@coalescesoftware/coa 1.0.113 → 1.0.116

package/bin/CLIProfile.js

@@ -55,6 +55,7 @@ exports.GetDefaultLocationForCoaConfigFile = GetDefaultLocationForCoaConfigFile;
 exports.ICLIProfileExample = {
     profile: "Profile To Use",
     environmentID: "Environment ID",
+    parameters: "Parameters",
     snowflakeAccount: "Snowflake Account To Use",
     snowflakeAuthType: "Snowflake Auth Type (Basic, KeyPair)",
     snowflakeKeyPairPath: "Snowflake Key Pair Path",
@@ -68,21 +69,29 @@ exports.ICLIProfileExample = {
     exclude: "Coalesce Node Selector"
 };
 const ReadCLIProfiles = (filePath) => {
-    return fs.promises.readFile(filePath, 'utf-8').then((file) => {
+    let filePathToUse;
+    if (!filePath) {
+        filePathToUse = (0, exports.GetDefaultLocationForCoaConfigFile)();
+    }
+    else {
+        filePathToUse = filePath;
+    }
+    return fs.promises.readFile(filePathToUse, 'utf-8')
+        .then((file) => {
         return ini.parse(file);
-    }).catch((err) => {
+    })
+        .catch((err) => {
         CLILogger.error("unable to read cli profile file filePath:", filePath, err);
-        throw new Error("unable to read cli profile");
+        if (!filePath) //if no filepath was specified, silently proceed
+            return {};
+        else //unable to proceed couldnt read file
+            throw new Error(`unable to read cli profile:${filePathToUse}`);
     });
 };
 const GetFinalCLIProfile = (commandLineOverrides, configFileLocation) => {
     let profileToUseOverride = commandLineOverrides.profile ? commandLineOverrides.profile : null;
-    return ReadCLIProfiles(configFileLocation).then((cliProfiles) => {
-        return cliProfiles;
-    }).catch((err) => {
-        //unable to read cli profiles 
-        return {};
-    }).then((cliProfiles) => {
+    return ReadCLIProfiles(configFileLocation)
+        .then((cliProfiles) => {
         const defaultCLIProfile = cliProfiles.default;
         let finalCLIProfile = {};
         //if theres a default cli profile, start with that
@@ -105,6 +114,8 @@ const GetFinalCLIProfile = (commandLineOverrides, configFileLocation) => {
         return finalCLIProfile;
     });
 };
+//Get CLI Config given command line overrides and a config file
+//config file location can be null - which means to use default location
 const GetCLIConfig = (commandLineOverrides, configFileLocation) => {
     return GetFinalCLIProfile(commandLineOverrides, configFileLocation).then((cliProfile) => {
         CLILogger.info("got final cli profile configFileLocation:", configFileLocation, JSON.stringify(RemoveCredentialsFromCLIProfile(cliProfile)));
@@ -124,7 +135,8 @@ const GetCLIConfig = (commandLineOverrides, configFileLocation) => {
                 snowflakeRole: cliProfile.snowflakeRole,
                 snowflakeUsername: cliProfile.snowflakeUsername,
                 snowflakeWarehouse: cliProfile.snowflakeWarehouse
-            }
+            },
+            runtimeParameters: cliProfile.parameters
         };
         Shared.Common.CleanupUndefinedValuesFromObject(cliConfig);
         return cliConfig;

package/bin/CommonCLI.js

@@ -19,7 +19,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FinishWithOutputFile = exports.GetUserConnectionForCLI = exports.CleanupCLIJob = void 0;
+exports.FinishWithOutputFile = exports.ValidateRuntimeParameters = exports.GetRuntimeParametersFromFirestore = exports.GetUserConnectionForCLI = exports.CleanupCLIJob = void 0;
 const Shared = __importStar(require("@coalescesoftware/shared"));
 const fs = __importStar(require("fs"));
 const crypto = __importStar(require("crypto"));
@@ -76,21 +76,20 @@ const GetKeyPairKey = (keyPairPath) => {
 };
 const GetUserConnectionForCLI = (userID, runInfo) => {
     return new Promise((resolve, reject) => {
-        var _a, _b, _c, _d, _e, _f, _g;
+        var _a, _b, _c, _d, _e, _f;
         const output = {
             connectionDetails: {
                 userID,
                 user: (_a = runInfo.userCredentials) === null || _a === void 0 ? void 0 : _a.snowflakeUsername,
                 role: (_b = runInfo.userCredentials) === null || _b === void 0 ? void 0 : _b.snowflakeRole,
                 warehouse: (_c = runInfo.userCredentials) === null || _c === void 0 ? void 0 : _c.snowflakeWarehouse,
-                authenticator: (_d = runInfo.userCredentials) === null || _d === void 0 ? void 0 : _d.snowflakeAuthType
             },
-            connectionType: (_e = runInfo.userCredentials) === null || _e === void 0 ? void 0 : _e.snowflakeAuthType
+            connectionType: (_d = runInfo.userCredentials) === null || _d === void 0 ? void 0 : _d.snowflakeAuthType
         };
-        if (!((_f = runInfo.userCredentials) === null || _f === void 0 ? void 0 : _f.snowflakeAuthType)) {
+        if (!((_e = runInfo.userCredentials) === null || _e === void 0 ? void 0 : _e.snowflakeAuthType)) {
             reject(new Error("ERROR (GetUserConnectionForCLI): no auth type provided"));
         }
-        else if (((_g = runInfo.userCredentials) === null || _g === void 0 ? void 0 : _g.snowflakeAuthType) === Shared.ConnectionOperations.EUserConnectionTypes.keyPair) {
+        else if (((_f = runInfo.userCredentials) === null || _f === void 0 ? void 0 : _f.snowflakeAuthType) === Shared.ConnectionOperations.EUserConnectionTypes.keyPair) {
             GetKeyPairKey(Shared.Common.getValueSafe(runInfo, ["userCredentials", "snowflakeKeyPairPath"], ""))
                 .then((keyPair) => {
                 output.connectionDetails.keyPair = keyPair;
@@ -106,6 +105,27 @@ const GetUserConnectionForCLI = (userID, runInfo) => {
     });
 };
 exports.GetUserConnectionForCLI = GetUserConnectionForCLI;
+////////
+// Runtime Parameters
+///////
+const GetRuntimeParametersFromFirestore = (firestore, teamID, environmentID) => {
+    return Shared.CommonOperations.getWorkspaceDocumentRefAdmin(firestore, teamID, environmentID).get().then((workspace) => {
+        return workspace.get("runTimeParameters");
+    });
+};
+exports.GetRuntimeParametersFromFirestore = GetRuntimeParametersFromFirestore;
+const ValidateRuntimeParameters = (runtimeParameters) => {
+    try {
+        JSON.parse(runtimeParameters);
+    }
+    catch (error) {
+        throw new Error(`Failed to parse runtime parameters: ${error.message}`);
+    }
+};
+exports.ValidateRuntimeParameters = ValidateRuntimeParameters;
+////////
+// Output File 
+///////
 const FinishWithOutputFile = (logContextToUse, outputFilePath, runCounter, token) => {
     if (!outputFilePath) {
         return Promise.resolve();

package/bin/Deploy.js

@@ -50,7 +50,7 @@ const DeployWithCLI = (plan, config, token) => {
         logContext = Shared.Logging.CreateLogContext(teamID, environmentID, userID);
         const connectionCache = new Shared.Snowflake.ConnectionStorageClass();
         RunSQL = Shared.SQLExecutorCreators.CreateRunSQLWithoutScheduler(teamDetails, connectionCache);
-        runInfo = Shared.DeployOperations.CreateDeployRequestObject(plan.plan, plan.environmentState, teamInfo, plan.gitInfo, plan.targetEnvironment, "");
+        runInfo = Shared.DeployOperations.CreateDeployRequestObject(plan.plan, plan.environmentState, teamInfo, plan.gitInfo, plan.targetEnvironment, plan.runtimeParameters);
         runInfo.userCredentials = config.userCredentials;
         return CommonCLI.GetUserConnectionForCLI(userID, runInfo);
     })