@codiac.io/codiac-cli 1.3.62 → 1.3.64

package/dist/relay/relay-container.js

@@ -14,7 +14,7 @@ const cli_tools_1 = require("@codiac.io/cli-tools");
 const INTERFACES_CLI_1 = require("../ops/INTERFACES_CLI");
 const Docker = require("dockerode");
 const DEFAULT_IMAGE_NAME = "codiacimages/codiac-relay";
-exports.DEFAULT_IMAGE_TAG = "1.4.33";
+exports.DEFAULT_IMAGE_TAG = "1.4.38";
 const DEFAULT_CONTAINER_NAME = "codiac-relay";
 const DEFAULT_HEALTH_CHECK_URL = "http://localhost:5799/heartbeat-json"; //  /ready-state";
 const DEFAULT_RETRY_TIMOUT_IN_MINUTES = 1;

package/dist/uilogic/cloud-resource-configurators/asset-configurator.d.ts

@@ -0,0 +1,47 @@
+import { IBetterLogger } from "@codiac.io/codiac-common";
+import { AtLeast } from "@codiac.io/codiac-common/contracts";
+import { RelayClient as GenRelayClient } from "../../apis/codiac-relay";
+import { Asset, PortMapping } from "../../apis/codiac-api/contracts";
+import { PromptChoice } from "../../cli-common";
+import { IEntryValidator, IOutputStyler, IUserInputProvider, ValidationResult } from "../../ops";
+import { AssetCreateRequest } from "../../commands/asset/create";
+export declare let ports: PromptChoice[];
+export declare class AssetConfigurator {
+    private _ui;
+    private _styler;
+    private genRelayClient;
+    private logger;
+    constructor(_ui: IUserInputProvider, _styler: IOutputStyler, genRelayClient: GenRelayClient, logger: IBetterLogger);
+    isLoaded: boolean;
+    /** The largest valid port number. */
+    private readonly MAX_PORT_NUMBER;
+    /** The value to select from a port number prompt
+     *  indicating the intention to remove the port number
+     *  assignment altogether. */
+    private readonly REMOVE_PORT_NUMBER;
+    load(assets: Asset[]): Promise<void>;
+    /** Prompts for port, ingress, ingressInternal, HostName
+     *
+     * Throws any encountered exceptions. */
+    editAsset(partial: AtLeast<AssetCreateRequest, "enterprise">): Promise<AtLeast<AssetCreateRequest, "enterprise" | "code" | "port" | "hasIngress">>;
+    promptForAllPortAssignments(existingPorts: number | PortMapping | (number | PortMapping)[] | undefined): Promise<number | PortMapping | (number | PortMapping)[] | undefined>;
+    /** Returns undefined if user opts to remove the given port assignment. */
+    private promptForPortAssignment;
+    private selectPortNumber;
+    /** Assembles the options list for port selection.
+   * Decorates any options for ports that are already taken by an existing asset.
+  */
+    private getPortOptionsList;
+    /** @param otherAssets  CAN NOT include the current asset. */
+    private portIsValid;
+    private buildPortDesc;
+    /** Parses strings in formats: a) `<number>:<number>` and `<number>:` and `<number>`,
+     * eg: `8181` or `8181:80` or `8181:`
+     * Throws invalids. */
+    toPortMapping(portSpec: string): number | PortMapping;
+    toPortString(portDef: number | PortMapping): string;
+}
+export declare class HostNameValidator implements IEntryValidator<string> {
+    constructor();
+    isValid(candidate: string | undefined): ValidationResult;
+}

package/dist/uilogic/cloud-resource-configurators/asset-configurator.js

