@catladder/cli 0.0.0-node16-ddfae617 → 0.0.0-refactor-env-context-9e652b63

package/package.json

@@ -8,7 +8,9 @@
     "lint": "eslint \"src/**/*.ts\"",
     "lint:fix": "eslint \"src/**/*.ts\" --fix",
     "test": "yarn run lint",
-    "build": "yarn tsc",
+    "build": "yarn build:compile && yarn build:bundle",
+    "build:bundle": "./scripts/bundle",
+    "build:compile": "yarn tsc",
     "build:watch": "yarn tsc -w"
   },
   "bin": {
@@ -16,34 +18,19 @@
     "catladder": "./bin/catladder"
   },
   "dependencies": {
-    "@catladder/pipeline": "0.0.0-node16-ddfae617",
-    "@kubernetes/client-node": "^0.16.2",
-    "child-process-promise": "^2.2.1",
-    "command-exists-promise": "^2.0.2",
-    "common-tags": "^1.8.0",
-    "dayjs": "^1.10.4",
-    "fs-extra": "^7.0.1",
-    "gitlab": "^4.4.1",
-    "js-yaml": "^4.1.0",
-    "lodash": "^4.17.21",
-    "memoizee": "^0.4.14",
-    "node-fetch": "^2.3.0",
-    "open": "^8.4.0",
-    "prettier": "^2.5.1",
-    "tmp-promise": "^2.0.2",
-    "update-notifier": "^2.5.0",
-    "vorpal": "^1.12.0",
-    "zx": "^4.3.0"
+    "ts-node": "^10.9.1"
   },
   "engines": {
     "node": ">=12.0.0"
   },
   "devDependencies": {
+    "@catladder/pipeline": "0.0.0-refactor-env-context-9e652b63",
+    "@kubernetes/client-node": "^0.16.2",
     "@tsconfig/node14": "^1.0.1",
     "@types/common-tags": "^1.8.0",
     "@types/fs-extra": "^5.0.4",
     "@types/js-yaml": "^4.0.5",
-    "@types/lodash": "^4.14.119",
+    "@types/lodash": "^4.14.185",
     "@types/memoizee": "^0.4.2",
     "@types/node-fetch": "^2.1.4",
     "@types/request": "^2.48.1",
@@ -52,9 +39,24 @@
     "@types/vorpal": "^1.12.0",
     "@types/websocket": "^0.0.40",
     "@types/yargs": "^13.0.0",
+    "child-process-promise": "^2.2.1",
+    "clipboardy": "^2.0.0",
+    "command-exists-promise": "^2.0.2",
+    "common-tags": "^1.8.0",
+    "dayjs": "^1.10.4",
     "eslint": "^8.7.0",
-    "typescript": "^4.5.4"
+    "fs-extra": "^7.0.1",
+    "gitlab": "^4.4.1",
+    "js-yaml": "^4.1.0",
+    "lodash": "^4.17.21",
+    "memoizee": "^0.4.14",
+    "node-fetch": "^2.3.0",
+    "open": "^8.4.0",
+    "prettier": "^2.5.1",
+    "tmp-promise": "^2.0.2",
+    "typescript": "^4.5.4",
+    "vorpal": "^1.12.0"
   },
-  "version": "0.0.0-node16-ddfae617",
+  "version": "0.0.0-refactor-env-context-9e652b63",
   "stableVersion": "0.0.0"
 }

package/scripts/bundle

@@ -0,0 +1,4 @@
+#!/bin/bash
+ncc build dist/catenv.js -o dist/bundles/catenv -e 'ts-node' $( ((SHOULD_MINIFY == 1)) && printf %s '-m')
+
+ncc build dist/cli.js -o dist/bundles/cli -e 'ts-node' $( ((SHOULD_MINIFY == 1)) && printf %s '-m')

package/src/apps/catenv/catenv.ts

