@coalescesoftware/coa 1.0.99 → 1.0.102

package/bin/CLIProfile.js

@@ -19,20 +19,37 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GetCLIConfig = exports.ICLIProfileExample = void 0;
+exports.GetCLIConfig = exports.ICLIProfileExample = exports.GetDefaultLocationForCoaConfigFile = void 0;
 /* eslint-disable multiline-comment-style */
 const Shared = __importStar(require("@coalescesoftware/shared"));
+const immer = __importStar(require("immer"));
 const os = require('os');
 const path = require('path');
 const ini = require('ini');
 const fs = require('fs');
+const RemoveCredentialsFromCLIProfile = (cliProfile) => {
+    return immer.produce(cliProfile, (draft) => {
+        if (draft.snowflakePassword)
+            draft.snowflakePassword = '<REDACTED>';
+        if (draft.snowflakeAccount)
+            draft.snowflakeAccount = '<REDACTED>';
+    });
+};
+const RemoveCredentialsFromCLIProfiles = (cliProfiles) => {
+    return immer.produce(cliProfiles, (draftState) => {
+        Object.keys(draftState).forEach((cliProfileName) => {
+            draftState[cliProfileName] = RemoveCredentialsFromCLIProfile(cliProfiles[cliProfileName]);
+        });
+    });
+};
 const CLILogger = Shared.Logging.GetLogger(Shared.Logging.LoggingArea.CLI_INTERNAL);