@@ -0,0 +1,394 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.HostNameValidator = exports.AssetConfigurator = exports.ports = void 0;
+const tslib_1 = require("tslib");
+const inversify_1 = require("inversify");
+const codiac_common_1 = require("@codiac.io/codiac-common");
+const codiac_relay_1 = require("../../apis/codiac-relay");
+const contracts_1 = require("../../apis/codiac-api/contracts");
+const cli_common_1 = require("../../cli-common");
+const ops_1 = require("../../ops");
+const _ = require("lodash");
+const type_safety_utils_1 = require("../type-safety-utils");
+// Has to be module-scoped bc the autocomplete redefines "this", so we can't use it inside searchPorts().
+exports.ports = [];
+let AssetConfigurator = class AssetConfigurator {
+    constructor(_ui, _styler, genRelayClient, logger) {
+        this._ui = _ui;
+        this._styler = _styler;
+        this.genRelayClient = genRelayClient;
+        this.logger = logger;
+        this.isLoaded = false;
+        /** The largest valid port number. */
+        this.MAX_PORT_NUMBER = 65535;
+        /** The value to select from a port number prompt
+         *  indicating the intention to remove the port number
+         *  assignment altogether. */
+        this.REMOVE_PORT_NUMBER = -1;
+    }
+    load(assets) {
+        var _a, _b;
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            let portResult = yield this.genRelayClient.Call.getKnownPortNumbers({});
+            if (portResult.error) {
+                this.logger.warn(`Error retrieving known port number list: ${(_a = portResult.error.message) !== null && _a !== void 0 ? _a : portResult.message}`);
+            }
+            exports.ports = this.getPortOptionsList((_b = portResult.output) !== null && _b !== void 0 ? _b : [], assets);
+            exports.ports.unshift({ name: this.REMOVE_PORT_NUMBER + " (none / remove)", value: this.REMOVE_PORT_NUMBER.toString() });
+            this.isLoaded = true;
+        });
+    }
+    /** Prompts for port, ingress, ingressInternal, HostName
+     *
+     * Throws any encountered exceptions. */
+    editAsset(partial) {
+        var _a, _b, _c, _d;
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            // PORTS
+            if (partial.type == contracts_1.AssetTypesEnum.helm) {
+                partial.port = 0; // Q: Do we need this placeholder?  Better off undefined?
+            }
+            else {
+                partial.port = yield this.promptForAllPortAssignments(partial.port);
+            }
+            // INGRESS
+            if (partial.type == contracts_1.AssetTypesEnum.helm) {
+                partial.hasIngress = false;
+                delete partial.routedWithoutName;
+                delete partial.code;
+            }
+            else if (partial.kit || partial.hasIngress == undefined /* || confirmed != undefined */) {
+                partial.hasIngress = yield this._ui.promptConfirm('hasIngress', 'Accessible from outside the cabinet (aka: has ingress route): ', (_a = partial.hasIngress) !== null && _a !== void 0 ? _a : false);
+                if (!partial.hasIngress) {
+                    delete partial.routedWithoutName;
+                    delete partial.code;
+                }
+            }
+            // INGRESS INTERNAL
+            if (partial.type == contracts_1.AssetTypesEnum.helm || !type_safety_utils_1.TypeSafetyUtils.toBoolean(partial.hasIngress)) {
+                delete partial.ingressInternal;
+            }
+            else {
+                let keep = yield this._ui.promptConfirm("isPrivateKeep", "Usage: ".concat(this._styler.hilite(type_safety_utils_1.TypeSafetyUtils.toBoolean(partial.ingressInternal) ? "private" : "external")), true);
+                if (!keep) {
+                    let choices = [{ name: "External (Public DNS)", value: "false" }, { name: "Private (not available on the internet)", value: "true" }];
+                    let selected = yield this._ui.promptSelect("isPrivate", "Usage:", choices, false, true);
+                    partial.ingressInternal = type_safety_utils_1.TypeSafetyUtils.toBoolean(selected);
+                }
+            }
+            // HOST NAME
+            if (partial.kit || partial.hasIngress == true) {
+                let entry = "";
+                while (!entry || entry.trim() == "") {
+                    entry = (yield this._ui.prompt('code', 'Host name on the inbound domain url: ', false, (_b = partial.code) !== null && _b !== void 0 ? _b : (_c = partial.name) === null || _c === void 0 ? void 0 : _c.toLowerCase(), new HostNameValidator()));
+                }
+                partial.code = entry.toLowerCase().trim();
+                partial.routedWithoutName = yield this._ui.promptConfirm('routedWithoutName', 'Will this asset be the base ingress against your DNS. eg: true services yourwebsite.com (as root/naked): ', (_d = partial.routedWithoutName) !== null && _d !== void 0 ? _d : false);
+                // TODO:  Three can only be one asset with the option selected.  Unset the others if they set this.
+            }
+            if (!partial.code)
+                partial.code = partial.name;
+            return partial; // cast bc TS wouldnt infer this for us
+        });
+    }
+    promptForAllPortAssignments(existingPorts) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            try {
+                let ultimate;
+                const existings = [];
+                if (existingPorts) {
+                    if (_.isArray(existingPorts)) {
+                        existings.push(...existingPorts);
+                    }
+                    else {
+                        existings.push(existingPorts);
+                    }
+                }
+                // CONFIRM/EDIT EACH EXISTING
+                let index = 0;
+                for (let existing of existings) {
+                    index++;
+                    let portDef = yield this.promptForPortAssignment(existing, index);
+                    // Append to the ultimate
+                    if (portDef == undefined) {
+                        this._ui.userMessage("Port removed.");
+                        index--; // reuse this index for the next port assignment
+                    }
+                    else {
+                        if (ultimate == undefined) {
+                            ultimate = portDef;
+                        }
+                        else if (_.isArray(ultimate)) {
+                            ultimate.push(portDef);
+                        }
+                        else {
+                            ultimate = [ultimate, portDef];
+                        }
+                    }
+                }
+                // ADD NEW ONES
+                // Automatically start adding when none are defined yet.  Otherwise, ask to add more.
+                while ((ultimate == undefined || ultimate.length == 0) || (yield this._ui.promptConfirm("onemore", "Assign another port?", false))) {
+                    index++;
+                    const thisPort = yield this.promptForPortAssignment(undefined, index);
+                    if (thisPort == undefined) {
+                        index--; // re-use on the next port number
+                    }
+                    else {
+                        this._ui.userMessage("Port ".concat(index + ": ", (typeof thisPort == 'number') ? thisPort.toString() : this.buildPortDesc(thisPort)));
+                        // Append to the ultimate
+                        if (ultimate == undefined) {
+                            ultimate = thisPort;
+                        }
+                        else if (_.isArray(ultimate)) {
+                            ultimate.push(thisPort);
+                        }
+                        else {
+                            ultimate = [ultimate, thisPort];
+                        }
+                    }
+                }
+                return ultimate;
+            }
+            catch (err) {
+                throw err;
+            }
+        });
+    }
+    /** Returns undefined if user opts to remove the given port assignment. */
+    promptForPortAssignment(portDef, index) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            try {
+                let thisPort;
+                // 1.  Confirm existing portDef
+                let keepMapping = false;
+                if (portDef != undefined) {
+                    thisPort = (typeof portDef == 'number') ? { external: portDef } : _.cloneDeep(portDef);
+                    let desc = this.buildPortDesc(thisPort);
+                    keepMapping = yield this._ui.promptConfirm("keepMapping", "Port ".concat(index + ": ", desc), true);
+                }
+                // 2.  Declare/Edit
+                if (thisPort == undefined || !keepMapping) {
+                    // SERVICE PORT (EXTERNAL)
+                    let keepExt = false;
+                    let promptExt = "Port ".concat(index + ": ", "Service Port (external): ");
+                    if ((thisPort === null || thisPort === void 0 ? void 0 : thisPort.external) !== undefined) {
+                        keepExt = yield this._ui.promptConfirm("keepExt", promptExt.concat(this._styler.hilite("" + thisPort.external)), true);
+                    }
+                    if (thisPort == undefined)
+                        thisPort = { external: 0 };
+                    if (keepExt !== true) {
+                        thisPort.external = yield this.selectPortNumber(thisPort.external, promptExt);
+                    }
+                    // CONTAINER PORT (INTERNAL)
+                    // TODO: allow for none and swiching to none
+                    if (thisPort.external == this.REMOVE_PORT_NUMBER) {
+                        return undefined; // User has opted for removal of this whole port assignment 
+                    }
+                    else {
+                        let keepInt = false;
+                        let promptInt = "Port ".concat(index + ": ", "Container Port (internal): ");
+                        if (thisPort.internal) {
+                            keepInt = yield this._ui.promptConfirm("keepInt", promptInt.concat(thisPort.internal.toString()));
+                        }
+                        else {
+                            keepInt = !(yield this._ui.promptConfirm("keepInt", "Port ".concat(index + ": ", "Forwarding?" /* "Forward to a different port on the container?" */), false));
+                        }
+                        if (keepInt !== true) {
+                            thisPort.internal = yield this.selectPortNumber(thisPort.internal, promptInt);
+                            if (thisPort.internal == this.REMOVE_PORT_NUMBER) { // User selected "NONE"
+                                delete thisPort.internal;
+                            }
+                        }
+                    }
+                }
+                return ((thisPort.internal != undefined) && (thisPort.internal != thisPort.external)) ? thisPort : thisPort.external;
+            }
+            catch (err) {
+                throw err;
+            }
+        });
+    }
+    selectPortNumber(defaultPort, prompt) {
+        var _a;
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            let portSelector = new cli_common_1.PromptSelectFuzzy(this.logger, this._ui, this._styler);
+            let fetcher = (search) => { return new Promise((resolve) => resolve(exports.ports)); };
+            let fuzzyOnRemote = false;
+            let validator = (candidate) => { return candidate == this.REMOVE_PORT_NUMBER.toString() || this.portIsValid(+(candidate) /*, assets, ports */); };
+            let selectedPort = yield portSelector.go('port', prompt !== null && prompt !== void 0 ? prompt : 'Default port number to assign this asset when deploying to a cabinet:', false, (_a = defaultPort === null || defaultPort === void 0 ? void 0 : defaultPort.toString()) !== null && _a !== void 0 ? _a : "", fuzzyOnRemote, fetcher, validator);
+            // if (thisPort == undefined) thisPort = { external: 0 };
+            let selected = +(selectedPort !== null && selectedPort !== void 0 ? selectedPort : 0);
+            return selected;
+        });
+    }
+    /** Assembles the options list for port selection.
+   * Decorates any options for ports that are already taken by an existing asset.
+  */
+    getPortOptionsList(portOptions, assets) {
+        let output = [];
+        for (let port of portOptions) {
+            if (typeof port.port == "number") {
+                let option = { value: `${port.port}`, name: `${port.port} ${port.reservedFor} [${port.group}]` };
+                let asset = assets.find(a => a.port == port.port);
+                if (asset) {
+                    option.name = option.name.concat(" ", this._styler.colorWarning(`TAKEN!! [by ${asset.name}]`));
+                }
+                output.push(option);
+            }
+            else {
+                for (let portNum = port.port.min; portNum <= port.port.max; portNum++) {
+                    // ports.push({ value: `${portNum}`, name: `${portNum} ${port.reservedFor} [${port.group}]` }) 
+                    let option = { value: `${portNum}`, name: `${portNum} ${port.reservedFor} [${port.group}]` };
+                    let asset = assets.find(a => a.port == port.port);
+                    if (asset) {
+                        option.name = option.name.concat(" ", this._styler.colorWarning(`TAKEN!! [by ${asset.name}]`));
+                    }
+                    output.push(option);
+                }
+            }
+        }
+        // Add any asset ports that arent in the standard list.
+        for (let asset of assets) {
+            if (!output.find(p => p.value == `${asset.port}`)) {
+                let option = { value: `${asset.port}`, name: `${asset.port} ` + this._styler.colorWarning(`TAKEN!! [by ${asset.name}]`) };
+                output.push(option);
+            }
+        }
+        // Add any remaining numbers
+        let flush = [];
+        let port = 0;
+        for (var bespoke of output) {
+            port++;
+            let bport = Number.parseInt(bespoke.value);
+            while (port < bport) {
+                flush.push({ value: "" + port, name: port + " unreserved" });
+                port++;
+            }
+            flush.push(bespoke);
+            if (port > this.MAX_PORT_NUMBER)
+                break;
+        }
+        return flush; // output;
+    }
+    /** @param otherAssets  CAN NOT include the current asset. */
+    portIsValid(candidatePort /*, otherAssets: Asset[], allPorts: PromptChoice[] */, allowZero = false) {
+        let isValid = false;
+        let reason;
+        let entry;
+        // if (allPorts.find(p => p.value == `${candidatePort}`)) {
+        //   // Means it was in the list of standard/registered ports
+        //   entry = +(candidatePort);
+        //   let owner = otherAssets.find(a => a.port == entry);
+        //   isValid = (owner == undefined);
+        //   if (owner) {
+        //     reason = `Port number [${entry}] is ` + this._styler.colorWarning(`TAKEN!! [by ${owner.name}]`);
+        //   }
+        // } else {
+        // Means it was a raw entry, un-matched in the autoselect
+        entry = candidatePort;
+        if (isNaN(+entry)) {
+            isValid = false;
+            reason = `[${entry}]: Not a port number.`; //; use TAB to autocomplete your selection.`;
+        }
+        else if ((allowZero && entry < 0) || (!allowZero && entry <= 0) || entry > 65535) {
+            isValid = false;
+            reason = `[${entry}]: Port number must be between 1 and 65535`;
+            // } else {
+            //   let owner = otherAssets.find(a => a.port == entry);
+            //   isValid = (owner == undefined);
+            //   if (owner) {
+            //     reason = `Port number [${entry}] is ` + this._styler.colorWarning(`TAKEN!! [by ${owner.name}]`);
+            //   }
+        }
+        else {
+            isValid = true;
+        }
+        // }
+        return (reason) ? { isValid: isValid, reason: reason } : isValid;
+    }
+    buildPortDesc(existingPort) {
+        let desc;
+        if (existingPort.internal == undefined) {
+            desc = this._styler.hilite(existingPort.external.toString());
+        }
+        else {
+            desc = "Fwd ".concat(this._styler.hilite(existingPort.external.toString()), "(ext)", " --> ", this._styler.hilite(existingPort.internal.toString()), "(int)");
+        }
+        return desc;
+    }
+    /** Parses strings in formats: a) `<number>:<number>` and `<number>:` and `<number>`,
+     * eg: `8181` or `8181:80` or `8181:`
+     * Throws invalids. */
+    toPortMapping(portSpec) {
+        var _a, _b, _c;
+        let parts = portSpec.split(":");
+        if (parts.length == 1) {
+            let output = Number.parseInt(parts[0]);
+            const valid = this.portIsValid(output);
+            if (typeof valid === 'object')
+                throw new Error("Invalid port number: ".concat((_a = valid.reason) !== null && _a !== void 0 ? _a : "Must be an integer between 0 and ".concat(this.MAX_PORT_NUMBER.toString())));
+            return output;
+        }
+        else {
+            let output = { external: Number.parseInt(parts[0]) };
+            output.internal = Number.parseInt(parts[1]);
+            const extValid = this.portIsValid(output.external);
+            const intValid = this.portIsValid(output.internal);
+            if (typeof extValid === 'object')
+                throw new Error("Invalid external port number: ".concat((_b = extValid.reason) !== null && _b !== void 0 ? _b : "Must be an integer between 0 and ", this.MAX_PORT_NUMBER.toString()));
+            if (typeof intValid === 'object')
+                throw new Error("Invalid internal port number: ".concat((_c = intValid.reason) !== null && _c !== void 0 ? _c : "Must be an integer between 0 and ", this.MAX_PORT_NUMBER.toString()));
+            return output;
+        }
+    }
+    toPortString(portDef) {
+        let output;
+        if (typeof portDef == 'number') {
+            output = portDef.toString();
+        }
+        else {
+            let parts = [portDef.external];
+            if (portDef.internal)
+                parts.push(portDef.internal);
+            output = parts.join(":");
+        }
+        return output;
+    }
+};
+AssetConfigurator = tslib_1.__decorate([
+    (0, inversify_1.injectable)(),
+    tslib_1.__param(0, (0, inversify_1.inject)(ops_1.INTERFACES_CLI.IUserInputProvider)),
+    tslib_1.__param(1, (0, inversify_1.inject)(ops_1.INTERFACES_CLI.IOutputStyler)),
+    tslib_1.__param(2, (0, inversify_1.inject)(codiac_relay_1.RelayClient)),
+    tslib_1.__param(3, (0, inversify_1.inject)(codiac_common_1.INTERFACES.IBetterLogger)),
+    tslib_1.__metadata("design:paramtypes", [Object, Object, codiac_relay_1.RelayClient, Object])
+], AssetConfigurator);
+exports.AssetConfigurator = AssetConfigurator;
+class HostNameValidator {
+    constructor() {
+    }
+    isValid(candidate) {
+        let isValid = false;
+        let reason;
+        let must = "must be 3- to 50-character string of alphanumerics and hyphens, starting with a letter.";
+        if (candidate == undefined || _.isEmpty(candidate)) {
+            // throw new Error("Missing ".concat(propertyName));
+            reason = must;
+        }
+        else {
+            let rxName = /^[a-zA-Z][a-zA-Z0-9-]{2,50}$/;
+            if (!rxName.test(candidate)) {
+                // throw new Error("Invalid ".concat(propertyName, ": ", must));
+                reason = must;
+            }
+            else {
+                isValid = true;
+            }
+        }
+        return { isValid: isValid, reason: reason };
+    }
+    ;
+}
+exports.HostNameValidator = HostNameValidator;
+//# sourceMappingURL=asset-configurator.js.map

