@catladder/cli 1.69.0 → 1.71.0

package/package.json

@@ -24,7 +24,7 @@
     "node": ">=12.0.0"
   },
   "devDependencies": {
-    "@catladder/pipeline": "1.69.0",
+    "@catladder/pipeline": "1.71.0",
     "@kubernetes/client-node": "^0.16.2",
     "@tsconfig/node14": "^1.0.1",
     "@types/common-tags": "^1.8.0",
@@ -57,5 +57,5 @@
     "typescript": "^4.5.4",
     "vorpal": "^1.12.0"
   },
-  "version": "1.69.0"
+  "version": "1.71.0"
 }

package/src/apps/cli/cli.ts

@@ -4,6 +4,7 @@ import packageInfos from "../../packageInfos";
 import { stopAllPortForwards } from "../../utils/portForward";
 import general from "./commands/general";
 import mongodb from "./commands/mongodb";
+import cloudSQL from "./commands/cloudSQL";
 import project from "./commands/project";
 import theStuffThatReallyMatters from "./commands/theStuffThatReallyMatters";
 
@@ -29,6 +30,7 @@ export default async () => {
 
   general(vorpal);
   project(vorpal);
+  cloudSQL(vorpal);
   mongodb(vorpal);
   theStuffThatReallyMatters(vorpal);
 

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

@@ -0,0 +1,132 @@
+import { spawn } from "child-process-promise";
+import type Vorpal from "vorpal";
+
+const createProxy = async (instance: string, port: number) => {
+  const proxy = spawn(
+    `cloud_sql_proxy -instances ${instance}=tcp:${port}`,
+    [],
+    { shell: "bash" }
+  );
+  // wait until it starts
+  await spawn(
+    `echo -n "Waiting for proxy"
+      until echo > /dev/tcp/localhost/${port}; do
+        sleep 0.2
+        echo -n "."
+      done 2>/dev/null`,
+    [],
+    { shell: "bash" }
+  );
+  const stop = () => proxy.childProcess.kill();
+  process.on("beforeExit", stop);
+
+  return {
+    stop,
+  };
+};
+
+export default async (vorpal: Vorpal) =>
+  vorpal
+    .command(
+      "cloud-sql-restore-db",
+      "restore a db from one source to another target"
+    )
+    .action(async function restoreDb() {
+      const { sourceInstance } = await this.prompt({
+        type: "input",
+        name: "sourceInstance",
+
+        message: "Source instance (connection string)? 🤔 ",
+      });
+
+      const SOURCE_INSTANCE_PORT = 54399;
+      const TARGET_INSTANCE_PORT = 54499;
+
+      const sourceProxy = await createProxy(
+        sourceInstance,
+        SOURCE_INSTANCE_PORT
+      );
+
+      const { sourcePassword } = await this.prompt({
+        type: "input",
+        name: "sourcePassword",
+
+        message: "Source Password? 🤔 ",
+      });
+
+      const { sourceDbName } = await this.prompt({
+        type: "input",
+        name: "sourceDbName",
+
+        message: "Source DB name? 🤔 ",
+      });
+
+      const { targetInstance } = await this.prompt({
+        type: "input",
+        name: "targetInstance",
+
+        message: "Targe INSTANCE (connection string)? 🤔  ",
+      });
+
+      const targetProxy = await createProxy(
+        targetInstance,
+        TARGET_INSTANCE_PORT
+      );
+
+      const { targetPassword } = await this.prompt({
+        type: "input",
+        name: "targetPassword",
+
+        message: "Target Password? 🤔 ",
+      });
+
+      const { targetDbName } = await this.prompt({
+        type: "input",
+        name: "targetDbName",
+
+        message: "Target DB name? 🤔 ",
+      });
+
+      const { shouldContinue } = await this.prompt({
+        type: "confirm",
+        name: "shouldContinue",
+        message: `This will drop ${targetInstance}/${targetDbName} and replace it with ${sourceInstance}/${sourceDbName}. Continue? 🤔 `,
+      });
+
+      if (!shouldContinue) {
+        return;
+      }
+
+      const targetPSQL = (command: string) =>
+        `PGPASSWORD=${targetPassword} psql -p ${TARGET_INSTANCE_PORT} --host=localhost --user=postgres -q ${command}`;
+
+      const copyDBScript = `
+      set -e
+     
+    
+
+      dumptmp=$(mktemp /tmp/dump.XXXXXX)
+
+      echo "Dumping file to $dumptmp"
+      pg_dump --dbname=postgres://postgres:${sourcePassword}@localhost:${SOURCE_INSTANCE_PORT}/${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" });
+      } finally {
+        sourceProxy.stop();
+        targetProxy.stop();
+      }
+    });

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

@@ -0,0 +1,8 @@
+import type Vorpal from "vorpal";
+//import commandInitProject from "./commandInitProject.old";
+
+import commandRestoreDb from "./commandRestoreDb";
+
+export default async (vorpal: Vorpal) => {
+  commandRestoreDb(vorpal);
+};

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

@@ -1,7 +1,7 @@
 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";
@@ -51,7 +51,6 @@ export default async (vorpal: Vorpal) => {
   commandConfigSecrets(vorpal);
   commandSecretsClearBackups(vorpal);
   commandDeletePods(vorpal);
-  commandCopyDB(vorpal);
 
   commandGetShell(vorpal);
   commandPortForward(vorpal);

package/dist/apps/cli/commands/project/commandCopyDB.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"commandCopyDB.js","sourceRoot":"","sources":["../../../../../src/apps/cli/commands/project/commandCopyDB.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,wEAI6C;AAE7C,2DAA2D;AAE3D,sBAAe,UAAO,MAAc;;;;;gBAClC,KAAA,CAAA,KAAA,MAAM;qBACH,OAAO,CACN,wBAAwB,EACxB,2CAA2C,CAC5C,CAAA;qBACA,YAAY,CAAA;gBAAC,qBAAM,IAAA,kCAAgB,GAAE,EAAA;oBALxC,sBAAA,cAKgB,SAAwB,EAAC;qBACtC,MAAM,CAAC,SAAe,MAAM,CAAC,EAAgB;wBAAd,YAAY,kBAAA;;;;;;oCACpC,KAAyB,IAAA,8BAAW,EAAC,YAAY,CAAC,EAAhD,GAAG,SAAA,EAAE,aAAa,mBAAA,CAA+B;oCACvB,qBAAM,IAAA,mCAAgB,GAAE,EAAA;;oCAApD,KAA4B,SAAwB,EAAlD,YAAY,kBAAA,EAAE,OAAO,aAAA;oCAEF,qBAAM,IAAI,CAAC,MAAM,CAAC;4CAC3C,IAAI,EAAE,SAAS;4CACf,IAAI,EAAE,gBAAgB;4CACtB,OAAO,EACL,sFAAsF;yCACzF,CAAC,EAAA;;oCALM,cAAc,GAAK,CAAA,SAKzB,CAAA,eALoB;oCAOtB,IAAI,CAAC,cAAc,EAAE;wCACnB,sBAAO;qCACR;;;;;iBA6DF,CAAC,EAAA;;;KAAA,EAAC"}

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

@@ -1,92 +0,0 @@
-import { spawn } from "child-process-promise";
-import type Vorpal from "vorpal";
-import {
-  getEnvVars,
-  getProjectConfig,
-  parseChoice,
-} from "../../../../config/getProjectConfig";
-import { readPass } from "../../../../utils/passwordstore";
-import { envAndComponents } from "./utils/autocompletions";
-
-export default async (vorpal: Vorpal) =>
-  vorpal
-    .command(
-      "copy-db <envComponent>",
-      "replace local db with the one from an env"
-    )
-    .autocomplete(await envAndComponents())
-    .action(async function copyDB({ envComponent }) {
-      const { env, componentName } = parseChoice(envComponent);
-      const { customerName, appName } = await getProjectConfig();
-
-      const { shouldContinue } = await this.prompt({
-        type: "confirm",
-        name: "shouldContinue",
-        message:
-          "This will drop your local database and replace it with the remote one. Continue? 🤔 ",
-      });
-
-      if (!shouldContinue) {
-        return;
-      }
-
-      // 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(
-        this,
-        env,
-        componentName
-      );
-
-      const LOCAL_PORT = 54321;
-
-      const instanceName = `${"xxxxxx reimplement shoulld be project id"}:${GOOGLE_CLOUD_SQL_REGION}:${customerName}-${appName}-${env}=tcp:${LOCAL_PORT}`;
-      const cloudsqlCredentials = await readPass(GOOGLE_CLOUD_SQL_PASS_PATH);
-
-      const { POSTGRESQL_URL } = process.env;
-      const matches = new RegExp(/\w+:\/\/.*@.*\/(\w*)()/g).exec(
-        POSTGRESQL_URL
-      );
-      if (!matches) {
-        throw new Error("Could not determine db name.");
-      }
-      const localDBName = matches[1];
-
-      const copyDBScript = `
-      set -e
-      credtmp=$(mktemp /tmp/cred.XXXXXX)
-      echo '${cloudsqlCredentials}' > $credtmp
-      echo "Opening connection..."
-      cloud_sql_proxy -instances ${instanceName} -credential_file $credtmp &> /dev/null &
-      PROXY_PID=$!
-
-      echo -n "Waiting for proxy"
-      until echo > /dev/tcp/localhost/${LOCAL_PORT}; do
-        sleep 0.2
-        echo -n "."
-      done 2>/dev/null
-      echo
-
-      dumptmp=$(mktemp /tmp/dump.XXXXXX)
-
-      echo "Dumping file to $dumptmp"
-      pg_dump --dbname=postgres://postgres:${POSTGRESQL_PASSWORD}@localhost:${LOCAL_PORT}/${componentName} --no-owner --no-privileges > $dumptmp
-      psql -q -c "drop database ${localDBName}" 1> /dev/null
-      psql -q -c "create database ${localDBName}" 1> /dev/null
-      echo "Restoring dump..."
-      psql -q ${localDBName} < $dumptmp 1> /dev/null
-
-      echo "Clean up..."
-      set +e
-      kill -9 $PROXY_PID
-      wait $PROXY_PID 2> /dev/null
-      rm $credtmp
-      rm $dumptmp
-      echo "\n🐱 Done!"
-      `;
-
-      await spawn(copyDBScript, [], { shell: "bash", stdio: "inherit" });
-      */
-    });