@catladder/cli 0.0.0-inventory-8c6dd3ed → 0.0.0-inventory-101e8082

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.
Files changed (11) hide show
  1. package/dist/apps/cli/commands/project/setup/setupCloudRun.js +3 -1
  2. package/dist/apps/cli/commands/project/setup/setupCloudRun.js.map +1 -1
  3. package/dist/bundles/catenv/index.js +29 -17
  4. package/dist/bundles/cli/index.js +32 -18
  5. package/dist/tsconfig.tsbuildinfo +1 -1
  6. package/dist/utils/gitlab.d.ts +1 -1
  7. package/dist/utils/gitlab.js +20 -15
  8. package/dist/utils/gitlab.js.map +1 -1
  9. package/package.json +2 -2
  10. package/src/apps/cli/commands/project/setup/setupCloudRun.ts +3 -1
  11. package/src/utils/gitlab.ts +17 -7
package/dist/apps/cli/commands/project/setup/setupCloudRun.js CHANGED
@@ -88,7 +88,9 @@ var setupCloudRun = function (instance, context) { return __awaiter(void 0, void
88
88
  instance.log("domain suffix: " + suffix);
89
89
  return [4 /*yield*/, (0, gitlab_1.upsertAllVariables)(instance, (_a = {},
90
90
  _a[pipeline_1.GCLOUD_RUN_CANONICAL_HOST_SUFFIX] = suffix,
91
- _a), context.environment.shortName, context.componentName)];
91
+ _a), context.environment.shortName, context.componentName, false, // backup
92
+ false // masked
93
+ )];
92
94
  case 5:
93
95
  _b.sent();
94
96
  return [2 /*return*/];