@@ -1,4 +1,4 @@
-import { Config, ComponentConfig } from "@catladder/pipeline";
+import type { Config, ComponentConfig } from "@catladder/pipeline";
 import { getEnvVars, getProjectConfig } from "../../config/getProjectConfig";
 import { getGitRoot } from "../../utils/projects";
 import { join } from "path";
@@ -14,21 +14,29 @@ const getCurrentComponentName = async (
 
 const sanitizeEnvVarName = (name: string) => name.replace(/[\s\-.]+/g, "_");
 
-const getAllVariablesToPrint = async (config: Config) => {
+const getAllVariablesToPrint = async (
+  config: Config,
+  choice?: {
+    env?: string;
+    componentName?: string;
+  }
+) => {
+  const env = choice?.env ?? "local";
   const { components } = config;
 
-  const currentComponent = await getCurrentComponentName(components);
+  const currentComponent =
+    choice?.componentName ?? (await getCurrentComponentName(components));
 
   let variables = {};
   if (currentComponent) {
-    variables = await getEnvVars(null, "local", currentComponent);
+    variables = await getEnvVars(null, env, currentComponent);
   } else {
     // when in a monorep and not in a subapp, merge all env vars.
     // this is not 100% correct, but better than not exporting any vars at all
     // so we also add prefixed variants
     variables = await Object.keys(components).reduce(
       async (acc, componentName) => {
-        const subappvars = await getEnvVars(null, "local", componentName);
+        const subappvars = await getEnvVars(null, env, componentName);
         return {
           ...(await acc),
           ...subappvars,
@@ -46,13 +54,12 @@ const getAllVariablesToPrint = async (config: Config) => {
   }
   return variables;
 };
-export default async () => {
+export default async (choice?: { env?: string; componentName?: string }) => {
   const config = await getProjectConfig();
   if (!config) {
     return;
   }
-
-  const variables = await getAllVariablesToPrint(config);
+  const variables = await getAllVariablesToPrint(config, choice);
 
   console.log(
     Object.entries(variables)

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

@@ -1,5 +1,5 @@
 import memoizee from "memoizee";
-import Vorpal from "vorpal";
+import type Vorpal from "vorpal";
 import { getk8sApi } from "../../../../k8sApi";
 import { getCurrentContext } from "../../../../utils/cluster";
 import { logError } from "../../../../utils/log";

package/src/apps/cli/commands/general/portForward.ts

@@ -1,4 +1,4 @@
-import Vorpal from "vorpal";
+import type Vorpal from "vorpal";
 import { logError } from "../../../../utils/log";
 
 import { startPortForward } from "../../../../utils/portForward";

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

@@ -1,4 +1,4 @@
-import Vorpal from "vorpal";
+import type Vorpal from "vorpal";
 import projectMongoDestroyMember from "./projectMongoDestroyMember";
 import projectMongoGetShell from "./projectMongoGetShell";
 import projectMongoPortForward from "./projectMongoPortForward";

package/src/apps/cli/commands/mongodb/projectMongoDestroyMember.ts

@@ -1,10 +1,8 @@
 import { exec } from "child-process-promise";
-import Vorpal from "vorpal";
+import type Vorpal from "vorpal";
+import { getProjectPvcs } from "../../../../kubernetes";
 import { logError } from "../../../../utils/log";
-import {
-  getProjectNamespace,
-  getProjectPvcs,
-} from "../../../../utils/projects";
+import { getProjectNamespace } from "../../../../utils/projects";
 import { envAndComponents } from "../project/utils/autocompletions";
 import ensureCluster from "../project/utils/ensureCluster";
 import { getMongoDbPodsWithReplInfo } from "./utils";

package/src/apps/cli/commands/mongodb/projectMongoGetShell.ts

@@ -1,4 +1,4 @@
-import Vorpal from "vorpal";
+import type Vorpal from "vorpal";
 import { logError } from "../../../../utils/log";
 import { getProjectNamespace } from "../../../../utils/projects";
 import { envAndComponents } from "../project/utils/autocompletions";

package/src/apps/cli/commands/mongodb/projectMongoPortForward.ts

@@ -1,10 +1,12 @@
-import Vorpal from "vorpal";
+import type Vorpal from "vorpal";
+import { getEnvVars, parseChoice } from "../../../../config/getProjectConfig";
 import { logError } from "../../../../utils/log";
 import { startPortForward } from "../../../../utils/portForward";
 import { getProjectNamespace } from "../../../../utils/projects";
 import { envAndComponents } from "../project/utils/autocompletions";
 import ensureCluster from "../project/utils/ensureCluster";
 import { getProjectMongodbAllPodsSortedWithLabel } from "./utils";
+import clipboard from "clipboardy";
 
 export default async (vorpal: Vorpal) =>
   vorpal
@@ -43,5 +45,18 @@ export default async (vorpal: Vorpal) =>
         default: "30000",
         message: "Local port: ",
       });
+      const { env, componentName } = parseChoice(envComponent);
+      const envVars = await getEnvVars(this, env, componentName);
+      const MONGODB_ROOT_PASSWORD = envVars?.MONGODB_ROOT_PASSWORD;
+      const connectionUrl = `mongodb://root:${MONGODB_ROOT_PASSWORD}@localhost:${localPort}`;
+      clipboard.writeSync(connectionUrl);
+      this.log("");
+      this.log("username: root");
+      this.log(`password: ${MONGODB_ROOT_PASSWORD}`);
+      this.log(`connection string: ${connectionUrl}`);
+      this.log("");
+      this.log("👆 connection string has been copied to your clipboard!");
+      this.log("");
+
       return startPortForward(podName, localPort, 27017, namespace);
     });

package/src/apps/cli/commands/mongodb/utils/index.ts

@@ -1,11 +1,14 @@
 import { exec, spawn } from "child-process-promise";
-import {
-  getProjectNamespace,
-  getProjectPodNames,
-} from "../../../../../utils/projects";
+import { getProjectPodNames } from "../../../../../kubernetes";
+import { getProjectNamespace } from "../../../../../utils/projects";
 
 const filterMongoDbs = (podNames: string[]) =>
-  podNames.filter((name) => name.includes("mongodb-replicaset"));
+  podNames.filter(
+    (name) =>
+      name.includes("mongodb") &&
+      !name.includes("mongodb-backup") &&
+      !name.includes("arbiter")
+  );
 
 export const getProjectMongodbAllPods = async (envComponent: string) =>
   filterMongoDbs(await getProjectPodNames(envComponent));
@@ -43,13 +46,18 @@ export const executeMongodbCommand = async (
 };
 
 export const podIsMaster = async (namespace: string, podName: string) => {
-  const result = await executeMongodbCommand(
-    namespace,
-    podName,
-    "db.isMaster()"
-  );
+  try {
+    const result = await executeMongodbCommand(
+      namespace,
+      podName,
+      "db.isMaster()"
+    );
 
-  return result.ismaster;
+    return result.ismaster;
+  } catch (e) {
+    // maybe shutting down ?
+    return null;
+  }
 };
 
 const spaces = (n: number) => " ".repeat(n);

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

@@ -2,7 +2,7 @@ import { isOfDeployType } from "@catladder/pipeline";
 import { spawn } from "child-process-promise";
 import { writeFile } from "fs-extra";
 import { withFile } from "tmp-promise";
-import Vorpal from "vorpal";
+import type Vorpal from "vorpal";
 import {
   getEnvVars,
   getGitlabVar,

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

@@ -1,19 +1,18 @@
 /* eslint-disable no-constant-condition */
+import { getSecretVarName } from "@catladder/pipeline";
 import { stripIndents } from "common-tags";
 import { difference } from "lodash";
-import Vorpal, { CommandInstance } from "vorpal";
-import { GOOGLE_CLOUD_SQL_PASS_PATH } from "../../../../config/constants";
+import type { CommandInstance } from "vorpal";
+import type Vorpal from "vorpal";
 import {
   getAllComponentsWithAllEnvsHierarchical,
   getEnvironment,
   getEnvVars,
-  getPipelineContextByChoice,
   getProjectComponents,
   parseChoice,
 } from "../../../../config/getProjectConfig";
 import { editAsFile } from "../../../../utils/editAsFile";
 import { upsertAllVariables } from "../../../../utils/gitlab";
-import { hasBitwarden, readPass } from "../../../../utils/passwordstore";
 import { delay } from "../../../../utils/promise";
 import { allEnvsAndAllComponents } from "./utils/autocompletions";
 
@@ -45,6 +44,7 @@ const resolveJson = (v: Vars) =>
       ];
     })
   );
+
 const getEnvVarsToEdit = async (
   instance: CommandInstance,
   env: string,
@@ -54,7 +54,13 @@ const getEnvVarsToEdit = async (
 
   const allEnvVars = await getEnvVars(instance, env, componentName);
   return Object.fromEntries(
-    secretEnvVarKeys.map((key) => [key, allEnvVars[key]])
+    secretEnvVarKeys.map((key) => {
+      const value = allEnvVars[key];
+      // due to some quirky way to resolve these variables, unset variables have the $CL_ prefix, so we remove thouse here
+      const variableIsNotSet =
+        value === "$" + getSecretVarName(env, componentName, key);
+      return [key, variableIsNotSet ? "🚨 FILL ME" : value];
+    })
   );
 };
 const doItFor = async (
@@ -148,32 +154,7 @@ const doItFor = async (
         env,
         componentName
       );
-
-      if (hasBitwarden()) {
-        // add cloud sql secret if needed.
-        // TODO: this is legacy, in the future we want to have one service account per app
-        try {
-          const context = await getPipelineContextByChoice(env, componentName);
-          if (
-            context.componentConfig.deploy &&
-            context.componentConfig.deploy.type === "kubernetes" &&
-            context.componentConfig.deploy.values?.cloudsql?.enabled
-          ) {
-            await upsertAllVariables(
-              instance,
-              {
-                cloudsqlProxyCredentials: await readPass(
-                  GOOGLE_CLOUD_SQL_PASS_PATH
-                ),
-              },
-              env,
-              componentName
-            );
-          }
-        } catch (e) {
-          // ignore atm
-        }
-      }
+      instance.log("");
       instance.log("✅ " + env + ":" + componentName);
     }
   }

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

@@ -1,6 +1,5 @@
 import { spawn } from "child-process-promise";
-import Vorpal from "vorpal";
-import { GOOGLE_CLOUD_SQL_PASS_PATH } from "../../../../config/constants";
+import type Vorpal from "vorpal";
 import {
   getEnvVars,
   getProjectConfig,
@@ -32,6 +31,7 @@ export default async (vorpal: Vorpal) =>
       }
 
       // TODO: reimpleent with new config
+      /*
       throw new Error("needs reimplementation with new config");
       const GOOGLE_CLOUD_SQL_REGION = "europe-west6"; // currently hardcoded
       const { POSTGRESQL_PASSWORD } = await getEnvVars(
@@ -88,4 +88,5 @@ export default async (vorpal: Vorpal) =>
       `;
 
       await spawn(copyDBScript, [], { shell: "bash", stdio: "inherit" });
+      */
     });

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

