@catladder/cli 0.0.0-main-d0a1e9f1 → 0.0.0-main-67fbbdf8

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

@@ -0,0 +1,40 @@
+import { BuildConfig } from "@catladder/pipeline";
+
+export type OldGitlabCiFile = {
+  variables: {
+    CUSTOMER_NAME: string;
+    APP_NAME: string;
+    COMPONENT_NAME?: string;
+    APP_DIR?: string;
+    CLUSTER_NAME?: string;
+  };
+  include: {
+    project: string;
+    ref: string;
+    file: string;
+  }[];
+};
+
+export const detectBuildConfig = (
+  gitlabCi: OldGitlabCiFile
+): BuildConfig["type"] => {
+  const firstInclude = gitlabCi.include[0];
+  if (!firstInclude || gitlabCi.include[0]?.project !== "catladder/gitlab-ci") {
+    throw new Error("unsupported gitlab-ci file");
+  }
+
+  if (firstInclude.file === "node-kubernetes.yml") {
+    return "node";
+  }
+
+  if (firstInclude.file === "static-js-kubernetes.yml") {
+    return "node-static";
+  }
+  if (firstInclude.file === "meteor-kubernetes.yml") {
+    throw new Error("meteor is not yet implemented");
+  }
+
+  if (firstInclude.file === "rails-kubernetes.yml") {
+    throw new Error("meteor is not yet implemented");
+  }
+};

package/src/config/getProjectConfig.ts

@@ -9,6 +9,7 @@ import { CommandInstance } from "vorpal";
 import { getAllVariables } from "../utils/gitlab";
 import memoizee from "memoizee";
 import { getGitRoot } from "../utils/projects";
+import { readYaml } from "../utils/files";
 // currently cant change
 
 export const getProjectConfig = memoizee(
@@ -18,11 +19,25 @@ export const getProjectConfig = memoizee(
       return readConfigSync(gitRoot);
     } catch (e) {
       // ignore
+      return null;
     }
   },
   { promise: true }
 );
 
