Removing Azure and AzureRM 2.1.0 from hosted agent (#10787)

* Removing Azure and AzureRM 2.1.0 from hosted agent * adding PreJobExecutionAzurePowerShell.ps1 * Resolving ccheck * Resolving check * resolving check * resolving check * resolving check * resolving check * resolving test check * resolving check * checking * resolving check: * Increasing patch version * updating patch * Resolving comments * resolving check * resolving comments * resolving test check * resolving comments * correcting path * removing unnecessary space * changing minor and patch versions
microsoft · Aug 5, 2019 · 245f88d · 245f88d
1 parent 497023d
commit 245f88d
Show file tree

Hide file tree

Showing 13 changed files with 61 additions and 4 deletions.
diff --git a/Tasks/AzurePowerShellV4/AzurePowerShell.ps1 b/Tasks/AzurePowerShellV4/AzurePowerShell.ps1
@@ -48,6 +48,7 @@ if ($targetAzurePs -eq $latestVersion) {
 
 $serviceName = Get-VstsInput -Name ConnectedServiceNameARM -Require
 $endpoint = Get-VstsEndpoint -Name $serviceName -Require
+$env:PSModulePath = Get-VstsTaskVariable -Name "AZ_PS_MODULE_PATH"
 
 Update-PSModulePathForHostedAgent -targetAzurePs $targetAzurePs
 

diff --git a/Tasks/AzurePowerShellV4/PreJobExecutionAzurePowerShell.ps1 b/Tasks/AzurePowerShellV4/PreJobExecutionAzurePowerShell.ps1
@@ -0,0 +1,21 @@
+$azureRMModulePath = "C:\Modules\azurerm_2.1.0"
+$azureModulePath = "C:\Modules\azure_2.1.0"
+$azPSModulePath = $env:PSModulePath
+
+if ($azPSModulePath.split(";") -contains $azureRMModulePath) {
+    $azPSModulePath = (($azPSModulePath).Split(";") | ? { $_ -ne $azureRMModulePath }) -join ";"
+    write-verbose "$azureRMModulePath removed. Restart the prompt for the changes to take effect."
+}
+else {
+    write-verbose "$azureRMModulePath is not present in $azPSModulePath"
+}
+
+if ($azPSModulePath.split(";") -contains $azureModulePath) {
+    $azPSModulePath = (($azPSModulePath).Split(";") | ? { $_ -ne $azureModulePath }) -join ";"
+    write-verbose "$azureModulePath removed. Restart the prompt for the changes to take effect."
+}
+else {
+    write-verbose "$azureModulePath is not present in $azPSModulePath"
+}
+
+Set-VstsTaskVariable -Name 'AZ_PS_MODULE_PATH' -Value $azPSModulePath
diff --git a/Tasks/AzurePowerShellV4/Tests/DoesNotFailOnStandardError.ps1 b/Tasks/AzurePowerShellV4/Tests/DoesNotFailOnStandardError.ps1
@@ -14,6 +14,8 @@ Register-Mock Initialize-AzModule
 Register-Mock Remove-EndpointSecrets
 Register-Mock Disconnect-AzureAndClearContext
 Register-Mock Get-VstsEndpoint
+Register-Mock Get-VstsTaskVariable
+Register-Mock Set-VstsTaskVariable
 
 # Act.
 $actual = @( & $PSScriptRoot\..\AzurePowerShell.ps1 )

diff --git a/Tasks/AzurePowerShellV4/Tests/DoesNotThrowForNativeCommandError.ps1 b/Tasks/AzurePowerShellV4/Tests/DoesNotThrowForNativeCommandError.ps1
@@ -14,6 +14,8 @@ Register-Mock Initialize-AzModule
 Register-Mock Remove-EndpointSecrets
 Register-Mock Disconnect-AzureAndClearContext
 Register-Mock Get-VstsEndpoint
+Register-Mock Get-VstsTaskVariable
+Register-Mock Set-VstsTaskVariable
 
 # Act.
 $actual = @( & $PSScriptRoot\..\AzurePowerShell.ps1 )

diff --git a/Tasks/AzurePowerShellV4/Tests/DoesNotUnravelOutput.ps1 b/Tasks/AzurePowerShellV4/Tests/DoesNotUnravelOutput.ps1
@@ -14,6 +14,8 @@ Register-Mock Initialize-AzModule
 Register-Mock Remove-EndpointSecrets
 Register-Mock Disconnect-AzureAndClearContext
 Register-Mock Get-VstsEndpoint
+Register-Mock Get-VstsTaskVariable
+Register-Mock Set-VstsTaskVariable
 
 # Act.
 $actual = @( & $PSScriptRoot\..\AzurePowerShell.ps1 )

diff --git a/Tasks/AzurePowerShellV4/Tests/FailsForNativeCommandError.ps1 b/Tasks/AzurePowerShellV4/Tests/FailsForNativeCommandError.ps1
@@ -14,6 +14,8 @@ Register-Mock Initialize-AzModule
 Register-Mock Remove-EndpointSecrets
 Register-Mock Disconnect-AzureAndClearContext
 Register-Mock Get-VstsEndpoint
+Register-Mock Get-VstsTaskVariable
+Register-Mock Set-VstsTaskVariable
 
 # Act.
 $actual = @( & $PSScriptRoot\..\AzurePowerShell.ps1 )

diff --git a/Tasks/AzurePowerShellV4/Tests/PerformsBasicFlow.ps1 b/Tasks/AzurePowerShellV4/Tests/PerformsBasicFlow.ps1
@@ -16,6 +16,8 @@ Register-Mock Initialize-AzModule
 Register-Mock Get-VstsEndpoint { @{auth = @{ scheme = "ServicePrincipal" }} }
 Register-Mock Remove-EndpointSecrets
 Register-Mock Disconnect-AzureAndClearContext
+Register-Mock Get-VstsTaskVariable
+Register-Mock Set-VstsTaskVariable
 
 # Act.
 $actual = & $PSScriptRoot\..\AzurePowerShell.ps1

diff --git a/Tasks/AzurePowerShellV4/Tests/RedirectsErrors.ps1 b/Tasks/AzurePowerShellV4/Tests/RedirectsErrors.ps1
@@ -14,6 +14,8 @@ Register-Mock Initialize-AzModule
 Register-Mock Remove-EndpointSecrets
 Register-Mock Disconnect-AzureAndClearContext
 Register-Mock Get-VstsEndpoint
+Register-Mock Get-VstsTaskVariable
+Register-Mock Set-VstsTaskVariable
 
 # Act.
 $actual = @( & $PSScriptRoot\..\AzurePowerShell.ps1 )

diff --git a/Tasks/AzurePowerShellV4/Tests/RemovesFunctionsAndVariables.ps1 b/Tasks/AzurePowerShellV4/Tests/RemovesFunctionsAndVariables.ps1
@@ -15,6 +15,8 @@ Register-Mock Update-PSModulePathForHostedAgent
 Register-Mock Remove-EndpointSecrets
 Register-Mock Disconnect-AzureAndClearContext
 Register-Mock Get-VstsEndpoint
+Register-Mock Get-VstsTaskVariable
+Register-Mock Set-VstsTaskVariable
 
 # Arrange the mock task SDK module.
 New-Module -Name VstsTaskSdk -ScriptBlock {

diff --git a/Tasks/AzurePowerShellV4/Tests/ThrowsForInvalidVersion.ps1 b/Tasks/AzurePowerShellV4/Tests/ThrowsForInvalidVersion.ps1
@@ -8,6 +8,9 @@ Register-Mock Get-VstsInput { "FilePath" } -- -Name ScriptType -Require
 Register-Mock Get-VstsInput { "foobar.ps1" } -- -Name ScriptPath
 Register-Mock Get-VstsInput { "OtherVersion" } -- -Name TargetAzurePs
 Register-Mock Get-VstsInput { "x.y.z" } -- -Name CustomTargetAzurePs
+Register-Mock Get-VstsTaskVariable
+Register-Mock Set-VstsTaskVariable
+Register-Mock Get-VstsEndpoint
 
 # Act/Assert.
 Assert-Throws {

diff --git a/Tasks/AzurePowerShellV4/Tests/ValidateInlineScriptFlow.ps1 b/Tasks/AzurePowerShellV4/Tests/ValidateInlineScriptFlow.ps1
@@ -18,6 +18,8 @@ Register-Mock Initialize-AzModule
 Register-Mock Remove-EndpointSecrets
 Register-Mock Disconnect-AzureAndClearContext
 Register-Mock Get-VstsEndpoint
+Register-Mock Get-VstsTaskVariable
+Register-Mock Set-VstsTaskVariable
 
 # Act.
 $actual = @( & $PSScriptRoot\..\AzurePowerShell.ps1 )

diff --git a/Tasks/AzurePowerShellV4/task.json b/Tasks/AzurePowerShellV4/task.json
@@ -16,8 +16,8 @@
     "author": "Microsoft Corporation",
     "version": {
         "Major": 4,
-        "Minor": 154,
-        "Patch": 5
+        "Minor": 156,
+        "Patch": 0
     },
     "preview": true,
     "releaseNotes": "Added support for Az Module and cross platform agents.",
@@ -143,6 +143,14 @@
         }
     ],
     "instanceNameFormat": "Azure PowerShell script: $(ScriptType)",
+    "prejobexecution": {
+        "PowerShell3": {
+            "target": "PreJobExecutionAzurePowerShell.ps1",
+            "platforms": [
+                "windows"
+            ]
+        }
+    },
     "execution": {
         "PowerShell3": {
             "target": "azurepowershell.ps1",

diff --git a/Tasks/AzurePowerShellV4/task.loc.json b/Tasks/AzurePowerShellV4/task.loc.json
@@ -16,8 +16,8 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 4,
-    "Minor": 154,
-    "Patch": 5
+    "Minor": 156,
+    "Patch": 0
   },
   "preview": true,
   "releaseNotes": "ms-resource:loc.releaseNotes",
@@ -143,6 +143,14 @@
     }
   ],
   "instanceNameFormat": "ms-resource:loc.instanceNameFormat",
+  "prejobexecution": {
+    "PowerShell3": {
+      "target": "PreJobExecutionAzurePowerShell.ps1",
+      "platforms": [
+        "windows"
+      ]
+    }
+  },
   "execution": {
     "PowerShell3": {
       "target": "azurepowershell.ps1",