@catladder/cli 0.0.0-node16-ddfae617 → 0.0.0-prettier-cbceeed9

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

@@ -1,45 +1,86 @@
-import Vorpal from "vorpal";
+import type Vorpal from "vorpal";
+import { getProjectPodNames } from "../../../../kubernetes";
 import { logError } from "../../../../utils/log";
-import { startPortForward } from "../../../../utils/portForward";
-import {
-  getProjectNamespace,
-  getProjectPodNames,
-} from "../../../../utils/projects";
+import { startKubePortForward } from "../../../../kubernetes/portForward";
+import { getProjectNamespace } from "../../../../utils/projects";
 import { envAndComponents } from "./utils/autocompletions";
 import ensureCluster from "./utils/ensureCluster";
+import type { CommandInstance } from "vorpal";
+import { parseChoice } from "../../../../config/parseChoice";
+import { getPipelineContextByChoice } from "../../../../config/getProjectConfig";
+import type { Context } from "@catladder/pipeline";
+import { isOfDeployType } from "@catladder/pipeline";
+import { startPortForwardCommand } from "../../../../utils/portForwards";
+import open from "open";
+const kubePortForward = async (cmd: CommandInstance, envComponent: string) => {
+  await ensureCluster.call(cmd, envComponent);
+  const namespace = await getProjectNamespace(envComponent);
+  const podNames = await getProjectPodNames(envComponent);
+  if (podNames.length === 0) {
+    logError(cmd, "sorry, no pods found");
+    return;
+  }
+  const { podName } = await cmd.prompt({
+    type: "list",
+    name: "podName",
+    choices: podNames,
+    message: "Which pod? 🤔",
+  });
 
+  const { localPort } = await cmd.prompt({
+    type: "number",
+    name: "localPort",
+
+    message: "Local port: ",
+  });
+
+  const { remotePort } = await cmd.prompt({
+    type: "number",
+    name: "remotePort",
+
+    message: "Remote port: ",
+  });
+
+  return startKubePortForward(podName, localPort, remotePort, namespace);
+};
+
+const cloudRunPortForward = async (cmd: CommandInstance, context: Context) => {
+  if (!isOfDeployType(context.componentConfig.deploy, "google-cloudrun")) {
+    throw new Error("not cloud run");
+  }
+
+  const { fullName } = context.environment;
+  let serviceName = fullName;
+  if (context.environment.envType === "review") {
+    const { mr } = await cmd.prompt({
+      type: "number",
+      name: "mr",
+
+      message: "Which mr 🤔 ",
+    });
+    // poor mans solution
+    serviceName = serviceName.replace("-review-", "-review-mr" + mr + "-");
+  }
+
+  const { projectId, region } = context.componentConfig.deploy;
+
+  const command = `gcloud beta run services proxy ${serviceName} --project ${projectId} --region ${region}`;
+
+  await startPortForwardCommand(`cloudRun/${serviceName}`, command);
+  open("http://localhost:8080");
+};
 export default async (vorpal: Vorpal) =>
   vorpal
     .command("project-port-forward <envComponent>", "start port-forwarding")
     .autocomplete(await envAndComponents())
     .action(async function ({ envComponent }) {
-      await ensureCluster.call(this, envComponent);
-      const namespace = await getProjectNamespace(envComponent);
-      const podNames = await getProjectPodNames(envComponent);
-      if (podNames.length === 0) {
-        logError(this, "sorry, no pods found");
-        return;
-      }
-      const { podName } = await this.prompt({
-        type: "list",
-        name: "podName",
-        choices: podNames,
-        message: "Which pod? 🤔",
-      });
-
-      const { localPort } = await this.prompt({
-        type: "number",
-        name: "localPort",
-
-        message: "Local port: ",
-      });
+      const { env, componentName } = parseChoice(envComponent);
+      const context = await getPipelineContextByChoice(env, componentName);
 
-      const { remotePort } = await this.prompt({
-        type: "number",
-        name: "remotePort",
-
-        message: "Remote port: ",
-      });
-
-      return startPortForward(podName, localPort, remotePort, namespace);
+      if (isOfDeployType(context.componentConfig.deploy, "kubernetes")) {
+        await kubePortForward(this, envComponent);
+      }
+      if (isOfDeployType(context.componentConfig.deploy, "google-cloudrun")) {
+        await cloudRunPortForward(this, context);
+      }
     });

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