+export const getGitlabCiFilePath = async () => {
+  const gitRoot = await getGitRoot();
+  return gitRoot + "/.gitlab-ci.yml";
+};
+export const getGitlabCi = async () => {
+  try {
+    return readYaml(await getGitlabCiFilePath());
+  } catch (e) {
+    // ignore
+    return null;
+  }
+};
+
 export const getProjectComponents = async () => {
   const config = await getProjectConfig();
   if (!config) return [];
@@ -74,7 +89,7 @@ const resolveSecrets = async (
 
   return Object.fromEntries(
     Object.entries(allEnvVars).map(([key, value]) => {
-      const isSecret = value?.startsWith("$CL_");
+      const isSecret = value?.startsWith?.("$CL_");
       if (isSecret) {
         // secrets have CL_XXXX structure
         const found = allVariablesInGitlab.find((v) => "$" + v.key === value);
@@ -96,5 +111,6 @@ export const getEnvVars = async (
   componentName: string
 ) => {
   const envionment = await getEnvironment(env, componentName);
+
   return resolveSecrets(vorpal, envionment.envVars);
 };

package/src/utils/editAsFile.ts

@@ -16,7 +16,7 @@ export const editAsFile = async <T>(
 `
     : "\n";
   const asString = fullPreamble + yaml.safeDump(inObject, { noRefs: true });
-  let newContent;
+  let newContent: T;
 
   await withFile(
     async ({ path: tmpFilePath }) => {

package/src/utils/files.ts

@@ -14,5 +14,9 @@ export const readFileOrError = async (filePath: string) => {
 };
 
 export const readYaml = async (filename: string) => {
-  return yaml.load(await readFile(filename));
+  try {
+    return yaml.load(await readFile(filename));
+  } catch (e) {
+    return null;
+  }
 };

package/src/utils/gitlab.ts

@@ -1,4 +1,5 @@
 import { exec } from "child-process-promise";
+import { isObject, result } from "lodash";
 import memoizee from "memoizee";
 import fetch from "node-fetch";
 import open from "open";
@@ -99,7 +100,19 @@ type GitlabVariable = {
 export const getAllVariables = memoizee(
   async (vorpal: CommandInstance): Promise<Array<GitlabVariable>> => {
     const { id } = await getProjectInfo(vorpal);
-    return await doGitlabRequest(vorpal, `projects/${id}/variables`);
+    let all: Array<GitlabVariable> = [];
+    let result: Array<GitlabVariable>;
+    let page = 1;
+    do {
+      result = await doGitlabRequest(
+        vorpal,
+        // 100 is max page size
+        `projects/${id}/variables?per_page=100&page=${page}`
+      );
+      page++;
+      all = [...all, ...result];
+    } while (result?.length > 0);
+    return all;
   },
   { promise: true }
 );
@@ -133,7 +146,7 @@ const updateVariable = async (
 };
 export const upsertAllVariables = async (
   vorpal: CommandInstance,
-  variables: Record<string, string>,
+  variables: Record<string, any>,
   env: string,
   componentName: string
 ): Promise<void> => {
@@ -141,11 +154,11 @@ export const upsertAllVariables = async (
 
   for (const [key, value] of Object.entries(variables ?? {})) {
     const fullKey = "CL_" + env + "_" + componentName + "_" + key;
-
+    const valueSanitized = isObject(value) ? JSON.stringify(value) : `${value}`;
     try {
-      await updateVariable(vorpal, id, fullKey, value);
+      await updateVariable(vorpal, id, fullKey, valueSanitized);
     } catch (e) {
-      await createVariable(vorpal, id, fullKey, value);
+      await createVariable(vorpal, id, fullKey, valueSanitized);
     } finally {
       getAllVariables.clear();
     }

package/src/utils/passwordstore/index.ts

@@ -1,11 +1,8 @@
 import { exec, spawn } from "child-process-promise";
 import commandExists from "command-exists-promise";
 import dayjs from "dayjs";
-
 import { readFile, writeFile } from "fs-extra";
-import yaml from "js-yaml";
 import { withFile } from "tmp-promise";
-import formatEnvVars from "../formatEnvVars";
 import getEditor from "../getEditor";
 import { getPreference, hasPreference, setPreference } from "../preferences";
 
@@ -78,9 +75,7 @@ const execBitwardenCommand = async (command: string): Promise<any> => {
       await loginBitwarden();
       return execBitwardenCommand(command);
     } else {
-      console.error(e);
-
-      console.log("wooops", e.message);
+      throw e;
     }
   }
 };
@@ -169,24 +164,27 @@ const share = async (itemId: string) =>
     ])}`
   );
 
-export const editPass = async (path: string) => {
+export const trashItem = async (path: string) => {
   const item = await getItem(path);
 
-  await withFile(async ({ path: tmpFilePath }) => {
-    await writeFile(tmpFilePath, item.notes);
-    await (await getEditor()).open(tmpFilePath);
-    const newContent = (await readFile(tmpFilePath)).toString("utf-8");
+  const result = await execBitwardenCommand(`delete item ${item.id}`);
 
-    await update("item", item.id, {
-      ...item,
-      notes: newContent,
-    });
-  }, { postfix: ".yml" });
+  return result;
 };
+export const editPass = async (path: string) => {
+  const item = await getItem(path);
 
-export const readPassEnvVars = async (path: string) => {
-  // make sure that you have pulled pass beforehand
-  const yamlstring = await readPass(path);
-  // if a value is an object, we convert it to strings
-  return formatEnvVars(yaml.load(yamlstring));
+  await withFile(
+    async ({ path: tmpFilePath }) => {
+      await writeFile(tmpFilePath, item.notes);
+      await (await getEditor()).open(tmpFilePath);
+      const newContent = (await readFile(tmpFilePath)).toString("utf-8");
+
+      await update("item", item.id, {
+        ...item,
+        notes: newContent,
+      });
+    },
+    { postfix: ".yml" }
+  );
 };

package/src/utils/projects/index.ts

@@ -5,7 +5,7 @@ import { getProjectConfig, parseChoice } from "../../config/getProjectConfig";
 import k8sApi from "../../k8sApi";
 import { readFileOrError } from "../files";
 
-export const getGitRoot = async () => {
+export const getGitRoot = async (): Promise<string> => {
   return (await exec("git rev-parse --show-toplevel")).stdout?.trim();
 };