@catladder/cli 1.164.0 → 1.165.1

package/dist/cli/src/gcloud/enableServices.js

@@ -1,87 +1,11 @@
 "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 __values = (this && this.__values) || function(o) {
-    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
-    if (m) return m.call(o);
-    if (o && typeof o.length === "number") return {
-        next: function () {
-            if (o && i >= o.length) o = void 0;
-            return { value: o && o[i++], done: !o };
-        }
-    };
-    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.enableGCloudServices = void 0;
-var child_process_promise_1 = require("child-process-promise");
-var enableGCloudServices = function (services, config) { return __awaiter(void 0, void 0, void 0, function () {
-    var services_1, services_1_1, service, e_1_1;
-    var e_1, _a;
-    return __generator(this, function (_b) {
-        switch (_b.label) {
-            case 0:
-                _b.trys.push([0, 5, 6, 7]);
-                services_1 = __values(services), services_1_1 = services_1.next();
-                _b.label = 1;
-            case 1:
-                if (!!services_1_1.done) return [3 /*break*/, 4];
-                service = services_1_1.value;
-                return [4 /*yield*/, (0, child_process_promise_1.exec)("gcloud services enable ".concat(service, " --project=").concat(config.projectId))];
-            case 2:
-                _b.sent();
-                _b.label = 3;
-            case 3:
-                services_1_1 = services_1.next();
-                return [3 /*break*/, 1];
-            case 4: return [3 /*break*/, 7];
-            case 5:
-                e_1_1 = _b.sent();
-                e_1 = { error: e_1_1 };
-                return [3 /*break*/, 7];
-            case 6:
-                try {
-                    if (services_1_1 && !services_1_1.done && (_a = services_1.return)) _a.call(services_1);
-                }
-                finally { if (e_1) throw e_1.error; }
-                return [7 /*endfinally*/];
-            case 7: return [2 /*return*/];
-        }
-    });
-}); };
+const child_process_promise_1 = require("child-process-promise");
+const enableGCloudServices = async (services, config) => {
+    for (const service of services) {
+        await (0, child_process_promise_1.exec)(`gcloud services enable ${service} --project=${config.projectId}`);
+    }
+};
 exports.enableGCloudServices = enableGCloudServices;
 //# sourceMappingURL=enableServices.js.map

package/dist/cli/src/gcloud/enableServices.js.map

