@catladder/cli 0.0.0-main-553001a0 → 0.0.0-main-d52d3655

package/dist/apps/cli/commands/cloudSQL/commandRestoreDb.js

@@ -62,7 +62,7 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
                 .command("cloud-sql-restore-db", "restore a db from one source to another target")
                 .action(function restoreDb() {
                 return __awaiter(this, void 0, void 0, function () {
-                    var sourceInstance, sourceProxy, targetProxy, sourcePort, targetPort, sourceLocalPort, sourcePassword, sourceDbName, targetInstance, targetLocalPort, targetPassword, targetDbName, shouldContinue, targetPSQL, copyDBScript;
+                    var sourceInstance, sourceProxy, targetProxy, sourcePort, targetPort, sourceLocalPort, sourceUsername, sourcePassword, sourceDbName, targetInstance, targetLocalPort, targetUsername, targetPassword, targetDbName, shouldContinue, targetPSQL, copyDBScript;
                     return __generator(this, function (_a) {
                         switch (_a.label) {
                             case 0: return [4 /*yield*/, this.prompt({
@@ -91,82 +91,98 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
                                 _a.label = 5;
                             case 5: return [4 /*yield*/, this.prompt({
                                     type: "input",
-                                    name: "sourcePassword",
-                                    message: "Source Password? 🤔 "
+                                    name: "sourceUsername",
+                                    "default": "postgres",
+                                    message: "Source Username? 🤔 "
                                 })];
                             case 6:
+                                sourceUsername = (_a.sent()).sourceUsername;
+                                return [4 /*yield*/, this.prompt({
+                                        type: "input",
+                                        name: "sourcePassword",
+                                        message: "Source Password? 🤔 "
+                                    })];
+                            case 7:
                                 sourcePassword = (_a.sent()).sourcePassword;
                                 return [4 /*yield*/, this.prompt({
                                         type: "input",
                                         name: "sourceDbName",
                                         message: "Source DB name? 🤔 "
                                     })];
-                            case 7:
+                            case 8:
                                 sourceDbName = (_a.sent()).sourceDbName;
                                 return [4 /*yield*/, this.prompt({
                                         type: "input",
                                         name: "targetInstance",
                                         message: "Targe INSTANCE (connection string or 'local')? 🤔  "
                                     })];
-                            case 8:
+                            case 9:
                                 targetInstance = (_a.sent()).targetInstance;
-                                if (!(targetInstance === "local")) return [3 /*break*/, 10];
+                                if (!(targetInstance === "local")) return [3 /*break*/, 11];
                                 return [4 /*yield*/, this.prompt({
                                         type: "number",
                                         name: "targetLocalPort",
                                         "default": 5432,
                                         message: "Local Port for target? 🤔 "
                                     })];
-                            case 9:
+                            case 10:
                                 targetLocalPort = (_a.sent()).targetLocalPort;
                                 targetPort = targetLocalPort;
-                                return [3 /*break*/, 12];
-                            case 10:
+                                return [3 /*break*/, 13];
+                            case 11:
                                 targetPort = 54499;
                                 return [4 /*yield*/, createProxy(targetInstance, targetPort)];
-                            case 11:
+                            case 12:
                                 targetProxy = _a.sent();
-                                _a.label = 12;
-                            case 12: return [4 /*yield*/, this.prompt({
+                                _a.label = 13;
+                            case 13: return [4 /*yield*/, this.prompt({
                                     type: "input",
-                                    name: "targetPassword",
-                                    message: "Target Password? 🤔 "
+                                    name: "targetUsername",
+                                    "default": "postgres",
+                                    message: "Target Username? 🤔 "
                                 })];
-                            case 13:
+                            case 14:
+                                targetUsername = (_a.sent()).targetUsername;
+                                return [4 /*yield*/, this.prompt({
+                                        type: "input",
+                                        name: "targetPassword",
+                                        message: "Target Password? 🤔 "
+                                    })];
+                            case 15:
                                 targetPassword = (_a.sent()).targetPassword;
                                 return [4 /*yield*/, this.prompt({
                                         type: "input",
                                         name: "targetDbName",
                                         message: "Target DB name? 🤔 "
                                     })];
-                            case 14:
+                            case 16:
                                 targetDbName = (_a.sent()).targetDbName;
                                 return [4 /*yield*/, this.prompt({
                                         type: "confirm",
                                         name: "shouldContinue",
                                         message: "This will drop ".concat(targetInstance, "/").concat(targetDbName, " and replace it with ").concat(sourceInstance, "/").concat(sourceDbName, ". Continue? \uD83E\uDD14 ")
                                     })];
-                            case 15:
+                            case 17:
                                 shouldContinue = (_a.sent()).shouldContinue;
                                 if (!shouldContinue) {
                                     return [2 /*return*/];
                                 }
                                 targetPSQL = function (command) {
-                                    return "PGPASSWORD=".concat(targetPassword, " psql -p ").concat(targetPort, " --host=localhost --user=postgres -q ").concat(command);
+                                    return "PGPASSWORD=".concat(targetPassword, " psql -p ").concat(targetPort, " --host=localhost --user=").concat(targetUsername, " -q ").concat(command);
                                 };
-                                copyDBScript = "\n      set -e\n     \n    \n\n      dumptmp=$(mktemp /tmp/dump.XXXXXX)\n\n      echo \"Dumping file to $dumptmp\"\n      pg_dump --dbname=postgres://postgres:".concat(sourcePassword, "@localhost:").concat(sourcePort, "/").concat(sourceDbName, " --no-owner --no-privileges > $dumptmp\n      echo \"dump done\"\n      ").concat(targetPSQL("-c 'drop database \"".concat(targetDbName, "\" WITH (FORCE)' 1> /dev/null || true")), "\n      ").concat(targetPSQL("-c 'create database \"".concat(targetDbName, "\"' 1> /dev/null")), "\n          echo \"Restoring dump...\"\n      ").concat(targetPSQL("\"".concat(targetDbName, "\" < $dumptmp 1> /dev/null")), "\n  \n\n      echo \"Clean up...\"\n      set +e\n      rm $dumptmp\n      echo \"\n\uD83D\uDC31 Done!\"\n      ");
-                                _a.label = 16;
-                            case 16:
-                                _a.trys.push([16, , 18, 19]);
+                                copyDBScript = "\n      set -e\n     \n    \n\n      dumptmp=$(mktemp /tmp/dump.XXXXXX)\n\n      echo \"Dumping file to $dumptmp\"\n      pg_dump --dbname=postgres://".concat(sourceUsername, ":").concat(sourcePassword, "@localhost:").concat(sourcePort, "/").concat(sourceDbName, " --no-owner --no-privileges > $dumptmp\n      echo \"dump done\"\n      ").concat(targetPSQL("-c 'drop database \"".concat(targetDbName, "\" WITH (FORCE)' 1> /dev/null || true")), "\n      ").concat(targetPSQL("-c 'create database \"".concat(targetDbName, "\"' 1> /dev/null")), "\n          echo \"Restoring dump...\"\n      ").concat(targetPSQL("\"".concat(targetDbName, "\" < $dumptmp 1> /dev/null")), "\n  \n\n      echo \"Clean up...\"\n      set +e\n      rm $dumptmp\n      echo \"\n\uD83D\uDC31 Done!\"\n      ");
+                                _a.label = 18;
+                            case 18:
+                                _a.trys.push([18, , 20, 21]);
                                 return [4 /*yield*/, (0, child_process_promise_1.spawn)(copyDBScript, [], { shell: "bash", stdio: "inherit" })];
-                            case 17:
+                            case 19:
                                 _a.sent();
-                                return [3 /*break*/, 19];
-                            case 18:
+                                return [3 /*break*/, 21];
+                            case 20:
                                 sourceProxy === null || sourceProxy === void 0 ? void 0 : sourceProxy.stop();
                                 targetProxy === null || targetProxy === void 0 ? void 0 : targetProxy.stop();
                                 return [7 /*endfinally*/];
-                            case 19: return [2 /*return*/];
+                            case 21: return [2 /*return*/];
                         }
                     });
                 });

package/dist/apps/cli/commands/cloudSQL/commandRestoreDb.js.map

@@ -1 +1 @@
-{"version":3,"file":"commandRestoreDb.js","sourceRoot":"","sources":["../../../../../src/apps/cli/commands/cloudSQL/commandRestoreDb.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"commandRestoreDb.js","sourceRoot":"","sources":["../../../../../src/apps/cli/commands/cloudSQL/commandRestoreDb.ts"],"names":[],"mappings":"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"}

package/dist/apps/cli/commands/project/commandCloudSqlProxy.js

@@ -64,7 +64,7 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
                     .action(function (_a) {
                     var envComponent = _a.envComponent;
                     return __awaiter(this, void 0, void 0, function () {
-                        var _b, env, componentName, context, proxyInfo, DB_PASSWORD, DB_NAME, instanceName, localPort, cloudsqlProxyCredentials;
+                        var _b, env, componentName, context, proxyInfo, DB_PASSWORD, DB_NAME, DB_USER, instanceName, localPort, cloudsqlProxyCredentials;
                         var _this = this;
                         return __generator(this, function (_c) {
                             switch (_c.label) {
@@ -89,7 +89,7 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
                                     return [3 /*break*/, 6];
                                 case 5: throw new Error("unsupported environment");
                                 case 6:
-                                    DB_PASSWORD = proxyInfo.DB_PASSWORD, DB_NAME = proxyInfo.DB_NAME, instanceName = proxyInfo.instanceName;
+                                    DB_PASSWORD = proxyInfo.DB_PASSWORD, DB_NAME = proxyInfo.DB_NAME, DB_USER = proxyInfo.DB_USER, instanceName = proxyInfo.instanceName;
                                     return [4 /*yield*/, this.prompt({
                                             type: "number",
                                             name: "localPort",
@@ -101,7 +101,7 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
                                     this.log("");
                                     this.log("postgres-PW: ".concat(DB_PASSWORD));
                                     this.log("");
-                                    this.log("POSTGRESQL_URL=postgresql://postgres:".concat(DB_PASSWORD, "@localhost:").concat(localPort, "/").concat(DB_NAME, "?schema=public"));
+                                    this.log("POSTGRESQL_URL=postgresql://".concat(DB_USER, ":").concat(DB_PASSWORD, "@localhost:").concat(localPort, "/").concat(DB_NAME, "?schema=public"));
                                     this.log("");
                                     return [4 /*yield*/, (0, getProjectConfig_1.getGitlabVar)(this, env, componentName, "cloudsqlProxyCredentials")];
                                 case 8:
@@ -168,13 +168,14 @@ var getProxyInfoForKubernetes = function (context) { return __awaiter(void 0, vo
                 return [2 /*return*/, {
                         instanceName: instanceName,
                         DB_PASSWORD: DB_PASSWORD,
-                        DB_NAME: DB_NAME
+                        DB_NAME: DB_NAME,
+                        DB_USER: "postgres"
                     }];
         }
     });
 }); };
 var getProxyInfoForCloudRun = function (context) { return __awaiter(void 0, void 0, void 0, function () {
-    var envVars, DB_PASSWORD, DB_NAME;
+    var envVars, DB_PASSWORD, DB_USER, DB_NAME;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
@@ -186,11 +187,13 @@ var getProxyInfoForCloudRun = function (context) { return __awaiter(void 0, void
             case 1:
                 envVars = _a.sent();
                 DB_PASSWORD = envVars === null || envVars === void 0 ? void 0 : envVars.DB_PASSWORD;
+                DB_USER = envVars === null || envVars === void 0 ? void 0 : envVars.DB_USER;
                 DB_NAME = context.environment.envVars.DB_NAME;
                 return [2 /*return*/, {
                         instanceName: context.componentConfig.deploy.cloudSql.instanceConnectionName,
                         DB_PASSWORD: DB_PASSWORD,
-                        DB_NAME: DB_NAME
+                        DB_NAME: DB_NAME,
+                        DB_USER: DB_USER
                     }];
         }
     });

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

@@ -1 +1 @@
-{"version":3,"file":"commandCloudSqlProxy.js","sourceRoot":"","sources":["../../../../../src/apps/cli/commands/project/commandCloudSqlProxy.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"commandCloudSqlProxy.js","sourceRoot":"","sources":["../../../../../src/apps/cli/commands/project/commandCloudSqlProxy.ts"],"names":[],"mappings":"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"}

package/dist/bundles/catenv/index.js

@@ -40065,7 +40065,7 @@ exports.readConfigSync = readConfigSync;
 
 exports.__esModule = true;
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "main-553001a0" || 0;
+exports.PIPELINE_IMAGE_TAG = "main-d52d3655" || 0;
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
 
 /***/ }),
@@ -41468,7 +41468,7 @@ var jobName_1 = __nccwpck_require__(7311);
 exports.GCLOUD_DEPLOY_CREDENTIALS_KEY = "GCLOUD_DEPLOY_credentialsKey";
 exports.GCLOUD_RUN_CANONICAL_HOST_SUFFIX = "GCLOUD_RUN_canonicalHostSuffix";
 var getCloudSqlVariables = function (_a) {
-  var _b, _c;
+  var _b, _c, _d;
   var deployConfigRaw = _a.deployConfigRaw,
     environmentSlug = _a.environmentSlug,
     env = _a.env,
@@ -41485,7 +41485,7 @@ var getCloudSqlVariables = function (_a) {
     return {
       CLOUD_SQL_INSTANCE_CONNECTION_NAME: deployConfigRaw.cloudSql.instanceConnectionName,
       DB_NAME: DB_NAME,
-      DB_USER: "postgres",
+      DB_USER: (_d = deployConfigRaw.cloudSql.dbUser) !== null && _d !== void 0 ? _d : "postgres",
       DB_PASSWORD: "$" + (0, context_1.getSecretVarName)(env, componentName, "DB_PASSWORD"),
       DATABASE_URL: "postgresql://$DB_USER:$DB_PASSWORD@localhost/$DB_NAME?host=/cloudsql/$CLOUD_SQL_INSTANCE_CONNECTION_NAME".concat(additionalQueryParamsString),
       DATABASE_JDBC_URL: "jdbc:postgresql:///$DB_NAME?cloudSqlInstance=$CLOUD_SQL_INSTANCE_CONNECTION_NAME&socketFactory=com.google.cloud.sql.postgres.SocketFactory&user=$DB_USER&password=$DB_PASSWORD".concat(additionalQueryParamsString)

package/dist/bundles/cli/index.js

@@ -159,7 +159,7 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
                 .command("cloud-sql-restore-db", "restore a db from one source to another target")
                 .action(function restoreDb() {
                 return __awaiter(this, void 0, void 0, function () {
-                    var sourceInstance, sourceProxy, targetProxy, sourcePort, targetPort, sourceLocalPort, sourcePassword, sourceDbName, targetInstance, targetLocalPort, targetPassword, targetDbName, shouldContinue, targetPSQL, copyDBScript;
+                    var sourceInstance, sourceProxy, targetProxy, sourcePort, targetPort, sourceLocalPort, sourceUsername, sourcePassword, sourceDbName, targetInstance, targetLocalPort, targetUsername, targetPassword, targetDbName, shouldContinue, targetPSQL, copyDBScript;
                     return __generator(this, function (_a) {
                         switch (_a.label) {
                             case 0: return [4 /*yield*/, this.prompt({
@@ -188,82 +188,98 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
                                 _a.label = 5;
                             case 5: return [4 /*yield*/, this.prompt({
                                     type: "input",
-                                    name: "sourcePassword",
-                                    message: "Source Password? 🤔 "
+                                    name: "sourceUsername",
+                                    "default": "postgres",
+                                    message: "Source Username? 🤔 "
                                 })];
                             case 6:
+                                sourceUsername = (_a.sent()).sourceUsername;
+                                return [4 /*yield*/, this.prompt({
+                                        type: "input",
+                                        name: "sourcePassword",
+                                        message: "Source Password? 🤔 "
+                                    })];
+                            case 7:
                                 sourcePassword = (_a.sent()).sourcePassword;
                                 return [4 /*yield*/, this.prompt({
                                         type: "input",
                                         name: "sourceDbName",
                                         message: "Source DB name? 🤔 "
                                     })];
-                            case 7:
+                            case 8:
                                 sourceDbName = (_a.sent()).sourceDbName;
                                 return [4 /*yield*/, this.prompt({
                                         type: "input",
                                         name: "targetInstance",
                                         message: "Targe INSTANCE (connection string or 'local')? 🤔  "
                                     })];
-                            case 8:
+                            case 9:
                                 targetInstance = (_a.sent()).targetInstance;
-                                if (!(targetInstance === "local")) return [3 /*break*/, 10];
+                                if (!(targetInstance === "local")) return [3 /*break*/, 11];
                                 return [4 /*yield*/, this.prompt({
                                         type: "number",
                                         name: "targetLocalPort",
                                         "default": 5432,
                                         message: "Local Port for target? 🤔 "
                                     })];
-                            case 9:
+                            case 10:
                                 targetLocalPort = (_a.sent()).targetLocalPort;
                                 targetPort = targetLocalPort;
-                                return [3 /*break*/, 12];
-                            case 10:
+                                return [3 /*break*/, 13];
+                            case 11:
                                 targetPort = 54499;
                                 return [4 /*yield*/, createProxy(targetInstance, targetPort)];
-                            case 11:
+                            case 12:
                                 targetProxy = _a.sent();
-                                _a.label = 12;
-                            case 12: return [4 /*yield*/, this.prompt({
+                                _a.label = 13;
+                            case 13: return [4 /*yield*/, this.prompt({
                                     type: "input",
-                                    name: "targetPassword",
-                                    message: "Target Password? 🤔 "
+                                    name: "targetUsername",
+                                    "default": "postgres",
+                                    message: "Target Username? 🤔 "
                                 })];
-                            case 13:
+                            case 14:
+                                targetUsername = (_a.sent()).targetUsername;
+                                return [4 /*yield*/, this.prompt({
+                                        type: "input",
+                                        name: "targetPassword",
+                                        message: "Target Password? 🤔 "
+                                    })];
+                            case 15:
                                 targetPassword = (_a.sent()).targetPassword;
                                 return [4 /*yield*/, this.prompt({
                                         type: "input",
                                         name: "targetDbName",
                                         message: "Target DB name? 🤔 "
                                     })];
-                            case 14:
+                            case 16:
                                 targetDbName = (_a.sent()).targetDbName;
                                 return [4 /*yield*/, this.prompt({
                                         type: "confirm",
                                         name: "shouldContinue",
                                         message: "This will drop ".concat(targetInstance, "/").concat(targetDbName, " and replace it with ").concat(sourceInstance, "/").concat(sourceDbName, ". Continue? \uD83E\uDD14 ")
                                     })];
-                            case 15:
+                            case 17:
                                 shouldContinue = (_a.sent()).shouldContinue;
                                 if (!shouldContinue) {
                                     return [2 /*return*/];
                                 }
                                 targetPSQL = function (command) {
-                                    return "PGPASSWORD=".concat(targetPassword, " psql -p ").concat(targetPort, " --host=localhost --user=postgres -q ").concat(command);
+                                    return "PGPASSWORD=".concat(targetPassword, " psql -p ").concat(targetPort, " --host=localhost --user=").concat(targetUsername, " -q ").concat(command);
                                 };
-                                copyDBScript = "\n      set -e\n     \n    \n\n      dumptmp=$(mktemp /tmp/dump.XXXXXX)\n\n      echo \"Dumping file to $dumptmp\"\n      pg_dump --dbname=postgres://postgres:".concat(sourcePassword, "@localhost:").concat(sourcePort, "/").concat(sourceDbName, " --no-owner --no-privileges > $dumptmp\n      echo \"dump done\"\n      ").concat(targetPSQL("-c 'drop database \"".concat(targetDbName, "\" WITH (FORCE)' 1> /dev/null || true")), "\n      ").concat(targetPSQL("-c 'create database \"".concat(targetDbName, "\"' 1> /dev/null")), "\n          echo \"Restoring dump...\"\n      ").concat(targetPSQL("\"".concat(targetDbName, "\" < $dumptmp 1> /dev/null")), "\n  \n\n      echo \"Clean up...\"\n      set +e\n      rm $dumptmp\n      echo \"\n\uD83D\uDC31 Done!\"\n      ");
-                                _a.label = 16;
-                            case 16:
-                                _a.trys.push([16, , 18, 19]);
+                                copyDBScript = "\n      set -e\n     \n    \n\n      dumptmp=$(mktemp /tmp/dump.XXXXXX)\n\n      echo \"Dumping file to $dumptmp\"\n      pg_dump --dbname=postgres://".concat(sourceUsername, ":").concat(sourcePassword, "@localhost:").concat(sourcePort, "/").concat(sourceDbName, " --no-owner --no-privileges > $dumptmp\n      echo \"dump done\"\n      ").concat(targetPSQL("-c 'drop database \"".concat(targetDbName, "\" WITH (FORCE)' 1> /dev/null || true")), "\n      ").concat(targetPSQL("-c 'create database \"".concat(targetDbName, "\"' 1> /dev/null")), "\n          echo \"Restoring dump...\"\n      ").concat(targetPSQL("\"".concat(targetDbName, "\" < $dumptmp 1> /dev/null")), "\n  \n\n      echo \"Clean up...\"\n      set +e\n      rm $dumptmp\n      echo \"\n\uD83D\uDC31 Done!\"\n      ");
+                                _a.label = 18;
+                            case 18:
+                                _a.trys.push([18, , 20, 21]);
                                 return [4 /*yield*/, (0, child_process_promise_1.spawn)(copyDBScript, [], { shell: "bash", stdio: "inherit" })];
-                            case 17:
+                            case 19:
                                 _a.sent();
-                                return [3 /*break*/, 19];
-                            case 18:
+                                return [3 /*break*/, 21];
+                            case 20:
                                 sourceProxy === null || sourceProxy === void 0 ? void 0 : sourceProxy.stop();
                                 targetProxy === null || targetProxy === void 0 ? void 0 : targetProxy.stop();
                                 return [7 /*endfinally*/];
-                            case 19: return [2 /*return*/];
+                            case 21: return [2 /*return*/];
                         }
                     });
                 });
@@ -1466,7 +1482,7 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
                     .action(function (_a) {
                     var envComponent = _a.envComponent;
                     return __awaiter(this, void 0, void 0, function () {
-                        var _b, env, componentName, context, proxyInfo, DB_PASSWORD, DB_NAME, instanceName, localPort, cloudsqlProxyCredentials;
+                        var _b, env, componentName, context, proxyInfo, DB_PASSWORD, DB_NAME, DB_USER, instanceName, localPort, cloudsqlProxyCredentials;
                         var _this = this;
                         return __generator(this, function (_c) {
                             switch (_c.label) {
@@ -1491,7 +1507,7 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
                                     return [3 /*break*/, 6];
                                 case 5: throw new Error("unsupported environment");
                                 case 6:
-                                    DB_PASSWORD = proxyInfo.DB_PASSWORD, DB_NAME = proxyInfo.DB_NAME, instanceName = proxyInfo.instanceName;
+                                    DB_PASSWORD = proxyInfo.DB_PASSWORD, DB_NAME = proxyInfo.DB_NAME, DB_USER = proxyInfo.DB_USER, instanceName = proxyInfo.instanceName;
                                     return [4 /*yield*/, this.prompt({
                                             type: "number",
                                             name: "localPort",
@@ -1503,7 +1519,7 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
                                     this.log("");
                                     this.log("postgres-PW: ".concat(DB_PASSWORD));
                                     this.log("");
-                                    this.log("POSTGRESQL_URL=postgresql://postgres:".concat(DB_PASSWORD, "@localhost:").concat(localPort, "/").concat(DB_NAME, "?schema=public"));
+                                    this.log("POSTGRESQL_URL=postgresql://".concat(DB_USER, ":").concat(DB_PASSWORD, "@localhost:").concat(localPort, "/").concat(DB_NAME, "?schema=public"));
                                     this.log("");
                                     return [4 /*yield*/, (0, getProjectConfig_1.getGitlabVar)(this, env, componentName, "cloudsqlProxyCredentials")];
                                 case 8:
@@ -1570,13 +1586,14 @@ var getProxyInfoForKubernetes = function (context) { return __awaiter(void 0, vo
                 return [2 /*return*/, {
                         instanceName: instanceName,
                         DB_PASSWORD: DB_PASSWORD,
-                        DB_NAME: DB_NAME
+                        DB_NAME: DB_NAME,
+                        DB_USER: "postgres"
                     }];
         }
     });
 }); };
 var getProxyInfoForCloudRun = function (context) { return __awaiter(void 0, void 0, void 0, function () {
-    var envVars, DB_PASSWORD, DB_NAME;
+    var envVars, DB_PASSWORD, DB_USER, DB_NAME;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
@@ -1588,11 +1605,13 @@ var getProxyInfoForCloudRun = function (context) { return __awaiter(void 0, void
             case 1:
                 envVars = _a.sent();
                 DB_PASSWORD = envVars === null || envVars === void 0 ? void 0 : envVars.DB_PASSWORD;
+                DB_USER = envVars === null || envVars === void 0 ? void 0 : envVars.DB_USER;
                 DB_NAME = context.environment.envVars.DB_NAME;
                 return [2 /*return*/, {
                         instanceName: context.componentConfig.deploy.cloudSql.instanceConnectionName,
                         DB_PASSWORD: DB_PASSWORD,
-                        DB_NAME: DB_NAME
+                        DB_NAME: DB_NAME,
+                        DB_USER: DB_USER
                     }];
         }
     });
@@ -351171,7 +351190,7 @@ exports.readConfigSync = readConfigSync;
 
 exports.__esModule = true;
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "main-553001a0" || 0;
+exports.PIPELINE_IMAGE_TAG = "main-d52d3655" || 0;
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
 
 /***/ }),
@@ -352574,7 +352593,7 @@ var jobName_1 = __nccwpck_require__(77311);
 exports.GCLOUD_DEPLOY_CREDENTIALS_KEY = "GCLOUD_DEPLOY_credentialsKey";
 exports.GCLOUD_RUN_CANONICAL_HOST_SUFFIX = "GCLOUD_RUN_canonicalHostSuffix";
 var getCloudSqlVariables = function (_a) {
-  var _b, _c;
+  var _b, _c, _d;
   var deployConfigRaw = _a.deployConfigRaw,
     environmentSlug = _a.environmentSlug,
     env = _a.env,
@@ -352591,7 +352610,7 @@ var getCloudSqlVariables = function (_a) {
     return {
       CLOUD_SQL_INSTANCE_CONNECTION_NAME: deployConfigRaw.cloudSql.instanceConnectionName,
       DB_NAME: DB_NAME,
-      DB_USER: "postgres",
+      DB_USER: (_d = deployConfigRaw.cloudSql.dbUser) !== null && _d !== void 0 ? _d : "postgres",
       DB_PASSWORD: "$" + (0, context_1.getSecretVarName)(env, componentName, "DB_PASSWORD"),
       DATABASE_URL: "postgresql://$DB_USER:$DB_PASSWORD@localhost/$DB_NAME?host=/cloudsql/$CLOUD_SQL_INSTANCE_CONNECTION_NAME".concat(additionalQueryParamsString),
       DATABASE_JDBC_URL: "jdbc:postgresql:///$DB_NAME?cloudSqlInstance=$CLOUD_SQL_INSTANCE_CONNECTION_NAME&socketFactory=com.google.cloud.sql.postgres.SocketFactory&user=$DB_USER&password=$DB_PASSWORD".concat(additionalQueryParamsString)