fiftyone.geolocation 4.3.1 → 4.3.6

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

@@ -171,6 +171,9 @@ function Update-MavenPackageDependencies {
   .Parameter TeamProjectName
   Name ofthe repository team project
   
+  .Parameter IsPackagesConfig
+  If the current package is packages.config which requires different treatment.
+  
   .Outputs
   Updated file content or $null of error occured
 #>
@@ -181,7 +184,9 @@ function Update-DotnetPackageFileContent {
 		[Parameter(Mandatory)]
 		[string]$ProjectFileContent,
 		[Parameter(Mandatory)]
-		[string]$TeamProjectName
+		[string]$TeamProjectName,
+		[Parameter(Mandatory)]
+		[boolean]$IsPackagesConfig
 	)
 	# Update each .csproj file with dependency versions.
 	foreach ($dependency in $Dependencies) {
@@ -192,44 +197,143 @@ function Update-DotnetPackageFileContent {
 		# That will be used to preserv the remaining of the markup,
 		# apart from the version which will be updated.
 		$dependencyVersion = $script:repositories."$dependency".version
-		$matchPattern = "(?<prefix>\<PackageReference \s*Include=\`"$packageName.*\`" \s*Version=\`").*(?<suffix>\`"\s*/\>)"
-		if ($ProjectFileContent -match "$matchPattern") {
-			Write-Host "# Version variable matches dependency $packageName. Update."
+		
+		if ($IsPackagesConfig) {
+			$matchPattern = "(?<prefix>\<package \s*id=\`"$packageName.*\`" \s*version=\`").*(?<suffix>\`"\s*targetFramework=\`".*\`"\s*/\>)"
+			if ($ProjectFileContent -match "$matchPattern") {
+				Write-Host "# Version variable matches dependency $packageName. Update."
+				
+				# Make sure that the version exists for the dependency. Else bail out.
+				if (!$(Test-TagExist `
+					-RepositoryName $dependency `
+					-Version $dependencyVersion `
+					-TeamProjectName $TeamProjectName)) {
+					Write-Host "# ERROR: Tag $dependencyVersion for repository $dependency does not exist."
+					return $null
+				}
+				
+				# This reuse the matched group so make sure we don't lose the original package name.
+				$replaceString = '${prefix}' + "$dependencyVersion" + '${suffix}'
+				$ProjectFileContent = $ProjectFileContent -replace "$matchPattern",$replaceString
+			}
+		} else {
+			$matchPattern = "(?<prefix>\<PackageReference \s*Include=\`"$packageName.*\`" \s*Version=\`").*(?<suffix>\`"\s*/\>)"
+			if ($ProjectFileContent -match "$matchPattern") {
+				Write-Host "# Version variable matches dependency $packageName. Update."
+				
+				# Make sure that the version exists for the dependency. Else bail out.
+				if (!$(Test-TagExist `
+					-RepositoryName $dependency `
+					-Version $dependencyVersion `
+					-TeamProjectName $TeamProjectName)) {
+					Write-Host "# ERROR: Tag $dependencyVersion for repository $dependency does not exist."
+					return $null
+				}
+				
+				# This reuse the matched group so make sure we don't lose the original package name.
+				$replaceString = '${prefix}' + "$dependencyVersion" + '${suffix}'
+				$ProjectFileContent = $ProjectFileContent -replace "$matchPattern",$replaceString
+			}
 			
-			# Make sure that the version exists for the dependency. Else bail out.
-			if (!$(Test-TagExist `
-				-RepositoryName $dependency `
-				-Version $dependencyVersion `
-				-TeamProjectName $TeamProjectName)) {
-				Write-Host "# ERROR: Tag $dependencyVersion for repository $dependency does not exist."
-				return $null
+			# Version 2 of xml markup for <PackageReference></PackageReference>
+			$matchPattern = "(?<prefix>\<PackageReference \s*Include=\`"$packageName.*\`"\s*\>.*\r\n.*\<Version\>)(?<version>.*)(?<suffix>\</Version\>.*\r\n.*\</PackageReference\>)"
+			if ($ProjectFileContent -match "$matchPattern") {
+				Write-Host "# Version variable matches dependency $packageName. Update."
+				
+				# Make sure that the version exists for the dependency. Else bail out.
+				if (!$(Test-TagExist `
+					-RepositoryName $dependency `
+					-Version $dependencyVersion `
+					-TeamProjectName $TeamProjectName)) {
+					Write-Host "# ERROR: Tag $dependencyVersion for repository $dependency does not exist."
+					return $null
+				}
+				
+				# This reuse the matched group so make sure we don't lose the original package name.
+				$replaceString = '${prefix}' + "$dependencyVersion" + '${suffix}'
+				$ProjectFileContent = $ProjectFileContent -replace "$matchPattern",$replaceString
 			}
 			
