Support Azure CLI login for AzureAD and Azure DevOps (#12516)

* Support Azure CLI login for AzureAD and Azure DevOps * Set subscription only if parameter is set * Increment task version Co-authored-by: Mike Brancato <mbrancato@humana.com> Co-authored-by: Nitin Issac Joy <nijoy@microsoft.com>
microsoft · May 20, 2020 · 763db7a · 763db7a
1 parent 16f91d2
commit 763db7a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/Tasks/AzureCLIV2/azureclitask.ts b/Tasks/AzureCLIV2/azureclitask.ts
@@ -128,7 +128,7 @@ export class azureclitask {
             let escapedCliPassword = cliPassword.replace(/"/g, '\\"');
             tl.setSecret(escapedCliPassword.replace(/\\/g, '\"'));
             //login using svn
-            Utility.throwIfError(tl.execSync("az", `login --service-principal -u "${servicePrincipalId}" -p "${escapedCliPassword}" --tenant "${tenantId}"`), tl.loc("LoginFailed"));
+            Utility.throwIfError(tl.execSync("az", `login --service-principal -u "${servicePrincipalId}" -p "${escapedCliPassword}" --tenant "${tenantId}" --allow-no-subscriptions`), tl.loc("LoginFailed"));
         }
         else if(authScheme.toLowerCase() == "managedserviceidentity") {
             //login using msi
@@ -139,8 +139,11 @@ export class azureclitask {
         }
 
         this.isLoggedIn = true;
-        //set the subscription imported to the current subscription
-        Utility.throwIfError(tl.execSync("az", "account set --subscription \"" + subscriptionID + "\""), tl.loc("ErrorInSettingUpSubscription"));
+
+        if (subscriptionID) {
+            //set the subscription imported to the current subscription
+            Utility.throwIfError(tl.execSync("az", "account set --subscription \"" + subscriptionID + "\""), tl.loc("ErrorInSettingUpSubscription"));
+        }
     }
 
     private static setConfigDirectory(): void {
@@ -183,4 +186,4 @@ if (!Utility.checkIfAzurePythonSdkIsInstalled()) {
     tl.setResult(tl.TaskResult.Failed, tl.loc("AzureSDKNotFound"));
 }
 
-azureclitask.runMain();
+azureclitask.runMain();
diff --git a/Tasks/AzureCLIV2/task.json b/Tasks/AzureCLIV2/task.json
@@ -21,7 +21,7 @@
     "version": {
         "Major": 2,
         "Minor": 0,
-        "Patch": 8
+        "Patch": 12
     },
     "minimumAgentVersion": "2.0.0",
     "instanceNameFormat": "Azure CLI $(scriptPath)",
@@ -198,4 +198,4 @@
         "GlobalCliConfigAgentVersionWarning": "For agent version < 2.115.0, only global Azure CLI configuration can be used",
         "UnacceptedScriptLocationValue": "%s is not a valid value for task input 'Script Location' (scriptLocation in YAML). Value can either be'inlineScript' or 'scriptPath'"
     }
-}
+}