-const getDefaultLocationForCoaConfigFile = () => {
+const GetDefaultLocationForCoaConfigFile = () => {
     const homedir = os.homedir();
     const coaConfigLocation = path.join(homedir, ".coa/config");
     CLILogger.info("using default location", coaConfigLocation);
     return coaConfigLocation;
 };
+exports.GetDefaultLocationForCoaConfigFile = GetDefaultLocationForCoaConfigFile;
 //voodoo typescript magic in order to get runtime and compiletime ICLIProfile code
 //https://stackoverflow.com/questions/45670705/iterate-over-interface-properties-in-typescript
 exports.ICLIProfileExample = {
@@ -45,9 +62,12 @@ exports.ICLIProfileExample = {
     snowflakeRole: "Snowflake Role",
     snowflakeUsername: "Snowflake Username",
     snowflakeWarehouse: "Snowflake Warehouse",
-    token: "Coalesce Token"
+    token: "Coalesce Token",
+    jobID: "Coalesce JobID",
+    include: "Coalesce Node Selector",
+    exclude: "Coalesce Node Selector"
 };
-const readCLIProfiles = (filePath) => {
+const ReadCLIProfiles = (filePath) => {
     return fs.promises.readFile(filePath, 'utf-8').then((file) => {
         return ini.parse(file);
     }).catch((err) => {
@@ -55,10 +75,9 @@ const readCLIProfiles = (filePath) => {
         throw new Error("unable to read cli profile");
     });
 };
-const getFinalCLIProfile = (commandLineOverrides) => {
+const GetFinalCLIProfile = (commandLineOverrides, configFileLocation) => {
     let profileToUseOverride = commandLineOverrides.profile ? commandLineOverrides.profile : null;
-    const defaultPath = getDefaultLocationForCoaConfigFile();
-    return readCLIProfiles(defaultPath).then((cliProfiles) => {
+    return ReadCLIProfiles(configFileLocation).then((cliProfiles) => {
         return cliProfiles;
     }).catch((err) => {
         //unable to read cli profiles 
@@ -74,7 +93,7 @@ const getFinalCLIProfile = (commandLineOverrides) => {
         const profileToUse = profileToUseOverride || //cli override
             (!!defaultCLIProfile && defaultCLIProfile.profile) //default profile exists
             || "";
-        CLILogger.info("using profile", profileToUse, "cliProfiles", JSON.stringify(cliProfiles));
+        CLILogger.info("using profile", profileToUse, "cliProfiles", JSON.stringify(RemoveCredentialsFromCLIProfiles(cliProfiles)));
         if (profileToUse) {
             if (!(profileToUse in cliProfiles)) {
                 throw new Error(`unable to find profile ${profileToUse}`);
@@ -86,13 +105,16 @@ const getFinalCLIProfile = (commandLineOverrides) => {
         return finalCLIProfile;
     });
 };
-const GetCLIConfig = (commandLineOverrides) => {
-    return getFinalCLIProfile(commandLineOverrides).then((cliProfile) => {
-        CLILogger.info("got final cli profile", JSON.stringify(cliProfile));
-        return {
+const GetCLIConfig = (commandLineOverrides, configFileLocation) => {
+    return GetFinalCLIProfile(commandLineOverrides, configFileLocation).then((cliProfile) => {
+        CLILogger.info("got final cli profile configFileLocation:", configFileLocation, JSON.stringify(RemoveCredentialsFromCLIProfile(cliProfile)));
+        const cliConfig = {
             token: cliProfile.token,
             runDetails: {
-                environmentID: cliProfile.environmentID
+                environmentID: cliProfile.environmentID,
+                jobID: cliProfile.jobID,
+                includeNodesSelector: cliProfile.include,
+                excludeNodesSelector: cliProfile.exclude
             },
             userCredentials: {
                 snowflakeAccount: cliProfile.snowflakeAccount,
@@ -104,6 +126,8 @@ const GetCLIConfig = (commandLineOverrides) => {
                 snowflakeWarehouse: cliProfile.snowflakeWarehouse
             }
         };
+        Shared.Common.CleanupUndefinedValuesFromObject(cliConfig);
+        return cliConfig;
     });
 };
 exports.GetCLIConfig = GetCLIConfig;

package/bin/index.js

@@ -39,7 +39,8 @@ const LogCLIInternal = Shared.Logging.GetLogger(Shared.Logging.LoggingArea.CLI_I
 const program = new commander_1.Command();
 program.version(require("../package.json").version, "-v, --version");
 program.option("-b, --debug", "Output extra debugging", false);
-const addOverridesToCommand = (command) => {
+program.option("--config <coa-config-location>", "coa config file location", CLIProfile.GetDefaultLocationForCoaConfigFile());
+const AddOverridesToCommand = (command) => {
     Object.keys(CLIProfile.ICLIProfileExample).forEach((key) => {
         command.option(`--${key} <value>`, CLIProfile.ICLIProfileExample[key], "");
     });
@@ -47,14 +48,13 @@ const addOverridesToCommand = (command) => {
 };
 //computeCLIOverrides returns an object that has a value if any of them have been specified at the command line
 //this is used as the final override when getting a CLIConfig
-const computeCLIOverrides = (command) => {
+const ComputeCLIOverrides = (command) => {
     let overrides = {};
     Object.keys(CLIProfile.ICLIProfileExample).forEach((key) => {
         const source = command.getOptionValueSource(key);
-        if (source == 'cli') {
+        if (source == "cli") {
             overrides[key] = command.getOptionValue(key);
         }
-        return overrides;
     });
     return overrides;
 };
@@ -68,12 +68,12 @@ program.command("none", { hidden: true, isDefault: true })
 /**
  * Plan command is responsible for reading files and creating a Coalesce Deployment Plan
  */
-addOverridesToCommand(program.command(Shared.CLIOperations.ECLICommands.Plan))
+AddOverridesToCommand(program.command(Shared.CLIOperations.ECLICommands.Plan))
     .option("-d, --dir <dir>", "Coalesce pipeline Yaml file path", ".")
     .option("--out <plan-location>", "Coalesce plan location", "./coa-plan.json")
     .description("plan a Coalesce deployment")
     .action((options, cmd) => {
-    const cliOverrides = computeCLIOverrides(cmd);
+    const cliOverrides = ComputeCLIOverrides(cmd);
     const optsWithGlobals = cmd.optsWithGlobals();
     const directoryPath = optsWithGlobals.dir;
     let logContextToUse;
@@ -89,7 +89,7 @@ addOverridesToCommand(program.command(Shared.CLIOperations.ECLICommands.Plan))
         Shared.CLIOperations.DisableNonCLIConsoleLogs();
     }
     let config;
-    return CLIProfile.GetCLIConfig(cliOverrides)
+    return CLIProfile.GetCLIConfig(cliOverrides, optsWithGlobals.config)
         .then((configResult) => {
         config = configResult;
         return Shared.SchedulerOperations.AuthenticateFirebaseTokenAndRetrieveTeamInfoForCLI(config.token, undefined);
@@ -118,11 +118,11 @@ addOverridesToCommand(program.command(Shared.CLIOperations.ECLICommands.Plan))
 /**
  * Deploy command is responsible for taking an already generated plan, and executing it
  */
-addOverridesToCommand(program.command(Shared.CLIOperations.ECLICommands.Deploy))
+AddOverridesToCommand(program.command(Shared.CLIOperations.ECLICommands.Deploy))
     .option("-p, --plan <plan-location>", "Coalesce plan location", "./coa-plan.json")
     .description("run a coalesce deployment plan")
     .action((options, cmd) => {
-    const cliOverrides = computeCLIOverrides(cmd);
+    const cliOverrides = ComputeCLIOverrides(cmd);
     const optsWithGlobals = cmd.optsWithGlobals();
     const plan = JSON.parse(fs_1.default.readFileSync(optsWithGlobals.plan, { encoding: "utf-8" }));
     // const config = JSON.parse(fs.readFileSync(cmd.config, { encoding: "utf-8" }))
@@ -140,7 +140,7 @@ addOverridesToCommand(program.command(Shared.CLIOperations.ECLICommands.Deploy))
     let logContextToUse;
     let runInfo;
     let config;
-    return CLIProfile.GetCLIConfig(cliOverrides)
+    return CLIProfile.GetCLIConfig(cliOverrides, optsWithGlobals.config)
         .then((configResult) => {
         config = configResult;
         return Shared.SchedulerOperations.AuthenticateFirebaseTokenAndRetrieveTeamInfoForCLI(config.token, undefined);
@@ -168,7 +168,7 @@ addOverridesToCommand(program.command(Shared.CLIOperations.ECLICommands.Deploy))
             Shared.CLIOperations.ExitCLISafe(0);
         })
             .catch(error => {
-            LogCLI.errorContext(logContextToUse, chalk_1.default.redBright(`An error occurred during deployment ${error}`));
+            LogCLI.errorContext(logContextToUse, chalk_1.default.redBright(`An error occurred during deployment ${error.toString()}`));
             Shared.CLIOperations.ExitCLISafe(1);
         });
     });
@@ -176,10 +176,10 @@ addOverridesToCommand(program.command(Shared.CLIOperations.ECLICommands.Deploy))
 /**
  * Refresh command begins a locally executed Coalesce Environment Run
  */
-addOverridesToCommand(program.command(Shared.CLIOperations.ECLICommands.Refresh))
+AddOverridesToCommand(program.command(Shared.CLIOperations.ECLICommands.Refresh))
     .description("runs a Coalesce pipeline")
     .action((options, command) => {
-    const cliOverrides = computeCLIOverrides(command);
+    const cliOverrides = ComputeCLIOverrides(command);
     const optsWithGlobals = command.optsWithGlobals();
     //const token = fs.readFileSync(cmd.token, { encoding: "utf8" })
     //const config = JSON.parse(fs.readFileSync(cmd.config, { encoding: "utf8" }))
@@ -201,17 +201,21 @@ addOverridesToCommand(program.command(Shared.CLIOperations.ECLICommands.Refresh)
     //WHY DO WE HAVE THIS CONFIG? 
     let runInfo;
     let config;
-    return CLIProfile.GetCLIConfig(cliOverrides)
+    return CLIProfile.GetCLIConfig(cliOverrides, optsWithGlobals.config)
         .then((configResult) => {
         config = configResult;
         return Shared.SchedulerOperations.AuthenticateFirebaseTokenAndRetrieveTeamInfoForCLI(config.token, undefined);
-    }).then(({ teamInfo }) => {
+    })
+        .then(({ teamInfo }) => {
         Shared.Logging.SetBackendGlobalContext({ userID: teamInfo.fbUserID, orgID: teamInfo.fbTeamID });
         runInfo = {
             runType: Shared.Runner.ERunType.refresh,
             runStatus: Shared.Runner.ERunStatus.running,
             runDetails: {
-                environmentID: config.runDetails.environmentID
+                environmentID: config.runDetails.environmentID,
+                jobID: config.runDetails.jobID,
+                includeNodesSelector: config.runDetails.includeNodesSelector,
+                excludeNodesSelector: config.runDetails.excludeNodesSelector
             },
             userCredentials: config.userCredentials,
             runTimeParameters: {}
@@ -230,11 +234,11 @@ addOverridesToCommand(program.command(Shared.CLIOperations.ECLICommands.Refresh)
             .then(() => {
             LogCLI.infoContext(logContextToUse, "Refresh successful!");
             Shared.CLIOperations.ExitCLISafe(0);
-        })
-            .catch(error => {
-            LogCLI.errorContext(logContextToUse, chalk_1.default.redBright(`Error during refresh!: ${error.toString()}`));
-            Shared.CLIOperations.ExitCLISafe(1);
         });
+    })
+        .catch(error => {
+        LogCLI.errorContext(logContextToUse, chalk_1.default.redBright(`Error during refresh!: ${error.toString()}`));
+        Shared.CLIOperations.ExitCLISafe(1);
     });
 });
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@coalescesoftware/coa",
-    "version": "1.0.99",
+    "version": "1.0.102",
     "license": "ISC",
     "author": "Coalesce Automation, Inc.",
     "main": "index.js",
@@ -12,7 +12,7 @@
         "start-cli-debug": "yarn run start --debug"
     },
     "dependencies": {
-        "@coalescesoftware/shared": "^1.0.106",
+        "@coalescesoftware/shared": "^1.0.111",
         "chalk": "^4.1.2",
         "commander": "^9.2.0",
         "firebase": "8.2.0",