@catladder/cli 0.0.0-refactor-gcloud-api-d53966a5 → 0.0.0-refactor-gcloud-api-ee7f86ef

package/dist/bundles/catenv/index.js

@@ -40074,7 +40074,7 @@ exports.readConfigSync = readConfigSync;
 
 exports.__esModule = true;
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "refactor-gcloud-api-d53966a5" || 0;
+exports.PIPELINE_IMAGE_TAG = "refactor-gcloud-api-ee7f86ef" || 0;
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
 
 /***/ }),

package/dist/bundles/cli/index.js

@@ -6483,7 +6483,7 @@ var getCloudRunDomainSuffix = function (config) { return __awaiter(void 0, void
                 return [4 /*yield*/, runClient.listServices({ parent: parent, pageSize: 1 }, { autoPaginate: false })];
             case 1:
                 existingService = (_a.sent())[0];
-                if (existingService) {
+                if (existingService.length > 0) {
                     return [2 /*return*/, getSuffixFromService(existingService)];
                 }
                 return [4 /*yield*/, runClient.createService({
@@ -6632,25 +6632,35 @@ exports.__esModule = true;
 exports.enableGCloudServices = void 0;
 var googleapis_1 = __nccwpck_require__(71581);
 var enableGCloudServices = function (services, config) { return __awaiter(void 0, void 0, void 0, function () {
-    var _i, services_1, service;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
+    var gcloudAuth, _a, _b, _i, services_1, service;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
-                _i = 0, services_1 = services;
-                _a.label = 1;
+                gcloudAuth = new googleapis_1.google.auth.GoogleAuth({
+                    scopes: ['https://www.googleapis.com/auth/cloud-platform'],
+                    projectId: config.projectId
+                });
+                _b = (_a = googleapis_1.google).options;
+                _c = {};
+                return [4 /*yield*/, gcloudAuth.getClient()];
             case 1:
-                if (!(_i < services_1.length)) return [3 /*break*/, 4];
+                _b.apply(_a, [(_c.auth = _d.sent(), _c)]);
+                _i = 0, services_1 = services;
+                _d.label = 2;
+            case 2:
+                if (!(_i < services_1.length)) return [3 /*break*/, 5];
                 service = services_1[_i];
                 return [4 /*yield*/, googleapis_1.google.serviceusage({ version: 'v1' }).services.enable({
                         name: "projects/".concat(config.projectId, "/services/").concat(service)
                     })];
-            case 2:
-                _a.sent();
-                _a.label = 3;
             case 3:
+                _d.sent();
+                _d.label = 4;
+            case 4:
                 _i++;
-                return [3 /*break*/, 1];
-            case 4: return [2 /*return*/];
+                return [3 /*break*/, 2];
+            case 5: return [2 /*return*/];
         }
     });
 }); };
@@ -6784,6 +6794,15 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
+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));
+};
 exports.__esModule = true;
 exports.upsertGcloudServiceAccountAndSaveSecret = exports.accountExists = void 0;
 var googleapis_1 = __nccwpck_require__(71581);
