@catladder/cli 1.146.1 → 1.147.0

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

@@ -53,9 +53,10 @@ exports.default = (function (vorpal) { return __awaiter(void 0, void 0, void 0,
                     .action(function (_a) {
                     return __awaiter(this, arguments, void 0, function (_b) {
                         var _c, env, componentName, context, proxyInfo, DB_PASSWORD, DB_NAME, DB_USER, instanceName, localPort;
+                        var _d, _e;
                         var envComponent = _b.envComponent;
-                        return __generator(this, function (_d) {
-                            switch (_d.label) {
+                        return __generator(this, function (_f) {
+                            switch (_f.label) {
                                 case 0:
                                     _c = (0, getProjectConfig_1.parseChoice)(envComponent), env = _c.env, componentName = _c.componentName;
                                     if (!componentName) {
@@ -64,20 +65,20 @@ exports.default = (function (vorpal) { return __awaiter(void 0, void 0, void 0,
                                     }
                                     return [4 /*yield*/, (0, getProjectConfig_1.getPipelineContextByChoice)(env, componentName)];
                                 case 1:
-                                    context = _d.sent();
+                                    context = _f.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];
+                                    if (!(0, pipeline_1.isOfDeployType)((_d = context.deploy) === null || _d === void 0 ? void 0 : _d.config, "kubernetes")) return [3 /*break*/, 3];
                                     return [4 /*yield*/, getProxyInfoForKubernetes(this, context)];
                                 case 2:
-                                    proxyInfo = _d.sent();
+                                    proxyInfo = _f.sent();
                                     return [3 /*break*/, 6];
                                 case 3:
-                                    if (!(0, pipeline_1.isOfDeployType)(context.componentConfig.deploy, "google-cloudrun")) return [3 /*break*/, 5];
+                                    if (!(0, pipeline_1.isOfDeployType)((_e = context.deploy) === null || _e === void 0 ? void 0 : _e.config, "google-cloudrun")) return [3 /*break*/, 5];
                                     return [4 /*yield*/, getProxyInfoForCloudRun(this, context)];
                                 case 4:
-                                    proxyInfo = _d.sent();
+                                    proxyInfo = _f.sent();
                                     return [3 /*break*/, 6];
                                 case 5: throw new Error("unsupported environment");
                                 case 6:
@@ -89,7 +90,7 @@ exports.default = (function (vorpal) { return __awaiter(void 0, void 0, void 0,
                                             message: "Local port: ",
                                         })];
                                 case 7:
-                                    localPort = (_d.sent()).localPort;
+                                    localPort = (_f.sent()).localPort;
                                     this.log("");
                                     this.log("postgres-PW: ".concat(DB_PASSWORD));
                                     this.log("");
@@ -104,7 +105,7 @@ exports.default = (function (vorpal) { return __awaiter(void 0, void 0, void 0,
                                             localPort: localPort,
                                         })];
                                 case 8:
-                                    _d.sent();
+                                    _f.sent();
                                     return [2 /*return*/];
                             }
                         });
@@ -115,15 +116,16 @@ exports.default = (function (vorpal) { return __awaiter(void 0, void 0, void 0,
 }); });
 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) {
+    var _a;
+    return __generator(this, function (_b) {
+        switch (_b.label) {
             case 0:
-                if (!(0, pipeline_1.isOfDeployType)(context.componentConfig.deploy, "kubernetes")) {
+                if (!(0, pipeline_1.isOfDeployType)((_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config, "kubernetes")) {
                     throw new Error("unsupported");
                 }
                 return [4 /*yield*/, (0, getProjectConfig_1.getEnvVarsResolved)(vorpal, context.environment.shortName, context.componentName)];
             case 1:
-                envVars = _a.sent();
+                envVars = _b.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.toString();
@@ -139,21 +141,22 @@ var getProxyInfoForKubernetes = function (vorpal, context) { return __awaiter(vo
 }); };
 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) {
+    var _a, _b, _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
-                if (!(0, pipeline_1.isOfDeployType)(context.componentConfig.deploy, "google-cloudrun") ||
-                    !context.componentConfig.deploy.cloudSql) {
+                if (!(0, pipeline_1.isOfDeployType)((_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config, "google-cloudrun") ||
+                    !((_b = context.deploy) === null || _b === void 0 ? void 0 : _b.config.cloudSql)) {
                     throw new Error("unsupported");
                 }
                 return [4 /*yield*/, (0, getProjectConfig_1.getEnvVarsResolved)(vorpal, context.environment.shortName, context.componentName)];
             case 1:
-                envVars = _a.sent();
+                envVars = _d.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.toString();
                 return [2 /*return*/, {
-                        instanceName: context.componentConfig.deploy.cloudSql.instanceConnectionName,
+                        instanceName: (_c = context.deploy) === null || _c === void 0 ? void 0 : _c.config.cloudSql.instanceConnectionName,
                         DB_PASSWORD: DB_PASSWORD,
                         DB_NAME: DB_NAME,
                         DB_USER: DB_USER,

package/dist/cli/src/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/cli/src/apps/cli/commands/project/commandOpenDashboard.js

@@ -54,25 +54,26 @@ exports.default = (function (vorpal) { return __awaiter(void 0, void 0, void 0,
                     .action(function (_a) {
                     return __awaiter(this, arguments, void 0, function (_b) {
                         var _c, env, componentName, context;
+                        var _d, _e;
                         var envComponent = _b.envComponent;
-                        return __generator(this, function (_d) {
-                            switch (_d.label) {
+                        return __generator(this, function (_f) {
+                            switch (_f.label) {
                                 case 0:
                                     _c = (0, getProjectConfig_1.parseChoice)(envComponent), env = _c.env, componentName = _c.componentName;
                                     return [4 /*yield*/, (0, getProjectConfig_1.getPipelineContextByChoice)(env, componentName)];
                                 case 1:
-                                    context = _d.sent();
-                                    if (!(0, pipeline_1.isOfDeployType)(context.componentConfig.deploy, "kubernetes")) return [3 /*break*/, 3];
+                                    context = _f.sent();
+                                    if (!(0, pipeline_1.isOfDeployType)((_d = context.deploy) === null || _d === void 0 ? void 0 : _d.config, "kubernetes")) return [3 /*break*/, 3];
                                     return [4 /*yield*/, (0, openKubernetesDashboards_1.openGoogleCloudKubernetesDashboard)(this, context)];
                                 case 2:
-                                    _d.sent();
-                                    _d.label = 3;
+                                    _f.sent();
+                                    _f.label = 3;
                                 case 3:
-                                    if (!(0, pipeline_1.isOfDeployType)(context.componentConfig.deploy, "google-cloudrun")) return [3 /*break*/, 5];
+                                    if (!(0, pipeline_1.isOfDeployType)((_e = context.deploy) === null || _e === void 0 ? void 0 : _e.config, "google-cloudrun")) return [3 /*break*/, 5];
                                     return [4 /*yield*/, (0, openCloudRunDashboards_1.openGoogleCloudRunDashboard)(this, context)];
                                 case 4:
-                                    _d.sent();
-                                    _d.label = 5;
+                                    _f.sent();
+                                    _f.label = 5;
                                 case 5: return [2 /*return*/];
                             }
                         });

package/dist/cli/src/apps/cli/commands/project/commandOpenDashboard.js.map

@@ -1 +1 @@
-{"version":3,"file":"commandOpenDashboard.js","sourceRoot":"","sources":["../../../../../../../src/apps/cli/commands/project/commandOpenDashboard.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAqD;AAErD,wEAG6C;AAC7C,6FAAiG;AACjG,4FAAqG;AAErG,2DAA2D;AAE3D,mBAAe,UAAO,MAAc;;;;;gBAClC,KAAA,CAAA,KAAA,MAAM;qBACH,OAAO,CACN,uCAAuC,EACvC,iDAAiD,CAClD,CAAA;qBACA,YAAY,CAAA;gBAAC,qBAAM,IAAA,kCAAgB,GAAE,EAAA;oBALxC,sBAAA,cAKgB,SAAwB,EAAC;qBACtC,MAAM,CAAC;wEAAgB,EAAgB;;4BAAd,YAAY,kBAAA;;;;oCAC9B,KAAyB,IAAA,8BAAW,EAAC,YAAY,CAAC,EAAhD,GAAG,SAAA,EAAE,aAAa,mBAAA,CAA+B;oCACzC,qBAAM,IAAA,6CAA0B,EAAC,GAAG,EAAE,aAAa,CAAC,EAAA;;oCAA9D,OAAO,GAAG,SAAoD;yCAChE,IAAA,yBAAc,EAAC,OAAO,CAAC,eAAe,CAAC,MAAM,EAAE,YAAY,CAAC,EAA5D,wBAA4D;oCAC9D,qBAAM,IAAA,6DAAkC,EAAC,IAAI,EAAE,OAAO,CAAC,EAAA;;oCAAvD,SAAuD,CAAC;;;yCAEtD,IAAA,yBAAc,EAAC,OAAO,CAAC,eAAe,CAAC,MAAM,EAAE,iBAAiB,CAAC,EAAjE,wBAAiE;oCACnE,qBAAM,IAAA,oDAA2B,EAAC,IAAI,EAAE,OAAO,CAAC,EAAA;;oCAAhD,SAAgD,CAAC;;;;;;iBAEpD,CAAC,EAAA;;;KAAA,EAAC"}
+{"version":3,"file":"commandOpenDashboard.js","sourceRoot":"","sources":["../../../../../../../src/apps/cli/commands/project/commandOpenDashboard.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAqD;AAErD,wEAG6C;AAC7C,6FAAiG;AACjG,4FAAqG;AAErG,2DAA2D;AAE3D,mBAAe,UAAO,MAAc;;;;;gBAClC,KAAA,CAAA,KAAA,MAAM;qBACH,OAAO,CACN,uCAAuC,EACvC,iDAAiD,CAClD,CAAA;qBACA,YAAY,CAAA;gBAAC,qBAAM,IAAA,kCAAgB,GAAE,EAAA;oBALxC,sBAAA,cAKgB,SAAwB,EAAC;qBACtC,MAAM,CAAC;wEAAgB,EAAgB;;;4BAAd,YAAY,kBAAA;;;;oCAC9B,KAAyB,IAAA,8BAAW,EAAC,YAAY,CAAC,EAAhD,GAAG,SAAA,EAAE,aAAa,mBAAA,CAA+B;oCACzC,qBAAM,IAAA,6CAA0B,EAAC,GAAG,EAAE,aAAa,CAAC,EAAA;;oCAA9D,OAAO,GAAG,SAAoD;yCAChE,IAAA,yBAAc,EAAC,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,EAAE,YAAY,CAAC,EAApD,wBAAoD;oCACtD,qBAAM,IAAA,6DAAkC,EAAC,IAAI,EAAE,OAAO,CAAC,EAAA;;oCAAvD,SAAuD,CAAC;;;yCAEtD,IAAA,yBAAc,EAAC,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,EAAE,iBAAiB,CAAC,EAAzD,wBAAyD;oCAC3D,qBAAM,IAAA,oDAA2B,EAAC,IAAI,EAAE,OAAO,CAAC,EAAA;;oCAAhD,SAAgD,CAAC;;;;;;iBAEpD,CAAC,EAAA;;;KAAA,EAAC"}

package/dist/cli/src/apps/cli/commands/project/commandPortForward.js

@@ -95,10 +95,11 @@ var kubePortForward = function (cmd, envComponent) { return __awaiter(void 0, vo
 }); };
 var cloudRunPortForward = function (cmd, context) { return __awaiter(void 0, void 0, void 0, function () {
     var fullName, serviceName, mr, _a, projectId, region, command;
-    return __generator(this, function (_b) {
-        switch (_b.label) {
+    var _b;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
             case 0:
-                if (!(0, pipeline_1.isOfDeployType)(context.componentConfig.deploy, "google-cloudrun")) {
+                if (!(0, pipeline_1.isOfDeployType)((_b = context.deploy) === null || _b === void 0 ? void 0 : _b.config, "google-cloudrun")) {
                     throw new Error("not cloud run");
                 }
                 fullName = context.environment.fullName;
@@ -110,18 +111,18 @@ var cloudRunPortForward = function (cmd, context) { return __awaiter(void 0, voi
                         message: "Which mr 🤔 ",
                     })];
             case 1:
-                mr = (_b.sent()).mr;
+                mr = (_c.sent()).mr;
                 // poor mans solution
                 serviceName = serviceName
                     .toString()
                     .replace("-review-", "-review-mr" + mr + "-");
-                _b.label = 2;
+                _c.label = 2;
             case 2:
-                _a = context.componentConfig.deploy, projectId = _a.projectId, region = _a.region;
+                _a = context.deploy.config, projectId = _a.projectId, region = _a.region;
                 command = "gcloud beta run services proxy ".concat(serviceName, " --project ").concat(projectId, " --region ").concat(region);
                 return [4 /*yield*/, (0, portForwards_1.startPortForwardCommand)("cloudRun/".concat(serviceName), command)];
             case 3:
-                _b.sent();
+                _c.sent();
                 (0, open_1.default)("http://localhost:8080");
                 return [2 /*return*/];
         }
@@ -140,25 +141,26 @@ exports.default = (function (vorpal) { return __awaiter(void 0, void 0, void 0,
                     .action(function (_a) {
                     return __awaiter(this, arguments, void 0, function (_b) {
                         var _c, env, componentName, context;
+                        var _d, _e;
                         var envComponent = _b.envComponent;
-                        return __generator(this, function (_d) {
-                            switch (_d.label) {
+                        return __generator(this, function (_f) {
+                            switch (_f.label) {
                                 case 0:
                                     _c = (0, parseChoice_1.parseChoice)(envComponent), env = _c.env, componentName = _c.componentName;
                                     return [4 /*yield*/, (0, getProjectConfig_1.getPipelineContextByChoice)(env, componentName)];
                                 case 1:
-                                    context = _d.sent();
-                                    if (!(0, pipeline_1.isOfDeployType)(context.componentConfig.deploy, "kubernetes")) return [3 /*break*/, 3];
+                                    context = _f.sent();
+                                    if (!(0, pipeline_1.isOfDeployType)((_d = context.deploy) === null || _d === void 0 ? void 0 : _d.config, "kubernetes")) return [3 /*break*/, 3];
                                     return [4 /*yield*/, kubePortForward(this, envComponent)];
                                 case 2:
-                                    _d.sent();
-                                    _d.label = 3;
+                                    _f.sent();
+                                    _f.label = 3;
                                 case 3:
-                                    if (!(0, pipeline_1.isOfDeployType)(context.componentConfig.deploy, "google-cloudrun")) return [3 /*break*/, 5];
+                                    if (!(0, pipeline_1.isOfDeployType)((_e = context.deploy) === null || _e === void 0 ? void 0 : _e.config, "google-cloudrun")) return [3 /*break*/, 5];
                                     return [4 /*yield*/, cloudRunPortForward(this, context)];
                                 case 4:
-                                    _d.sent();
-                                    _d.label = 5;
+                                    _f.sent();
+                                    _f.label = 5;
                                 case 5: return [2 /*return*/];
                             }
                         });

package/dist/cli/src/apps/cli/commands/project/commandPortForward.js.map

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

package/dist/cli/src/apps/cli/commands/project/setup/setupCloudRun.d.ts

@@ -1,3 +1,3 @@
-import type { Context } from "../../../../../../../pipeline/src/index.js";
+import type { ComponentContext } from "../../../../../../../pipeline/src/index.js";
 import type { CommandInstance } from "vorpal";
-export declare const setupCloudRun: (instance: CommandInstance, context: Context) => Promise<void>;
+export declare const setupCloudRun: (instance: CommandInstance, context: ComponentContext) => Promise<void>;

package/dist/cli/src/apps/cli/commands/project/setup/setupCloudRun.js

@@ -71,13 +71,14 @@ var gitlab_1 = require("../../../../../utils/gitlab");
 var setupCloudRun = function (instance, context) { return __awaiter(void 0, void 0, void 0, function () {
     var config, suffix;
     var _a;
-    return __generator(this, function (_b) {
-        switch (_b.label) {
+    var _b, _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
-                if (!(0, pipeline_1.isOfDeployType)(context.componentConfig.deploy, "google-cloudrun")) {
+                if (!(0, pipeline_1.isOfDeployType)((_b = context.deploy) === null || _b === void 0 ? void 0 : _b.config, "google-cloudrun")) {
                     throw new Error("deploy config is not of type 'google-cloudrun'");
                 }
-                config = context.componentConfig.deploy;
+                config = (_c = context.deploy) === null || _c === void 0 ? void 0 : _c.config;
                 // enable services
                 instance.log("enable required services...");
                 return [4 /*yield*/, (0, enableServices_1.enableGCloudServices)(__spreadArray([
@@ -89,11 +90,11 @@ var setupCloudRun = function (instance, context) { return __awaiter(void 0, void
                         ? ["sqladmin.googleapis.com", "sql-component.googleapis.com"]
                         : [])), false), config)];
             case 1:
-                _b.sent();
+                _d.sent();
                 instance.log("upsert artifacts registry...");
                 return [4 /*yield*/, (0, artifactsRegistry_1.upsertGcloudArtifactsRegistry)(config)];
             case 2:
-                _b.sent();
+                _d.sent();
                 instance.log("upsert deploy service account...");
                 return [4 /*yield*/, (0, serviceAccounts_1.upsertGcloudServiceAccountAndSaveSecret)(instance, context, {
                         projectId: config.projectId,
@@ -109,7 +110,7 @@ var setupCloudRun = function (instance, context) { return __awaiter(void 0, void
                         ], __read((config.cloudSql ? ["roles/cloudsql.admin"] : [])), false),
                     }, pipeline_1.GCLOUD_DEPLOY_CREDENTIALS_KEY)];
             case 3:
-                _b.sent();
+                _d.sent();
                 // gcloud run automatically gives us a hostname
                 // but the pipeline need to know it before deployment
                 // so we get this through some magic and add this as a ci/cd variable
@@ -117,14 +118,14 @@ var setupCloudRun = function (instance, context) { return __awaiter(void 0, void
                 instance.log("get service domain suffix... that might take a while initially");
                 return [4 /*yield*/, (0, getCloudRunDomainSuffix_1.getCloudRunDomainSuffix)(config)];
             case 4:
-                suffix = _b.sent();
+                suffix = _d.sent();
                 instance.log("domain suffix: " + suffix);
                 return [4 /*yield*/, (0, gitlab_1.upsertAllVariables)(instance, (_a = {},
                         _a[pipeline_1.GCLOUD_RUN_CANONICAL_HOST_SUFFIX] = suffix,
                         _a), context.environment.shortName, context.componentName, false, // backup
                     false)];
             case 5:
-                _b.sent();
+                _d.sent();
                 return [2 /*return*/];
         }
     });

package/dist/cli/src/apps/cli/commands/project/setup/setupCloudRun.js.map

@@ -1 +1 @@
-{"version":3,"file":"setupCloudRun.js","sourceRoot":"","sources":["../../../../../../../../src/apps/cli/commands/project/setup/setupCloudRun.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,gDAI6B;AAG7B,6EAAwF;AACxF,kGAAiG;AACjG,uEAA4E;AAC5E,yEAAgG;AAChG,sDAAiE;AAE1D,IAAM,aAAa,GAAG,UAC3B,QAAyB,EACzB,OAAgB;;;;;;gBAEhB,IAAI,CAAC,IAAA,yBAAc,EAAC,OAAO,CAAC,eAAe,CAAC,MAAM,EAAE,iBAAiB,CAAC,EAAE,CAAC;oBACvE,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;gBACpE,CAAC;gBAEK,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,MAAM,CAAC;gBAE9C,kBAAkB;gBAElB,QAAQ,CAAC,GAAG,CAAC,6BAA6B,CAAC,CAAC;gBAC5C,qBAAM,IAAA,qCAAoB;wBAEtB,oBAAoB;wBACpB,iCAAiC;wBACjC,+BAA+B,EAAE,sBAAsB;wBACvD,qCAAqC;8BAClC,CAAC,MAAM,CAAC,QAAQ;wBACjB,CAAC,CAAC,CAAC,yBAAyB,EAAE,8BAA8B,CAAC;wBAC7D,CAAC,CAAC,EAAE,CAAC,WAET,MAAM,CACP,EAAA;;gBAXD,SAWC,CAAC;gBACF,QAAQ,CAAC,GAAG,CAAC,8BAA8B,CAAC,CAAC;gBAC7C,qBAAM,IAAA,iDAA6B,EAAC,MAAM,CAAC,EAAA;;gBAA3C,SAA2C,CAAC;gBAE5C,QAAQ,CAAC,GAAG,CAAC,kCAAkC,CAAC,CAAC;gBACjD,qBAAM,IAAA,yDAAuC,EAC3C,QAAQ,EACR,OAAO,EACP;wBACE,SAAS,EAAE,MAAM,CAAC,SAAS;wBAC3B,WAAW,EAAE,yBAAyB;wBACtC,WAAW,EAAE,8CAA8C;wBAC3D,IAAI,EAAE,MAAM;wBACZ,yLAAyL;wBACzL,KAAK;4BACH,kCAAkC;4BAClC,iBAAiB;4BACjB,8BAA8B;4BAC9B,4BAA4B;kCACzB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,SACrD;qBACF,EACD,wCAA6B,CAC9B,EAAA;;gBAlBD,SAkBC,CAAC;gBAEF,+CAA+C;gBAC/C,qDAAqD;gBACrD,qEAAqE;gBACrE,iEAAiE;gBACjE,QAAQ,CAAC,GAAG,CACV,gEAAgE,CACjE,CAAC;gBACa,qBAAM,IAAA,iDAAuB,EAAC,MAAM,CAAC,EAAA;;gBAA9C,MAAM,GAAG,SAAqC;gBACpD,QAAQ,CAAC,GAAG,CAAC,iBAAiB,GAAG,MAAM,CAAC,CAAC;gBAEzC,qBAAM,IAAA,2BAAkB,EACtB,QAAQ;wBAEN,GAAC,2CAAgC,IAAG,MAAM;6BAE5C,OAAO,CAAC,WAAW,CAAC,SAAS,EAC7B,OAAO,CAAC,aAAa,EACrB,KAAK,EAAE,SAAS;oBAChB,KAAK,CACN,EAAA;;gBATD,SASC,CAAC;;;;KACH,CAAC;AArEW,QAAA,aAAa,iBAqExB"}
+{"version":3,"file":"setupCloudRun.js","sourceRoot":"","sources":["../../../../../../../../src/apps/cli/commands/project/setup/setupCloudRun.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,gDAI6B;AAG7B,6EAAwF;AACxF,kGAAiG;AACjG,uEAA4E;AAC5E,yEAAgG;AAChG,sDAAiE;AAE1D,IAAM,aAAa,GAAG,UAC3B,QAAyB,EACzB,OAAyB;;;;;;;gBAEzB,IAAI,CAAC,IAAA,yBAAc,EAAC,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,EAAE,iBAAiB,CAAC,EAAE,CAAC;oBAC/D,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;gBACpE,CAAC;gBAEK,MAAM,GAAG,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,CAAC;gBAEtC,kBAAkB;gBAElB,QAAQ,CAAC,GAAG,CAAC,6BAA6B,CAAC,CAAC;gBAC5C,qBAAM,IAAA,qCAAoB;wBAEtB,oBAAoB;wBACpB,iCAAiC;wBACjC,+BAA+B,EAAE,sBAAsB;wBACvD,qCAAqC;8BAClC,CAAC,MAAM,CAAC,QAAQ;wBACjB,CAAC,CAAC,CAAC,yBAAyB,EAAE,8BAA8B,CAAC;wBAC7D,CAAC,CAAC,EAAE,CAAC,WAET,MAAM,CACP,EAAA;;gBAXD,SAWC,CAAC;gBACF,QAAQ,CAAC,GAAG,CAAC,8BAA8B,CAAC,CAAC;gBAC7C,qBAAM,IAAA,iDAA6B,EAAC,MAAM,CAAC,EAAA;;gBAA3C,SAA2C,CAAC;gBAE5C,QAAQ,CAAC,GAAG,CAAC,kCAAkC,CAAC,CAAC;gBACjD,qBAAM,IAAA,yDAAuC,EAC3C,QAAQ,EACR,OAAO,EACP;wBACE,SAAS,EAAE,MAAM,CAAC,SAAS;wBAC3B,WAAW,EAAE,yBAAyB;wBACtC,WAAW,EAAE,8CAA8C;wBAC3D,IAAI,EAAE,MAAM;wBACZ,yLAAyL;wBACzL,KAAK;4BACH,kCAAkC;4BAClC,iBAAiB;4BACjB,8BAA8B;4BAC9B,4BAA4B;kCACzB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,SACrD;qBACF,EACD,wCAA6B,CAC9B,EAAA;;gBAlBD,SAkBC,CAAC;gBAEF,+CAA+C;gBAC/C,qDAAqD;gBACrD,qEAAqE;gBACrE,iEAAiE;gBACjE,QAAQ,CAAC,GAAG,CACV,gEAAgE,CACjE,CAAC;gBACa,qBAAM,IAAA,iDAAuB,EAAC,MAAM,CAAC,EAAA;;gBAA9C,MAAM,GAAG,SAAqC;gBACpD,QAAQ,CAAC,GAAG,CAAC,iBAAiB,GAAG,MAAM,CAAC,CAAC;gBAEzC,qBAAM,IAAA,2BAAkB,EACtB,QAAQ;wBAEN,GAAC,2CAAgC,IAAG,MAAM;6BAE5C,OAAO,CAAC,WAAW,CAAC,SAAS,EAC7B,OAAO,CAAC,aAAa,EACrB,KAAK,EAAE,SAAS;oBAChB,KAAK,CACN,EAAA;;gBATD,SASC,CAAC;;;;KACH,CAAC;AArEW,QAAA,aAAa,iBAqExB"}

package/dist/cli/src/apps/cli/commands/project/setup/setupContext.d.ts

@@ -1,3 +1,3 @@
-import type { Context } from "../../../../../../../pipeline/src/index.js";
+import type { ComponentContext } from "../../../../../../../pipeline/src/index.js";
 import type { CommandInstance } from "vorpal";
-export declare const setupContext: (instance: CommandInstance, context: Context) => Promise<void>;
+export declare const setupContext: (instance: CommandInstance, context: ComponentContext) => Promise<void>;

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

@@ -42,8 +42,9 @@ var setupCloudRun_1 = require("./setupCloudRun");
 var setupKubernetes_1 = require("./setupKubernetes");
 var setupContext = function (instance, context) { return __awaiter(void 0, void 0, void 0, function () {
     var deployConfig;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
+    var _a, _b;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
             case 0:
                 instance.log("");
                 instance.log("==================================================================================");
@@ -53,18 +54,18 @@ var setupContext = function (instance, context) { return __awaiter(void 0, void
                     context.componentName +
                     "...");
                 instance.log("");
-                if (!(0, pipeline_1.isOfDeployType)(context.componentConfig.deploy, "google-cloudrun")) return [3 /*break*/, 2];
+                if (!(0, pipeline_1.isOfDeployType)((_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config, "google-cloudrun")) return [3 /*break*/, 2];
                 return [4 /*yield*/, (0, setupCloudRun_1.setupCloudRun)(instance, context)];
             case 1:
-                _a.sent();
-                _a.label = 2;
+                _c.sent();
+                _c.label = 2;
             case 2:
-                deployConfig = context.componentConfig.deploy;
+                deployConfig = (_b = context.deploy) === null || _b === void 0 ? void 0 : _b.config;
                 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;
+                _c.sent();
+                _c.label = 4;
             case 4:
                 instance.log("");
                 instance.log("✅ " +

package/dist/cli/src/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,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,yBAAc,EAAC,OAAO,CAAC,eAAe,CAAC,MAAM,EAAE,iBAAiB,CAAC,EAAjE,wBAAiE;gBACnE,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"}
+{"version":3,"file":"setupContext.js","sourceRoot":"","sources":["../../../../../../../../src/apps/cli/commands/project/setup/setupContext.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,gDAAqD;AAErD,iDAAgD;AAEhD,qDAAoD;AAE7C,IAAM,YAAY,GAAG,UAC1B,QAAyB,EACzB,OAAyB;;;;;;gBAEzB,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,yBAAc,EAAC,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,EAAE,iBAAiB,CAAC,EAAzD,wBAAyD;gBAC3D,qBAAM,IAAA,6BAAa,EAAC,QAAQ,EAAE,OAAO,CAAC,EAAA;;gBAAtC,SAAsC,CAAC;;;gBAGnC,YAAY,GAAG,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,CAAC;qBACxC,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/cli/src/apps/cli/commands/project/setup/setupKubernetes.d.ts

@@ -1,3 +1,3 @@
-import type { Context } from "../../../../../../../pipeline/src/index.js";
+import type { ComponentContext } from "../../../../../../../pipeline/src/index.js";
 import type { CommandInstance } from "vorpal";
-export declare const setupKubernetes: (instance: CommandInstance, context: Context) => Promise<void>;
+export declare const setupKubernetes: (instance: CommandInstance, context: ComponentContext) => Promise<void>;

package/dist/cli/src/apps/cli/commands/project/setup/setupKubernetes.js

@@ -47,19 +47,20 @@ var gitlab_1 = require("../../../../../utils/gitlab");
 var ensureNamespace_1 = __importDefault(require("../utils/ensureNamespace"));
 var setupKubernetes = function (instance, context) { return __awaiter(void 0, void 0, void 0, function () {
     var deployConfig, projectId, deploy_tokens, fullName, namespace, serviceAccountName, KUBE_URL, e_1, secretName, KUBE_CA_PEM, KUBE_TOKEN, vars, missing;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
+    var _a;
+    return __generator(this, function (_b) {
+        switch (_b.label) {
             case 0:
-                deployConfig = context.componentConfig.deploy;
+                deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
                 if (!(0, pipeline_1.isOfDeployType)(deployConfig, "kubernetes")) {
                     throw new Error("cannot run setupKubernetes on non-kubernetes deployments");
                 }
                 return [4 /*yield*/, (0, gitlab_1.getProjectInfo)(instance)];
             case 1:
-                projectId = (_a.sent()).id;
+                projectId = (_b.sent()).id;
                 return [4 /*yield*/, (0, gitlab_1.doGitlabRequest)(instance, "projects/".concat(projectId, "/deploy_tokens"))];
             case 2:
-                deploy_tokens = _a.sent();
+                deploy_tokens = _b.sent();
                 if (!!deploy_tokens.find(function (v) { return v.name === "gitlab-deploy-token"; })) return [3 /*break*/, 4];
                 instance.log("I will setup the 'GitLab Deploy Token', so Kubernetes can pull images from this project.");
                 return [4 /*yield*/, (0, gitlab_1.doGitlabRequest)(instance, "projects/".concat(projectId, "/deploy_tokens"), {
@@ -68,19 +69,19 @@ var setupKubernetes = function (instance, context) { return __awaiter(void 0, vo
                         scopes: ["read_registry"],
                     }, "POST")];
             case 3:
-                _a.sent();
-                _a.label = 4;
+                _b.sent();
+                _b.label = 4;
             case 4:
                 fullName = (0, pipeline_1.getFullKubernetesClusterName)(deployConfig.cluster);
                 instance.log("cluster: ".concat(fullName));
                 return [4 /*yield*/, (0, cluster_1.connectToCluster)(fullName)];
             case 5:
-                _a.sent();
+                _b.sent();
                 instance.log("");
                 instance.log("ensuring namespace ...");
                 return [4 /*yield*/, (0, ensureNamespace_1.default)(context)];
             case 6:
-                namespace = _a.sent();
+                namespace = _b.sent();
                 instance.log("Namespace " + namespace + " created / updated!");
                 instance.log("");
                 //$.verbose = true;
@@ -90,43 +91,43 @@ var setupKubernetes = function (instance, context) { return __awaiter(void 0, vo
                 serviceAccountName = "cl-".concat(context.componentName, "-deploy");
                 return [4 /*yield*/, (0, child_process_promise_1.exec)("TERM=dumb kubectl cluster-info | grep -E 'Kubernetes master|Kubernetes control plane' | awk '/http/ {print $NF}'").then(function (s) { return s.stdout.trim(); })];
             case 7:
-                KUBE_URL = _a.sent();
-                _a.label = 8;
+                KUBE_URL = _b.sent();
+                _b.label = 8;
             case 8:
-                _a.trys.push([8, 12, , 13]);
+                _b.trys.push([8, 12, , 13]);
                 return [4 /*yield*/, (0, child_process_promise_1.exec)("kubectl delete serviceaccount --namespace ".concat(namespace, " ").concat(serviceAccountName))];
             case 9:
-                _a.sent();
+                _b.sent();
                 return [4 /*yield*/, (0, child_process_promise_1.exec)("kubectl delete rolebinding --namespace ".concat(namespace, " ").concat(serviceAccountName))];
             case 10:
-                _a.sent();
+                _b.sent();
                 return [4 /*yield*/, (0, child_process_promise_1.exec)("kubectl delete role --namespace ".concat(namespace, " ").concat(serviceAccountName))];
             case 11:
-                _a.sent();
+                _b.sent();
                 return [3 /*break*/, 13];
             case 12:
-                e_1 = _a.sent();
+                e_1 = _b.sent();
                 return [3 /*break*/, 13];
             case 13: return [4 /*yield*/, (0, child_process_promise_1.exec)("kubectl create serviceaccount --namespace ".concat(namespace, " ").concat(serviceAccountName))];
             case 14:
-                _a.sent();
+                _b.sent();
                 // upsert role in the ns
                 return [4 /*yield*/, (0, child_process_promise_1.exec)("cat <<EOF | kubectl apply -f -\nkind: Role\napiVersion: rbac.authorization.k8s.io/v1\nmetadata:\n  namespace: ".concat(namespace, "\n  name: ").concat(serviceAccountName, "\nrules:\n- apiGroups: [\"\", \"extensions\", \"apps\", \"networking.k8s.io\", \"batch\", \"autoscaling\", \"rbac.authorization.k8s.io\",\"snapshot.storage.k8s.io\"]\n  resources: [\"deployments\", \"replicasets\", \"statefulsets\", \"pods\", \"secrets\", \"configmaps\", \"services\", \"ingresses\", \"serviceaccounts\", \"roles\", \"rolebindings\", \"jobs\", \"cronjobs\", \"horizontalpodautoscalers\", \"persistentvolumeclaims\", \"volumesnapshots\"]\n  verbs: [\"*\"]\n---\nkind: RoleBinding\napiVersion: rbac.authorization.k8s.io/v1\nmetadata:\n  name: ").concat(serviceAccountName, "\n  namespace: ").concat(namespace, "\nsubjects:\n  - kind: ServiceAccount\n    name: ").concat(serviceAccountName, "\n    namespace:  ").concat(namespace, "\nroleRef:\n  kind: Role\n  name: ").concat(serviceAccountName, "\n  apiGroup: rbac.authorization.k8s.io\nEOF\n"))];
             case 15:
                 // upsert role in the ns
-                _a.sent();
+                _b.sent();
                 secretName = "".concat(serviceAccountName, "-secret");
                 // create token for the service account
                 return [4 /*yield*/, (0, child_process_promise_1.exec)("\nkubectl apply -f - <<EOF\napiVersion: v1\nkind: Secret\nmetadata:\n  name: ".concat(secretName, "\n  namespace: ").concat(namespace, "\n  annotations:\n    kubernetes.io/service-account.name: ").concat(serviceAccountName, "\ntype: kubernetes.io/service-account-token\nEOF\n  "))];
             case 16:
                 // create token for the service account
-                _a.sent();
+                _b.sent();
                 return [4 /*yield*/, (0, child_process_promise_1.exec)("kubectl get secret ".concat(secretName, " --namespace ").concat(namespace, " -o jsonpath=\"{['data']['ca\\.crt']}\"")).then(function (c) { return c.stdout.trim(); })];
             case 17:
-                KUBE_CA_PEM = _a.sent();
+                KUBE_CA_PEM = _b.sent();
                 return [4 /*yield*/, (0, child_process_promise_1.exec)("kubectl get secret ".concat(secretName, " --namespace ").concat(namespace, " -o jsonpath=\"{['data']['token']}\" | base64 --decode")).then(function (c) { return c.stdout.trim(); })];
             case 18:
-                KUBE_TOKEN = _a.sent();
+                KUBE_TOKEN = _b.sent();
                 vars = {
                     KUBE_TOKEN: KUBE_TOKEN,
                     KUBE_CA_PEM: KUBE_CA_PEM,
@@ -145,7 +146,7 @@ var setupKubernetes = function (instance, context) { return __awaiter(void 0, vo
                 instance.log("pusing secrets to gitlab...");
                 return [4 /*yield*/, (0, gitlab_1.upsertAllVariables)(instance, vars, context.environment.shortName, context.componentName, false)];
             case 19:
-                _a.sent();
+                _b.sent();
                 instance.log("done!");
                 return [2 /*return*/];
         }

package/dist/cli/src/apps/cli/commands/project/setup/setupKubernetes.js.map

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

package/dist/cli/src/apps/cli/commands/project/utils/ensureCluster.js

@@ -42,20 +42,21 @@ var cluster_1 = require("../../../../../utils/cluster");
 function default_1(envComponent) {
     return __awaiter(this, void 0, void 0, function () {
         var _a, env, componentName, context, cluster, connectedClusterName, shouldContinue;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
+        var _b, _c;
+        return __generator(this, function (_d) {
+            switch (_d.label) {
                 case 0:
                     _a = (0, getProjectConfig_1.parseChoice)(envComponent), env = _a.env, componentName = _a.componentName;
                     return [4 /*yield*/, (0, getProjectConfig_1.getPipelineContextByChoice)(env, componentName)];
                 case 1:
-                    context = _b.sent();
-                    if (!(0, pipeline_1.isOfDeployType)(context.componentConfig.deploy, "kubernetes")) {
+                    context = _d.sent();
+                    if (!(0, pipeline_1.isOfDeployType)((_b = context.deploy) === null || _b === void 0 ? void 0 : _b.config, "kubernetes")) {
                         throw new Error("can't ensure cluster for non-kubernetes deployments");
                     }
-                    cluster = (0, pipeline_1.getFullKubernetesClusterName)(context.componentConfig.deploy.cluster);
+                    cluster = (0, pipeline_1.getFullKubernetesClusterName)((_c = context.deploy) === null || _c === void 0 ? void 0 : _c.config.cluster);
                     return [4 /*yield*/, (0, cluster_1.getCurrentConnectedClusterName)()];
                 case 2:
-                    connectedClusterName = _b.sent();
+                    connectedClusterName = _d.sent();
                     if (!(cluster !== connectedClusterName)) return [3 /*break*/, 6];
                     this.log("you are currently connected to cluster '".concat(connectedClusterName, "'"));
                     this.log("but the project requires cluster '".concat(cluster, "'"));
@@ -66,15 +67,15 @@ function default_1(envComponent) {
                             message: "Do you want to connect to '".concat(cluster, "'?"),
                         })];
                 case 3:
-                    shouldContinue = (_b.sent()).shouldContinue;
+                    shouldContinue = (_d.sent()).shouldContinue;
                     if (!!shouldContinue) return [3 /*break*/, 4];
                     this.log("abort");
                     return [3 /*break*/, 6];
                 case 4: return [4 /*yield*/, (0, cluster_1.connectToCluster)(cluster)];
                 case 5:
-                    _b.sent();
+                    _d.sent();
                     this.log("connected to cluster '".concat(cluster, "'"));
-                    _b.label = 6;
+                    _d.label = 6;
                 case 6: return [2 /*return*/];
             }
         });

package/dist/cli/src/apps/cli/commands/project/utils/ensureCluster.js.map

@@ -1 +1 @@
-{"version":3,"file":"ensureCluster.js","sourceRoot":"","sources":["../../../../../../../../src/apps/cli/commands/project/utils/ensureCluster.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAG6B;AAC7B,2EAGgD;AAChD,wDAGsC;AACtC,mBAA+B,YAAoB;;;;;;oBAC3C,KAAyB,IAAA,8BAAW,EAAC,YAAY,CAAC,EAAhD,GAAG,SAAA,EAAE,aAAa,mBAAA,CAA+B;oBACzC,qBAAM,IAAA,6CAA0B,EAAC,GAAG,EAAE,aAAa,CAAC,EAAA;;oBAA9D,OAAO,GAAG,SAAoD;oBACpE,IAAI,CAAC,IAAA,yBAAc,EAAC,OAAO,CAAC,eAAe,CAAC,MAAM,EAAE,YAAY,CAAC,EAAE,CAAC;wBAClE,MAAM,IAAI,KAAK,CAAC,qDAAqD,CAAC,CAAC;oBACzE,CAAC;oBACK,OAAO,GAAG,IAAA,uCAA4B,EAC1C,OAAO,CAAC,eAAe,CAAC,MAAM,CAAC,OAAO,CACvC,CAAC;oBAC2B,qBAAM,IAAA,wCAA8B,GAAE,EAAA;;oBAA7D,oBAAoB,GAAG,SAAsC;yBAE/D,CAAA,OAAO,KAAK,oBAAoB,CAAA,EAAhC,wBAAgC;oBAClC,IAAI,CAAC,GAAG,CACN,kDAA2C,oBAAoB,MAAG,CACnE,CAAC;oBACF,IAAI,CAAC,GAAG,CAAC,4CAAqC,OAAO,MAAG,CAAC,CAAC;oBAC/B,qBAAM,IAAI,CAAC,MAAM,CAAC;4BAC3C,IAAI,EAAE,SAAS;4BACf,IAAI,EAAE,gBAAgB;4BACtB,OAAO,EAAE,IAAI;4BACb,OAAO,EAAE,qCAA8B,OAAO,OAAI;yBACnD,CAAC,EAAA;;oBALM,cAAc,GAAK,CAAA,SAKzB,CAAA,eALoB;yBAMlB,CAAC,cAAc,EAAf,wBAAe;oBACjB,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;;wBAElB,qBAAM,IAAA,0BAAgB,EAAC,OAAO,CAAC,EAAA;;oBAA/B,SAA+B,CAAC;oBAChC,IAAI,CAAC,GAAG,CAAC,gCAAyB,OAAO,MAAG,CAAC,CAAC;;;;;;CAGnD;AA7BD,4BA6BC"}
+{"version":3,"file":"ensureCluster.js","sourceRoot":"","sources":["../../../../../../../../src/apps/cli/commands/project/utils/ensureCluster.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAG6B;AAC7B,2EAGgD;AAChD,wDAGsC;AACtC,mBAA+B,YAAoB;;;;;;;oBAC3C,KAAyB,IAAA,8BAAW,EAAC,YAAY,CAAC,EAAhD,GAAG,SAAA,EAAE,aAAa,mBAAA,CAA+B;oBACzC,qBAAM,IAAA,6CAA0B,EAAC,GAAG,EAAE,aAAa,CAAC,EAAA;;oBAA9D,OAAO,GAAG,SAAoD;oBACpE,IAAI,CAAC,IAAA,yBAAc,EAAC,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,EAAE,YAAY,CAAC,EAAE,CAAC;wBAC1D,MAAM,IAAI,KAAK,CAAC,qDAAqD,CAAC,CAAC;oBACzE,CAAC;oBACK,OAAO,GAAG,IAAA,uCAA4B,EAAC,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,CAAC,OAAO,CAAC,CAAC;oBAChD,qBAAM,IAAA,wCAA8B,GAAE,EAAA;;oBAA7D,oBAAoB,GAAG,SAAsC;yBAE/D,CAAA,OAAO,KAAK,oBAAoB,CAAA,EAAhC,wBAAgC;oBAClC,IAAI,CAAC,GAAG,CACN,kDAA2C,oBAAoB,MAAG,CACnE,CAAC;oBACF,IAAI,CAAC,GAAG,CAAC,4CAAqC,OAAO,MAAG,CAAC,CAAC;oBAC/B,qBAAM,IAAI,CAAC,MAAM,CAAC;4BAC3C,IAAI,EAAE,SAAS;4BACf,IAAI,EAAE,gBAAgB;4BACtB,OAAO,EAAE,IAAI;4BACb,OAAO,EAAE,qCAA8B,OAAO,OAAI;yBACnD,CAAC,EAAA;;oBALM,cAAc,GAAK,CAAA,SAKzB,CAAA,eALoB;yBAMlB,CAAC,cAAc,EAAf,wBAAe;oBACjB,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;;wBAElB,qBAAM,IAAA,0BAAgB,EAAC,OAAO,CAAC,EAAA;;oBAA/B,SAA+B,CAAC;oBAChC,IAAI,CAAC,GAAG,CAAC,gCAAyB,OAAO,MAAG,CAAC,CAAC;;;;;;CAGnD;AA3BD,4BA2BC"}