@codiac.io/codiac-cli 1.3.121 → 1.3.123

package/dist/commands/csp/login.js

@@ -1,157 +1,197 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.CLIENT_CREDENTIALS = void 0;
 const tslib_1 = require("tslib");
 const _ = require("lodash");
 const core_1 = require("@oclif/core");
-const ops_1 = require("../../ops");
 const contracts_1 = require("../../apis/codiac-relay/contracts");
-const command_base_enterprise_1 = require("../../command-base-enterprise");
-const cloud_provider_contextualizer_1 = require("../../uilogic/cloud-provider-contextualizer");
-const read_stdin_1 = require("../../read-stdin");
 const type_safety_utils_1 = require("../../uilogic/type-safety-utils");
-class CspLogin extends command_base_enterprise_1.CommandBaseEnterprise {
-    get uiCloudProvider() {
-        if (this.__uiCloudProvider_backing === undefined) {
-            this.__uiCloudProvider_backing = this.ioc.get(cloud_provider_contextualizer_1.CloudProviderContextualizer);
-        }
-        return this.__uiCloudProvider_backing;
+const command_base_exec_tenant_1 = require("../../command-base-exec-tenant");
+const config_ui_utils_1 = require("../../uilogic/config-ui-utils");
+/** wtf: This because we cant use `CredentialType.client_credentials`.
+ *
+ * Using the enum `CredentialType.client_credentials` fails with:
+ *
+ * *"Cannot read properties of undefined (reading 'client_credentials')"*
+ */
+exports.CLIENT_CREDENTIALS = "client_credentials";
+class CspLogin extends command_base_exec_tenant_1.CommandBaseExecTenant {
+    // static readonly USERNAME_PLACEHOLDER = "<CspTenantClientId>";
+    // protected bootstrap(): void {
+    //   super.bootstrap();
+    //   CloudProviderContextualizer.bootstrap(this.ioc);
+    // }
+    captureArgs() {
+        var _a, _b, _c;
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const { args, flags } = yield this.parse(CspLogin);
+            let partial = {};
+            if (args.provider) {
+                partial.providerCode = type_safety_utils_1.TypeSafetyUtils.toEnum(contracts_1.CloudProviderEnum, args.provider);
+                if (partial.providerCode == undefined)
+                    throw new Error("Unrecognized cloud provider.");
+            }
+            // TODO: We should build this with better decoupled principles 
+            // (eg: delegate to a ui provider instead of if-aws), 
+            // but not worth it until there's more than just this one single outlier.
+            if (partial.providerCode == contracts_1.CloudProviderEnum.aws && flags['aws-session-token']) {
+                partial.proprietaryInput = { sessionToken: flags['aws-session-token'] };
+            }
+            if (flags.subscriptionId)
+                partial.providerSubscription = flags.subscriptionId.trim();
+            if (flags.tenantId)
+                partial.providerTenant = flags.tenantId.trim();
+            if (flags.user) {
+                partial.username = flags.user;
+            }
+            if (flags.clientSecret) {
+                partial.credsType = exports.CLIENT_CREDENTIALS;
+                // partial.username = partial.username ?? CspLogin.USERNAME_PLACEHOLDER; // <-- this is not a magic string, just a placeholder.
+                if (flags.silent == true) {
+                    // silent mode, with piped input
+                    partial.secret = (_a = this.pipedInput) === null || _a === void 0 ? void 0 : _a.trim(); // (await readStdin())?.trim();
+                    this.logger.debug("Secret captured from stdin stream in command [csp login].");
+                    if (_.isEmpty(partial.secret)) {
+                        throw new Error("Missing client secret.  In silent mode, clientSecret must be passed in via stdin (ie: piped input).");
+                    }
+                }
+            }
+            // ---------------------------------------------------------------
+            // TODO: move everything from here down into the base class
+            // ---------------------------------------------------------------
+            const interactionMode = (this.pipedInput) ? config_ui_utils_1.InteractionModes.silent : (_c = (_b = undefined !== null && undefined !== void 0 ? undefined : (flags.echo ? config_ui_utils_1.InteractionModes.echo : undefined)) !== null && _b !== void 0 ? _b : (flags["to-script"] ? config_ui_utils_1.InteractionModes.toscript : undefined)) !== null && _c !== void 0 ? _c : (flags.silent ? config_ui_utils_1.InteractionModes.silent : undefined);
+            const takeDefaults = flags['take-defaults'];
+            return [partial, interactionMode, takeDefaults];
+        });
     }
-    bootstrap() {
-        super.bootstrap();
-        cloud_provider_contextualizer_1.CloudProviderContextualizer.bootstrap(this.ioc);
+    buildCandidate_silently(partial, rootMap) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            if (partial.providerCode == undefined) {
+                throw new Error(`You must specify a cloud provider.`);
+            }
+            if (_.isEmpty(partial.secret)) {
+                throw new Error(`No clientSecret/password provided (clientSecret/password can be provided interatively or via the stdin process stream).`);
+            }
+            const cspTenant = yield this.cspContextualizer.ensureCspTenantContext(this._codiacApi, partial.providerCode, partial.providerSubscription, partial.providerTenant, true);
+            partial.providerSubscription = cspTenant.subscriptionId;
+            partial.providerTenant = cspTenant.tenantId;
+            let candidate;
+            if (partial.proprietaryInput) {
+                candidate = this.cspContextualizer.assembleLoginRequest(this.ioc, partial.providerCode, partial.username, partial.secret, cspTenant.subscriptionId, partial.proprietaryInput);
+            }
+            else {
+                candidate = {
+                    providerCode: partial.providerCode,
+                    username: partial.username,
+                    secret: partial.secret,
+                    providerSubscription: partial.providerSubscription,
+                };
+                if (partial.credsType)
+                    candidate.credsType = partial.credsType;
+                if (partial.providerTenant)
+                    candidate.providerTenant = partial.providerTenant;
+            }
+            return candidate;
+        });
     }