-			# This reuse the matched group so make sure we don't lose the original package name.
-			$replaceString = '${prefix}' + "$dependencyVersion" + '${suffix}'
-			$ProjectFileContent = $ProjectFileContent -replace "$matchPattern",$replaceString
+			# If HintPath exists. This is when a project is a .Net Framework. Update the Hint Path.
+			$matchPattern = "(?<prefix>\<HintPath\>\s*.*$packageName.*)\d+\.\d+\.\d+.*(?<suffix>\\lib.*\<\/HintPath\>)"
+			if ($ProjectFileContent -match "$matchPattern") {
+				Write-Host "# Version variable matches dependency $packageName. Update."
+				
+				# Make sure that the version exists for the dependency. Else bail out.
+				if (!$(Test-TagExist `
+					-RepositoryName $dependency `
+					-Version $dependencyVersion `
+					-TeamProjectName $TeamProjectName)) {
+					Write-Host "# ERROR: Tag $dependencyVersion for repository $dependency does not exist."
+					return $null
+				}
+				
+				# This reuse the matched group so make sure we don't lose the original package name.
+				$replaceString = '${prefix}' + "$dependencyVersion" + '${suffix}'
+				$ProjectFileContent = $ProjectFileContent -replace "$matchPattern",$replaceString
+			}
 		}
-		
-		# Version 2 of xml markup for <PackageReference></PackageReference>
-		$matchPattern = "(?<prefix>\<PackageReference \s*Include=\`"$packageName.*\`"\s*\>.*\r\n.*\<Version\>)(?<version>.*)(?<suffix>\</Version\>.*\r\n.*\</PackageReference\>)"
-		if ($ProjectFileContent -match "$matchPattern") {
-			Write-Host "# Version variable matches dependency $packageName. Update."
-			
-			# Make sure that the version exists for the dependency. Else bail out.
-			if (!$(Test-TagExist `
-				-RepositoryName $dependency `
-				-Version $dependencyVersion `
-				-TeamProjectName $TeamProjectName)) {
-				Write-Host "# ERROR: Tag $dependencyVersion for repository $dependency does not exist."
-				return $null
+	}
+	return $ProjectFileContent
+}
+
+<#
+  .Description
+  Update package dependencies for a package file
+  which can be .csproj or packages.config file.
+  
+  .Parameter FilePath
+  Path to a package file
+  
+  .Parameter Dependencies
+  List of dependencies to be updated
+  
+  .Parameter TeamProjectName
+  Name of a Team Project that the changes should be
+  made to.
+  
+  .Outputs
+  true or false
+#>
+function Update-DotnetPackageDependenciesPerFile {
+	param (
+		[Parameter(Mandatory)]
+		[string]$FilePath,
+		[Parameter(Mandatory)]
+		[string[]]$Dependencies,
+		[Parameter(Mandatory)]
+		[string]$TeamProjectName
+	)
+	Write-Host ""
+	Write-Host "# Updating package file $FilePath"
+	$projFileContent = $(Get-Content $FilePath -Raw)
+	$isPackagesConfig = $FilePath -match ".*packages.config"
+	$updatedContent = Update-DotnetPackageFileContent `
+		-Dependencies $Dependencies `
+		-ProjectFileContent $projFileContent `
+		-TeamProjectName $TeamProjectName `
+		-IsPackagesConfig $isPackagesConfig
+	
+	# Check if content has been updated.
+	if ($updatedContent -ne $null) {
+		if ($updatedContent -ne $projFileContent) {
+			Write-Host "# Dependency version has been updated. Update the $FilePath content."
+			if (![FileHandler]::SetContent($FilePath, $updatedContent)) {
+				Write-Host "# ERROR: Failed to update the $FilePath content."
+				return $false
 			}
 			
-			# This reuse the matched group so make sure we don't lose the original package name.
-			$replaceString = '${prefix}' + "$dependencyVersion" + '${suffix}'
-			$ProjectFileContent = $ProjectFileContent -replace "$matchPattern",$replaceString
+			# Stage the change
+			if (![GitHandler]::Add("$FilePath")) {
+				Write-Host "# ERROR: Failed to stage the change."
+				return $false
+			}
 		}
+	} else {
+		Write-Host "# ERROR: error occurs while updating content of package file."
+		return $false
 	}
-	return $ProjectFileContent
+	return $true
 }
 
 <#