@@ -0,0 +1,27 @@
+/* eslint-disable no-constant-condition */
+import type Vorpal from "vorpal";
+import type { CommandInstance } from "vorpal";
+import { clearBackups } from "../../../../utils/gitlab";
+import { allEnvsAndAllComponents } from "./utils/autocompletions";
+
+export const projectSecretsClearBackups = async (
+  vorpal: CommandInstance,
+  keep = 3
+) => {
+  await clearBackups(vorpal, keep);
+};
+
+export default async (vorpal: Vorpal) => {
+  vorpal
+    .command("project-secrets-clear-backups", "clears all backups")
+    .autocomplete(await allEnvsAndAllComponents())
+    .action(async function () {
+      const { keep } = await this.prompt({
+        type: "number",
+        name: "keep",
+        default: 1,
+        message: "How many backups should we keep? 🤔",
+      });
+      return await projectSecretsClearBackups(this, keep);
+    });
+};

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

@@ -1,4 +1,4 @@
-import Vorpal from "vorpal";
+import type Vorpal from "vorpal";
 import { setupProject } from "./setup";
 
 export default async (vorpal: Vorpal) =>

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

@@ -1,6 +1,7 @@
-import { V1Job, V1ObjectMeta } from "@kubernetes/client-node";
+import type { V1ObjectMeta } from "@kubernetes/client-node";
+import { V1Job } from "@kubernetes/client-node";
 
-import Vorpal from "vorpal";
+import type Vorpal from "vorpal";
 import { getk8sApiBatch, getk8sApiBatchBeta } from "../../../../k8sApi";
 import { logError } from "../../../../utils/log";
 import { namespaceAutoCompletion } from "../general/namespaceAutoCompletion";

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

@@ -1,7 +1,7 @@
-import Vorpal from "vorpal";
+import type Vorpal from "vorpal";
 import commandCloudSqlProxy from "./commandCloudSqlProxy";
 import commandConfigSecrets from "./commandConfigSecrets";
-import commandCopyDB from "./commandCopyDB";
+
 import commandDeletePods from "./commandDeletePods";
 import commandDeleteProject from "./commandDeleteProject";
 import commandEnvVars from "./commandEnvVars";
@@ -24,6 +24,7 @@ import commandPortForward from "./commandPortForward";
 import commandTriggerCronjob from "./commandTriggerCronjob";
 
 import commandOpenGrafanaPod from "./commandOpenGrafanaPod";
