@catladder/cli 0.0.0-refactor-docker-45f6e733 → 0.0.0-refactor-cache-61f8abb0

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

@@ -1,103 +1,44 @@
 "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 (g && (g = 0, op[0] && (_ = 0)), _) 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 };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupAccessTokens = void 0;
-var open_1 = __importDefault(require("open"));
-var gitlab_1 = require("../../../../../utils/gitlab");
-var setupAccessTokens = function (instance) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, projectId, projectWebUrl, e_1, understood, GL_TOKEN;
-    return __generator(this, function (_b) {
-        switch (_b.label) {
-            case 0: return [4 /*yield*/, (0, gitlab_1.getProjectInfo)(instance)];
-            case 1:
-                _a = _b.sent(), projectId = _a.id, projectWebUrl = _a.web_url;
-                _b.label = 2;
-            case 2:
-                _b.trys.push([2, 4, , 8]);
-                return [4 /*yield*/, (0, gitlab_1.doGitlabRequest)(instance, "projects/".concat(projectId, "/variables/GL_TOKEN"))];
-            case 3:
-                _b.sent();
-                return [3 /*break*/, 8];
-            case 4:
-                e_1 = _b.sent();
-                if (e_1.message !== "not found") {
-                    throw e_1;
-                }
-                // not found
-                instance.log("I need add a GL_TOKEN to the project, so that semantic release will work\n");
-                instance.log("👉 Please please create a project access token in gitlab and copy its value into clipboard\n\n - name: something like 'semantic-release'\n - expires: leave empty\n - role: maintainer - scopes: api, read_repository");
-                instance.log("\n");
-                return [4 /*yield*/, instance.prompt({
-                        default: true,
-                        message: "Understood and open gitlab now? 🤔",
-                        name: "understood",
-                        type: "confirm",
-                    })];
-            case 5:
-                understood = (_b.sent()).understood;
-                if (!understood) {
-                    instance.log("continuing anyway...");
-                }
-                (0, open_1.default)("".concat(projectWebUrl, "/-/settings/access_tokens"));
-                instance.log("\n");
-                instance.log("Enter your copied token now: ");
-                instance.log("\n");
-                return [4 /*yield*/, instance.prompt({
-                        type: "password",
-                        name: "GL_TOKEN",
-                        message: "Access Token: ",
-                    })];
-            case 6:
-                GL_TOKEN = (_b.sent()).GL_TOKEN;
-                return [4 /*yield*/, (0, gitlab_1.doGitlabRequest)(instance, "projects/".concat(projectId, "/variables"), {
-                        key: "GL_TOKEN",
-                        value: GL_TOKEN,
-                        masked: true,
-                    }, "POST")];
-            case 7:
-                _b.sent();
-                return [3 /*break*/, 8];
-            case 8: return [2 /*return*/];
+const dayjs_1 = __importDefault(require("dayjs"));
+const gitlab_1 = require("../../../../../utils/gitlab");
+const TOKEN_NAME = "semantic-release";
+const setupAccessTokens = async (instance) => {
+    const { id: projectId } = await (0, gitlab_1.getProjectInfo)(instance);
+    const projectTokens = await (0, gitlab_1.doGitlabRequest)(instance, `projects/${projectId}/access_tokens`);
+    const token = projectTokens.find((t) => t.name === TOKEN_NAME && t.active === true);
+    const expires_at = (0, dayjs_1.default)()
+        .add(1, "year")
+        .subtract(1, "day")
+        .format("YYYY-MM-DD");
+    const newToken = token
+        ? await (0, gitlab_1.doGitlabRequest)(instance, `projects/${projectId}/access_tokens/${token.id}/rotate`, { expires_at }, "POST")
+        : await (0, gitlab_1.doGitlabRequest)(instance, `projects/${projectId}/access_tokens`, {
+            name: TOKEN_NAME,
+            scopes: ["api", "read_repository"],
+            access_level: 40, // Maintainer
+            expires_at,
+        }, "POST");
+    try {
+        await (0, gitlab_1.doGitlabRequest)(instance, `projects/${projectId}/variables/GL_TOKEN`);
+        await (0, gitlab_1.doGitlabRequest)(instance, `projects/${projectId}/variables/GL_TOKEN`, { value: newToken.token }, "PUT");
+    }
+    catch (e) {
+        if (e.message !== "not found") {
+            throw e;
         }
-    });
-}); };
+        // not found
+        await (0, gitlab_1.doGitlabRequest)(instance, `projects/${projectId}/variables`, {
+            key: "GL_TOKEN",
+            value: newToken.token,
+            masked: true,
+        }, "POST");
+    }
+    instance.log("Token configured for semantic release. Renew me again in a year!");
+};
 exports.setupAccessTokens = setupAccessTokens;
 //# sourceMappingURL=setupAccessTokens.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"setupAccessTokens.js","sourceRoot":"","sources":["../../../../../../../../src/apps/cli/commands/project/setup/setupAccessTokens.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8CAAwB;AAExB,sDAA8E;AAEvE,IAAM,iBAAiB,GAAG,UAAO,QAAyB;;;;oBAE7D,qBAAM,IAAA,uBAAc,EAAC,QAAQ,CAAC,EAAA;;gBAD1B,KACJ,SAA8B,EADpB,SAAS,QAAA,EAAW,aAAa,aAAA;;;;gBAG3C,qBAAM,IAAA,wBAAe,EAAC,QAAQ,EAAE,mBAAY,SAAS,wBAAqB,CAAC,EAAA;;gBAA3E,SAA2E,CAAC;;;;gBAE5E,IAAI,GAAC,CAAC,OAAO,KAAK,WAAW,EAAE,CAAC;oBAC9B,MAAM,GAAC,CAAC;gBACV,CAAC;gBACD,YAAY;gBAEZ,QAAQ,CAAC,GAAG,CACV,4EAA4E,CAC7E,CAAC;gBACF,QAAQ,CAAC,GAAG,CACV,uNAAuN,CACxN,CAAC;gBACF,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;gBAEI,qBAAM,QAAQ,CAAC,MAAM,CAAC;wBAC3C,OAAO,EAAE,IAAI;wBACb,OAAO,EAAE,oCAAoC;wBAC7C,IAAI,EAAE,YAAY;wBAClB,IAAI,EAAE,SAAS;qBAChB,CAAC,EAAA;;gBALM,UAAU,GAAK,CAAA,SAKrB,CAAA,WALgB;gBAMlB,IAAI,CAAC,UAAU,EAAE,CAAC;oBAChB,QAAQ,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC;gBACvC,CAAC;gBACD,IAAA,cAAI,EAAC,UAAG,aAAa,8BAA2B,CAAC,CAAC;gBAElD,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;gBAEnB,QAAQ,CAAC,GAAG,CAAC,+BAA+B,CAAC,CAAC;gBAE9C,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;gBACE,qBAAM,QAAQ,CAAC,MAAM,CAAC;wBACzC,IAAI,EAAE,UAAU;wBAChB,IAAI,EAAE,UAAU;wBAChB,OAAO,EAAE,gBAAgB;qBAC1B,CAAC,EAAA;;gBAJM,QAAQ,GAAK,CAAA,SAInB,CAAA,SAJc;gBAMhB,qBAAM,IAAA,wBAAe,EACnB,QAAQ,EACR,mBAAY,SAAS,eAAY,EACjC;wBACE,GAAG,EAAE,UAAU;wBACf,KAAK,EAAE,QAAQ;wBACf,MAAM,EAAE,IAAI;qBACb,EACD,MAAM,CACP,EAAA;;gBATD,SASC,CAAC;;;;;KAEL,CAAC;AApDW,QAAA,iBAAiB,qBAoD5B"}