-    run() {
+    buildCandidate_interactively(partial, takeDefaults, rootMap) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            return new Promise((resolve, reject) => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                var _a;
+            // Select the CSP
+            if (partial.providerCode == undefined) {
+                // Select interactively
+                let allPvds = Object.values(contracts_1.CloudProviderEnum); //this.cspUiFactory.getAllClusterProviders(this.ioc);  // TODO: this call is currently limited to cluster providers - we need the comprehensive list of CSPs in use.
+                _.remove(allPvds, x => x == contracts_1.CloudProviderEnum.other);
+                _.remove(allPvds, x => x == contracts_1.CloudProviderEnum.localMachine);
+                partial.providerCode = yield this.cspContextualizer.promptForCloudProvider(allPvds, undefined);
+            }
+            // prompt for password/secret if needed
+            if (partial.credsType == exports.CLIENT_CREDENTIALS) {
+                // Client Credentials auth flow (aka: service principal creds)
+                while (partial.secret == undefined || _.isEmpty(partial.secret)) {
+                    partial.secret = yield this._ui.promptPassword("clientSecret", "Client Secret: ");
+                    if (_.isEmpty(partial.secret)) {
+                        this._ui.userMessage(`No client secret provided (client secret can be provided interactively or via the stdin process stream).`);
+                    }
+                }
+            }
+            // Csp Tenant
+            const cspTenant = yield this.cspContextualizer.ensureCspTenantContext(this._codiacApi, partial.providerCode, partial.providerSubscription, partial.providerTenant, false);
+            partial.providerSubscription = cspTenant.subscriptionId;
+            partial.providerTenant = cspTenant.tenantId;
+            // ULTIMATE CANDIDATE
+            let candidate = {
+                providerCode: partial.providerCode,
+                credsType: partial.credsType,
+                username: partial.username,
+                secret: partial.secret,
+                providerSubscription: partial.providerSubscription,
+                providerTenant: partial.providerTenant
+            };
+            return candidate;
+        });
+    }
+    buildCommandString(candidate, cmd) {
+        cmd.push(candidate.providerCode);
+        cmd.push("--silent");
+        if (candidate.username)
+            cmd.push(...["--user", candidate.username]);
+        if (candidate.credsType == exports.CLIENT_CREDENTIALS)
+            cmd.push("--clientSecret");
+        if (candidate.providerSubscription)
+            cmd.push(...["--subscriptionId", candidate.providerSubscription]);
+        if (candidate.providerTenant)
+            cmd.push(...["--tenantId", candidate.providerTenant]);
+        if (candidate.proprietaryInput) {
+            // Aws
+            if (candidate.proprietaryInput.sessionToken) {
+                cmd.push(...["--aws-session-token", candidate.proprietaryInput.sessionToken]);
+            }
+        }
+        // This command must run in silent mode, 
+        // and even if they provided a password inline, 
+        // we should only recommend piping the secret in.
+        cmd.unshift("echo", "$MY_SECRET", "|");
+        return cmd;
+    }
+    executeTask(candidate) {
+        var _a, _b, _c, _d;
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            if (candidate.credsType == exports.CLIENT_CREDENTIALS) {
+                // ------------------------------------------------------------
+                // Client Credentials auth flow (aka: service principal creds)
+                // ------------------------------------------------------------
                 try {
-                    this.bootstrap();
-                    const { args, flags } = yield this.parse(CspLogin);
-                    (_a = this._relayContainer) === null || _a === void 0 ? void 0 : _a.ready$.subscribe(() => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                        var _b, _c, _d;
-                        try {
-                            if (flags.silent === true)
-                                this.__ui = new ops_1.ThrowingUserInputProvider(this.logger);
-                            this._userCntx = yield this.establishTenantContext(this._userCntx);
-                            // Select the CSP
-                            let provider;
-                            if (args.provider) {
-                                provider = type_safety_utils_1.TypeSafetyUtils.toEnum(contracts_1.CloudProviderEnum, args.provider);
-                                if (provider == undefined)
-                                    throw new Error("Unrecognized cloud provider.");
-                            }
-                            else if (flags.silent === true) {
-                                throw new Error(`You must specify a cloud provider.`);
-                            }
-                            else {
-                                // Select interactively
-                                let allPvds = Object.values(contracts_1.CloudProviderEnum); //this.cspUiFactory.getAllClusterProviders(this.ioc);  // TODO: this call is currently limited to cluster providers - we need the comprehensive list of CSPs in use.
-                                _.remove(allPvds, x => x == contracts_1.CloudProviderEnum.other);
-                                _.remove(allPvds, x => x == contracts_1.CloudProviderEnum.localMachine);
-                                provider = yield this.uiCloudProvider.promptForCloudProvider(allPvds, undefined);
-                            }
-                            let proprietaryInput;
-                            // TODO: We should build this with better decoupled principles (eg: delegate to a ui provider instead of if-aws), but not worth it until there's more than just this one single outlier.
-                            if (provider == contracts_1.CloudProviderEnum.aws && flags['aws-session-token'])
-                                proprietaryInput = { sessionToken: flags['aws-session-token'] };
-                            if (flags.clientSecret) {
-                                // Client Credentials auth flow (aka: service principal creds)
-                                let clientSecret;
-                                if (flags.silent == true) {
-                                    // silent mode, with piped input
-                                    clientSecret = yield (0, read_stdin_1.default)();
-                                    if (_.isEmpty(clientSecret)) {
-                                        throw new Error("Missing client secret.  In silent mode, clientSecret must be passed in via stdin (ie: piped input).");
-                                    }
-                                }
-                                else {
-                                    // Interactive mode
-                                    clientSecret = yield this._ui.promptPassword("clientSecret", "Client Secret: ");
-                                }
-                                if (_.isEmpty(clientSecret)) {
-                                    throw new Error(`No client secret provided (client secret can be provided interatively or via the stdin process stream).`);
-                                }
-                                const cspTenant = yield this.cspContextualizer.ensureCspTenantContext(this._codiacApi, provider, flags.subscriptionId, flags.tenantId, flags.silent);
-                                // BUILD REQUEST
-                                let req = {
-                                    providerCode: provider,
-                                    credsType: 'client_credentials',
-                                    username: (_b = flags.user) !== null && _b !== void 0 ? _b : "<CspTenantClientId>",
-                                    secret: clientSecret,
-                                    providerSubscription: cspTenant.subscriptionId,
-                                    providerTenant: cspTenant.tenantId
-                                };
-                                let result = yield this.genRelayClient.Call.csp_login(req);
-                                if (result.success) {
-                                    this._ui.userMessage(`${this._styler.colorGood("Success!")} Authenticated this Codiac instance as a trusted client with ${this._styler.hilite(provider)} for [${this._userCntx.currentTenantCode}: ${this._userCntx.userName}].`);
-                                    this.logger.debug(`Authenticated this Codiac instance as a trusted client with ${this._styler.hilite(provider)} for [${this._userCntx.currentTenantCode}: ${this._userCntx.userName}].`);
-                                }
-                                else {
-                                    this._ui.userMessage(`Authentication failed (${result.message})`);
-                                }
-                            }
-                            else if (Boolean(flags.silent) === true) {
-                                const cspTenant = yield this.cspContextualizer.ensureCspTenantContext(this._codiacApi, provider, flags.subscriptionId, flags.tenantId, flags.silent);
-                                // Silent login - good luck...  (if user or password are empty, the api will pick up the stored creds for this csp)
-                                let loginReq;
-                                if (proprietaryInput) {
-                                    loginReq = this.uiCloudProvider.assembleLoginRequest(this.ioc, provider, flags.user, flags.password, cspTenant.subscriptionId, proprietaryInput);
-                                }
-                                else {
-                                    loginReq = {
-                                        providerCode: provider,
-                                        username: flags.user,
-                                        secret: flags.password,
-                                        providerSubscription: cspTenant.subscriptionId,
-                                        providerTenant: cspTenant.tenantId
-                                    };
-                                }
-                                const loginResult = yield this.genRelayClient.Call.csp_login(loginReq); // TODO: Consider passing in flags.subscriptionId
-                                if (loginResult.success) {
-                                    this._ui.userMessage(`${this._styler.colorGood("Success!")} Authenticated with ${this._styler.hilite(provider)} for [${this._userCntx.currentTenantCode}: ${this._userCntx.userName}].`);
-                                    this.logger.debug(`Authenticated with ${this._styler.hilite(provider)} for [${this._userCntx.currentTenantCode}: ${this._userCntx.userName}].`);
-                                }
-                                else {
-                                    this._ui.userMessage(`Authentication failed (${loginResult.message})`);
-                                }
-                            }
-                            else {
-                                // interactive auth flow
-                                try {
-                                    const cspTenant = yield this.uiCloudProvider.ensureCspTenantContext(this._codiacApi, provider, flags.subscriptionId, flags.tenantId, flags.silent);
-                                    let cspUser = yield this.uiCloudProvider.promptForCloudProviderCreds(this.ioc, provider, Boolean(flags.silent), flags.user, flags.password, cspTenant, proprietaryInput);
-                                    let subx = "";
-                                    if (cspUser.subscriptionId) {
-                                        subx = ((cspUser.provider == contracts_1.CloudProviderEnum.aws) ? "acct" : "subx").concat(": ", cspUser.subscriptionId);
-                                        subx = "(".concat(subx, ")");
-                                    }
-                                    this._ui.userMessage(this._styler.colorGood("Success!").concat(" Authenticated with ", provider, " as ", this._styler.hilite(cspUser.username), subx));
-                                }
-                                catch (err) {
-                                    this._ui.userMessage(`${this._styler.colorCritical("FAILED")} ${(_c = err.name) !== null && _c !== void 0 ? _c : ""} ${(_d = err.message) !== null && _d !== void 0 ? _d : ""}`);
-                                }
-                            }
-                            resolve();
-                        }
-                        catch (err) {
-                            // this.logger.error(err);
-                            // this._ui.userMessage(`${this._styler.colorCritical("ERROR")} ${err.name ?? ""} ${err.message ?? ""}`);
-                            this.handleError(err);
-                            resolve();
-                        }
-                        finally {
-                            yield this.closeConnections();
-                        }
-                    }));
+                    let result = yield this.genRelayClient.Call.csp_login(candidate);
+                    if (result.success) {
+                        this._ui.userMessage(`${this._styler.colorGood("Success!")} Authenticated this Codiac instance as a trusted client with ${this._styler.hilite(candidate.providerCode)} for [${this._userCntx.currentTenantCode}: ${this._userCntx.userName}].`);
+                        this.logger.debug(`Authenticated this Codiac instance as a trusted client with ${this._styler.hilite(candidate.providerCode)} for [${this._userCntx.currentTenantCode}: ${this._userCntx.userName}].`);
+                    }
+                    else {
+                        this._ui.userMessage(`${this._styler.colorCritical("Authentication FAILED")} (${result.message})`);
+                    }
                 }
                 catch (err) {
-                    this.handleError(err);
-                    reject(err);
+                    this._ui.userMessage(`${this._styler.colorCritical("Error")} ${(_a = err.name) !== null && _a !== void 0 ? _a : ""} ${(_b = err.message) !== null && _b !== void 0 ? _b : ""}`);
                 }
