@catladder/cli 1.41.2 → 1.41.4

package/dist/apps/cli/commands/project/setup/setupCloudSQL.d.ts

@@ -0,0 +1,3 @@
+import type { Context } from "@catladder/pipeline";
+import type { CommandInstance } from "vorpal";
+export declare const setupCloudSQL: (instance: CommandInstance, context: Context) => Promise<void>;

package/dist/apps/cli/commands/project/setup/setupCloudSQL.js

@@ -0,0 +1,56 @@
+"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 };
+    }
+};
+exports.__esModule = true;
+exports.setupCloudSQL = void 0;
+var pipeline_1 = require("@catladder/pipeline");
+var setupCloudSQL = function (instance, context) { return __awaiter(void 0, void 0, void 0, function () {
+    var config;
+    return __generator(this, function (_a) {
+        if (!(0, pipeline_1.hasCloudSQL)(context)) {
+            throw new Error("cannot setup cloudsql, as it has none");
+        }
+        config = (0, pipeline_1.getCloudSQLConfig)(context);
+        instance.log("");
+        instance.log("! make sure to provide cloudsqlProxyCredentials for the cloud sql service account in " +
+            config.projectId);
+        instance.log("");
+        return [2 /*return*/];
+    });
+}); };
+exports.setupCloudSQL = setupCloudSQL;
+//# sourceMappingURL=setupCloudSQL.js.map

package/dist/apps/cli/commands/project/setup/setupCloudSQL.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"setupCloudSQL.js","sourceRoot":"","sources":["../../../../../../src/apps/cli/commands/project/setup/setupCloudSQL.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,gDAAqE;AAG9D,IAAM,aAAa,GAAG,UAC3B,QAAyB,EACzB,OAAgB;;;QAEhB,IAAI,CAAC,IAAA,sBAAW,EAAC,OAAO,CAAC,EAAE;YACzB,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC;SAC1D;QACK,MAAM,GAAG,IAAA,4BAAiB,EAAC,OAAO,CAAC,CAAC;QAC1C,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACjB,QAAQ,CAAC,GAAG,CACV,uFAAuF;YACrF,MAAM,CAAC,SAAS,CACnB,CAAC;QACF,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;;;KAClB,CAAC;AAdW,QAAA,aAAa,iBAcxB"}

package/dist/apps/cli/commands/project/setup/setupContext.js

@@ -38,6 +38,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 exports.__esModule = true;
 exports.setupContext = void 0;
 var pipeline_1 = require("@catladder/pipeline");