package/dist/uilogic/cloud-resource-configurators/asset-configurator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"asset-configurator.js","sourceRoot":"","sources":["../../../src/uilogic/cloud-resource-configurators/asset-configurator.ts"],"names":[],"mappings":"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"}

package/dist/uilogic/cloud-resource-configurators/aws-resource-configurator.d.ts

@@ -40,10 +40,12 @@ export declare class AwsResourceConfigurator implements IFileStoreConfigurator,
         spec: ClusterDef;
         defaults: Partial<ClusterDef>;
     }>;
+    private promptForIngressSpec;
     defineClusterCaptureParams(initial: Partial<ClusterDef>, defaults?: Partial<ClusterDef>): Promise<{
         spec: ClusterCaptureDef;
         defaults: Partial<ClusterDef>;
     }>;
+    private promptForName;
     private promptForNodeSpec;
     private promptForLocation;
     /** Asks the user whether to keep the default version, and if not presents a select list. */

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

@@ -12,6 +12,8 @@ const codiac_relay_1 = require("../../apis/codiac-relay");
 const codiac_constants_1 = require("../../codiac-constants");
 const contracts_2 = require("../../relay/contracts");
 const ops_1 = require("../../ops");
+const cli_common_1 = require("../../cli-common");
+const type_safety_utils_1 = require("../type-safety-utils");
 /** Walks the user through the selection of an existing
  * or the declaration of a new image registry.
  */
