@catladder/cli 0.0.0-refactor-image-ca767657 → 0.0.0-refactor-gcloud-auth-no-file-b43bf0d9

package/package.json

@@ -1,9 +1,58 @@
 {
   "name": "@catladder/cli",
+  "description": "Panter cli tool for Kubernetes",
   "author": "Marco Wettstein <maw@panter.ch>",
   "homepage": "https://git.panter.ch/catladder/catladder/#readme",
   "bugs": "https://git.panter.ch/catladder/catladder/issues",
+  "repository": {
+    "type": "git",
+    "url": "git+https://git.panter.ch/catladder/catladder.git",
+    "directory": "cli"
+  },
+  "keywords": [
+    "GitLab",
+    "cloud",
+    "cli",
+    "gitlab-ci",
+    "ci/cd",
+    "pipeline",
+    "deployment",
+    "devops",
+    "automation",
+    "typescript"
+  ],
+  "contributors": [
+    {
+      "name": "Marco Wettstein",
+      "email": "maw@panter.ch"
+    },
+    {
+      "name": "Michael Leu",
+      "email": "leu@panter.ch"
+    },
+    {
+      "name": "Luboš Matejčík",
+      "email": "lma@panter.ch"
+    },
+    {
+      "name": "Kaspar Vollenweider",
+      "email": "vok@panter.ch"
+    },
+    {
+      "name": "Silvan Adrian",
+      "email": "sia@panter.ch"
+    },
+    {
+      "name": "Stefan Bakocs",
+      "email": "stb@panter.ch"
+    },
+    {
+      "name": "Lukas Brezina",
+      "email": "brl@panter.ch"
+    }
+  ],
   "license": "MIT",
+  "version": "0.0.0-refactor-gcloud-auth-no-file-b43bf0d9",
   "scripts": {
     "lint": "eslint \"src/**/*.ts\"",
     "lint:fix": "eslint \"src/**/*.ts\" --fix",
@@ -24,7 +73,7 @@
     "node": ">=12.0.0"
   },
   "devDependencies": {
-    "@catladder/pipeline": "0.0.0-refactor-image-ca767657",
+    "@catladder/pipeline": "0.0.0-refactor-gcloud-auth-no-file-b43bf0d9",
     "@kubernetes/client-node": "^0.16.2",
     "@tsconfig/node14": "^1.0.1",
     "@types/common-tags": "^1.8.0",
@@ -43,6 +92,7 @@
     "clipboardy": "^2.0.0",
     "command-exists-promise": "^2.0.2",
     "common-tags": "^1.8.0",
+    "connection-string-parser": "^1.0.4",
     "dayjs": "^1.10.4",
     "eslint": "^8.7.0",
     "fs-extra": "^7.0.1",
@@ -57,6 +107,5 @@
     "typescript": "^4.5.4",
     "vorpal": "^1.12.0"
   },
-  "version": "0.0.0-refactor-image-ca767657",
   "stableVersion": "0.0.0"
 }

package/src/apps/cli/commands/cloudSQL/commandRestoreDb.ts

@@ -1,6 +1,5 @@
-import { spawn } from "child-process-promise";
-
 import type Vorpal from "vorpal";
+import { spawnCopyDb } from "../../../../gcloud/cloudSql/copyDb";
 import type { CloudSqlBackgroundProxy } from "../../../../gcloud/cloudSql/startProxy";
 import { startCloudSqlProxyInBackground } from "../../../../gcloud/cloudSql/startProxy";
 
@@ -119,34 +118,17 @@ export default async (vorpal: Vorpal) =>
         return;
       }
 
