@catladder/cli 0.0.0-refactor-cloud-run-825d7e86 → 0.0.0-refactore-catenv-command-validates-argument-78d05852

package/src/apps/cli/commands/project/index.ts

@@ -26,6 +26,7 @@ import commandTriggerCronjob from "./commandTriggerCronjob";
 import commandOpenGrafanaPod from "./commandOpenGrafanaPod";
 import commandSecretsClearBackups from "./commandSecretsClearBackups";
 import commandProjectRestoreDb from "./cloudSql/commandProjectRestoreDb";
+import commandSecurityEvaluate from "./commandSecurityEvaluate";
 
 export default async (vorpal: Vorpal) => {
   commandSetup(vorpal);
@@ -61,4 +62,5 @@ export default async (vorpal: Vorpal) => {
 
   commandGetMyTotalWorktime(vorpal);
   commandMigrateHelm3(vorpal);
+  commandSecurityEvaluate(vorpal);
 };

package/src/catci.ts

@@ -0,0 +1,3 @@
+import { runCatCi } from "./apps/catci/catci";
+
+runCatCi();

package/src/catenv.ts

@@ -1,10 +1,6 @@
-import catenv from "./apps/catenv/catenv";
+import catenv from './apps/catenv/catenv';
 
-import { parseChoice } from "./config/parseChoice";
-
-const choice = process.argv[2] ? parseChoice(process.argv[2]) : null;
-
-catenv(choice).then(() => {
+catenv().then(() => {
   // we have to exit manually, because we have some file watches
   process.exit();
 });

package/src/config/getProjectConfig.ts

@@ -134,17 +134,15 @@ const resolveSecrets = async (
         .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];
+          if (secretKey?.hidden || value === undefined) {
+            return null;
+          }
+
+          for (const variable of allVariablesInGitlab) {
+            value = value.replace(
+              new RegExp("\\$" + variable.key, "g"),
+              variable.value
+            );
           }
           return [key, value];
         })

package/src/config/parseChoiceArgument.ts

@@ -0,0 +1,50 @@
+import type { Config, EnvType } from '@catladder/pipeline';
+import { ENV_TYPES, isKnowEnvType } from '@catladder/pipeline';
+import type { Choice } from '../apps/catenv/types';
+
+const envTypes = Object.keys(ENV_TYPES);
+
+export const getEnvComponentArgument = (): {
+  env: EnvType;
+  componentName?: string | undefined;
+} => {
+  const componentMatch = `([a-zA-Z0-9_-]+)`;
+  const argRegexp = new RegExp(
+    `^((${envTypes.join('|')}):${componentMatch}|${componentMatch})$`
+  );
+  const envComponent = process.argv[2] ?? '';
+  const [, , env = 'local', componentNameWithEnv, onlyComponentName] =
+    argRegexp.exec(envComponent);
+  if (!isKnowEnvType(env)) {
+    throw new Error(
+      `invalid env type! ${env}.\nEnv must be one of: ${envTypes.join(', ')}`
+    );
+  }
+  if (componentNameWithEnv?.length) {
+    return { env, componentName: componentNameWithEnv };
+  }
+  if (onlyComponentName?.length) {
+    return { env, componentName: onlyComponentName };
+  }
+  return { env };
+};
+
+/**
+ * Parses the environment component argument and returns a Choice object.
+ * @param envComponent - The environment component argument to parse.
+ * @returns The parsed Choice object.
+ * @throws Error if the env type is invalid.
+ */
+export const parseChoiceArgument = ({ components }: Config): Choice => {
+  const { env, componentName } = getEnvComponentArgument();
+  const componentNames = Object.keys(components);
+  if (componentName?.length && !componentNames.includes(componentName)) {
+    throw new Error(
+      `invalid component name! Component must be one of: ${componentNames.join(', ')}`
+    );
+  }
+  if (componentName?.length) {
+    return { env, componentName };
+  }
+  return { env };
+};

package/src/gcloud/serviceAccounts.ts

@@ -69,7 +69,8 @@ const upsertGcloudServiceAccount = async (
   }
 
   return await exec(
-    `gcloud iam service-accounts keys create /dev/stdout --iam-account=${fullIdentifier}`
+    // on some platforms /dev/stdout is not available without the pipe
+    `gcloud iam service-accounts keys create /dev/stdout --iam-account=${fullIdentifier} | cat`
   ).then((o) => o.stdout);
 };