-                finally {
-                    yield this.closeConnections();
+            }
+            else {
+                // ------------------------------------------------------------
+                // User Interactive auth flow (aka: PKCE with regular user creds)
+                // ------------------------------------------------------------
+                try {
+                    let cspUser = yield this.cspContextualizer.promptForCloudProviderCreds(this.ioc, candidate.providerCode, false, candidate.username, candidate.secret, { subscriptionId: candidate.providerSubscription, tenantId: candidate.providerTenant }, candidate.proprietaryInput);
+                    let subx = "";
+                    if (cspUser.subscriptionId) {
+                        subx = ((cspUser.provider == contracts_1.CloudProviderEnum.aws) ? "acct" : "subx").concat(": ", cspUser.subscriptionId);
+                        subx = "(".concat(subx, ")");
+                    }
+                    this._ui.userMessage(this._styler.colorGood("Success!").concat(" Authenticated with ", candidate.providerCode, " as ", this._styler.hilite(cspUser.username), subx));
+                }
+                catch (err) {
+                    this._ui.userMessage(`${this._styler.colorCritical("FAILED")} ${(_c = err.name) !== null && _c !== void 0 ? _c : ""} ${(_d = err.message) !== null && _d !== void 0 ? _d : ""}`);
                 }
-            }));
+            }
+            return;
         });
     }
 }