-      const targetPSQL = (command: string) =>
-        `PGPASSWORD=${targetPassword} psql -p ${targetPort} --host=localhost --user=${targetUsername} -q ${command}`;
-
-      const copyDBScript = `
-      set -e
-     
-    
-
-      dumptmp=$(mktemp /tmp/dump.XXXXXX)
-
-      echo "Dumping file to $dumptmp"
-      pg_dump --dbname=postgres://${sourceUsername}:${sourcePassword}@localhost:${sourcePort}/${sourceDbName} --no-owner --no-privileges > $dumptmp
-      echo "dump done"
-      ${targetPSQL(
-        `-c 'drop database "${targetDbName}" WITH (FORCE)' 1> /dev/null || true`
-      )}
-      ${targetPSQL(`-c 'create database "${targetDbName}"' 1> /dev/null`)}
-          echo "Restoring dump..."
-      ${targetPSQL(`"${targetDbName}" < $dumptmp 1> /dev/null`)}
-  
-
-      echo "Clean up..."
-      set +e
-      rm $dumptmp
-      echo "\n🐱 Done!"
-      `;
       try {
-        await spawn(copyDBScript, [], { shell: "bash", stdio: "inherit" });
+        await spawnCopyDb({
+          targetPassword,
+          targetPort,
+          targetUsername,
+          sourceUsername,
+          sourcePassword,
+          sourcePort,
+          sourceDbName,
+          targetDbName,
+        });
       } finally {
         sourceProxy?.stop();
         targetProxy?.stop();

package/src/apps/cli/commands/project/cloudSql/commandProjectRestoreDb.ts

@@ -0,0 +1,175 @@
+import type Vorpal from "vorpal";
+import {
+  getEnvVarsResolved,
+  getPipelineContextByChoice,
+} from "../../../../../config/getProjectConfig";
+import type { CloudSqlBackgroundProxy } from "../../../../../gcloud/cloudSql/startProxy";
+import { startCloudSqlProxyInBackground } from "../../../../../gcloud/cloudSql/startProxy";
+import { envAndComponents } from "../utils/autocompletions";
+
+import { ConnectionStringParser } from "connection-string-parser";
+import { spawnCopyDb } from "../../../../../gcloud/cloudSql/copyDb";
+
+export default async (vorpal: Vorpal) =>
+  vorpal
+    .command(
+      "project-cloud-sql-restore-db",
+      "restores a project db from one source to another target"
+    )
+    .action(async function restoreDb() {
+      const envs = await envAndComponents();
+
+      const { sourceEnvAndComponent } = await this.prompt({
+        type: "list",
+        name: "sourceEnvAndComponent",
+        choices: envs,
+
+        message: "Source instance (connection string or 'local')? 🤔 ",
+      });
+
+      const [sourceEnv, sourceComponent] = sourceEnvAndComponent.split(":");
+
+      const sourceContext = await getPipelineContextByChoice(
+        sourceEnv,
+        sourceComponent
+      );
+
+      const sourceEnvVars = await getEnvVarsResolved(
+        this,
+        sourceContext.environment.shortName,
+        sourceContext.componentName
+      );
+
+      let sourceProxy: CloudSqlBackgroundProxy;
+      let sourceDbName: string;
+
+      let sourceUsername: string;
+      let sourcePassword: string;
+
+      let targetUsername: string;
+      let targetPassword: string;
+      let targetProxy: CloudSqlBackgroundProxy;
+
+      let sourcePort: number;
+      let targetPort: number;
+      let targetDbName: string;
+
+      const closeAll = () => {
+        sourceProxy?.stop();
+        targetProxy?.stop();
+      };
+
+      if (sourceEnv === "local") {
+        const parser = new ConnectionStringParser({
+          scheme: "postgres",
+          hosts: [],
+        });
+
+        const parsersResult = parser.parse(sourceEnvVars.DATABASE_URL);
+        sourcePort = parsersResult.hosts?.[0]?.port;
+        sourceUsername = parsersResult.username;
+        sourcePassword = parsersResult.password;
+        sourceDbName = parsersResult.endpoint;
+      } else {
+        sourcePort = 54399;
+        sourceProxy = await startCloudSqlProxyInBackground({
+          instanceName: sourceEnvVars.CLOUD_SQL_INSTANCE_CONNECTION_NAME,
+          localPort: sourcePort,
+        });
+
+        sourceUsername = sourceEnvVars.DB_USER;
+        sourcePassword = sourceEnvVars.DB_PASSWORD;
+        sourceDbName = sourceEnvVars.DB_NAME;
+      }
+
+      const { targetEnvAndComponent } = await this.prompt({
+        type: "list",
+        name: "targetEnvAndComponent",
+        choices: envs,
+
+        message: "target env? 🤔 ",
+      });
+
+      const [targetEnv, targetComponent] = targetEnvAndComponent.split(":");
+
+      const targetContext = await getPipelineContextByChoice(
+        targetEnv,
+        targetComponent
+      );
+
+      const targetEnvVars = await getEnvVarsResolved(
+        this,
+        targetContext.environment.shortName,
+        targetContext.componentName
+      );
+
+      if (targetEnv === "local") {
+        const parser = new ConnectionStringParser({
+          scheme: "postgres",
+          hosts: [],
+        });
+
+        const parsersResult = parser.parse(targetEnvVars.DATABASE_URL);
+
+        targetPort = parsersResult.hosts?.[0]?.port;
+        targetUsername = parsersResult.username;
+        targetPassword = parsersResult.password;
+        targetDbName = parsersResult.endpoint;
+      } else {
+        targetPort = 54499;
+        targetProxy = await startCloudSqlProxyInBackground({
+          instanceName: targetEnvVars.CLOUD_SQL_INSTANCE_CONNECTION_NAME,
+          localPort: targetPort,
+        });
+
+        targetUsername = targetEnvVars.DB_USER;
+        targetPassword = targetEnvVars.DB_PASSWORD;
+        targetDbName = targetEnvVars.DB_NAME;
+      }
+
+      const { shouldContinue } = await this.prompt({
+        type: "confirm",
+        name: "shouldContinue",
+        message: `This will drop ${targetEnv}/${targetDbName} and replace it with ${sourceEnv}/${sourceDbName}. Continue? 🤔 `,
+      });
+
+      if (!shouldContinue) {
+        this.log("abort");
+        closeAll();
+        return;
+      }
+
+      if (targetContext.environment.envType === "prod") {
+        this.log(
+          `\n🚨 You are overriding a production environment. Please type in ${targetEnvVars.CLOUD_SQL_INSTANCE_CONNECTION_NAME} to continue\n\n`
+        );
+        const { confirmInstance } = await this.prompt({
+          type: "input",
+          name: "confirmInstance",
+          message: "confirm: ",
+        });
+
+        if (
+          confirmInstance !== targetEnvVars.CLOUD_SQL_INSTANCE_CONNECTION_NAME
+        ) {
+          this.log("abort");
+          closeAll();
+          return;
+        }
+      }
+
+      try {
+        await spawnCopyDb({
+          targetPassword,
+          targetPort,
+          targetUsername,
+          sourceUsername,
+          sourcePassword,
+          sourcePort,
+          sourceDbName,
+          targetDbName,
+        });
+      } finally {
+        closeAll();
+      }
+    });

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

@@ -177,10 +177,12 @@ const doItFor = async (
       }
     }
   }
