fiftyone.geolocation 4.3.4 → 4.3.5

package/ci/common-ci/.github/labels.yml

@@ -22,6 +22,12 @@
 - name: "status: duplicate"
   description: This issue or pull request already exists
   color: cfd3d7
+- name: "status: awaiting external input"
+  description: This item is awaiting for external input
+  color: 6699ff
+- name: "status: will not fix"
+  description: This item will not be fixed
+  color: 6392fa
 - name: "status: released/4.3.0"
   description: This change was released in the specified version
   color: a8d131
@@ -66,3 +72,9 @@
 - name: "scheduled: 15th Dec 2021"
   description: This item has been scheduled for 15th Dec 2021 release
   color: 6ff076
+- name: "scheduled: 12th Jan 2022"
+  description: This item has been scheduled for 12th Jan 2022 release
+  color: d49233
+- name: "scheduled: 19th Jan 2022"
+  description: This item has been scheduled for 19th Jan 2022 release
+  color: d49291

package/ci/common-ci/.github/workflows/sync-labels.yml

@@ -26,6 +26,8 @@ jobs:
               51Degrees/device-detection-cxx
               51Degrees/device-detection-data
               51Degrees/device-detection-dotnet
+              51Degrees/device-detection-go
+              51Degrees/device-detection-examples-go
               51Degrees/device-detection-java
               51Degrees/device-detection-nginx
               51Degrees/device-detection-node

package/ci/common-ci/release-config.json

