@catladder/cli 0.0.0-main-84b04424 → 0.0.0-main-675caed2

package/dist/apps/catenv/printVariables.js

@@ -70,6 +70,7 @@ var getAllVariablesToPrint = function (config, choice) { return __awaiter(void 0
                             case 0: return [4 /*yield*/, (0, getProjectConfig_1.getEnvVarsResolved)(null, env, componentName)];
                             case 1:
                                 subappvars = _b.sent();
+                                delete subappvars["_ALL_ENV_VAR_KEYS"];
                                 _a = [{}];
                                 return [4 /*yield*/, acc];
                             case 2: return [2 /*return*/, __assign.apply(void 0, [__assign.apply(void 0, [__assign.apply(void 0, _a.concat([(_b.sent())])), subappvars]), Object.fromEntries(Object.entries(subappvars).map(function (_a) {

package/dist/apps/catenv/printVariables.js.map

@@ -1 +1 @@
-{"version":3,"file":"printVariables.js","sourceRoot":"","sources":["../../../src/apps/catenv/printVariables.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,kEAAmE;AAEnE,iCAIiB;AAEjB,IAAM,sBAAsB,GAAG,UAAO,MAAc,EAAE,MAAe;;;;oBACjC,qBAAM,IAAA,2CAAmC,EACzE,MAAM,EACN,MAAM,CACP,EAAA;;gBAHK,KAA4B,SAGjC,EAHO,GAAG,SAAA,EAAE,gBAAgB,sBAAA;gBAKzB,SAAS,GAAG,EAAE,CAAC;qBACf,gBAAgB,EAAhB,wBAAgB;gBACN,qBAAM,IAAA,qCAAkB,EAAC,IAAI,EAAE,GAAG,EAAE,gBAAgB,CAAC,EAAA;;gBAAjE,SAAS,GAAG,SAAqD,CAAC;;oBAKtD,qBAAM,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,MAAM,CACrD,UAAO,GAAG,EAAE,aAAa;;;;oCACJ,qBAAM,IAAA,qCAAkB,EAAC,IAAI,EAAE,GAAG,EAAE,aAAa,CAAC,EAAA;;gCAA/D,UAAU,GAAG,SAAkD;;gCAE/D,qBAAM,GAAG,EAAA;oCADf,wGACK,CAAC,SAAS,CAAC,KACX,UAAU,IAEV,MAAM,CAAC,WAAW,CACnB,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,UAAC,EAAY;4CAAX,GAAG,QAAA,EAAE,KAAK,QAAA;wCAAM,OAAA;4CAC/C,UAAG,IAAA,0BAAkB,EAAC,aAAa,CAAC,WAAW,EAAE,CAAC,cAAI,GAAG,CAAE;4CAC3D,KAAK;yCACN;oCAHgD,CAGhD,CAAC,CACH,IACD;;;qBACH,EACD,EAAE,CACH,EAAA;;gBAnBD,6DAA6D;gBAC7D,0EAA0E;gBAC1E,mCAAmC;gBACnC,SAAS,GAAG,SAgBX,CAAC;;oBAEJ,sBAAO,SAAS,EAAC;;;KAClB,CAAC;AAEK,IAAM,cAAc,GAAG,UAAO,MAAc,EAAE,MAAe;;;;oBAChD,qBAAM,sBAAsB,CAAC,MAAM,EAAE,MAAM,CAAC,EAAA;;gBAAxD,SAAS,GAAG,SAA4C;gBAE9D,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC,SAAS,CAAC,CAAC,CAAC;;;;KAClD,CAAC;AAJW,QAAA,cAAc,kBAIzB;AAEF,IAAM,wBAAwB,GAAG,UAAC,SAAoB;IACpD,OAAA,IAAA,0BAAkB,EAAC,SAAS,EAAE,SAAS,CAAC;AAAxC,CAAwC,CAAC"}
+{"version":3,"file":"printVariables.js","sourceRoot":"","sources":["../../../src/apps/catenv/printVariables.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,kEAAmE;AAEnE,iCAIiB;AAEjB,IAAM,sBAAsB,GAAG,UAAO,MAAc,EAAE,MAAe;;;;oBACjC,qBAAM,IAAA,2CAAmC,EACzE,MAAM,EACN,MAAM,CACP,EAAA;;gBAHK,KAA4B,SAGjC,EAHO,GAAG,SAAA,EAAE,gBAAgB,sBAAA;gBAKzB,SAAS,GAA2B,EAAE,CAAC;qBACvC,gBAAgB,EAAhB,wBAAgB;gBACN,qBAAM,IAAA,qCAAkB,EAAC,IAAI,EAAE,GAAG,EAAE,gBAAgB,CAAC,EAAA;;gBAAjE,SAAS,GAAG,SAAqD,CAAC;;oBAKtD,qBAAM,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,MAAM,CACrD,UAAO,GAAG,EAAE,aAAa;;;;oCACJ,qBAAM,IAAA,qCAAkB,EAAC,IAAI,EAAE,GAAG,EAAE,aAAa,CAAC,EAAA;;gCAA/D,UAAU,GAAG,SAAkD;gCACrE,OAAO,UAAU,CAAC,mBAAmB,CAAC,CAAC;;gCAEjC,qBAAM,GAAG,EAAA;oCADf,wGACK,CAAC,SAAS,CAAC,KACX,UAAU,IAEV,MAAM,CAAC,WAAW,CACnB,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,UAAC,EAAY;4CAAX,GAAG,QAAA,EAAE,KAAK,QAAA;wCAAM,OAAA;4CAC/C,UAAG,IAAA,0BAAkB,EAAC,aAAa,CAAC,WAAW,EAAE,CAAC,cAAI,GAAG,CAAE;4CAC3D,KAAK;yCACN;oCAHgD,CAGhD,CAAC,CACH,IACD;;;qBACH,EACD,EAAE,CACH,EAAA;;gBApBD,6DAA6D;gBAC7D,0EAA0E;gBAC1E,mCAAmC;gBACnC,SAAS,GAAG,SAiBX,CAAC;;oBAGJ,sBAAO,SAAS,EAAC;;;KAClB,CAAC;AAEK,IAAM,cAAc,GAAG,UAAO,MAAc,EAAE,MAAe;;;;oBAChD,qBAAM,sBAAsB,CAAC,MAAM,EAAE,MAAM,CAAC,EAAA;;gBAAxD,SAAS,GAAG,SAA4C;gBAE9D,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC,SAAS,CAAC,CAAC,CAAC;;;;KAClD,CAAC;AAJW,QAAA,cAAc,kBAIzB;AAEF,IAAM,wBAAwB,GAAG,UAAC,SAAoB;IACpD,OAAA,IAAA,0BAAkB,EAAC,SAAS,EAAE,SAAS,CAAC;AAAxC,CAAwC,CAAC"}

package/dist/apps/catenv/writeDotEnvFiles.js

@@ -74,6 +74,7 @@ var writeDotEnvFiles = function (config, choice) { return __awaiter(void 0, void
                 return [4 /*yield*/, (0, getProjectConfig_1.getEnvVarsResolved)(null, env, componentName)];
             case 4:
                 variables = _b.sent();
+                delete variables["_ALL_ENV_VAR_KEYS"];
                 componentDir = (0, utils_1.getComponentFullPath)(gitRoot, config, componentName);
                 filePath = (0, path_1.join)(componentDir, ".env");
                 variablesSanitized = (0, utils_1.sanitizeMultiLine)(variables);

package/dist/apps/catenv/writeDotEnvFiles.js.map

@@ -1 +1 @@
-{"version":3,"file":"writeDotEnvFiles.js","sourceRoot":"","sources":["../../../src/apps/catenv/writeDotEnvFiles.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,qCAAqC;AACrC,6BAA4B;AAC5B,kEAAmE;AACnE,iDAAkD;AAElD,iCAKiB;AAEV,IAAM,gBAAgB,GAAG,UAAO,MAAc,EAAE,MAAe;;;;oBAClC,qBAAM,IAAA,2CAAmC,EACzE,MAAM,EACN,MAAM,CACP,EAAA;;gBAHK,KAA4B,SAGjC,EAHO,GAAG,SAAA,EAAE,gBAAgB,sBAAA;gBAOvB,gCAAgC,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC;qBACvE,MAAM,CAAC,UAAC,EAAa;wBAAV,SAAS,QAAA;oBAAM,OAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,MAAM;gBAAjB,CAAiB,CAAC;qBAC5C,GAAG,CAAC,UAAC,EAAe;wBAAd,aAAa,QAAA;oBAAM,OAAA,aAAa;gBAAb,CAAa,CAAC,CAAC;gBAErC,kCAAkC,GAAG,gBAAgB;oBACzD,CAAC,CAAC,gCAAgC,CAAC,QAAQ,CAAC,gBAAgB,CAAC;wBAC3D,CAAC,CAAC,CAAC,gBAAgB,CAAC;wBACpB,CAAC,CAAC,EAAE;oBACN,CAAC,CAAC,gCAAgC,CAAC;gBACrB,qBAAM,IAAA,qBAAU,GAAE,EAAA;;gBAA5B,OAAO,GAAG,SAAkB;sBAE4B,EAAlC,yEAAkC;;;qBAAlC,CAAA,gDAAkC,CAAA;gBAAnD,aAAa;gBACJ,qBAAM,IAAA,qCAAkB,EAAC,IAAI,EAAE,GAAG,EAAE,aAAa,CAAC,EAAA;;gBAA9D,SAAS,GAAG,SAAkD;gBAC9D,YAAY,GAAG,IAAA,4BAAoB,EAAC,OAAO,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC;gBACpE,QAAQ,GAAG,IAAA,WAAI,EAAC,YAAY,EAAE,MAAM,CAAC,CAAC;gBAEtC,kBAAkB,GAAG,IAAA,yBAAiB,EAAC,SAAS,CAAC,CAAC;gBACxD,qBAAM,IAAA,oBAAS,EACb,QAAQ,EACR,0DAA0D;wBACxD,IAAA,0BAAkB,EAAC,kBAAkB,CAAC,CACzC,EAAA;;gBAJD,SAIC,CAAC;;;gBAVwB,IAAkC,CAAA;;;;;KAY/D,CAAC;AA/BW,QAAA,gBAAgB,oBA+B3B"}
+{"version":3,"file":"writeDotEnvFiles.js","sourceRoot":"","sources":["../../../src/apps/catenv/writeDotEnvFiles.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,qCAAqC;AACrC,6BAA4B;AAC5B,kEAAmE;AACnE,iDAAkD;AAElD,iCAKiB;AAEV,IAAM,gBAAgB,GAAG,UAAO,MAAc,EAAE,MAAe;;;;oBAClC,qBAAM,IAAA,2CAAmC,EACzE,MAAM,EACN,MAAM,CACP,EAAA;;gBAHK,KAA4B,SAGjC,EAHO,GAAG,SAAA,EAAE,gBAAgB,sBAAA;gBAOvB,gCAAgC,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC;qBACvE,MAAM,CAAC,UAAC,EAAa;wBAAV,SAAS,QAAA;oBAAM,OAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,MAAM;gBAAjB,CAAiB,CAAC;qBAC5C,GAAG,CAAC,UAAC,EAAe;wBAAd,aAAa,QAAA;oBAAM,OAAA,aAAa;gBAAb,CAAa,CAAC,CAAC;gBAErC,kCAAkC,GAAG,gBAAgB;oBACzD,CAAC,CAAC,gCAAgC,CAAC,QAAQ,CAAC,gBAAgB,CAAC;wBAC3D,CAAC,CAAC,CAAC,gBAAgB,CAAC;wBACpB,CAAC,CAAC,EAAE;oBACN,CAAC,CAAC,gCAAgC,CAAC;gBACrB,qBAAM,IAAA,qBAAU,GAAE,EAAA;;gBAA5B,OAAO,GAAG,SAAkB;sBAE4B,EAAlC,yEAAkC;;;qBAAlC,CAAA,gDAAkC,CAAA;gBAAnD,aAAa;gBACJ,qBAAM,IAAA,qCAAkB,EAAC,IAAI,EAAE,GAAG,EAAE,aAAa,CAAC,EAAA;;gBAA9D,SAAS,GAAG,SAAkD;gBACpE,OAAO,SAAS,CAAC,mBAAmB,CAAC,CAAC;gBAChC,YAAY,GAAG,IAAA,4BAAoB,EAAC,OAAO,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC;gBACpE,QAAQ,GAAG,IAAA,WAAI,EAAC,YAAY,EAAE,MAAM,CAAC,CAAC;gBAEtC,kBAAkB,GAAG,IAAA,yBAAiB,EAAC,SAAS,CAAC,CAAC;gBACxD,qBAAM,IAAA,oBAAS,EACb,QAAQ,EACR,0DAA0D;wBACxD,IAAA,0BAAkB,EAAC,kBAAkB,CAAC,CACzC,EAAA;;gBAJD,SAIC,CAAC;;;gBAXwB,IAAkC,CAAA;;;;;KAa/D,CAAC;AAhCW,QAAA,gBAAgB,oBAgC3B"}

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

@@ -37,25 +37,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 exports.__esModule = true;
 var child_process_promise_1 = require("child-process-promise");
-var createProxy = function (instance, port) { return __awaiter(void 0, void 0, void 0, function () {
-    var proxy, stop;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
-            case 0:
-                proxy = (0, child_process_promise_1.spawn)("cloud_sql_proxy -instances ".concat(instance, "=tcp:").concat(port), [], { shell: "bash" });
-                // wait until it starts
-                return [4 /*yield*/, (0, child_process_promise_1.spawn)("echo -n \"Waiting for proxy\"\n      until echo > /dev/tcp/localhost/".concat(port, "; do\n        sleep 0.2\n        echo -n \".\"\n      done 2>/dev/null"), [], { shell: "bash" })];
-            case 1:
-                // wait until it starts
-                _a.sent();
-                stop = function () { return proxy.childProcess.kill(); };
-                process.on("beforeExit", stop);
-                return [2 /*return*/, {
-                        stop: stop
-                    }];
-        }
-    });
-}); };
+var startProxy_1 = require("../../../../gcloud/cloudSql/startProxy");
 exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void 0, function () {
     return __generator(this, function (_a) {
         return [2 /*return*/, vorpal
@@ -85,7 +67,10 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
                                 return [3 /*break*/, 5];
                             case 3:
                                 sourcePort = 54399;
-                                return [4 /*yield*/, createProxy(sourceInstance, sourcePort)];
+                                return [4 /*yield*/, (0, startProxy_1.startCloudSqlProxyInBackground)({
+                                        instanceName: sourceInstance,
+                                        localPort: sourcePort
+                                    })];
                             case 4:
                                 sourceProxy = _a.sent();
                                 _a.label = 5;
@@ -114,7 +99,7 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
                                 return [4 /*yield*/, this.prompt({
                                         type: "input",
                                         name: "targetInstance",
-                                        message: "Targe INSTANCE (connection string or 'local')? 🤔  "
+                                        message: "Target INSTANCE (connection string or 'local')? 🤔  "
                                     })];
                             case 9:
                                 targetInstance = (_a.sent()).targetInstance;
@@ -131,7 +116,10 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
                                 return [3 /*break*/, 13];
                             case 11:
                                 targetPort = 54499;
-                                return [4 /*yield*/, createProxy(targetInstance, targetPort)];
+                                return [4 /*yield*/, (0, startProxy_1.startCloudSqlProxyInBackground)({
+                                        instanceName: targetInstance,
+                                        localPort: targetPort
+                                    })];
                             case 12:
                                 targetProxy = _a.sent();
                                 _a.label = 13;

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

@@ -37,9 +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 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) {
@@ -99,9 +99,9 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
                                     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, child_process_promise_1.spawn)("cloud_sql_proxy", ["-instances", "".concat(instanceName, "=tcp:").concat(localPort)], {
-                                            stdio: "inherit",
-                                            shell: true
+                                    return [4 /*yield*/, (0, startProxy_1.startCloudSqlProxyInCurrentShell)({
+                                            instanceName: instanceName,
+                                            localPort: localPort
                                         })];
                                 case 8:
                                     _c.sent();

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

@@ -150,6 +150,7 @@ var getAllVariablesToPrint = function (config, choice) { return __awaiter(void 0
                             case 0: return [4 /*yield*/, (0, getProjectConfig_1.getEnvVarsResolved)(null, env, componentName)];
                             case 1:
                                 subappvars = _b.sent();
+                                delete subappvars["_ALL_ENV_VAR_KEYS"];
                                 _a = [{}];
                                 return [4 /*yield*/, acc];
                             case 2: return [2 /*return*/, __assign.apply(void 0, [__assign.apply(void 0, [__assign.apply(void 0, _a.concat([(_b.sent())])), subappvars]), Object.fromEntries(Object.entries(subappvars).map(function (_a) {
@@ -387,6 +388,7 @@ var writeDotEnvFiles = function (config, choice) { return __awaiter(void 0, void
                 return [4 /*yield*/, (0, getProjectConfig_1.getEnvVarsResolved)(null, env, componentName)];
             case 4:
                 variables = _b.sent();
+                delete variables["_ALL_ENV_VAR_KEYS"];
                 componentDir = (0, utils_1.getComponentFullPath)(gitRoot, config, componentName);
                 filePath = (0, path_1.join)(componentDir, ".env");
                 variablesSanitized = (0, utils_1.sanitizeMultiLine)(variables);
@@ -553,17 +555,6 @@ var choice = process.argv[2] ? (0, parseChoice_1.parseChoice)(process.argv[2]) :
 
 "use strict";
 
-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 __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
@@ -789,25 +780,31 @@ var getGitlabVar = function (vorpal, env, componentName, variableName) { return
     });
 }); };
 exports.getGitlabVar = getGitlabVar;
-var resolveSecrets = function (vorpal, allEnvVars) { return __awaiter(void 0, void 0, void 0, function () {
+var resolveSecrets = function (vorpal, varSets) { return __awaiter(void 0, void 0, void 0, function () {
     var allVariablesInGitlab;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0: return [4 /*yield*/, (0, gitlab_1.getAllVariables)(vorpal)];
             case 1:
                 allVariablesInGitlab = _a.sent();
-                return [2 /*return*/, Object.fromEntries(Object.entries(allEnvVars).map(function (_a) {
-                        var _b, _c;
-                        var key = _a[0], value = _a[1];
-                        var containsSecret = (_c = (_b = String(value)) === null || _b === void 0 ? void 0 : _b.includes) === null || _c === void 0 ? void 0 : _c.call(_b, "$CL_");
-                        if (containsSecret) {
-                            for (var _i = 0, allVariablesInGitlab_1 = allVariablesInGitlab; _i < allVariablesInGitlab_1.length; _i++) {
-                                var variable = allVariablesInGitlab_1[_i];
-                                value = value.replace(new RegExp("\\$" + variable.key, "g"), variable.value);
+                return [2 /*return*/, Object.fromEntries(varSets.flatMap(function (set) {
+                        return Object.entries(set.envVars)
+                            .map(function (_a) {
+                            var key = _a[0], value = _a[1];
+                            var secretKey = set.secretEnvVarKeys.find(function (k) { return k.key === key; });
+                            if (secretKey) {
+                                if (secretKey.hidden) {
+                                    return null;
+                                }
+                                for (var _i = 0, allVariablesInGitlab_1 = allVariablesInGitlab; _i < allVariablesInGitlab_1.length; _i++) {
+                                    var variable = allVariablesInGitlab_1[_i];
+                                    value = value.replace(new RegExp("\\$" + variable.key, "g"), variable.value);
+                                }
+                                return [key, value];
                             }
                             return [key, value];
-                        }
-                        return [key, value];
+                        })
+                            .filter(Boolean);
                     }))];
         }
     });
@@ -828,7 +825,12 @@ var getEnvVarsResolved = function (vorpal, env, componentName) { return __awaite
                 envionment = _a.sent();
                 // in the pipeline the secrets alreadyy exists  and bash will expand them
                 // but here we need to manually load them
-                return [2 /*return*/, resolveSecrets(vorpal, envionment.envVars)];
+                return [2 /*return*/, resolveSecrets(vorpal, [
+                        {
+                            envVars: envionment.envVars,
+                            secretEnvVarKeys: envionment.secretEnvVarKeys
+                        },
+                    ])];
             case 3:
                 e_2 = _a.sent();
                 // env is disabled
@@ -851,7 +853,10 @@ var getJobOnlyEnvVarsResolved = function (vorpal, env, componentName) { return _
                 return [4 /*yield*/, (0, exports.getEnvironment)(env, componentName)];
             case 1:
                 envionment = _a.sent();
-                return [2 /*return*/, resolveSecrets(vorpal, __assign(__assign({}, envionment.jobOnlyVars.build.envVars), envionment.jobOnlyVars.deploy.envVars))];
+                return [2 /*return*/, resolveSecrets(vorpal, [
+                        envionment.jobOnlyVars.build,
+                        envionment.jobOnlyVars.deploy,
+                    ])];
             case 2:
                 e_3 = _a.sent();
                 // env is disabled
@@ -40712,7 +40717,7 @@ exports.readConfigSync = readConfigSync;
 
 exports.__esModule = true;
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "main-84b04424" || 0;
+exports.PIPELINE_IMAGE_TAG = "main-675caed2" || 0;
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
 
 /***/ }),

package/dist/bundles/cli/index.js

@@ -134,25 +134,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 exports.__esModule = true;
 var child_process_promise_1 = __nccwpck_require__(75763);
-var createProxy = function (instance, port) { return __awaiter(void 0, void 0, void 0, function () {
-    var proxy, stop;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
-            case 0:
-                proxy = (0, child_process_promise_1.spawn)("cloud_sql_proxy -instances ".concat(instance, "=tcp:").concat(port), [], { shell: "bash" });
-                // wait until it starts
-                return [4 /*yield*/, (0, child_process_promise_1.spawn)("echo -n \"Waiting for proxy\"\n      until echo > /dev/tcp/localhost/".concat(port, "; do\n        sleep 0.2\n        echo -n \".\"\n      done 2>/dev/null"), [], { shell: "bash" })];
-            case 1:
-                // wait until it starts
-                _a.sent();
-                stop = function () { return proxy.childProcess.kill(); };
-                process.on("beforeExit", stop);
-                return [2 /*return*/, {
-                        stop: stop
-                    }];
-        }
-    });
-}); };
+var startProxy_1 = __nccwpck_require__(63069);
 exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void 0, function () {
     return __generator(this, function (_a) {
         return [2 /*return*/, vorpal
@@ -182,7 +164,10 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
                                 return [3 /*break*/, 5];
                             case 3:
                                 sourcePort = 54399;
-                                return [4 /*yield*/, createProxy(sourceInstance, sourcePort)];
+                                return [4 /*yield*/, (0, startProxy_1.startCloudSqlProxyInBackground)({
+                                        instanceName: sourceInstance,
+                                        localPort: sourcePort
+                                    })];
                             case 4:
                                 sourceProxy = _a.sent();
                                 _a.label = 5;
@@ -211,7 +196,7 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
                                 return [4 /*yield*/, this.prompt({
                                         type: "input",
                                         name: "targetInstance",
-                                        message: "Targe INSTANCE (connection string or 'local')? 🤔  "
+                                        message: "Target INSTANCE (connection string or 'local')? 🤔  "
                                     })];
                             case 9:
                                 targetInstance = (_a.sent()).targetInstance;
@@ -228,7 +213,10 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
                                 return [3 /*break*/, 13];
                             case 11:
                                 targetPort = 54499;
-                                return [4 /*yield*/, createProxy(targetInstance, targetPort)];
+                                return [4 /*yield*/, (0, startProxy_1.startCloudSqlProxyInBackground)({
+                                        instanceName: targetInstance,
+                                        localPort: targetPort
+                                    })];
                             case 12:
                                 targetProxy = _a.sent();
                                 _a.label = 13;
@@ -1455,9 +1443,9 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 exports.__esModule = true;
 var pipeline_1 = __nccwpck_require__(25355);
-var child_process_promise_1 = __nccwpck_require__(75763);
 var getProjectConfig_1 = __nccwpck_require__(24146);
 var autocompletions_1 = __nccwpck_require__(41373);
+var startProxy_1 = __nccwpck_require__(63069);
 exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void 0, function () {
     var _a, _b;
     return __generator(this, function (_c) {
@@ -1517,9 +1505,9 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
                                     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, child_process_promise_1.spawn)("cloud_sql_proxy", ["-instances", "".concat(instanceName, "=tcp:").concat(localPort)], {
-                                            stdio: "inherit",
-                                            shell: true
+                                    return [4 /*yield*/, (0, startProxy_1.startCloudSqlProxyInCurrentShell)({
+                                            instanceName: instanceName,
+                                            localPort: localPort
                                         })];
                                 case 8:
                                     _c.sent();
@@ -6144,17 +6132,6 @@ exports.GRAFANA_PROXY_TARGET_PORT = 9090;
 
 "use strict";
 
-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 __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
@@ -6380,25 +6357,31 @@ var getGitlabVar = function (vorpal, env, componentName, variableName) { return
     });
 }); };
 exports.getGitlabVar = getGitlabVar;
-var resolveSecrets = function (vorpal, allEnvVars) { return __awaiter(void 0, void 0, void 0, function () {
+var resolveSecrets = function (vorpal, varSets) { return __awaiter(void 0, void 0, void 0, function () {
     var allVariablesInGitlab;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0: return [4 /*yield*/, (0, gitlab_1.getAllVariables)(vorpal)];
             case 1:
                 allVariablesInGitlab = _a.sent();
-                return [2 /*return*/, Object.fromEntries(Object.entries(allEnvVars).map(function (_a) {
-                        var _b, _c;
-                        var key = _a[0], value = _a[1];
-                        var containsSecret = (_c = (_b = String(value)) === null || _b === void 0 ? void 0 : _b.includes) === null || _c === void 0 ? void 0 : _c.call(_b, "$CL_");
-                        if (containsSecret) {
-                            for (var _i = 0, allVariablesInGitlab_1 = allVariablesInGitlab; _i < allVariablesInGitlab_1.length; _i++) {
-                                var variable = allVariablesInGitlab_1[_i];
-                                value = value.replace(new RegExp("\\$" + variable.key, "g"), variable.value);
+                return [2 /*return*/, Object.fromEntries(varSets.flatMap(function (set) {
+                        return Object.entries(set.envVars)
+                            .map(function (_a) {
+                            var key = _a[0], value = _a[1];
+                            var secretKey = set.secretEnvVarKeys.find(function (k) { return k.key === key; });
+                            if (secretKey) {
+                                if (secretKey.hidden) {
+                                    return null;
+                                }
+                                for (var _i = 0, allVariablesInGitlab_1 = allVariablesInGitlab; _i < allVariablesInGitlab_1.length; _i++) {
+                                    var variable = allVariablesInGitlab_1[_i];
+                                    value = value.replace(new RegExp("\\$" + variable.key, "g"), variable.value);
+                                }
+                                return [key, value];
                             }
                             return [key, value];
-                        }
-                        return [key, value];
+                        })
+                            .filter(Boolean);
                     }))];
         }
     });
@@ -6419,7 +6402,12 @@ var getEnvVarsResolved = function (vorpal, env, componentName) { return __awaite
                 envionment = _a.sent();
                 // in the pipeline the secrets alreadyy exists  and bash will expand them
                 // but here we need to manually load them
-                return [2 /*return*/, resolveSecrets(vorpal, envionment.envVars)];
+                return [2 /*return*/, resolveSecrets(vorpal, [
+                        {
+                            envVars: envionment.envVars,
+                            secretEnvVarKeys: envionment.secretEnvVarKeys
+                        },
+                    ])];
             case 3:
                 e_2 = _a.sent();
                 // env is disabled
@@ -6442,7 +6430,10 @@ var getJobOnlyEnvVarsResolved = function (vorpal, env, componentName) { return _
                 return [4 /*yield*/, (0, exports.getEnvironment)(env, componentName)];
             case 1:
                 envionment = _a.sent();
-                return [2 /*return*/, resolveSecrets(vorpal, __assign(__assign({}, envionment.jobOnlyVars.build.envVars), envionment.jobOnlyVars.deploy.envVars))];
+                return [2 /*return*/, resolveSecrets(vorpal, [
+                        envionment.jobOnlyVars.build,
+                        envionment.jobOnlyVars.deploy,
+                    ])];
             case 2:
                 e_3 = _a.sent();
                 // env is disabled
@@ -6681,6 +6672,134 @@ exports.openGoogleCloudRunDashboard = openGoogleCloudRunDashboard;
 
 /***/ }),
 
+/***/ 63069:
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+
+"use strict";
+
+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) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+exports.__esModule = true;
+exports.startCloudSqlProxyInBackground = exports.startCloudSqlProxyInCurrentShell = exports.ERROR_NOT_INSTALLED = void 0;
+var child_process_promise_1 = __nccwpck_require__(75763);
+var command_exists_promise_1 = __importDefault(__nccwpck_require__(80133));
+exports.ERROR_NOT_INSTALLED = "cloud-sql-proxy not installed";
+var getProxyCommandSpawnArgs = function (_a) {
+    var localPort = _a.localPort, instanceName = _a.instanceName;
+    return __awaiter(void 0, void 0, void 0, function () {
+        var commandString, _b, _c, cmd, args;
+        return __generator(this, function (_d) {
+            switch (_d.label) {
+                case 0: return [4 /*yield*/, (0, command_exists_promise_1["default"])("cloud-sql-proxy")];
+                case 1:
+                    if (!(_d.sent())) return [3 /*break*/, 2];
+                    _b = "cloud-sql-proxy --port ".concat(localPort, " ").concat(instanceName);
+                    return [3 /*break*/, 4];
+                case 2: return [4 /*yield*/, (0, command_exists_promise_1["default"])("cloud_sql_proxy" // v1
+                    )];
+                case 3:
+                    _b = (_d.sent())
+                        ? "cloud_sql_proxy -instances ".concat(instanceName, "=tcp:").concat(localPort)
+                        : null;
+                    _d.label = 4;
+                case 4:
+                    commandString = _b;
+                    if (!commandString) {
+                        throw new Error(exports.ERROR_NOT_INSTALLED);
+                    }
+                    _c = commandString.split(" "), cmd = _c[0], args = _c.slice(1);
+                    return [2 /*return*/, { cmd: cmd, args: args }];
+            }
+        });
+    });
+};
+var startCloudSqlProxyInCurrentShell = function (opts) { return __awaiter(void 0, void 0, void 0, function () {
+    var _a, cmd, args;
+    return __generator(this, function (_b) {
+        switch (_b.label) {
+            case 0: return [4 /*yield*/, getProxyCommandSpawnArgs(opts)];
+            case 1:
+                _a = _b.sent(), cmd = _a.cmd, args = _a.args;
+                return [4 /*yield*/, (0, child_process_promise_1.spawn)(cmd, args, {
+                        stdio: "inherit",
+                        shell: true
+                    })];
+            case 2:
+                _b.sent();
+                return [2 /*return*/];
+        }
+    });
+}); };
+exports.startCloudSqlProxyInCurrentShell = startCloudSqlProxyInCurrentShell;
+var startCloudSqlProxyInBackground = function (opts) { return __awaiter(void 0, void 0, void 0, function () {
+    var _a, cmd, args, proxyPromise, stop;
+    return __generator(this, function (_b) {
+        switch (_b.label) {
+            case 0: return [4 /*yield*/, getProxyCommandSpawnArgs(opts)];
+            case 1:
+                _a = _b.sent(), cmd = _a.cmd, args = _a.args;
+                proxyPromise = (0, child_process_promise_1.spawn)(cmd, args, { shell: "bash" });
+                // wait until it starts
+                return [4 /*yield*/, (0, child_process_promise_1.spawn)("echo -n \"Waiting for proxy\"\n      until echo > /dev/tcp/localhost/".concat(opts.localPort, "; do\n        sleep 0.2\n        echo -n \".\"\n      done 2>/dev/null"), [], { shell: "bash" })];
+            case 2:
+                // wait until it starts
+                _b.sent();
+                stop = function () {
+                    proxyPromise["catch"](function () {
+                        // ignore
+                    });
+                    proxyPromise.childProcess.kill();
+                };
+                // stop if catladder i stopped
+                process.on("beforeExit", stop);
+                return [2 /*return*/, {
+                        stop: stop
+                    }];
+        }
+    });
+}); };
+exports.startCloudSqlProxyInBackground = startCloudSqlProxyInBackground;
+//# sourceMappingURL=startProxy.js.map
+
+/***/ }),
+
 /***/ 4895:
 /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
 
@@ -351666,7 +351785,7 @@ exports.readConfigSync = readConfigSync;
 
 exports.__esModule = true;
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "main-84b04424" || 0;
+exports.PIPELINE_IMAGE_TAG = "main-675caed2" || 0;
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
 
 /***/ }),

package/dist/config/getProjectConfig.d.ts

@@ -16,13 +16,9 @@ export declare const getAllComponentsWithAllEnvsHierarchical: () => Promise<{
 export declare const getAllPipelineContexts: () => Promise<import("@catladder/pipeline").Context[]>;
 export declare const getEnvironment: (env: string, componentName: string) => Promise<import("@catladder/pipeline").Environment>;
 export declare const getGitlabVar: (vorpal: CommandInstance, env: string, componentName: string, variableName: string) => Promise<string>;
-export declare const getEnvVarsResolved: (vorpal: CommandInstance | null, env: string, componentName: string | null) => Promise<{
-    [k: string]: string;
-}>;
+export declare const getEnvVarsResolved: (vorpal: CommandInstance | null, env: string, componentName: string | null) => Promise<any>;
 /**
  *
  * is used to get job only vars that should also be editable locally with catladder.
  */
-export declare const getJobOnlyEnvVarsResolved: (vorpal: CommandInstance, env: string, componentName: string) => Promise<{
-    [k: string]: string;
-}>;
+export declare const getJobOnlyEnvVarsResolved: (vorpal: CommandInstance, env: string, componentName: string) => Promise<any>;