Update PS AzureRM -> Az (#19913)

* Update PS AzureRM -> Az - Restore AzureRM for AzureCloudPowerShellDeployment - Changed logic to install Az. modules - Do not remove AzureRM modules * Update PS AzureRM -> Az - Restore AzureRM for AzureCloudPowerShellDeployment - Changed logic to install Az. modules - Do not remove AzureRM modules * Bump versions
microsoft · May 31, 2024 · 78b51e7 · 78b51e7
1 parent 2410102
commit 78b51e7
Show file tree

Hide file tree

Showing 64 changed files with 282 additions and 297 deletions.
diff --git a/Tasks/AzureCloudPowerShellDeploymentV1/Publish-AzureCloudDeployment.ps1 b/Tasks/AzureCloudPowerShellDeploymentV1/Publish-AzureCloudDeployment.ps1
@@ -1,6 +1,4 @@
-$featureFlags = @{
-    retireAzureRM  = [System.Convert]::ToBoolean($env:RETIRE_AZURERM_POWERSHELL_MODULE)
-}
+$env:RETIRE_AZURERM_POWERSHELL_MODULE = $false
 
 Trace-VstsEnteringInvocation $MyInvocation
 Import-VstsLocStrings "$PSScriptRoot\Task.json"
@@ -36,11 +34,7 @@ try{
     if ($EnableAdvancedStorageOptions)
     {
         $endpoint = Get-VstsEndpoint -Name $ARMConnectedServiceName -Require
-        if ($featureFlags.retireAzureRM) {
-            Initialize-AzModule -Endpoint $endpoint
-        } else {
-            Initialize-AzureRMModule -Endpoint $endpoint
-        }
+        Initialize-AzureRMModule -Endpoint $endpoint
     }
 
     # Load all dependent files for execution

diff --git a/Tasks/AzureCloudPowerShellDeploymentV1/Utility.ps1 b/Tasks/AzureCloudPowerShellDeploymentV1/Utility.ps1
@@ -1,8 +1,4 @@
-$featureFlags = @{
-    retireAzureRM  = [System.Convert]::ToBoolean($env:RETIRE_AZURERM_POWERSHELL_MODULE)
-}
-
-function Get-SingleFile($files, $pattern)
+function Get-SingleFile($files, $pattern)
 {
     if ($files -is [system.array])
     {
@@ -61,28 +57,14 @@ function Get-AzureStoragePrimaryKey($storageAccount, [bool]$isArm)
 {
     if ($isArm)
     {
-        if ($featureFlags.retireAzureRM)
-        {
-            $storageAccountResource = Get-AzResource | where-object { $_.Name -eq $storageAccount -and $_.ResourceType -eq "Microsoft.Storage/storageAccounts" }
-        }
-        else
-        {
-            $storageAccountResource = Get-AzureRmResource | where-object { $_.Name -eq $storageAccount -and $_.ResourceType -eq "Microsoft.Storage/storageAccounts" }
-        }
+        $storageAccountResource = Get-AzureRmResource | where-object { $_.Name -eq $storageAccount -and $_.ResourceType -eq "Microsoft.Storage/storageAccounts" }
 
         if (!$storageAccountResource)
         {
             Write-Error -Message "Could not find resource $storageAccount that has a type of Microsoft.Storage/storageAccounts"
         }
 
-        if ($featureFlags.retireAzureRM)
-        {
-            $storageAccountKeys = Get-AzStorageAccountKey -ResourceGroupName $storageAccountResource.ResourceGroupName -Name $storageAccount
-        }
-        else
-        {
-            $storageAccountKeys = Get-AzureRmStorageAccountKey -ResourceGroupName $storageAccountResource.ResourceGroupName -Name $storageAccount
-        }
+        $storageAccountKeys = Get-AzureRmStorageAccountKey -ResourceGroupName $storageAccountResource.ResourceGroupName -Name $storageAccount
 
         if(!$storageAccountKeys)
         {
@@ -206,14 +188,7 @@ function Get-DiagnosticsExtensions($storageAccount, $extensionsPath, $storageAcc
                     {
                         try
                         {
-                            if ($featureFlags.retireAzureRM)
-                            {
-                                $storageContext = New-AzStorageContext -StorageAccountName $storageAccountName -StorageAccountKey $storageAccountKey
-                            }
-                            else
-                            {
-                                $storageContext = New-AzureStorageContext -StorageAccountName $storageAccountName -StorageAccountKey $storageAccountKey
-                            }
+                            $storageContext = New-AzureStorageContext -StorageAccountName $storageAccountName -StorageAccountKey $storageAccountKey
                             Write-Host "New-AzureServiceDiagnosticsExtensionConfig -Role $role -StorageContext $StorageContext -DiagnosticsConfigurationPath $fullExtPath"
                             $wadconfig = New-AzureServiceDiagnosticsExtensionConfig -Role $role -StorageContext $StorageContext -DiagnosticsConfigurationPath $fullExtPath 
                         }

diff --git a/Tasks/AzureCloudPowerShellDeploymentV1/task.json b/Tasks/AzureCloudPowerShellDeploymentV1/task.json
@@ -16,8 +16,8 @@
     "author": "Microsoft Corporation",
     "version": {
         "Major": 1,
-        "Minor": 240,
-        "Patch": 4
+        "Minor": 241,
+        "Patch": 0
     },
     "demands": [
         "azureps"

diff --git a/Tasks/AzureCloudPowerShellDeploymentV1/task.loc.json b/Tasks/AzureCloudPowerShellDeploymentV1/task.loc.json
@@ -16,8 +16,8 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 1,
-    "Minor": 240,
-    "Patch": 4
+    "Minor": 241,
+    "Patch": 0
   },
   "demands": [
     "azureps"

diff --git a/Tasks/AzureCloudPowerShellDeploymentV2/task.json b/Tasks/AzureCloudPowerShellDeploymentV2/task.json
@@ -16,8 +16,8 @@
     "author": "Microsoft Corporation",
     "version": {
         "Major": 2,
-        "Minor": 240,
-        "Patch": 4
+        "Minor": 241,
+        "Patch": 0
     },
     "demands": [
         "azureps"

diff --git a/Tasks/AzureCloudPowerShellDeploymentV2/task.loc.json b/Tasks/AzureCloudPowerShellDeploymentV2/task.loc.json
@@ -16,8 +16,8 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 2,
-    "Minor": 240,
-    "Patch": 4
+    "Minor": 241,
+    "Patch": 0
   },
   "demands": [
     "azureps"

diff --git a/Tasks/AzureFileCopyV1/task.json b/Tasks/AzureFileCopyV1/task.json
@@ -13,8 +13,8 @@
     "author": "Microsoft Corporation",
     "version": {
         "Major": 1,
-        "Minor": 240,
-        "Patch": 6
+        "Minor": 241,
+        "Patch": 0
     },
     "demands": [
         "azureps"

diff --git a/Tasks/AzureFileCopyV1/task.loc.json b/Tasks/AzureFileCopyV1/task.loc.json
@@ -13,8 +13,8 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 1,
-    "Minor": 240,
-    "Patch": 6
+    "Minor": 241,
+    "Patch": 0
   },
   "demands": [
     "azureps"

diff --git a/Tasks/AzureFileCopyV2/task.json b/Tasks/AzureFileCopyV2/task.json
@@ -13,8 +13,8 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 2,
-    "Minor": 240,
-    "Patch": 8
+    "Minor": 241,
+    "Patch": 0
   },
   "demands": [
     "azureps"

diff --git a/Tasks/AzureFileCopyV2/task.loc.json b/Tasks/AzureFileCopyV2/task.loc.json
@@ -13,8 +13,8 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 2,
-    "Minor": 240,
-    "Patch": 8
+    "Minor": 241,
+    "Patch": 0
   },
   "demands": [
     "azureps"

diff --git a/Tasks/AzureFileCopyV3/task.json b/Tasks/AzureFileCopyV3/task.json
@@ -13,8 +13,8 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 3,
-    "Minor": 240,
-    "Patch": 8
+    "Minor": 241,
+    "Patch": 0
   },
   "demands": [
     "azureps"
@@ -312,4 +312,4 @@
     "AFC_UninstallWinRMCustomScriptExtension": "Uninstall WinRM custom script manually and retry deployment.",
     "ExpiredServicePrincipal": "Could not fetch access token for Azure. Verify if the Service Principal used is valid and not expired."
   }
-}
+}
diff --git a/Tasks/AzureFileCopyV3/task.loc.json b/Tasks/AzureFileCopyV3/task.loc.json
@@ -13,8 +13,8 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 3,
-    "Minor": 240,
-    "Patch": 8
+    "Minor": 241,
+    "Patch": 0
   },
   "demands": [
     "azureps"

diff --git a/Tasks/AzureFileCopyV4/task.json b/Tasks/AzureFileCopyV4/task.json
@@ -13,8 +13,8 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 4,
-    "Minor": 240,
-    "Patch": 8
+    "Minor": 241,
+    "Patch": 0
   },
   "demands": [
     "azureps"
@@ -300,4 +300,4 @@
     "UnsupportedAuthScheme": "Unsupported authentication scheme '{0}' for endpoint.",
     "ServicePrincipalError": "There was an error with the service principal used for the deployment."
   }
-}
+}
diff --git a/Tasks/AzureFileCopyV4/task.loc.json b/Tasks/AzureFileCopyV4/task.loc.json
@@ -13,8 +13,8 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 4,
-    "Minor": 240,
-    "Patch": 8
+    "Minor": 241,
+    "Patch": 0
   },
   "demands": [
     "azureps"

diff --git a/Tasks/AzureFileCopyV5/task.json b/Tasks/AzureFileCopyV5/task.json
@@ -13,8 +13,8 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 5,
-    "Minor": 240,
-    "Patch": 8
+    "Minor": 241,
+    "Patch": 0
   },
   "demands": [
     "azureps"
@@ -300,4 +300,4 @@
     "ServicePrincipalError": "There was an error with the service principal used for the deployment.",
     "AzModuleNotFound": "Could not find the modules: 'Az.Accounts'. If the module was recently installed, retry after restarting the Azure Pipelines task agent."
   }
-}
+}
diff --git a/Tasks/AzureFileCopyV5/task.loc.json b/Tasks/AzureFileCopyV5/task.loc.json
@@ -13,8 +13,8 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 5,
-    "Minor": 240,
-    "Patch": 8
+    "Minor": 241,
+    "Patch": 0
   },
   "demands": [
     "azureps"

diff --git a/Tasks/AzureFileCopyV6/task.json b/Tasks/AzureFileCopyV6/task.json
@@ -13,8 +13,8 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 6,
-    "Minor": 240,
-    "Patch": 10
+    "Minor": 241,
+    "Patch": 0
   },
   "demands": [
     "azureps"
@@ -287,4 +287,4 @@
     "ServicePrincipalError": "There was an error with the service principal used for the deployment.",
     "AzModuleNotFound": "Could not find the modules: 'Az.Accounts'. If the module was recently installed, retry after restarting the Azure Pipelines task agent."
   }
-}
+}
diff --git a/Tasks/AzureFileCopyV6/task.loc.json b/Tasks/AzureFileCopyV6/task.loc.json
@@ -13,8 +13,8 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 6,
-    "Minor": 240,
-    "Patch": 10
+    "Minor": 241,
+    "Patch": 0
   },
   "demands": [
     "azureps"

diff --git a/Tasks/AzurePowerShellV2/task.json b/Tasks/AzurePowerShellV2/task.json
@@ -17,8 +17,8 @@
     "author": "Microsoft Corporation",
     "version": {
         "Major": 2,
-        "Minor": 240,
-        "Patch": 4
+        "Minor": 241,
+        "Patch": 0
     },
     "demands": [
         "azureps"

diff --git a/Tasks/AzurePowerShellV2/task.loc.json b/Tasks/AzurePowerShellV2/task.loc.json
@@ -17,8 +17,8 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 2,
-    "Minor": 240,
-    "Patch": 4
+    "Minor": 241,
+    "Patch": 0
   },
   "demands": [
     "azureps"

diff --git a/Tasks/AzurePowerShellV3/task.json b/Tasks/AzurePowerShellV3/task.json
@@ -17,8 +17,8 @@
     "author": "Microsoft Corporation",
     "version": {
         "Major": 3,
-        "Minor": 240,
-        "Patch": 4
+        "Minor": 241,
+        "Patch": 0
     },
     "releaseNotes": "Added support for Fail on standard error and ErrorActionPreference",
     "demands": [

diff --git a/Tasks/AzurePowerShellV3/task.loc.json b/Tasks/AzurePowerShellV3/task.loc.json
@@ -17,8 +17,8 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 3,
-    "Minor": 240,
-    "Patch": 4
+    "Minor": 241,
+    "Patch": 0
   },
   "releaseNotes": "ms-resource:loc.releaseNotes",
   "demands": [

diff --git a/Tasks/AzurePowerShellV4/task.json b/Tasks/AzurePowerShellV4/task.json
@@ -17,8 +17,8 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 4,
-    "Minor": 240,
-    "Patch": 6
+    "Minor": 241,
+    "Patch": 0
   },
   "releaseNotes": "Added support for Az Module and cross platform agents.",
   "groups": [
@@ -210,4 +210,4 @@
     "JS_Stderr": "PowerShell wrote one or more lines to the standard error stream.",
     "ExpiredServicePrincipal": "Could not fetch access token for Azure. Verify if the Service Principal used is valid and not expired."
   }
-}
+}
diff --git a/Tasks/AzurePowerShellV4/task.loc.json b/Tasks/AzurePowerShellV4/task.loc.json
@@ -17,8 +17,8 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 4,
-    "Minor": 240,
-    "Patch": 6
+    "Minor": 241,
+    "Patch": 0
   },
   "releaseNotes": "ms-resource:loc.releaseNotes",
   "groups": [

diff --git a/Tasks/AzurePowerShellV5/task.json b/Tasks/AzurePowerShellV5/task.json
@@ -17,8 +17,8 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 5,
-    "Minor": 240,
-    "Patch": 6
+    "Minor": 241,
+    "Patch": 0
   },
   "releaseNotes": "Added support for Az Module and cross platform agents.",
   "groups": [
@@ -203,4 +203,4 @@
     "ExpiredServicePrincipal": "Could not fetch access token for Azure. Verify if the Service Principal used is valid and not expired.",
     "PS_ExitCode": "PowerShell exited with code '{0}'."
   }
-}
+}
diff --git a/Tasks/AzurePowerShellV5/task.loc.json b/Tasks/AzurePowerShellV5/task.loc.json
@@ -17,8 +17,8 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 5,
-    "Minor": 240,
-    "Patch": 6
+    "Minor": 241,
+    "Patch": 0
   },
   "releaseNotes": "ms-resource:loc.releaseNotes",
   "groups": [