@catladder/cli 1.75.5 → 1.76.1

package/package.json

@@ -24,7 +24,7 @@
     "node": ">=12.0.0"
   },
   "devDependencies": {
-    "@catladder/pipeline": "1.75.5",
+    "@catladder/pipeline": "1.76.1",
     "@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.75.5"
+  "version": "1.76.1"
 }

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

@@ -60,6 +60,14 @@ export default async (vorpal: Vorpal) =>
         sourceProxy = await createProxy(sourceInstance, sourcePort);
       }
 
+      const { sourceUsername } = await this.prompt({
+        type: "input",
+        name: "sourceUsername",
+        default: "postgres",
+
+        message: "Source Username? 🤔 ",
+      });
+
       const { sourcePassword } = await this.prompt({
         type: "input",
         name: "sourcePassword",
@@ -95,6 +103,13 @@ export default async (vorpal: Vorpal) =>
         targetProxy = await createProxy(targetInstance, targetPort);
       }
 
+      const { targetUsername } = await this.prompt({
+        type: "input",
+        name: "targetUsername",
+        default: "postgres",
+
+        message: "Target Username? 🤔 ",
+      });
       const { targetPassword } = await this.prompt({
         type: "input",
         name: "targetPassword",
@@ -120,7 +135,7 @@ export default async (vorpal: Vorpal) =>
       }
 
       const targetPSQL = (command: string) =>
-        `PGPASSWORD=${targetPassword} psql -p ${targetPort} --host=localhost --user=postgres -q ${command}`;
+        `PGPASSWORD=${targetPassword} psql -p ${targetPort} --host=localhost --user=${targetUsername} -q ${command}`;
 
       const copyDBScript = `
       set -e
@@ -130,7 +145,7 @@ export default async (vorpal: Vorpal) =>
       dumptmp=$(mktemp /tmp/dump.XXXXXX)
 
       echo "Dumping file to $dumptmp"
-      pg_dump --dbname=postgres://postgres:${sourcePassword}@localhost:${sourcePort}/${sourceDbName} --no-owner --no-privileges > $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`

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

@@ -16,6 +16,7 @@ type ProxyInfo = {
   instanceName: string;
   DB_NAME: string;
   DB_PASSWORD: string;
+  DB_USER: string;
 };
 export default async (vorpal: Vorpal) =>
   vorpal
@@ -43,7 +44,7 @@ export default async (vorpal: Vorpal) =>
       }
 
       // skynet-164509:europe-west6:pvl-cyclomania-review=tcp:5432
-      const { DB_PASSWORD, DB_NAME, instanceName } = proxyInfo;
+      const { DB_PASSWORD, DB_NAME, DB_USER, instanceName } = proxyInfo;
       const { localPort } = await this.prompt({
         type: "number",
         name: "localPort",
@@ -55,7 +56,7 @@ export default async (vorpal: Vorpal) =>
       this.log(`postgres-PW: ${DB_PASSWORD}`);
       this.log("");
       this.log(
-        `POSTGRESQL_URL=postgresql://postgres:${DB_PASSWORD}@localhost:${localPort}/${DB_NAME}?schema=public`
+        `POSTGRESQL_URL=postgresql://${DB_USER}:${DB_PASSWORD}@localhost:${localPort}/${DB_NAME}?schema=public`
       );
       this.log("");
 
@@ -125,6 +126,7 @@ const getProxyInfoForKubernetes = async (
     instanceName,
     DB_PASSWORD,
     DB_NAME,
+    DB_USER: "postgres",
   };
 };
 
@@ -145,6 +147,7 @@ const getProxyInfoForCloudRun = async (
   );
 
   const DB_PASSWORD = envVars?.DB_PASSWORD;
+  const DB_USER = envVars?.DB_USER;
 
   const DB_NAME = context.environment.envVars.DB_NAME;
 
@@ -153,5 +156,6 @@ const getProxyInfoForCloudRun = async (
       context.componentConfig.deploy.cloudSql.instanceConnectionName,
     DB_PASSWORD,
     DB_NAME,
+    DB_USER,
   };
 };