azure/login
1
0
Fork 0
mirror of synced 2026-06-05 17:18:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

add await to setazurestack

Browse source
This commit is contained in:
Shiying Chen 2024-06-19 16:27:55 +08:00
commit deb78bee2b
2 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

20
lib/main/index.js
View file

@ -4003,7 +4003,7 @@ class AzureCliLogin {
};
yield this.executeAzCliCommand(["version"], true, execOptions);
core.debug(`Azure CLI version used:\n${output}`);
this.setAzurestackEnvIfNecessary();
yield this.registerAzurestackEnvIfNecessary();
yield this.executeAzCliCommand(["cloud", "set", "-n", this.loginConfig.environment], false);
core.info(`Done setting cloud: "${this.loginConfig.environment}"`);
if (this.loginConfig.authType === LoginConfig_1.LoginConfig.AUTH_TYPE_SERVICE_PRINCIPAL) {
@ -4029,7 +4029,7 @@ class AzureCliLogin {
}
});
}
setAzurestackEnvIfNecessary() {
registerAzurestackEnvIfNecessary() {
return __awaiter(this, void 0, void 0, function* () {
if (this.loginConfig.environment != "azurestack") {
return;
@ -4037,14 +4037,14 @@ class AzureCliLogin {
if (!this.loginConfig.resourceManagerEndpointUrl) {
throw new Error("resourceManagerEndpointUrl is a required parameter when environment is defined.");
}
// core.info(`Unregistering cloud: "${this.loginConfig.environment}" first if it exists`);
// try {
// await this.executeAzCliCommand(["cloud", "set", "-n", "AzureCloud"], true);
// await this.executeAzCliCommand(["cloud", "unregister", "-n", this.loginConfig.environment], false);
// }
// catch (error) {
// core.info(`Ignore cloud not registered error: "${error}"`);
// }
core.info(`Unregistering cloud: "${this.loginConfig.environment}" first if it exists`);
try {
yield this.executeAzCliCommand(["cloud", "set", "-n", "AzureCloud"], true);
yield this.executeAzCliCommand(["cloud", "unregister", "-n", this.loginConfig.environment], false);
}
catch (error) {
core.info(`Ignore cloud not registered error: "${error}"`);
}
core.info(`Registering cloud: "${this.loginConfig.environment}" with ARM endpoint: "${this.loginConfig.resourceManagerEndpointUrl}"`);
try {
let baseUri = this.loginConfig.resourceManagerEndpointUrl;

20
src/Cli/AzureCliLogin.ts
View file

@ -31,7 +31,7 @@ export class AzureCliLogin {
await this.executeAzCliCommand(["version"], true, execOptions);
core.debug(`Azure CLI version used:\n${output}`);
this.setAzurestackEnvIfNecessary();
await this.registerAzurestackEnvIfNecessary();
await this.executeAzCliCommand(["cloud", "set", "-n", this.loginConfig.environment], false);
core.info(`Done setting cloud: "${this.loginConfig.environment}"`);
@ -59,7 +59,7 @@ export class AzureCliLogin {
}
}
async setAzurestackEnvIfNecessary() {
async registerAzurestackEnvIfNecessary() {
if (this.loginConfig.environment != "azurestack") {
return;
}
@ -67,14 +67,14 @@ export class AzureCliLogin {
throw new Error("resourceManagerEndpointUrl is a required parameter when environment is defined.");
}
// core.info(`Unregistering cloud: "${this.loginConfig.environment}" first if it exists`);
// try {
// await this.executeAzCliCommand(["cloud", "set", "-n", "AzureCloud"], true);
// await this.executeAzCliCommand(["cloud", "unregister", "-n", this.loginConfig.environment], false);
// }
// catch (error) {
// core.info(`Ignore cloud not registered error: "${error}"`);
// }
core.info(`Unregistering cloud: "${this.loginConfig.environment}" first if it exists`);
try {
await this.executeAzCliCommand(["cloud", "set", "-n", "AzureCloud"], true);
await this.executeAzCliCommand(["cloud", "unregister", "-n", this.loginConfig.environment], false);
}
catch (error) {
core.info(`Ignore cloud not registered error: "${error}"`);
}
core.info(`Registering cloud: "${this.loginConfig.environment}" with ARM endpoint: "${this.loginConfig.resourceManagerEndpointUrl}"`);
try {