Fix jq version evaluation (#866)

* Update * UpdateTestCase * Update * Update
Azure · Mar 21, 2024 · c37e9fd · c37e9fd
1 parent fcc716c
commit c37e9fd
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/scripts/UpdateRequiredModules.ps1 b/scripts/UpdateRequiredModules.ps1
@@ -4,11 +4,9 @@ $existingmodule = @()
 $newmodule = @()
 $updated = $false
 $data.RequiredModules | ForEach-Object {
-    $moduleVersion = $_.RequiredVersion
-    [int]$moduleVersionInt = $moduleVersion.Replace('.',',')
-    $galleryVersion = (Find-Module -Name $_.ModuleName).Version
-    [int]$galleryVersionInt = $galleryVersion.Replace('.',',')
-    if ($moduleVersionInt -lt $galleryVersionInt) {
+    $moduleVersion = New-Object System.Version($_.RequiredVersion)
+    $galleryVersion = New-Object System.Version((Find-Module -Name $_.ModuleName).Version)
+    if ($moduleVersion -lt $galleryVersion) {
         $newmodule = @{
             "ModuleName" = $_.ModuleName
             "RequiredVersion" = $galleryVersion

diff --git a/src/internal/functions/Assert-AzOpsJqDependency.ps1 b/src/internal/functions/Assert-AzOpsJqDependency.ps1
@@ -19,13 +19,13 @@
 
     process {
         Write-AzOpsMessage -LogLevel InternalComment -LogString 'Assert-AzOpsJqDependency.Validating'
-
+        $minVersion = New-Object System.Version("1.6")
         $result = (Invoke-AzOpsNativeCommand -ScriptBlock { jq --version } -IgnoreExitcode)
         $installed = $result -as [bool]
 
         if ($installed) {
-            [double]$version = ($result).Split("-")[1]
-            if ($version -ge 1.6) {
+            $version = New-Object System.Version(($result).Split("-")[1])
+            if ($version -ge $minVersion) {
                 Write-AzOpsMessage -LogLevel InternalComment -LogString 'Assert-AzOpsJqDependency.Success'
                 return
             }

diff --git a/src/tests/functional/Microsoft.Network/connections/deploy/deploy.json b/src/tests/functional/Microsoft.Network/connections/deploy/deploy.json
@@ -40,13 +40,13 @@
             "name": "[parameters('publicIPAddressesName')]",
             "location": "northeurope",
             "sku": {
-                "name": "Basic",
+                "name": "Standard",
                 "tier": "Regional"
             },
             "properties": {
                 "ipAddress": "20.219.217.108",
                 "publicIPAddressVersion": "IPv4",
-                "publicIPAllocationMethod": "Dynamic",
+                "publicIPAllocationMethod": "Static",
                 "idleTimeoutInMinutes": 4,
                 "dnsSettings": {
                     "domainNameLabel": "[parameters('publicIPAddressesName')]",