@@ -1 +1 @@
-{"version":3,"file":"enableServices.js","sourceRoot":"","sources":["../../../../src/gcloud/enableServices.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+DAA6C;AAEtC,IAAM,oBAAoB,GAAG,UAClC,QAAkB,EAClB,MAEC;;;;;;;gBAEqB,aAAA,SAAA,QAAQ,CAAA;;;;gBAAnB,OAAO;gBAChB,qBAAM,IAAA,4BAAI,EACR,iCAA0B,OAAO,wBAAc,MAAM,CAAC,SAAS,CAAE,CAClE,EAAA;;gBAFD,SAEC,CAAC;;;;;;;;;;;;;;;;;;;KAEL,CAAC;AAXW,QAAA,oBAAoB,wBAW/B"}
+{"version":3,"file":"enableServices.js","sourceRoot":"","sources":["../../../../src/gcloud/enableServices.ts"],"names":[],"mappings":";;;AAAA,iEAA6C;AAEtC,MAAM,oBAAoB,GAAG,KAAK,EACvC,QAAkB,EAClB,MAEC,EACD,EAAE;IACF,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAC/B,MAAM,IAAA,4BAAI,EACR,0BAA0B,OAAO,cAAc,MAAM,CAAC,SAAS,EAAE,CAClE,CAAC;IACJ,CAAC;AACH,CAAC,CAAC;AAXW,QAAA,oBAAoB,wBAW/B"}

package/dist/cli/src/gcloud/openDashboard.js

@@ -1,103 +1,20 @@
 "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 __values = (this && this.__values) || function(o) {
-    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
-    if (m) return m.call(o);
-    if (o && typeof o.length === "number") return {
-        next: function () {
-            if (o && i >= o.length) o = void 0;
-            return { value: o && o[i++], done: !o };
-        }
-    };
-    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
-};
-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 __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.openGoogleCloudDashboard = void 0;
-var getGoogleAuthUserNumber_1 = require("../apps/cli/utils/getGoogleAuthUserNumber");
-var open_1 = __importDefault(require("open"));
-var openGoogleCloudDashboard = function (instance, path, params) { return __awaiter(void 0, void 0, void 0, function () {
-    var url, _a, _b, _c, key, value, googleAuthUserNumber;
-    var e_1, _d;
-    return __generator(this, function (_e) {
-        switch (_e.label) {
-            case 0:
-                url = new URL("https://console.cloud.google.com/");
-                url.pathname = path;
-                try {
-                    for (_a = __values(Object.entries(params)), _b = _a.next(); !_b.done; _b = _a.next()) {
-                        _c = __read(_b.value, 2), key = _c[0], value = _c[1];
-                        url.searchParams.set(key, value);
-                    }
-                }
-                catch (e_1_1) { e_1 = { error: e_1_1 }; }
-                finally {
-                    try {
-                        if (_b && !_b.done && (_d = _a.return)) _d.call(_a);
-                    }
-                    finally { if (e_1) throw e_1.error; }
-                }
-                return [4 /*yield*/, getGoogleAuthUserNumber_1.getGoogleAuthUserNumber.call(instance)];
-            case 1:
-                googleAuthUserNumber = _e.sent();
-                url.searchParams.set("authuser", googleAuthUserNumber);
-                (0, open_1.default)(url.toString());
-                return [2 /*return*/];
-        }
-    });
-}); };
+const getGoogleAuthUserNumber_1 = require("../apps/cli/utils/getGoogleAuthUserNumber");
+const open_1 = __importDefault(require("open"));
+const openGoogleCloudDashboard = async (instance, path, params) => {
+    const url = new URL("https://console.cloud.google.com/");
+    url.pathname = path;
+    for (const [key, value] of Object.entries(params)) {
+        url.searchParams.set(key, value);
+    }
+    const googleAuthUserNumber = await getGoogleAuthUserNumber_1.getGoogleAuthUserNumber.call(instance);
+    url.searchParams.set("authuser", googleAuthUserNumber);
+    (0, open_1.default)(url.toString());
+};
 exports.openGoogleCloudDashboard = openGoogleCloudDashboard;
 //# sourceMappingURL=openDashboard.js.map

package/dist/cli/src/gcloud/openDashboard.js.map

@@ -1 +1 @@
-{"version":3,"file":"openDashboard.js","sourceRoot":"","sources":["../../../../src/gcloud/openDashboard.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,qFAAoF;AACpF,8CAAwB;AACjB,IAAM,wBAAwB,GAAG,UACtC,QAAyB,EACzB,IAAY,EACZ,MAA8B;;;;;;gBAExB,GAAG,GAAG,IAAI,GAAG,CAAC,mCAAmC,CAAC,CAAC;gBACzD,GAAG,CAAC,QAAQ,GAAG,IAAI,CAAC;;oBACpB,KAA2B,KAAA,SAAA,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA,4CAAE,CAAC;wBAAzC,KAAA,mBAAY,EAAX,GAAG,QAAA,EAAE,KAAK,QAAA;wBACpB,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;oBACnC,CAAC;;;;;;;;;gBAE4B,qBAAM,iDAAuB,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAA;;gBAAnE,oBAAoB,GAAG,SAA4C;gBACzE,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,UAAU,EAAE,oBAAoB,CAAC,CAAC;gBAEvD,IAAA,cAAI,EAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;;;;KACtB,CAAC;AAfW,QAAA,wBAAwB,4BAenC"}
+{"version":3,"file":"openDashboard.js","sourceRoot":"","sources":["../../../../src/gcloud/openDashboard.ts"],"names":[],"mappings":";;;;;;AACA,uFAAoF;AACpF,gDAAwB;AACjB,MAAM,wBAAwB,GAAG,KAAK,EAC3C,QAAyB,EACzB,IAAY,EACZ,MAA8B,EAC9B,EAAE;IACF,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,mCAAmC,CAAC,CAAC;IACzD,GAAG,CAAC,QAAQ,GAAG,IAAI,CAAC;IACpB,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QAClD,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IACnC,CAAC;IAED,MAAM,oBAAoB,GAAG,MAAM,iDAAuB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC1E,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,UAAU,EAAE,oBAAoB,CAAC,CAAC;IAEvD,IAAA,cAAI,EAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;AACvB,CAAC,CAAC;AAfW,QAAA,wBAAwB,4BAenC"}

package/dist/cli/src/gcloud/serviceAccounts.js

@@ -1,195 +1,72 @@
 "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());
-    });
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.upsertGcloudServiceAccountAndSaveSecret = exports.accountExists = void 0;
+const child_process_promise_1 = require("child-process-promise");
+const crypto_1 = require("crypto");
+const gitlab_1 = require("../utils/gitlab");
+const accountExists = async (fullIdentifier) => {
+    try {
+        await (0, child_process_promise_1.exec)(`gcloud iam service-accounts describe ${fullIdentifier}`);
+        return true;
+    }
+    catch (_a) {
+        return false;
+    }
 };