@@ -262,29 +366,22 @@ function Update-DotnetPackageDependencies {
 	if ($dependencies -ne $null -and $dependencies.count -gt 0) {
 		# Update each .csproj file.
 		foreach ($project in $(Get-ChildItem -Filter *.csproj -Recurse)) {
-			$projFileContent = $(Get-Content $project.FullName -Raw)
-			$updatedContent = Update-DotnetPackageFileContent `
+			if (!$(Update-DotnetPackageDependenciesPerFile `
+				-FilePath $project.FullName `
 				-Dependencies $dependencies `
-				-ProjectFileContent $projFileContent `
-				-TeamProjectName $TeamProjectName
-			
-			# Check if .csproj has been updated.
-			if ($updatedContent -ne $null) {
-				if ($updatedContent -ne $projFileContent) {
-					Write-Host "# Dependency version has been updated. Update the $($project.FullName) content."
-					if (![FileHandler]::SetContent($project.FullName, $updatedContent)) {
-						Write-Host "# ERROR: Failed to update the $project.FullName content."
-						return $false
-					}
-					
-					# Stage the change
-					if (![GitHandler]::Add("$($project.FullName)")) {
-						Write-Host "# ERROR: Failed to stage the change."
-						return $false
-					}
-				}
-			} else {
-				Write-Host "# ERROR: error occurs while updating content of package file."
+				-TeamProjectName $TeamProjectName)) {
+				Write-Host "# ERROR: Failed to update package file $($project.FullName)"
+				return $false
+			}
+		}
+		
+		# Update each packages.config file.
+		foreach ($project in $(Get-ChildItem -Filter packages.config -Recurse)) {
+			if (!$(Update-DotnetPackageDependenciesPerFile `
+				-FilePath $project.FullName `
+				-Dependencies $dependencies `
+				-TeamProjectName $TeamProjectName)) {
+				Write-Host "# ERROR: Failed to update package file $($project.FullName)"
 				return $false
 			}
 		}
@@ -619,6 +716,134 @@ function Update-PythonPackageDependencies {
 	return $true
 }
 
