@catladder/cli 0.0.0-main-0d4bc87f → 0.0.0-main-ee579532

package/package.json

@@ -17,7 +17,7 @@
   },
   "dependencies": {
     "@bitwarden/cli": "^1.8.0",
-    "@catladder/pipeline": "0.0.0-main-0d4bc87f",
+    "@catladder/pipeline": "0.0.0-main-ee579532",
     "@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-0d4bc87f",
+  "version": "0.0.0-main-ee579532",
   "stableVersion": "0.0.0-test7"
 }

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

@@ -20,6 +20,7 @@ import {
   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";
@@ -192,7 +193,7 @@ export const migrateV2 = async (vorpal: Vorpal) => {
           }, Promise.resolve({}));
         } else {
           components = {
-            [COMPONENT_NAME]: await createComponent(".", gitlabCi),
+            [COMPONENT_NAME]: await createComponent(APP_DIR, gitlabCi),
           };
         }
         // we only have one component
@@ -222,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}`);
   }
 };