package/dist/apps/cli/commands/project/setup/setupCloudRun.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"setupCloudRun.js","sourceRoot":"","sources":["../../../../../../src/apps/cli/commands/project/setup/setupCloudRun.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,gDAI6B;AAG7B,6EAAwF;AACxF,kGAAiG;AACjG,uEAA4E;AAC5E,yEAAgG;AAChG,sDAAiE;AAE1D,IAAM,aAAa,GAAG,UAC3B,QAAyB,EACzB,OAAgB;;;;;;gBAEhB,IAAI,CAAC,IAAA,yBAAc,EAAC,OAAO,CAAC,eAAe,CAAC,MAAM,EAAE,iBAAiB,CAAC,EAAE;oBACtE,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;iBACnE;gBAEK,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,MAAM,CAAC;gBAE9C,kBAAkB;gBAElB,QAAQ,CAAC,GAAG,CAAC,4BAA4B,CAAC,CAAC;gBAC3C,qBAAM,IAAA,qCAAoB,EACxB,CAAC,oBAAoB,EAAE,iCAAiC,CAAC,EACzD,MAAM,CACP,EAAA;;gBAHD,SAGC,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,EAAE;4BACL,kCAAkC;4BAClC,iBAAiB;4BACjB,8BAA8B;yBAC/B;qBACF,EACD,wCAA6B,CAC9B,EAAA;;gBAhBD,SAgBC,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,CACtB,EAAA;;gBAPD,SAOC,CAAC;;;;KACH,CAAC;AAzDW,QAAA,aAAa,iBAyDxB"}
1
+ {"version":3,"file":"setupCloudRun.js","sourceRoot":"","sources":["../../../../../../src/apps/cli/commands/project/setup/setupCloudRun.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,gDAI6B;AAG7B,6EAAwF;AACxF,kGAAiG;AACjG,uEAA4E;AAC5E,yEAAgG;AAChG,sDAAiE;AAE1D,IAAM,aAAa,GAAG,UAC3B,QAAyB,EACzB,OAAgB;;;;;;gBAEhB,IAAI,CAAC,IAAA,yBAAc,EAAC,OAAO,CAAC,eAAe,CAAC,MAAM,EAAE,iBAAiB,CAAC,EAAE;oBACtE,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;iBACnE;gBAEK,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,MAAM,CAAC;gBAE9C,kBAAkB;gBAElB,QAAQ,CAAC,GAAG,CAAC,4BAA4B,CAAC,CAAC;gBAC3C,qBAAM,IAAA,qCAAoB,EACxB,CAAC,oBAAoB,EAAE,iCAAiC,CAAC,EACzD,MAAM,CACP,EAAA;;gBAHD,SAGC,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,EAAE;4BACL,kCAAkC;4BAClC,iBAAiB;4BACjB,8BAA8B;yBAC/B;qBACF,EACD,wCAA6B,CAC9B,EAAA;;gBAhBD,SAgBC,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,CAAC,SAAS;qBAChB,EAAA;;gBATD,SASC,CAAC;;;;KACH,CAAC;AA3DW,QAAA,aAAa,iBA2DxB"}
package/dist/bundles/catenv/index.js CHANGED
@@ -779,15 +779,16 @@ var getVariableValueByRawName = function (vorpal, rawName) { return __awaiter(vo
779
779
  exports.getVariableValueByRawName = getVariableValueByRawName;
780
780
  var maskableRegex = new RegExp("^[a-zA-Z0-9_+=/@:.~-]{8,}$"); // SEE https://gitlab.com/gitlab-org/gitlab-foss/-/blob/master/spec/frontend/ci_variable_list/components/ci_variable_modal_spec.js#L20
781
781
  var isMaskable = function (value) { return maskableRegex.test(value); };
782
- var createVariable = function (vorpal, projectId, key, value, environment_scope) {
782
+ var createVariable = function (vorpal, projectId, key, value, environment_scope, masked) {
783
783
  if (environment_scope === void 0) { environment_scope = "*"; }
784
+ if (masked === void 0) { masked = true; }
784
785
  return __awaiter(void 0, void 0, void 0, function () {
785
786
  return __generator(this, function (_a) {
786
787
  switch (_a.label) {
787
788
  case 0: return [4 /*yield*/, (0, exports.doGitlabRequest)(vorpal, "projects/".concat(projectId, "/variables"), {
788
789
  key: key,
789
790
  value: value,
790
- masked: isMaskable(value),
791
+ masked: masked && isMaskable(value),
791
792
  environment_scope: environment_scope
792
793
  })];
793
794
  case 1: return [2 /*return*/, _a.sent()];
@@ -795,17 +796,20 @@ var createVariable = function (vorpal, projectId, key, value, environment_scope)
795
796
  });
796
797
  });
797
798
  };
798
- var updateVariable = function (vorpal, projectId, key, value) { return __awaiter(void 0, void 0, void 0, function () {
799
- return __generator(this, function (_a) {
800
- switch (_a.label) {
801
- case 0: return [4 /*yield*/, (0, exports.doGitlabRequest)(vorpal, "projects/".concat(projectId, "/variables/").concat(key), {
802
- value: value,
803
- masked: isMaskable(value)
804
- }, true)];
805
- case 1: return [2 /*return*/, _a.sent()];
806
- }
799
+ var updateVariable = function (vorpal, projectId, key, value, masked) {
800
+ if (masked === void 0) { masked = true; }
801
+ return __awaiter(void 0, void 0, void 0, function () {
802
+ return __generator(this, function (_a) {
803
+ switch (_a.label) {
804
+ case 0: return [4 /*yield*/, (0, exports.doGitlabRequest)(vorpal, "projects/".concat(projectId, "/variables/").concat(key), {
805
+ value: value,
806
+ masked: masked && isMaskable(value)
807
+ }, true)];
808
+ case 1: return [2 /*return*/, _a.sent()];
809
+ }
810
+ });
807
811
  });
808
- }); };
812
+ };
809
813
  var getAllCatladderEnvVarsInGitlab = function (vorpal) { return __awaiter(void 0, void 0, void 0, function () {
810
814
  var allVariables;
811
815
  return __generator(this, function (_a) {
@@ -835,8 +839,9 @@ var getAllCatladderEnvVarsInGitlab = function (vorpal) { return __awaiter(void 0
835
839
  }
836
840
  });
837
841
  }); };
838
- var upsertAllVariables = function (vorpal, variables, env, componentName, backup) {
842
+ var upsertAllVariables = function (vorpal, variables, env, componentName, backup, masked) {
839
843
  if (backup === void 0) { backup = true; }
844
+ if (masked === void 0) { masked = true; }
840
845
  return __awaiter(void 0, void 0, void 0, function () {
841
846
  var id, existingVariables, _i, _a, _b, key, value, fullKey, valueSanitized, exists, oldValue, changed;
842
847
  var _c;
@@ -861,7 +866,7 @@ var upsertAllVariables = function (vorpal, variables, env, componentName, backup
861
866
  if (!changed) return [3 /*break*/, 10];
862
867
  if (!exists) return [3 /*break*/, 7];
863
868
  vorpal.log("changed: ".concat(key));
864
- return [4 /*yield*/, updateVariable(vorpal, id, fullKey, valueSanitized)];
869
+ return [4 /*yield*/, updateVariable(vorpal, id, fullKey, valueSanitized, masked)];
865
870
  case 4:
866
871
  _d.sent();
867
872
  if (!backup) return [3 /*break*/, 6];
@@ -872,7 +877,7 @@ var upsertAllVariables = function (vorpal, variables, env, componentName, backup
872
877
  case 6: return [3 /*break*/, 9];
873
878
  case 7:
874
879
  vorpal.log("new : ".concat(key));
875
- return [4 /*yield*/, createVariable(vorpal, id, fullKey, valueSanitized)];
880
+ return [4 /*yield*/, createVariable(vorpal, id, fullKey, valueSanitized, undefined, masked)];
876
881
  case 8:
877
882
  _d.sent();
878
883
  _d.label = 9;
@@ -39832,7 +39837,7 @@ exports.readConfigSync = readConfigSync;
39832
39837
 
39833
39838
  exports.__esModule = true;
39834
39839
  exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
39835
- exports.PIPELINE_IMAGE_TAG = "inventory-8c6dd3ed" || 0;
39840
+ exports.PIPELINE_IMAGE_TAG = "inventory-101e8082" || 0;
39836
39841
  exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
39837
39842
 
39838
39843
  /***/ }),
@@ -42225,7 +42230,14 @@ var createInventoryReporitngJob = function (context) {
42225
42230
  name: "inventory:reporting",
42226
42231
  stage: "reporting",
42227
42232
  variables: {},
42228
- script: [printReportComand]
42233
+ script: [printReportComand],
42234
+ needsStages: [{
42235
+ stage: "build",
42236
+ artifacts: true
42237
+ }, {
42238
+ stage: "deploy",
42239
+ artifacts: true
42240
+ }]
42229
42241
  };
42230
42242
  };
42231
42243
 
package/dist/bundles/cli/index.js CHANGED
@@ -4112,7 +4112,9 @@ var setupCloudRun = function (instance, context) { return __awaiter(void 0, void
4112
4112
  instance.log("domain suffix: " + suffix);
4113
4113
  return [4 /*yield*/, (0, gitlab_1.upsertAllVariables)(instance, (_a = {},
4114
4114
  _a[pipeline_1.GCLOUD_RUN_CANONICAL_HOST_SUFFIX] = suffix,
4115
- _a), context.environment.shortName, context.componentName)];
4115
+ _a), context.environment.shortName, context.componentName, false, // backup
4116
+ false // masked
4117
+ )];
4116
4118
  case 5:
4117
4119
  _b.sent();
4118
4120
  return [2 /*return*/];
@@ -7300,15 +7302,16 @@ var getVariableValueByRawName = function (vorpal, rawName) { return __awaiter(vo
7300
7302
  exports.getVariableValueByRawName = getVariableValueByRawName;
7301
7303
  var maskableRegex = new RegExp("^[a-zA-Z0-9_+=/@:.~-]{8,}$"); // SEE https://gitlab.com/gitlab-org/gitlab-foss/-/blob/master/spec/frontend/ci_variable_list/components/ci_variable_modal_spec.js#L20
7302
7304
  var isMaskable = function (value) { return maskableRegex.test(value); };
7303
- var createVariable = function (vorpal, projectId, key, value, environment_scope) {
7305
+ var createVariable = function (vorpal, projectId, key, value, environment_scope, masked) {
7304
7306
  if (environment_scope === void 0) { environment_scope = "*"; }
7307
+ if (masked === void 0) { masked = true; }
7305
7308
  return __awaiter(void 0, void 0, void 0, function () {
7306
7309
  return __generator(this, function (_a) {
7307
7310
  switch (_a.label) {
7308
7311
  case 0: return [4 /*yield*/, (0, exports.doGitlabRequest)(vorpal, "projects/".concat(projectId, "/variables"), {
7309
7312
  key: key,
7310
7313
  value: value,
7311
- masked: isMaskable(value),
7314
+ masked: masked && isMaskable(value),
7312
7315
  environment_scope: environment_scope
7313
7316
  })];
7314
7317
  case 1: return [2 /*return*/, _a.sent()];
@@ -7316,17 +7319,20 @@ var createVariable = function (vorpal, projectId, key, value, environment_scope)
7316
7319
  });
7317
7320
  });
7318
7321
  };
7319
- var updateVariable = function (vorpal, projectId, key, value) { return __awaiter(void 0, void 0, void 0, function () {
7320
- return __generator(this, function (_a) {
7321
- switch (_a.label) {
7322
- case 0: return [4 /*yield*/, (0, exports.doGitlabRequest)(vorpal, "projects/".concat(projectId, "/variables/").concat(key), {
7323
- value: value,
7324
- masked: isMaskable(value)
7325
- }, true)];
7326
- case 1: return [2 /*return*/, _a.sent()];
7327
- }
7322
+ var updateVariable = function (vorpal, projectId, key, value, masked) {
7323
+ if (masked === void 0) { masked = true; }
7324
+ return __awaiter(void 0, void 0, void 0, function () {
7325
+ return __generator(this, function (_a) {
7326
+ switch (_a.label) {
7327
+ case 0: return [4 /*yield*/, (0, exports.doGitlabRequest)(vorpal, "projects/".concat(projectId, "/variables/").concat(key), {
7328
+ value: value,
7329
+ masked: masked && isMaskable(value)
7330
+ }, true)];
7331
+ case 1: return [2 /*return*/, _a.sent()];
7332
+ }
7333
+ });
7328
7334
  });
7329
- }); };
7335
+ };
7330
7336
  var getAllCatladderEnvVarsInGitlab = function (vorpal) { return __awaiter(void 0, void 0, void 0, function () {
7331
7337
  var allVariables;
7332
7338
  return __generator(this, function (_a) {
@@ -7356,8 +7362,9 @@ var getAllCatladderEnvVarsInGitlab = function (vorpal) { return __awaiter(void 0
7356
7362
  }
7357
7363
  });
7358
7364
  }); };
7359
- var upsertAllVariables = function (vorpal, variables, env, componentName, backup) {
7365
+ var upsertAllVariables = function (vorpal, variables, env, componentName, backup, masked) {
7360
7366
  if (backup === void 0) { backup = true; }
7367
+ if (masked === void 0) { masked = true; }
7361
7368
  return __awaiter(void 0, void 0, void 0, function () {
7362
7369
  var id, existingVariables, _i, _a, _b, key, value, fullKey, valueSanitized, exists, oldValue, changed;
7363
7370
  var _c;
@@ -7382,7 +7389,7 @@ var upsertAllVariables = function (vorpal, variables, env, componentName, backup
7382
7389
  if (!changed) return [3 /*break*/, 10];
7383
7390
  if (!exists) return [3 /*break*/, 7];
7384
7391
  vorpal.log("changed: ".concat(key));
7385
- return [4 /*yield*/, updateVariable(vorpal, id, fullKey, valueSanitized)];
7392
+ return [4 /*yield*/, updateVariable(vorpal, id, fullKey, valueSanitized, masked)];
7386
7393
  case 4:
7387
7394
  _d.sent();
7388
7395
  if (!backup) return [3 /*break*/, 6];
@@ -7393,7 +7400,7 @@ var upsertAllVariables = function (vorpal, variables, env, componentName, backup
7393
7400
  case 6: return [3 /*break*/, 9];
7394
7401
  case 7:
7395
7402
  vorpal.log("new : ".concat(key));
7396
- return [4 /*yield*/, createVariable(vorpal, id, fullKey, valueSanitized)];
7403
+ return [4 /*yield*/, createVariable(vorpal, id, fullKey, valueSanitized, undefined, masked)];
7397
7404
  case 8:
7398
7405
  _d.sent();
7399
7406
  _d.label = 9;
@@ -350602,7 +350609,7 @@ exports.readConfigSync = readConfigSync;
350602
350609
 
350603
350610
  exports.__esModule = true;
350604
350611
  exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
350605
- exports.PIPELINE_IMAGE_TAG = "inventory-8c6dd3ed" || 0;
350612
+ exports.PIPELINE_IMAGE_TAG = "inventory-101e8082" || 0;
350606
350613
  exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
350607
350614
 
350608
350615
  /***/ }),
@@ -352995,7 +353002,14 @@ var createInventoryReporitngJob = function (context) {
352995
353002
  name: "inventory:reporting",
352996
353003
  stage: "reporting",
352997
353004
  variables: {},
352998
- script: [printReportComand]
353005
+ script: [printReportComand],
353006
+ needsStages: [{
353007
+ stage: "build",
353008
+ artifacts: true
353009
+ }, {
353010
+ stage: "deploy",
353011
+ artifacts: true
353012
+ }]
352999
353013
  };
353000
353014
  };
353001
353015