@codiac.io/codiac-cli 1.2.236 → 1.2.248

package/dist/relay/relay-container.js

@@ -16,7 +16,7 @@ const inversify_1 = require("inversify");
 const codiac_ops_common_1 = require("@codiac.io/codiac-ops-common");
 const child_process_1 = require("child_process");
 const DEFAULT_IMAGE_NAME = "codiacimages/codiac-relay";
-const DEFAULT_IMAGE_TAG = "1.2.61";
+const DEFAULT_IMAGE_TAG = "1.2.68";
 const DEFUALT_CONTIANER_NAME = "codiac-relay";
 const DEFAULT_HEALTH_CHECK_URL = "http://localhost:5799/heartbeat-json"; //  /ready-state";
 const DEFAULT_RETRY_TIMOUT_IN_MINUTES = 1;
@@ -49,8 +49,23 @@ let RelayContainer = class RelayContainer {
         });
         this._cliExec = new cli_tools_1.CliExec(logger);
         this.getDocker();
-        // The api's may already be running. Let's see.
-        this.healthCheck();
+        // This should hit anytime the image tag changes, which triggers the workflow to rip and replace if its not the same versions
+        (0, rxjs_1.of)(this.imageTag)
+            .pipe((0, operators_1.distinctUntilChanged)())
+            .pipe((0, operators_1.concatMap)(_ => this.versionMismatch()))
+            .pipe((0, operators_1.concatMap)(versionMismatch => {
+            if (versionMismatch) {
+                return this.stop()
+                    .pipe((0, operators_1.concatMap)(_ => this.remove()))
+                    .pipe((0, operators_1.concatMap)(_ => this.deleteRelayImage()))
+                    .pipe((0, operators_1.concatMap)(_ => this.pullImage()));
+            }
+            else {
+                // The api's may already be running. Let's see.
+                return (0, rxjs_1.of)("no work was done");
+            }
+        }))
+            .subscribe(_ => this.healthCheck());
         //  If we find docker is not started, we put ourselves into a loop, asking the user to kick it on
         this.dockerFailed$
             .pipe((0, operators_1.delay)(10000))
@@ -88,6 +103,126 @@ let RelayContainer = class RelayContainer {
         }))
             .subscribe();
     }