@@ -1,11 +1,9 @@
-import Vorpal from "vorpal";
+import type Vorpal from "vorpal";
 import { getk8sApi } from "../../../../k8sApi";
+import { getProjectPodNames } from "../../../../kubernetes";
 
 import { logError } from "../../../../utils/log";
-import {
-  getProjectNamespace,
-  getProjectPodNames,
-} from "../../../../utils/projects";
+import { getProjectNamespace } from "../../../../utils/projects";
 import { envAndComponents } from "./utils/autocompletions";
 import ensureCluster from "./utils/ensureCluster";
 

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

@@ -1,4 +1,4 @@
-import Vorpal from "vorpal";
+import type Vorpal from "vorpal";
 import { exec } from "child-process-promise";
 import { getProjectNamespace } from "../../../../utils/projects";
 import { envAndComponents } from "./utils/autocompletions";

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

@@ -1,4 +1,4 @@
-import Vorpal from "vorpal";
+import type Vorpal from "vorpal";
 import { getEnvVars, parseChoice } from "../../../../config/getProjectConfig";
 import { envAndComponents } from "./utils/autocompletions";
 

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

@@ -1,5 +1,5 @@
 import { spawn } from "child-process-promise";
-import Vorpal from "vorpal";
+import type Vorpal from "vorpal";
 
 export default async (vorpal: Vorpal) =>
   vorpal

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