-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 };
+exports.accountExists = accountExists;
+const upsertGcloudServiceAccount = async (context, account) => {
+    const { projectId, name, displayName, roles, description } = account;
+    // name has limit of 30
+    const namePrefix = `${name}`;
+    const nameSuffixRaw = `${context.env}-${context.name}`;
+    const nameMiddleRaw = `${context.fullConfig.customerName}-${context.fullConfig.appName}`;
+    const MAX_LENGTH = 30;
+    const NUM_SEPARATORS = 2;
+    // we want to first hash middle, then suffix
+    // if for middle we have at least 1 char left, its ok, so we don't hash nameSuffix, otherwise we need to hash that as well
+    const middleMaxLength = MAX_LENGTH - namePrefix.length - nameSuffixRaw.length - NUM_SEPARATORS;
+    let nameMiddle;
+    let nameSuffix;
+    if (middleMaxLength < 1) {
+        nameMiddle = hashIfNessecary(nameMiddleRaw, 1);
+        nameSuffix = hashIfNessecary(nameSuffixRaw, MAX_LENGTH - namePrefix.length - 1 - NUM_SEPARATORS);
+    }
+    else {
+        nameMiddle = hashIfNessecary(nameMiddleRaw, middleMaxLength);
+        nameSuffix = nameSuffixRaw;
+    }
+    const fullName = `${namePrefix}-${nameMiddle}-${nameSuffix}`;
+    const fullDisplayName = `${context.fullConfig.customerName}-${context.fullConfig.appName} ${context.env}:${context.name} | ${displayName}`;
+    const fullIdentifier = `${fullName}@${projectId}.iam.gserviceaccount.com`;
+    const existing = await (0, exports.accountExists)(fullIdentifier);
+    if (!existing) {
+        await (0, child_process_promise_1.exec)(`gcloud iam service-accounts create ${fullName} --display-name="${fullDisplayName}" --project="${projectId}"  --description="${description}"`);
     }
+    const memberName = `serviceAccount:${fullIdentifier}`;
+    for (const role of roles) {
+        await (0, child_process_promise_1.exec)(`gcloud projects add-iam-policy-binding ${projectId} --member=${memberName} --role=${role} `);
+    }
+    // create key
+    // delete first all keys
+    const keys = await (0, child_process_promise_1.exec)(`gcloud iam service-accounts keys list --iam-account=${fullIdentifier} --managed-by=user --format=json`).then((o) => JSON.parse(o.stdout));
+    for (const key of keys) {
+        await (0, child_process_promise_1.exec)(`gcloud iam service-accounts keys delete ${key.name} --quiet --iam-account=${fullIdentifier}`);
+    }
+    return await (0, child_process_promise_1.exec)(
+    // on some platforms /dev/stdout is not available without the pipe
+    `gcloud iam service-accounts keys create /dev/stdout --iam-account=${fullIdentifier} | cat`).then((o) => o.stdout);
 };