+    versionMismatch() {
+        // Confirm the latest version is running, otherwise rip and replace
+        return this.getRunningContainers().pipe((0, operators_1.map)((response) => {
+            if (response) {
+                const currentVersion = response[0];
+                return !(currentVersion.RepoTags[0].includes(DEFAULT_IMAGE_TAG));
+            }
+            else
+                return false;
+        }));
+    }
+    deleteRelayImage() {
+        return this.getRelayImages().pipe((0, operators_1.map)((response) => {
+            const output = new rxjs_1.Subject();
+            this.logger.debug("Deleting relay images no longer targeted");
+            if (response) {
+                const localRelayImages = response;
+                localRelayImages
+                    .filter(i => i.Tag != this.imageTag)
+                    .forEach(image => {
+                    this._cliExec.execAsyncStdOut(`docker rmi ${image.Repository}:${image.Tag}`, { cwd: this.projectRoot }, IBetterLogger_1.LogLevel.debug, true)
+                        .then((fullfulled) => {
+                        this.logger.debug('pull response', fullfulled);
+                        this.createContainer();
+                        output.next('Remove Image complete');
+                    })
+                        .catch(error => {
+                        this.logger.debug(`Removing Relay image failed.`);
+                    });
+                });
+            }
+            else
+                output.next('Remove Image complete');
+            output.subscribe();
+            return output.asObservable();
+        }));
+    }
+    getRelayImageFromDockerPS() {
+        const command = `docker ps -a  | grep -v ID`;
+        const output = new rxjs_1.Subject();
+        this._cliExec.execAsyncStdOut(command, { cwd: this.projectRoot }, IBetterLogger_1.LogLevel.debug, true)
+            .then((stdout) => {
+            // Split the output into lines and parse each line as JSON
+            try {
+                const listedContainers = stdout.split("\n");
+                const relayImangeName = listedContainers.find(r => {
+                    const name = r.split("   ")[1].includes(this.imageName);
+                    if (name)
+                        return name;
+                });
+                if (relayImangeName != "") {
+                    output.next(relayImangeName.split("   ")[1]);
+                }
+                else
+                    output.next(undefined);
+            }
+            catch (parseError) {
+                console.error(`Error parsing Docker output: ${parseError}`);
+                return parseError;
+            }
+        })
+            .catch(error => {
+            this.logger.debug(`get running containers Failed.`);
+            output.next(undefined);
+        });
+        return output.asObservable();
+    }
+    getRunningContainers() {
+        const output = new rxjs_1.Subject();
+        return this.getRelayImageFromDockerPS()
+            .pipe((0, operators_1.concatMap)(running => {
+            const command = `docker inspect ${running}`;
+            this._cliExec.execAsyncStdOut(command, { cwd: this.projectRoot }, IBetterLogger_1.LogLevel.debug, true)
+                .then((stdout) => {
+                // Split the output into lines and parse each line as JSON
+                try {
+                    if (stdout != "") {
+                        const images = JSON.parse(stdout);
+                        output.next(images);
+                    }
+                    else
+                        output.next(undefined);
+                }
+                catch (parseError) {
+                    console.error(`Error parsing Docker output: ${parseError}`);
+                    output.next(undefined);
+                }
+            })
+                .catch(error => {
+                this.logger.debug(`get running containers Failed.`);
+                output.next(undefined);
+            });
+            return output.asObservable();
+        }));
+    }
+    getRelayImages(tag) {
+        const command = `docker images --format "{{json .}}" ${this.imageName}${(tag) ? ":" + tag : ""}`;
+        const output = new rxjs_1.Subject();
+        this._cliExec.execAsyncStdOut(command, { cwd: this.projectRoot }, IBetterLogger_1.LogLevel.debug, true)
+            .then((stdout) => {
+            // Split the output into lines and parse each line as JSON
+            try {
+                if (stdout != "") {
+                    const lines = stdout.trim().split('\n');
+                    const images = lines.map(line => JSON.parse(line));
+                    output.next(images);
+                }
+                else
+                    output.next(undefined);
+            }
+            catch (parseError) {
+                console.error(`Error parsing Docker output: ${parseError}`);
+                return parseError;
+            }
+        })
+            .catch(error => {
+            this.logger.debug(`get relay images failed.`);
+        });
+        return output.asObservable();
+    }
     get start$() {
         return this.startSubj.asObservable();
     }

package/dist/relay/relay-container.js.map

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

package/dist/relay/wsclient/relay-websocket-client.js