+<#
+  .Description
+  Update dependencies of all Golang packages in a repository.
+  
+  .Parameter Dependencies
+  An array of dependencies
+  
+  .Parameter SharedVariableContent
+  Content to be updated.
+  
+  .Parameter TeamProjectName
+  Name ofthe repository team project
+  
+  .Outputs
+  Updated content. $null if error occurs
+#>
+function Update-GoPackageContent {
+	param (
+		[Parameter(Mandatory)]
+		[string[]]$Dependencies,
+		[Parameter(Mandatory)]
+		[string]$GoModContent,
+		[Parameter(Mandatory)]
+		[string]$TeamProjectName
+	)
+	foreach ($dependency in $Dependencies) {
+		$matchPattern = "(?<prefix>(require|replace)\s*((?!$dependency).)*$dependency\s*)v\d+\.\d+\.\d+((?!\s).)*"
+		if ($GoModContent -match $matchPattern) {
+			Write-Host "# go.mod content match $dependency. Update."
+			$dependencyVersion = $script:repositories."$dependency".version
+			
+			# Make sure that the version exists for the dependency. Else bail out.
+			if (!$(Test-TagExist `
+				-RepositoryName $dependency `
+				-Version $dependencyVersion `
+				-TeamProjectName $TeamProjectName)) {
+				Write-Host "# ERROR: Tag $dependencyVersion for repository $dependency does not exist."
+				return $null
+			}
+			$replaceString = '${prefix}' + "v$dependencyVersion"
+			$GoModContent = $GoModContent -replace `
+				$matchPattern, `
+				$replaceString
+		} else {
+			Write-Host "# Nothing to update for dependency $dependency"
+		}
+	}
+	return $GoModContent
+}
+
+<#
+  .Description
+  Update dependencies of all Golang packages in a repository.
+  This function updates go.mod but won't update go.sum. This
+  is not future proof, but enough for GO MVP implementation.
+  
+  .Parameter RepositoryName
+  Name of a repository
+  
+  .Parameter TeamProjectName
+  Name ofthe repository team project
+  
+  .Outputs
+  true or false
+#>
+function Update-GoPackageDependencies {
+	param (
+		[Parameter(Mandatory)]
+		[string]$RepositoryName,
+		[Parameter(Mandatory)]
+		[string]$TeamProjectName
+	)
+	
+	Write-Host ""
+	Write-Host "Update Go Package Dependencies"
+	Write-Host "================================="
+	
+	# TODO: If go.sum is ever required, this approach needs to be changed. "go mod"
+	# will be required and dependencies will need to be available publicly to use
+	# "go mod". At the point of implementation, using "go mod" requires changes to
+	# changes to release process flow and need to be carefully considered. Thus,
+	# is an overkill for MVP version of go support at this point.
+	if (Test-Path go.sum) {
+		Write-Host "# ERROR: go.sum is not currently handled. " +
+			"Updating go.sum requires dependencies to be available publicly, " +
+			"so updating go.mod is not enough."
+		return $false
+	}
+	
+	$dependencies = $script:repositories."$RepositoryName".dependencies
+	if ($dependencies -ne $null -and $dependencies.count -gt 0) {
+		# Check if shared-variables.yml exists
+		if (Test-Path go.mod) {
+			$goModContent = $(Get-Content go.mod -Raw)
+			$updatedContent = Update-GoPackageContent `
+				-Dependencies $dependencies `
+				-GoModContent $goModContent `
+				-TeamProjectName $TeamProjectName
+			
+			if ($updatedContent -ne $null) {
+				# Check if go.mod has been updated.
+				if ($updatedContent -ne $goModContent) {
+					Write-Host "# Dependency version has been updated. Update the go.mod content."
+					if (![FileHandler]::SetContent("go.mod", $updatedContent)) {
+						Write-Host "# ERROR: Failed to update the go.mod content."
+						return $false
+					}
+					
+					# Stage the change
+					if (![GitHandler]::Add("go.mod")) {
+						Write-Host "# ERROR: Failed to stage the change."
+						return $false
+					}
+				}
+			} else {
+				Write-Host "# ERROR: error occured during the update of the go.mod"
+				return $false
+			}
+		} else {
+			Write-Host "# No go.mod file is found at this directory. Nothing to update."
+		}
+	} else {
+		Write-Host "# There is no dependencies defined in configuration file. Skipped."
+	}
+	
+	return $true
+}
+
 <#
   .Description
   Update dependencies of all packages in a repository.
@@ -648,7 +873,7 @@ function Update-PackageDependencies {
 	
 	Write-Host ""
 	Write-Host "# Update package dependencies"
-	Write-Host "============================"
+	Write-Host "============================="
 	
 	# Initialise the script variables
 	Initialize-GlobalVariables -Configuration $Configuration
@@ -683,6 +908,12 @@ function Update-PackageDependencies {
 				-RepositoryName $repoName -TeamProjectName $TeamProjectName
 			Break
 		}
+		"*go" {
+			Write-Host "# $repoName is a Golang package."
+			$succeeded = Update-GoPackageDependencies `
+				-RepositoryName $repoName -TeamProjectName $TeamProjectName
+			Break
+		}
 		Default {
 			Write-Host "# $repoName is of type that do not need to update package."
 			Break

package/ci/common-ci/scripts/modules/51DReleaseModule/51DReleaseModule.Tests.ps1

@@ -26,7 +26,7 @@ Describe 'Update-CommitPushPullSub' {
 				}
 			}
 		}' | ConvertFrom-Json
-		$result = Update-CommitPushPullSub -Configuration $configuration -TeamProjectName "testproj"
+		$result = Update-CommitPushPullSub -Configuration $configuration -DepTeamProjectName "testproj" -PrTeamProjectName "testproj"
 		$result | Should -BeExactly $true
 	}
 	
@@ -42,7 +42,7 @@ Describe 'Update-CommitPushPullSub' {
 				}
 			}
 		}' | ConvertFrom-Json
-		$result = $(Update-CommitPushPullSub -Configuration $configuration -TeamProjectName "testproj")
+		$result = $(Update-CommitPushPullSub -Configuration $configuration -DepTeamProjectName "testproj" -PrTeamProjectName "testproj")
 		$result | Should -BeExactly $false
 	}
 	
@@ -60,7 +60,7 @@ Describe 'Update-CommitPushPullSub' {
 				}
 			}
 		}' | ConvertFrom-Json
-		$result = $(Update-CommitPushPullSub -Configuration $configuration -TeamProjectName "testproj")
+		$result = $(Update-CommitPushPullSub -Configuration $configuration -DepTeamProjectName "testproj" -PrTeamProjectName "testproj")
 		$result | Should -BeExactly $false
 	}
 	
@@ -80,7 +80,7 @@ Describe 'Update-CommitPushPullSub' {
 				}
 			}
 		}' | ConvertFrom-Json
-		$result = Update-CommitPushPullSub -Configuration $configuration -TeamProjectName "testproj"
+		$result = Update-CommitPushPullSub -Configuration $configuration -DepTeamProjectName "testproj" -PrTeamProjectName "testproj"
 		$result | Should -BeExactly $false
 	}
 	
@@ -102,7 +102,7 @@ Describe 'Update-CommitPushPullSub' {
 				}
 			}
 		}' | ConvertFrom-Json
-		$result = Update-CommitPushPullSub -Configuration $configuration -TeamProjectName "testproj"
+		$result = Update-CommitPushPullSub -Configuration $configuration -DepTeamProjectName "testproj" -PrTeamProjectName "testproj"
 		$result | Should -BeExactly $false
 	}
 	
@@ -128,7 +128,8 @@ Describe 'Update-CommitPushPullSub' {
 		}' | ConvertFrom-Json
 		$result = Update-CommitPushPullSub `
 			-Configuration $configuration `
-			-TeamProjectName "testproj"
+			-DepTeamProjectName "testproj" `
+			-PrTeamProjectName "testproj"
 		$result | Should -BeExactly $false
 	}
 	
@@ -156,7 +157,7 @@ Describe 'Update-CommitPushPullSub' {
 				}
 			}
 		}' | ConvertFrom-Json
-		$result = Update-CommitPushPullSub -Configuration $configuration -TeamProjectName "testproj"
+		$result = Update-CommitPushPullSub -Configuration $configuration -DepTeamProjectName "testproj" -PrTeamProjectName "testproj"
 		$result | Should -BeExactly $true
 	}
 	
