@catladder/cli 1.110.2 → 1.111.0

package/package.json

@@ -24,7 +24,7 @@
     "node": ">=12.0.0"
   },
   "devDependencies": {
-    "@catladder/pipeline": "1.110.2",
+    "@catladder/pipeline": "1.111.0",
     "@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.110.2"
+  "version": "1.111.0"
 }

package/src/apps/catenv/printVariables.ts

@@ -13,15 +13,22 @@ const getAllVariablesToPrint = async (config: Config, choice?: Choice) => {
     choice
   );
 
-  let variables: Record<string, string> = {};
   if (currentComponent) {
-    variables = await getEnvVarsResolved(null, env, currentComponent);
+    // don't print vars if dotenv is enabled
+    if (config.components[currentComponent].dotEnv) {
+      return {};
+    }
+    return await getEnvVarsResolved(null, env, currentComponent);
   } else {
     // when in a monorep and not in a subapp, merge all env vars.
     // this is not 100% correct, but better than not exporting any vars at all
     // so we also add prefixed variants
-    variables = await Object.keys(config.components).reduce(
+    return await Object.keys(config.components).reduce(
       async (acc, componentName) => {
+        // don't print vars if dotenv is enabled
+        if (config.components[componentName].dotEnv) {
+          return await acc;
+        }
         const subappvars = await getEnvVarsResolved(null, env, componentName);
         delete subappvars["_ALL_ENV_VAR_KEYS"];
         return {
@@ -36,11 +43,9 @@ const getAllVariablesToPrint = async (config: Config, choice?: Choice) => {
           ),
         };
       },
-      {}
+      Promise.resolve({} as Record<string, string>)
     );
   }
-
-  return variables;
 };
 
 export const printVariables = async (config: Config, choice?: Choice) => {

package/src/apps/catenv/writeDotEnvFiles.ts

@@ -17,8 +17,6 @@ export const writeDotEnvFiles = async (config: Config, choice?: Choice) => {
     choice
   );
 
-  // whether to print .dotenv is currentl configure on the "local" part of the env
-
   const componentsWithEnabledDotEnvWrite = Object.entries(config.components)
     .filter(([, component]) => component?.dotEnv)
     .map(([componentName]) => componentName);

package/src/apps/catenv/writeEnvDTs.ts

@@ -19,14 +19,14 @@ export const writeDTsFiles = async (config: Config, choice?: Choice) => {
     .filter(([, component]) => component?.envDTs)
     .map(([componentName]) => componentName);
 
-  const componentsToActuallyWriteDotEnvNow = currentComponent
+  const componentsToActuallyWriteEnvDts = currentComponent
     ? componentsWithEnabledEnvDTsWrite.includes(currentComponent)
       ? [currentComponent]
       : []
     : componentsWithEnabledEnvDTsWrite;
   const gitRoot = await getGitRoot();
 
-  for (const componentName of componentsToActuallyWriteDotEnvNow) {
+  for (const componentName of componentsToActuallyWriteEnvDts) {
     const envNames = await getEnvsForDTs(env, componentName);
     const envDTsContent = createEnvDTsContent(envNames);
 

package/src/config/getProjectConfig.ts

@@ -125,7 +125,7 @@ export const getGitlabVar = async (
 const resolveSecrets = async (
   vorpal: CommandInstance | null,
   varSets: EnvironmentEnvVars[]
-) => {
+): Promise<Record<string, string>> => {
   const allVariablesInGitlab = await getAllVariables(vorpal);
 
   return Object.fromEntries(