@@ -171,12 +211,16 @@ CspLogin.examples = [
 // static dependsOn = ["provider"];  // this isnt the whole of the requirements
 CspLogin.flags = {
     user: core_1.Flags.string({ char: 'u', description: 'The username at the given cloud provider.' /*, exclusive: ["clientSecret"] */ }),
-    password: core_1.Flags.string({ char: 'p', description: '(must be provided via stdin) The password at the given cloud provider.', exclusive: ["clientSecret"] }),
+    password: core_1.Flags.string({ char: 'p', description: '(must be provided via stdin using --silent) The password at the given cloud provider.', exclusive: ["clientSecret"] }),
     "aws-session-token": core_1.Flags.string({ required: false, exclusive: ["clientSecret"], description: "(for AWS only) The session token parameter for use when authenticating with a short-term AWS access key credentials." }),
-    clientSecret: core_1.Flags.boolean({ exclusive: ["password"], description: '(must be provided interactively or via stdin) Invokes the OAuth Client Credentials Flow. Used to authenticate when no user is present, such as an internal service or in a devops pipeline.  Note: This is a secret that must be created when Codiac gets registered as a trusted application in your cloud service provider subscription (eg: in azure, this is an app registration in Azure AD).' }),
+    clientSecret: core_1.Flags.boolean({ exclusive: ["password"], description: '(must be provided interactively or via stdin using --silent) Invokes the OAuth Client Credentials Flow. Used to authenticate when no user is present, such as an internal service or in a devops pipeline.  Note: This is a secret that must be created when Codiac gets registered as a trusted application in your cloud service provider subscription (eg: in azure, this is an app registration in Azure AD).' }),
     subscriptionId: core_1.Flags.string({ char: 's', description: '(in silent mode, either this or tenantId is required if you have more than one tenant profile on a given cloud provider) The Id of the cloud provider subscription under which to authenticate.' }),
     tenantId: core_1.Flags.string({ char: 't', description: '(in silent mode, either this or subscriptionId is required if you have more than one tenant profile on a given cloud provider) The Id of the cloud provider tenant under which to authenticate.' }),
-    silent: core_1.Flags.boolean({ char: 'y', required: false, description: `(Optional: defaults to false) Suppresses any user-interaction.` })
+    // TODO: Move these into the base class
+    silent: core_1.Flags.boolean({ exclusive: ["echo", "to-script"], description: 'Non-Interactive mode; executes without any user interaction and fails on any missing or invalid arguments.' }),
+    echo: core_1.Flags.boolean({ exclusive: ["to-script", "silent"], description: 'Echo interaction mode; renders the equivalent non-interactive cli command for future use before final execution.' }),
+    "to-script": core_1.Flags.boolean({ exclusive: ["echo", "silent"], description: 'Toscript interaction mode; renders the equivalent non-interactive cli command WITHOUT any execution.' }),
+    "take-defaults": core_1.Flags.boolean({ exclusive: ["silent"], description: "Setting this to true prevents prompting for confirmation on parameters that were passed in or were automatically set to default values (Irrelevant in --silent mode).  This behavior does NOT apply to scenarios that the command needs to override invalid user input; such cases will always prompt for confirmation.  eg: when no argument was provided for file or type, and only one exists, the system will render the autoselected file unless this flag is set." })
 };
 CspLogin.args = {
     provider: core_1.Args.string({ required: false, options: Object.keys(contracts_1.CloudProviderEnum), description: 'Code indicating the Cloud Service Provider (CSP) being authenticated with.' })

package/dist/commands/csp/login.js.map

@@ -1 +1 @@
-{"version":3,"file":"login.js","sourceRoot":"","sources":["../../../src/commands/csp/login.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"login.js","sourceRoot":"","sources":["../../../src/commands/csp/login.ts"],"names":[],"mappings":";;;;AAAA,4BAA4B;AAC5B,sCAAyC;AACzC,iEAAkH;AAElH,uEAAkE;AAClE,6EAAuE;AAEvE,mEAAiE;AAOjE;;;;;GAKG;AACU,QAAA,kBAAkB,GAAG,oBAAoB,CAAC;AAEvD,MAAqB,QAAS,SAAQ,gDAAyC;IAsC7E,gEAAgE;IAEhE,gCAAgC;IAChC,uBAAuB;IACvB,qDAAqD;IACrD,IAAI;IAGS,WAAW;;;YACtB,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;YAEnD,IAAI,OAAO,GAAgC,EAAE,CAAC;YAE9C,IAAI,IAAI,CAAC,QAAQ,EAAE;gBACjB,OAAO,CAAC,YAAY,GAAG,mCAAe,CAAC,MAAM,CAAoB,6BAAiB,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;gBACnG,IAAI,OAAO,CAAC,YAAY,IAAI,SAAS;oBAAE,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;aACxF;YAED,+DAA+D;YAC/D,sDAAsD;YACtD,yEAAyE;YACzE,IAAI,OAAO,CAAC,YAAY,IAAI,6BAAiB,CAAC,GAAG,IAAI,KAAK,CAAC,mBAAmB,CAAC,EAAE;gBAC/E,OAAO,CAAC,gBAAgB,GAAwB,EAAE,YAAY,EAAE,KAAK,CAAC,mBAAmB,CAAC,EAAE,CAAC;aAC9F;YAED,IAAI,KAAK,CAAC,cAAc;gBAAE,OAAO,CAAC,oBAAoB,GAAG,KAAK,CAAC,cAAc,CAAC,IAAI,EAAE,CAAC;YACrF,IAAI,KAAK,CAAC,QAAQ;gBAAE,OAAO,CAAC,cAAc,GAAG,KAAK,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;YAEnE,IAAI,KAAK,CAAC,IAAI,EAAE;gBACd,OAAO,CAAC,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC;aAC/B;YAED,IAAI,KAAK,CAAC,YAAY,EAAE;gBACtB,OAAO,CAAC,SAAS,GAAG,0BAAkB,CAAC;gBACvC,+HAA+H;gBAE/H,IAAI,KAAK,CAAC,MAAM,IAAI,IAAI,EAAE;oBACxB,gCAAgC;oBAChC,OAAO,CAAC,MAAM,GAAG,MAAA,IAAI,CAAC,UAAU,0CAAE,IAAI,EAAE,CAAC,CAAC,+BAA+B;oBACzE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,2DAA2D,CAAC,CAAC;oBAC/E,IAAI,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;wBAC7B,MAAM,IAAI,KAAK,CAAC,qGAAqG,CAAC,CAAC;qBACxH;iBACF;aACF;YAGD,kEAAkE;YAClE,2DAA2D;YAC3D,kEAAkE;YAElE,MAAM,eAAe,GACnB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,kCAAgB,CAAC,MAAM,CAAC,CAAC,CAAC,MAAA,MAAA,SAAS,aAAT,SAAS,cAAT,SAAS,GAClD,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,kCAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,mCAChD,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,kCAAgB,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,mCAC5D,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,kCAAgB,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;YAE5D,MAAM,YAAY,GAAG,KAAK,CAAC,eAAe,CAAC,CAAC;YAE5C,OAAO,CAAC,OAAO,EAAE,eAAe,EAAE,YAAY,CAAC,CAAC;;KACjD;IAIY,uBAAuB,CAAC,OAAoC,EAAE,OAAgB;;YAEzF,IAAI,OAAO,CAAC,YAAY,IAAI,SAAS,EAAE;gBACrC,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;aACvD;YAED,IAAI,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;gBAC7B,MAAM,IAAI,KAAK,CAAC,yHAAyH,CAAC,CAAC;aAC5I;YAED,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,sBAAsB,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC,YAAY,EAAE,OAAO,CAAC,oBAAoB,EAAE,OAAO,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC;YACzK,OAAO,CAAC,oBAAoB,GAAG,SAAS,CAAC,cAAc,CAAC;YACxD,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC,QAAQ,CAAC;YAG5C,IAAI,SAA6B,CAAA;YACjC,IAAI,OAAO,CAAC,gBAAgB,EAAE;gBAC5B,SAAS,GAAG,IAAI,CAAC,iBAAiB,CAAC,oBAAoB,CAAC,IAAI,CAAC,GAAG,EAAE,OAAO,CAAC,YAAY,EAAE,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,MAAM,EAAE,SAAS,CAAC,cAAc,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAC;aAC/K;iBAAM;gBACL,SAAS,GAAG;oBACV,YAAY,EAAE,OAAO,CAAC,YAAY;oBAClC,QAAQ,EAAE,OAAO,CAAC,QAAQ;oBAC1B,MAAM,EAAE,OAAO,CAAC,MAAM;oBACtB,oBAAoB,EAAE,OAAO,CAAC,oBAAoB;iBACnD,CAAA;gBACD,IAAI,OAAO,CAAC,SAAS;oBAAE,SAAS,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;gBAC/D,IAAI,OAAO,CAAC,cAAc;oBAAE,SAAS,CAAC,cAAc,GAAG,OAAO,CAAC,cAAc,CAAC;aAC/E;YACD,OAAO,SAAS,CAAC;QACnB,CAAC;KAAA;IAKY,4BAA4B,CAAC,OAAoC,EAAE,YAAqB,EAAE,OAAgB;;YAErH,iBAAiB;YACjB,IAAI,OAAO,CAAC,YAAY,IAAI,SAAS,EAAE;gBACrC,uBAAuB;gBACvB,IAAI,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,6BAAiB,CAAC,CAAC,CAAC,oKAAoK;gBACpN,CAAC,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,6BAAiB,CAAC,KAAK,CAAC,CAAC;gBACrD,CAAC,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,6BAAiB,CAAC,YAAY,CAAC,CAAC;gBAC5D,OAAO,CAAC,YAAY,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,sBAAsB,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;aAChG;YAGD,uCAAuC;YACvC,IAAI,OAAO,CAAC,SAAS,IAAI,0BAAkB,EAAE;gBAC3C,8DAA8D;gBAC9D,OAAO,OAAO,CAAC,MAAM,IAAI,SAAS,IAAI,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;oBAC/D,OAAO,CAAC,MAAM,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,cAAc,EAAE,iBAAiB,CAAC,CAAC;oBAClF,IAAI,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;wBAC7B,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,0GAA0G,CAAC,CAAC;qBAClI;iBACF;aACF;YAED,aAAa;YACb,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,sBAAsB,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC,YAAY,EAAE,OAAO,CAAC,oBAAoB,EAAE,OAAO,CAAC,cAAc,EAAE,KAAK,CAAC,CAAC;YAC1K,OAAO,CAAC,oBAAoB,GAAG,SAAS,CAAC,cAAc,CAAC;YACxD,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC,QAAQ,CAAC;YAG5C,qBAAqB;YACrB,IAAI,SAAS,GAAuB;gBAClC,YAAY,EAAE,OAAO,CAAC,YAAY;gBAClC,SAAS,EAAE,OAAO,CAAC,SAAS;gBAC5B,QAAQ,EAAE,OAAO,CAAC,QAAQ;gBAC1B,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,oBAAoB,EAAE,OAAO,CAAC,oBAAoB;gBAClD,cAAc,EAAE,OAAO,CAAC,cAAc;aACvC,CAAC;YAEF,OAAO,SAAS,CAAC;QACnB,CAAC;KAAA;IAEM,kBAAkB,CAAC,SAA6B,EAAE,GAAa;QAEpE,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAA;QAChC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;QACpB,IAAI,SAAS,CAAC,QAAQ;YAAE,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC;QAEpE,IAAI,SAAS,CAAC,SAAS,IAAI,0BAAkB;YAAE,GAAG,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;QAC1E,IAAI,SAAS,CAAC,oBAAoB;YAAE,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,kBAAkB,EAAE,SAAS,CAAC,oBAAoB,CAAC,CAAC,CAAC;QACtG,IAAI,SAAS,CAAC,cAAc;YAAE,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,YAAY,EAAE,SAAS,CAAC,cAAc,CAAC,CAAC,CAAC;QAEpF,IAAI,SAAS,CAAC,gBAAgB,EAAE;YAC9B,MAAM;YACN,IAA0B,SAAS,CAAC,gBAAiB,CAAC,YAAY,EAAE;gBAClE,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,qBAAqB,EAAwB,SAAS,CAAC,gBAAiB,CAAC,YAAa,CAAC,CAAC,CAAC;aACvG;SACF;QAED,yCAAyC;QACzC,gDAAgD;QAChD,iDAAiD;QACjD,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,YAAY,EAAE,GAAG,CAAC,CAAA;QAEtC,OAAO,GAAG,CAAC;IACb,CAAC;IAKY,WAAW,CAAC,SAA6B;;;YAEpD,IAAI,SAAS,CAAC,SAAS,IAAI,0BAAkB,EAAE;gBAC7C,+DAA+D;gBAC/D,8DAA8D;gBAC9D,+DAA+D;gBAC/D,IAAI;oBACF,IAAI,MAAM,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;oBACjE,IAAI,MAAM,CAAC,OAAO,EAAE;wBAClB,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,UAAU,CAAC,gEAAgE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,YAAY,CAAC,SAAS,IAAI,CAAC,SAAS,CAAC,iBAAiB,KAAK,IAAI,CAAC,SAAS,CAAC,QAAQ,IAAI,CAAC,CAAC;wBAChP,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,+DAA+D,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,YAAY,CAAC,SAAS,IAAI,CAAC,SAAS,CAAC,iBAAiB,KAAK,IAAI,CAAC,SAAS,CAAC,QAAQ,IAAI,CAAC,CAAC;qBACxM;yBAAM;wBACL,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,uBAAuB,CAAC,KAAK,MAAM,CAAC,OAAO,GAAG,CAAC,CAAC;qBACpG;iBACF;gBAAC,OAAO,GAAG,EAAE;oBACZ,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,OAAO,CAAC,IAAI,MAAA,GAAG,CAAC,IAAI,mCAAI,EAAE,IAAI,MAAA,GAAG,CAAC,OAAO,mCAAI,EAAE,EAAE,CAAC,CAAC;iBACvG;aAEF;iBAAM;gBACL,+DAA+D;gBAC/D,iEAAiE;gBACjE,+DAA+D;gBAC/D,IAAI;oBAEF,IAAI,OAAO,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,2BAA2B,CAAC,IAAI,CAAC,GAAG,EAAE,SAAS,CAAC,YAAY,EAAE,KAAK,EAC5G,SAAS,CAAC,QAAQ,EAClB,SAAS,CAAC,MAAM,EAChB,EAAE,cAAc,EAAE,SAAS,CAAC,oBAAoB,EAAE,QAAQ,EAAE,SAAS,CAAC,cAAc,EAAE,EACtF,SAAS,CAAC,gBAAgB,CAC3B,CAAC;oBACF,IAAI,IAAI,GAAW,EAAE,CAAC;oBACtB,IAAI,OAAO,CAAC,cAAc,EAAE;wBAC1B,IAAI,GAAG,CAAC,CAAC,OAAO,CAAC,QAAQ,IAAI,6BAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC;wBAC5G,IAAI,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;qBAC9B;oBACD,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,sBAAsB,EAAE,SAAS,CAAC,YAAY,EAAE,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC;iBACtK;gBAAC,OAAO,GAAG,EAAE;oBACZ,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,QAAQ,CAAC,IAAI,MAAA,GAAG,CAAC,IAAI,mCAAI,EAAE,IAAI,MAAA,GAAG,CAAC,OAAO,mCAAI,EAAE,EAAE,CAAC,CAAC;iBACxG;aACF;YAED,OAAO;;KACR;;AAxPH,2BA0PC;AAxPQ,oBAAW,GAAG,wNAAwN,CAAA;AAEtO,iBAAQ,GAAG;IAChB,eAAe;IACf,sBAAsB;IACtB,uEAAuE;IACvE,uEAAuE;IACvE,uHAAuH;IACvH,yJAAyJ;IACzJ,sHAAsH;IACtH,sEAAsE;IACtE,iHAAiH;CAClH,CAAA;AAED,+EAA+E;AAExE,cAAK,GAAG;IACb,IAAI,EAAE,YAAK,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,WAAW,EAAE,2CAA2C,CAAC,kCAAkC,EAAE,CAAC;IAC9H,QAAQ,EAAE,YAAK,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,WAAW,EAAE,uFAAuF,EAAE,SAAS,EAAE,CAAC,cAAc,CAAC,EAAE,CAAC;IACxK,mBAAmB,EAAE,YAAK,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,cAAc,CAAC,EAAE,WAAW,EAAE,sHAAsH,EAAE,CAAC;IACxN,YAAY,EAAE,YAAK,CAAC,OAAO,CAAC,EAAE,SAAS,EAAE,CAAC,UAAU,CAAC,EAAE,WAAW,EAAE,mZAAmZ,EAAE,CAAC;IAC1d,cAAc,EAAE,YAAK,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,WAAW,EAAE,iMAAiM,EAAE,CAAC;IAC3P,QAAQ,EAAE,YAAK,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,WAAW,EAAE,iMAAiM,EAAE,CAAC;IAErP,uCAAuC;IACvC,MAAM,EAAE,YAAK,CAAC,OAAO,CAAC,EAAE,SAAS,EAAE,CAAC,MAAM,EAAE,WAAW,CAAC,EAAE,WAAW,EAAE,4GAA4G,EAAE,CAAC;IACtL,IAAI,EAAE,YAAK,CAAC,OAAO,CAAC,EAAE,SAAS,EAAE,CAAC,WAAW,EAAE,QAAQ,CAAC,EAAE,WAAW,EAAE,kHAAkH,EAAE,CAAC;IAC5L,WAAW,EAAE,YAAK,CAAC,OAAO,CAAC,EAAE,SAAS,EAAE,CAAC,MAAM,EAAE,QAAQ,CAAC,EAAE,WAAW,EAAE,sGAAsG,EAAE,CAAC;IAClL,eAAe,EAAE,YAAK,CAAC,OAAO,CAAC,EAAE,SAAS,EAAE,CAAC,QAAQ,CAAC,EAAE,WAAW,EAAE,ycAAyc,EAAE,CAAC;CAClhB,CAAA;AAEM,aAAI,GAAG;IACZ,QAAQ,EAAE,WAAI,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,6BAAiB,CAAC,EAAE,WAAW,EAAE,4EAA4E,EAAE,CAAC;CAC/K,CAAA"}

package/dist/commands/csp/logout.d.ts

@@ -1,15 +1,17 @@
+import { CloudProviderEnum } from '../../apis/codiac-relay/contracts';
 import { CommandBaseEnterprise } from '../../command-base-enterprise';
 export default class CspLogout extends CommandBaseEnterprise {
     static description: string;
     static examples: string[];
     static flags: {
+        subscriptionId: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        tenantId: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
         silent: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
     };
+    private static _allPvds;
+    static get allPvds(): CloudProviderEnum[];
     static args: {
         provider: import("@oclif/core/lib/interfaces/parser").Arg<string | undefined, Record<string, unknown>>;
     };
-    private get uiCloudProvider();
-    private __uiCloudProvider_backing;
-    protected bootstrap(): void;
     run(): Promise<void>;
 }

package/dist/commands/csp/logout.js

@@ -1,26 +1,25 @@
 "use strict";
+var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const core_1 = require("@oclif/core");
 const contracts_1 = require("../../apis/codiac-relay/contracts");
 const command_base_enterprise_1 = require("../../command-base-enterprise");
-const cloud_provider_contextualizer_1 = require("../../uilogic/cloud-provider-contextualizer");
+const _ = require("lodash");
 const type_safety_utils_1 = require("../../uilogic/type-safety-utils");
 class CspLogout extends command_base_enterprise_1.CommandBaseEnterprise {
-    get uiCloudProvider() {
-        if (this.__uiCloudProvider_backing === undefined) {
-            this.__uiCloudProvider_backing = this.ioc.get(cloud_provider_contextualizer_1.CloudProviderContextualizer);
+    static get allPvds() {
+        if (this._allPvds == undefined) {
+            this._allPvds = Object.values(contracts_1.CloudProviderEnum); //this.cspUiFactory.getAllClusterProviders(this.ioc);  // TODO: this call is currently limited to cluster providers - we need the comprehensive list of CSPs in use.
+            _.remove(this._allPvds, x => x == contracts_1.CloudProviderEnum.other);
+            _.remove(this._allPvds, x => x == contracts_1.CloudProviderEnum.localMachine);
         }
-        return this.__uiCloudProvider_backing;
-    }
-    bootstrap() {
-        super.bootstrap();
-        cloud_provider_contextualizer_1.CloudProviderContextualizer.bootstrap(this.ioc);
+        return this._allPvds;
     }
     run() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             return new Promise((resolve, reject) => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                var _a, _b, _c, _d;
+                var _b, _c, _d, _e, _f;
                 try {
                     this.bootstrap();
                     const { args, flags } = yield this.parse(CspLogout);
@@ -39,22 +38,31 @@ class CspLogout extends command_base_enterprise_1.CommandBaseEnterprise {
                     }
                     else {
                         // Select interactively
-                        let allPvds = this.cspUiFactory.getAllClusterProviders(this.ioc);
-                        provider = yield this.uiCloudProvider.promptForCloudProvider(allPvds, undefined);
+                        // let allPvds = this.cspUiFactory.getAllClusterProviders(this.ioc);  // we dont want just cluster providers here
+                        provider = yield this.cspContextualizer.promptForCloudProvider(CspLogout.allPvds, undefined);
+                    }
+                    let cspAcct = { subscriptionId: flags.subscriptionId, tenantId: flags.tenantId };
+                    const cspTenant = yield this.cspContextualizer.ensureCspTenant(provider, this._codiacApi, cspAcct, false);
+                    if (cspTenant) {
+                        cspAcct.tenantId = cspTenant.cspTenantId;
+                        // remove an invalid user-provided subscriptionId
+                        if (cspAcct.subscriptionId && !((_b = cspTenant.subscriptionIds) === null || _b === void 0 ? void 0 : _b.includes(cspAcct.subscriptionId))) {
+                            delete cspAcct.subscriptionId;
+                        }
                     }
                     // interactive sign-out flow
                     try {
-                        let username = yield this.uiCloudProvider.promptToLogout(this.ioc, provider, suppressConfirmations);
+                        let username = yield this.cspContextualizer.promptToLogout(this.ioc, provider, cspAcct, suppressConfirmations);
                         this._ui.userMessage(`${this._styler.colorGood("Success!")} Signed out from ${this._styler.hilite(provider)}.`);
                     }
                     catch (err) {
-                        this._ui.userMessage(`${this._styler.colorCritical("FAILED")} ${(_a = err.name) !== null && _a !== void 0 ? _a : ""} ${(_b = err.message) !== null && _b !== void 0 ? _b : ""}`);
+                        this._ui.userMessage(`${this._styler.colorCritical("FAILED")} ${(_c = err.name) !== null && _c !== void 0 ? _c : ""} ${(_d = err.message) !== null && _d !== void 0 ? _d : ""}`);
                     }
                     resolve();
                 }
                 catch (err) {
                     this.logger.error(err);
-                    this._ui.userMessage(`${this._styler.colorCritical("ERROR")} ${(_c = err.name) !== null && _c !== void 0 ? _c : ""} ${(_d = err.message) !== null && _d !== void 0 ? _d : ""}`);
+                    this._ui.userMessage(`${this._styler.colorCritical("ERROR")} ${(_e = err.name) !== null && _e !== void 0 ? _e : ""} ${(_f = err.message) !== null && _f !== void 0 ? _f : ""}`);
                     resolve();
                 }
                 finally {
@@ -65,6 +73,7 @@ class CspLogout extends command_base_enterprise_1.CommandBaseEnterprise {
     }
 }
 exports.default = CspLogout;
+_a = CspLogout;
 CspLogout.description = 'Closes session with the given Cloud Service Provider (CSP), eg: aws, azure, docker.  Use this command to clear the local cache for your security account at that provider.';
 CspLogout.examples = [
     'cod csp logout',
@@ -73,9 +82,11 @@ CspLogout.examples = [
 ];
 // static dependsOn = ["provider"];  // this isnt the whole of the requirements
 CspLogout.flags = {
+    subscriptionId: core_1.Flags.string({ char: 's', description: '(in silent mode, either this or tenantId is required if you have more than one tenant profile on a given cloud provider) The Id of the cloud provider subscription under which to logout.' }),
+    tenantId: core_1.Flags.string({ char: 't', description: '(in silent mode, either this or subscriptionId is required if you have more than one tenant profile on a given cloud provider) The Id of the cloud provider tenant under which to logout.' }),
     silent: core_1.Flags.boolean({ char: 'y', required: false, description: `(Optional: defaults to false) Suppresses any user-interaction.` })
 };
 CspLogout.args = {
-    provider: core_1.Args.string({ required: false, options: Object.keys(contracts_1.CloudProviderEnum), char: 'p', description: 'Code indicating the Cloud Service Provider (CSP) being authenticated with.' })
+    provider: core_1.Args.string({ required: false, options: _a.allPvds, char: 'p', description: 'Code indicating the Cloud Service Provider (CSP) being authenticated with.' })
 };
 //# sourceMappingURL=logout.js.map

package/dist/commands/csp/logout.js.map

@@ -1 +1 @@
-{"version":3,"file":"logout.js","sourceRoot":"","sources":["../../../src/commands/csp/logout.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"logout.js","sourceRoot":"","sources":["../../../src/commands/csp/logout.ts"],"names":[],"mappings":"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"}

package/dist/commands/noc/cluster/forget.js

@@ -106,7 +106,7 @@ class NocClusterForget extends command_base_exec_tenant_1.CommandBaseExecTenant
                 // this.logger.trace("rootmap", rootMap);
                 // Get the list of clusters
                 let cluster;
-                let readResult = yield this._codiacApi.ClusterDef.tryReadMany({ all: true }, { projection: { pathsIncluded: ["id", "name", "provider", "thisMachine", "locationName", "instance", "modified", "modifiedBy"], pathsExcluded: [] } });
+                let readResult = yield this._codiacApi.ClusterDef.tryReadMany({ all: true }, { projection: { pathsIncluded: ["id", "name", "provider", "thisMachine", "locationName", "instance", "modified", "modifiedBy", "isCaptured"], pathsExcluded: [] } });
                 let clusterDefs = (_b = readResult.output) !== null && _b !== void 0 ? _b : [];
                 clusterDefs = _.orderBy(clusterDefs, c => c.name);
                 if (provider) {
@@ -117,10 +117,10 @@ class NocClusterForget extends command_base_exec_tenant_1.CommandBaseExecTenant
                 }
                 else {
                     if (running !== true) {
-                        clusterDefs = clusterDefs.filter(c => c.instance == undefined);
+                        clusterDefs = clusterDefs.filter(c => c.instance == undefined || type_safety_utils_1.TypeSafetyUtils.toBoolean(c.isCaptured == true));
                     }
                     if (readResult.error == undefined && clusterDefs.length === 0) {
-                        this._ui.userMessage("No clusters exist without instances");
+                        this._ui.userMessage("No clusters exist that are either captured or without instances");
                     }
                     else if (silent === true) {
                         cluster = clusterDefs.find(c => c.name === name && c.provider === provider);