+import commandSecretsClearBackups from "./commandSecretsClearBackups";
 
 export default async (vorpal: Vorpal) => {
   commandSetup(vorpal);
@@ -48,8 +49,8 @@ export default async (vorpal: Vorpal) => {
   commandOpenEnv(vorpal);
   commandTriggerCronjob(vorpal);
   commandConfigSecrets(vorpal);
+  commandSecretsClearBackups(vorpal);
   commandDeletePods(vorpal);
-  commandCopyDB(vorpal);
 
   commandGetShell(vorpal);
   commandPortForward(vorpal);

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

@@ -1,8 +1,9 @@
-import { CommandInstance } from "vorpal";
+import type { CommandInstance } from "vorpal";
 import { getAllPipelineContexts } from "../../../../../config/getProjectConfig";
 import { projectConfigSecrets } from "../commandConfigSecrets";
 import { setupAccessTokens } from "./setupAccessTokens";
 import { setupContext } from "./setupContext";
+import { setupTopic } from "./setupTopic";
 
 export const setupProject = async (instance: CommandInstance) => {
   const allContext = await getAllPipelineContexts();
@@ -11,6 +12,7 @@ export const setupProject = async (instance: CommandInstance) => {
     await setupContext(instance, context);
   }
   await setupAccessTokens(instance);
+  await setupTopic(instance);
   instance.log("");
   const { configSecrets } = await instance.prompt({
     default: true,

package/src/apps/cli/commands/project/setup/setupAccessTokens.ts

@@ -1,5 +1,5 @@
 import open from "open";
-import { CommandInstance } from "vorpal";
+import type { CommandInstance } from "vorpal";
 import { doGitlabRequest, getProjectInfo } from "../../../../../utils/gitlab";
 
 export const setupAccessTokens = async (instance: CommandInstance) => {
@@ -18,7 +18,7 @@ export const setupAccessTokens = async (instance: CommandInstance) => {
       "I need add a GL_TOKEN to the project, so that semantic release will work\n"
     );
     instance.log(
-      "👉 Please please create a project access token in gitlab and copy its value into clipboard\n\n - name: something like 'semantic-release'\n - expires: leave empty\n - scopes: api, read_repository"
+      "👉 Please please create a project access token in gitlab and copy its value into clipboard\n\n - name: something like 'semantic-release'\n - expires: leave empty\n - role: maintainer - scopes: api, read_repository"
     );
     instance.log("\n");
 
@@ -43,10 +43,17 @@ export const setupAccessTokens = async (instance: CommandInstance) => {
       name: "GL_TOKEN",
       message: "Access Token: ",
     });
-    await doGitlabRequest(instance, `projects/${projectId}/variables`, {
-      key: "GL_TOKEN",
-      value: GL_TOKEN,
-    });
+
+    await doGitlabRequest(
+      instance,
+      `projects/${projectId}/variables`,
+      {
+        key: "GL_TOKEN",
+        value: GL_TOKEN,
+        masked: true,
+      },
+      "POST"
+    );
   }
 
   const deploy_tokens = await doGitlabRequest(
@@ -63,10 +70,15 @@ export const setupAccessTokens = async (instance: CommandInstance) => {
       "I will setup the 'GitLab Deploy Token', so Kubernetes can pull images from this project."
     );
 
-    await doGitlabRequest(instance, `projects/${projectId}/deploy_tokens`, {
-      id: projectId,
-      name: "gitlab-deploy-token",
-      scopes: ["read_registry"],
-    });
+    await doGitlabRequest(
+      instance,
+      `projects/${projectId}/deploy_tokens`,
+      {
+        id: projectId,
+        name: "gitlab-deploy-token",
+        scopes: ["read_registry"],
+      },
+      "POST"
+    );
   }
 };

package/src/apps/cli/commands/project/setup/setupCloudRun.ts

@@ -0,0 +1,84 @@
+import type { Context } from "@catladder/pipeline";
+import {
+  GCLOUD_DEPLOY_CREDENTIALS_KEY,
+  GCLOUD_RUN_CANONICAL_HOST_SUFFIX,
+  isOfDeployType,
+} from "@catladder/pipeline";
+
+import type { CommandInstance } from "vorpal";
+import { upsertGcloudArtifactsRegistry } from "../../../../../gcloud/artifactsRegistry";
+import { getCloudRunDomainSuffix } from "../../../../../gcloud/cloudRun/getCloudRunDomainSuffix";
+import { enableGCloudServices } from "../../../../../gcloud/enableServices";
+import { upsertGcloudServiceAccountAndSaveSecret } from "../../../../../gcloud/serviceAccounts";
+import { upsertAllVariables } from "../../../../../utils/gitlab";
+
+export const setupCloudRun = async (
+  instance: CommandInstance,
+  context: Context
+) => {
+  if (!isOfDeployType(context.componentConfig.deploy, "google-cloudrun")) {
+    throw new Error("deploy config is not of type 'google-cloudrun'");
+  }
+
+  const config = context.componentConfig.deploy;
+
+  // enable services
+
+  instance.log("enable required servies...");
+  await enableGCloudServices(
+    [
+      "run.googleapis.com",
+      "artifactregistry.googleapis.com",
+      "cloudscheduler.googleapis.com", // for scheduling jobs
+      "cloudresourcemanager.googleapis.com", // only required to get google cloud project number
+      ...(config.cloudSql
+        ? ["sqladmin.googleapis.com", "sql-component.googleapis.com"]
+        : []),
+    ],
+    config
+  );
+  instance.log("upsert artifacts registry...");
+  await upsertGcloudArtifactsRegistry(config);
+
+  instance.log("upsert deploy service account...");
+  await upsertGcloudServiceAccountAndSaveSecret(
+    instance,
+    context,
+    {
+      projectId: config.projectId,
+      displayName: "Catladder gcloud deploy",
+      description: "This service account deploys to google cloud",
+      name: "cl-d",
+      // TODO: run.admin is a bit much, would be better to follow https://stackoverflow.com/questions/55788714/deploying-to-cloud-run-with-a-custom-service-account-failed-with-iam-serviceacco
+      roles: [
+        "roles/artifactregistry.repoAdmin",
+        "roles/run.admin",
+        "roles/iam.serviceAccountUser",
+        "roles/cloudscheduler.admin", // for scheduling
+        ...(config.cloudSql ? ["roles/cloudsql.admin"] : []),
+      ],
+    },
+    GCLOUD_DEPLOY_CREDENTIALS_KEY
+  );
+
+  // gcloud run automatically gives us a hostname
+  // but the pipeline need to know it before deployment
+  // so we get this through some magic and add this as a ci/cd variable
+  // the pipeline than can use this to construct the canonical host
+  instance.log(
+    "get service domain suffix... that might take a while initially"
+  );
+  const suffix = await getCloudRunDomainSuffix(config);
+  instance.log("domain suffix: " + suffix);
+
+  await upsertAllVariables(
+    instance,
+    {
+      [GCLOUD_RUN_CANONICAL_HOST_SUFFIX]: suffix,
+    },
+    context.environment.shortName,
+    context.componentName,
+    false, // backup
+    false // masked
+  );
+};

package/src/apps/cli/commands/project/setup/setupCloudSQL.ts

@@ -0,0 +1,22 @@
+import type { Context } from "@catladder/pipeline";
+import {
+  getKubernetesCloudSQLConfig,
+  hasKubernetesCloudSQL,
+} from "@catladder/pipeline";
+import type { CommandInstance } from "vorpal";
+
+export const setupCloudSQL = async (
+  instance: CommandInstance,
+  context: Context
+) => {
+  if (!hasKubernetesCloudSQL(context)) {
+    throw new Error("cannot setup cloudsql, as it has none");
+  }
+  const config = getKubernetesCloudSQLConfig(context);
+  instance.log("");
+  instance.log(
+    "! make sure to provide cloudsqlProxyCredentials for the cloud sql service account in " +
+      config.projectId
+  );
+  instance.log("");
+};

package/src/apps/cli/commands/project/setup/setupContext.ts

@@ -1,5 +1,8 @@
-import { Context, isOfDeployType } from "@catladder/pipeline";
-import { CommandInstance } from "vorpal";
+import type { Context } from "@catladder/pipeline";
+import { isOfDeployType, hasKubernetesCloudSQL } from "@catladder/pipeline";
+import type { CommandInstance } from "vorpal";
+import { setupCloudRun } from "./setupCloudRun";
+import { setupCloudSQL } from "./setupCloudSQL";
 import { setupKubernetes } from "./setupKubernetes";
 
 export const setupContext = async (
@@ -19,6 +22,13 @@ export const setupContext = async (
       "..."
   );
   instance.log("");
+  if (isOfDeployType(context.componentConfig.deploy, "google-cloudrun")) {
+    await setupCloudRun(instance, context);
+  }
+  if (hasKubernetesCloudSQL(context)) {
+    await setupCloudSQL(instance, context);
+  }
+
   const deployConfig = context.componentConfig.deploy;
   if (isOfDeployType(deployConfig, "kubernetes")) {
     await setupKubernetes(instance, context);

package/src/apps/cli/commands/project/setup/setupKubernetes.ts

@@ -1,10 +1,10 @@
+import type { Context } from "@catladder/pipeline";
 import {
-  Context,
   getFullKubernetesClusterName,
   isOfDeployType,
 } from "@catladder/pipeline";
-import { CommandInstance } from "vorpal";
-import { $ } from "zx";
+import type { CommandInstance } from "vorpal";
+import { exec } from "child-process-promise";
 import { connectToCluster } from "../../../../../utils/cluster";
 import { upsertAllVariables } from "../../../../../utils/gitlab";
 import ensureNamespace from "../utils/ensureNamespace";
@@ -33,34 +33,41 @@ export const setupKubernetes = async (
   // we currently create one per component to better separate them
   instance.log("ensuring service accounts...");
   const serviceAccountName = `cl-${context.componentName}-deploy`;
-  const KUBE_URL =
-    await $`TERM=dumb kubectl cluster-info | grep -E 'Kubernetes master|Kubernetes control plane' | awk '/http/ {print $NF}'`.then(
-      (s) => s.stdout.trim()
-    );
+  const KUBE_URL = await exec(
+    `TERM=dumb kubectl cluster-info | grep -E 'Kubernetes master|Kubernetes control plane' | awk '/http/ {print $NF}'`
+  ).then((s) => s.stdout.trim());
 
   // first upsert service acount in the ns
   try {
-    await $`kubectl delete serviceaccount --namespace ${namespace} ${serviceAccountName}`;
-    await $`kubectl delete rolebinding --namespace ${namespace} ${serviceAccountName}`;
-    await $`kubectl delete role --namespace ${namespace} ${serviceAccountName}`;
+    await exec(
+      `kubectl delete serviceaccount --namespace ${namespace} ${serviceAccountName}`
+    );
+    await exec(
+      `kubectl delete rolebinding --namespace ${namespace} ${serviceAccountName}`
+    );
+    await exec(
+      `kubectl delete role --namespace ${namespace} ${serviceAccountName}`
+    );
   } catch (e) {
     // ignore
   }
 
-  await $`kubectl create serviceaccount --namespace ${namespace} ${serviceAccountName}`;
+  await exec(
+    `kubectl create serviceaccount --namespace ${namespace} ${serviceAccountName}`
+  );
 
   // upsert role in the ns
 
-  await $`cat <<EOF | kubectl apply -f -
+  await exec(`cat <<EOF | kubectl apply -f -
 kind: Role
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   namespace: ${namespace}
   name: ${serviceAccountName}
 rules:
-- apiGroups: ["", "extensions", "apps", "networking.k8s.io", "batch", "autoscaling"]
-  resources: ["deployments", "replicasets", "statefulsets", "pods", "secrets", "configmaps", "services", "ingresses", "serviceaccounts", "jobs", "cronjobs", "horizontalpodautoscalers"]
-  verbs: ["get", "list", "watch", "create", "update", "patch", "delete"] # You can also use ["*"]
+- apiGroups: ["", "extensions", "apps", "networking.k8s.io", "batch", "autoscaling", "rbac.authorization.k8s.io","snapshot.storage.k8s.io"]
+  resources: ["deployments", "replicasets", "statefulsets", "pods", "secrets", "configmaps", "services", "ingresses", "serviceaccounts", "roles", "rolebindings", "jobs", "cronjobs", "horizontalpodautoscalers", "persistentvolumeclaims", "volumesnapshots"]
+  verbs: ["*"]
 ---
 kind: RoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
@@ -76,20 +83,19 @@ roleRef:
   name: ${serviceAccountName}
   apiGroup: rbac.authorization.k8s.io
 EOF
-`;
+`);
 
   // get token name
-  const tokenName =
-    await $`kubectl get serviceaccount --namespace ${namespace} ${serviceAccountName} -o jsonpath='{.secrets[0].name}'`;
+  const tokenName = await exec(
+    `kubectl get serviceaccount --namespace ${namespace} ${serviceAccountName} -o jsonpath='{.secrets[0].name}'`
+  ).then((c) => c.stdout.trim());
 
-  const KUBE_CA_PEM =
-    await $`kubectl get secret ${tokenName} --namespace ${namespace} -o jsonpath="{['data']['ca\\.crt']}"`.then(
-      (c) => c.stdout.trim()
-    );
-  const KUBE_TOKEN =
-    await $`kubectl get secret ${tokenName} --namespace ${namespace} -o jsonpath="{['data']['token']}" | base64 --decode`.then(
-      (c) => c.stdout.trim()
-    );
+  const KUBE_CA_PEM = await exec(
+    `kubectl get secret ${tokenName} --namespace ${namespace} -o jsonpath="{['data']['ca\\.crt']}"`
+  ).then((c) => c.stdout.trim());
+  const KUBE_TOKEN = await exec(
+    `kubectl get secret ${tokenName} --namespace ${namespace} -o jsonpath="{['data']['token']}" | base64 --decode`
+  ).then((c) => c.stdout.trim());
 
   const vars = {
     KUBE_TOKEN,
@@ -106,7 +112,8 @@ EOF
     instance,
     vars,
     context.environment.shortName,
-    context.componentName
+    context.componentName,
+    false // no backup
   );
   instance.log("done!");
 };

package/src/apps/cli/commands/project/setup/setupTopic.ts

@@ -0,0 +1,22 @@
+import type { CommandInstance } from "vorpal";
+import { doGitlabRequest, getProjectInfo } from "../../../../../utils/gitlab";
+
+const catladderTopic = "catladder"
+
+export const setupTopic = async (instance: CommandInstance) => {
+  const { id: projectId } = await getProjectInfo(
+    instance
+  );
+
+  const { topics } = await doGitlabRequest(
+    instance,
+    `projects/${projectId}`
+  );
+
+  await doGitlabRequest(
+    instance,
+    `projects/${projectId}`,
+    { topics: [catladderTopic, ...topics] },
+    "PUT"
+  );
+};

package/src/apps/cli/commands/project/utils/ensureNamespace.ts

@@ -1,5 +1,7 @@
-import { Context, getKubernetesNamespace } from "@catladder/pipeline";
-import { V1Namespace, V1ObjectMeta } from "@kubernetes/client-node";
+import type { Context} from "@catladder/pipeline";
+import { getKubernetesNamespace } from "@catladder/pipeline";
+import type { V1ObjectMeta } from "@kubernetes/client-node";
+import { V1Namespace } from "@kubernetes/client-node";
 import { getk8sApi } from "../../../../../k8sApi";
 
 export default async function (context: Context) {

package/src/apps/cli/commands/project/utils/showProjectBanner.ts

@@ -1,4 +1,4 @@
-import Vorpal from "vorpal";
+import type Vorpal from "vorpal";
 import { getProjectConfig } from "../../../../../config/getProjectConfig";
 
 export const showProjectBanner = async (vorpal: Vorpal) => {

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

@@ -1,6 +1,6 @@
 import { spawn } from "child-process-promise";
 import fetch from "node-fetch";
-import Vorpal from "vorpal";
+import type Vorpal from "vorpal";
 
 export default async (vorpal: Vorpal) => {
   vorpal.command("dadjoke", "something for jonas.").action(async function () {
@@ -19,7 +19,7 @@ export default async (vorpal: Vorpal) => {
   vorpal
     .command("starwars", "Long time ago... in a galaxy far far away...")
     .action(async function () {
-      starwarsPromise = spawn("telnet", ["towel.blinkenlights.nl"], {
+      starwarsPromise = spawn("telnet", ["2001:7b8:666:ffff::1:42"], {
         stdio: ["pipe", "inherit", "pipe"],
       });
       await starwarsPromise;

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

@@ -1,9 +1,9 @@
-import { Config } from "@catladder/pipeline";
+import type { Config } from "@catladder/pipeline";
 import { spawn, exec } from "child-process-promise";
 import { writeFile } from "fs-extra";
 import { dump } from "js-yaml";
 import { format } from "prettier";
-import { CommandInstance } from "vorpal";
+import type { CommandInstance } from "vorpal";
 import { getGitRoot } from "../../../utils/projects";
 
 export const writeConfig = async (

package/src/apps/cli/verify/index.ts

@@ -1,4 +1,4 @@
-import Vorpal from "vorpal";
+import type Vorpal from "vorpal";
 import {
   getGitlabCi,
   getProjectConfig,

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

@@ -1,4 +1,4 @@
-import {
+import type {
   BuildConfig,
   ComponentConfig,
   Config,
@@ -14,7 +14,7 @@ import {
 } from "fs-extra";
 import { isEmpty } from "lodash";
 import { join } from "path";
-import Vorpal from "vorpal";
+import type Vorpal from "vorpal";
 import {
   getGitlabCi,
   getGitlabCiFilePath,
@@ -24,11 +24,8 @@ import { syncBitwarden } from "../../../../utils/passwordstore";
 import { getGitRoot } from "../../../../utils/projects";
 import { writeConfig } from "../../config/writeConfig";
 import { migrateSecrets } from "./migrateSecrets";
-import {
-  detectBuildConfig,
-  isOldInclude,
-  OldGitlabCiFile,
-} from "./oldGitlabCi";
+import type { OldGitlabCiFile } from "./oldGitlabCi";
+import { detectBuildConfig, isOldInclude } from "./oldGitlabCi";
 export const LEGACY_ENVS = [
   "dev-local",
   "dev",
@@ -39,6 +36,7 @@ export const LEGACY_ENVS = [
 
 const arrayToRecord = (arr: { name: string }[]): Record<string, any> => {
   if (!arr) return undefined;
+  if (!Array.isArray(arr)) return arr;
   return Object.fromEntries(arr.map(({ name, ...rest }) => [name, rest]));
 };
 

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

@@ -1,10 +1,11 @@
-import { Config, getEnvironment } from "@catladder/pipeline";
+import type { Config } from "@catladder/pipeline";
+import { getEnvironment } from "@catladder/pipeline";
 import { load } from "js-yaml";
 import { pick } from "lodash";
-import { CommandInstance } from "vorpal";
+import type { CommandInstance } from "vorpal";
 import { upsertAllVariables } from "../../../../utils/gitlab";
 import { readPass, trashItem } from "../../../../utils/passwordstore";
-import { LEGACY_ENVS } from "./fromv2";
+import type { LEGACY_ENVS } from "./fromv2";
 
 const getPassPath = (newConfig: Config, env: string) => {
   return `${newConfig.customerName}/${newConfig.appName}/${env}/secrets.yml`;
@@ -22,7 +23,11 @@ export const migrateSecrets = async (
     const secrets = load(yamlstring);
 
     Object.keys(newConfig.components).forEach(async (componentName) => {
-      const environment = getEnvironment(newConfig, componentName, newEnv);
+      const environment = await getEnvironment(
+        newConfig,
+        componentName,
+        newEnv
+      );
       await upsertAllVariables(
         vorpal,
         pick(secrets, environment.secretEnvVarKeys),