-var __values = (this && this.__values) || function(o) {
-    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
-    if (m) return m.call(o);
-    if (o && typeof o.length === "number") return {
-        next: function () {
-            if (o && i >= o.length) o = void 0;
-            return { value: o && o[i++], done: !o };
-        }
-    };
-    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
+const upsertGcloudServiceAccountAndSaveSecret = async (instance, context, account, secretName) => {
+    instance.log("upserting service account " + account.name + "...");
+    const key = await upsertGcloudServiceAccount(context, account);
+    await (0, gitlab_1.upsertAllVariables)(instance, {
+        [secretName]: key,
+    }, context.env, context.name);
+    instance.log("done!");
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.upsertGcloudServiceAccountAndSaveSecret = exports.accountExists = void 0;
-var child_process_promise_1 = require("child-process-promise");
-var crypto_1 = require("crypto");
-var gitlab_1 = require("../utils/gitlab");
-var accountExists = function (fullIdentifier) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a;
-    return __generator(this, function (_b) {
-        switch (_b.label) {
-            case 0:
-                _b.trys.push([0, 2, , 3]);
-                return [4 /*yield*/, (0, child_process_promise_1.exec)("gcloud iam service-accounts describe ".concat(fullIdentifier))];
-            case 1:
-                _b.sent();
-                return [2 /*return*/, true];
-            case 2:
-                _a = _b.sent();
-                return [2 /*return*/, false];
-            case 3: return [2 /*return*/];
-        }
-    });
-}); };
-exports.accountExists = accountExists;
-var upsertGcloudServiceAccount = function (context, account) { return __awaiter(void 0, void 0, void 0, function () {
-    var projectId, name, displayName, roles, description, namePrefix, nameSuffixRaw, nameMiddleRaw, MAX_LENGTH, NUM_SEPARATORS, middleMaxLength, nameMiddle, nameSuffix, fullName, fullDisplayName, fullIdentifier, existing, memberName, roles_1, roles_1_1, role, e_1_1, keys, keys_1, keys_1_1, key, e_2_1;
-    var e_1, _a, e_2, _b;
-    return __generator(this, function (_c) {
-        switch (_c.label) {
-            case 0:
-                projectId = account.projectId, name = account.name, displayName = account.displayName, roles = account.roles, description = account.description;
-                namePrefix = "".concat(name);
-                nameSuffixRaw = "".concat(context.env, "-").concat(context.name);
-                nameMiddleRaw = "".concat(context.fullConfig.customerName, "-").concat(context.fullConfig.appName);
-                MAX_LENGTH = 30;
-                NUM_SEPARATORS = 2;
-                middleMaxLength = MAX_LENGTH - namePrefix.length - nameSuffixRaw.length - NUM_SEPARATORS;
-                if (middleMaxLength < 1) {
-                    nameMiddle = hashIfNessecary(nameMiddleRaw, 1);
-                    nameSuffix = hashIfNessecary(nameSuffixRaw, MAX_LENGTH - namePrefix.length - 1 - NUM_SEPARATORS);
-                }
-                else {
-                    nameMiddle = hashIfNessecary(nameMiddleRaw, middleMaxLength);
-                    nameSuffix = nameSuffixRaw;
-                }
-                fullName = "".concat(namePrefix, "-").concat(nameMiddle, "-").concat(nameSuffix);
-                fullDisplayName = "".concat(context.fullConfig.customerName, "-").concat(context.fullConfig.appName, " ").concat(context.env, ":").concat(context.name, " | ").concat(displayName);
-                fullIdentifier = "".concat(fullName, "@").concat(projectId, ".iam.gserviceaccount.com");
-                return [4 /*yield*/, (0, exports.accountExists)(fullIdentifier)];
-            case 1:
-                existing = _c.sent();
-                if (!!existing) return [3 /*break*/, 3];
-                return [4 /*yield*/, (0, child_process_promise_1.exec)("gcloud iam service-accounts create ".concat(fullName, " --display-name=\"").concat(fullDisplayName, "\" --project=\"").concat(projectId, "\"  --description=\"").concat(description, "\""))];
-            case 2:
-                _c.sent();
-                _c.label = 3;
-            case 3:
-                memberName = "serviceAccount:".concat(fullIdentifier);
-                _c.label = 4;
-            case 4:
-                _c.trys.push([4, 9, 10, 11]);
-                roles_1 = __values(roles), roles_1_1 = roles_1.next();
-                _c.label = 5;
-            case 5:
-                if (!!roles_1_1.done) return [3 /*break*/, 8];
-                role = roles_1_1.value;
-                return [4 /*yield*/, (0, child_process_promise_1.exec)("gcloud projects add-iam-policy-binding ".concat(projectId, " --member=").concat(memberName, " --role=").concat(role, " "))];
-            case 6:
-                _c.sent();
-                _c.label = 7;
-            case 7:
-                roles_1_1 = roles_1.next();
-                return [3 /*break*/, 5];
-            case 8: return [3 /*break*/, 11];
-            case 9:
-                e_1_1 = _c.sent();
-                e_1 = { error: e_1_1 };
-                return [3 /*break*/, 11];
-            case 10:
-                try {
-                    if (roles_1_1 && !roles_1_1.done && (_a = roles_1.return)) _a.call(roles_1);
-                }
-                finally { if (e_1) throw e_1.error; }
-                return [7 /*endfinally*/];
-            case 11: return [4 /*yield*/, (0, child_process_promise_1.exec)("gcloud iam service-accounts keys list --iam-account=".concat(fullIdentifier, " --managed-by=user --format=json")).then(function (o) { return JSON.parse(o.stdout); })];
-            case 12:
-                keys = _c.sent();
-                _c.label = 13;
-            case 13:
-                _c.trys.push([13, 18, 19, 20]);
-                keys_1 = __values(keys), keys_1_1 = keys_1.next();
-                _c.label = 14;
-            case 14:
-                if (!!keys_1_1.done) return [3 /*break*/, 17];
-                key = keys_1_1.value;
-                return [4 /*yield*/, (0, child_process_promise_1.exec)("gcloud iam service-accounts keys delete ".concat(key.name, " --quiet --iam-account=").concat(fullIdentifier))];
-            case 15:
-                _c.sent();
-                _c.label = 16;
-            case 16:
-                keys_1_1 = keys_1.next();
-                return [3 /*break*/, 14];
-            case 17: return [3 /*break*/, 20];
-            case 18:
-                e_2_1 = _c.sent();
-                e_2 = { error: e_2_1 };
-                return [3 /*break*/, 20];
-            case 19:
-                try {
-                    if (keys_1_1 && !keys_1_1.done && (_b = keys_1.return)) _b.call(keys_1);
-                }
-                finally { if (e_2) throw e_2.error; }
-                return [7 /*endfinally*/];
-            case 20: return [4 /*yield*/, (0, child_process_promise_1.exec)(
-                // on some platforms /dev/stdout is not available without the pipe
-                "gcloud iam service-accounts keys create /dev/stdout --iam-account=".concat(fullIdentifier, " | cat")).then(function (o) { return o.stdout; })];
-            case 21: return [2 /*return*/, _c.sent()];
-        }
-    });
-}); };
-var upsertGcloudServiceAccountAndSaveSecret = function (instance, context, account, secretName) { return __awaiter(void 0, void 0, void 0, function () {
-    var key;
-    var _a;
-    return __generator(this, function (_b) {
-        switch (_b.label) {
-            case 0:
-                instance.log("upserting service account " + account.name + "...");
-                return [4 /*yield*/, upsertGcloudServiceAccount(context, account)];
-            case 1:
-                key = _b.sent();
-                return [4 /*yield*/, (0, gitlab_1.upsertAllVariables)(instance, (_a = {},
-                        _a[secretName] = key,
-                        _a), context.env, context.name)];
-            case 2:
-                _b.sent();
-                instance.log("done!");
-                return [2 /*return*/];
-        }
-    });
-}); };
 exports.upsertGcloudServiceAccountAndSaveSecret = upsertGcloudServiceAccountAndSaveSecret;