@@ -1,44 +1,18 @@
 {
 	"repositories": {
 		"common-ci": {
-			"version": "4.3.25",
+			"version": "4.3.41",
 			"isLeaf": true
 		},
 		"device-detection-cxx": {
-			"version": "4.3.9",
+			"version": "4.3.12",
 			"isLeaf": false,
 			"dependencies": [
 				"common-ci"
 			]
 		},
-		"device-detection-varnish": {
-			"version": "4.3.2",
-			"isLeaf": false,
-			"dependencies": [
-				"common-ci",
-				"device-detection-cxx"
-			]
-		},
-		"device-detection-nginx": {
-			"version": "4.3.4",
-			"isLeaf": false,
-			"dependencies": [
-				"common-ci",
-				"device-detection-cxx"
-			]
-		},
-		"device-detection-java": {
-			"version": "4.3.10",
-			"packageName": "pipeline.device-detection",
-			"versionVariableName": "devicedetection.version",
-			"isLeaf": false,
-			"dependencies": [
-				"common-ci",
-				"device-detection-cxx"
-			]
-		},
 		"location-java": {
-		    "version": "4.3.6",
+		    "version": "4.3.7",
 			"packageName": "pipeline.geo-location",
 			"versionVariableName": "geolocation.version",
 			"isLeaf": false,
@@ -47,93 +21,36 @@
 				"device-detection-java"
 			]
 		},
-		"location-onpremise-java": {
-		    "version": "4.3.2",
-			"packageName": "geo-location.digitalelement",
-			"versionVariableName": "geolocation.digitalelement.version",
-			"isLeaf": false,
-			"dependencies": [
-				"common-ci",
-				"location-java"
-			]
-		},
-		"pipeline-dotnet": {
-			"version": "4.3.8",
-			"packageName": "FiftyOne.Pipeline",
-			"isLeaf": false,
-			"dependencies": [
-				"common-ci"
-			]
-		},
-		"location-dotnet": {
-		    "version": "4.3.8",
-			"packageName": "FiftyOne.Geolocation",
-			"isLeaf": false,
-			"dependencies": [
-				"common-ci",
-				"pipeline-dotnet",
-				"device-detection-dotnet"
-			]
-		},
-		"device-detection-dotnet": {
-			"version": "4.3.10",
-			"packageName": "FiftyOne.DeviceDetection",
-			"isLeaf": false,
-			"dependencies": [
-				"common-ci",
-				"device-detection-cxx",
-				"pipeline-dotnet"
-			]
-		},
-		"entitlement-dotnet": {
-			"version": "4.1.16",
+		"device-detection-java": {
+			"version": "4.3.12",
+			"packageName": "pipeline.device-detection",
+			"versionVariableName": "devicedetection.version",
 			"isLeaf": false,
 			"dependencies": [
 				"common-ci",
-				"pipeline-dotnet"
-			]
-		},
-		"internal-engines-dotnet": {
-			"version": "4.3.5",
-			"packageName": "FiftyOne.GeoLocation.OnPremise",
-			"isLeaf": false,			
-			"dependencies": [
-				"common-ci",
-				"pipeline-dotnet",
-				"device-detection-dotnet",
-				"location-dotnet"
-			]
-		},
-		"pipeline-node": {
-			"version": "4.3.6",
-			"packageName": "fiftyone.pipeline",
-			"isLeaf": false,
-			"dependencies": [
-				"common-ci"
+				"device-detection-cxx"
 			]
 		},
 		"location-node": {
-		    "version": "4.3.4",
+		    "version": "4.3.5",
 			"packageName": "fiftyone.geolocation",
 			"isLeaf": false,
 			"dependencies": [
 				"common-ci",
-				"pipeline-node",
 				"device-detection-node"
 			]
 		},
 		"device-detection-node": {
-			"version": "4.3.6",
+			"version": "4.3.9",
 			"packageName": "fiftyone.devicedetection",
 			"isLeaf": false,
 			"dependencies": [
 				"common-ci",
-				"device-detection-cxx",
-				"pipeline-node"
+				"device-detection-cxx"
 			]
 		},
 		"device-detection-python": {
-			"version": "4.3.2",
+			"version": "4.3.3",
 			"packageName": "fiftyone_devicedetection",
 			"versionVariableName": "deviceDetectionVersion",
 			"isLeaf": false,
@@ -142,74 +59,29 @@
 				"device-detection-cxx"
 			]
 		},
-		"pipeline-php-core": {
-			"version": "4.3.5",
-			"packageName": "fiftyone.pipeline.core",
-			"isLeaf": false,
-			"dependencies": [
-				"common-ci"
-			]
-		},
-		"pipeline-php-engines": {
-			"version": "4.3.4",
-			"packageName": "fiftyone.pipeline.engines",
-			"isLeaf": false,
-			"dependencies": [
-				"common-ci",
-				"pipeline-php-core"
-			]
-		},
-		"pipeline-php-cloudrequestengine": {
-			"version": "4.3.5",
-			"packageName": "fiftyone.pipeline.cloudrequestengine",
-			"isLeaf": false,
-			"dependencies": [
-				"common-ci",
-				"pipeline-php-core",
-				"pipeline-php-engines"
-			]
-		},
-		"location-php": {
-			"version": "4.3.4",
-			"packageName": "fiftyone.geolocation",
-			"isLeaf": false,
-			"dependencies": [
-				"common-ci",
-				"pipeline-php-core",
-				"pipeline-php-engines",
-				"pipeline-php-cloudrequestengine",
-				"device-detection-php"
-			]
-		},
 		"device-detection-php-onpremise": {
-			"version": "4.3.4",
+			"version": "4.3.9",
 			"packageName": "fiftyone.devicedetection",
 			"isLeaf": false,
 			"dependencies": [
 				"common-ci",
-				"device-detection-cxx",
-				"pipeline-php-core",
-				"pipeline-php-engines"
+				"device-detection-cxx"
 			]
 		},
-		"device-detection-php": {
-			"version": "4.3.4",
-			"packageName": "fiftyone.devicedetection",
+		"device-detection-go": {
+			"version": "4.3.3",
 			"isLeaf": false,
 			"dependencies": [
 				"common-ci",
-				"pipeline-php-core",
-				"pipeline-php-engines",
-				"pipeline-php-cloudrequestengine"
+				"device-detection-cxx"
 			]
 		},
-		"pipeline-wordpress": {
-			"version": "1.0.2",
-			"packageName": "fiftyonedegrees.wordpress",
+		"device-detection-examples-go": {
+			"version": "4.3.2",
 			"isLeaf": false,
 			"dependencies": [
 				"common-ci",
-				"pipeline-php-cloudrequestengine"
+				"device-detection-go"
 			]
 		}
 	},

package/ci/common-ci/scripts/modules/51DDownloadDataFileModule/51DDownloadDataFileModule.psm1

@@ -22,26 +22,50 @@ function Get-DataFile {
         [string]$fullFilePath
     )
     
+    Add-Type -AssemblyName System.Net.Http
+
     $webClient = New-Object System.Net.Http.HttpClient;
     $webClient.Timeout = New-TimeSpan -Seconds 240
     $url ="https://distributor.51degrees.com/api/v2/download?LicenseKeys=$($licenseKey)&Type=$($dataType)&Download=True&Product=$($product)"
     $start_time = Get-Date
+    $complete = $false
+    $tryCount = 0
 
-    # Get download stream
-    $stream = $webClient.GetStreamAsync($url)
-    $stream.ConfigureAwait($false) > $null
-    if ($null -ne $stream.Exception){ throw $stream.Exception }
-
-    # Save stream to path
-    try
-    {
-        $fileStream = [System.IO.File]::Create($fullFilePath)
-        $stream.Result.CopyTo($fileStream)
-    }
-    finally
+    DO
     {
-        if ($null -ne $fileStream){ $fileStream.Dispose() }
-        if (($null -ne $stream) -and ($stream.IsCompleted -eq $true)){ $stream.Dispose() }
+        $tryCount++;
+        Write-Host "Attempt: $tryCount"
+        
+        try
+        {
+            # Get download stream
+            $stream = $webClient.GetStreamAsync($url)
+            $stream.ConfigureAwait($false) > $null
+            if ($null -ne $stream.Exception){ throw $stream.Exception }
+
+            # Save stream to path
+            try
+            {
+                $fileStream = [System.IO.File]::Create($fullFilePath)
+                $stream.Result.CopyTo($fileStream)            
+                $complete = $true
+            }
+            finally
+            {
+                if ($null -ne $fileStream){ $fileStream.Dispose() }
+                if (($null -ne $stream) -and ($stream.IsCompleted -eq $true)){ $stream.Dispose() }
+            }
+        }
+        catch
+        {
+            Write-Host "# ERROR downloading data file:"
+            Write-Host $_
+        }        
+    } While (($complete -eq $false) -and ($tryCount -le 10))
+    
+    if($complete -eq $false)
+    {        
+		throw "# ERROR: Data file download failed after $tryCount attempts."
     }
 
     Write-Output "Time taken: $((Get-Date).Subtract($start_time).Seconds) second(s)"

package/ci/common-ci/scripts/modules/51DGitModule/51DGitModule.psm1

@@ -592,7 +592,9 @@ function Update-SubmoduleReferences {
 			Write-Host "# Checking tag $targetTag"
 			
 			$tagUpdated = $false
-			if ($targetTag -ne $null) {
+			$targetSpecified = $null -ne $targetTag
+
+			if ($targetSpecified) {
 				# Get all tag
 				Write-Host "# Fetch all tags"
 				if (![GitHandler]::FetchAllTags()) {
@@ -628,18 +630,20 @@ function Update-SubmoduleReferences {
 			}
 			
 			Pop-Location
-			
-			# Exit if not all tags have been found.
-			if (!$tagUpdated) {
-				Write-Host "# ERROR: Failed to update Submodule $subRepoName to tag $targetTag."
-				return $false
-			}
-			
-			# Stage the submodule update
-			Write-Host "# Stage the submodule $submodulePath"
-			if (![GitHandler]::Add($submodulePath)) {
-				Write-Host "# ERROR: Failed to stage the submodule $subRepoName."
-				return $false
+						
+			if($targetSpecified) {
+				# Exit if not all tags have been found.
+				if (!$tagUpdated) {
+					Write-Host "# ERROR: Failed to update Submodule $subRepoName to tag $targetTag."
+					return $false
+				}
+
+				# Stage the submodule update
+				Write-Host "# Stage the submodule $submodulePath"
+				if (![GitHandler]::Add($submodulePath)) {
+					Write-Host "# ERROR: Failed to stage the submodule $subRepoName."
+					return $false
+				}
 			}
 		} else {
 			Write-Host "# ERROR: Failed to extract module path from $submodulePath"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fiftyone.geolocation",
-  "version": "4.3.4",
+  "version": "4.3.5",
   "description": "Geo-location services for the 51Degrees Pipeline API",
   "main": "index.js",
   "types": "types/index.d.ts",