+var setupCloudSQL_1 = require("./setupCloudSQL");
 var setupKubernetes_1 = require("./setupKubernetes");
 var setupContext = function (instance, context) { return __awaiter(void 0, void 0, void 0, function () {
     var deployConfig;
@@ -52,13 +53,19 @@ var setupContext = function (instance, context) { return __awaiter(void 0, void
                     context.componentName +
                     "...");
                 instance.log("");
-                deployConfig = context.componentConfig.deploy;
-                if (!(0, pipeline_1.isOfDeployType)(deployConfig, "kubernetes")) return [3 /*break*/, 2];
-                return [4 /*yield*/, (0, setupKubernetes_1.setupKubernetes)(instance, context)];
+                if (!(0, pipeline_1.hasCloudSQL)(context)) return [3 /*break*/, 2];
+                return [4 /*yield*/, (0, setupCloudSQL_1.setupCloudSQL)(instance, context)];
             case 1:
                 _a.sent();
                 _a.label = 2;
             case 2:
+                deployConfig = context.componentConfig.deploy;
+                if (!(0, pipeline_1.isOfDeployType)(deployConfig, "kubernetes")) return [3 /*break*/, 4];
+                return [4 /*yield*/, (0, setupKubernetes_1.setupKubernetes)(instance, context)];
+            case 3:
+                _a.sent();
+                _a.label = 4;
+            case 4:
                 instance.log("");
                 instance.log("✅ " +
                     context.environment.shortName +

package/dist/apps/cli/commands/project/setup/setupContext.js.map

@@ -1 +1 @@
-{"version":3,"file":"setupContext.js","sourceRoot":"","sources":["../../../../../../src/apps/cli/commands/project/setup/setupContext.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,gDAAqD;AAErD,qDAAoD;AAE7C,IAAM,YAAY,GAAG,UAC1B,QAAyB,EACzB,OAAgB;;;;;gBAEhB,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;gBACjB,QAAQ,CAAC,GAAG,CACV,oFAAoF,CACrF,CAAC;gBAEF,QAAQ,CAAC,GAAG,CACV,mBAAmB;oBACjB,OAAO,CAAC,WAAW,CAAC,SAAS;oBAC7B,GAAG;oBACH,OAAO,CAAC,aAAa;oBACrB,KAAK,CACR,CAAC;gBACF,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;gBACX,YAAY,GAAG,OAAO,CAAC,eAAe,CAAC,MAAM,CAAC;qBAChD,IAAA,yBAAc,EAAC,YAAY,EAAE,YAAY,CAAC,EAA1C,wBAA0C;gBAC5C,qBAAM,IAAA,iCAAe,EAAC,QAAQ,EAAE,OAAO,CAAC,EAAA;;gBAAxC,SAAwC,CAAC;;;gBAG3C,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;gBACjB,QAAQ,CAAC,GAAG,CACV,IAAI;oBACF,OAAO,CAAC,WAAW,CAAC,SAAS;oBAC7B,GAAG;oBACH,OAAO,CAAC,aAAa;oBACrB,QAAQ,CACX,CAAC;gBAEF,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;;;;KAClB,CAAC;AAhCW,QAAA,YAAY,gBAgCvB"}
+{"version":3,"file":"setupContext.js","sourceRoot":"","sources":["../../../../../../src/apps/cli/commands/project/setup/setupContext.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,gDAAkE;AAElE,iDAAgD;AAEhD,qDAAoD;AAE7C,IAAM,YAAY,GAAG,UAC1B,QAAyB,EACzB,OAAgB;;;;;gBAEhB,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;gBACjB,QAAQ,CAAC,GAAG,CACV,oFAAoF,CACrF,CAAC;gBAEF,QAAQ,CAAC,GAAG,CACV,mBAAmB;oBACjB,OAAO,CAAC,WAAW,CAAC,SAAS;oBAC7B,GAAG;oBACH,OAAO,CAAC,aAAa;oBACrB,KAAK,CACR,CAAC;gBACF,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;qBACb,IAAA,sBAAW,EAAC,OAAO,CAAC,EAApB,wBAAoB;gBACtB,qBAAM,IAAA,6BAAa,EAAC,QAAQ,EAAE,OAAO,CAAC,EAAA;;gBAAtC,SAAsC,CAAC;;;gBAGnC,YAAY,GAAG,OAAO,CAAC,eAAe,CAAC,MAAM,CAAC;qBAChD,IAAA,yBAAc,EAAC,YAAY,EAAE,YAAY,CAAC,EAA1C,wBAA0C;gBAC5C,qBAAM,IAAA,iCAAe,EAAC,QAAQ,EAAE,OAAO,CAAC,EAAA;;gBAAxC,SAAwC,CAAC;;;gBAG3C,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;gBACjB,QAAQ,CAAC,GAAG,CACV,IAAI;oBACF,OAAO,CAAC,WAAW,CAAC,SAAS;oBAC7B,GAAG;oBACH,OAAO,CAAC,aAAa;oBACrB,QAAQ,CACX,CAAC;gBAEF,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;;;;KAClB,CAAC;AApCW,QAAA,YAAY,gBAoCvB"}

package/dist/apps/cli/verify/migration/migrateSecrets.js

@@ -63,10 +63,11 @@ var migrateSecrets = function (vorpal, newConfig, oldEnv) { return __awaiter(voi
                     var environment;
                     return __generator(this, function (_a) {
                         switch (_a.label) {
-                            case 0:
-                                environment = (0, pipeline_1.getEnvironment)(newConfig, componentName, newEnv);
-                                return [4 /*yield*/, (0, gitlab_1.upsertAllVariables)(vorpal, (0, lodash_1.pick)(secrets_1, environment.secretEnvVarKeys), newEnv, componentName)];
+                            case 0: return [4 /*yield*/, (0, pipeline_1.getEnvironment)(newConfig, componentName, newEnv)];
                             case 1:
+                                environment = _a.sent();
+                                return [4 /*yield*/, (0, gitlab_1.upsertAllVariables)(vorpal, (0, lodash_1.pick)(secrets_1, environment.secretEnvVarKeys), newEnv, componentName)];
+                            case 2:
                                 _a.sent();
                                 return [2 /*return*/];
                         }

package/dist/apps/cli/verify/migration/migrateSecrets.js.map

@@ -1 +1 @@
-{"version":3,"file":"migrateSecrets.js","sourceRoot":"","sources":["../../../../../src/apps/cli/verify/migration/migrateSecrets.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,gDAAqD;AACrD,mCAA+B;AAC/B,iCAA8B;AAE9B,mDAA8D;AAC9D,iEAAsE;AAGtE,IAAM,WAAW,GAAG,UAAC,SAAiB,EAAE,GAAW;IACjD,OAAO,UAAG,SAAS,CAAC,YAAY,cAAI,SAAS,CAAC,OAAO,cAAI,GAAG,iBAAc,CAAC;AAC7E,CAAC,CAAC;AAEK,IAAM,cAAc,GAAG,UAC5B,MAAuB,EACvB,SAAiB,EACjB,MAAkC;;;;;gBAE5B,MAAM,GAAG,MAAM,KAAK,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC;gBACnD,IAAI,GAAG,WAAW,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;;;;gBAEvB,qBAAM,IAAA,wBAAQ,EAAC,IAAI,CAAC,EAAA;;gBAAjC,UAAU,GAAG,SAAoB;gBACjC,YAAU,IAAA,cAAI,EAAC,UAAU,CAAC,CAAC;gBAEjC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,UAAO,aAAa;;;;;gCACtD,WAAW,GAAG,IAAA,yBAAc,EAAC,SAAS,EAAE,aAAa,EAAE,MAAM,CAAC,CAAC;gCACrE,qBAAM,IAAA,2BAAkB,EACtB,MAAM,EACN,IAAA,aAAI,EAAC,SAAO,EAAE,WAAW,CAAC,gBAAgB,CAAC,EAC3C,MAAM,EACN,aAAa,CACd,EAAA;;gCALD,SAKC,CAAC;;;;qBACH,CAAC,CAAC;gBACH,qBAAM,IAAA,yBAAS,EAAC,IAAI,CAAC,EAAA;;gBAArB,SAAqB,CAAC;;;;gBAEtB,OAAO,CAAC,IAAI,CAAC,6CAAsC,MAAM,gBAAM,GAAC,CAAE,CAAC,CAAC;;;;;KAEvE,CAAC;AAxBW,QAAA,cAAc,kBAwBzB"}
+{"version":3,"file":"migrateSecrets.js","sourceRoot":"","sources":["../../../../../src/apps/cli/verify/migration/migrateSecrets.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,gDAAqD;AACrD,mCAA+B;AAC/B,iCAA8B;AAE9B,mDAA8D;AAC9D,iEAAsE;AAGtE,IAAM,WAAW,GAAG,UAAC,SAAiB,EAAE,GAAW;IACjD,OAAO,UAAG,SAAS,CAAC,YAAY,cAAI,SAAS,CAAC,OAAO,cAAI,GAAG,iBAAc,CAAC;AAC7E,CAAC,CAAC;AAEK,IAAM,cAAc,GAAG,UAC5B,MAAuB,EACvB,SAAiB,EACjB,MAAkC;;;;;gBAE5B,MAAM,GAAG,MAAM,KAAK,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC;gBACnD,IAAI,GAAG,WAAW,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;;;;gBAEvB,qBAAM,IAAA,wBAAQ,EAAC,IAAI,CAAC,EAAA;;gBAAjC,UAAU,GAAG,SAAoB;gBACjC,YAAU,IAAA,cAAI,EAAC,UAAU,CAAC,CAAC;gBAEjC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,UAAO,aAAa;;;;oCACxC,qBAAM,IAAA,yBAAc,EACtC,SAAS,EACT,aAAa,EACb,MAAM,CACP,EAAA;;gCAJK,WAAW,GAAG,SAInB;gCACD,qBAAM,IAAA,2BAAkB,EACtB,MAAM,EACN,IAAA,aAAI,EAAC,SAAO,EAAE,WAAW,CAAC,gBAAgB,CAAC,EAC3C,MAAM,EACN,aAAa,CACd,EAAA;;gCALD,SAKC,CAAC;;;;qBACH,CAAC,CAAC;gBACH,qBAAM,IAAA,yBAAS,EAAC,IAAI,CAAC,EAAA;;gBAArB,SAAqB,CAAC;;;;gBAEtB,OAAO,CAAC,IAAI,CAAC,6CAAsC,MAAM,gBAAM,GAAC,CAAE,CAAC,CAAC;;;;;KAEvE,CAAC;AA5BW,QAAA,cAAc,kBA4BzB"}