add await to setazurestack

remove unregister cloud first
fix 459
2026-03-13 18:17:09 -04:00 · 2024-06-19 16:27:55 +08:00 · 2024-06-18 17:05:25 +08:00 · 2024-06-11 16:42:01 +08:00
3 changed files with 9546 additions and 3 deletions
--- a/lib/cleanup/index.js
+++ b/lib/cleanup/index.js
--- a/lib/main/index.js
+++ b/lib/main/index.js
--- a/src/Cli/AzureCliLogin.ts
+++ b/src/Cli/AzureCliLogin.ts
@@ -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;
        }
@@ -85,7 +85,7 @@ export class AzureCliLogin {
            let suffixKeyvault = ".vault" + baseUri.substring(baseUri.indexOf('.')); // keyvault suffix starts with .
            let suffixStorage = baseUri.substring(baseUri.indexOf('.') + 1); // storage suffix starts without .
            let profileVersion = "2019-03-01-hybrid";
-            await this.executeAzCliCommand(["cloud", "register", "-n", this.loginConfig.environment, "--endpoint-resource-manager", `"${this.loginConfig.resourceManagerEndpointUrl}"`, "--suffix-keyvault-dns", `"${suffixKeyvault}"`, "--suffix-storage-endpoint", `"${suffixStorage}"`, "--profile", `"${profileVersion}"`], false);
+            await this.executeAzCliCommand(["cloud", "register", "-n", this.loginConfig.environment, "--endpoint-resource-manager", this.loginConfig.resourceManagerEndpointUrl, "--suffix-keyvault-dns", suffixKeyvault, "--suffix-storage-endpoint", suffixStorage, "--profile", profileVersion], false);
        }
        catch (error) {
            core.error(`Error while trying to register cloud "${this.loginConfig.environment}"`);
Author	SHA1	Message	Date
Shiying Chen	deb78bee2b	add await to setazurestack	2024-06-19 16:27:55 +08:00
MoChilia	0df14e308f	remove unregister cloud first	2024-06-18 17:05:25 +08:00
Shiying Chen	ca0c27b734	fix 459	2024-06-11 16:42:01 +08:00