@catladder/cli 0.0.0-node16-ddfae617 → 0.0.0-pipeline-variables-a7b0b5d2

package/dist/apps/cli/commands/mongodb/projectMongoPortForward.d.ts

@@ -1,3 +1,3 @@
-import Vorpal from "vorpal";
+import type Vorpal from "vorpal";
 declare const _default: (vorpal: Vorpal) => Promise<Vorpal.Command>;
 export default _default;

package/dist/apps/cli/commands/mongodb/projectMongoPortForward.js

@@ -39,12 +39,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 exports.__esModule = true;
+var getProjectConfig_1 = require("../../../../config/getProjectConfig");
 var log_1 = require("../../../../utils/log");
-var portForward_1 = require("../../../../utils/portForward");
+var portForward_1 = require("../../../../kubernetes/portForward");
 var projects_1 = require("../../../../utils/projects");
 var autocompletions_1 = require("../project/utils/autocompletions");
 var ensureCluster_1 = __importDefault(require("../project/utils/ensureCluster"));
 var utils_1 = require("./utils");
+var clipboardy_1 = __importDefault(require("clipboardy"));
 exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void 0, function () {
     var _a, _b;
     return __generator(this, function (_c) {
@@ -58,18 +60,18 @@ 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 namespace, podNames, podName, localPort;
-                        return __generator(this, function (_b) {
-                            switch (_b.label) {
+                        var namespace, podNames, podName, localPort, _b, env, componentName, envVars, MONGODB_ROOT_PASSWORD, connectionUrl;
+                        return __generator(this, function (_c) {
+                            switch (_c.label) {
                                 case 0: return [4 /*yield*/, ensureCluster_1["default"].call(this, envComponent)];
                                 case 1:
-                                    _b.sent();
+                                    _c.sent();
                                     return [4 /*yield*/, (0, projects_1.getProjectNamespace)(envComponent)];
                                 case 2:
-                                    namespace = _b.sent();
+                                    namespace = _c.sent();
                                     return [4 /*yield*/, (0, utils_1.getProjectMongodbAllPodsSortedWithLabel)(envComponent)];
                                 case 3:
-                                    podNames = _b.sent();
+                                    podNames = _c.sent();
                                     if (podNames.length === 0) {
                                         (0, log_1.logError)(this, "sorry, no pods found");
                                         return [2 /*return*/];
@@ -84,8 +86,8 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
                                         message: "Which pod? 🤔"
                                     })];
                                 case 5:
-                                    podName = (_b.sent()).podName;
-                                    _b.label = 6;
+                                    podName = (_c.sent()).podName;
+                                    _c.label = 6;
                                 case 6: return [4 /*yield*/, this.prompt({
                                         type: "number",
                                         name: "localPort",
@@ -93,8 +95,22 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
                                         message: "Local port: "
                                     })];
                                 case 7:
-                                    localPort = (_b.sent()).localPort;
-                                    return [2 /*return*/, (0, portForward_1.startPortForward)(podName, localPort, 27017, namespace)];
+                                    localPort = (_c.sent()).localPort;
+                                    _b = (0, getProjectConfig_1.parseChoice)(envComponent), env = _b.env, componentName = _b.componentName;
+                                    return [4 /*yield*/, (0, getProjectConfig_1.getEnvVarsResolved)(this, env, componentName)];
+                                case 8:
+                                    envVars = _c.sent();
+                                    MONGODB_ROOT_PASSWORD = envVars === null || envVars === void 0 ? void 0 : envVars.MONGODB_ROOT_PASSWORD;
+                                    connectionUrl = "mongodb://root:".concat(MONGODB_ROOT_PASSWORD, "@localhost:").concat(localPort);
+                                    clipboardy_1["default"].writeSync(connectionUrl);
+                                    this.log("");
+                                    this.log("username: root");
+                                    this.log("password: ".concat(MONGODB_ROOT_PASSWORD));
+                                    this.log("connection string: ".concat(connectionUrl));
+                                    this.log("");
+                                    this.log("👆 connection string has been copied to your clipboard!");
+                                    this.log("");
+                                    return [2 /*return*/, (0, portForward_1.startKubePortForward)(podName, localPort, 27017, namespace)];
                             }
                         });
                     });

package/dist/apps/cli/commands/mongodb/projectMongoPortForward.js.map

@@ -1 +1 @@
-{"version":3,"file":"projectMongoPortForward.js","sourceRoot":"","sources":["../../../../../src/apps/cli/commands/mongodb/projectMongoPortForward.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,6CAAiD;AACjD,6DAAiE;AACjE,uDAAiE;AACjE,oEAAoE;AACpE,iFAA2D;AAC3D,iCAAkE;AAElE,sBAAe,UAAO,MAAc;;;;;gBAClC,KAAA,CAAA,KAAA,MAAM;qBACH,OAAO,CACN,2CAA2C,EAC3C,0BAA0B,CAC3B,CAAA;qBACA,YAAY,CAAA;gBAAC,qBAAM,IAAA,kCAAgB,GAAE,EAAA;oBALxC,sBAAA,cAKgB,SAAwB,EAAC;qBACtC,MAAM,CAAC,UAAgB,EAAgB;wBAAd,YAAY,kBAAA;;;;;wCACpC,qBAAM,0BAAa,CAAC,IAAI,CAAC,IAAI,EAAE,YAAY,CAAC,EAAA;;oCAA5C,SAA4C,CAAC;oCAC3B,qBAAM,IAAA,8BAAmB,EAAC,YAAY,CAAC,EAAA;;oCAAnD,SAAS,GAAG,SAAuC;oCACxC,qBAAM,IAAA,+CAAuC,EAC5D,YAAY,CACb,EAAA;;oCAFK,QAAQ,GAAG,SAEhB;oCACD,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE;wCACzB,IAAA,cAAQ,EAAC,IAAI,EAAE,sBAAsB,CAAC,CAAC;wCACvC,sBAAO;qCACR;yCAEG,CAAA,QAAQ,CAAC,MAAM,KAAK,CAAC,CAAA,EAArB,wBAAqB;oCACvB,OAAO,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;;wCAG1B,qBAAM,IAAI,CAAC,MAAM,CAAC;wCAChB,IAAI,EAAE,MAAM;wCACZ,IAAI,EAAE,SAAS;wCACf,OAAO,EAAE,QAAQ;wCACjB,OAAO,EAAE,eAAe;qCACzB,CAAC,EAAA;;oCANJ,OAAO,GAAG,CACR,SAKE,CACH,CAAC,OAAO,CAAC;;wCAGU,qBAAM,IAAI,CAAC,MAAM,CAAC;wCACtC,IAAI,EAAE,QAAQ;wCACd,IAAI,EAAE,WAAW;wCACjB,SAAO,EAAE,OAAO;wCAChB,OAAO,EAAE,cAAc;qCACxB,CAAC,EAAA;;oCALM,SAAS,GAAK,CAAA,SAKpB,CAAA,UALe;oCAMjB,sBAAO,IAAA,8BAAgB,EAAC,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,SAAS,CAAC,EAAC;;;;iBAC/D,CAAC,EAAA;;;KAAA,EAAC"}
+{"version":3,"file":"projectMongoPortForward.js","sourceRoot":"","sources":["../../../../../src/apps/cli/commands/mongodb/projectMongoPortForward.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,wEAG6C;AAC7C,6CAAiD;AACjD,kEAA0E;AAC1E,uDAAiE;AACjE,oEAAoE;AACpE,iFAA2D;AAC3D,iCAAkE;AAClE,0DAAmC;AAEnC,sBAAe,UAAO,MAAc;;;;;gBAClC,KAAA,CAAA,KAAA,MAAM;qBACH,OAAO,CACN,2CAA2C,EAC3C,0BAA0B,CAC3B,CAAA;qBACA,YAAY,CAAA;gBAAC,qBAAM,IAAA,kCAAgB,GAAE,EAAA;oBALxC,sBAAA,cAKgB,SAAwB,EAAC;qBACtC,MAAM,CAAC,UAAgB,EAAgB;wBAAd,YAAY,kBAAA;;;;;wCACpC,qBAAM,0BAAa,CAAC,IAAI,CAAC,IAAI,EAAE,YAAY,CAAC,EAAA;;oCAA5C,SAA4C,CAAC;oCAC3B,qBAAM,IAAA,8BAAmB,EAAC,YAAY,CAAC,EAAA;;oCAAnD,SAAS,GAAG,SAAuC;oCACxC,qBAAM,IAAA,+CAAuC,EAC5D,YAAY,CACb,EAAA;;oCAFK,QAAQ,GAAG,SAEhB;oCACD,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE;wCACzB,IAAA,cAAQ,EAAC,IAAI,EAAE,sBAAsB,CAAC,CAAC;wCACvC,sBAAO;qCACR;yCAEG,CAAA,QAAQ,CAAC,MAAM,KAAK,CAAC,CAAA,EAArB,wBAAqB;oCACvB,OAAO,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;;wCAG1B,qBAAM,IAAI,CAAC,MAAM,CAAC;wCAChB,IAAI,EAAE,MAAM;wCACZ,IAAI,EAAE,SAAS;wCACf,OAAO,EAAE,QAAQ;wCACjB,OAAO,EAAE,eAAe;qCACzB,CAAC,EAAA;;oCANJ,OAAO,GAAG,CACR,SAKE,CACH,CAAC,OAAO,CAAC;;wCAGU,qBAAM,IAAI,CAAC,MAAM,CAAC;wCACtC,IAAI,EAAE,QAAQ;wCACd,IAAI,EAAE,WAAW;wCACjB,SAAO,EAAE,OAAO;wCAChB,OAAO,EAAE,cAAc;qCACxB,CAAC,EAAA;;oCALM,SAAS,GAAK,CAAA,SAKpB,CAAA,UALe;oCAMX,KAAyB,IAAA,8BAAW,EAAC,YAAY,CAAC,EAAhD,GAAG,SAAA,EAAE,aAAa,mBAAA,CAA+B;oCACzC,qBAAM,IAAA,qCAAkB,EAAC,IAAI,EAAE,GAAG,EAAE,aAAa,CAAC,EAAA;;oCAA5D,OAAO,GAAG,SAAkD;oCAC5D,qBAAqB,GAAG,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,qBAAqB,CAAC;oCACvD,aAAa,GAAG,yBAAkB,qBAAqB,wBAAc,SAAS,CAAE,CAAC;oCACvF,uBAAS,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;oCACnC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;oCACb,IAAI,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;oCAC3B,IAAI,CAAC,GAAG,CAAC,oBAAa,qBAAqB,CAAE,CAAC,CAAC;oCAC/C,IAAI,CAAC,GAAG,CAAC,6BAAsB,aAAa,CAAE,CAAC,CAAC;oCAChD,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;oCACb,IAAI,CAAC,GAAG,CAAC,yDAAyD,CAAC,CAAC;oCACpE,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;oCAEb,sBAAO,IAAA,kCAAoB,EAAC,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,SAAS,CAAC,EAAC;;;;iBACnE,CAAC,EAAA;;;KAAA,EAAC"}

package/dist/apps/cli/commands/mongodb/utils/index.js

@@ -49,15 +49,20 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 exports.__esModule = true;
 exports.getProjectMongodbAllPodsSortedWithLabel = exports.getMongoDbPodsWithReplInfo = exports.podIsMaster = exports.executeMongodbCommand = exports.getMongodbShell = exports.getProjectMongodbAllPods = void 0;
 var child_process_promise_1 = require("child-process-promise");
+var kubernetes_1 = require("../../../../../kubernetes");
 var projects_1 = require("../../../../../utils/projects");
 var filterMongoDbs = function (podNames) {
-    return podNames.filter(function (name) { return name.includes("mongodb-replicaset"); });
+    return podNames.filter(function (name) {
+        return name.includes("mongodb") &&
+            !name.includes("mongodb-backup") &&
+            !name.includes("arbiter");
+    });
 };
 var getProjectMongodbAllPods = function (envComponent) { return __awaiter(void 0, void 0, void 0, function () { var _a; return __generator(this, function (_b) {
     switch (_b.label) {
         case 0:
             _a = filterMongoDbs;
-            return [4 /*yield*/, (0, projects_1.getProjectPodNames)(envComponent)];
+            return [4 /*yield*/, (0, kubernetes_1.getProjectPodNames)(envComponent)];
         case 1: return [2 /*return*/, _a.apply(void 0, [_b.sent()])];
     }
 }); }); };
@@ -104,13 +109,20 @@ var executeMongodbCommand = function (namespace, podName, mongoCommand) { return
 }); };
 exports.executeMongodbCommand = executeMongodbCommand;
 var podIsMaster = function (namespace, podName) { return __awaiter(void 0, void 0, void 0, function () {
-    var result;
+    var result, e_2;
     return __generator(this, function (_a) {
         switch (_a.label) {
-            case 0: return [4 /*yield*/, (0, exports.executeMongodbCommand)(namespace, podName, "db.isMaster()")];
+            case 0:
+                _a.trys.push([0, 2, , 3]);
+                return [4 /*yield*/, (0, exports.executeMongodbCommand)(namespace, podName, "db.isMaster()")];
             case 1:
                 result = _a.sent();
                 return [2 /*return*/, result.ismaster];
+            case 2:
+                e_2 = _a.sent();
+                // maybe shutting down ?
+                return [2 /*return*/, null];
+            case 3: return [2 /*return*/];
         }
     });
 }); };

package/dist/apps/cli/commands/mongodb/utils/index.js.map

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

package/dist/apps/cli/commands/project/commandCloudSqlProxy.d.ts

@@ -1,3 +1,3 @@
-import Vorpal from "vorpal";
+import type Vorpal from "vorpal";
 declare const _default: (vorpal: Vorpal) => Promise<Vorpal.Command>;
 export default _default;

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

@@ -37,11 +37,9 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 exports.__esModule = true;
 var pipeline_1 = require("@catladder/pipeline");
-var child_process_promise_1 = require("child-process-promise");
-var fs_extra_1 = require("fs-extra");
-var tmp_promise_1 = require("tmp-promise");
 var getProjectConfig_1 = require("../../../../config/getProjectConfig");
 var autocompletions_1 = require("./utils/autocompletions");
+var startProxy_1 = require("../../../../gcloud/cloudSql/startProxy");
 exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void 0, function () {
     var _a, _b;
     return __generator(this, function (_c) {
@@ -53,79 +51,60 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
                 return [4 /*yield*/, (0, autocompletions_1.envAndComponents)()];
             case 1: return [2 /*return*/, _b.apply(_a, [_c.sent()])
                     .action(function (_a) {
-                    var _b, _c, _d, _e;
                     var envComponent = _a.envComponent;
                     return __awaiter(this, void 0, void 0, function () {
-                        var _f, env, componentName, config, localPort, envVars, POSTGRESQL_PASSWORD, context, values, projectId, defaultInstanceId, instanceId, defaultRegion, region, instanceName, cloudsqlProxyCredentials;
-                        var _this = this;
-                        return __generator(this, function (_g) {
-                            switch (_g.label) {
+                        var _b, env, componentName, context, proxyInfo, DB_PASSWORD, DB_NAME, DB_USER, instanceName, localPort;
+                        return __generator(this, function (_c) {
+                            switch (_c.label) {
                                 case 0:
-                                    _f = (0, getProjectConfig_1.parseChoice)(envComponent), env = _f.env, componentName = _f.componentName;
-                                    return [4 /*yield*/, (0, getProjectConfig_1.getProjectConfig)()];
+                                    _b = (0, getProjectConfig_1.parseChoice)(envComponent), env = _b.env, componentName = _b.componentName;
+                                    if (!componentName) {
+                                        this.log("need componentName");
+                                        return [2 /*return*/];
+                                    }
+                                    return [4 /*yield*/, (0, getProjectConfig_1.getPipelineContextByChoice)(env, componentName)];
                                 case 1:
-                                    config = _g.sent();
+                                    context = _c.sent();
+                                    if (env === "review") {
+                                        vorpal.log("⚠️ connection string does not include mr information on review environments");
+                                    }
+                                    if (!(0, pipeline_1.isOfDeployType)(context.componentConfig.deploy, "kubernetes")) return [3 /*break*/, 3];
+                                    return [4 /*yield*/, getProxyInfoForKubernetes(this, context)];
+                                case 2:
+                                    proxyInfo = _c.sent();
+                                    return [3 /*break*/, 6];
+                                case 3:
+                                    if (!(0, pipeline_1.isOfDeployType)(context.componentConfig.deploy, "google-cloudrun")) return [3 /*break*/, 5];
+                                    return [4 /*yield*/, getProxyInfoForCloudRun(this, context)];
+                                case 4:
+                                    proxyInfo = _c.sent();
+                                    return [3 /*break*/, 6];
+                                case 5: throw new Error("unsupported environment");
+                                case 6:
+                                    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",
                                             "default": "54320",
                                             message: "Local port: "
                                         })];
-                                case 2:
-                                    localPort = (_g.sent()).localPort;
-                                    return [4 /*yield*/, (0, getProjectConfig_1.getEnvVars)(this, env, componentName)];
-                                case 3:
-                                    envVars = _g.sent();
-                                    POSTGRESQL_PASSWORD = envVars === null || envVars === void 0 ? void 0 : envVars.POSTGRESQL_PASSWORD;
-                                    return [4 /*yield*/, (0, getProjectConfig_1.getPipelineContextByChoice)(env, componentName)];
-                                case 4:
-                                    context = _g.sent();
-                                    if (!(0, pipeline_1.isOfDeployType)(context.componentConfig.deploy, "kubernetes")) {
-                                        throw new Error("currently only supported for kubernetes deployment");
-                                    }
+                                case 7:
+                                    localPort = (_c.sent()).localPort;
                                     this.log("");
-                                    this.log("postgres-PW: ".concat(POSTGRESQL_PASSWORD));
+                                    this.log("postgres-PW: ".concat(DB_PASSWORD));
                                     this.log("");
-                                    this.log("POSTGRESQL_URL=postgresql://postgres:".concat(POSTGRESQL_PASSWORD, "@localhost:").concat(localPort, "/").concat(context.environment.envVars.KUBE_APP_NAME, "?schema=public"));
+                                    this.log("connection strings:");
                                     this.log("");
-                                    values = context.componentConfig.deploy.values;
-                                    projectId = ((_b = values === null || values === void 0 ? void 0 : values.cloudsql) === null || _b === void 0 ? void 0 : _b.projectId) ||
-                                        ((_c = context.componentConfig.deploy.cluster) === null || _c === void 0 ? void 0 : _c.projectId);
-                                    defaultInstanceId = "".concat(config.customerName, "-").concat(config.appName, "-").concat(env);
-                                    instanceId = ((_d = values === null || values === void 0 ? void 0 : values.cloudsql) === null || _d === void 0 ? void 0 : _d.instanceId) || defaultInstanceId;
-                                    defaultRegion = "europe-west6";
-                                    region = ((_e = values === null || values === void 0 ? void 0 : values.cloudsql) === null || _e === void 0 ? void 0 : _e.region) || defaultRegion;
-                                    instanceName = "".concat(projectId, ":").concat(region, ":").concat(instanceId, "=tcp:").concat(localPort);
-                                    return [4 /*yield*/, (0, getProjectConfig_1.getGitlabVar)(this, env, componentName, "cloudsqlProxyCredentials")];
-                                case 5:
-                                    cloudsqlProxyCredentials = _g.sent();
-                                    if (!cloudsqlProxyCredentials) {
-                                        // we store cloudsqlProxyCredentials on gitlab, but its currently get pushed via bitwarden due to legacy reasons
-                                        // this will be fixed with when https://git.panter.ch/catladder/catladder/-/merge_requests/32/ is merged
-                                        this.log("cloudsqlProxyCredentials env var missing in gitlab. Please contact gilde-ci-cd about that.");
-                                        throw new Error("cloudsqlProxyCredentials missing in secrets");
-                                    }
-                                    return [4 /*yield*/, (0, tmp_promise_1.withFile)(function (_a) {
-                                            var tmpFilePath = _a.path;
-                                            return __awaiter(_this, void 0, void 0, function () {
-                                                return __generator(this, function (_b) {
-                                                    switch (_b.label) {
-                                                        case 0: return [4 /*yield*/, (0, fs_extra_1.writeFile)(tmpFilePath, cloudsqlProxyCredentials)];
-                                                        case 1:
-                                                            _b.sent();
-                                                            return [4 /*yield*/, (0, child_process_promise_1.spawn)("cloud_sql_proxy", ["-instances", instanceName, "-credential_file", tmpFilePath], {
-                                                                    stdio: "inherit",
-                                                                    shell: true
-                                                                })];
-                                                        case 2:
-                                                            _b.sent();
-                                                            return [2 /*return*/];
-                                                    }
-                                                });
-                                            });
+                                    this.log("DATABASE_URL=postgresql://".concat(DB_USER, ":").concat(DB_PASSWORD, "@localhost:").concat(localPort, "/").concat(DB_NAME, "?schema=public"));
+                                    this.log("");
+                                    this.log("DATABASE_JDBC_URL=jdbc:postgresql://localhost:".concat(localPort, "/").concat(DB_NAME, "?schema=public&user=").concat(DB_USER, "&password=").concat(DB_PASSWORD));
+                                    this.log("");
+                                    return [4 /*yield*/, (0, startProxy_1.startCloudSqlProxyInCurrentShell)({
+                                            instanceName: instanceName,
+                                            localPort: localPort
                                         })];
-                                case 6:
-                                    _g.sent();
+                                case 8:
+                                    _c.sent();
                                     return [2 /*return*/];
                             }
                         });
@@ -134,4 +113,52 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
         }
     });
 }); });
+var getProxyInfoForKubernetes = function (vorpal, context) { return __awaiter(void 0, void 0, void 0, function () {
+    var envVars, cloudSqlValues, DB_PASSWORD, DB_NAME, instanceName;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                if (!(0, pipeline_1.isOfDeployType)(context.componentConfig.deploy, "kubernetes")) {
+                    throw new Error("unsupported");
+                }
+                return [4 /*yield*/, (0, getProjectConfig_1.getEnvVarsResolved)(vorpal, context.environment.shortName, context.componentName)];
+            case 1:
+                envVars = _a.sent();
+                cloudSqlValues = (0, pipeline_1.createKubernetesCloudsqlBaseValues)(context);
+                DB_PASSWORD = (envVars === null || envVars === void 0 ? void 0 : envVars.DB_PASSWORD) || (envVars === null || envVars === void 0 ? void 0 : envVars.POSTGRESQL_PASSWORD);
+                DB_NAME = cloudSqlValues.cloudsql.fullDbName;
+                instanceName = cloudSqlValues.cloudsql.instanceConnectionName;
+                return [2 /*return*/, {
+                        instanceName: instanceName,
+                        DB_PASSWORD: DB_PASSWORD,
+                        DB_NAME: DB_NAME,
+                        DB_USER: "postgres"
+                    }];
+        }
+    });
+}); };
+var getProxyInfoForCloudRun = function (vorpal, context) { return __awaiter(void 0, void 0, void 0, function () {
+    var envVars, DB_PASSWORD, DB_USER, DB_NAME;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                if (!(0, pipeline_1.isOfDeployType)(context.componentConfig.deploy, "google-cloudrun") ||
+                    !context.componentConfig.deploy.cloudSql) {
+                    throw new Error("unsupported");
+                }
+                return [4 /*yield*/, (0, getProjectConfig_1.getEnvVarsResolved)(vorpal, context.environment.shortName, context.componentName)];
+            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_USER: DB_USER
+                    }];
+        }
+    });
+}); };
 //# sourceMappingURL=commandCloudSqlProxy.js.map

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/apps/cli/commands/project/commandConfigSecrets.d.ts

