From 40935f9fb5bfeb6c572ca3f5267c951a75c43091 Mon Sep 17 00:00:00 2001 From: Shiying Chen Date: Mon, 27 Nov 2023 17:21:50 +0800 Subject: [PATCH] Azure/login should logout the active account at the beginning (#376) * logout at the beginning * remove logout step in test case --- .github/workflows/azure-login-negative.yml | 5 ----- src/Cli/AzureCliLogin.ts | 7 +++++++ 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/azure-login-negative.yml b/.github/workflows/azure-login-negative.yml index 21bed1f0e..4f0362620 100644 --- a/.github/workflows/azure-login-negative.yml +++ b/.github/workflows/azure-login-negative.yml @@ -347,11 +347,6 @@ jobs: script: | core.setFailed('Last action should fail but not. Please check it.') - # logout first to avoid the conflict with SP1 - - name: Azure CLI logout - run: | - az logout - # SP1 is ignored and SP2 will be used for login, but it will fail since SP2 has no access to the given subscription - name: Login with both creds and individual parameters id: login_12 diff --git a/src/Cli/AzureCliLogin.ts b/src/Cli/AzureCliLogin.ts index fc67fbffc..c69bb75ec 100644 --- a/src/Cli/AzureCliLogin.ts +++ b/src/Cli/AzureCliLogin.ts @@ -34,6 +34,13 @@ export class AzureCliLogin { await this.executeAzCliCommand(["--version"], true, execOptions); core.debug(`Azure CLI version used:\n${output}`); + try { + await this.executeAzCliCommand(["logout"], true, execOptions); + } + catch (error) { + core.debug(`Ignore logout error: "${error}"`); + } + this.setAzurestackEnvIfNecessary(); await this.executeAzCliCommand(["cloud", "set", "-n", this.loginConfig.environment], false);