@catladder/cli 0.0.0-main-3b6d4049 → 0.0.0-main-5f142cf2

package/src/apps/shell/commands/project/commandConfigSecrets.ts

@@ -1,27 +1,16 @@
-import { V1Secret } from "@kubernetes/client-node";
-import yaml from "js-yaml";
-import { difference, mapValues, pick } from "lodash";
+/* eslint-disable no-constant-condition */
+import { difference } from "lodash";
 import Vorpal from "vorpal";
-import { GOOGLE_CLOUD_SQL_PASS_PATH } from "../../../../config/constants";
-import k8sApi from "../../../../k8sApi";
-import { ISecrets } from "../../../../types/types";
-import { logError } from "../../../../utils/log";
-import {
-  editPass,
-  insertPass,
-  readPass,
-  readPassEnvVars,
-  syncBitwarden,
-} from "../../../../utils/passwordstore";
 import {
-  getAllSecretsEnvVarsMapping,
-  getPassPath,
-  getProjectNamespace,
-} from "../../../../utils/projects";
+  getEnvironmentByChoice,
+  getEnvVars,
+  parseChoice,
+} from "../../../../config/getProjectConfig";
+import { ISecrets } from "../../../../types/types";
+import { editAsFile } from "../../../../utils/editAsFile";
+import { upsertAllVariables } from "../../../../utils/gitlab";
 import { delay } from "../../../../utils/promise";
 import { envAutocompletion } from "./utils/autocompletions";
-import ensureCluster from "./utils/ensureCluster";
-import ensureNamespace from "./utils/ensureNamespace";
 
 export default (vorpal: Vorpal) => {
   vorpal
@@ -31,86 +20,37 @@ export default (vorpal: Vorpal) => {
     )
     .autocomplete(envAutocompletion)
     .action(async function ({ envComponent }) {
-      throw new Error("need to reimplement");
-      await ensureCluster.call(this);
-
-      /*
-
-      
-      const passPath = await getPassPath(env);
-      this.log("");
-      this.log(`😼 I will now open bitwarden @ '${passPath}'`);
-      this.log("");
-
-      const subapp = await promptForSubAppIfAny(this);
-
-      const secretEnvVarsMapping = await getAllSecretsEnvVarsMapping(
-        env,
-        subapp
+      const { secretEnvVarKeys } = await getEnvironmentByChoice(envComponent);
+      const { env, componentName } = parseChoice(envComponent);
+      const allEnvVars = await getEnvVars(this, envComponent);
+      let valuesToEdit = Object.fromEntries(
+        secretEnvVarKeys.map((key) => [key, allEnvVars[key]])
       );
 
-      await syncBitwarden();
-
-      // check if exist and fill in details if not
-      try {
-        await readPass(passPath);
-      } catch (e) {
-        // does not exist. create it
-        await createNewEnvInPass.call(this, env, secretEnvVarsMapping);
-      }
-
-      let envConfigInPass: any = null;
-      // eslint-disable-next-line no-constant-condition
       while (true) {
-        let hasError = false;
-        await editPass(passPath);
-
-        try {
-          envConfigInPass = await readPassEnvVars(passPath);
+        const hasError = false;
 
-          const configuredKeysInPass = Object.keys(envConfigInPass);
+        valuesToEdit = await editAsFile(valuesToEdit);
+        const usedKeys = valuesToEdit ? Object.keys(valuesToEdit) : [];
+        // check whether newValues have the exact number of keys
+        const extranous = difference(usedKeys, secretEnvVarKeys);
+        const missing = difference(secretEnvVarKeys, usedKeys);
 
-          const allSecretEnvKeysInValues = Object.keys(secretEnvVarsMapping);
-          const keysNotInValues = difference(
-            configuredKeysInPass,
-            allSecretEnvKeysInValues
-          );
-
-          const keysNotInPass = difference(
-            allSecretEnvKeysInValues,
-            configuredKeysInPass
-          );
-          if (keysNotInValues.length > 0) {
-            this.log("");
-            this.log(
-              `☝️  Notice: the following keys are defined in pass, but not in values: ${keysNotInValues.join(
-                ", "
-              )}`
-            );
-            this.log(
-              `These values are probably from another app that uses the same namespace.`
-            );
+        if (extranous.length > 0 || missing.length > 0) {
+          this.log("");
+          this.log("😿 Oh no! There is something wrong");
+          this.log("");
+          if (extranous.length > 0) {
+            this.log("these secrets are not declared in the config");
+            extranous.forEach((key) => this.log(key));
             this.log("");
           }
-          if (keysNotInPass.length > 0) {
-            await logError(
-              this,
-              `the following keys are defined in the values.yaml, but not in pass: ${keysNotInPass.join(
-                ", "
-              )}`
-            );
-
-            hasError = true;
+          if (missing.length > 0) {
+            this.log("these secrets have not been provided:");
+            missing.forEach((key) => this.log(key));
+            this.log("");
           }
-        } catch (e) {
-          await logError(this, "failed to parse yaml", e.message);
-          hasError = true;
-        }
 
-        if (hasError) {
-          this.log("");
-          this.log("🤦 You miserably failed to provide something useful 💩");
-          this.log("");
           await delay(1000);
           const { shouldContinue } = await this.prompt({
             default: true,
@@ -123,56 +63,15 @@ export default (vorpal: Vorpal) => {
             throw new Error("abort");
           }
         } else {
+          await upsertAllVariables(this, valuesToEdit, env, componentName);
+
           break;
         }
       }
 
-      if (env !== "env-local") {
-        await ensureNamespace.call(this, env);
-
-        this.log(
-          "😼 Please be patient while i am doing some complicated stuff... "
-        );
-        const namespace = await getProjectNamespace(env);
-
-        // secrets is object of [key]: secretName
-        const grouped = Object.keys(secretEnvVarsMapping).reduce<{
-          [secretName: string]: string[];
-        }>((acc, key) => {
-          const secretName = secretEnvVarsMapping[key];
-          return {
-            ...acc,
-            [secretName]: [...(acc[secretName] || []), key],
-          };
-        }, {});
-
-        for (const secretName of Object.keys(grouped)) {
-          const valueKeysInGroup = grouped[secretName];
-          const valuesFromPassInGroup = pick(envConfigInPass, valueKeysInGroup);
-
-          let existingSecretValues = {};
-          try {
-            const existingSecretResult = await k8sApi.readNamespacedSecret(
-              secretName,
-              namespace
-            );
-            // tslint:disable-next-line:no-console
-            if (existingSecretResult && existingSecretResult.body.data) {
-              existingSecretValues = existingSecretResult.body.data;
-            }
-          } catch (e) {
-            // ignore
-          }
-          await createKubernetesSecret.call(
-            this,
-            namespace,
-            secretName,
+      /*
 
-            valuesFromPassInGroup,
-            existingSecretValues
-          );
-        }
-        this.log("");
+      
         // adding gcloud sql proxy secret
         const cloudsqlCredentials = await readPass(GOOGLE_CLOUD_SQL_PASS_PATH);
         await createKubernetesSecret.call(
@@ -198,33 +97,9 @@ export default (vorpal: Vorpal) => {
       */
     });
 };