+{"version":3,"file":"setupAccessTokens.js","sourceRoot":"","sources":["../../../../../../../../src/apps/cli/commands/project/setup/setupAccessTokens.ts"],"names":[],"mappings":";;;;;;AACA,kDAA0B;AAC1B,wDAA8E;AAE9E,MAAM,UAAU,GAAG,kBAAkB,CAAC;AAE/B,MAAM,iBAAiB,GAAG,KAAK,EAAE,QAAyB,EAAE,EAAE;IACnE,MAAM,EAAE,EAAE,EAAE,SAAS,EAAE,GAAG,MAAM,IAAA,uBAAc,EAAC,QAAQ,CAAC,CAAC;IAEzD,MAAM,aAAa,GAAG,MAAM,IAAA,wBAAe,EACzC,QAAQ,EACR,YAAY,SAAS,gBAAgB,CACtC,CAAC;IACF,MAAM,KAAK,GAAG,aAAa,CAAC,IAAI,CAC9B,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,UAAU,IAAI,CAAC,CAAC,MAAM,KAAK,IAAI,CAClD,CAAC;IAEF,MAAM,UAAU,GAAG,IAAA,eAAK,GAAE;SACvB,GAAG,CAAC,CAAC,EAAE,MAAM,CAAC;SACd,QAAQ,CAAC,CAAC,EAAE,KAAK,CAAC;SAClB,MAAM,CAAC,YAAY,CAAC,CAAC;IAExB,MAAM,QAAQ,GAAG,KAAK;QACpB,CAAC,CAAC,MAAM,IAAA,wBAAe,EACnB,QAAQ,EACR,YAAY,SAAS,kBAAkB,KAAK,CAAC,EAAE,SAAS,EACxD,EAAE,UAAU,EAAE,EACd,MAAM,CACP;QACH,CAAC,CAAC,MAAM,IAAA,wBAAe,EACnB,QAAQ,EACR,YAAY,SAAS,gBAAgB,EACrC;YACE,IAAI,EAAE,UAAU;YAChB,MAAM,EAAE,CAAC,KAAK,EAAE,iBAAiB,CAAC;YAClC,YAAY,EAAE,EAAE,EAAE,aAAa;YAC/B,UAAU;SACX,EACD,MAAM,CACP,CAAC;IAEN,IAAI,CAAC;QACH,MAAM,IAAA,wBAAe,EAAC,QAAQ,EAAE,YAAY,SAAS,qBAAqB,CAAC,CAAC;QAC5E,MAAM,IAAA,wBAAe,EACnB,QAAQ,EACR,YAAY,SAAS,qBAAqB,EAC1C,EAAE,KAAK,EAAE,QAAQ,CAAC,KAAK,EAAE,EACzB,KAAK,CACN,CAAC;IACJ,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,IAAI,CAAC,CAAC,OAAO,KAAK,WAAW,EAAE,CAAC;YAC9B,MAAM,CAAC,CAAC;QACV,CAAC;QACD,YAAY;QACZ,MAAM,IAAA,wBAAe,EACnB,QAAQ,EACR,YAAY,SAAS,YAAY,EACjC;YACE,GAAG,EAAE,UAAU;YACf,KAAK,EAAE,QAAQ,CAAC,KAAK;YACrB,MAAM,EAAE,IAAI;SACb,EACD,MAAM,CACP,CAAC;IACJ,CAAC;IAED,QAAQ,CAAC,GAAG,CACV,kEAAkE,CACnE,CAAC;AACJ,CAAC,CAAC;AA/DW,QAAA,iBAAiB,qBA+D5B"}

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

