@catladder/cli 1.105.1 → 1.106.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>;

package/dist/config/getProjectConfig.js

@@ -1,15 +1,4 @@
 "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]; } });
@@ -235,25 +224,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);
                     }))];
         }
     });
@@ -274,7 +269,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
@@ -297,7 +297,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

package/dist/config/getProjectConfig.js.map

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

package/dist/gcloud/cloudSql/startProxy.d.ts

@@ -0,0 +1,10 @@
+export declare const ERROR_NOT_INSTALLED = "cloud-sql-proxy not installed";
+export declare type CloudSqlBackgroundProxy = {
+    stop: () => void;
+};
+export declare type CloudSqlProxyOptions = {
+    instanceName: string;
+    localPort: number;
+};
+export declare const startCloudSqlProxyInCurrentShell: (opts: CloudSqlProxyOptions) => Promise<void>;
+export declare const startCloudSqlProxyInBackground: (opts: CloudSqlProxyOptions) => Promise<CloudSqlBackgroundProxy>;

package/dist/gcloud/cloudSql/startProxy.js

@@ -0,0 +1,121 @@
+"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 = require("child-process-promise");
+var command_exists_promise_1 = __importDefault(require("command-exists-promise"));
+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

package/dist/gcloud/cloudSql/startProxy.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"startProxy.js","sourceRoot":"","sources":["../../../src/gcloud/cloudSql/startProxy.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+DAA8C;AAC9C,kFAAmD;AAEtC,QAAA,mBAAmB,GAAG,+BAA+B,CAAC;AAWnE,IAAM,wBAAwB,GAAG,UAAO,EAGjB;QAFrB,SAAS,eAAA,EACT,YAAY,kBAAA;;;;;wBAEW,qBAAM,IAAA,mCAAa,EAAC,iBAAiB,CAAC,EAAA;;yBAAvC,CAAC,SAAsC,CAAC,EAAxC,wBAAwC;oBAC1D,KAAA,iCAA0B,SAAS,cAAI,YAAY,CAAE,CAAA;;wBACpD,qBAAM,IAAA,mCAAa,EAClB,iBAAiB,CAAC,KAAK;qBACxB,EAAA;;oBAFD,KAAA,CAAC,SAEA,CAAC;wBACJ,CAAC,CAAC,qCAA8B,YAAY,kBAAQ,SAAS,CAAE;wBAC/D,CAAC,CAAC,IAAI,CAAA;;;oBANF,aAAa,KAMX;oBACR,IAAI,CAAC,aAAa,EAAE;wBAClB,MAAM,IAAI,KAAK,CAAC,2BAAmB,CAAC,CAAC;qBACtC;oBAEK,KAAiB,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,EAAxC,GAAG,QAAA,EAAK,IAAI,cAAA,CAA6B;oBAChD,sBAAO,EAAE,GAAG,KAAA,EAAE,IAAI,MAAA,EAAE,EAAC;;;;CACtB,CAAC;AAEK,IAAM,gCAAgC,GAAG,UAC9C,IAA0B;;;;oBAEJ,qBAAM,wBAAwB,CAAC,IAAI,CAAC,EAAA;;gBAApD,KAAgB,SAAoC,EAAlD,GAAG,SAAA,EAAE,IAAI,UAAA;gBAEjB,qBAAM,IAAA,6BAAK,EAAC,GAAG,EAAE,IAAI,EAAE;wBACrB,KAAK,EAAE,SAAS;wBAChB,KAAK,EAAE,IAAI;qBACZ,CAAC,EAAA;;gBAHF,SAGE,CAAC;;;;KACJ,CAAC;AATW,QAAA,gCAAgC,oCAS3C;AAEK,IAAM,8BAA8B,GAAG,UAC5C,IAA0B;;;;oBAEJ,qBAAM,wBAAwB,CAAC,IAAI,CAAC,EAAA;;gBAApD,KAAgB,SAAoC,EAAlD,GAAG,SAAA,EAAE,IAAI,UAAA;gBAEX,YAAY,GAAG,IAAA,6BAAK,EAAC,GAAG,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;gBAEzD,uBAAuB;gBACvB,qBAAM,IAAA,6BAAK,EACT,+EACoC,IAAI,CAAC,SAAS,2EAG/B,EACnB,EAAE,EACF,EAAE,KAAK,EAAE,MAAM,EAAE,CAClB,EAAA;;gBATD,uBAAuB;gBACvB,SAQC,CAAC;gBACI,IAAI,GAAG;oBACX,YAAY,CAAC,OAAK,CAAA,CAAC;wBACjB,SAAS;oBACX,CAAC,CAAC,CAAC;oBACH,YAAY,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC;gBACnC,CAAC,CAAC;gBACF,8BAA8B;gBAC9B,OAAO,CAAC,EAAE,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;gBAE/B,sBAAO;wBACL,IAAI,MAAA;qBACL,EAAC;;;KACH,CAAC;AA7BW,QAAA,8BAA8B,kCA6BzC"}