Merge pull request #9161 from Microsoft/users/raagra/disconnect-azure-feedback-m143

Feedback on disconnect azure

Author: Rajat Agrawal

Tasks/AzureCloudPowerShellDeploymentV1/Publish-AzureCloudDeployment.ps1

@@ -176,7 +176,6 @@ try{
         Validate-AzureCloudServiceStatus -CloudServiceName $ServiceName -Slot $Slot
     }
 } finally {
-    Disconnect-AzureAndClearContext
 	Trace-VstsLeavingInvocation $MyInvocation
 }
 

Tasks/AzureFileCopyV1/AzureFileCopy.ps1

@@ -197,7 +197,7 @@ finally
 {
     Remove-AzureContainer -containerName $containerName -storageContext $storageContext
     Remove-EndpointSecrets
-    Disconnect-AzureAndClearContext
+    Disconnect-AzureAndClearContext -authScheme $connectionType -ErrorAction SilentlyContinue
     Write-Verbose "Completed Azure File Copy Task for Azure VMs Destination" -Verbose
     Trace-VstsLeavingInvocation $MyInvocation
 }

Tasks/AzureFileCopyV2/AzureFileCopy.ps1

@@ -249,7 +249,7 @@ finally
 {
     Remove-AzureContainer -containerName $containerName -storageContext $storageContext
     Remove-EndpointSecrets
-    Disconnect-AzureAndClearContext
+    Disconnect-AzureAndClearContext -authScheme $connectionType -ErrorAction SilentlyContinue
     Write-Verbose "Completed Azure File Copy Task for Azure VMs Destination" -Verbose
     Trace-VstsLeavingInvocation $MyInvocation
 }

Tasks/AzurePowerShellV2/AzurePowerShell.ps1

@@ -140,5 +140,5 @@ finally {
         Remove-Item -LiteralPath $__vstsAzPSInlineScriptPath -ErrorAction 'SilentlyContinue'
     }
 
-    Disconnect-AzureAndClearContext
+    Disconnect-AzureAndClearContext -authScheme $authScheme -ErrorAction SilentlyContinue
 }

Tasks/AzurePowerShellV3/AzurePowerShell.ps1

@@ -158,5 +158,5 @@ finally {
 
     Import-Module $PSScriptRoot\ps_modules\VstsAzureHelpers_
     Remove-EndpointSecrets
-    Disconnect-AzureAndClearContext
+    Disconnect-AzureAndClearContext -authScheme $authScheme -ErrorAction SilentlyContinue
 }

Tasks/Common/VstsAzureHelpers_/InitializeFunctions.ps1

@@ -635,37 +635,37 @@ function Remove-EndpointSecrets {
 
 function Disconnect-AzureAndClearContext {
     [CmdletBinding()]
-    param()
+    param(
+        [string]$authScheme = 'ServicePrincipal'
+    )
 
     try {
-        Write-Verbose "Trying to disconnect from Azure and clear context"
+        if ($authScheme -eq 'ServicePrincipal') {
+            Write-Verbose "Trying to disconnect from Azure and clear context"
 
-        if (Get-Command -Name "Disconnect-AzureRmAccount" -ErrorAction "SilentlyContinue") {
-            Write-Host "##[command]Disconnect-AzureRmAccount"
-            Disconnect-AzureRmAccount
-        }
-        elseif (Get-Command -Name "Remove-AzureRmAccount" -ErrorAction "SilentlyContinue") {
-            Write-Host "##[command]Remove-AzureRmAccount"
-            Remove-AzureRmAccount
-        }
-        elseif (Get-Command -Name "Logout-AzureRmAccount" -ErrorAction "SilentlyContinue") {
-            Write-Host "##[command]Logout-AzureRmAccount"
-            Logout-AzureRmAccount
-        }
-        else {
-            $noCommandMessage = "Unable to find a command to log out of Azure"
-            Write-Host "##vso[task.logissue type=warning;]$noCommandMessage"
-        }
+            if (Get-Command -Name "Disconnect-AzureRmAccount" -ErrorAction "SilentlyContinue") {
+                Write-Host "##[command]Disconnect-AzureRmAccount"
+                $null = Disconnect-AzureRmAccount
+            }
+            elseif (Get-Command -Name "Remove-AzureRmAccount" -ErrorAction "SilentlyContinue") {
+                Write-Host "##[command]Remove-AzureRmAccount"
+                $null = Remove-AzureRmAccount
+            }
+            elseif (Get-Command -Name "Logout-AzureRmAccount" -ErrorAction "SilentlyContinue") {
+                Write-Host "##[command]Logout-AzureRmAccount"
+                $null = Logout-AzureRmAccount
+            }
 
-        if (Get-Command -Name "Clear-AzureRmContext" -ErrorAction "SilentlyContinue") {
-            Write-Host "##[command]Clear-AzureRmContext -Scope Process"
-            $null = Clear-AzureRmContext -Scope Process
-            Write-Host "##[command]Clear-AzureRmContext -Scope CurrentUser -Force -ErrorAction SilentlyContinue"
-            $null = Clear-AzureRmContext -Scope CurrentUser -Force -ErrorAction SilentlyContinue
+            if (Get-Command -Name "Clear-AzureRmContext" -ErrorAction "SilentlyContinue") {
+                Write-Host "##[command]Clear-AzureRmContext -Scope Process"
+                $null = Clear-AzureRmContext -Scope Process
+                Write-Host "##[command]Clear-AzureRmContext -Scope CurrentUser -Force -ErrorAction SilentlyContinue"
+                $null = Clear-AzureRmContext -Scope CurrentUser -Force -ErrorAction SilentlyContinue
+            }
         }
     } catch {
-        $error = $_.Exception.Message
-        Write-Verbose "Unable to disconnect and clear context: $error"
-        Write-Host "##vso[task.logissue type=warning;]$error"
+        $message = $_.Exception.Message
+        Write-Verbose "Unable to disconnect and clear context: $message"
+        Write-Host "##vso[task.logissue type=warning;]$message"
     }
 }