@@ -186,7 +187,7 @@ Describe 'Update-CommitPushPullSub' {
 				}
 			}
 		}' | ConvertFrom-Json
-		$result = Update-CommitPushPullSub -Configuration $configuration -TeamProjectName "testproj"
+		$result = Update-CommitPushPullSub -Configuration $configuration -DepTeamProjectName "testproj" -PrTeamProjectName "testproj"
 		$result | Should -BeExactly $false
 	}
 }

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

@@ -102,7 +102,7 @@ function Get-NonLeafAction {
 				# Check if action required for a dependency.
 				if (!$script:traveledTable[$dependency]) {
 					Get-Action `
-						-PojectName $dependency `
+						-RepositoryName $dependency `
 						-TeamProjectName $TeamProjectName
 				}
 				
@@ -414,8 +414,13 @@ function Start-Release {
   .Parameter Configuration
   A configuration object from a configuration file.
   
-  .Parameter TeamProjectName
-  Name ofthe repository team project
+  .Parameter DepTeamProjectName
+  Name of the repository team project to be used for
+  dependency updates.
+  
+  .Parameter PrTeamProjectName
+  Name of the repository team project to be used for
+  creating pull request to main.
   
   .Outputs
   true or false
@@ -425,7 +430,9 @@ function Update-CommitPushPullSub {
 		[Parameter(Mandatory)]
 		[object]$Configuration,
 		[Parameter(Mandatory)]
-		[string]$TeamProjectName
+		[string]$DepTeamProjectName,
+		[Parameter(Mandatory)]
+		[string]$PrTeamProjectName
 	)
 	
 	Initialize-GlobalVariables -Configuration $Configuration
@@ -443,7 +450,7 @@ function Update-CommitPushPullSub {
 	if ($(Test-TagExist `
 		-RepositoryName $repoName `
 		-Version $targetVersion `
-		-TeamProjectName $TeamProjectName)) {
+		-TeamProjectName $PrTeamProjectName)) {
 		Write-Host "# ERROR: A tag for the target version $targetVersion already exists."
 		return $false
 	}
