fix invocation

Author: craigthackerx

.azuredevops/templates/steps/terraform-init-plan.yaml

@@ -273,7 +273,7 @@ steps:
           -AttemptAzureLogin                    '${{ parameters.AttemptAzureLogin }}' `
           -InstallCheckov                       '${{ parameters.InstallCheckov }}'
     name: RunAzTerraform
-    displayName: 'Run Terraform orchestration'
+    displayName: 'Run Terraform init & Terraform plan'
     env:
       ${{ if eq(parameters.UseAzureServiceConnection, 'true') }}:
         # Always required with service connection

Run-AzTerraform.ps1

@@ -381,14 +381,10 @@ finally
                     -InvocationName $MyInvocation.MyCommand.Name
     }
 
-    if ($convertedUseAzureUserLogin)
+    if ($convertedUseAzureUserLogin -and $convertedAttemptAzureLogin)
     {
         Disconnect-AzureCli -IsUserDeviceLogin $true
     }
-    else
-    {
-        Disconnect-AzureCli -IsUserDeviceLogin $false
-    }
 
     $Env:TF_LOG = $null
     Set-Location $currentWorkingDirectory