+  instance.log("");
   instance.log("upserting all variables, please wait...");
   instance.log("");
   for (const [componentName, envs] of Object.entries(envAndComponents)) {
     for (const env of envs) {
+      instance.log("upserting " + env + ":" + componentName + "...\n");
       await upsertAllVariables(
         instance,
         valuesToEdit[componentName][env],
@@ -189,6 +191,7 @@ const doItFor = async (
       );
       instance.log("");
       instance.log("✅ " + env + ":" + componentName);
+      instance.log("--------------------------------\n");
     }
   }
   instance.log("done! 😻");

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

@@ -25,6 +25,7 @@ import commandTriggerCronjob from "./commandTriggerCronjob";
 
 import commandOpenGrafanaPod from "./commandOpenGrafanaPod";
 import commandSecretsClearBackups from "./commandSecretsClearBackups";
+import commandProjectRestoreDb from "./cloudSql/commandProjectRestoreDb";
 
 export default async (vorpal: Vorpal) => {
   commandSetup(vorpal);
@@ -45,6 +46,7 @@ export default async (vorpal: Vorpal) => {
   commandOpenGrafana(vorpal);
   commandOpenGrafanaPod(vorpal);
   commandCloudSqlProxy(vorpal);
+  commandProjectRestoreDb(vorpal);
   commandOpenGit(vorpal);
   commandOpenEnv(vorpal);
   commandTriggerCronjob(vorpal);

package/src/gcloud/cloudSql/copyDb.ts

@@ -0,0 +1,57 @@
+import { spawn } from "child-process-promise";
+type Opts = {
+  targetPassword: string;
+  targetPort: number;
+  targetUsername: string;
+  sourceUsername: string;
+  sourcePassword: string;
+  sourcePort: number;
+  sourceDbName: string;
+  targetDbName: string;
+};
+export const spawnCopyDb = async (opts: Opts) => {
+  const script = createCopyDbScript(opts);
+
+  return await spawn(script, [], {
+    shell: "bash",
+    stdio: "inherit",
+  });
+};
+const createCopyDbScript = ({
+  targetPassword,
+  targetPort,
+  targetUsername,
+  sourceUsername,
+  sourcePassword,
+  sourcePort,
+  sourceDbName,
+  targetDbName,
+}: Opts) => {
+  const targetPSQL = (command: string) =>
+    `PGPASSWORD=${targetPassword} psql -p ${targetPort} --host=localhost --user=${targetUsername} -q ${command}`;
+
+  const copyDBScript = `
+      set -e
+     
+    
+
+      dumptmp=$(mktemp /tmp/dump.XXXXXX)
+
+      echo "Dumping file to $dumptmp"
+      pg_dump --dbname=postgres://${sourceUsername}:${sourcePassword}@localhost:${sourcePort}/${sourceDbName} --no-owner --no-privileges > $dumptmp
+      echo "dump done"
+      ${targetPSQL(
+        `-c 'drop database "${targetDbName}" WITH (FORCE)' 1> /dev/null || true`
+      )}
+      ${targetPSQL(`-c 'create database "${targetDbName}"' 1> /dev/null`)}
+          echo "Restoring dump..."
+      ${targetPSQL(`"${targetDbName}" < $dumptmp 1> /dev/null`)}
+  
+
+      echo "Clean up..."
+      set +e
+      rm $dumptmp
+      echo "\n🐱 Done!"
+      `;
+  return copyDBScript;
+};