-async function createKubernetesSecret(
-  namespace: string,
-  secretName: string,
-  stringData: Pick<any, string>,
-  existingSecretValues?: Record<string, string>
-) {
-  const secret = new V1Secret();
-  secret.metadata = {
-    name: secretName,
-  };
-  secret.data = existingSecretValues;
-  secret.stringData = stringData;
-  this.log(`😼 upserting secret '${secretName}' (push it real good!)`);
-  try {
-    await k8sApi.deleteNamespacedSecret(secretName, namespace, "true");
-  } catch (e) {
-    // ignore
-  }
-  try {
-    await k8sApi.createNamespacedSecret(namespace, secret);
-  } catch (e) {
-    logError(this, "error pushing secrets", e.body.message);
-  }
-}
 
 async function createNewEnvInPass(env: any, secretEnvVarsMapping: ISecrets) {
-  const passPath = await getPassPath(env);
+  // const passPath = await getPassPath(env);
   this.log(
     "Your selected env is not yet in pass. Do you want to copy it from another env? "
   );
@@ -235,15 +110,5 @@ async function createNewEnvInPass(env: any, secretEnvVarsMapping: ISecrets) {
     choices: [...envAutocompletion.filter((e) => e !== env), noAnswer],
     message: "Do you want to copy an env?",
   });
-  if (sourceEnv === noAnswer) {
-    await insertPass(
-      passPath,
-      yaml.safeDump(mapValues(secretEnvVarsMapping, (value, key) => "fillme"))
-    );
-  } else {
-    const sourceEnvPath = await getPassPath(sourceEnv);
-    const stdout = await readPass(sourceEnvPath);
-
-    await insertPass(passPath, stdout);
-  }
+  // TODO: reimplenent
 }

package/src/apps/shell/commands/project/commandCopyDB.ts