@@ -1,4 +1,5 @@
-import Vorpal, { CommandInstance } from "vorpal";
+import type { CommandInstance } from "vorpal";
+import type Vorpal from "vorpal";
 export declare const projectConfigSecrets: (vorpal: CommandInstance, envComponent?: string) => Promise<void>;
 declare const _default: (vorpal: Vorpal) => Promise<void>;
 export default _default;

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

@@ -3,6 +3,17 @@ var __makeTemplateObject = (this && this.__makeTemplateObject) || function (cook
     if (Object.defineProperty) { Object.defineProperty(cooked, "raw", { value: raw }); } else { cooked.raw = raw; }
     return cooked;
 };
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -39,16 +50,24 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
 exports.__esModule = true;
 exports.projectConfigSecrets = void 0;
 /* eslint-disable no-constant-condition */
+var pipeline_1 = require("@catladder/pipeline");
 var common_tags_1 = require("common-tags");
 var lodash_1 = require("lodash");
-var constants_1 = require("../../../../config/constants");
 var getProjectConfig_1 = require("../../../../config/getProjectConfig");
 var editAsFile_1 = require("../../../../utils/editAsFile");
 var gitlab_1 = require("../../../../utils/gitlab");
-var passwordstore_1 = require("../../../../utils/passwordstore");
 var promise_1 = require("../../../../utils/promise");
 var autocompletions_1 = require("./utils/autocompletions");
 /* for convenience, parse json objects. that makes it easier to edit secrets that are object */