@@ -1,9 +1,7 @@
-import Vorpal from "vorpal";
+import type Vorpal from "vorpal";
+import { getProjectPodNames } from "../../../../kubernetes";
 import { logError } from "../../../../utils/log";
-import {
-  getProjectNamespace,
-  getProjectPodNames,
-} from "../../../../utils/projects";
+import { getProjectNamespace } from "../../../../utils/projects";
 import { getShell } from "../../../../utils/shell";
 
 import { envAndComponents } from "./utils/autocompletions";

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

@@ -1,7 +1,8 @@
 import { exec } from "child-process-promise";
 import { last } from "lodash";
 import open from "open";
-import Vorpal, { CommandInstance } from "vorpal";
+import type { CommandInstance } from "vorpal";
+import type Vorpal from "vorpal";
 import {
   doGitlabRequest,
   getGitlabToken,

package/src/apps/cli/commands/project/commandInitProject.old.ts

@@ -2,7 +2,7 @@ import { readFile, writeFile } from "fs-extra";
 import { dump } from "js-yaml";
 import { mapKeys, snakeCase, toUpper } from "lodash";
 import path from "path";
-import Vorpal from "vorpal";
+import type Vorpal from "vorpal";
 import { hasGitlabCiFile } from "../../../../utils/projects";
 
 const transformVar = (key: string) => toUpper(snakeCase(key));

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

@@ -1,7 +1,7 @@
 import { dump } from "js-yaml";
 import { pick } from "lodash";
-import Vorpal from "vorpal";
-import { getProjectPods } from "../../../../utils/projects";
+import type Vorpal from "vorpal";
+import { getProjectPods } from "../../../../kubernetes";
 import { envAndComponents } from "./utils/autocompletions";
 import ensureCluster from "./utils/ensureCluster";
 

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

@@ -1,5 +1,5 @@
 import { exec } from "child-process-promise";
-import Vorpal from "vorpal";
+import type Vorpal from "vorpal";
 import {
   getEnvironment,
   parseChoice,
@@ -43,8 +43,9 @@ export default async (vorpal: Vorpal) =>
           // ignore
         }
 
-        const releaseName = (await getEnvironment(env, componentName)).envVars
-          .RELEASE_NAME; // TODO: maybe its own function would be better
+        // we use the app full name as the release name
+        const releaseName = (await getEnvironment(env, componentName)).fullName;
+
         this.log(`helm release name: ${releaseName}`);
         this.log("");
         this.log("migrating now... 😼. This may take a moment");

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

@@ -1,4 +1,4 @@
-import Vorpal from "vorpal";
+import type Vorpal from "vorpal";
 import { getProjectNamespace } from "../../../../utils/projects";
 import { envAndComponents } from "./utils/autocompletions";
 

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

@@ -1,5 +1,5 @@
 import open from "open";
-import Vorpal from "vorpal";
+import type Vorpal from "vorpal";
 import {
   GRAFANA_PROXY_LOCAL_PORT,
   GRAFANA_PROXY_TARGET_PORT,

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

@@ -1,48 +1,28 @@
-import Vorpal from "vorpal";
+import { isOfDeployType } from "@catladder/pipeline";
+import type Vorpal from "vorpal";
 import {
   getPipelineContextByChoice,
   parseChoice,
 } from "../../../../config/getProjectConfig";
-import { getGoogleAuthUserNumber } from "../../utils/getGoogleAuthUserNumber";
-import { openGoogleCloudKubernetesDashboard } from "../shared";
+import { openGoogleCloudRunDashboard } from "../../../../gcloud/cloudRun/openCloudRunDashboards";
+import { openGoogleCloudKubernetesDashboard } from "../../../../kubernetes/openKubernetesDashboards";
+
 import { envAndComponents } from "./utils/autocompletions";
+
 export default async (vorpal: Vorpal) =>
   vorpal
     .command(
       "project-open-dashboard <envComponent>",
-      "open kubernetes dashboard on google"
+      "open an apps dashboard (kubernetes or cloudrun)"
     )
     .autocomplete(await envAndComponents())
     .action(async function ({ envComponent }) {
       const { env, componentName } = parseChoice(envComponent);
-      const { componentConfig, environment } = await getPipelineContextByChoice(
-        env,
-        componentName
-      );
-
-      if (
-        !componentConfig.deploy ||
-        componentConfig.deploy.type !== "kubernetes"
-      ) {
-        throw new Error(
-          "only kubernetes deployments are supported at the moment"
-        );
+      const context = await getPipelineContextByChoice(env, componentName);
+      if (isOfDeployType(context.componentConfig.deploy, "kubernetes")) {
+        await openGoogleCloudKubernetesDashboard(this, context);
       }
-
-      if (
-        !componentConfig.deploy.cluster ||
-        componentConfig.deploy.cluster.type !== "gcloud"
-      ) {
-        throw new Error("no gcloud custer configured");
+      if (isOfDeployType(context.componentConfig.deploy, "google-cloudrun")) {
+        await openGoogleCloudRunDashboard(this, context);
       }
-      // currently only supports kubernetes
-      const namespace = environment.envVars.KUBE_NAMESPACE;
-
-      const authGoogleNumber = await getGoogleAuthUserNumber.call(this, vorpal);
-
-      openGoogleCloudKubernetesDashboard(
-        componentConfig.deploy.cluster,
-        namespace,
-        authGoogleNumber
-      );
     });

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

@@ -1,5 +1,5 @@
 import open from "open";
-import Vorpal from "vorpal";
+import type Vorpal from "vorpal";
 import {
   getEnvironment,
   parseChoice,

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

@@ -1,5 +1,5 @@
-import Vorpal from "vorpal";
-import { $ } from "zx";
+import type Vorpal from "vorpal";
+import { exec } from "child-process-promise";
 
 export default async (vorpal: Vorpal) =>
   vorpal
@@ -8,5 +8,5 @@ export default async (vorpal: Vorpal) =>
       "open the repo on gitlab / github in your browser"
     )
     .action(async () => {
-      await $`npx git-open`;
+      await exec("npx git-open");
     });

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

@@ -1,6 +1,6 @@
 import open from "open";
 import { startPortForward } from "../../../../utils/portForward";
-import Vorpal from "vorpal";
+import type Vorpal from "vorpal";
 import {
   GRAFANA_PROXY_LOCAL_PORT,
   GRAFANA_PROXY_TARGET_PORT,

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

@@ -1,15 +1,13 @@
 import open from "open";
-import Vorpal from "vorpal";
+import type Vorpal from "vorpal";
 import {
   GRAFANA_PROXY_LOCAL_PORT,
   GRAFANA_PROXY_TARGET_PORT,
 } from "../../../../config/constants";
+import { getProjectPodNames } from "../../../../kubernetes";
 import { logError } from "../../../../utils/log";
 import { startPortForward } from "../../../../utils/portForward";
-import {
-  getProjectNamespace,
-  getProjectPodNames,
-} from "../../../../utils/projects";
+import { getProjectNamespace } from "../../../../utils/projects";
 import { envAndComponents } from "./utils/autocompletions";
 import ensureCluster from "./utils/ensureCluster";