@@ -243,8 +245,7 @@ let AwsResourceConfigurator = class AwsResourceConfigurator {
                             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.name = yield this.promptForName(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))!;
@@ -258,6 +259,7 @@ let AwsResourceConfigurator = class AwsResourceConfigurator {
                     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);
+                    cluster.ingressDef = yield this.promptForIngressSpec(initial.ingressDef);
                     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)
@@ -280,11 +282,61 @@ let AwsResourceConfigurator = class AwsResourceConfigurator {
             }));
         });
     }
+    promptForIngressSpec(current) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            // INTERNAL?
+            let choices = []; //Object.keys(IngressExposure).map(k => <PromptChoice>{ name: k, value: k });
+            choices.push({ value: contracts_1.IngressExposure.external, name: contracts_1.IngressExposure.external.concat(this._styler.dim(" (Accessible from the internet)")) });
+            choices.push({ value: contracts_1.IngressExposure.internal, name: contracts_1.IngressExposure.internal.concat(this._styler.dim(" (private, inside a network)")) });
+            // choices.push({ value: IngressExposure.none, name: IngressExposure.none.concat(this._styler.dim(" (do not install)")) });
+            // default to external
+            let access = type_safety_utils_1.TypeSafetyUtils.toBoolean(current === null || current === void 0 ? void 0 : current.internal) ? contracts_1.IngressExposure.internal : contracts_1.IngressExposure.external;
+            let keep = false;
+            keep = yield this._ui.promptConfirm("internalConfirm", "Ingress: ".concat(this._styler.hilite(access)), true);
+            if (!keep) {
+                let selected = (yield this._ui.promptSelect("internal", "Ingress: ", choices));
+                access = type_safety_utils_1.TypeSafetyUtils.toEnum(contracts_1.IngressExposure, selected); // assertion ok because the list is limited to valid values.
+            }
+            // Convert to domain
+            let output;
+            if (access == contracts_1.IngressExposure.internal) {
+                output = (current !== null && current !== void 0 ? current : {});
+                output.internal = true;
+            }
+            else {
+                output = current;
+                if (output)
+                    delete output.internal;
+            }
+            return output;
+        });
+    }
     defineClusterCaptureParams(initial, defaults) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             throw new Error("Cluster capture not yet implemented for AWS.");
         });
     }