@@ -75,26 +94,45 @@ var resolveJson = function (v) {
         ];
     }));
 };
+var getSecretEnvVarKeysToConfigure = function (env, componentName) { return __awaiter(void 0, void 0, void 0, function () {
+    var _a, secretEnvVarKeys, jobOnlyVars;
+    return __generator(this, function (_b) {
+        switch (_b.label) {
+            case 0: return [4 /*yield*/, (0, getProjectConfig_1.getEnvironment)(env, componentName)];
+            case 1:
+                _a = _b.sent(), secretEnvVarKeys = _a.secretEnvVarKeys, jobOnlyVars = _a.jobOnlyVars;
+                return [2 /*return*/, __spreadArray(__spreadArray(__spreadArray([], jobOnlyVars.build.secretEnvVarKeys, true), jobOnlyVars.deploy.secretEnvVarKeys, true), secretEnvVarKeys, true).filter(function (k) { return !k.hidden; })
+                        .map(function (k) { return k.key; })];
+        }
+    });
+}); };
 var getEnvVarsToEdit = function (instance, env, componentName) { return __awaiter(void 0, void 0, void 0, function () {
-    var secretEnvVarKeys, allEnvVars;
+    var secretEnvVarKeys, normalEnvVars, jobOnlyEnvVars, allEnvVars;
     return __generator(this, function (_a) {
         switch (_a.label) {
-            case 0: return [4 /*yield*/, (0, getProjectConfig_1.getEnvironment)(env, componentName)];
+            case 0: return [4 /*yield*/, getSecretEnvVarKeysToConfigure(env, componentName)];
             case 1:
-                secretEnvVarKeys = (_a.sent()).secretEnvVarKeys;
-                return [4 /*yield*/, (0, getProjectConfig_1.getEnvVars)(instance, env, componentName)];
+                secretEnvVarKeys = _a.sent();
+                return [4 /*yield*/, (0, getProjectConfig_1.getEnvVarsResolved)(instance, env, componentName)];
             case 2:
-                allEnvVars = _a.sent();
-                return [2 /*return*/, Object.fromEntries(secretEnvVarKeys.map(function (key) { return [key, allEnvVars[key]]; }))];
+                normalEnvVars = _a.sent();
+                return [4 /*yield*/, (0, getProjectConfig_1.getJobOnlyEnvVarsResolved)(instance, env, componentName)];
+            case 3:
+                jobOnlyEnvVars = _a.sent();
+                allEnvVars = __assign(__assign({}, normalEnvVars), jobOnlyEnvVars);
+                return [2 /*return*/, Object.fromEntries(secretEnvVarKeys.map(function (key) {
+                        var value = allEnvVars[key];
+                        // due to some quirky way to resolve these variables, unset variables have the $CL_ prefix, so we remove thouse here
+                        var variableIsNotSet = value === "$" + (0, pipeline_1.getSecretVarName)(env, componentName, key);
+                        return [key, variableIsNotSet ? "🚨 FILL ME" : value];
+                    }))];
         }
     });
 }); };
 var doItFor = function (instance, envAndComponents) { return __awaiter(void 0, void 0, void 0, function () {
-    var valuesToEdit, _a, _b, hasErrors, _i, _c, _d, componentName, envs, _e, envs_1, env, usedKeys, secretEnvVarKeys, extranous, missing, shouldContinue, _f, _g, _h, componentName, envs, _j, envs_2, env, context, _k, _l, e_1;
-    var _m;
-    var _o, _p;
-    return __generator(this, function (_q) {
-        switch (_q.label) {
+    var valuesToEdit, _a, _b, hasErrors, _i, _c, _d, componentName, envs, _e, envs_1, env, usedKeys, secretEnvVarKeys, extranous, missing, shouldContinue, _f, _g, _h, componentName, envs, _j, envs_2, env;
+    return __generator(this, function (_k) {
+        switch (_k.label) {
             case 0:
                 _b = (_a = Object).fromEntries;
                 return [4 /*yield*/, Promise.all(Object.entries(envAndComponents).map(function (_a) {
@@ -127,9 +165,9 @@ var doItFor = function (instance, envAndComponents) { return __awaiter(void 0, v
                         });
                     }))];
             case 1:
-                valuesToEdit = _b.apply(_a, [_q.sent()]);
+                valuesToEdit = _b.apply(_a, [_k.sent()]);
                 hasErrors = true;
-                _q.label = 2;
+                _k.label = 2;
             case 2:
                 if (!hasErrors) return [3 /*break*/, 12];
                 return [4 /*yield*/, (0, editAsFile_1.editAsFile)(resolveJson(valuesToEdit), (0, common_tags_1.stripIndents)(templateObject_1 || (templateObject_1 = __makeTemplateObject(["\n        Please fill in all secrets for: \n\n        ", "\n\n        "], ["\n        Please fill in all secrets for: \n\n        ", "\n\n        "])), Object.entries(envAndComponents)
@@ -139,25 +177,25 @@ var doItFor = function (instance, envAndComponents) { return __awaiter(void 0, v
                     })
                         .join("\n")))];
             case 3:
-                valuesToEdit = _q.sent();
+                valuesToEdit = _k.sent();
                 // check for errors
                 hasErrors = false;
                 _i = 0, _c = Object.entries(envAndComponents);
-                _q.label = 4;
+                _k.label = 4;
             case 4:
                 if (!(_i < _c.length)) return [3 /*break*/, 11];
                 _d = _c[_i], componentName = _d[0], envs = _d[1];
                 _e = 0, envs_1 = envs;
-                _q.label = 5;
+                _k.label = 5;
             case 5:
                 if (!(_e < envs_1.length)) return [3 /*break*/, 10];
                 env = envs_1[_e];
                 usedKeys = valuesToEdit[componentName][env]
                     ? Object.keys(valuesToEdit[componentName][env])
                     : [];
-                return [4 /*yield*/, (0, getProjectConfig_1.getEnvironment)(env, componentName)];
+                return [4 /*yield*/, getSecretEnvVarKeysToConfigure(env, componentName)];
             case 6:
-                secretEnvVarKeys = (_q.sent()).secretEnvVarKeys;
+                secretEnvVarKeys = _k.sent();
                 extranous = (0, lodash_1.difference)(usedKeys, secretEnvVarKeys);
                 missing = (0, lodash_1.difference)(secretEnvVarKeys, usedKeys);
                 if (!(extranous.length > 0 || missing.length > 0)) return [3 /*break*/, 9];
@@ -176,7 +214,7 @@ var doItFor = function (instance, envAndComponents) { return __awaiter(void 0, v
                 }
                 return [4 /*yield*/, (0, promise_1.delay)(1000)];
             case 7:
-                _q.sent();
+                _k.sent();
                 return [4 /*yield*/, instance.prompt({
                         "default": true,
                         message: "Try again? 🤔",
@@ -184,12 +222,12 @@ var doItFor = function (instance, envAndComponents) { return __awaiter(void 0, v
                         type: "confirm"
                     })];
             case 8:
-                shouldContinue = (_q.sent()).shouldContinue;
+                shouldContinue = (_k.sent()).shouldContinue;
                 if (!shouldContinue) {
                     throw new Error("abort");
                 }
                 hasErrors = true;
-                _q.label = 9;
+                _k.label = 9;
             case 9:
                 _e++;
                 return [3 /*break*/, 5];
@@ -201,52 +239,28 @@ var doItFor = function (instance, envAndComponents) { return __awaiter(void 0, v
                 instance.log("upserting all variables, please wait...");
                 instance.log("");
                 _f = 0, _g = Object.entries(envAndComponents);
-                _q.label = 13;
+                _k.label = 13;
             case 13:
-                if (!(_f < _g.length)) return [3 /*break*/, 25];
+                if (!(_f < _g.length)) return [3 /*break*/, 18];
                 _h = _g[_f], componentName = _h[0], envs = _h[1];
                 _j = 0, envs_2 = envs;
-                _q.label = 14;
+                _k.label = 14;
             case 14:
-                if (!(_j < envs_2.length)) return [3 /*break*/, 24];
+                if (!(_j < envs_2.length)) return [3 /*break*/, 17];
                 env = envs_2[_j];
                 return [4 /*yield*/, (0, gitlab_1.upsertAllVariables)(instance, valuesToEdit[componentName][env], env, componentName)];
             case 15:
-                _q.sent();
-                if (!(0, passwordstore_1.hasBitwarden)()) return [3 /*break*/, 22];
-                _q.label = 16;
-            case 16:
-                _q.trys.push([16, 21, , 22]);
-                return [4 /*yield*/, (0, getProjectConfig_1.getPipelineContextByChoice)(env, componentName)];
-            case 17:
-                context = _q.sent();
-                if (!(context.componentConfig.deploy &&
-                    context.componentConfig.deploy.type === "kubernetes" &&
-                    ((_p = (_o = context.componentConfig.deploy.values) === null || _o === void 0 ? void 0 : _o.cloudsql) === null || _p === void 0 ? void 0 : _p.enabled))) return [3 /*break*/, 20];
-                _k = gitlab_1.upsertAllVariables;
-                _l = [instance];
-                _m = {};
-                return [4 /*yield*/, (0, passwordstore_1.readPass)(constants_1.GOOGLE_CLOUD_SQL_PASS_PATH)];
-            case 18: return [4 /*yield*/, _k.apply(void 0, _l.concat([(_m.cloudsqlProxyCredentials = _q.sent(),
-                        _m), env,
-                    componentName]))];
-            case 19:
-                _q.sent();
-                _q.label = 20;
-            case 20: return [3 /*break*/, 22];
-            case 21:
-                e_1 = _q.sent();
-                return [3 /*break*/, 22];
-            case 22:
+                _k.sent();
+                instance.log("");
                 instance.log("✅ " + env + ":" + componentName);
-                _q.label = 23;
-            case 23:
+                _k.label = 16;
+            case 16:
                 _j++;
                 return [3 /*break*/, 14];
-            case 24:
+            case 17:
                 _f++;
                 return [3 /*break*/, 13];
-            case 25:
+            case 18:
                 instance.log("done! 😻");
                 instance.log("");
                 return [2 /*return*/];