@@ -7,6 +7,7 @@ import {
 import {
   getEnvVars,
   getProjectConfig,
+  parseChoice,
 } from "../../../../config/getProjectConfig";
 import { readPass } from "../../../../utils/passwordstore";
 import { envAutocompletion } from "./utils/autocompletions";
@@ -19,7 +20,7 @@ export default (vorpal: Vorpal) =>
     )
     .autocomplete(envAutocompletion)
     .action(async function copyDB({ envComponent }) {
-      const [env, componentName] = envComponent.split("-");
+      const { env, componentName } = parseChoice(envComponent);
       const { customerName, appName } = getProjectConfig();
 
       const { shouldContinue } = await this.prompt({

package/src/apps/shell/commands/project/commandDeletePods.ts

@@ -1,4 +1,3 @@
-import { V1DeleteOptions } from "@kubernetes/client-node";
 import Vorpal from "vorpal";
 import k8sApi from "../../../../k8sApi";
 
@@ -12,12 +11,12 @@ import ensureCluster from "./utils/ensureCluster";
 
 export default (vorpal: Vorpal) =>
   vorpal
-    .command("project-delete-pods <env>", "delete / restart pods")
+    .command("project-delete-pods <envComponent>", "delete / restart pods")
     .autocomplete(envAutocompletion)
-    .action(async function ({ env }) {
-      await ensureCluster.call(this);
-      const namespace = await getProjectNamespace(env);
-      const podNames = await getProjectPodNames(env);
+    .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;

package/src/apps/shell/commands/project/commandDeleteProject.ts

@@ -1,18 +1,17 @@
 import Vorpal from "vorpal";
-import { exec, spawn } from "child-process-promise";
-import { Env } from "../../../../types/types";
+import { exec } from "child-process-promise";
 import { getProjectNamespace } from "../../../../utils/projects";
 import { envAutocompletion } from "./utils/autocompletions";
 
 export default (vorpal: Vorpal) =>
   vorpal
     .command(
-      "project-delete <env>",
+      "project-delete <envComponent>",
       "deletes a environment of a project (it deletes the namespace)"
     )
     .autocomplete(envAutocompletion)
-    .action(async function ({ env }) {
-      const namespace = await getProjectNamespace(env as Env);
+    .action(async function ({ envComponent }) {
+      const namespace = await getProjectNamespace(envComponent);
       const { shouldContinue } = await this.prompt({
         type: "confirm",
         name: "shouldContinue",

package/src/apps/shell/commands/project/commandGetShell.ts

@@ -2,7 +2,7 @@ import Vorpal from "vorpal";
 import { logError } from "../../../../utils/log";
 import {
   getProjectNamespace,
-  getProjectPodNames
+  getProjectPodNames,
 } from "../../../../utils/projects";
 import { getShell } from "../../../../utils/shell";
 
@@ -12,14 +12,14 @@ import ensureCluster from "./utils/ensureCluster";
 export default (vorpal: Vorpal) =>
   vorpal
     .command(
-      "project-get-shell <env>",
+      "project-get-shell <envComponent>",
       "get a shell to a pod in the environment"
     )
     .autocomplete(envAutocompletion)
-    .action(async function({ env }) {
-      await ensureCluster.call(this);
-      const namespace = await getProjectNamespace(env);
-      const podNames = await getProjectPodNames(env);
+    .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;
@@ -28,7 +28,7 @@ export default (vorpal: Vorpal) =>
         type: "list",
         name: "podName",
         choices: podNames,
-        message: "Which pod? 🤔"
+        message: "Which pod? 🤔",
       });
 
       return getShell(namespace, podName);

package/src/apps/shell/commands/project/commandInitGitlab.ts

@@ -1,12 +1,14 @@
+import { isOfDeployType } from "@catladder/pipeline";
 import open from "open";
 import Vorpal from "vorpal";
-import { getClusterByName } from "../../../../utils/cluster";
-import { doGitlabRequest, getProjectInfo } from "../../../../utils/gitlab";
-import { readPass, syncBitwarden } from "../../../../utils/passwordstore/";
+import { getAllPipelineContexts } from "../../../../config/getProjectConfig";
 import {
-  getLocalProjectVariables,
-  getProjectNamespace,
-} from "../../../../utils/projects";
+  getClusterByFullName,
+  getClusterByName,
+} from "../../../../utils/cluster";
+import { doGitlabRequest, getProjectInfo } from "../../../../utils/gitlab";
+import { readPass } from "../../../../utils/passwordstore/";
+import { getProjectNamespace } from "../../../../utils/projects";
 
 export default (vorpal: Vorpal) =>
   vorpal
@@ -18,67 +20,111 @@ export default (vorpal: Vorpal) =>
       const { id: projectId, web_url: projectWebUrl } = await getProjectInfo(
         this
       );
-      await syncBitwarden();
-      const clusters = await doGitlabRequest(
+      const existingGitlabClusters = await doGitlabRequest<{ name: string }[]>(
         this,
         `projects/${projectId}/clusters`
       );
 
-      if (clusters.length === 0) {
+      const existingClusters = existingGitlabClusters.map(
+        (c: { name: string }) => {
+          const found = getClusterByFullName(c.name);
+
+          return {
+            name: found ? found.name : null,
+            fullName: c.name,
+          };
+        }
+      );
+
+      if (existingClusters.length === 0) {
         this.log("");
         this.log("there is no cluster on the current project?");
       } else {
         this.log("there are already these clusters on the gitlab: ");
         this.log("");
-        clusters.forEach((cluster: any) => this.log(` - ${cluster.name}`));
+        existingClusters.forEach((cluster) =>
+          this.log(` - ${cluster.name || "unknown"} (${cluster.fullName})`)
+        );
       }
 
       this.log("");
-      this.log("your project specifies the following cluster:");
+      this.log("your project specifies the following clusters:");
       this.log("");
-      const { CLUSTER_NAME } = await getLocalProjectVariables();
-      const configuredCluster = await getClusterByName(CLUSTER_NAME);
-      if (!configuredCluster) {
-        throw new Error(
-          `there exist no cluster with the name '${CLUSTER_NAME}'`
-        );
-      }
-      this.log(`${CLUSTER_NAME} (${configuredCluster.fullName})`);
+      const allContext = getAllPipelineContexts();
+      const allDeployments = allContext.map((c) => c.componentConfig.deploy);
+
+      const configuredClusterNames = allDeployments.reduce<string[]>(
+        (acc, c) => {
+          if (
+            isOfDeployType(c, "kubernetes") &&
+            !acc.includes(c.cluster || "production")
+          ) {
+            return [...acc, c.cluster || "production"];
+          }
+          return acc;
+        },
+        []
+      );
+      const configuredClusters = configuredClusterNames.map((c) => ({
+        name: c,
+        config: getClusterByName(c),
+      }));
+      configuredClusters.forEach((cluster) =>
+        this.log(` - ${cluster.name || "unknown"} (${cluster.config.fullName})`)
+      );
       this.log("");
-      const { shouldContinue } = await this.prompt({
-        type: "confirm",
-        name: "shouldContinue",
-        message: "Should I add the this cluster ? 🤔  ",
-      });
+
+      const missingClusters = configuredClusters.filter(
+        (c) => !existingClusters.some((exist) => exist.name === c.name)
+      );
+
       this.log("");
-      if (shouldContinue) {
-        const { api_url, passCredentials } = configuredCluster;
-        if (!api_url) {
-          throw new Error("no api_url on this cluster!");
-        }
-        if (!passCredentials) {
-          throw new Error("no passCredentials on this cluster!");
-        }
-        const token = await readPass(passCredentials.token);
-        const ca_cert = await readPass(passCredentials.ca_cert);
-
-        const postResult = await doGitlabRequest(
-          this,
-          `projects/${projectId}/clusters/user`,
-          {
-            name: configuredCluster.fullName,
-            managed: false,
-            platform_kubernetes_attributes: {
-              api_url,
-              ca_cert,
-              token,
-              namespace: await getProjectNamespace("prod"),
-            },
+      this.log("These clusters are not configured yet on gitlab:");
+      this.log("");
+
+      missingClusters.forEach((cluster) =>
+        this.log(` - ${cluster.name || "unknown"} (${cluster.config.fullName})`)
+      );
+      this.log("");
+
+      for (const cluster of missingClusters) {
+        this.log(`${cluster} (${cluster.config.fullName})`);
+        this.log("");
+        const { shouldContinue } = await this.prompt({
+          type: "confirm",
+          name: "shouldContinue",
+          message: "Should I add the this cluster ? 🤔  ",
+        });
+        this.log("");
+        if (shouldContinue) {
+          const { api_url, passCredentials } = cluster.config;
+          if (!api_url) {
+            throw new Error("no api_url on this cluster!");
+          }
+          if (!passCredentials) {
+            throw new Error("no passCredentials on this cluster!");
+          }
+          const token = await readPass(passCredentials.token);
+          const ca_cert = await readPass(passCredentials.ca_cert);
+
+          const postResult = await doGitlabRequest(
+            this,
+            `projects/${projectId}/clusters/user`,
+            {
+              name: cluster.config.fullName,
+              managed: false,
+              platform_kubernetes_attributes: {
+                api_url,
+                ca_cert,
+                token,
+                namespace: await getProjectNamespace("prod"),
+              },
+            }
+          );
+          const { message } = postResult;
+          if (message) {
+            this.log(`Message from gitlab: ${message}`);
           }
-        );
-        const { message } = postResult;
-        if (message) {
-          this.log(`Message from gitlab: ${message}`);
         }
       }
 

package/src/apps/shell/commands/project/commandInitProject.ts

@@ -38,6 +38,9 @@ const DEFAULT_FILES_TO_CREATE: FileToCreate[] = [
       readFile(path.resolve(__dirname, "../includes/envrc"), "utf8"),
   },
 ];
+/*
+
+TODO: reimplement as PRESETS ? 
 const PLATFORMS: { [platformName: string]: PlatformDefinition } = {
   nextJS: {
     variables: {},
@@ -180,10 +183,15 @@ const PLATFORMS: { [platformName: string]: PlatformDefinition } = {
     values: {},
   },
 };
+
+*/
+
+const PLATFORMS: any = {};
 export default (vorpal: Vorpal) =>
   vorpal
     .command("project-init", "Inits a new project")
     .action(async function () {
+      throw new Error("needs reimplementation");
       const hasGitlabFile = await hasGitlabCiFile();
       if (hasGitlabFile) {
         this.log("there is already a gitlab-ci.yml file. Skipping");

package/src/apps/shell/commands/project/commandListPods.ts

@@ -2,20 +2,19 @@ import yaml from "js-yaml";
 import { pick } from "lodash";
 import Vorpal from "vorpal";
 import { getProjectPods } from "../../../../utils/projects";
-
 import { envAutocompletion } from "./utils/autocompletions";
 import ensureCluster from "./utils/ensureCluster";
 
 export default (vorpal: Vorpal) =>
   vorpal
-    .command("project-list-pods <env>", "list pods of local project")
+    .command("project-list-pods <envComponent>", "list pods of local project")
     .autocomplete(envAutocompletion)
-    .action(async function({ env }) {
-      await ensureCluster.call(this);
-      const pods = await getProjectPods(env);
+    .action(async function ({ envComponent }) {
+      await ensureCluster.call(this, envComponent);
+      const pods = await getProjectPods(envComponent);
       this.log(
         yaml.safeDump(
-          pods.map(p => pick(p, ["metadata.name", "status.startTime"]))
+          pods.map((p) => pick(p, ["metadata.name", "status.startTime"]))
         )
       );
     });

package/src/apps/shell/commands/project/commandMigrateHelm3.ts

@@ -37,7 +37,7 @@ export default (vorpal: Vorpal) =>
           // ignore
         }
 
-        const releaseName = await getEnvironmentByChoice(envComponent).variables
+        const releaseName = await getEnvironmentByChoice(envComponent).envVars
           .RELEASE_NAME; // TODO: maybe its own function would be better
         this.log(`helm release name: ${releaseName}`);
         this.log("");

package/src/apps/shell/commands/project/commandNamespace.ts

@@ -1,12 +1,14 @@
 import Vorpal from "vorpal";
-import { Env } from "../../../../types/types";
 import { getProjectNamespace } from "../../../../utils/projects";
 import { envAutocompletion } from "./utils/autocompletions";
 
 export default (vorpal: Vorpal) =>
   vorpal
-    .command("project-namespace <env>", "show namespace of local project")
+    .command(
+      "project-namespace <envComponent>",
+      "show namespace of local project"
+    )
     .autocomplete(envAutocompletion)
-    .action(async function({ env }) {
-      this.log(await getProjectNamespace(env as Env));
+    .action(async function ({ envComponent }) {
+      this.log(await getProjectNamespace(envComponent));
     });

package/src/apps/shell/commands/project/commandOpenCostDashboard.ts

@@ -13,11 +13,14 @@ import { envAutocompletion } from "./utils/autocompletions";
 import ensureCluster from "./utils/ensureCluster";
 export default (vorpal: Vorpal) =>
   vorpal
-    .command("project-check-costs <env>", "Shows you how much you're spending")
+    .command(
+      "project-check-costs <envComponent>",
+      "Shows you how much you're spending"
+    )
     .autocomplete(envAutocompletion)
-    .action(async function ({ env }) {
-      await ensureCluster.call(this);
-      const namespace = await getProjectNamespace(env);
+    .action(async function ({ envComponent }) {
+      await ensureCluster.call(this, envComponent);
+      const namespace = await getProjectNamespace(envComponent);
       const url = `http://localhost:${GRAFANA_PROXY_LOCAL_PORT}/namespace.html?name=${namespace}`;
       await startPortForward(
         "deployment/kubecost-cost-analyzer",