Merge pull request #2462 from IDEMSInternational/fix/encrypted-deploy…

…ment-set fix: encrypted deployment set
IDEMSInternational · Oct 9, 2024 · d987c2c · d987c2c
2 parents 3f6ff1c + 641971a
commit d987c2c
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 7 deletions.
diff --git a/packages/scripts/src/commands/deployment/set.ts b/packages/scripts/src/commands/deployment/set.ts
@@ -68,7 +68,7 @@ export class DeploymentSet {
     }
   }
 
-  private async promptDeploymentSelect() {
+  public async promptDeploymentSelect() {
     const deploymentNames = fs
       .readdirSync(DEPLOYMENTS_PATH, { withFileTypes: true })
       .filter((d) => d.isDirectory())

diff --git a/packages/scripts/src/commands/deployment/utils.ts b/packages/scripts/src/commands/deployment/utils.ts
@@ -63,6 +63,7 @@ function parseConfigJson(json: IDeploymentConfigJson) {
 /**
  * Decide if a config needs recompiling by checking if modified timestamps
  * on the .ts and .json files are the same (applied during compilation)
+ * TODO - also consider files from encrypted or other imports (e.g. skins)
  */
 function isConfigUpToDate(tsPath: string, jsonPath: string) {
   const json = fs.readJSONSync(jsonPath) as IDeploymentConfigJson;

diff --git a/packages/workflows/src/deployment.workflows.ts b/packages/workflows/src/deployment.workflows.ts
@@ -1,3 +1,4 @@
+import { DeploymentSet } from "../../scripts/src/commands/deployment/set";
 import type { IDeploymentWorkflows } from "./workflow.model";
 /** Default workflows made available to all deployments */
 const workflows: IDeploymentWorkflows = {
@@ -85,17 +86,26 @@ const workflows: IDeploymentWorkflows = {
         ],
         label: "Set active deployment",
         steps: [
+          // Prompt deployment name if not specified
           {
-            name: "deployment set",
-            function: async ({ tasks, args }) => {
-              await tasks.deployment.set(args[0]);
+            name: "deployment prompt",
+            condition: async ({ args }) => !args[0],
+            function: async ({ args }) => {
+              const deploymentName = await new DeploymentSet().promptDeploymentSelect();
+              args[0] = deploymentName;
             },
           },
-          // Ensure deployment decrypted once set
+          // Attempt to decrypt config before setting (so that it can populate to config json)
           {
             name: "decrypt",
-            function: async ({ tasks }) => {
-              await tasks.encryption.decrypt();
+            function: async ({ tasks, args }) => {
+              await tasks.encryption.decrypt(args[0]);
+            },
+          },
+          {
+            name: "deployment set",
+            function: async ({ tasks, args }) => {
+              await tasks.deployment.set(args[0]);
             },
           },
           {