@catladder/cli 1.105.0 → 1.105.2

package/package.json

@@ -24,7 +24,7 @@
     "node": ">=12.0.0"
   },
   "devDependencies": {
-    "@catladder/pipeline": "1.105.0",
+    "@catladder/pipeline": "1.105.2",
     "@kubernetes/client-node": "^0.16.2",
     "@tsconfig/node14": "^1.0.1",
     "@types/common-tags": "^1.8.0",
@@ -57,5 +57,5 @@
     "typescript": "^4.5.4",
     "vorpal": "^1.12.0"
   },
-  "version": "1.105.0"
+  "version": "1.105.2"
 }

package/src/apps/catenv/printVariables.ts

@@ -13,7 +13,7 @@ const getAllVariablesToPrint = async (config: Config, choice?: Choice) => {
     choice
   );
 
-  let variables = {};
+  let variables: Record<string, string> = {};
   if (currentComponent) {
     variables = await getEnvVarsResolved(null, env, currentComponent);
   } else {
@@ -23,6 +23,7 @@ const getAllVariablesToPrint = async (config: Config, choice?: Choice) => {
     variables = await Object.keys(config.components).reduce(
       async (acc, componentName) => {
         const subappvars = await getEnvVarsResolved(null, env, componentName);
+        delete subappvars["_ALL_ENV_VAR_KEYS"];
         return {
           ...(await acc),
           ...subappvars,
@@ -38,6 +39,7 @@ const getAllVariablesToPrint = async (config: Config, choice?: Choice) => {
       {}
     );
   }
+
   return variables;
 };
 

package/src/apps/catenv/writeDotEnvFiles.ts

@@ -32,6 +32,7 @@ export const writeDotEnvFiles = async (config: Config, choice?: Choice) => {
 
   for (const componentName of componentsToActuallyWriteDotEnvNow) {
     const variables = await getEnvVarsResolved(null, env, componentName);
+    delete variables["_ALL_ENV_VAR_KEYS"];
     const componentDir = getComponentFullPath(gitRoot, config, componentName);
     const filePath = join(componentDir, ".env");
     // many .dotenv don't like multiline values, so we sanitize them here

package/src/config/getProjectConfig.ts

@@ -1,4 +1,4 @@
-import type { Config } from "@catladder/pipeline";
+import type { Config, EnvironmentEnvVars } from "@catladder/pipeline";
 import {
   readConfigSync,
   getAllEnvs,
@@ -124,24 +124,32 @@ export const getGitlabVar = async (
 
 const resolveSecrets = async (
   vorpal: CommandInstance | null,
-  allEnvVars: Record<string, string>
+  varSets: EnvironmentEnvVars[]
 ) => {
   const allVariablesInGitlab = await getAllVariables(vorpal);
 
   return Object.fromEntries(
-    Object.entries(allEnvVars).map(([key, value]) => {
-      const containsSecret = String(value)?.includes?.("$CL_");
-      if (containsSecret) {
-        for (const variable of allVariablesInGitlab) {
-          value = value.replace(
-            new RegExp("\\$" + variable.key, "g"),
-            variable.value
-          );
-        }
-        return [key, value];
-      }
-      return [key, value];
-    })
+    varSets.flatMap((set) =>
+      Object.entries(set.envVars)
+        .map(([key, value]) => {
+          const secretKey = set.secretEnvVarKeys.find((k) => k.key === key);
+
+          if (secretKey) {
+            if (secretKey.hidden) {
+              return null;
+            }
+            for (const variable of allVariablesInGitlab) {
+              value = value.replace(
+                new RegExp("\\$" + variable.key, "g"),
+                variable.value
+              );
+            }
+            return [key, value];
+          }
+          return [key, value];
+        })
+        .filter(Boolean)
+    )
   );
 };
 
@@ -155,9 +163,15 @@ export const getEnvVarsResolved = async (
   }
   try {
     const envionment = await getEnvironment(env, componentName);
+
     // in the pipeline the secrets alreadyy exists  and bash will expand them
     // but here we need to manually load them
-    return resolveSecrets(vorpal, envionment.envVars);
+    return resolveSecrets(vorpal, [
+      {
+        envVars: envionment.envVars,
+        secretEnvVarKeys: envionment.secretEnvVarKeys,
+      },
+    ]);
   } catch (e) {
     // env is disabled
     return {};
@@ -175,10 +189,10 @@ export const getJobOnlyEnvVarsResolved = async (
 ) => {
   try {
     const envionment = await getEnvironment(env, componentName);
-    return resolveSecrets(vorpal, {
-      ...envionment.jobOnlyVars.build.envVars,
-      ...envionment.jobOnlyVars.deploy.envVars,
-    });
+    return resolveSecrets(vorpal, [
+      envionment.jobOnlyVars.build,
+      envionment.jobOnlyVars.deploy,
+    ]);
   } catch (e) {
     // env is disabled
     return {};