-var hashIfNessecary = function (str, maxLength) {
-    return str.length > maxLength ? hash(str, maxLength) : str;
-};
-var hash = function (str, length) {
+const hashIfNessecary = (str, maxLength) => str.length > maxLength ? hash(str, maxLength) : str;
+const hash = (str, length) => {
     return (0, crypto_1.createHmac)("sha256", str).digest("hex").substring(0, length);
 };
 //# sourceMappingURL=serviceAccounts.js.map

package/dist/cli/src/gcloud/serviceAccounts.js.map

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

package/dist/cli/src/k8sApi/index.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getk8sApiBatchBeta = exports.getk8sApiBatch = exports.getk8sApi = void 0;
-var client_node_1 = require("@kubernetes/client-node");
-var getKubeConfig = function () {
-    var kc = new client_node_1.KubeConfig();
+const client_node_1 = require("@kubernetes/client-node");
+const getKubeConfig = () => {
+    const kc = new client_node_1.KubeConfig();
     kc.loadFromDefault();
     return kc;
 };
@@ -11,18 +11,18 @@ var getKubeConfig = function () {
  * get kubernetes client. avoid reusing the instance when context get changed
  * @returns kuberenetes client
  */
-var getk8sApi = function () {
-    var kc = getKubeConfig();
+const getk8sApi = () => {
+    const kc = getKubeConfig();
     return kc.makeApiClient(client_node_1.CoreV1Api);
 };
 exports.getk8sApi = getk8sApi;
-var getk8sApiBatch = function () {
-    var kc = getKubeConfig();
+const getk8sApiBatch = () => {
+    const kc = getKubeConfig();
     return kc.makeApiClient(client_node_1.BatchV1Api);
 };
 exports.getk8sApiBatch = getk8sApiBatch;
-var getk8sApiBatchBeta = function () {
-    var kc = getKubeConfig();
+const getk8sApiBatchBeta = () => {
+    const kc = getKubeConfig();
     return kc.makeApiClient(client_node_1.BatchV1beta1Api);
 };
 exports.getk8sApiBatchBeta = getk8sApiBatchBeta;

package/dist/cli/src/k8sApi/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/k8sApi/index.ts"],"names":[],"mappings":";;;AAAA,uDAKiC;AAEjC,IAAM,aAAa,GAAG;IACpB,IAAM,EAAE,GAAG,IAAI,wBAAU,EAAE,CAAC;IAC5B,EAAE,CAAC,eAAe,EAAE,CAAC;IACrB,OAAO,EAAE,CAAC;AACZ,CAAC,CAAC;AACF;;;GAGG;AACI,IAAM,SAAS,GAAG;IACvB,IAAM,EAAE,GAAG,aAAa,EAAE,CAAC;IAE3B,OAAO,EAAE,CAAC,aAAa,CAAC,uBAAS,CAAC,CAAC;AACrC,CAAC,CAAC;AAJW,QAAA,SAAS,aAIpB;AAEK,IAAM,cAAc,GAAG;IAC5B,IAAM,EAAE,GAAG,aAAa,EAAE,CAAC;IAE3B,OAAO,EAAE,CAAC,aAAa,CAAC,wBAAU,CAAC,CAAC;AACtC,CAAC,CAAC;AAJW,QAAA,cAAc,kBAIzB;AAEK,IAAM,kBAAkB,GAAG;IAChC,IAAM,EAAE,GAAG,aAAa,EAAE,CAAC;IAE3B,OAAO,EAAE,CAAC,aAAa,CAAC,6BAAe,CAAC,CAAC;AAC3C,CAAC,CAAC;AAJW,QAAA,kBAAkB,sBAI7B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/k8sApi/index.ts"],"names":[],"mappings":";;;AAAA,yDAKiC;AAEjC,MAAM,aAAa,GAAG,GAAG,EAAE;IACzB,MAAM,EAAE,GAAG,IAAI,wBAAU,EAAE,CAAC;IAC5B,EAAE,CAAC,eAAe,EAAE,CAAC;IACrB,OAAO,EAAE,CAAC;AACZ,CAAC,CAAC;AACF;;;GAGG;AACI,MAAM,SAAS,GAAG,GAAG,EAAE;IAC5B,MAAM,EAAE,GAAG,aAAa,EAAE,CAAC;IAE3B,OAAO,EAAE,CAAC,aAAa,CAAC,uBAAS,CAAC,CAAC;AACrC,CAAC,CAAC;AAJW,QAAA,SAAS,aAIpB;AAEK,MAAM,cAAc,GAAG,GAAG,EAAE;IACjC,MAAM,EAAE,GAAG,aAAa,EAAE,CAAC;IAE3B,OAAO,EAAE,CAAC,aAAa,CAAC,wBAAU,CAAC,CAAC;AACtC,CAAC,CAAC;AAJW,QAAA,cAAc,kBAIzB;AAEK,MAAM,kBAAkB,GAAG,GAAG,EAAE;IACrC,MAAM,EAAE,GAAG,aAAa,EAAE,CAAC;IAE3B,OAAO,EAAE,CAAC,aAAa,CAAC,6BAAe,CAAC,CAAC;AAC3C,CAAC,CAAC;AAJW,QAAA,kBAAkB,sBAI7B"}