@catladder/cli 0.0.0-main-70bd51e4 → 0.0.0-main-82f64437

package/package.json

@@ -17,7 +17,7 @@
   },
   "dependencies": {
     "@bitwarden/cli": "^1.8.0",
-    "@catladder/pipeline": "0.0.0-main-70bd51e4",
+    "@catladder/pipeline": "0.0.0-main-82f64437",
     "@kubernetes/client-node": "^0.16.1",
     "child-process-promise": "^2.2.1",
     "clipboardy": "^2.2.0",
@@ -60,6 +60,6 @@
     "eslint": "^8.7.0",
     "typescript": "^4.5.4"
   },
-  "version": "0.0.0-main-70bd51e4",
+  "version": "0.0.0-main-82f64437",
   "stableVersion": "0.0.0-test7"
 }

package/src/apps/cli/config/writeConfig.ts

@@ -1,5 +1,5 @@
 import { Config } from "@catladder/pipeline";
-import { spawn } from "child-process-promise";
+import { spawn, exec } from "child-process-promise";
 import { writeFile } from "fs-extra";
 import { safeDump } from "js-yaml";
 import { format } from "prettier";
@@ -44,9 +44,10 @@ export const writeConfig = async (
       encoding: "utf-8",
     });
     vorpal.log("adding type @catladder/pipeline....");
-    await spawn("yarn add @catladder/pipeline -D", {
+    await spawn("yarn add @catladder/pipeline -DW", {
       shell: true,
     });
+    await exec("git add " + gitRoot + "/catladder.ts");
   } else {
     const content = safeDump(config);
 
@@ -61,6 +62,7 @@ export const writeConfig = async (
         encoding: "utf-8",
       }
     );
+    await exec("git add " + gitRoot + "/catladder.ts");
   }
   vorpal.log("done!");
   vorpal.log("");

package/src/apps/cli/verify/migration/fromv2.ts

@@ -1,17 +1,26 @@
 import {
   BuildConfig,
+  ComponentConfig,
   Config,
   DeployConfigKubernetes,
   Env,
 } from "@catladder/pipeline";
-import { readFile, writeFile } from "fs-extra";
+import {
+  existsSync,
+  lstatSync,
+  readdirSync,
+  readFile,
+  writeFile,
+} from "fs-extra";
 import { isEmpty } from "lodash";
+import { join } from "path";
 import Vorpal from "vorpal";
 import {
   getGitlabCi,
   getGitlabCiFilePath,
 } from "../../../../config/getProjectConfig";
 import { readYaml } from "../../../../utils/files";
+import { syncBitwarden } from "../../../../utils/passwordstore";
 import { getGitRoot } from "../../../../utils/projects";
 import { writeConfig } from "../../config/writeConfig";
 import { migrateSecrets } from "./migrateSecrets";
@@ -44,6 +53,16 @@ const transformVars = (rawVars: {
   };
 };
 