@@ -453,7 +460,7 @@ function Update-CommitPushPullSub {
 	Write-Host "# Checkout release branch for version $targetVersion"
 	if (!$(Get-ReleaseBranch `
 		-Version $targetVersion `
-		-TeamProjectName $TeamProjectName)) {
+		-TeamProjectName $PrTeamProjectName)) {
 		return $false
 	}
 
@@ -471,7 +478,7 @@ function Update-CommitPushPullSub {
 	Write-Host "# Updating package dependencies"
 	if (!$(Update-PackageDependencies `
 		-Configuration $Configuration `
-		-TeamProjectName $TeamProjectName)) {
+		-TeamProjectName $DepTeamProjectName)) {
 		return $false
 	}
 	
@@ -489,12 +496,12 @@ function Update-CommitPushPullSub {
 	$pullRequest = Get-PullRequestToMain `
 		-RepositoryName $repoName `
 		-ReleaseBranch "refs/heads/$targetBranch" `
-		-TeamProjectName $TeamProjectName
+		-TeamProjectName $PrTeamProjectName
 	if ($pullRequest -eq $null) {
 		if (!(New-PullRequestToMain `
 			-RepositoryName $repoName `
 			-SourceBranchRef "refs/heads/$targetBranch" `
-			-TeamProjectName $TeamProjectName)) {
+			-TeamProjectName $PrTeamProjectName)) {
 			return $false
 		}
 	} else {
@@ -512,8 +519,13 @@ function Update-CommitPushPullSub {
   .Parameter ConfigFile
   Full path to the configuration file.
   
-  .Parameter TeamProjectName
-  Name ofthe repository team project
+  .Parameter DepTeamProjectName
+  Name of the repository team project to be used for
+  dependency updates.
+  
+  .Parameter PrTeamProjectName
+  Name of the repository team project to be used for
+  creating pull request to main.
   
   .Outputs
   true or false
@@ -523,13 +535,18 @@ function Update-CommitPushPull {
 		[Parameter(Mandatory)]
 		[string]$ConfigFile,
 		[Parameter(Mandatory)]
-		[string]$TeamProjectName
+		[string]$DepTeamProjectName,
+		[Parameter(Mandatory)]
+		[string]$PrTeamProjectName
 	)
 
 	# Reinitialise the script variables.
 	$configuration = Get-Content $ConfigFile | Out-String | ConvertFrom-Json
 	
-	return Update-CommitPushPullSub -Configuration $configuration -TeamProjectName $TeamProjectName
+	return Update-CommitPushPullSub `
+		-Configuration $configuration `
+		-DepTeamProjectName $DepTeamProjectName `
+		-PrTeamProjectName $PrTeamProjectName
 }
 
 Export-ModuleMember -Function Start-Release