Merge branch 'release/4.0.0'

CluedIn-io · Feb 7, 2024 · c944859 · c944859
2 parents a005b00 + 802bb66
commit c944859
Show file tree

Hide file tree

Showing 12 changed files with 243 additions and 108 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup Label="Compilation Metadata">
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <!-- TODO: Clean up warnings -->
@@ -36,6 +36,10 @@
     <PackageIcon>nugetlogo.png</PackageIcon>
   </PropertyGroup>
 
+  <PropertyGroup Label="FixBuildDefault">
+	  <IncludeProjectsNotInAssetsFileInDepsFile>false</IncludeProjectsNotInAssetsFileInDepsFile>
+  </PropertyGroup>
+
   <ItemGroup Label="Package Includes">
     <None Include="$(MSBuildThisFileDirectory)build\assets\nugetlogo.png" Pack="true" PackagePath="\" />
   </ItemGroup>

diff --git a/GitVersion.yml b/GitVersion.yml
@@ -1,6 +1,29 @@
-# GitVersion.yml
-mode: ContinuousDelivery
-next-version: 3.3
-branches: {}
+mode: ContinuousDeployment
+next-version: 4.0
+branches:
+  master:
+    mode: ContinuousDelivery
+  pull-request:
+    tag: pr
+    increment: None
+  develop:
+    tag: alpha
+  hotfix:
+    tag: useBranchName
+  ama:
+    increment: None
+    tracks-release-branches: false
+    regex: ^ama[/-]
+    is-release-branch: false
+    mode: ContinuousDeployment
+    track-merge-target: false
+    tag: ama
+    pre-release-weight: 30000
+    prevent-increment-of-merged-branch-version: true
+    is-mainline: false
+    source-branches:
+    - main
+    - develop
 ignore:
-  sha: []
+  sha: []
+
diff --git a/README.md b/README.md
@@ -46,3 +46,12 @@ docker-compose logs wiremock
 - [Docker](https://www.docker.com/)
 - [Pester](https://github.com/pester/Pester)
 - [WireMock](http://wiremock.org/)
+
+# About CluedIn
+CluedIn is the Cloud-native Master Data Management Platform that brings data teams together enabling them to deliver the foundation of high-quality, trusted data that empowers everyone to make a difference. 
+
+We're different because we use enhanced data management techniques like [Graph](https://www.cluedin.com/graph-versus-relational-databases-which-is-best) and [Zero Upfront Modelling](https://www.cluedin.com/upfront-versus-dynamic-data-modelling) to accelerate the time taken to prepare data to deliver insight by as much as 80%. Installed in as little as 20 minutes from the [Azure Marketplace](https://azuremarketplace.microsoft.com/en-gb/marketplace/apps/cluedin.azure_cluedin?tab=Overview), CluedIn is fully integrated with [Microsoft Purview](https://www.cluedin.com/product/microsoft-purview-mdm-integration?hsCtaTracking=461021ab-7a38-41a3-93dd-cfe2325dfd35%7Cb835efc0-e9b7-4385-a1b6-75cb7632527b) and the full [Microsoft Fabric](https://www.cluedin.com/microsoft-fabric) suite, making it the preferred choice for [Azure customers](https://www.cluedin.com/microsoft-intelligent-data-platform). 
+
+To learn more about CluedIn, [contact the team](https://www.cluedin.com/discovery-call) today.
+
+[https://www.cluedin.com](https://www.cluedin.com)
diff --git a/docs/4.0.0-release-notes.md b/docs/4.0.0-release-notes.md
@@ -0,0 +1,3 @@
+# Features
+- Update to support CluedIn 4.0
+- Supports configurable types and keys
diff --git a/global.json b/global.json
@@ -1,7 +1,8 @@
 {
   "sdk": {
-    "version": "3.1.201",
-    "rollForward": "latestFeature"
+    "version": "6.0.400",
+    "rollForward": "latestFeature",
+    "allowPrerelease": "false"
   },
   "msbuild-sdks": {
     "Microsoft.Build.CentralPackageVersions": "2.0.52"

diff --git a/packages.props b/packages.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup Label="Dependency Versions">
-    <_ComponentHost>2.0.0</_ComponentHost>
+    <_ComponentHost>3.1.0</_ComponentHost>
     <_AutoFixture>4.11.0</_AutoFixture>
-    <_CluedIn>3.3.0-*</_CluedIn>
+    <_CluedIn>4.0.0</_CluedIn>
   </PropertyGroup>
   <ItemGroup>
     <!--
@@ -19,7 +19,7 @@
     <PackageReference Update="xunit.runner.visualstudio" Version="2.4.1" />
     <PackageReference Update="Moq" Version="4.13.1" />
     <PackageReference Update="Shouldly" Version="3.0.2" />
-    <PackageReference Update="CluedIn.Testing.Base" Version="$(_CluedIn)" />
+    <PackageReference Update="CluedIn.Testing.Base" Version="4.0.0" />
   </ItemGroup>
   <ItemGroup>
     <!--
@@ -28,7 +28,7 @@
     -->
     <PackageReference Update="ComponentHost" Version="$(_ComponentHost)" />
     <PackageReference Update="CluedIn.Crawling" Version="$(_CluedIn)" />
-    <PackageReference Update="CluedIn.CrawlerIntegrationTesting" Version="$(_CluedIn)" />
+    <PackageReference Update="CluedIn.CrawlerIntegrationTesting" Version="4.0.0" />
     <PackageReference Update="CluedIn.Core" Version="$(_CluedIn)" />
     <PackageReference Update="CluedIn.Core.Agent" Version="$(_CluedIn)" />
     <PackageReference Update="CluedIn.Server" Version="$(_CluedIn)" />

diff --git a/src/ExternalSearch.Providers.GoogleMaps/Constants.cs b/src/ExternalSearch.Providers.GoogleMaps/Constants.cs
@@ -14,7 +14,18 @@ public static class Constants
         public struct KeyName
         {
             public const string ApiToken = "apiToken";
-
+            public const string AcceptedEntityType = "acceptedEntityType";
+            public const string OrgNameKey = "orgNameKey";
+            public const string OrgAddressKey = "orgAddressKey";
+            public const string OrgZipCodeKey = "orgZipCodeKey";
+            public const string OrgStateKey = "orgStateKey";
+            public const string OrgCountryKey = "orgCountryKey";
+            public const string LocationAddressKey = "locationAddressKey";
+            public const string UserAddressKey = "userAddressKey";
+            public const string PersonAddressKey = "personAddressKey";
+            public const string PersonAddressCityKey = "personAddressCityKey";
+            public const string LatitudeKey = "latitudeKey";
+            public const string LongitudeKey = "longitudeKey";
         }
 
         public static string About { get; set; } = "Google Maps is a web mapping platform and consumer application offered by Google. It offers satellite imagery, aerial photography, street maps, 360° interactive panoramic views of streets, real-time traffic conditions, and route planning for traveling by foot, car, air and public transportation.";
@@ -31,7 +42,92 @@ public struct KeyName
                     type = "input",
                     isRequired = true,
                     name = KeyName.ApiToken
-                }
+                },
+                new Control()
+                {
+                    displayName = "Accepted Entity Type",
+                    type = "input",
+                    isRequired = false,
+                    name = KeyName.AcceptedEntityType
+                },
+                new Control()
+                {
+                    displayName = "Organization Name vocab key",
+                    type = "input",
+                    isRequired = false,
+                    name = KeyName.OrgNameKey
+                },
+                new Control()
+                {
+                    displayName = "Organization Address vocab key",
+                    type = "input",
+                    isRequired = false,
+                    name = KeyName.OrgAddressKey
+                },
+
+                new Control()
+                {
+                    displayName = "Organization Zip vocab key",
+                    type = "input",
+                    isRequired = false,
+                    name = KeyName.OrgZipCodeKey
+                },
+                new Control()
+                {
+                    displayName = "Organization State vocab key",
+                    type = "input",
+                    isRequired = false,
+                    name = KeyName.OrgStateKey
+                },
+                new Control()
+                {
+                    displayName = "Organization Country vocab key",
+                    type = "input",
+                    isRequired = false,
+                    name = KeyName.OrgCountryKey
+                },
+                new Control()
+                {
+                    displayName = "Location Address vocab key",
+                    type = "input",
+                    isRequired = false,
+                    name = KeyName.LocationAddressKey
+                },
+                new Control()
+                {
+                    displayName = "User Address vocab key",
+                    type = "input",
+                    isRequired = false,
+                    name = KeyName.UserAddressKey
+                },
+                new Control()
+                {
+                    displayName = "Person Address vocab key",
+                    type = "input",
+                    isRequired = false,
+                    name = KeyName.PersonAddressKey
+                },
+                new Control()
+                {
+                    displayName = "Person Address City vocab key",
+                    type = "input",
+                    isRequired = false,
+                    name = KeyName.PersonAddressCityKey
+                },
+                new Control()
+                {
+                    displayName = "Latitude vocab key",
+                    type = "input",
+                    isRequired = false,
+                    name = KeyName.LatitudeKey
+                },
+                new Control()
+                {
+                    displayName = "Longitude vocab key",
+                    type = "input",
+                    isRequired = false,
+                    name = KeyName.LongitudeKey
+                },
             }
         };
 

diff --git a/src/ExternalSearch.Providers.GoogleMaps/Directory.Build.props b/src/ExternalSearch.Providers.GoogleMaps/Directory.Build.props
diff --git a/src/ExternalSearch.Providers.GoogleMaps/GoogleMapsExternalSearchJobData.cs b/src/ExternalSearch.Providers.GoogleMaps/GoogleMapsExternalSearchJobData.cs
@@ -8,15 +8,51 @@ public class GoogleMapsExternalSearchJobData : CrawlJobData
         public GoogleMapsExternalSearchJobData(IDictionary<string, object> configuration)
         {
             ApiToken = GetValue<string>(configuration, Constants.KeyName.ApiToken);
+            AcceptedEntityType = GetValue<string>(configuration, Constants.KeyName.AcceptedEntityType);
+            OrgNameKey = GetValue<string>(configuration, Constants.KeyName.OrgNameKey);
+            OrgAddressKey = GetValue<string>(configuration, Constants.KeyName.OrgAddressKey);
+            OrgZipCodeKey = GetValue<string>(configuration, Constants.KeyName.OrgZipCodeKey);
+            OrgStateKey = GetValue<string>(configuration, Constants.KeyName.OrgStateKey);
+            OrgCountryKey = GetValue<string>(configuration, Constants.KeyName.OrgCountryKey);
+            LocationAddressKey = GetValue<string>(configuration, Constants.KeyName.LocationAddressKey);
+            UserAddressKey = GetValue<string>(configuration, Constants.KeyName.UserAddressKey);
+            PersonAddressKey = GetValue<string>(configuration, Constants.KeyName.PersonAddressKey);
+            PersonAddressCityKey = GetValue<string>(configuration, Constants.KeyName.PersonAddressCityKey);
+            LatitudeKey = GetValue<string>(configuration, Constants.KeyName.LatitudeKey);
+            LongitudeKey = GetValue<string>(configuration, Constants.KeyName.LongitudeKey);
         }
 
         public IDictionary<string, object> ToDictionary()
         {
             return new Dictionary<string, object> {
-                { Constants.KeyName.ApiToken, ApiToken }
+                { Constants.KeyName.ApiToken, ApiToken },
+                { Constants.KeyName.AcceptedEntityType, AcceptedEntityType },
+                { Constants.KeyName.OrgNameKey, OrgNameKey },
+                { Constants.KeyName.OrgAddressKey, OrgAddressKey },
+                { Constants.KeyName.OrgZipCodeKey, OrgZipCodeKey },
+                { Constants.KeyName.OrgStateKey, OrgStateKey },
+                { Constants.KeyName.OrgCountryKey, OrgCountryKey },
+                { Constants.KeyName.LocationAddressKey, LocationAddressKey },
+                { Constants.KeyName.UserAddressKey, UserAddressKey },
+                { Constants.KeyName.PersonAddressKey, PersonAddressKey },
+                { Constants.KeyName.PersonAddressCityKey, PersonAddressCityKey },
+                { Constants.KeyName.LatitudeKey, LatitudeKey },
+                { Constants.KeyName.LongitudeKey, LongitudeKey }
             };
         }
 
         public string ApiToken { get; set; }
+        public string AcceptedEntityType { get; set; }
+        public string OrgNameKey { get; set; }
+        public string OrgAddressKey { get; set; }
+        public string OrgZipCodeKey { get; set; }
+        public string OrgStateKey { get; set; }
+        public string OrgCountryKey { get; set; }
+        public string LocationAddressKey { get; set; }
+        public string UserAddressKey { get; set; }
+        public string PersonAddressKey { get; set; }
+        public string PersonAddressCityKey { get; set; }
+        public string LatitudeKey { get; set; }
+        public string LongitudeKey { get; set; }
     }
 }