@@ -1,134 +1,57 @@
 "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 (g && (g = 0, op[0] && (_ = 0)), _) 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 __read = (this && this.__read) || function (o, n) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator];
-    if (!m) return o;
-    var i = m.call(o), r, ar = [], e;
-    try {
-        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
-    }
-    catch (error) { e = { error: error }; }
-    finally {
-        try {
-            if (r && !r.done && (m = i["return"])) m.call(i);
-        }
-        finally { if (e) throw e.error; }
-    }
-    return ar;
-};
-var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
-    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-        if (ar || !(i in from)) {
-            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-            ar[i] = from[i];
-        }
-    }
-    return to.concat(ar || Array.prototype.slice.call(from));
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupCloudRun = void 0;
-var pipeline_1 = require("../../../../../../../pipeline/src/index.js");
-var artifactsRegistry_1 = require("../../../../../gcloud/artifactsRegistry");
-var getCloudRunDomainSuffix_1 = require("../../../../../gcloud/cloudRun/getCloudRunDomainSuffix");
-var enableServices_1 = require("../../../../../gcloud/enableServices");
-var serviceAccounts_1 = require("../../../../../gcloud/serviceAccounts");
-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;
-    var _b, _c;
-    return __generator(this, function (_d) {
-        switch (_d.label) {
-            case 0:
-                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 = (_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([
-                        "run.googleapis.com",
-                        "artifactregistry.googleapis.com",
-                        "cloudscheduler.googleapis.com", // for scheduling jobs
-                        "cloudresourcemanager.googleapis.com"
-                    ], __read((config.cloudSql
-                        ? ["sqladmin.googleapis.com", "sql-component.googleapis.com"]
-                        : [])), false), config)];
-            case 1:
-                _d.sent();
-                instance.log("upsert artifacts registry...");
-                return [4 /*yield*/, (0, artifactsRegistry_1.upsertGcloudArtifactsRegistry)(config)];
-            case 2:
-                _d.sent();
-                instance.log("upsert deploy service account...");
-                return [4 /*yield*/, (0, serviceAccounts_1.upsertGcloudServiceAccountAndSaveSecret)(instance, context, {
-                        projectId: config.projectId,
-                        displayName: "Catladder gcloud deploy",
-                        description: "This service account deploys to google cloud",
-                        name: "cl-d",
-                        // TODO: run.admin is a bit much, would be better to follow https://stackoverflow.com/questions/55788714/deploying-to-cloud-run-with-a-custom-service-account-failed-with-iam-serviceacco
-                        roles: __spreadArray([
-                            "roles/artifactregistry.repoAdmin",
-                            "roles/run.admin",
-                            "roles/iam.serviceAccountUser",
-                            "roles/cloudscheduler.admin"
-                        ], __read((config.cloudSql ? ["roles/cloudsql.admin"] : [])), false),
-                    }, pipeline_1.GCLOUD_DEPLOY_CREDENTIALS_KEY)];
-            case 3:
-                _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
-                // the pipeline than can use this to construct the canonical host
-                instance.log("get service domain suffix... that might take a while initially");
-                return [4 /*yield*/, (0, getCloudRunDomainSuffix_1.getCloudRunDomainSuffix)(config)];
-            case 4:
-                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:
-                _d.sent();
-                return [2 /*return*/];
-        }
-    });
-}); };
+const pipeline_1 = require("../../../../../../../pipeline/src/index.js");
+const artifactsRegistry_1 = require("../../../../../gcloud/artifactsRegistry");
+const getCloudRunDomainSuffix_1 = require("../../../../../gcloud/cloudRun/getCloudRunDomainSuffix");
+const enableServices_1 = require("../../../../../gcloud/enableServices");
+const serviceAccounts_1 = require("../../../../../gcloud/serviceAccounts");
+const gitlab_1 = require("../../../../../utils/gitlab");
+const setupCloudRun = async (instance, context) => {
+    var _a, _b;
+    if (!(0, pipeline_1.isOfDeployType)((_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config, "google-cloudrun")) {
+        throw new Error("deploy config is not of type 'google-cloudrun'");
+    }
+    const config = (_b = context.deploy) === null || _b === void 0 ? void 0 : _b.config;
+    // enable services
+    instance.log("enable required services...");
+    await (0, enableServices_1.enableGCloudServices)([
+        "run.googleapis.com",
+        "artifactregistry.googleapis.com",
+        "cloudscheduler.googleapis.com", // for scheduling jobs
+        "cloudresourcemanager.googleapis.com", // only required to get google cloud project number
+        ...(config.cloudSql
+            ? ["sqladmin.googleapis.com", "sql-component.googleapis.com"]
+            : []),
+    ], config);
+    instance.log("upsert artifacts registry...");
+    await (0, artifactsRegistry_1.upsertGcloudArtifactsRegistry)(config);
+    instance.log("upsert deploy service account...");
+    await (0, serviceAccounts_1.upsertGcloudServiceAccountAndSaveSecret)(instance, context, {
+        projectId: config.projectId,
+        displayName: "Catladder gcloud deploy",
+        description: "This service account deploys to google cloud",
+        name: "cl-d",
+        // TODO: run.admin is a bit much, would be better to follow https://stackoverflow.com/questions/55788714/deploying-to-cloud-run-with-a-custom-service-account-failed-with-iam-serviceacco
+        roles: [
+            "roles/artifactregistry.repoAdmin",
+            "roles/run.admin",
+            "roles/iam.serviceAccountUser",
+            "roles/cloudscheduler.admin", // for scheduling
+            ...(config.cloudSql ? ["roles/cloudsql.admin"] : []),
+        ],
+    }, pipeline_1.GCLOUD_DEPLOY_CREDENTIALS_KEY);
+    // 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
+    // the pipeline than can use this to construct the canonical host
+    instance.log("get service domain suffix... that might take a while initially");
+    const suffix = await (0, getCloudRunDomainSuffix_1.getCloudRunDomainSuffix)(config);
+    instance.log("domain suffix: " + suffix);
+    await (0, gitlab_1.upsertAllVariables)(instance, {
+        [pipeline_1.GCLOUD_RUN_CANONICAL_HOST_SUFFIX]: suffix,
+    }, context.env, context.name, false, // backup
+    false);
+};
 exports.setupCloudRun = setupCloudRun;
 //# sourceMappingURL=setupCloudRun.js.map

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,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"}
+{"version":3,"file":"setupCloudRun.js","sourceRoot":"","sources":["../../../../../../../../src/apps/cli/commands/project/setup/setupCloudRun.ts"],"names":[],"mappings":";;;AACA,kDAI6B;AAG7B,+EAAwF;AACxF,oGAAiG;AACjG,yEAA4E;AAC5E,2EAAgG;AAChG,wDAAiE;AAE1D,MAAM,aAAa,GAAG,KAAK,EAChC,QAAyB,EACzB,OAAyB,EACzB,EAAE;;IACF,IAAI,CAAC,IAAA,yBAAc,EAAC,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,EAAE,iBAAiB,CAAC,EAAE,CAAC;QAC/D,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;IACpE,CAAC;IAED,MAAM,MAAM,GAAG,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,CAAC;IAEtC,kBAAkB;IAElB,QAAQ,CAAC,GAAG,CAAC,6BAA6B,CAAC,CAAC;IAC5C,MAAM,IAAA,qCAAoB,EACxB;QACE,oBAAoB;QACpB,iCAAiC;QACjC,+BAA+B,EAAE,sBAAsB;QACvD,qCAAqC,EAAE,mDAAmD;QAC1F,GAAG,CAAC,MAAM,CAAC,QAAQ;YACjB,CAAC,CAAC,CAAC,yBAAyB,EAAE,8BAA8B,CAAC;YAC7D,CAAC,CAAC,EAAE,CAAC;KACR,EACD,MAAM,CACP,CAAC;IACF,QAAQ,CAAC,GAAG,CAAC,8BAA8B,CAAC,CAAC;IAC7C,MAAM,IAAA,iDAA6B,EAAC,MAAM,CAAC,CAAC;IAE5C,QAAQ,CAAC,GAAG,CAAC,kCAAkC,CAAC,CAAC;IACjD,MAAM,IAAA,yDAAuC,EAC3C,QAAQ,EACR,OAAO,EACP;QACE,SAAS,EAAE,MAAM,CAAC,SAAS;QAC3B,WAAW,EAAE,yBAAyB;QACtC,WAAW,EAAE,8CAA8C;QAC3D,IAAI,EAAE,MAAM;QACZ,yLAAyL;QACzL,KAAK,EAAE;YACL,kCAAkC;YAClC,iBAAiB;YACjB,8BAA8B;YAC9B,4BAA4B,EAAE,iBAAiB;YAC/C,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;SACrD;KACF,EACD,wCAA6B,CAC9B,CAAC;IAEF,+CAA+C;IAC/C,qDAAqD;IACrD,qEAAqE;IACrE,iEAAiE;IACjE,QAAQ,CAAC,GAAG,CACV,gEAAgE,CACjE,CAAC;IACF,MAAM,MAAM,GAAG,MAAM,IAAA,iDAAuB,EAAC,MAAM,CAAC,CAAC;IACrD,QAAQ,CAAC,GAAG,CAAC,iBAAiB,GAAG,MAAM,CAAC,CAAC;IAEzC,MAAM,IAAA,2BAAkB,EACtB,QAAQ,EACR;QACE,CAAC,2CAAgC,CAAC,EAAE,MAAM;KAC3C,EACD,OAAO,CAAC,GAAG,EACX,OAAO,CAAC,IAAI,EACZ,KAAK,EAAE,SAAS;IAChB,KAAK,CACN,CAAC;AACJ,CAAC,CAAC;AArEW,QAAA,aAAa,iBAqExB"}

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

@@ -1,82 +1,25 @@
 "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 (g && (g = 0, op[0] && (_ = 0)), _) 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 };
-    }
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupContext = void 0;
-var pipeline_1 = require("../../../../../../../pipeline/src/index.js");
-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;
+const pipeline_1 = require("../../../../../../../pipeline/src/index.js");
+const setupCloudRun_1 = require("./setupCloudRun");
+const setupKubernetes_1 = require("./setupKubernetes");
+const setupContext = async (instance, context) => {
     var _a, _b;
-    return __generator(this, function (_c) {
-        switch (_c.label) {
-            case 0:
-                instance.log("");
-                instance.log("==================================================================================");
-                instance.log("🐱 🔧 setting up " +
-                    context.environment.shortName +
-                    ":" +
-                    context.componentName +
-                    "...");
-                instance.log("");
-                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:
-                _c.sent();
-                _c.label = 2;
-            case 2:
-                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:
-                _c.sent();
-                _c.label = 4;
-            case 4:
-                instance.log("");
-                instance.log("✅ " +
-                    context.environment.shortName +
-                    ":" +
-                    context.componentName +
-                    " done!");
-                instance.log("");
-                return [2 /*return*/];
-        }
-    });
-}); };
+    instance.log("");
+    instance.log("==================================================================================");
+    instance.log("🐱 🔧 setting up " + context.env + ":" + context.name + "...");
+    instance.log("");
+    if ((0, pipeline_1.isOfDeployType)((_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config, "google-cloudrun")) {
+        await (0, setupCloudRun_1.setupCloudRun)(instance, context);
+    }
+    const deployConfig = (_b = context.deploy) === null || _b === void 0 ? void 0 : _b.config;
+    if ((0, pipeline_1.isOfDeployType)(deployConfig, "kubernetes")) {
+        await (0, setupKubernetes_1.setupKubernetes)(instance, context);
+    }
+    instance.log("");
+    instance.log("✅ " + context.env + ":" + context.name + " done!");
+    instance.log("");
+};
 exports.setupContext = setupContext;
 //# sourceMappingURL=setupContext.js.map

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,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"}
+{"version":3,"file":"setupContext.js","sourceRoot":"","sources":["../../../../../../../../src/apps/cli/commands/project/setup/setupContext.ts"],"names":[],"mappings":";;;AACA,kDAAqD;AAErD,mDAAgD;AAEhD,uDAAoD;AAE7C,MAAM,YAAY,GAAG,KAAK,EAC/B,QAAyB,EACzB,OAAyB,EACzB,EAAE;;IACF,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IACjB,QAAQ,CAAC,GAAG,CACV,oFAAoF,CACrF,CAAC;IAEF,QAAQ,CAAC,GAAG,CAAC,mBAAmB,GAAG,OAAO,CAAC,GAAG,GAAG,GAAG,GAAG,OAAO,CAAC,IAAI,GAAG,KAAK,CAAC,CAAC;IAC7E,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IACjB,IAAI,IAAA,yBAAc,EAAC,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,EAAE,iBAAiB,CAAC,EAAE,CAAC;QAC9D,MAAM,IAAA,6BAAa,EAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IACzC,CAAC;IAED,MAAM,YAAY,GAAG,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,CAAC;IAC5C,IAAI,IAAA,yBAAc,EAAC,YAAY,EAAE,YAAY,CAAC,EAAE,CAAC;QAC/C,MAAM,IAAA,iCAAe,EAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC3C,CAAC;IAED,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IACjB,QAAQ,CAAC,GAAG,CAAC,IAAI,GAAG,OAAO,CAAC,GAAG,GAAG,GAAG,GAAG,OAAO,CAAC,IAAI,GAAG,QAAQ,CAAC,CAAC;IAEjE,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;AACnB,CAAC,CAAC;AAxBW,QAAA,YAAY,gBAwBvB"}