+const getLegacyMonorepoSubCiFiles = (dir: string) => {
+  return readdirSync(dir)
+    .filter((file) => lstatSync(file).isDirectory())
+    .map((dir) => ({
+      dir,
+      ci: join(dir, ".gitlab-ci.yml"),
+    }))
+    .filter(({ ci }) => existsSync(ci));
+};
+
 const transformValues = (
   valuesIn: Record<string, any>
 ): DeployConfigKubernetes["values"] => {
@@ -110,61 +129,78 @@ export const migrateV2 = async (vorpal: Vorpal) => {
       vorpal.log("");
 
       if (shouldContinue) {
-        const { env, ...baseValues } =
-          (await readYaml(gitRoot + "/values.yml")) ?? {};
-
-        const startCommand = baseValues?.application?.command?.join(" ");
-
+        const createComponent = async (
+          dir: string,
+          ciFile: OldGitlabCiFile
+        ): Promise<ComponentConfig> => {
+          const { env, ...baseValues } =
+            (await readYaml(dir + "/values.yml")) ?? {};
+
+          const startCommand = baseValues?.application?.command?.join(" ");
+          return {
+            vars: env ? transformVars(env) : undefined,
+            dir: dir,
+            build: {
+              type: detectBuildConfig(ciFile),
+              startCommand: startCommand,
+            } as BuildConfig,
+            deploy: {
+              type: "kubernetes",
+              values: transformValues(baseValues),
+              cluster: CLUSTER_NAME,
+            },
+            env: await LEGACY_ENVS.reduce<Promise<Env>>(
+              async (acc, envName) => {
+                if (envName === "stage" && !STAGING_ENABLED) {
+                  return {
+                    ...(await acc),
+                    [envName]: false,
+                  };
+                }
+                const newEnvName = envName === "dev-local" ? "local" : envName;
+
+                const envValues =
+                  (await readYaml(dir + `/values-${envName}.yml`)) ?? {};
+                const { env, ...rest } = envValues;
+                const hostname = rest?.application?.hostname;
+                const values = transformValues(rest);
+                return {
+                  ...(await acc),
+                  [newEnvName]: {
+                    hostname: hostname,
+                    vars: env ? transformVars(env) : undefined,
+                    deploy: values
+                      ? {
+                          values: values,
+                        }
+                      : undefined,
+                  },
+                };
+              },
+              Promise.resolve({})
+            ),
+          };
+        };
+        let components: Record<string, ComponentConfig>;
+        if (detectBuildConfig(gitlabCi) === "monorepo") {
+          components = await getLegacyMonorepoSubCiFiles(gitRoot).reduce<
+            Promise<Record<string, ComponentConfig>>
+          >(async (acc, el) => {
+            return {
+              ...(await acc),
+              [el.dir]: await createComponent(el.dir, await readYaml(el.ci)),
+            };
+          }, Promise.resolve({}));
+        } else {
+          components = {
+            [COMPONENT_NAME]: await createComponent(APP_DIR, gitlabCi),
+          };
+        }
         // we only have one component
         const config: Config = {
           customerName: CUSTOMER_NAME,
           appName: APP_NAME,
-          components: {
-            [COMPONENT_NAME]: {
-              vars: env ? transformVars(env) : undefined,
-              dir: APP_DIR ?? ".",
-              build: {
-                type: detectBuildConfig(gitlabCi),
-                startCommand: startCommand,
-              } as BuildConfig,
-              deploy: {
-                type: "kubernetes",
-                values: transformValues(baseValues),
-                cluster: CLUSTER_NAME,
-              },
-              env: await LEGACY_ENVS.reduce<Promise<Env>>(
-                async (acc, envName) => {
-                  if (envName === "stage" && !STAGING_ENABLED) {
-                    return {
-                      ...(await acc),
-                      [envName]: false,
-                    };
-                  }
-                  const newEnvName =
-                    envName === "dev-local" ? "local" : envName;
-
-                  const envValues =
-                    (await readYaml(gitRoot + `/values-${envName}.yml`)) ?? {};
-                  const { env, ...rest } = envValues;
-                  const hostname = rest?.application?.hostname;
-                  const values = transformValues(rest);
-                  return {
-                    ...(await acc),
-                    [newEnvName]: {
-                      hostname: hostname,
-                      vars: env ? transformVars(env) : undefined,
-                      deploy: values
-                        ? {
-                            values: values,
-                          }
-                        : undefined,
-                    },
-                  };
-                },
-                Promise.resolve({})
-              ),
-            },
-          },
+          components,
         };
 
         const comment =
@@ -187,8 +223,10 @@ export const migrateV2 = async (vorpal: Vorpal) => {
 
         this.log("-------------------");
         this.log("migrate secrets");
+        await syncBitwarden();
         for (const env of LEGACY_ENVS) {
-          await migrateSecrets(this, gitlabCi, env);
+          if (env === "stage" && !STAGING_ENABLED) return;
+          await migrateSecrets(this, config, env);
         }
 
         this.log("-------------------");

package/src/apps/cli/verify/migration/migrateSecrets.ts

@@ -1,32 +1,37 @@
+import { Config, getEnvironment } from "@catladder/pipeline";
 import { load } from "js-yaml";
+import { pick } from "lodash";
 import { CommandInstance } from "vorpal";
 import { upsertAllVariables } from "../../../../utils/gitlab";
 import { readPass, trashItem } from "../../../../utils/passwordstore";
 import { LEGACY_ENVS } from "./fromv2";
-import { OldGitlabCiFile } from "./oldGitlabCi";
 
-const getPassPath = (gitlabCi: OldGitlabCiFile, env: string) => {
-  return `${gitlabCi.variables.CUSTOMER_NAME}/${gitlabCi.variables.APP_NAME}/${env}/secrets.yml`;
+const getPassPath = (newConfig: Config, env: string) => {
+  return `${newConfig.customerName}/${newConfig.appName}/${env}/secrets.yml`;
 };
 
 export const migrateSecrets = async (
   vorpal: CommandInstance,
-  gitlabCi: OldGitlabCiFile,
-  env: typeof LEGACY_ENVS[number]
+  newConfig: Config,
+  oldEnv: typeof LEGACY_ENVS[number]
 ) => {
-  const path = getPassPath(gitlabCi, env);
+  const newEnv = oldEnv === "dev-local" ? "local" : oldEnv;
+  const path = getPassPath(newConfig, oldEnv);
   try {
     const yamlstring = await readPass(path);
     const secrets = load(yamlstring);
 
-    await upsertAllVariables(
-      vorpal,
-      secrets,
-      env === "dev-local" ? "local" : env,
-      gitlabCi.variables.COMPONENT_NAME
-    );
+    Object.keys(newConfig.components).forEach(async (componentName) => {
+      const environment = getEnvironment(newConfig, componentName, newEnv);
+      await upsertAllVariables(
+        vorpal,
+        pick(secrets, environment.secretEnvVarKeys),
+        newEnv,
+        componentName
+      );
+    });
     await trashItem(path);
   } catch (e) {
-    console.warn(`could not migrate secrets for env '${env}': ${e}`);
+    console.warn(`could not migrate secrets for env '${oldEnv}': ${e}`);
   }
 };

package/src/apps/cli/verify/migration/oldGitlabCi.ts

@@ -18,12 +18,14 @@ export type OldGitlabCiFile = {
 
 export const detectBuildConfig = (
   gitlabCi: OldGitlabCiFile
-): BuildConfig["type"] => {
+): BuildConfig["type"] | "monorepo" => {
   const firstInclude = gitlabCi.include[0];
   if (!firstInclude || gitlabCi.include[0]?.project !== "catladder/gitlab-ci") {
     throw new Error("unsupported gitlab-ci file");
   }
 
+  if (firstInclude.file === "monorepo.yml") return "monorepo";
+
   if (firstInclude.file === "node-kubernetes.yml") {
     return "node";
   }