@@ -85,7 +85,8 @@ let RelayWebsocketClient = RelayWebsocketClient_1 = class RelayWebsocketClient {
                 var _a;
                 try {
                     if (this.socket) {
-                        if (![this.socket.CLOSED, this.socket.CLOSING].includes(this.socket.readyState)) {
+                        let closingStates = [this.socket.CLOSED, this.socket.CLOSING];
+                        if (!closingStates.includes(this.socket.readyState)) {
                             this.socket.close();
                             this.logger.debug(`Closed web socket.`);
                         }

package/dist/relay/wsclient/relay-websocket-client.js.map

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

package/dist/uilogic/cloud-provider-contextualizer.d.ts

@@ -31,10 +31,10 @@ export declare class CloudProviderContextualizer {
      * @returns username
      *
      * @param suppressConfirmations TODO: Remove this argument and apply the non-tty ui provider for silent mode.
-     * @param providedUserName TODO: Remove this argument and rely on relay state (via separate login step).
-     * @param providedSecret TODO: Remove this argument and rely on relay state (via separate login step).
+     * @param providerUserName TODO: Remove this argument and rely on relay state (via separate login step).
+     * @param providerSecret TODO: Remove this argument and rely on relay state (via separate login step).
      */
-    promptForCloudProviderCreds(ioc: interfaces.Container, providerCode: CloudProviderEnum, suppressConfirmations?: boolean, providedUserName?: string, providedSecret?: string): Promise<string>;
+    promptForCloudProviderCreds(ioc: interfaces.Container, providerCode: CloudProviderEnum, suppressConfirmations?: boolean, providerUserName?: string, providerSecret?: string): Promise<string>;
     /** Signs the user out from the given cloud service provider.
      *
      * @returns username

package/dist/uilogic/cloud-provider-contextualizer.js

@@ -70,10 +70,10 @@ let CloudProviderContextualizer = CloudProviderContextualizer_1 = class CloudPro
      * @returns username
      *
      * @param suppressConfirmations TODO: Remove this argument and apply the non-tty ui provider for silent mode.
-     * @param providedUserName TODO: Remove this argument and rely on relay state (via separate login step).
-     * @param providedSecret TODO: Remove this argument and rely on relay state (via separate login step).
+     * @param providerUserName TODO: Remove this argument and rely on relay state (via separate login step).
+     * @param providerSecret TODO: Remove this argument and rely on relay state (via separate login step).
      */
-    promptForCloudProviderCreds(ioc, providerCode, suppressConfirmations, providedUserName, providedSecret) {
+    promptForCloudProviderCreds(ioc, providerCode, suppressConfirmations, providerUserName, providerSecret) {
         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;
@@ -119,9 +119,9 @@ let CloudProviderContextualizer = CloudProviderContextualizer_1 = class CloudPro
                         let loginUi = this.loginUiFactory.create(providerCode, ioc);
                         let userName;
                         // if (suppressConfirmations)
-                        [isAuthed, userName] = yield loginUi.promptToLogin(undefined, suppressConfirmations, providedUserName, providedSecret);
+                        [isAuthed, userName] = yield loginUi.promptToLogin(undefined, suppressConfirmations, providerUserName, providerSecret);
                         if (!isAuthed)
-                            throw new Error(`Login to ${providerCode} failed${providedUserName ? " for " + providedUserName : ""}.`);
+                            throw new Error(`Login to ${providerCode} failed${providerUserName ? " for " + providerUserName : ""}.`);
                         // while (!isAuthed && !suppressConfirmations) {
                         //   loginUi = this.loginUiFactory.create(providerCode, ioc);
                         //   [isAuthed, userName] = await loginUi.promptToLogin(undefined, suppressConfirmations, providedUserName, providedSecret);

package/dist/uilogic/config-ui-utils.d.ts

@@ -3,11 +3,7 @@ import { IOutputStyler, IUserInputProvider, ValidationResult } from "@codiac.io/
 import { CodiacClient } from "../apis/codiac-api";
 import { CabinetClusterRoot, ConfigDef, ConfigDefTypesEnum, EnterpriseRoot, EnvironmentRoot, KvpReference, RootMap, ScopedSetting, ScopeLevel } from "../apis/codiac-api/contracts";
 import { Schema } from 'jsonschema';
-export type TextValueParent = {
-    text: string;
-    value: string;
-    children?: TextValueParent[];
-};
+import { ICabinetTreeEmbellisher, RootMapUiUtils, TextValueParent } from './rootmap-ui-utils';
 /** TODO: Move this into the Domain */
 export declare enum SpecialConfigTypes {
     "env" = "env",
@@ -37,9 +33,7 @@ export declare const RegexBySettingType: ConfigTypeMap<{
     rxForKey?: RegExp;
     rxForValue?: RegExp;
 } | undefined>;
-export declare class ConfigUiUtils {
-    private _ui;
-    private _styler;
+export declare class ConfigUiUtils extends RootMapUiUtils {
     private _codiacApi;
     /** The prefix on a setting value indicating that the setting value is actually sourced from a key-value store (such as an Azure key vault or AWS secret store). */
     static SOURCED_VALUE_PREFIX: string;
@@ -62,21 +56,7 @@ export declare class ConfigUiUtils {
     /** Mutates the setting object to convert a value that is a serialized source reference into the explicit source property  */
     deserializeSourcedValue(setting: AtLeast<ScopedSetting, "value" | "source">): void;
     buildConfigTree(settings: Pick<ScopedSetting, "setting" | "value">[]): TextValueParent[];
-    constructor(_ui: IUserInputProvider, _styler: IOutputStyler, _codiacApi: CodiacClient);
-    /** Validates the candidate's current value,
-     * prompts the user if necessary,
-     * mutates the candidate as needed,
-     * and returns the applicable enterprise obj from the RootMap.
-     *
-     * Throws when unable to assign one,
-     * so otherwise, candidate SHALL ALWAYS end up with an enterprise assigned.*/
-    promptForEnterprise<TCandidate extends {
-        enterprise?: string | undefined;
-    }>(candidate: TCandidate, rootMap: RootMap): Promise<EnterpriseRoot>;
-    /** Returns the ultiamate asset name and the flag telling whether the original user input was changed. */
-    promptForAsset(assets: {
-        name: string;
-    }[], current?: string | undefined): Promise<[string, boolean]>;
+    constructor(ui: IUserInputProvider, styler: IOutputStyler, _codiacApi: CodiacClient);
     promptForTypeAndFile(enterprise: string, asset: string, configType?: SpecialConfigTypes | undefined, targetFile?: string | undefined, existingConfigDefs?: Pick<ConfigDef, "type" | "targetFile">[] | undefined, allowAddNew?: boolean, takeDefaults?: boolean): Promise<[SpecialConfigTypes | undefined, string | undefined, ScopedSetting[] | undefined, boolean]>;
     /** Prompts for a single setting name.
    *
@@ -136,21 +116,8 @@ export declare class ConfigUiUtils {
     validateAndPromptForScope(rootMap: RootMap, enterprise: string, scope?: ScopeLevel | undefined, target?: string | undefined, existings?: AtLeast<ScopedSetting, "scope" | "target">[], allowEverywhere?: boolean): Promise<[(ScopeLevel | undefined), (string | undefined), boolean]>;
     /** NOTE: /target output can be undefined ONLY if allowEverywhere is set to true.  If false, you can safely apply an assertion operator (!) to scope and target. */
     promptForScope(enterprise: string, rootMap: RootMap, existings?: AtLeast<ScopedSetting, "scope" | "target">[], allowEverywhere?: boolean, prompt?: string): Promise<Pick<ScopedSetting, "scope" | "target"> | undefined>;
-    /** Selects a cabinet from a tree view.
-     *
-     * @returns Cabinet object from RootMap and the environment name.
-     * @param takeDefaults (optional, defaults to false) suppresses confirmation of default values when user has not provided any (but NOT when the user-supplied values were invalid and automatically CHANGED to a default).
-     */
-    promptForCabinet(enterprise: string, rootMap: RootMap, defaultValue?: string | undefined, takeDefaults?: boolean): Promise<[CabinetClusterRoot, string]>;
-    deriveEnvironmentFrom(enterprise: string, cabinet: string, rootMap: RootMap): EnvironmentRoot;
-    /** Retrieves the cabinet object from the RootMap. */
-    getCabinetInfrx(enterprise: string, environment: string, cabinet: string, rootMap: RootMap): CabinetClusterRoot;
-    /** sets each value to "scope|target".
-   * */
-    buildCabinetTree(rootMap: RootMap, existings?: AtLeast<ScopedSetting, "scope" | "target">[]): TextValueParent[];
-    /** Truncates the string to the given length with an ellipses as suffix */
-    private ellipsis;
-    private buildSelectChoicesFrom;
+    /** Appends the setting (or a count of settings) applied at each scope level */
+    createSettingsEmbellisher(existings?: AtLeast<ScopedSetting, "scope" | "target">[]): ICabinetTreeEmbellisher;
     /** Determines the format of the string that was piped in,
    * and parses it into an object in memory.
    *