@coalescesoftware/coa 1.0.123 → 1.0.124

package/bin/CLIProfile.js

@@ -59,6 +59,7 @@ exports.ICLIProfileExample = {
     snowflakeAccount: "Snowflake Account To Use",
     snowflakeAuthType: "Snowflake Auth Type (Basic, KeyPair)",
     snowflakeKeyPairPath: "Snowflake Key Pair Path",
+    snowflakeKeyPairPass: "Snowflake Key Pair Pass",
     snowflakePassword: "Snowflake Password",
     snowflakeRole: "Snowflake Role",
     snowflakeUsername: "Snowflake Username",
@@ -132,6 +133,7 @@ const GetCLIConfig = (commandLineOverrides, configFileLocation) => {
                 snowflakeAuthType: cliProfile.snowflakeAuthType,
                 snowflakePassword: cliProfile.snowflakePassword,
                 snowflakeKeyPairPath: cliProfile.snowflakeKeyPairPath,
+                snowflakeKeyPairPass: cliProfile.snowflakeKeyPairPass,
                 snowflakeRole: cliProfile.snowflakeRole,
                 snowflakeUsername: cliProfile.snowflakeUsername,
                 snowflakeWarehouse: cliProfile.snowflakeWarehouse

package/bin/CommonCLI.js

@@ -53,14 +53,14 @@ const CleanupCLIJob = (runCompletion, firebase, logContext, action) => {
     return cleanupPromise;
 };
 exports.CleanupCLIJob = CleanupCLIJob;
-const GetKeyPairKey = (keyPairPath) => {
+const GetKeyPairKey = (keyPairPath, keyPairPass) => {
     return new Promise((resolve, reject) => {
         Shared.Common.assert(Shared.Logging.LoggingArea.RunnerBackend, !!keyPairPath, "ERROR (GetKeyPairPath): invalid or missing keyPairPath");
         const privateKeyFile = fs.readFileSync(keyPairPath);
         const privateKeyObject = crypto.createPrivateKey({
             key: privateKeyFile,
             format: "pem",
-            passphrase: "passphrase"
+            passphrase: keyPairPass
         });
         const privateKey = privateKeyObject.export({
             format: "pem",
@@ -90,7 +90,7 @@ const GetUserConnectionForCLI = (userID, runInfo) => {
             reject(new Error("ERROR (GetUserConnectionForCLI): no auth type provided"));
         }
         else if (((_f = runInfo.userCredentials) === null || _f === void 0 ? void 0 : _f.snowflakeAuthType) === Shared.ConnectionOperations.EUserConnectionTypes.keyPair) {
-            GetKeyPairKey(Shared.Common.getValueSafe(runInfo, ["userCredentials", "snowflakeKeyPairPath"], ""))
+            GetKeyPairKey(Shared.Common.getValueSafe(runInfo, ["userCredentials", "snowflakeKeyPairPath"], ""), Shared.Common.getValueSafe(runInfo, ["userCredentials", "snowflakeKeyPairPass"], ""))
                 .then((keyPair) => {
                 output.connectionDetails.keyPair = keyPair;
                 resolve(output);

package/bin/Package.js

@@ -423,7 +423,6 @@ const BuildManifest = (workspaceData) => {
         const entityImportedData = Object.keys(workspaceData[entityType]);
         manifest[entityType] = {};
         entityImportedData.forEach(namedEntityKey => {
-            debugger;
             manifest[entityType][namedEntityKey] = {
                 id: namedEntityKey,
                 name: getEntityNameFromPackageManifest(entityType, namedEntityKey)
@@ -469,7 +468,7 @@ const FlushFirestoreWorkspaceWithAllWorkspaceDataForCLIPackages = (firestore, te
 };
 const GetPackageListMessageCLI = (packageContext) => {
     const { environmentID, teamID, firestore } = packageContext;
-    return Shared.Workspaces.getAllWorkspaceDataFromFirebase(firestore, teamID, environmentID)
+    return Shared.Workspaces.getAllWorkspaceDataFromFirebase(firestore, teamID, environmentID.toString())
         .then(wsData => {
         const packages = Shared.Common.getValueSafe(wsData, ["packages"], null);
         if (packages && Object.keys(packages).length) {
@@ -592,7 +591,7 @@ const InstallPackage = (packageProvider, packageContext) => {
         let packageDependencyInfo;
         let manifest;
         PackagesLogger.infoContext(loggerContext, `Gathering your project workspace data for environment: ${environmentID}`);
-        return Shared.Workspaces.getAllWorkspaceDataFromFirebase(firestore, teamID, environmentID)
+        return Shared.Workspaces.getAllWorkspaceDataFromFirebase(firestore, teamID, environmentID.toString())
             .then((projectWorkspaceDataFromFirestore) => {
             projectWorkspaceData = projectWorkspaceDataFromFirestore;
             return packageProvider.getWorkspaceDataFS();
@@ -654,7 +653,7 @@ const UninstallPackage = (packageID, packageContext) => {
         let projectWorkspaceData;
         let prunedWorkspaceData;
         PackagesLogger.infoContext(loggerContext, `Gathering your project workspace data for environment: ${environmentID}`);
-        return Shared.Workspaces.getAllWorkspaceDataFromFirebase(firestore, teamID, environmentID)
+        return Shared.Workspaces.getAllWorkspaceDataFromFirebase(firestore, teamID, environmentID.toString())
             .then((projectWorkspaceDataFromFirestore) => {
             projectWorkspaceData = projectWorkspaceDataFromFirestore;
             const allProjectDependencies = Shared.Common.getValueSafe(projectWorkspaceDataFromFirestore, ["packages"], {});

package/bin/RunOutput.js

@@ -22,6 +22,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SaveRunOutputToFile = void 0;
 const Shared = __importStar(require("@coalescesoftware/shared"));
 const CLILogger = Shared.Logging.GetLogger(Shared.Logging.LoggingArea.CLI);
+//convert from firestore shape to run output shape
 const cleanRunResult = (nodeID, runResult) => {
     return {
         nodeID,
@@ -56,9 +57,11 @@ const GetRunOutputForRunCounter = (firestore, teamID, runID) => {
             queryResult.docs.forEach((runResultDoc) => {
                 const stepCounter = runResultDoc.id;
                 const runResult = runResultDoc.data();
-                runResults[stepCounter] = cleanRunResult(stepCounter, runResult.history[0]);
+                Shared.RunsTypes.RunResult.check(runResult);
+                runResults[stepCounter] = cleanRunResult(stepCounter, runResult);
             });
-            runData.runResults.runResults = runInfo.runHistory.map((stepCounter) => {
+            const executionSequence = Shared.Runs.GetExecutionSequenceFromRunResults(runResults);
+            runData.runResults.runResults = executionSequence.map((stepCounter) => {
                 return runResults[stepCounter];
             });
         });
@@ -74,6 +77,7 @@ const SaveRunOutputToFile = (runOutputFileLocation, runIDString, token) => {
         const runID = parseInt(runIDString);
         return GetRunOutputForRunCounter(firestore, teamID, runID);
     }).then((runOutput) => {
+        Shared.RunsTypes.RRunOutput.check(runOutput);
         const runOutputJSON = Shared.Common.StringifyFirestoreObject(runOutput);
         return Shared.Common.WriteFile(runOutputFileLocation, runOutputJSON + "\n");
     });

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@coalescesoftware/coa",
-    "version": "1.0.123",
+    "version": "1.0.124",
     "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.123",
+        "@coalescesoftware/shared": "^1.0.124",
         "chalk": "^4.1.2",
         "commander": "^9.2.0",
         "firebase": "8.2.0",
@@ -21,7 +21,8 @@
         "ink": "^3.2.0",
         "inquirer": "^8.2.4",
         "react": "^17.0.2",
-        "react-redux": "^7.2.6"
+        "react-redux": "^7.2.6",
+        "runtypes": "^6.5.1"
     },
     "devDependencies": {
         "typescript": "^4.5.5"