fiftyone.geolocation 4.3.1 → 4.3.6

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

@@ -1,42 +1,54 @@
 {
 	"repositories": {
 		"common-ci": {
-			"version": "4.3.2",
+			"version": "4.3.43",
 			"isLeaf": true
 		},
 		"common-cxx": {
-			"version": "4.3.1",
+			"version": "4.3.8",
 			"isLeaf": false,
 			"dependencies": [
 				"common-ci"
 			]
 		},
 		"device-detection-cxx": {
-			"version": "4.3.2",
+			"version": "4.3.13",
 			"isLeaf": false,
 			"dependencies": [
 				"common-ci",
 				"common-cxx"
 			]
 		},
-		"device-detection-varnish": {
-			"version": "4.3.0",
+		"pipeline-node": {
+			"version": "4.3.7",
+			"packageName": "fiftyone.pipeline",
+			"isLeaf": false,
+			"dependencies": [
+				"common-ci"
+			]
+		},
+		"location-node": {
+		    "version": "4.3.6",
+			"packageName": "fiftyone.geolocation",
 			"isLeaf": false,
 			"dependencies": [
 				"common-ci",
-				"device-detection-cxx"
+				"pipeline-node",
+				"device-detection-node"
 			]
 		},
-		"device-detection-nginx": {
-			"version": "4.3.1",
+		"device-detection-node": {
+			"version": "4.3.10",
+			"packageName": "fiftyone.devicedetection",
 			"isLeaf": false,
 			"dependencies": [
 				"common-ci",
-				"device-detection-cxx"
+				"device-detection-cxx",
+				"pipeline-node"
 			]
 		},
 		"pipeline-java": {
-			"version": "4.3.0",
+			"version": "4.3.8",
 			"packageName": "pipeline",
 			"versionVariableName": "pipeline.version",
 			"isLeaf": false,
@@ -45,7 +57,7 @@
 			]
 		},
 		"location-java": {
-		    "version": "4.3.0",
+		    "version": "4.3.8",
 			"packageName": "pipeline.geo-location",
 			"versionVariableName": "geolocation.version",
 			"isLeaf": false,
@@ -55,30 +67,18 @@
 				"device-detection-java"
 			]
 		},
-		"location-onpremise-java": {
-		    "version": "4.3.0",
-			"packageName": "geo-location.digitalelement",
-			"versionVariableName": "geolocation.digitalelement.version",
-			"isLeaf": false,
-			"dependencies": [
-				"common-ci",
-				"pipeline-java",
-				"location-java"
-			]
-		},
 		"device-detection-java": {
-			"version": "4.3.0",
+			"version": "4.3.13",
 			"packageName": "pipeline.device-detection",
 			"versionVariableName": "devicedetection.version",
 			"isLeaf": false,
 			"dependencies": [
 				"common-ci",
-				"device-detection-cxx",
-				"pipeline-java"
+				"device-detection-cxx"
 			]
 		},
 		"common-dotnet": {
-			"version": "4.3.1",
+			"version": "4.3.5",
 			"packageName": "FiftyOne.Common",
 			"isLeaf": false,
 			"dependencies": [
@@ -86,7 +86,7 @@
 			]
 		},
 		"caching-dotnet": {
-			"version": "4.3.1",
+			"version": "4.3.5",
 			"packageName": "FiftyOne.Caching",
 			"isLeaf": false,
 			"dependencies": [
@@ -94,7 +94,7 @@
 			]
 		},
 		"pipeline-dotnet": {
-			"version": "4.3.1",
+			"version": "4.3.15",
 			"packageName": "FiftyOne.Pipeline",
 			"isLeaf": false,
 			"dependencies": [
@@ -104,7 +104,7 @@
 			]
 		},
 		"location-dotnet": {
-		    "version": "4.3.2",
+		    "version": "4.3.11",
 			"packageName": "FiftyOne.Geolocation",
 			"isLeaf": false,
 			"dependencies": [
@@ -115,67 +115,37 @@
 			]
 		},
 		"device-detection-dotnet": {
-			"version": "4.3.1",
+			"version": "4.3.14",
 			"packageName": "FiftyOne.DeviceDetection",
 			"isLeaf": false,
 			"dependencies": [
 				"common-ci",
 				"device-detection-cxx",
+				"caching-dotnet",
 				"common-dotnet",
 				"pipeline-dotnet"
 			]
 		},
-		"entitlement-dotnet": {
-			"version": "4.1.9",
-			"isLeaf": false,
-			"dependencies": [
-				"common-ci",
-				"common-dotnet",
-				"pipeline-dotnet"
-			]
-		},
-		"internal-engines-dotnet": {
-			"version": "4.3.0",
-			"packageName": "FiftyOne.GeoLocation.OnPremise",
-			"isLeaf": false,			
-			"dependencies": [
-				"common-ci",
-				"common-dotnet",
-				"pipeline-dotnet",
-				"device-detection-dotnet",
-				"location-dotnet"
-			]
-		},
-		"pipeline-node": {
-			"version": "4.3.1",
-			"packageName": "fiftyone.pipeline",
+		"license-dotnet": {
+			"version": "4.3.3",
+			"packageName": "FiftyOne.(License|Resource)",
 			"isLeaf": false,
 			"dependencies": [
 				"common-ci"
 			]
 		},
-		"location-node": {
-		    "version": "4.3.1",
-			"packageName": "fiftyone.geolocation",
-			"isLeaf": false,
-			"dependencies": [
-				"common-ci",
-				"pipeline-node",
-				"device-detection-node"
-			]
-		},
-		"device-detection-node": {
-			"version": "4.3.1",
-			"packageName": "fiftyone.devicedetection",
+		"entitlement-dotnet": {
+			"version": "4.1.18",
 			"isLeaf": false,
 			"dependencies": [
 				"common-ci",
-				"device-detection-cxx",
-				"pipeline-node"
+				"common-dotnet",
+				"license-dotnet",
+				"pipeline-dotnet"
 			]
 		},
 		"pipeline-python": {
-			"version": "4.3.1",
+			"version": "4.3.5",
 			"packageName": "fiftyone_pipeline",
 			"versionVariableName": "pipelineVersion",
 			"isLeaf": false,
@@ -184,7 +154,7 @@
 			]
 		},
 		"location-python": {
-		    "version": "4.3.0",
+		    "version": "4.3.2",
 			"packageName": "fiftyone_location",
 			"versionVariableName": "locationVersion",
 			"isLeaf": false,
@@ -194,7 +164,7 @@
 			]
 		},
 		"device-detection-python": {
-			"version": "4.3.0",
+			"version": "4.3.4",
 			"packageName": "fiftyone_devicedetection",
 			"versionVariableName": "deviceDetectionVersion",
 			"isLeaf": false,
@@ -204,65 +174,20 @@
 				"pipeline-python"
 			]
 		},
-		"pipeline-php-core": {
-			"version": "4.3.1",
-			"packageName": "fiftyone.pipeline.core",
-			"isLeaf": false,
-			"dependencies": [
-				"common-ci"
-			]
-		},
-		"pipeline-php-engines": {
-			"version": "4.3.1",
-			"packageName": "fiftyone.pipeline.engines",
-			"isLeaf": false,
-			"dependencies": [
-				"common-ci",
-				"pipeline-php-core"
-			]
-		},
-		"pipeline-php-cloudrequestengine": {
-			"version": "4.3.1",
-			"packageName": "fiftyone.pipeline.cloudrequestengine",
+		"device-detection-go": {
+			"version": "4.3.4",
 			"isLeaf": false,
 			"dependencies": [
 				"common-ci",
-				"pipeline-php-core",
-				"pipeline-php-engines"
-			]
-		},
-		"location-php": {
-			"version": "4.3.1",
-			"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.1",
-			"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.1",
-			"packageName": "fiftyone.devicedetection",
+		"device-detection-examples-go": {
+			"version": "4.3.3",
 			"isLeaf": false,
 			"dependencies": [
 				"common-ci",
-				"pipeline-php-core",
-				"pipeline-php-engines",
-				"pipeline-php-cloudrequestengine"
+				"device-detection-go"
 			]
 		}
 	},

package/ci/common-ci/scripts/azure/checkSlot.ps1

@@ -0,0 +1,28 @@
+# This is a wrapper script which runs the Get-SlotStatus function in the 
+# 51DDeployModule, helpful if running from azure pipelines and need to pass in
+# arguments.
+
+param (
+    # The path to the module folder which contains the 51DeployModule. This 
+    # module contains the Get-SlotStatus function.
+    [Parameter(Mandatory=$true)]
+    [string]$ModulePath,
+
+    # The URI of the service to test, e.g. https://51degrees.com
+    [Parameter(Mandatory=$true)]
+    [string]$Uri,
+
+    # The number of tries before aborting the test.
+    [int]$NumberOfTries=18,
+
+    # The delay between tries in seconds.
+    [int]$SecondsBetweenTries=10
+)
+
+# Install all modules
+$Env:PSModulePath += "$([IO.Path]::PathSeparator)$($ModulePath)"
+Write-Host "Module Path: $($Env:PSModulePath)"
+
+# Execute Get-SlotStatus script. The function will exit with a status of 1 if 
+# the service fails to respond with a HTTP 200 status code.
+Get-SlotStatus -Uri $Uri -NumberOfTries $NumberOfTries -SecondsBetweenTries $SecondsBetweenTries

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

@@ -1,9 +1,16 @@
+# Get the path to the script parent folder.
+$scriptPath = Split-Path -parent $MyInvocation.MyCommand.Definition
+
 # Class contains definition of authorization string.
 class Authorization {
-	# static [string]$AuthorizationString = "Bearer $Env:SYSTEM_ACCESSTOKEN"
-	# When using this script locally, update and use the authorization string with your
-	# base 64 PAT as described at
+	static [string]$AuthorizationString = "Bearer $Env:SYSTEM_ACCESSTOKEN"
+	# When using this script locally, create a authorization -setting.json with the following content:
+	# { "Base64PAT": "Basic [Your Base 64 PAT]" }
+	# Update it with your base 64 encoded PAT as described at
 	# https://docs.microsoft.com/en-us/azure/devops/organizations/accounts/use-personal-access-tokens-to-authenticate?view=azure-devops&tabs=preview-page#use-a-pat
-	# e.g.
-	static [string]$AuthorizationString = "Basic OnVrbndrZ2xpcnh3ajR1Z3M2eDZtYXhzeTdrYmczazRiZHdlemNtaXl6dnJ5eHE2ZmhrYnE="
+	#
+	# Then uncomment the following line, load this module and run 'Using module 51DAuthorizationModule' in a fresh environment if
+	# accessing this directly from a terminal.
+	# 
+	# static [string]$AuthorizationString = $(Get-Content $scriptPath/authorization-settings.json -Raw | Out-String | ConvertFrom-Json).Base64PAT
 }

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

@@ -0,0 +1,66 @@
+<#
+  ==================== Deploy =====================
+  .Description
+  This module contains functions to aid with deployment to Azure Services.
+#>
+
+# Get HTTP status where querying a Uri, return even if the client throws an
+# exception.
+function Get-StatusCode {
+
+    param(
+        [string]$Uri
+    )
+
+    try{
+        (Invoke-WebRequest -Uri $Uri -UseBasicParsing -DisableKeepAlive).StatusCode
+    }
+    catch [Net.WebException]
+    {
+        [int]$_.Exception.Response.StatusCode
+    }
+    catch [Exception]
+    {
+        return 0
+    }
+}
+
+# Check if a service has started by polling an endoint, if the number of retrys 
+# has been exhausted and the service is not running (no 200 status code returned)
+# then exit with status code 1.
+function Get-SlotStatus {
+    param (
+        # The URI of the service to test, e.g. https://51degrees.com
+        [Parameter(Mandatory=$true)]
+        [string]$Uri,
+
+        # The number of tries before aborting the test.
+        [Parameter(Mandatory=$true)]
+        [int]$NumberOfTries,
+
+        # The delay between tries in seconds.
+        [Parameter(Mandatory=$true)]
+        [int]$SecondsBetweenTries
+    )
+
+    # Wait for the service to start
+    Write-Host -NoNewline "Waiting for response from $Uri "
+
+    $Tries = 0
+    $HTTP_Status = Get-StatusCode -Uri $Uri -Path $Path
+    While ($HTTP_Status -ne 200 -And $Tries -le $NumberOfTries) {
+        Start-Sleep -Seconds $SecondsBetweenTries
+        $Tries = $Tries +1
+        $HTTP_Status = Get-StatusCode -Uri $Uri -Path $Path
+        Write-Host -NoNewLine "."
+    }
+    Write-Host ""
+    # Exit if service is not accepting requests
+    if($HTTP_Status -ne 200) {
+        Write-Host "Service is not accepting requests."
+        exit 1
+    }
+    Write-Host "Service has started"
+}
+
+Export-ModuleMember -Function Get-SlotStatus

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

@@ -0,0 +1,74 @@
+<#
+  ==================== Download =====================
+  .Description
+  This module contains a function to download a data file
+  from the 51Degrees Distributor.
+#>
+
+# Download a data file.
+function Get-DataFile {
+
+    param (
+        [Parameter(Mandatory=$true)]
+        [string]$licenseKey,
+
+        [Parameter(Mandatory=$true)]
+        [string]$dataType,
+
+        [Parameter(Mandatory=$true)]
+        [string]$product,
+
+        [Parameter(Mandatory=$true)]
+        [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
+
+    DO
+    {
+        $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)"
+}
+
+Export-ModuleMember -Function Get-DataFile

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

@@ -591,16 +591,18 @@ function Update-SubmoduleReferences {
 			$targetTag = $script:repositories."$subRepoName".version
 			Write-Host "# Checking tag $targetTag"
 			
-			# Get all tag
-			Write-Host "# Fetch all tags"
-			if (![GitHandler]::FetchAllTags()) {
-				Write-Host "# ERROR: Failed to fetch tags. Cannot reliably check submodule deployment."
-				Pop-Location
-				return $false
-			}
-			
 			$tagUpdated = $false
-			if ($targetTag -ne $null) {
+			$targetSpecified = $null -ne $targetTag
+
+			if ($targetSpecified) {
+				# Get all tag
+				Write-Host "# Fetch all tags"
+				if (![GitHandler]::FetchAllTags()) {
+					Write-Host "# ERROR: Failed to fetch tags. Cannot reliably check submodule deployment."
+					Pop-Location
+					return $false
+				}
+
 				$remoteRepo = git -c http.extraheader="AUTHORIZATION: $([Authorization]::AuthorizationString)" config --get remote.origin.url
 				Write-Host "# Remote repository found '$remoteRepo'"
 				# Make sure to sort the tag, so only pick up the biggest tag.
@@ -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"