Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support Azure CLI login for AzureAD and Azure DevOps #12516

Merged
merged 5 commits into from
May 19, 2020
Merged

Support Azure CLI login for AzureAD and Azure DevOps #12516

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
072f329
Support Azure CLI login for AzureAD and Azure DevOps
Mar 11, 2020
bf7f4cd
Merge branch 'master' into allow_no_subscription
mbrancato May 5, 2020
b39e626
Set subscription only if parameter is set
mbrancato May 5, 2020
51b12c8
Increment task version
mbrancato May 5, 2020
7211d5f
Merge branch 'master' into allow_no_subscription
issacnitinmsft May 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions Tasks/AzureCLIV2/azureclitask.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,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"));
mbrancato marked this conversation as resolved.
Show resolved Hide resolved
mbrancato marked this conversation as resolved.
Show resolved Hide resolved
}
else if(authScheme.toLowerCase() == "managedserviceidentity") {
//login using msi
Expand All @@ -145,8 +145,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 {
Expand Down Expand Up @@ -189,4 +192,4 @@ if (!Utility.checkIfAzurePythonSdkIsInstalled()) {
tl.setResult(tl.TaskResult.Failed, tl.loc("AzureSDKNotFound"));
}

azureclitask.runMain();
azureclitask.runMain();
4 changes: 2 additions & 2 deletions Tasks/AzureCLIV2/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"version": {
"Major": 2,
"Minor": 0,
"Patch": 11
"Patch": 12
},
"minimumAgentVersion": "2.0.0",
"instanceNameFormat": "Azure CLI $(scriptPath)",
Expand Down Expand Up @@ -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'"
}
}
}