@@ -6809,10 +6828,11 @@ var accountExists = function (client, projectId, fullPath) { return __awaiter(vo
 }); };
 exports.accountExists = accountExists;
 var upsertGcloudServiceAccount = function (context, account) { return __awaiter(void 0, void 0, void 0, function () {
-    var projectId, name, displayName, roles, description, namePrefix, nameSuffix, nameMiddleLength, nameMiddle, middle, fullName, fullDisplayName, fullIdentifier, fullPath, gcloudIamClient, gcloudProjectsClient, gcloudAuth, _a, _b, existing, memberName, projectIamPolicy, currentBindings, bindings, keylist, _i, _c, key_1, key;
-    var _d;
-    return __generator(this, function (_e) {
-        switch (_e.label) {
+    var projectId, name, displayName, roles, description, namePrefix, nameSuffix, nameMiddleLength, nameMiddle, middle, fullName, fullDisplayName, fullIdentifier, fullPath, gcloudIamClient, gcloudProjectsClient, gcloudAuth, _a, _b, existing, memberName, projectIamPolicy, currentBindings, bindings, keylist, key;
+    var _c;
+    var _d, _e;
+    return __generator(this, function (_f) {
+        switch (_f.label) {
             case 0:
                 projectId = account.projectId, name = account.name, displayName = account.displayName, roles = account.roles, description = account.description;
                 namePrefix = "".concat(name, "-");
@@ -6831,13 +6851,13 @@ var upsertGcloudServiceAccount = function (context, account) { return __awaiter(
                     projectId: projectId
                 });
                 _b = (_a = googleapis_1.google).options;
-                _d = {};
+                _c = {};
                 return [4 /*yield*/, gcloudAuth.getClient()];
             case 1:
-                _b.apply(_a, [(_d.auth = _e.sent(), _d)]);
+                _b.apply(_a, [(_c.auth = _f.sent(), _c)]);
                 return [4 /*yield*/, (0, exports.accountExists)(gcloudIamClient, projectId, fullPath)];
             case 2:
-                existing = _e.sent();
+                existing = _f.sent();
                 if (!!existing) return [3 /*break*/, 4];
                 return [4 /*yield*/, gcloudIamClient.projects.serviceAccounts.create({
                         name: gcloudProjectsClient.projectPath(projectId),
@@ -6850,23 +6870,23 @@ var upsertGcloudServiceAccount = function (context, account) { return __awaiter(
                         }
                     })];
             case 3:
-                _e.sent();
-                _e.label = 4;
+                _f.sent();
+                _f.label = 4;
             case 4:
                 memberName = "serviceAccount:".concat(fullIdentifier);
                 return [4 /*yield*/, gcloudProjectsClient.getIamPolicy({ resource: gcloudProjectsClient.projectPath(projectId) })];
             case 5:
-                projectIamPolicy = (_e.sent())[0];
+                projectIamPolicy = (_f.sent())[0];
                 currentBindings = projectIamPolicy.bindings;
                 bindings = currentBindings.map(function (binding) {
-                    var _a;
-                    return ((_a = roles.includes(binding.role)) !== null && _a !== void 0 ? _a : !binding.members.includes(memberName))
-                        ? __assign(__assign({}, binding), { members: binding.members.concat([memberName]) }) : binding;
+                    return (roles.includes(binding.role) && !binding.members.includes(memberName))
+                        ? __assign(__assign({}, binding), { members: __spreadArray(__spreadArray([], binding.members, true), [memberName], false) }) : binding;
                 }).concat(roles.filter(function (r) { return !currentBindings.map(function (b) { return b.role; }).includes(r); }).map(function (newRole) { return ({
                     role: newRole,
                     members: [memberName]
                 }); }));
                 return [4 /*yield*/, gcloudProjectsClient.setIamPolicy({
+                        resource: gcloudProjectsClient.projectPath(projectId),
                         policy: {
                             bindings: bindings,
                             etag: projectIamPolicy.etag
@@ -6876,29 +6896,23 @@ var upsertGcloudServiceAccount = function (context, account) { return __awaiter(
                     // delete first all keys
                 ];
             case 6:
-                _e.sent();
+                _f.sent();
                 return [4 /*yield*/, gcloudIamClient.projects.serviceAccounts.keys.list({
                         name: fullPath,
                         keyTypes: ['USER_MANAGED']
                     })];
             case 7:
-                keylist = _e.sent();
-                _i = 0, _c = keylist.data.keys;
-                _e.label = 8;
+                keylist = _f.sent();
+                (_e = (_d = keylist.data) === null || _d === void 0 ? void 0 : _d.keys) === null || _e === void 0 ? void 0 : _e.map(function (key) { return __awaiter(void 0, void 0, void 0, function () { return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0: return [4 /*yield*/, gcloudIamClient.projects.serviceAccounts.keys["delete"]({ name: key.name })];
+                        case 1: return [2 /*return*/, _a.sent()];
+                    }
+                }); }); });
+                return [4 /*yield*/, gcloudIamClient.projects.serviceAccounts.keys.create({ name: fullPath })];
             case 8:
-                if (!(_i < _c.length)) return [3 /*break*/, 11];
-                key_1 = _c[_i];
-                return [4 /*yield*/, gcloudIamClient.projects.serviceAccounts.keys["delete"]({ name: key_1.name })];
-            case 9:
-                _e.sent();
-                _e.label = 10;
-            case 10:
-                _i++;
-                return [3 /*break*/, 8];
-            case 11: return [4 /*yield*/, gcloudIamClient.projects.serviceAccounts.keys.create({ name: fullPath })];
-            case 12:
-                key = _e.sent();
-                return [2 /*return*/, key.data.privateKeyData];
+                key = _f.sent();
+                return [2 /*return*/, Buffer.from(key.data.privateKeyData, "base64").toString("utf-8")];
         }
     });
 }); };
@@ -1118254,7 +1118268,7 @@ exports.readConfigSync = readConfigSync;
 
 exports.__esModule = true;
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "refactor-gcloud-api-d53966a5" || 0;
+exports.PIPELINE_IMAGE_TAG = "refactor-gcloud-api-ee7f86ef" || 0;
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
 
 /***/ }),

package/dist/gcloud/cloudRun/getCloudRunDomainSuffix.js

@@ -54,7 +54,7 @@ var getCloudRunDomainSuffix = function (config) { return __awaiter(void 0, void
                 return [4 /*yield*/, runClient.listServices({ parent: parent, pageSize: 1 }, { autoPaginate: false })];
             case 1:
                 existingService = (_a.sent())[0];
-                if (existingService) {
+                if (existingService.length > 0) {
                     return [2 /*return*/, getSuffixFromService(existingService)];
                 }
                 return [4 /*yield*/, runClient.createService({

package/dist/gcloud/cloudRun/getCloudRunDomainSuffix.js.map

@@ -1 +1 @@
-{"version":3,"file":"getCloudRunDomainSuffix.js","sourceRoot":"","sources":["../../../src/gcloud/cloudRun/getCloudRunDomainSuffix.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,yCAAmD;AAEnD,IAAM,oBAAoB,GAAG,UAAC,OAAY;IACxC,IAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC;IAC5B,IAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;IAE3C,OAAO,OAAO,CAAC,OAAO,CAAC,UAAU,GAAG,IAAI,GAAG,GAAG,EAAE,EAAE,CAAC,CAAC;AACtD,CAAC,CAAC;AACK,IAAM,uBAAuB,GAAG,UAAO,MAA4B;;;;;gBAUlE,gBAAgB,GAAG,4BAA4B,CAAC;gBAEhD,SAAS,GAAG,IAAI,oBAAc,EAAE,CAAA;gBAChC,MAAM,GAAG,mBAAY,MAAM,CAAC,SAAS,wBAAc,MAAM,CAAC,MAAM,CAAE,CAAA;gBAE9C,qBAAM,SAAS,CAAC,YAAY,CAAC,EAAE,MAAM,QAAA,EAAE,QAAQ,EAAE,CAAC,EAAE,EAAE,EAAE,YAAY,EAAE,KAAK,EAAE,CAAC,EAAA;;gBAAjG,eAAe,GAAI,CAAA,SAA8E,CAAA,GAAlF;gBAEtB,IAAI,eAAe,EAAE;oBACnB,sBAAO,oBAAoB,CAAC,eAAe,CAAC,EAAC;iBAC9C;gBAE+B,qBAAM,SAAS,CAAC,aAAa,CAAC;wBAC5D,MAAM,QAAA;wBACN,SAAS,EAAE,gBAAgB;wBAC3B,OAAO,EAAE;4BACP,QAAQ,EAAE;gCACR,UAAU,EAAE,CAAC,EAAE,KAAK,EAAE,4CAA4C,EAAE,CAAC;6BACtE;yBACF;qBACF,CAAC,EAAA;;gBARK,qBAAqB,GAAI,CAAA,SAQ9B,CAAA,GAR0B;gBASL,qBAAM,qBAAqB,CAAC,OAAO,EAAE,EAAA;;gBAArD,YAAY,GAAI,CAAA,SAAqC,CAAA,GAAzC;gBAEO,qBAAM,SAAS,CAAC,aAAa,CAAC;wBACtD,IAAI,EAAE,YAAY,CAAC,IAAI;qBACxB,CAAC,EAAA;;gBAFK,eAAe,GAAI,CAAA,SAExB,CAAA,GAFoB;gBAGtB,qBAAM,eAAe,CAAC,OAAO,EAAE,EAAA;;gBAA/B,SAA+B,CAAA;gBAExB,qBAAM,oBAAoB,CAAC,YAAY,CAAC,EAAA;oBAA/C,sBAAO,SAAwC,EAAC;;;KACjD,CAAC;AAtCW,QAAA,uBAAuB,2BAsClC"}
+{"version":3,"file":"getCloudRunDomainSuffix.js","sourceRoot":"","sources":["../../../src/gcloud/cloudRun/getCloudRunDomainSuffix.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,yCAAmD;AAEnD,IAAM,oBAAoB,GAAG,UAAC,OAAY;IACxC,IAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC;IAC5B,IAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;IAE3C,OAAO,OAAO,CAAC,OAAO,CAAC,UAAU,GAAG,IAAI,GAAG,GAAG,EAAE,EAAE,CAAC,CAAC;AACtD,CAAC,CAAC;AACK,IAAM,uBAAuB,GAAG,UAAO,MAA4B;;;;;gBAUlE,gBAAgB,GAAG,4BAA4B,CAAC;gBAEhD,SAAS,GAAG,IAAI,oBAAc,EAAE,CAAA;gBAChC,MAAM,GAAG,mBAAY,MAAM,CAAC,SAAS,wBAAc,MAAM,CAAC,MAAM,CAAE,CAAA;gBAE9C,qBAAM,SAAS,CAAC,YAAY,CAAC,EAAE,MAAM,QAAA,EAAE,QAAQ,EAAE,CAAC,EAAE,EAAE,EAAE,YAAY,EAAE,KAAK,EAAE,CAAC,EAAA;;gBAAjG,eAAe,GAAI,CAAA,SAA8E,CAAA,GAAlF;gBAEtB,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE;oBAC9B,sBAAO,oBAAoB,CAAC,eAAe,CAAC,EAAC;iBAC9C;gBAE+B,qBAAM,SAAS,CAAC,aAAa,CAAC;wBAC5D,MAAM,QAAA;wBACN,SAAS,EAAE,gBAAgB;wBAC3B,OAAO,EAAE;4BACP,QAAQ,EAAE;gCACR,UAAU,EAAE,CAAC,EAAE,KAAK,EAAE,4CAA4C,EAAE,CAAC;6BACtE;yBACF;qBACF,CAAC,EAAA;;gBARK,qBAAqB,GAAI,CAAA,SAQ9B,CAAA,GAR0B;gBASL,qBAAM,qBAAqB,CAAC,OAAO,EAAE,EAAA;;gBAArD,YAAY,GAAI,CAAA,SAAqC,CAAA,GAAzC;gBAEO,qBAAM,SAAS,CAAC,aAAa,CAAC;wBACtD,IAAI,EAAE,YAAY,CAAC,IAAI;qBACxB,CAAC,EAAA;;gBAFK,eAAe,GAAI,CAAA,SAExB,CAAA,GAFoB;gBAGtB,qBAAM,eAAe,CAAC,OAAO,EAAE,EAAA;;gBAA/B,SAA+B,CAAA;gBAExB,qBAAM,oBAAoB,CAAC,YAAY,CAAC,EAAA;oBAA/C,sBAAO,SAAwC,EAAC;;;KACjD,CAAC;AAtCW,QAAA,uBAAuB,2BAsClC"}

package/dist/gcloud/enableServices.js

@@ -39,25 +39,35 @@ exports.__esModule = true;
 exports.enableGCloudServices = void 0;
 var googleapis_1 = require("googleapis");
 var enableGCloudServices = function (services, config) { return __awaiter(void 0, void 0, void 0, function () {
-    var _i, services_1, service;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
+    var gcloudAuth, _a, _b, _i, services_1, service;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
-                _i = 0, services_1 = services;
-                _a.label = 1;
+                gcloudAuth = new googleapis_1.google.auth.GoogleAuth({
+                    scopes: ['https://www.googleapis.com/auth/cloud-platform'],
+                    projectId: config.projectId
+                });
+                _b = (_a = googleapis_1.google).options;
+                _c = {};
+                return [4 /*yield*/, gcloudAuth.getClient()];
             case 1:
-                if (!(_i < services_1.length)) return [3 /*break*/, 4];
+                _b.apply(_a, [(_c.auth = _d.sent(), _c)]);
+                _i = 0, services_1 = services;
+                _d.label = 2;
+            case 2:
+                if (!(_i < services_1.length)) return [3 /*break*/, 5];
                 service = services_1[_i];
                 return [4 /*yield*/, googleapis_1.google.serviceusage({ version: 'v1' }).services.enable({
                         name: "projects/".concat(config.projectId, "/services/").concat(service)
                     })];
-            case 2:
-                _a.sent();
-                _a.label = 3;
             case 3:
+                _d.sent();
+                _d.label = 4;
+            case 4:
                 _i++;
-                return [3 /*break*/, 1];
-            case 4: return [2 /*return*/];
+                return [3 /*break*/, 2];
+            case 5: return [2 /*return*/];
         }
     });
 }); };

package/dist/gcloud/enableServices.js.map

@@ -1 +1 @@
-{"version":3,"file":"enableServices.js","sourceRoot":"","sources":["../../src/gcloud/enableServices.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yCAAoC;AAE7B,IAAM,oBAAoB,GAAG,UAClC,QAAkB,EAClB,MAEC;;;;;sBAE6B,EAAR,qBAAQ;;;qBAAR,CAAA,sBAAQ,CAAA;gBAAnB,OAAO;gBAChB,qBAAM,mBAAM,CAAC,YAAY,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC;wBAC3D,IAAI,EAAE,mBAAY,MAAM,CAAC,SAAS,uBAAa,OAAO,CAAE;qBACzD,CAAC,EAAA;;gBAFF,SAEE,CAAA;;;gBAHkB,IAAQ,CAAA;;;;;KAK/B,CAAC;AAXW,QAAA,oBAAoB,wBAW/B"}
+{"version":3,"file":"enableServices.js","sourceRoot":"","sources":["../../src/gcloud/enableServices.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yCAAoC;AAE7B,IAAM,oBAAoB,GAAG,UAClC,QAAkB,EAClB,MAEC;;;;;;gBAEK,UAAU,GAAG,IAAI,mBAAM,CAAC,IAAI,CAAC,UAAU,CAAC;oBAC5C,MAAM,EAAE,CAAC,gDAAgD,CAAC;oBAC1D,SAAS,EAAE,MAAM,CAAC,SAAS;iBAC5B,CAAC,CAAC;gBACH,KAAA,CAAA,KAAA,mBAAM,CAAA,CAAC,OAAO,CAAA;;gBAAS,qBAAM,UAAU,CAAC,SAAS,EAAE,EAAA;;gBAAnD,eAAiB,OAAI,GAAE,SAA4B,OAAG,CAAA;sBAExB,EAAR,qBAAQ;;;qBAAR,CAAA,sBAAQ,CAAA;gBAAnB,OAAO;gBAChB,qBAAM,mBAAM,CAAC,YAAY,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC;wBAC3D,IAAI,EAAE,mBAAY,MAAM,CAAC,SAAS,uBAAa,OAAO,CAAE;qBACzD,CAAC,EAAA;;gBAFF,SAEE,CAAA;;;gBAHkB,IAAQ,CAAA;;;;;KAK/B,CAAC;AAjBW,QAAA,oBAAoB,wBAiB/B"}

package/dist/gcloud/serviceAccounts.js

@@ -46,6 +46,15 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
+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));
+};
 exports.__esModule = true;
 exports.upsertGcloudServiceAccountAndSaveSecret = exports.accountExists = void 0;
 var googleapis_1 = require("googleapis");
@@ -71,10 +80,11 @@ var accountExists = function (client, projectId, fullPath) { return __awaiter(vo
 }); };
 exports.accountExists = accountExists;
 var upsertGcloudServiceAccount = function (context, account) { return __awaiter(void 0, void 0, void 0, function () {
-    var projectId, name, displayName, roles, description, namePrefix, nameSuffix, nameMiddleLength, nameMiddle, middle, fullName, fullDisplayName, fullIdentifier, fullPath, gcloudIamClient, gcloudProjectsClient, gcloudAuth, _a, _b, existing, memberName, projectIamPolicy, currentBindings, bindings, keylist, _i, _c, key_1, key;
-    var _d;
-    return __generator(this, function (_e) {
-        switch (_e.label) {
+    var projectId, name, displayName, roles, description, namePrefix, nameSuffix, nameMiddleLength, nameMiddle, middle, fullName, fullDisplayName, fullIdentifier, fullPath, gcloudIamClient, gcloudProjectsClient, gcloudAuth, _a, _b, existing, memberName, projectIamPolicy, currentBindings, bindings, keylist, key;
+    var _c;
+    var _d, _e;
+    return __generator(this, function (_f) {
+        switch (_f.label) {
             case 0:
                 projectId = account.projectId, name = account.name, displayName = account.displayName, roles = account.roles, description = account.description;
                 namePrefix = "".concat(name, "-");
@@ -93,13 +103,13 @@ var upsertGcloudServiceAccount = function (context, account) { return __awaiter(
                     projectId: projectId
                 });
                 _b = (_a = googleapis_1.google).options;
-                _d = {};
+                _c = {};
                 return [4 /*yield*/, gcloudAuth.getClient()];
             case 1:
-                _b.apply(_a, [(_d.auth = _e.sent(), _d)]);
+                _b.apply(_a, [(_c.auth = _f.sent(), _c)]);
                 return [4 /*yield*/, (0, exports.accountExists)(gcloudIamClient, projectId, fullPath)];
             case 2:
-                existing = _e.sent();
+                existing = _f.sent();
                 if (!!existing) return [3 /*break*/, 4];
                 return [4 /*yield*/, gcloudIamClient.projects.serviceAccounts.create({
                         name: gcloudProjectsClient.projectPath(projectId),
@@ -112,23 +122,23 @@ var upsertGcloudServiceAccount = function (context, account) { return __awaiter(
                         }
                     })];
             case 3:
-                _e.sent();
-                _e.label = 4;
+                _f.sent();
+                _f.label = 4;
             case 4:
                 memberName = "serviceAccount:".concat(fullIdentifier);
                 return [4 /*yield*/, gcloudProjectsClient.getIamPolicy({ resource: gcloudProjectsClient.projectPath(projectId) })];
             case 5:
-                projectIamPolicy = (_e.sent())[0];
+                projectIamPolicy = (_f.sent())[0];
                 currentBindings = projectIamPolicy.bindings;
                 bindings = currentBindings.map(function (binding) {
-                    var _a;
-                    return ((_a = roles.includes(binding.role)) !== null && _a !== void 0 ? _a : !binding.members.includes(memberName))
-                        ? __assign(__assign({}, binding), { members: binding.members.concat([memberName]) }) : binding;
+                    return (roles.includes(binding.role) && !binding.members.includes(memberName))
+                        ? __assign(__assign({}, binding), { members: __spreadArray(__spreadArray([], binding.members, true), [memberName], false) }) : binding;
                 }).concat(roles.filter(function (r) { return !currentBindings.map(function (b) { return b.role; }).includes(r); }).map(function (newRole) { return ({
                     role: newRole,
                     members: [memberName]
                 }); }));
                 return [4 /*yield*/, gcloudProjectsClient.setIamPolicy({
+                        resource: gcloudProjectsClient.projectPath(projectId),
                         policy: {
                             bindings: bindings,
                             etag: projectIamPolicy.etag
@@ -138,29 +148,23 @@ var upsertGcloudServiceAccount = function (context, account) { return __awaiter(
                     // delete first all keys
                 ];
             case 6:
-                _e.sent();
+                _f.sent();
                 return [4 /*yield*/, gcloudIamClient.projects.serviceAccounts.keys.list({
                         name: fullPath,
                         keyTypes: ['USER_MANAGED']
                     })];
             case 7:
-                keylist = _e.sent();
-                _i = 0, _c = keylist.data.keys;
-                _e.label = 8;
+                keylist = _f.sent();
+                (_e = (_d = keylist.data) === null || _d === void 0 ? void 0 : _d.keys) === null || _e === void 0 ? void 0 : _e.map(function (key) { return __awaiter(void 0, void 0, void 0, function () { return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0: return [4 /*yield*/, gcloudIamClient.projects.serviceAccounts.keys["delete"]({ name: key.name })];
+                        case 1: return [2 /*return*/, _a.sent()];
+                    }
+                }); }); });
+                return [4 /*yield*/, gcloudIamClient.projects.serviceAccounts.keys.create({ name: fullPath })];
             case 8:
-                if (!(_i < _c.length)) return [3 /*break*/, 11];
-                key_1 = _c[_i];
-                return [4 /*yield*/, gcloudIamClient.projects.serviceAccounts.keys["delete"]({ name: key_1.name })];
-            case 9:
-                _e.sent();
-                _e.label = 10;
-            case 10:
-                _i++;
-                return [3 /*break*/, 8];
-            case 11: return [4 /*yield*/, gcloudIamClient.projects.serviceAccounts.keys.create({ name: fullPath })];
-            case 12:
-                key = _e.sent();
-                return [2 /*return*/, key.data.privateKeyData];
+                key = _f.sent();
+                return [2 /*return*/, Buffer.from(key.data.privateKeyData, "base64").toString("utf-8")];
         }
     });
 }); };

package/dist/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":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGA,yCAAoC;AACpC,mEAAgE;AAChE,iCAAoC;AAEpC,0CAAqD;AAE9C,IAAM,aAAa,GAAG,UAAO,MAAkB,EAAE,SAAiB,EAAE,QAAgB;;;;;;gBAEvF,qBAAM,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,EAAA;;gBAA7D,SAA6D,CAAA;gBAC7D,sBAAO,IAAI,EAAC;;;gBAEZ,sBAAO,KAAK,EAAC;;;;KAEhB,CAAC;AAPW,QAAA,aAAa,iBAOxB;AASF,IAAM,0BAA0B,GAAG,UACjC,OAAgB,EAChB,OAAuB;;;;;;;gBAEf,SAAS,GAA4C,OAAO,UAAnD,EAAE,IAAI,GAAsC,OAAO,KAA7C,EAAE,WAAW,GAAyB,OAAO,YAAhC,EAAE,KAAK,GAAkB,OAAO,MAAzB,EAAE,WAAW,GAAK,OAAO,YAAZ,CAAa;gBAG/D,UAAU,GAAG,UAAG,IAAI,MAAG,CAAC;gBACxB,UAAU,GAAG,WAAI,OAAO,CAAC,WAAW,CAAC,SAAS,cAAI,OAAO,CAAC,aAAa,CAAE,CAAC;gBAC1E,gBAAgB,GAAG,EAAE,GAAG,UAAU,CAAC,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;gBAC9D,UAAU,GAAG,UAAG,OAAO,CAAC,UAAU,CAAC,YAAY,cAAI,OAAO,CAAC,UAAU,CAAC,OAAO,CAAE,CAAC;gBAEhF,MAAM,GAAG,eAAe,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAC;gBAEvD,QAAQ,GAAG,UAAG,UAAU,SAAG,MAAM,SAAG,UAAU,CAAE,CAAC;gBAEjD,eAAe,GAAG,UAAG,OAAO,CAAC,UAAU,CAAC,YAAY,cAAI,OAAO,CAAC,UAAU,CAAC,OAAO,cAAI,OAAO,CAAC,WAAW,CAAC,SAAS,cAAI,OAAO,CAAC,aAAa,gBAAM,WAAW,CAAE,CAAC;gBAEhK,cAAc,GAAG,UAAG,QAAQ,cAAI,SAAS,6BAA0B,CAAC;gBACpE,QAAQ,GAAG,mBAAY,SAAS,8BAAoB,cAAc,CAAE,CAAC;gBAErE,eAAe,GAAG,mBAAM,CAAC,GAAG,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;gBAChD,oBAAoB,GAAG,IAAI,iCAAc,EAAE,CAAC;gBAC5C,UAAU,GAAG,IAAI,mBAAM,CAAC,IAAI,CAAC,UAAU,CAAC;oBAC5C,MAAM,EAAE,CAAC,gDAAgD,CAAC;oBAC1D,SAAS,WAAA;iBACV,CAAC,CAAC;gBACH,KAAA,CAAA,KAAA,mBAAM,CAAA,CAAC,OAAO,CAAA;;gBAAS,qBAAM,UAAU,CAAC,SAAS,EAAE,EAAA;;gBAAnD,eAAiB,OAAI,GAAE,SAA4B,OAAG,CAAA;gBAErC,qBAAM,IAAA,qBAAa,EAAC,eAAe,EAAE,SAAS,EAAE,QAAQ,CAAC,EAAA;;gBAApE,QAAQ,GAAG,SAAyD;qBAEtE,CAAC,QAAQ,EAAT,wBAAS;gBACX,qBAAM,eAAe,CAAC,QAAQ,CAAC,eAAe,CAAC,MAAM,CAAC;wBACpD,IAAI,EAAE,oBAAoB,CAAC,WAAW,CAAC,SAAS,CAAC;wBACjD,WAAW,EAAE;4BACX,SAAS,EAAE,QAAQ;4BACnB,cAAc,EAAE;gCACd,WAAW,EAAE,eAAe;gCAC5B,WAAW,aAAA;6BACZ;yBACF;qBACF,CAAC,EAAA;;gBATF,SASE,CAAA;;;gBAEE,UAAU,GAAG,yBAAkB,cAAc,CAAE,CAAC;gBAG3B,qBAAM,oBAAoB,CAAC,YAAY,CAAC,EAAE,QAAQ,EAAE,oBAAoB,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE,CAAC,EAAA;;gBAAtH,gBAAgB,GAAI,CAAA,SAAkG,CAAA,GAAtG;gBACjB,eAAe,GAAG,gBAAgB,CAAC,QAAQ,CAAC;gBAC5C,QAAQ,GAAG,eAAe,CAAC,GAAG,CAAC,UAAA,OAAO;oBAC1C,OAAA,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;wBACrE,CAAC,uBAAM,OAAO,KAAE,OAAO,kCAAM,OAAO,CAAC,OAAO,UAAE,UAAU,aACxD,CAAC,CAAC,OAAO;gBAFX,CAEW,CACZ,CAAC,MAAM,CACN,KAAK,CAAC,MAAM,CAAC,UAAA,CAAC,IAAI,OAAA,CAAC,eAAe,CAAC,GAAG,CAAC,UAAA,CAAC,IAAI,OAAA,CAAC,CAAC,IAAI,EAAN,CAAM,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,EAA7C,CAA6C,CAAC,CAAC,GAAG,CAAC,UAAA,OAAO,IAAI,OAAA,CAAC;oBAC/E,IAAI,EAAE,OAAO;oBACb,OAAO,EAAE,CAAC,UAAU,CAAC;iBACtB,CAAC,EAH8E,CAG9E,CAAC,CACJ,CAAA;gBAED,qBAAM,oBAAoB,CAAC,YAAY,CAAC;wBACtC,QAAQ,EAAE,oBAAoB,CAAC,WAAW,CAAC,SAAS,CAAC;wBACrD,MAAM,EAAE;4BACN,QAAQ,UAAA;4BACR,IAAI,EAAE,gBAAgB,CAAC,IAAI;yBAC5B;qBACF,CAAC;oBAEF,aAAa;oBAEb,wBAAwB;kBAJtB;;gBANF,SAME,CAAA;gBAKc,qBAAM,eAAe,CAAC,QAAQ,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC;wBACvE,IAAI,EAAE,QAAQ;wBACd,QAAQ,EAAE,CAAC,cAAc,CAAC;qBAC3B,CAAC,EAAA;;gBAHI,OAAO,GAAG,SAGd;gBAEF,MAAA,MAAA,OAAO,CAAC,IAAI,0CAAE,IAAI,0CAAE,GAAG,CAAC,UAAM,GAAG;;gCAC/B,qBAAM,eAAe,CAAC,QAAQ,CAAC,eAAe,CAAC,IAAI,CAAC,QAAM,CAAA,CAAC,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,CAAC,EAAA;gCAA9E,sBAAA,SAA8E,EAAA;;yBAAA,CAC/E,CAAA;gBAEW,qBAAM,eAAe,CAAC,QAAQ,CAAC,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,EAAA;;gBAApF,GAAG,GAAG,SAA8E;gBAC1F,sBAAO,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAA;;;KACxE,CAAC;AAEK,IAAM,uCAAuC,GAAG,UACrD,QAAyB,EACzB,OAAgB,EAChB,OAAuB,EACvB,UAAkB;;;;;;gBAElB,QAAQ,CAAC,GAAG,CAAC,4BAA4B,GAAG,OAAO,CAAC,IAAI,GAAG,KAAK,CAAC,CAAC;gBACtD,qBAAM,0BAA0B,CAAC,OAAO,EAAE,OAAO,CAAC,EAAA;;gBAAxD,GAAG,GAAG,SAAkD;gBAE9D,qBAAM,IAAA,2BAAkB,EACtB,QAAQ;wBAEN,GAAC,UAAU,IAAG,GAAG;6BAEnB,OAAO,CAAC,WAAW,CAAC,SAAS,EAC7B,OAAO,CAAC,aAAa,CACtB,EAAA;;gBAPD,SAOC,CAAC;gBACF,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;;;;KACvB,CAAC;AAlBW,QAAA,uCAAuC,2CAkBlD;AAEF,IAAM,eAAe,GAAG,UAAC,GAAW,EAAE,SAAiB;IACrD,OAAA,GAAG,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG;AAAnD,CAAmD,CAAC;AAEtD,IAAM,IAAI,GAAG,UAAC,GAAW,EAAE,MAAc;IACvC,OAAO,IAAA,mBAAU,EAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;AACtE,CAAC,CAAC"}