@codiac.io/codiac-cli 1.2.157 → 1.2.165

package/lib/uilogic/cloud-resource-configurators/aws-resource-configurator.js

@@ -1,297 +1,348 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AwsResourceConfigurator = void 0;
-const tslib_1 = require("tslib");
-const cli_tools_1 = require("@codiac.io/cli-tools");
-const codiac_common_1 = require("@codiac.io/codiac-common");
-const contracts_1 = require("../../apis/codiac-api/contracts");
-const image_registry_1 = require("@codiac.io/codiac-domain/image-registry");
-const codiac_ops_common_1 = require("@codiac.io/codiac-ops-common");
-const inversify_1 = require("inversify");
-const _ = require("lodash");
-const extended_relay_client_1 = require("../../relay/extended-relay-client");
-const codiac_relay_1 = require("../../apis/codiac-relay");
-const codiac_constants_1 = require("../../codiac-constants");
-/** Walks the user through the selection of an existing
- * or the declaration of a new image registry.
- */
-let AwsResourceConfigurator = class AwsResourceConfigurator {
-    constructor(relayClient, genRelayClient, codiacUser, _ui, _styler, logger) {
-        this.relayClient = relayClient;
-        this.genRelayClient = genRelayClient;
-        this.codiacUser = codiacUser;
-        this._ui = _ui;
-        this._styler = _styler;
-        this.logger = logger;
-        this.cloudProvider = contracts_1.CloudProviderEnum.aws;
-        this.cliExec = new cli_tools_1.CliExec(this.logger);
-    }
-    promptToLogin(providerSubscriptionId, suppressConfirmations, providedUserName, providedSecret) {
-        var _a, _b;
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            try {
-                let isAuthed = false;
-                let userName = undefined;
-                let secret = undefined;
-                if (!suppressConfirmations) {
-                    this._ui.userMessage(`Enter your credentials for ${this._styler.hilite(this.cloudProvider)}`);
-                    userName = yield this._ui.prompt('regUsername', "Access Key Id:", false);
-                    if (userName === undefined || userName === "")
-                        userName = "<token>"; // TODO: make username nullable on the authPvd, so this becomes the job of the auth provider
-                    secret = yield this._ui.promptPassword('regSecret', `Secret Access Key:`);
-                }
-                else {
-                    if (!providedUserName || !providedSecret)
-                        throw new Error("Must provide cloud provider username/pwd to login silent mode");
-                    userName = providedUserName;
-                    secret = providedSecret;
-                }
-                try {
-                    this._ui.startSpinner(`Authenticating with ${this.cloudProvider}...`);
-                    let authResult = yield this.relayClient.logIntoCloudProvider(this.cloudProvider, { Username: userName, Secret: secret });
-                    // /* TODO: use this instead */ let authResult = await this.genRelayClient.Call.csp_login({ providerCode: this.cloudProvider, username: userName, secret: secret });
-                    isAuthed = authResult !== undefined; // <-- because authenticate throws on failures.  // authResult.success;
-                    this._ui.stopSpinner("Success!");
-                }
-                catch (err) {
-                    this.logger.debug(`Error authenticating with ${this.cloudProvider}: ${(_a = err.name) !== null && _a !== void 0 ? _a : ""} ${(_b = err.message) !== null && _b !== void 0 ? _b : ""}`);
-                    this._ui.stopSpinner("Failed.");
-                }
-                if (isAuthed)
-                    this._ui.userMessage(`Logged into ${this._styler.hilite(this.cloudProvider)} as [${this._styler.hilite(userName !== null && userName !== void 0 ? userName : "token")}]`);
-                // TODO: Look up the Aws AccountId
-                // let subxId = await this.promptForSubscriptionId(userName, providerSubscriptionId);
-                return [isAuthed, userName];
-            }
-            catch (err) {
-                throw err;
-            }
-        });
-    }
-    promptToLogout() {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            throw new Error("Interactive logout is not implemented for Aws.");
-        });
-    }
-    captureImageRegistry() {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            return new Promise((resolve, reject) => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                try {
-                    let awsUser = yield this.relayClient.getCurrentUserFor(this.cloudProvider);
-                    // /* TODO: use this instead */ let awsUser = await this.genRelayClient.Call.get_current_user_for({ providerCode: this.cloudProvider });
-                    if (!awsUser)
-                        throw new Error(`Cannot capture an aws container registry: No ${this.cloudProvider} account has been authenticated.`);
-                    // Get region, default to the one these tokens are for calling out
-                    // let region = await this._ui.prompt('scope', 'enter the region of the ECR: ', true, registry.scope || defaults.scope);
-                    let isPrivate = yield this._ui.promptConfirm("regAwsIsPrivate", "Private container registry? (hit 'n' for public) ", true);
-                    // TODO:  Capture the registry url
-                    let registry;
-                    if (isPrivate) {
-                        // PRIVATE REGION-BASED CONTAINER REGISTRY
-                        // url: `${AWS_ACCOUNT_ID}.dkr.ecr.${REGION}.amazonaws.com`
-                        // eg:  `570376874173.dkr.ecr.us-east-1.amazonaws.com`
-                        // regUrl = (await this._ui.prompt("regUrl", "Enter the private registry base url"))!;
-                        let accountId = (yield this._ui.prompt("accountId", "AWS account Id:"));
-                        // let regionCode = (await this._ui.prompt<string>("regionCode", "AWS region code:"))!;
-                        let regionCode = yield this.promptForLocation();
-                        registry = new image_registry_1.AwsPrivateEcrImageRegistry(accountId, regionCode);
-                    }
-                    else {
-                        // REGISTRY IN AWS PUBLIC CONTAINER GALLERY
-                        // NOT region-based.
-                        // NOTE: Your Alias doesnt get created until the first repository is created.
-                        // url: `public.ecr.aws/${PUBLIC_REGISTRY_ALIAS}/`
-                        // eg:  `public.ecr.aws/e7d8o5e6/`
-                        // NOTE: You may use custom or default alias in the url; both are valid.
-                        // regUrl = (await this._ui.prompt("regUrl", "Enter the public registry base url"))!;   // eg: public.ecr.aws/e7d8o5e6 
-                        let alias = (yield this._ui.prompt("alias", "Alias for your registry:")); // eg: public.ecr.aws/e7d8o5e6 
-                        registry = new image_registry_1.AwsPublicEcrImageRegistry(alias);
-                    }
-                    resolve(registry);
-                }
-                catch (err) {
-                    // this.logger.error(`${err.name ?? ''} ${err.message ?? ''}`, err.stack);
-                    reject(err);
-                }
-            }));
-        });
-    }
-    defineCluster(initial, defaults) {
-        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, _e;
-                let output;
-                try {
-                    const DEFAULT_STARTING_NODE_COUNT = 2;
-                    let cluster = {};
-                    cluster.provider = this.cloudProvider;
-                    cluster.privateOwner = this.codiacUser.tenantCode;
-                    // APPLY DEFAULTS FOR THIS CSP
-                    let switchedCsp = Boolean(defaults !== undefined && (defaults.provider !== this.cloudProvider));
-                    if (defaults === undefined || switchedCsp) {
-                        let defaultResult = yield this.genRelayClient.Call.getClusterDefaults({ provider: this.cloudProvider });
-                        if (defaultResult.error) {
-                            this.logger.warn(`Error retrieving defaults for ${this.cloudProvider} cluster: ${(_a = defaultResult.error.name) !== null && _a !== void 0 ? _a : ""} ${(_b = defaultResult.error.message) !== null && _b !== void 0 ? _b : ""}`);
-                        }
-                        defaults = (_c = defaultResult.output) !== null && _c !== void 0 ? _c : {}; // fall back to an empty object if we failed, so that we dont keep looking this up on subsequent calls.
-                        let assignment = (objVal, srcVal) => Boolean(srcVal === undefined) ? objVal : srcVal;
-                        if (switchedCsp) {
-                            initial = _.assignWith({}, defaults, cluster, { name: initial.name }, assignment); // Throw out any prior cluster properties bc they were set for a diff provider.
-                        }
-                        else {
-                            initial = _.assignWith({}, defaults, initial, assignment);
-                        }
-                    }
-                    // COMMENTED OUT BC: Moved to the cluster configurator
-                    cluster.name = (yield this._ui.prompt("name", "Cluster name: ", true, initial === null || initial === void 0 ? void 0 : initial.name));
-                    cluster.locationName = yield this.promptForLocation(initial === null || initial === void 0 ? void 0 : initial.locationName);
-                    // TODO: Use the method `getIdentityFrom()` from the Codiac AwsAdapter lib to derive this from the Aws primary creds. 
-                    cluster.providerSubscription = (yield this._ui.prompt("providerSubscription", "Aws Account Id (ten-digit code): ", true, initial === null || initial === void 0 ? void 0 : initial.providerSubscription));
-                    cluster.providerGroup = "n/a"; // (await this._ui.prompt("providerGroup", "Resource Group: ", true, cluster.providerGroup || cluster.name))!;
-                    let subnet = (yield this._ui.prompt("subnet", "Subnet: ", false, (_d = initial === null || initial === void 0 ? void 0 : initial.subnet) !== null && _d !== void 0 ? _d : codiac_constants_1.CliConstants.CHOICE_VALUE_FOR_AUTOCREATE));
-                    cluster.subnet = (subnet === codiac_constants_1.CliConstants.CHOICE_VALUE_FOR_AUTOCREATE) ? undefined : subnet;
-                    cluster.nodeSpec = yield this.promptForNodeSpec(initial === null || initial === void 0 ? void 0 : initial.nodeSpec);
-                    cluster.startingNodeCount = (yield this._ui.prompt("startingNodeCount", "Qty nodes: ", true, (_e = initial === null || initial === void 0 ? void 0 : initial.startingNodeCount) !== null && _e !== void 0 ? _e : DEFAULT_STARTING_NODE_COUNT));
-                    // // cluster.nodePools = (await this._ui.prompt("winNodePool", "Add Windows node pool: ", false, false)) ? cluster.nodePools : [];
-                    cluster.k8sVersion = yield this.promptForK8sVersion(cluster.locationName, initial === null || initial === void 0 ? void 0 : initial.k8sVersion);
-                    let spec = Object.assign({ name: cluster.name, provider: cluster.provider, providerSubscription: cluster.providerSubscription, locationName: cluster.locationName, providerGroup: cluster.providerGroup, nodeCount: cluster.nodeCount, ingressDef: cluster.ingressDef, privateOwner: cluster.privateOwner, nodeSpec: cluster.nodeSpec, startingNodeCount: cluster.startingNodeCount, identitySpec: { type: "", name: "" } }, this.createAuditable());
-                    spec.k8sVersion = cluster.k8sVersion;
-                    if (cluster === null || cluster === void 0 ? void 0 : cluster.nodePools)
-                        spec.nodePools = cluster.nodePools;
-                    if (cluster.defaultFootprint)
-                        spec.defaultFootprint = cluster.defaultFootprint;
-                    if (cluster.startingNodeCount)
-                        spec.startingNodeCount = cluster.startingNodeCount;
-                    if (cluster.subnet)
-                        spec.subnet = cluster.subnet;
-                    if (cluster.windowsAdmin)
-                        spec.windowsAdmin = cluster.windowsAdmin;
-                    resolve({ spec: spec, defaults: defaults });
-                }
-                catch (err) {
-                    // this.logger.error(`${err.name ?? ''} ${err.message ?? ''}`, err.stack);
-                    reject(err);
-                }
-            }));
-        });
-    }
-    promptForNodeSpec(defaultValue) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            let output;
-            try {
-                let res = yield this.genRelayClient.Call.getAwsNodeTypes({});
-                if (res.error)
-                    throw res.error;
-                if (res.output == undefined || res.output.length === 0)
-                    throw new Error("No node types found.");
-                let allNodeTypes = res.output.map(n => n.name);
-                // cluster.nodeSpec = (await this._ui.prompt("nodeSpec", "Node type: ", true, defaults?.nodeSpec))!;
-                let keepDefault = false;
-                if (defaultValue && allNodeTypes.indexOf(defaultValue) >= 0) {
-                    keepDefault = yield this._ui.promptConfirm("keepNodeSpec", `Node type: ${this._styler.hilite(defaultValue)} `);
-                }
-                if (keepDefault === true && defaultValue !== undefined) {
-                    output = defaultValue;
-                }
-                else {
-                    let nodeTypeChoices = allNodeTypes.map(x => { return { name: x, value: x }; });
-                    output = (yield this._ui.promptSelect("nodeSpec", "Node type: ", nodeTypeChoices));
-                }
-                return output;
-            }
-            catch (err) {
-                throw err;
-            }
-        });
-    }
-    promptForLocation(defaultValue) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            let output;
-            try {
-                let regionResult = yield this.genRelayClient.Call.getAwsRegions({});
-                if (regionResult.error)
-                    throw regionResult.error;
-                if (regionResult.output == undefined || regionResult.output.length === 0)
-                    throw new Error("No Aws regions found.");
-                let allRegions = regionResult.output;
-                let keepDefault = false;
-                if (defaultValue && allRegions.find(x => x.code === defaultValue)) {
-                    keepDefault = yield this._ui.promptConfirm("keepLocation", `Location: ${this._styler.hilite(defaultValue)} `);
-                }
-                if (keepDefault === true && defaultValue !== undefined) {
-                    output = defaultValue;
-                }
-                else {
-                    let byGeoGroup = _.groupBy(allRegions, loc => loc.group);
-                    let geoChoices = Object.keys(byGeoGroup);
-                    let geo = (yield this._ui.promptSelect("geo", "Geography: ", geoChoices));
-                    let regions = _.orderBy(byGeoGroup[geo], ['name']);
-                    let regionChoices = regions.map(x => { return { name: `${x.name.padEnd(16, ".")}${x.code.padStart(16, ".")}`, value: x.code }; });
-                    output = (yield this._ui.promptSelect("locationName", "Region: ", regionChoices));
-                }
-                return output;
-            }
-            catch (err) {
-                throw err;
-            }
-        });
-    }
-    /** Asks the user whether to keep the default version, and if not presents a select list. */
-    promptForK8sVersion(location, defaultK8sVersion) {
-        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;
-                let output;
-                try {
-                    let versResult = yield this.genRelayClient.Call.getAvailableK8sVersions({ provider: this.cloudProvider, location: location });
-                    if (versResult.error)
-                        throw versResult.error;
-                    let k8sVersions = (_b = (_a = versResult.output) === null || _a === void 0 ? void 0 : _a.map(x => x.k8sVersion)) !== null && _b !== void 0 ? _b : [];
-                    let keepVersion = false;
-                    if (defaultK8sVersion && k8sVersions.indexOf(defaultK8sVersion) > 0) {
-                        keepVersion = yield this._ui.promptConfirm("keepVersion", `Kubernetes version: ${this._styler.hilite(defaultK8sVersion)} `);
-                    }
-                    if (keepVersion === true && defaultK8sVersion !== undefined) {
-                        output = defaultK8sVersion;
-                    }
-                    else {
-                        if (k8sVersions.length > 0) {
-                            output = (yield this._ui.promptSelect("k8sVersion", "Kubernetes version: ", k8sVersions)); // defaults?.k8sVersion;
-                        }
-                        else {
-                            output = (yield this._ui.prompt("k8sVersion", "Kubernetes version: ", true, defaultK8sVersion));
-                        }
-                    }
-                    resolve(output);
-                }
-                catch (err) {
-                    // this.logger.error(`${err.name ?? ''} ${err.message ?? ''}`, err.stack);
-                    reject(err);
-                }
-            }));
-        });
-    }
-    createAuditable() {
-        let stamp = new Date(Date.now());
-        return {
-            created: stamp,
-            createdBy: this.codiacUser.username,
-            modified: stamp,
-            modifiedBy: this.codiacUser.username
-        };
-    }
-};
-AwsResourceConfigurator = tslib_1.__decorate([
-    (0, inversify_1.injectable)(),
-    tslib_1.__param(0, (0, inversify_1.inject)(extended_relay_client_1.ExtendedRelayClient)),
-    tslib_1.__param(1, (0, inversify_1.inject)(codiac_relay_1.RelayClient)),
-    tslib_1.__param(2, (0, inversify_1.inject)(codiac_ops_common_1.UserNameTenantCode)),
-    tslib_1.__param(3, (0, inversify_1.inject)(codiac_ops_common_1.INTERFACES_OPS.IUserInputProvider)),
-    tslib_1.__param(4, (0, inversify_1.inject)(codiac_ops_common_1.INTERFACES_OPS.IOutputStyler)),
-    tslib_1.__param(5, (0, inversify_1.inject)(codiac_common_1.INTERFACES.IBetterLogger)),
-    tslib_1.__metadata("design:paramtypes", [extended_relay_client_1.ExtendedRelayClient,
-        codiac_relay_1.RelayClient,
-        codiac_ops_common_1.UserNameTenantCode, Object, Object, Object])
-], AwsResourceConfigurator);
-exports.AwsResourceConfigurator = AwsResourceConfigurator;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AwsResourceConfigurator = void 0;
+const tslib_1 = require("tslib");
+const inversify_1 = require("inversify");
+const _ = require("lodash");
+const codiac_common_1 = require("@codiac.io/codiac-common");
+const image_registry_1 = require("@codiac.io/codiac-domain/image-registry");
+const codiac_ops_common_1 = require("@codiac.io/codiac-ops-common");
+const contracts_1 = require("../../apis/codiac-api/contracts");
+const extended_relay_client_1 = require("../../relay/extended-relay-client");
+const codiac_relay_1 = require("../../apis/codiac-relay");
+const codiac_constants_1 = require("../../codiac-constants");
+const contracts_2 = require("../../relay/contracts/contracts");
+/** Walks the user through the selection of an existing
+ * or the declaration of a new image registry.
+ */
+let AwsResourceConfigurator = class AwsResourceConfigurator {
+    constructor(relayClient, genRelayClient, codiacUser, _ui, _styler, logger) {
+        this.relayClient = relayClient;
+        this.genRelayClient = genRelayClient;
+        this.codiacUser = codiacUser;
+        this._ui = _ui;
+        this._styler = _styler;
+        this.logger = logger;
+        this.cloudProvider = contracts_1.CloudProviderEnum.aws;
+    }
+    captureSecretStore(defaults) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            try {
+                let output;
+                // const cspUser = await this.relayClient.getCurrentUserFor(this.cloudProvider);
+                const cspUserResult = yield this.genRelayClient.Call.getAwsUser({});
+                if (cspUserResult.error)
+                    throw cspUserResult.error;
+                const cspUser = cspUserResult.output;
+                if (!cspUser)
+                    throw new Error(`Cannot capture any ${this.cloudProvider} secret store: No ${this.cloudProvider} account has been authenticated.`);
+                let confirm = false;
+                while (confirm !== true) {
+                    let region = yield this.promptForLocation(defaults === null || defaults === void 0 ? void 0 : defaults.region);
+                    let name = `secretStore|${this.cloudProvider}|${cspUser.accountId}|${region}`;
+                    let instance = new contracts_2.AwsSecretStore(name, name, cspUser.accountId, region); // AWS makes this redundant here because it doesnt expose the secret store as an independent resource.
+                    output = new contracts_2.AwsSecretStoreDef(name, cspUser.accountId, region, instance);
+                    confirm = yield this._ui.promptConfirm("secretStore", `Capture secret store: ${this._styler.hilite(name)} ?`, true);
+                }
+                return output;
+            }
+            catch (err) {
+                throw err;
+            }
+        });
+    }
+    promptToLogin(providerAccountId, suppressConfirmations, providedUserName, providedSecret) {
+        var _a, _b;
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            try {
+                let isAuthed = false;
+                let userName = undefined;
+                let secret = undefined;
+                if (!suppressConfirmations) {
+                    this._ui.userMessage(`Enter your credentials for ${this._styler.hilite(this.cloudProvider)}`);
+                    userName = yield this._ui.prompt('regUsername', "Access Key Id:", false);
+                    if (userName === undefined || userName === "")
+                        userName = "<token>"; // TODO: make username nullable on the authPvd, so this becomes the job of the auth provider
+                    secret = yield this._ui.promptPassword('regSecret', `Secret Access Key:`);
+                }
+                else {
+                    if (!providedUserName || !providedSecret)
+                        throw new Error("Must provide cloud provider username/pwd to login silent mode");
+                    userName = providedUserName;
+                    secret = providedSecret;
+                }
+                try {
+                    this._ui.startSpinner(`Authenticating with ${this.cloudProvider}...`);
+                    let authResult = yield this.relayClient.logIntoCloudProvider(this.cloudProvider, { Username: userName, Secret: secret });
+                    // /* TODO: use this instead */ let authResult = await this.genRelayClient.Call.csp_login({ providerCode: this.cloudProvider, username: userName, secret: secret });
+                    isAuthed = Boolean(authResult !== undefined); // <-- because authenticate throws on failures.  // authResult.success;
+                    this._ui.stopSpinner("Success!");
+                }
+                catch (err) {
+                    this.logger.debug(`Error authenticating with ${this.cloudProvider}: ${(_a = err.name) !== null && _a !== void 0 ? _a : ""} ${(_b = err.message) !== null && _b !== void 0 ? _b : ""}`);
+                    this._ui.stopSpinner("Failed.");
+                }
+                if (isAuthed)
+                    this._ui.userMessage(`Logged into ${this._styler.hilite(this.cloudProvider)} as [${this._styler.hilite(userName !== null && userName !== void 0 ? userName : "token")}]`);
+                // TODO: Look up the Aws AccountId
+                // let subxId = await this.promptForSubscriptionId(userName, providerSubscriptionId);
+                return [isAuthed, userName];
+            }
+            catch (err) {
+                throw err;
+            }
+        });
+    }
+    promptToLogout() {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            throw new Error("Interactive logout is not implemented for Aws.");
+        });
+    }
+    // Commented out bc: Replaced with `getAwsUserInfo()` 
+    // // TODO: csp user already defines the AWS accountId - look it up instead.
+    // // Really though... we cant carry on with one user per csp anymore.  
+    // // We may need to switch users midstroke if a resource is on a different csp account.
+    // public async promptForAccountId(defaultValue?: string): Promise<string> {
+    //   let accountId = (await this._ui.prompt<string>("accountId", "AWS Account Id (ten-digit code):", true, defaultValue))!;
+    //   return accountId;
+    // }
+    /** Returns undefined for invalid creds. */
+    getAwsUserInfo() {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            let result = yield this.genRelayClient.Call.getAwsUser({});
+            return result.output;
+        });
+    }
+    captureImageRegistry() {
+        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;
+                try {
+                    // let awsUser = await this.relayClient.getCurrentUserFor(this.cloudProvider);
+                    /* TODO: use this instead */
+                    // let awsUser = await this.genRelayClient.Call.get_current_user_for({ providerCode: this.cloudProvider });
+                    let userResult = yield this.genRelayClient.Call.getAwsUser({});
+                    if (userResult.error)
+                        throw new Error(`Cannot capture an aws container registry: Error retrieving ${this.cloudProvider} account: ${(_a = userResult.message) !== null && _a !== void 0 ? _a : ""} ${userResult.error.message}.`);
+                    let awsUser = userResult.output;
+                    if (!awsUser)
+                        throw new Error(`Cannot capture an aws container registry: No ${this.cloudProvider} account has been authenticated.`);
+                    // Get region, default to the one these tokens are for calling out
+                    // let region = await this._ui.prompt('scope', 'enter the region of the ECR: ', true, registry.scope || defaults.scope);
+                    let isPrivate = yield this._ui.promptConfirm("regAwsIsPrivate", "Private container registry? (hit 'n' for public) ", true);
+                    // TODO:  Capture the registry url
+                    let registry;
+                    if (isPrivate) {
+                        // PRIVATE REGION-BASED CONTAINER REGISTRY
+                        // url: `${AWS_ACCOUNT_ID}.dkr.ecr.${REGION}.amazonaws.com`
+                        // eg:  `570376874173.dkr.ecr.us-east-1.amazonaws.com`
+                        // regUrl = (await this._ui.prompt("regUrl", "Enter the private registry base url"))!;
+                        // let regionCode = (await this._ui.prompt<string>("regionCode", "AWS region code:"))!;
+                        let regionCode = yield this.promptForLocation();
+                        registry = new image_registry_1.AwsPrivateEcrImageRegistry(awsUser.accountId, regionCode);
+                    }
+                    else {
+                        // REGISTRY IN AWS PUBLIC CONTAINER GALLERY
+                        // NOT region-based.
+                        // NOTE: Your Alias doesnt get created until the first repository is created.
+                        // url: `public.ecr.aws/${PUBLIC_REGISTRY_ALIAS}/`
+                        // eg:  `public.ecr.aws/e7d8o5e6/`
+                        // NOTE: You may use custom or default alias in the url; both are valid.
+                        // regUrl = (await this._ui.prompt("regUrl", "Enter the public registry base url"))!;   // eg: public.ecr.aws/e7d8o5e6 
+                        let alias = (yield this._ui.prompt("alias", "Alias for your registry:")); // eg: public.ecr.aws/e7d8o5e6 
+                        registry = new image_registry_1.AwsPublicEcrImageRegistry(alias);
+                    }
+                    resolve(registry);
+                }
+                catch (err) {
+                    // this.logger.error(`${err.name ?? ''} ${err.message ?? ''}`, err.stack);
+                    reject(err);
+                }
+            }));
+        });
+    }
+    defineCluster(initial, defaults) {
+        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, _e;
+                let output;
+                try {
+                    const DEFAULT_STARTING_NODE_COUNT = 2;
+                    let cluster = {};
+                    cluster.provider = this.cloudProvider;
+                    cluster.privateOwner = this.codiacUser.tenantCode;
+                    // APPLY DEFAULTS FOR THIS CSP
+                    let switchedCsp = Boolean(defaults !== undefined && (defaults.provider !== this.cloudProvider));
+                    if (defaults === undefined || switchedCsp) {
+                        let defaultResult = yield this.genRelayClient.Call.getClusterDefaults({ provider: this.cloudProvider });
+                        if (defaultResult.error) {
+                            this.logger.warn(`Error retrieving defaults for ${this.cloudProvider} cluster: ${(_a = defaultResult.error.name) !== null && _a !== void 0 ? _a : ""} ${(_b = defaultResult.error.message) !== null && _b !== void 0 ? _b : ""}`);
+                        }
+                        defaults = (_c = defaultResult.output) !== null && _c !== void 0 ? _c : {}; // fall back to an empty object if we failed, so that we dont keep looking this up on subsequent calls.
+                        let assignment = (objVal, srcVal) => Boolean(srcVal === undefined) ? objVal : srcVal;
+                        if (switchedCsp) {
+                            initial = _.assignWith({}, defaults, cluster, { name: initial.name }, assignment); // Throw out any prior cluster properties bc they were set for a diff provider.
+                        }
+                        else {
+                            initial = _.assignWith({}, defaults, initial, assignment);
+                        }
+                    }
+                    // COMMENTED OUT BC: Moved to the cluster configurator
+                    cluster.name = (yield this._ui.prompt("name", "Cluster name: ", true, initial === null || initial === void 0 ? void 0 : initial.name));
+                    cluster.locationName = yield this.promptForLocation(initial === null || initial === void 0 ? void 0 : initial.locationName);
+                    // TODO: Use the method `getIdentityFrom()` from the Codiac AwsAdapter lib to derive this from the Aws primary creds. 
+                    // cluster.providerSubscription = (await this._ui.prompt("providerSubscription", "Aws Account Id (ten-digit code): ", true, initial?.providerSubscription))!;
+                    // cluster.providerSubscription = await this.promptForAccountId(initial?.providerSubscription);
+                    let awsUser = yield this.getAwsUserInfo();
+                    if (awsUser == undefined) {
+                        throw new Error(`No current user authenticated for AWS.`);
+                    }
+                    cluster.providerSubscription = awsUser.accountId;
+                    cluster.providerGroup = "n/a"; // (await this._ui.prompt("providerGroup", "Resource Group: ", true, cluster.providerGroup || cluster.name))!;
+                    let subnet = (yield this._ui.prompt("subnet", "Subnet: ", false, (_d = initial === null || initial === void 0 ? void 0 : initial.subnet) !== null && _d !== void 0 ? _d : codiac_constants_1.CliConstants.CHOICE_VALUE_FOR_AUTOCREATE));
+                    cluster.subnet = (subnet === codiac_constants_1.CliConstants.CHOICE_VALUE_FOR_AUTOCREATE) ? undefined : subnet;
+                    cluster.nodeSpec = yield this.promptForNodeSpec(initial === null || initial === void 0 ? void 0 : initial.nodeSpec);
+                    cluster.startingNodeCount = (yield this._ui.prompt("startingNodeCount", "Qty nodes: ", true, (_e = initial === null || initial === void 0 ? void 0 : initial.startingNodeCount) !== null && _e !== void 0 ? _e : DEFAULT_STARTING_NODE_COUNT));
+                    // // cluster.nodePools = (await this._ui.prompt("winNodePool", "Add Windows node pool: ", false, false)) ? cluster.nodePools : [];
+                    cluster.k8sVersion = yield this.promptForK8sVersion(cluster.locationName, initial === null || initial === void 0 ? void 0 : initial.k8sVersion);
+                    let spec = Object.assign({ name: cluster.name, provider: cluster.provider, providerSubscription: cluster.providerSubscription, locationName: cluster.locationName, providerGroup: cluster.providerGroup, nodeCount: cluster.nodeCount, ingressDef: cluster.ingressDef, privateOwner: cluster.privateOwner, nodeSpec: cluster.nodeSpec, startingNodeCount: cluster.startingNodeCount, identitySpec: { type: "", name: "" } }, this.createAuditable());
+                    spec.k8sVersion = cluster.k8sVersion;
+                    if (cluster === null || cluster === void 0 ? void 0 : cluster.nodePools)
+                        spec.nodePools = cluster.nodePools;
+                    if (cluster.defaultFootprint)
+                        spec.defaultFootprint = cluster.defaultFootprint;
+                    if (cluster.startingNodeCount)
+                        spec.startingNodeCount = cluster.startingNodeCount;
+                    if (cluster.subnet)
+                        spec.subnet = cluster.subnet;
+                    if (cluster.windowsAdmin)
+                        spec.windowsAdmin = cluster.windowsAdmin;
+                    resolve({ spec: spec, defaults: defaults });
+                }
+                catch (err) {
+                    // this.logger.error(`${err.name ?? ''} ${err.message ?? ''}`, err.stack);
+                    reject(err);
+                }
+            }));
+        });
+    }
+    promptForNodeSpec(defaultValue) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            let output;
+            try {
+                let res = yield this.genRelayClient.Call.getAwsNodeTypes({});
+                if (res.error)
+                    throw res.error;
+                if (res.output == undefined || res.output.length === 0)
+                    throw new Error("No node types found.");
+                let allNodeTypes = res.output.map(n => n.name);
+                // cluster.nodeSpec = (await this._ui.prompt("nodeSpec", "Node type: ", true, defaults?.nodeSpec))!;
+                let keepDefault = false;
+                if (defaultValue && allNodeTypes.indexOf(defaultValue) >= 0) {
+                    keepDefault = yield this._ui.promptConfirm("keepNodeSpec", `Node type: ${this._styler.hilite(defaultValue)} `);
+                }
+                if (keepDefault === true && defaultValue !== undefined) {
+                    output = defaultValue;
+                }
+                else {
+                    let nodeTypeChoices = allNodeTypes.map(x => { return { name: x, value: x }; });
+                    output = (yield this._ui.promptSelect("nodeSpec", "Node type: ", nodeTypeChoices));
+                }
+                return output;
+            }
+            catch (err) {
+                throw err;
+            }
+        });
+    }
+    promptForLocation(defaultValue) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            let output;
+            try {
+                let regionResult = yield this.genRelayClient.Call.getAwsRegions({});
+                if (regionResult.error)
+                    throw regionResult.error;
+                if (regionResult.output == undefined || regionResult.output.length === 0)
+                    throw new Error("No Aws regions found.");
+                let allRegions = regionResult.output;
+                let keepDefault = false;
+                if (defaultValue && allRegions.find(x => x.code === defaultValue)) {
+                    keepDefault = yield this._ui.promptConfirm("keepLocation", `Location: ${this._styler.hilite(defaultValue)} `);
+                }
+                if (keepDefault === true && defaultValue !== undefined) {
+                    output = defaultValue;
+                }
+                else {
+                    let byGeoGroup = _.groupBy(allRegions, loc => loc.group);
+                    let geoChoices = Object.keys(byGeoGroup);
+                    let geo = (yield this._ui.promptSelect("geo", "Geography: ", geoChoices));
+                    let regions = _.orderBy(byGeoGroup[geo], ['name']);
+                    let regionChoices = regions.map(x => { return { name: `${x.name.padEnd(16, ".")}${x.code.padStart(16, ".")}`, value: x.code }; });
+                    output = (yield this._ui.promptSelect("locationName", "Region: ", regionChoices));
+                }
+                return output;
+            }
+            catch (err) {
+                throw err;
+            }
+        });
+    }
+    /** Asks the user whether to keep the default version, and if not presents a select list. */
+    promptForK8sVersion(location, defaultK8sVersion) {
+        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;
+                let output;
+                try {
+                    let versResult = yield this.genRelayClient.Call.getAvailableK8sVersions({ provider: this.cloudProvider, location: location });
+                    if (versResult.error)
+                        throw versResult.error;
+                    let k8sVersions = (_b = (_a = versResult.output) === null || _a === void 0 ? void 0 : _a.map(x => x.k8sVersion)) !== null && _b !== void 0 ? _b : [];
+                    let keepVersion = false;
+                    if (defaultK8sVersion && k8sVersions.indexOf(defaultK8sVersion) > 0) {
+                        keepVersion = yield this._ui.promptConfirm("keepVersion", `Kubernetes version: ${this._styler.hilite(defaultK8sVersion)} `);
+                    }
+                    if (keepVersion === true && defaultK8sVersion !== undefined) {
+                        output = defaultK8sVersion;
+                    }
+                    else {
+                        if (k8sVersions.length > 0) {
+                            output = (yield this._ui.promptSelect("k8sVersion", "Kubernetes version: ", k8sVersions)); // defaults?.k8sVersion;
+                        }
+                        else {
+                            output = (yield this._ui.prompt("k8sVersion", "Kubernetes version: ", true, defaultK8sVersion));
+                        }
+                    }
+                    resolve(output);
+                }
+                catch (err) {
+                    // this.logger.error(`${err.name ?? ''} ${err.message ?? ''}`, err.stack);
+                    reject(err);
+                }
+            }));
+        });
+    }
+    createAuditable() {
+        let stamp = new Date(Date.now());
+        return {
+            created: stamp,
+            createdBy: this.codiacUser.username,
+            modified: stamp,
+            modifiedBy: this.codiacUser.username
+        };
+    }
+};
+AwsResourceConfigurator = tslib_1.__decorate([
+    (0, inversify_1.injectable)(),
+    tslib_1.__param(0, (0, inversify_1.inject)(extended_relay_client_1.ExtendedRelayClient)),
+    tslib_1.__param(1, (0, inversify_1.inject)(codiac_relay_1.RelayClient)),
+    tslib_1.__param(2, (0, inversify_1.inject)(codiac_ops_common_1.UserNameTenantCode)),
+    tslib_1.__param(3, (0, inversify_1.inject)(codiac_ops_common_1.INTERFACES_OPS.IUserInputProvider)),
+    tslib_1.__param(4, (0, inversify_1.inject)(codiac_ops_common_1.INTERFACES_OPS.IOutputStyler)),
+    tslib_1.__param(5, (0, inversify_1.inject)(codiac_common_1.INTERFACES.IBetterLogger)),
+    tslib_1.__metadata("design:paramtypes", [extended_relay_client_1.ExtendedRelayClient,
+        codiac_relay_1.RelayClient,
+        codiac_ops_common_1.UserNameTenantCode, Object, Object, Object])
+], AwsResourceConfigurator);
+exports.AwsResourceConfigurator = AwsResourceConfigurator;
 //# sourceMappingURL=aws-resource-configurator.js.map