@catladder/cli 1.149.0 → 1.149.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -70,18 +70,27 @@ var accountExists = function (fullIdentifier) { return __awaiter(void 0, void 0,
70
70
  }); };
71
71
  exports.accountExists = accountExists;
72
72
  var upsertGcloudServiceAccount = function (context, account) { return __awaiter(void 0, void 0, void 0, function () {
73
- var projectId, name, displayName, roles, description, namePrefix, nameSuffix, nameMiddleLength, nameMiddle, middle, fullName, fullDisplayName, fullIdentifier, existing, memberName, roles_1, roles_1_1, role, e_1_1, keys, keys_1, keys_1_1, key, e_2_1;
73
+ 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;
74
74
  var e_1, _a, e_2, _b;
75
75
  return __generator(this, function (_c) {
76
76
  switch (_c.label) {
77
77
  case 0:
78
78
  projectId = account.projectId, name = account.name, displayName = account.displayName, roles = account.roles, description = account.description;
79
- namePrefix = "".concat(name, "-");
80
- nameSuffix = "-".concat(context.environment.shortName, "-").concat(context.componentName);
81
- nameMiddleLength = 30 - namePrefix.length - nameSuffix.length;
82
- nameMiddle = "".concat(context.fullConfig.customerName, "-").concat(context.fullConfig.appName);
83
- middle = hashIfNessecary(nameMiddle, nameMiddleLength);
84
- fullName = "".concat(namePrefix).concat(middle).concat(nameSuffix);
79
+ namePrefix = "".concat(name);
80
+ nameSuffixRaw = "".concat(context.environment.shortName, "-").concat(context.componentName);
81
+ nameMiddleRaw = "".concat(context.fullConfig.customerName, "-").concat(context.fullConfig.appName);
82
+ MAX_LENGTH = 30;
83
+ NUM_SEPARATORS = 2;
84
+ middleMaxLength = MAX_LENGTH - namePrefix.length - nameSuffixRaw.length - NUM_SEPARATORS;
85
+ if (middleMaxLength < 1) {
86
+ nameMiddle = hashIfNessecary(nameMiddleRaw, 1);
87
+ nameSuffix = hashIfNessecary(nameSuffixRaw, MAX_LENGTH - namePrefix.length - 1 - NUM_SEPARATORS);
88
+ }
89
+ else {
90
+ nameMiddle = hashIfNessecary(nameMiddleRaw, middleMaxLength);
91
+ nameSuffix = nameSuffixRaw;
92
+ }
93
+ fullName = "".concat(namePrefix, "-").concat(nameMiddle, "-").concat(nameSuffix);
85
94
  fullDisplayName = "".concat(context.fullConfig.customerName, "-").concat(context.fullConfig.appName, " ").concat(context.environment.shortName, ":").concat(context.componentName, " | ").concat(displayName);
86
95
  fullIdentifier = "".concat(fullName, "@").concat(projectId, ".iam.gserviceaccount.com");
87
96
  return [4 /*yield*/, (0, exports.accountExists)(fullIdentifier)];
@@ -1 +1 @@
1
- {"version":3,"file":"serviceAccounts.js","sourceRoot":"","sources":["../../../../src/gcloud/serviceAccounts.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"serviceAccounts.js","sourceRoot":"","sources":["../../../../src/gcloud/serviceAccounts.ts"],"names":[],"mappings":"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"}