+    promptForName(current) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            let ultimate;
+            let keepName = false;
+            if (current != undefined && !_.isEmpty(current)) {
+                // if (takeDefaults) {
+                //   this._ui.userMessage("Cluster name: ".concat(this._styler.hilite(cluster.name)));
+                // } else {
+                keepName = yield this._ui.promptConfirm("nameConfirm", "Cluster name: ".concat(this._styler.hilite(current)), true);
+                if (keepName)
+                    ultimate = current;
+                // }
+            }
+            if (!keepName || ultimate == undefined /* undef check is redundant, but its there for typescript */) {
+                do {
+                    ultimate = (yield this._ui.prompt("name", "Cluster name: ", true, current));
+                } while (_.isEmpty(ultimate));
+            }
+            return ultimate;
+        });
+    }
     promptForNodeSpec(defaultValue) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             let output;
@@ -305,7 +357,10 @@ let AwsResourceConfigurator = class AwsResourceConfigurator {
                 }
                 else {
                     let nodeTypeChoices = allNodeTypes.map(x => { return { name: x, value: x }; });
-                    output = (yield this._ui.promptSelect("nodeSpec", "Node type: ", nodeTypeChoices));
+                    // TODO: Fuzzy-search here
+                    // output = (await this._ui.promptSelect("nodeSpec", "Node type: ", nodeTypeChoices))!;
+                    let fuzzySelector = new cli_common_1.PromptSelectFuzzy(this.logger, this._ui, this._styler);
+                    output = (yield fuzzySelector.go("nodeSpec", "Node type: ", false, defaultValue, false, () => tslib_1.__awaiter(this, void 0, void 0, function* () { return nodeTypeChoices; })));
                 }
                 return output;
             }