@catladder/cli 0.0.0-main-8a8ce056 → 0.0.0-main-5a349d07

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 (18) hide show
  1. package/dist/bundles/catenv/index.js +36 -47
  2. package/dist/bundles/cli/index.js +36 -45
  3. package/dist/cli/src/catenv.js +0 -2
  4. package/dist/cli/src/catenv.js.map +1 -1
  5. package/dist/pipeline/src/context/createComponentContext.js +1 -0
  6. package/dist/pipeline/src/context/createComponentContext.js.map +1 -1
  7. package/dist/pipeline/src/pipeline/createAllJobs.d.ts +6 -6
  8. package/dist/pipeline/src/pipeline/createAllJobs.js +7 -19
  9. package/dist/pipeline/src/pipeline/createAllJobs.js.map +1 -1
  10. package/dist/pipeline/src/pipeline/createMainPipeline.js +2 -2
  11. package/dist/pipeline/src/pipeline/createMainPipeline.js.map +1 -1
  12. package/dist/pipeline/src/pipeline/gitlab/createGitlabJobs.d.ts +4 -4
  13. package/dist/pipeline/src/pipeline/gitlab/createGitlabJobs.js +26 -24
  14. package/dist/pipeline/src/pipeline/gitlab/createGitlabJobs.js.map +1 -1
  15. package/dist/pipeline/src/types/context.d.ts +2 -4
  16. package/dist/tsconfig.tsbuildinfo +1 -1
  17. package/package.json +1 -1
  18. package/src/catenv.ts +0 -2
package/dist/bundles/catenv/index.js CHANGED
@@ -666,9 +666,7 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
666
666
  var catenv_1 = __importDefault(__nccwpck_require__(6965));
667
667
  var parseChoice_1 = __nccwpck_require__(3941);
668
668
  var choice = process.argv[2] ? (0, parseChoice_1.parseChoice)(process.argv[2]) : null;
669
- var now = performance.now();
670
669
  (0, catenv_1.default)(choice).then(function () {
671
- console.log("catenv", performance.now() - now);
672
670
  // we have to exit manually, because we have some file watches
673
671
  process.exit();
674
672
  });
@@ -4044,6 +4042,7 @@ var createComponentContext = function (ctx) { return __awaiter(void 0, void 0, v
4044
4042
  context = {
4045
4043
  fullConfig: ctx.config,
4046
4044
  componentConfig: componentConfig,
4045
+ env: ctx.env,
4047
4046
  build: {
4048
4047
  dir: dir,
4049
4048
  config: build,
@@ -7428,17 +7427,6 @@ exports["default"] = ownPkg;
7428
7427
 
7429
7428
  "use strict";
7430
7429
 
7431
- var __assign = (this && this.__assign) || function () {
7432
- __assign = Object.assign || function(t) {
7433
- for (var s, i = 1, n = arguments.length; i < n; i++) {
7434
- s = arguments[i];
7435
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
7436
- t[p] = s[p];
7437
- }
7438
- return t;
7439
- };
7440
- return __assign.apply(this, arguments);
7441
- };
7442
7430
  var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
7443
7431
  function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
7444
7432
  return new (P || (P = Promise))(function (resolve, reject) {
@@ -7524,14 +7512,13 @@ var createAllJobs = function (_a) { return __awaiter(void 0, [_a], void 0, funct
7524
7512
  })];
7525
7513
  case 1:
7526
7514
  allComponentContext = _c.sent();
7527
- return [2 /*return*/, allComponentContext.reduce(function (acc, _a) {
7528
- var componentName = _a.componentName, env = _a.env, context = _a.context;
7529
- if (!acc[componentName]) {
7530
- acc[componentName] = {};
7531
- }
7532
- acc[componentName][env] = (0, createJobsForComponent_1.createJobsForComponentContext)(context).map(function (job) { return (__assign(__assign({}, job), { context: context })); });
7533
- return acc;
7534
- }, {})];
7515
+ return [2 /*return*/, allComponentContext.map(function (_a) {
7516
+ var context = _a.context;
7517
+ return ({
7518
+ context: context,
7519
+ jobs: (0, createJobsForComponent_1.createJobsForComponentContext)(context),
7520
+ });
7521
+ })];
7535
7522
  }
7536
7523
  });
7537
7524
  }); };
@@ -7820,8 +7807,8 @@ var createMainPipeline = function (pipelineType, config) { return __awaiter(void
7820
7807
  // this is purely for better readability in git diffs when you add new components
7821
7808
  .sort(function (a, b) {
7822
7809
  var componentNames = Object.keys(config.components);
7823
- var aIndex = componentNames.findIndex(function (c) { return c === a.componentName; });
7824
- var bIndex = componentNames.findIndex(function (c) { return c === b.componentName; });
7810
+ var aIndex = componentNames.findIndex(function (c) { return c === a.context.componentName; });
7811
+ var bIndex = componentNames.findIndex(function (c) { return c === b.context.componentName; });
7825
7812
  return aIndex - bIndex;
7826
7813
  })
7827
7814
  .reduce(function (acc, _a) {
@@ -8151,7 +8138,8 @@ var getFullJobName = function (name, componentName, env) {
8151
8138
  };
8152
8139
  var getFullReferencedJobName = function (referencedJobName, componentName, env, allJobs) {
8153
8140
  var _a, _b;
8154
- var referencedJob = (_b = (_a = allJobs[componentName]) === null || _a === void 0 ? void 0 : _a[env]) === null || _b === void 0 ? void 0 : _b.find(function (j) { return j.name === referencedJobName; });
8141
+ var referencedJob = (_b = (_a = allJobs
8142
+ .find(function (j) { return j.context.componentName === componentName && j.context.env === env; })) === null || _a === void 0 ? void 0 : _a.jobs) === null || _b === void 0 ? void 0 : _b.find(function (j) { return j.name === referencedJobName; });
8155
8143
  if (!referencedJob) {
8156
8144
  throw new Error("unknown job referenced: '".concat(referencedJobName, "' from '").concat(env, ":").concat(componentName, "'"));
8157
8145
  }
@@ -8161,14 +8149,19 @@ var getFullReferencedJobName = function (referencedJobName, componentName, env,
8161
8149
  var getJobName = function (need) {
8162
8150
  return (0, lodash_1.isObject)(need) ? need.job : need;
8163
8151
  };
8164
- var makeGitlabJob = function (componentName, env, _a, allJobs, baseRules) {
8152
+ var makeGitlabJob = function (context, _a, allJobs, baseRules) {
8165
8153
  var _b, _c;
8166
- var environment = _a.environment, envMode = _a.envMode, needsStages = _a.needsStages, needsOtherComponent = _a.needsOtherComponent, name = _a.name, needs = _a.needs, jobTags = _a.jobTags, script = _a.script, context = _a.context, variables = _a.variables, runnerVariables = _a.runnerVariables, when = _a.when, job = __rest(_a, ["environment", "envMode", "needsStages", "needsOtherComponent", "name", "needs", "jobTags", "script", "context", "variables", "runnerVariables", "when"]);
8167
- var stage = envMode === "stagePerEnv" ? "".concat(job.stage, " ").concat(env) : job.stage;
8154
+ var environment = _a.environment, envMode = _a.envMode, needsStages = _a.needsStages, needsOtherComponent = _a.needsOtherComponent, name = _a.name, needs = _a.needs, jobTags = _a.jobTags, script = _a.script, variables = _a.variables, runnerVariables = _a.runnerVariables, when = _a.when, job = __rest(_a, ["environment", "envMode", "needsStages", "needsOtherComponent", "name", "needs", "jobTags", "script", "variables", "runnerVariables", "when"]);
8155
+ var stage = envMode === "stagePerEnv" ? "".concat(job.stage, " ").concat(context.env) : job.stage;
8168
8156
  var needsFromStages = needsStages === null || needsStages === void 0 ? void 0 : needsStages.flatMap(function (n) {
8169
- var _a, _b, _c, _d;
8170
- var referencedComponentName = componentName;
8171
- var allJobNamesFromThatStage = (_d = (_c = (_b = (_a = allJobs[referencedComponentName]) === null || _a === void 0 ? void 0 : _a[env]) === null || _b === void 0 ? void 0 : _b.filter(function (j) { return j.stage === n.stage; })) === null || _c === void 0 ? void 0 : _c.map(function (j) { return j.name; })) !== null && _d !== void 0 ? _d : [];
8157
+ var _a, _b, _c;
8158
+ var referencedComponentName = context.componentName;
8159
+ var allJobNamesFromThatStage = (_c = (_b = (_a = allJobs
8160
+ .filter(function (j) {
8161
+ return j.context.componentName === referencedComponentName &&
8162
+ j.context.env === context.env;
8163
+ })
8164
+ .flatMap(function (j) { return j.jobs; })) === null || _a === void 0 ? void 0 : _a.filter(function (j) { return j.stage === n.stage; })) === null || _b === void 0 ? void 0 : _b.map(function (j) { return j.name; })) !== null && _c !== void 0 ? _c : [];
8172
8165
  return allJobNamesFromThatStage.map(function (job) {
8173
8166
  var _a;
8174
8167
  return ({
@@ -8183,13 +8176,13 @@ var makeGitlabJob = function (componentName, env, _a, allJobs, baseRules) {
8183
8176
  var _a;
8184
8177
  return (0, lodash_1.isObject)(n)
8185
8178
  ? {
8186
- job: getFullReferencedJobName(n.job, (_a = n.componentName) !== null && _a !== void 0 ? _a : componentName, env, allJobs),
8179
+ job: getFullReferencedJobName(n.job, (_a = n.componentName) !== null && _a !== void 0 ? _a : context.componentName, context.env, allJobs),
8187
8180
  artifacts: n.artifacts,
8188
8181
  }
8189
- : getFullReferencedJobName(n, componentName, env, allJobs);
8182
+ : getFullReferencedJobName(n, context.componentName, context.env, allJobs);
8190
8183
  }).sort(function (a, b) { return getJobName(a).localeCompare(getJobName(b)); });
8191
8184
  var deduplicatedGitlabNeeds = __spreadArray([], __read(new Map(gitlabNeeds.map(function (n) { return [(0, lodash_1.isObject)(n) ? n.job : n, n]; })).values()), false);
8192
- var fullJobName = getFullJobName(name, componentName, envMode !== "none" ? env : undefined);
8185
+ var fullJobName = getFullJobName(name, context.componentName, envMode !== "none" ? context.env : undefined);
8193
8186
  // backwards compatibility, some may still use KUBERNETES_CPU_REQUEST, KUBERNETES_MEMORY_REQUEST, etc. in variables.
8194
8187
  // those should now be set in the runnerVariables as they don't work in the variables key of the catladder job, becuase those get injected
8195
8188
  var PIPELINE_RUNNER_VARIABLES = [
@@ -8219,7 +8212,7 @@ var makeGitlabJob = function (componentName, env, _a, allJobs, baseRules) {
8219
8212
  : [])), false);
8220
8213
  var modified = addGitlabEnvironment(context, environment, __assign(__assign({}, job), { rules: rules.length > 0 ? rules : undefined, variables: __assign(__assign({}, legacyRunnerVariables), runnerVariables), script: __spreadArray(__spreadArray([], __read(varsInjectScripts), false), __read(((_c = script === null || script === void 0 ? void 0 : script.filter(utils_1.notNil)) !== null && _c !== void 0 ? _c : [])), false), tags: jobTags, stage: stage,
8221
8214
  // sort in a predictable manner for snapshot tests
8222
- needs: deduplicatedGitlabNeeds, retry: defaults_1.BASE_RETRY, interruptible: true }), componentName, env, allJobs);
8215
+ needs: deduplicatedGitlabNeeds, retry: defaults_1.BASE_RETRY, interruptible: true }), context.componentName, context.env, allJobs);
8223
8216
  return [fullJobName, (0, removeUndefined_1.removeUndefined)(modified)];
8224
8217
  };
8225
8218
  exports.makeGitlabJob = makeGitlabJob;
@@ -8252,19 +8245,15 @@ allJobs) {
8252
8245
  };
8253
8246
  var createGitlabJobs = function (allJobs, baseRules) { return __awaiter(void 0, void 0, void 0, function () {
8254
8247
  return __generator(this, function (_a) {
8255
- return [2 /*return*/, Object.keys(allJobs).flatMap(function (componentName) {
8256
- var componentJobs = allJobs[componentName];
8257
- return Object.keys(componentJobs).flatMap(function (env) {
8258
- var jobs = componentJobs[env];
8259
- return jobs.flatMap(function (job) {
8260
- var _a = __read((0, exports.makeGitlabJob)(componentName, env, job, allJobs, baseRules), 2), fullJobName = _a[0], gitlabJob = _a[1];
8261
- return {
8262
- name: fullJobName,
8263
- gitlabJob: gitlabJob,
8264
- componentName: componentName,
8265
- env: env,
8266
- };
8267
- });
8248
+ return [2 /*return*/, allJobs.flatMap(function (_a) {
8249
+ var context = _a.context, jobs = _a.jobs;
8250
+ return jobs.map(function (job) {
8251
+ var _a = __read((0, exports.makeGitlabJob)(context, job, allJobs, baseRules), 2), fullJobName = _a[0], gitlabJob = _a[1];
8252
+ return {
8253
+ name: fullJobName,
8254
+ gitlabJob: gitlabJob,
8255
+ context: context,
8256
+ };
8268
8257
  });
8269
8258
  })];
8270
8259
  });
package/dist/bundles/cli/index.js CHANGED
@@ -11488,6 +11488,7 @@ var createComponentContext = function (ctx) { return __awaiter(void 0, void 0, v
11488
11488
  context = {
11489
11489
  fullConfig: ctx.config,
11490
11490
  componentConfig: componentConfig,
11491
+ env: ctx.env,
11491
11492
  build: {
11492
11493
  dir: dir,
11493
11494
  config: build,
@@ -14872,17 +14873,6 @@ exports["default"] = ownPkg;
14872
14873
 
14873
14874
  "use strict";
14874
14875
 
14875
- var __assign = (this && this.__assign) || function () {
14876
- __assign = Object.assign || function(t) {
14877
- for (var s, i = 1, n = arguments.length; i < n; i++) {
14878
- s = arguments[i];
14879
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
14880
- t[p] = s[p];
14881
- }
14882
- return t;
14883
- };
14884
- return __assign.apply(this, arguments);
14885
- };
14886
14876
  var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
14887
14877
  function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
14888
14878
  return new (P || (P = Promise))(function (resolve, reject) {
@@ -14968,14 +14958,13 @@ var createAllJobs = function (_a) { return __awaiter(void 0, [_a], void 0, funct
14968
14958
  })];
14969
14959
  case 1:
14970
14960
  allComponentContext = _c.sent();
14971
- return [2 /*return*/, allComponentContext.reduce(function (acc, _a) {
14972
- var componentName = _a.componentName, env = _a.env, context = _a.context;
14973
- if (!acc[componentName]) {
14974
- acc[componentName] = {};
14975
- }
14976
- acc[componentName][env] = (0, createJobsForComponent_1.createJobsForComponentContext)(context).map(function (job) { return (__assign(__assign({}, job), { context: context })); });
14977
- return acc;
14978
- }, {})];
14961
+ return [2 /*return*/, allComponentContext.map(function (_a) {
14962
+ var context = _a.context;
14963
+ return ({
14964
+ context: context,
14965
+ jobs: (0, createJobsForComponent_1.createJobsForComponentContext)(context),
14966
+ });
14967
+ })];
14979
14968
  }
14980
14969
  });
14981
14970
  }); };
@@ -15264,8 +15253,8 @@ var createMainPipeline = function (pipelineType, config) { return __awaiter(void
15264
15253
  // this is purely for better readability in git diffs when you add new components
15265
15254
  .sort(function (a, b) {
15266
15255
  var componentNames = Object.keys(config.components);
15267
- var aIndex = componentNames.findIndex(function (c) { return c === a.componentName; });
15268
- var bIndex = componentNames.findIndex(function (c) { return c === b.componentName; });
15256
+ var aIndex = componentNames.findIndex(function (c) { return c === a.context.componentName; });
15257
+ var bIndex = componentNames.findIndex(function (c) { return c === b.context.componentName; });
15269
15258
  return aIndex - bIndex;
15270
15259
  })
15271
15260
  .reduce(function (acc, _a) {
@@ -15595,7 +15584,8 @@ var getFullJobName = function (name, componentName, env) {
15595
15584
  };
15596
15585
  var getFullReferencedJobName = function (referencedJobName, componentName, env, allJobs) {
15597
15586
  var _a, _b;
15598
- var referencedJob = (_b = (_a = allJobs[componentName]) === null || _a === void 0 ? void 0 : _a[env]) === null || _b === void 0 ? void 0 : _b.find(function (j) { return j.name === referencedJobName; });
15587
+ var referencedJob = (_b = (_a = allJobs
15588
+ .find(function (j) { return j.context.componentName === componentName && j.context.env === env; })) === null || _a === void 0 ? void 0 : _a.jobs) === null || _b === void 0 ? void 0 : _b.find(function (j) { return j.name === referencedJobName; });
15599
15589
  if (!referencedJob) {
15600
15590
  throw new Error("unknown job referenced: '".concat(referencedJobName, "' from '").concat(env, ":").concat(componentName, "'"));
15601
15591
  }
@@ -15605,14 +15595,19 @@ var getFullReferencedJobName = function (referencedJobName, componentName, env,
15605
15595
  var getJobName = function (need) {
15606
15596
  return (0, lodash_1.isObject)(need) ? need.job : need;
15607
15597
  };
15608
- var makeGitlabJob = function (componentName, env, _a, allJobs, baseRules) {
15598
+ var makeGitlabJob = function (context, _a, allJobs, baseRules) {
15609
15599
  var _b, _c;
15610
- var environment = _a.environment, envMode = _a.envMode, needsStages = _a.needsStages, needsOtherComponent = _a.needsOtherComponent, name = _a.name, needs = _a.needs, jobTags = _a.jobTags, script = _a.script, context = _a.context, variables = _a.variables, runnerVariables = _a.runnerVariables, when = _a.when, job = __rest(_a, ["environment", "envMode", "needsStages", "needsOtherComponent", "name", "needs", "jobTags", "script", "context", "variables", "runnerVariables", "when"]);
15611
- var stage = envMode === "stagePerEnv" ? "".concat(job.stage, " ").concat(env) : job.stage;
15600
+ var environment = _a.environment, envMode = _a.envMode, needsStages = _a.needsStages, needsOtherComponent = _a.needsOtherComponent, name = _a.name, needs = _a.needs, jobTags = _a.jobTags, script = _a.script, variables = _a.variables, runnerVariables = _a.runnerVariables, when = _a.when, job = __rest(_a, ["environment", "envMode", "needsStages", "needsOtherComponent", "name", "needs", "jobTags", "script", "variables", "runnerVariables", "when"]);
15601
+ var stage = envMode === "stagePerEnv" ? "".concat(job.stage, " ").concat(context.env) : job.stage;
15612
15602
  var needsFromStages = needsStages === null || needsStages === void 0 ? void 0 : needsStages.flatMap(function (n) {
15613
- var _a, _b, _c, _d;
15614
- var referencedComponentName = componentName;
15615
- var allJobNamesFromThatStage = (_d = (_c = (_b = (_a = allJobs[referencedComponentName]) === null || _a === void 0 ? void 0 : _a[env]) === null || _b === void 0 ? void 0 : _b.filter(function (j) { return j.stage === n.stage; })) === null || _c === void 0 ? void 0 : _c.map(function (j) { return j.name; })) !== null && _d !== void 0 ? _d : [];
15603
+ var _a, _b, _c;
15604
+ var referencedComponentName = context.componentName;
15605
+ var allJobNamesFromThatStage = (_c = (_b = (_a = allJobs
15606
+ .filter(function (j) {
15607
+ return j.context.componentName === referencedComponentName &&
15608
+ j.context.env === context.env;
15609
+ })
15610
+ .flatMap(function (j) { return j.jobs; })) === null || _a === void 0 ? void 0 : _a.filter(function (j) { return j.stage === n.stage; })) === null || _b === void 0 ? void 0 : _b.map(function (j) { return j.name; })) !== null && _c !== void 0 ? _c : [];
15616
15611
  return allJobNamesFromThatStage.map(function (job) {
15617
15612
  var _a;
15618
15613
  return ({
@@ -15627,13 +15622,13 @@ var makeGitlabJob = function (componentName, env, _a, allJobs, baseRules) {
15627
15622
  var _a;
15628
15623
  return (0, lodash_1.isObject)(n)
15629
15624
  ? {
15630
- job: getFullReferencedJobName(n.job, (_a = n.componentName) !== null && _a !== void 0 ? _a : componentName, env, allJobs),
15625
+ job: getFullReferencedJobName(n.job, (_a = n.componentName) !== null && _a !== void 0 ? _a : context.componentName, context.env, allJobs),
15631
15626
  artifacts: n.artifacts,
15632
15627
  }
15633
- : getFullReferencedJobName(n, componentName, env, allJobs);
15628
+ : getFullReferencedJobName(n, context.componentName, context.env, allJobs);
15634
15629
  }).sort(function (a, b) { return getJobName(a).localeCompare(getJobName(b)); });
15635
15630
  var deduplicatedGitlabNeeds = __spreadArray([], __read(new Map(gitlabNeeds.map(function (n) { return [(0, lodash_1.isObject)(n) ? n.job : n, n]; })).values()), false);
15636
- var fullJobName = getFullJobName(name, componentName, envMode !== "none" ? env : undefined);
15631
+ var fullJobName = getFullJobName(name, context.componentName, envMode !== "none" ? context.env : undefined);
15637
15632
  // backwards compatibility, some may still use KUBERNETES_CPU_REQUEST, KUBERNETES_MEMORY_REQUEST, etc. in variables.
15638
15633
  // those should now be set in the runnerVariables as they don't work in the variables key of the catladder job, becuase those get injected
15639
15634
  var PIPELINE_RUNNER_VARIABLES = [
@@ -15663,7 +15658,7 @@ var makeGitlabJob = function (componentName, env, _a, allJobs, baseRules) {
15663
15658
  : [])), false);
15664
15659
  var modified = addGitlabEnvironment(context, environment, __assign(__assign({}, job), { rules: rules.length > 0 ? rules : undefined, variables: __assign(__assign({}, legacyRunnerVariables), runnerVariables), script: __spreadArray(__spreadArray([], __read(varsInjectScripts), false), __read(((_c = script === null || script === void 0 ? void 0 : script.filter(utils_1.notNil)) !== null && _c !== void 0 ? _c : [])), false), tags: jobTags, stage: stage,
15665
15660
  // sort in a predictable manner for snapshot tests
15666
- needs: deduplicatedGitlabNeeds, retry: defaults_1.BASE_RETRY, interruptible: true }), componentName, env, allJobs);
15661
+ needs: deduplicatedGitlabNeeds, retry: defaults_1.BASE_RETRY, interruptible: true }), context.componentName, context.env, allJobs);
15667
15662
  return [fullJobName, (0, removeUndefined_1.removeUndefined)(modified)];
15668
15663
  };
15669
15664
  exports.makeGitlabJob = makeGitlabJob;
@@ -15696,19 +15691,15 @@ allJobs) {
15696
15691
  };
15697
15692
  var createGitlabJobs = function (allJobs, baseRules) { return __awaiter(void 0, void 0, void 0, function () {
15698
15693
  return __generator(this, function (_a) {
15699
- return [2 /*return*/, Object.keys(allJobs).flatMap(function (componentName) {
15700
- var componentJobs = allJobs[componentName];
15701
- return Object.keys(componentJobs).flatMap(function (env) {
15702
- var jobs = componentJobs[env];
15703
- return jobs.flatMap(function (job) {
15704
- var _a = __read((0, exports.makeGitlabJob)(componentName, env, job, allJobs, baseRules), 2), fullJobName = _a[0], gitlabJob = _a[1];
15705
- return {
15706
- name: fullJobName,
15707
- gitlabJob: gitlabJob,
15708
- componentName: componentName,
15709
- env: env,
15710
- };
15711
- });
15694
+ return [2 /*return*/, allJobs.flatMap(function (_a) {
15695
+ var context = _a.context, jobs = _a.jobs;
15696
+ return jobs.map(function (job) {
15697
+ var _a = __read((0, exports.makeGitlabJob)(context, job, allJobs, baseRules), 2), fullJobName = _a[0], gitlabJob = _a[1];
15698
+ return {
15699
+ name: fullJobName,
15700
+ gitlabJob: gitlabJob,
15701
+ context: context,
15702
+ };
15712
15703
  });
15713
15704
  })];
15714
15705
  });
package/dist/cli/src/catenv.js CHANGED
@@ -6,9 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
6
6
  var catenv_1 = __importDefault(require("./apps/catenv/catenv"));
7
7
  var parseChoice_1 = require("./config/parseChoice");
8
8
  var choice = process.argv[2] ? (0, parseChoice_1.parseChoice)(process.argv[2]) : null;
9
- var now = performance.now();
10
9
  (0, catenv_1.default)(choice).then(function () {
11
- console.log("catenv", performance.now() - now);
12
10
  // we have to exit manually, because we have some file watches
13
11
  process.exit();
14
12
  });
package/dist/cli/src/catenv.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"catenv.js","sourceRoot":"","sources":["../../../src/catenv.ts"],"names":[],"mappings":";;;;;AAAA,gEAA0C;AAE1C,oDAAmD;AAEnD,IAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAA,yBAAW,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AAErE,IAAM,GAAG,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC;AAC9B,IAAA,gBAAM,EAAC,MAAM,CAAC,CAAC,IAAI,CAAC;IAClB,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,EAAE,GAAG,GAAG,CAAC,CAAC;IAC/C,8DAA8D;IAC9D,OAAO,CAAC,IAAI,EAAE,CAAC;AACjB,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"catenv.js","sourceRoot":"","sources":["../../../src/catenv.ts"],"names":[],"mappings":";;;;;AAAA,gEAA0C;AAE1C,oDAAmD;AAEnD,IAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAA,yBAAW,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AAErE,IAAA,gBAAM,EAAC,MAAM,CAAC,CAAC,IAAI,CAAC;IAClB,8DAA8D;IAC9D,OAAO,CAAC,IAAI,EAAE,CAAC;AACjB,CAAC,CAAC,CAAC"}
package/dist/pipeline/src/context/createComponentContext.js CHANGED
@@ -85,6 +85,7 @@ var createComponentContext = function (ctx) { return __awaiter(void 0, void 0, v
85
85
  context = {
86
86
  fullConfig: ctx.config,
87
87
  componentConfig: componentConfig,
88
+ env: ctx.env,
88
89
  build: {
89
90
  dir: dir,
90
91
  config: build,
package/dist/pipeline/src/context/createComponentContext.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"createComponentContext.js","sourceRoot":"","sources":["../../../../../pipeline/src/context/createComponentContext.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iCAAoC;AACpC,kCAAuC;AAEvC,oCAAyC;AAMzC,kCAAkD;AAClD,mDAAkD;AAClD,iEAAgE;AAChE,6DAA+E;AAUxE,IAAM,sBAAsB,GAAG,UACpC,GAAkC;;;;;gBAElC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE,CAAC;oBAC5C,MAAM,IAAI,KAAK,CACb,kEAAkE,CACnE,CAAC;gBACJ,CAAC;gBAE0B,qBAAM,IAAA,kDAAiC,EAChE,GAAG,CAAC,MAAM,EACV,GAAG,CAAC,aAAa,CAClB,EAAA;;gBAHK,kBAAkB,GAAG,SAG1B;gBAEK,UAAU,GAAG,IAAA,6CAAqB,EAAC,GAAG,CAAC,CAAC;gBAExC,8BAA8B,GAAG,UAAU,CAAC,YAAY,CAAC;gBACzD,QAAQ,GAGV,8BAA8B,CAAC,MAAM;oBACvC,CAAC,CAAC;wBACE,KAAK,EACH,mBAAW,CACT,8BAA8B,CAAC,KAAK,CAAC,IAAuB,CAC7D,CAAC,QAAQ,CAAC,UAAU,CAAC;wBACxB,MAAM,EAAE,qBAAY,CAClB,8BAA8B,CAAC,MAAM,CAAC,IAAwB,CAC/D,CAAC,QAAQ,CAAC,UAAiB,CAAC;qBAC9B;oBACH,CAAC,CAAC;wBACE,KAAK,EAAE,EAAE;wBACT,MAAM,EAAE,EAAE;qBACX,CAAC;gBACA,eAAe,GAAG,IAAA,8BAAsB,EAC5C,QAAQ,EACR,8BAA8B,CAC/B,CAAC;gBAEkB,qBAAM,IAAA,+BAAc,EAAC,GAAG,CAAC,EAAA;;gBAAvC,WAAW,GAAG,SAAyB;gBACrC,MAAM,GAA6B,eAAe,OAA5C,EAAE,KAAK,GAAsB,eAAe,MAArC,EAAE,UAAU,GAAU,eAAe,WAAzB,EAAE,GAAG,GAAK,eAAe,IAApB,CAAqB;gBACrD,OAAO,GAAyC;oBACpD,UAAU,EAAE,GAAG,CAAC,MAAM;oBACtB,eAAe,iBAAA;oBAEf,KAAK,EAAE;wBACL,GAAG,EAAE,GAAG;wBACR,MAAM,EAAE,KAAK;qBACd;oBACD,MAAM,EAAE,MAAM;wBACZ,CAAC,CAAC;4BACE,MAAM,EAAE,MAAM;yBACf;wBACH,CAAC,CAAC,IAAI;oBACR,aAAa,EAAE,GAAG,CAAC,aAAa;oBAChC,WAAW,aAAA;oBACX,kBAAkB,EAAE,kBAAkB;oBACtC,YAAY,EAAE,GAAG,CAAC,YAAY;oBAC9B,OAAO,EAAE,GAAG,CAAC,OAAO;iBACrB,CAAC;gBACI,kBAAkB,GAAG,IAAA,mBAAU,EAAC,UAAU,CAAC;oBAC/C,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC;oBACrB,CAAC,CAAC,UAAU,CAAC;gBACf,4CACK,OAAO,KACV,UAAU,EAAE,kBAAkB,KAC9B;;;KACH,CAAC;AAnEW,QAAA,sBAAsB,0BAmEjC;AAEF;;GAEG;AACU,QAAA,aAAa,GAAG,8BAAsB,CAAC"}
1
+ {"version":3,"file":"createComponentContext.js","sourceRoot":"","sources":["../../../../../pipeline/src/context/createComponentContext.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iCAAoC;AACpC,kCAAuC;AAEvC,oCAAyC;AAMzC,kCAAkD;AAClD,mDAAkD;AAClD,iEAAgE;AAChE,6DAA+E;AAUxE,IAAM,sBAAsB,GAAG,UACpC,GAAkC;;;;;gBAElC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE,CAAC;oBAC5C,MAAM,IAAI,KAAK,CACb,kEAAkE,CACnE,CAAC;gBACJ,CAAC;gBAE0B,qBAAM,IAAA,kDAAiC,EAChE,GAAG,CAAC,MAAM,EACV,GAAG,CAAC,aAAa,CAClB,EAAA;;gBAHK,kBAAkB,GAAG,SAG1B;gBAEK,UAAU,GAAG,IAAA,6CAAqB,EAAC,GAAG,CAAC,CAAC;gBAExC,8BAA8B,GAAG,UAAU,CAAC,YAAY,CAAC;gBACzD,QAAQ,GAGV,8BAA8B,CAAC,MAAM;oBACvC,CAAC,CAAC;wBACE,KAAK,EACH,mBAAW,CACT,8BAA8B,CAAC,KAAK,CAAC,IAAuB,CAC7D,CAAC,QAAQ,CAAC,UAAU,CAAC;wBACxB,MAAM,EAAE,qBAAY,CAClB,8BAA8B,CAAC,MAAM,CAAC,IAAwB,CAC/D,CAAC,QAAQ,CAAC,UAAiB,CAAC;qBAC9B;oBACH,CAAC,CAAC;wBACE,KAAK,EAAE,EAAE;wBACT,MAAM,EAAE,EAAE;qBACX,CAAC;gBACA,eAAe,GAAG,IAAA,8BAAsB,EAC5C,QAAQ,EACR,8BAA8B,CAC/B,CAAC;gBAEkB,qBAAM,IAAA,+BAAc,EAAC,GAAG,CAAC,EAAA;;gBAAvC,WAAW,GAAG,SAAyB;gBACrC,MAAM,GAA6B,eAAe,OAA5C,EAAE,KAAK,GAAsB,eAAe,MAArC,EAAE,UAAU,GAAU,eAAe,WAAzB,EAAE,GAAG,GAAK,eAAe,IAApB,CAAqB;gBACrD,OAAO,GAAyC;oBACpD,UAAU,EAAE,GAAG,CAAC,MAAM;oBACtB,eAAe,iBAAA;oBACf,GAAG,EAAE,GAAG,CAAC,GAAG;oBAEZ,KAAK,EAAE;wBACL,GAAG,EAAE,GAAG;wBACR,MAAM,EAAE,KAAK;qBACd;oBACD,MAAM,EAAE,MAAM;wBACZ,CAAC,CAAC;4BACE,MAAM,EAAE,MAAM;yBACf;wBACH,CAAC,CAAC,IAAI;oBACR,aAAa,EAAE,GAAG,CAAC,aAAa;oBAChC,WAAW,aAAA;oBACX,kBAAkB,EAAE,kBAAkB;oBACtC,YAAY,EAAE,GAAG,CAAC,YAAY;oBAC9B,OAAO,EAAE,GAAG,CAAC,OAAO;iBACrB,CAAC;gBACI,kBAAkB,GAAG,IAAA,mBAAU,EAAC,UAAU,CAAC;oBAC/C,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC;oBACrB,CAAC,CAAC,UAAU,CAAC;gBACf,4CACK,OAAO,KACV,UAAU,EAAE,kBAAkB,KAC9B;;;KACH,CAAC;AApEW,QAAA,sBAAsB,0BAoEjC;AAEF;;GAEG;AACU,QAAA,aAAa,GAAG,8BAAsB,CAAC"}
package/dist/pipeline/src/pipeline/createAllJobs.d.ts CHANGED
@@ -1,9 +1,9 @@
1
- import type { CatladderJobWithContext, Config, PipelineTrigger, PipelineType } from "../types";
2
- export type AllCatladderJobs = {
3
- [componentName: string]: {
4
- [env: string]: Array<CatladderJobWithContext>;
5
- };
6
- };
1
+ import type { ComponentContext, Config, PipelineTrigger, PipelineType } from "../types";
2
+ import type { CatladderJob } from "../types/jobs";
3
+ export type AllCatladderJobs = Array<{
4
+ context: ComponentContext;
5
+ jobs: Array<CatladderJob>;
6
+ }>;
7
7
  export type AllJobsContext = {
8
8
  config: Config;
9
9
  trigger: PipelineTrigger;
package/dist/pipeline/src/pipeline/createAllJobs.js CHANGED
@@ -1,15 +1,4 @@
1
1
  "use strict";
2
- var __assign = (this && this.__assign) || function () {
3
- __assign = Object.assign || function(t) {
4
- for (var s, i = 1, n = arguments.length; i < n; i++) {
5
- s = arguments[i];
6
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
7
- t[p] = s[p];
8
- }
9
- return t;
10
- };
11
- return __assign.apply(this, arguments);
12
- };
13
2
  var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
14
3
  function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
15
4
  return new (P || (P = Promise))(function (resolve, reject) {
@@ -95,14 +84,13 @@ var createAllJobs = function (_a) { return __awaiter(void 0, [_a], void 0, funct
95
84
  })];
96
85
  case 1:
97
86
  allComponentContext = _c.sent();
98
- return [2 /*return*/, allComponentContext.reduce(function (acc, _a) {
99
- var componentName = _a.componentName, env = _a.env, context = _a.context;
100
- if (!acc[componentName]) {
101
- acc[componentName] = {};
102
- }
103
- acc[componentName][env] = (0, createJobsForComponent_1.createJobsForComponentContext)(context).map(function (job) { return (__assign(__assign({}, job), { context: context })); });
104
- return acc;
105
- }, {})];
87
+ return [2 /*return*/, allComponentContext.map(function (_a) {
88
+ var context = _a.context;
89
+ return ({
90
+ context: context,
91
+ jobs: (0, createJobsForComponent_1.createJobsForComponentContext)(context),
92
+ });
93
+ })];
106
94
  }
107
95
  });
108
96
  }); };
package/dist/pipeline/src/pipeline/createAllJobs.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"createAllJobs.js","sourceRoot":"","sources":["../../../../../pipeline/src/pipeline/createAllJobs.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oCAAgD;AAChD,sCAAoD;AAQpD,mEAAyE;AAczE,IAAM,yBAAyB,GAAG,iEAAO,EAIxB;QAHf,MAAM,YAAA,EACN,OAAO,aAAA,EACP,YAAY,kBAAA;;;oBAQL,qBAAM,OAAO,CAAC,GAAG,CACtB,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,UAAC,aAAa;oBACnD,IAAM,IAAI,GAAG,IAAA,4BAAmB,EAAC,MAAM,EAAE,aAAa,EAAE,OAAO,CAAC,CAAC;oBACjE,OAAO,IAAI,CAAC,GAAG,CAAC,UAAO,GAAG;;;;wCACR,qBAAM,IAAA,gCAAsB,EAAC;wCAC3C,MAAM,QAAA;wCACN,aAAa,eAAA;wCACb,GAAG,KAAA;wCACH,OAAO,SAAA;wCACP,YAAY,cAAA;qCACb,CAAC,EAAA;;oCANI,OAAO,GAAG,SAMd;oCAEF,sBAAO;4CACL,GAAG,KAAA;4CACH,aAAa,eAAA;4CACb,OAAO,SAAA;yCACR,EAAC;;;yBACH,CAAC,CAAC;gBACL,CAAC,CAAC,CACH,EAAA;oBAnBD,sBAAO,SAmBN,EAAC;;;KACH,CAAC;AAEK,IAAM,aAAa,GAAG,iEAAO,EAInB;;QAHf,MAAM,YAAA,EACN,OAAO,aAAA,EACP,YAAY,kBAAA;;;oBAEgB,qBAAM,yBAAyB,CAAC;oBAC1D,MAAM,QAAA;oBACN,OAAO,SAAA;oBACP,YAAY,cAAA;iBACb,CAAC,EAAA;;gBAJI,mBAAmB,GAAG,SAI1B;gBAEF,sBAAO,mBAAmB,CAAC,MAAM,CAAC,UAAC,GAAG,EAAE,EAA+B;4BAA7B,aAAa,mBAAA,EAAE,GAAG,SAAA,EAAE,OAAO,aAAA;wBACnE,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE,CAAC;4BACxB,GAAG,CAAC,aAAa,CAAC,GAAG,EAAE,CAAC;wBAC1B,CAAC;wBACD,GAAG,CAAC,aAAa,CAAC,CAAC,GAAG,CAAC,GAAG,IAAA,sDAA6B,EAAC,OAAO,CAAC,CAAC,GAAG,CAClE,UAAC,GAAG,IAAK,OAAA,uBACJ,GAAG,KACN,OAAO,SAAA,IACP,EAHO,CAGP,CACH,CAAC;wBAEF,OAAO,GAAG,CAAC;oBACb,CAAC,EAAE,EAAsB,CAAC,EAAC;;;KAC5B,CAAC;AAxBW,QAAA,aAAa,iBAwBxB"}
1
+ {"version":3,"file":"createAllJobs.js","sourceRoot":"","sources":["../../../../../pipeline/src/pipeline/createAllJobs.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oCAAgD;AAChD,sCAAoD;AAQpD,mEAAyE;AAazE,IAAM,yBAAyB,GAAG,iEAAO,EAIxB;QAHf,MAAM,YAAA,EACN,OAAO,aAAA,EACP,YAAY,kBAAA;;;oBAQL,qBAAM,OAAO,CAAC,GAAG,CACtB,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,UAAC,aAAa;oBACnD,IAAM,IAAI,GAAG,IAAA,4BAAmB,EAAC,MAAM,EAAE,aAAa,EAAE,OAAO,CAAC,CAAC;oBACjE,OAAO,IAAI,CAAC,GAAG,CAAC,UAAO,GAAG;;;;wCACR,qBAAM,IAAA,gCAAsB,EAAC;wCAC3C,MAAM,QAAA;wCACN,aAAa,eAAA;wCACb,GAAG,KAAA;wCACH,OAAO,SAAA;wCACP,YAAY,cAAA;qCACb,CAAC,EAAA;;oCANI,OAAO,GAAG,SAMd;oCAEF,sBAAO;4CACL,GAAG,KAAA;4CACH,aAAa,eAAA;4CACb,OAAO,SAAA;yCACR,EAAC;;;yBACH,CAAC,CAAC;gBACL,CAAC,CAAC,CACH,EAAA;oBAnBD,sBAAO,SAmBN,EAAC;;;KACH,CAAC;AAEK,IAAM,aAAa,GAAG,iEAAO,EAInB;;QAHf,MAAM,YAAA,EACN,OAAO,aAAA,EACP,YAAY,kBAAA;;;oBAEgB,qBAAM,yBAAyB,CAAC;oBAC1D,MAAM,QAAA;oBACN,OAAO,SAAA;oBACP,YAAY,cAAA;iBACb,CAAC,EAAA;;gBAJI,mBAAmB,GAAG,SAI1B;gBAEF,sBAAO,mBAAmB,CAAC,GAAG,CAAC,UAAC,EAAW;4BAAT,OAAO,aAAA;wBAAO,OAAA,CAAC;4BAC/C,OAAO,SAAA;4BACP,IAAI,EAAE,IAAA,sDAA6B,EAAC,OAAO,CAAC;yBAC7C,CAAC;oBAH8C,CAG9C,CAAC,EAAC;;;KACL,CAAC;AAfW,QAAA,aAAa,iBAexB"}
package/dist/pipeline/src/pipeline/createMainPipeline.js CHANGED
@@ -107,8 +107,8 @@ var createMainPipeline = function (pipelineType, config) { return __awaiter(void
107
107
  // this is purely for better readability in git diffs when you add new components
108
108
  .sort(function (a, b) {
109
109
  var componentNames = Object.keys(config.components);
110
- var aIndex = componentNames.findIndex(function (c) { return c === a.componentName; });
111
- var bIndex = componentNames.findIndex(function (c) { return c === b.componentName; });
110
+ var aIndex = componentNames.findIndex(function (c) { return c === a.context.componentName; });
111
+ var bIndex = componentNames.findIndex(function (c) { return c === b.context.componentName; });
112
112
  return aIndex - bIndex;
113
113
  })
114
114
  .reduce(function (acc, _a) {
package/dist/pipeline/src/pipeline/createMainPipeline.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"createMainPipeline.js","sourceRoot":"","sources":["../../../../../pipeline/src/pipeline/createMainPipeline.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kCAKkB;AAQlB,0CAAqE;AACrE,iDAAgD;AAChD,yDAAwD;AACxD,8DAA6D;AAC7D,sEAAiF;AACjF,gEAAkE;AAE3D,IAAM,kBAAkB,GAAG,UAChC,YAAe,EACf,MAAc;;;;;gBAER,MAAM,GAAG,IAAA,qCAAiB,EAAC,MAAM,CAAC,CAAC;qBAErC,CAAA,YAAY,KAAK,QAAQ,CAAA,EAAzB,wBAAyB;gBAGD,qBAAM,OAAO,CAAC,GAAG,CACzC,8BAAqB,CAAC,GAAG,CACvB,UAAO,OAAO;;;;;oCACN,KAAA,mCAAgB,CAAA;oCACpB,qBAAM,IAAA,6BAAa,EAAC,EAAE,MAAM,QAAA,EAAE,OAAO,SAAA,EAAE,YAAY,cAAA,EAAE,CAAC,EAAA;wCADxD,qBAAM,kBACJ,SAAsD,EACtD,wBAAwB,CAAC,OAAO,CAAC,EAClC,EAAA;wCAHD,sBAAA,SAGC,EAAA;;;yBAAA,CACJ,CACF,EAAA;;gBARK,iBAAiB,GAAG,SAQzB;gBAEK,OAAO,GAAG,iBAAiB;qBAC9B,IAAI,EAAE;oBACP,uEAAuE;oBACvE,iFAAiF;qBAChF,IAAI,CAAC,UAAC,CAAC,EAAE,CAAC;oBACT,IAAM,cAAc,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;oBACtD,IAAM,MAAM,GAAG,cAAc,CAAC,SAAS,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,KAAK,CAAC,CAAC,aAAa,EAArB,CAAqB,CAAC,CAAC;oBACtE,IAAM,MAAM,GAAG,cAAc,CAAC,SAAS,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,KAAK,CAAC,CAAC,aAAa,EAArB,CAAqB,CAAC,CAAC;oBACtE,OAAO,MAAM,GAAG,MAAM,CAAC;gBACzB,CAAC,CAAC;qBAED,MAAM,CACL,UAAC,GAAG,EAAE,EAAmB;;wBAAjB,SAAS,eAAA,EAAE,IAAI,UAAA;oBACrB,yDAAyD;oBACzD,oIAAoI;oBACpI,IAAI,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;wBACd,GAAG,CAAC,IAAI,CAAC,CAAC,KAAK,0CACV,CAAC,MAAA,GAAG,CAAC,IAAI,CAAC,CAAC,KAAK,mCAAI,EAAE,CAAC,kBACvB,CAAC,MAAA,SAAS,CAAC,KAAK,mCAAI,EAAE,CAAC,SAC3B,CAAC;oBACJ,CAAC;yBAAM,CAAC;wBACN,GAAG,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC;oBACxB,CAAC;oBAED,OAAO,GAAG,CAAC;gBACb,CAAC,EACD,EAAqC,CACtC,CAAC;gBAEJ,sBAAO,IAAA,uDAAgC,EAAC;wBACtC,MAAM,yCAAM,MAAM,YAAE,SAAS,SAAC;wBAC9B,IAAI,wBACC,OAAO,GACP,IAAA,wCAAoB,GAAE,CAC1B;qBACF,CAAgB,EAAC;oBAEpB,MAAM,IAAI,KAAK,CAAC,UAAG,YAAY,sBAAmB,CAAC,CAAC;;;KACrD,CAAC;AAzDW,QAAA,kBAAkB,sBAyD7B;AACF,SAAS,wBAAwB,CAAC,OAAwB;IACxD,qCAAqC;IACrC,uBAAuB;IACvB,wBAAwB;IACxB,QAAQ,OAAO,EAAE,CAAC;QAChB,KAAK,YAAY;YACf,OAAO,CAAC,oCAA4B,EAAE,2BAAmB,CAAC,CAAC;QAC7D,KAAK,IAAI;YACP,OAAO,CAAC,6BAAqB,CAAC,CAAC;QACjC,KAAK,eAAe;YAClB,OAAO,CAAC,8BAAsB,CAAC,CAAC;IACpC,CAAC;AACH,CAAC"}
1
+ {"version":3,"file":"createMainPipeline.js","sourceRoot":"","sources":["../../../../../pipeline/src/pipeline/createMainPipeline.ts"],"names":[],"mappings":"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"}
package/dist/pipeline/src/pipeline/gitlab/createGitlabJobs.d.ts CHANGED
@@ -1,11 +1,11 @@
1
- import type { CatladderJobWithContext, GitlabJobDef, GitlabRule } from "../../types";
1
+ import type { ComponentContext, GitlabJobDef, GitlabRule } from "../../types";
2
+ import type { CatladderJob } from "../../types/jobs";
2
3
  import type { AllCatladderJobs } from "../createAllJobs";
3
4
  export type AllGitlabJobs = {
4
5
  name: string;
5
6
  gitlabJob: GitlabJobDef;
6
- componentName: string;
7
- env: string;
7
+ context: ComponentContext;
8
8
  }[];
9
9
  export declare const GITLAB_ENVIRONMENT_URL_VARIABLE = "CL_GITLAB_ENVIRONMENT_URL";
10
- export declare const makeGitlabJob: (componentName: string, env: string, { environment, envMode, needsStages, needsOtherComponent, name, needs, jobTags, script, context, variables, runnerVariables, when, ...job }: CatladderJobWithContext<string>, allJobs: AllCatladderJobs, baseRules?: GitlabRule[]) => [fullName: string, job: GitlabJobDef];
10
+ export declare const makeGitlabJob: (context: ComponentContext, { environment, envMode, needsStages, needsOtherComponent, name, needs, jobTags, script, variables, runnerVariables, when, ...job }: CatladderJob<string>, allJobs: AllCatladderJobs, baseRules?: GitlabRule[]) => [fullName: string, job: GitlabJobDef];
11
11
  export declare const createGitlabJobs: (allJobs: AllCatladderJobs, baseRules?: GitlabRule[]) => Promise<AllGitlabJobs>;
package/dist/pipeline/src/pipeline/gitlab/createGitlabJobs.js CHANGED
@@ -99,7 +99,8 @@ var getFullJobName = function (name, componentName, env) {
99
99
  };
100
100
  var getFullReferencedJobName = function (referencedJobName, componentName, env, allJobs) {
101
101
  var _a, _b;
102
- var referencedJob = (_b = (_a = allJobs[componentName]) === null || _a === void 0 ? void 0 : _a[env]) === null || _b === void 0 ? void 0 : _b.find(function (j) { return j.name === referencedJobName; });
102
+ var referencedJob = (_b = (_a = allJobs
103
+ .find(function (j) { return j.context.componentName === componentName && j.context.env === env; })) === null || _a === void 0 ? void 0 : _a.jobs) === null || _b === void 0 ? void 0 : _b.find(function (j) { return j.name === referencedJobName; });
103
104
  if (!referencedJob) {
104
105
  throw new Error("unknown job referenced: '".concat(referencedJobName, "' from '").concat(env, ":").concat(componentName, "'"));
105
106
  }
@@ -109,14 +110,19 @@ var getFullReferencedJobName = function (referencedJobName, componentName, env,
109
110
  var getJobName = function (need) {
110
111
  return (0, lodash_1.isObject)(need) ? need.job : need;
111
112
  };
112
- var makeGitlabJob = function (componentName, env, _a, allJobs, baseRules) {
113
+ var makeGitlabJob = function (context, _a, allJobs, baseRules) {
113
114
  var _b, _c;
114
- var environment = _a.environment, envMode = _a.envMode, needsStages = _a.needsStages, needsOtherComponent = _a.needsOtherComponent, name = _a.name, needs = _a.needs, jobTags = _a.jobTags, script = _a.script, context = _a.context, variables = _a.variables, runnerVariables = _a.runnerVariables, when = _a.when, job = __rest(_a, ["environment", "envMode", "needsStages", "needsOtherComponent", "name", "needs", "jobTags", "script", "context", "variables", "runnerVariables", "when"]);
115
- var stage = envMode === "stagePerEnv" ? "".concat(job.stage, " ").concat(env) : job.stage;
115
+ var environment = _a.environment, envMode = _a.envMode, needsStages = _a.needsStages, needsOtherComponent = _a.needsOtherComponent, name = _a.name, needs = _a.needs, jobTags = _a.jobTags, script = _a.script, variables = _a.variables, runnerVariables = _a.runnerVariables, when = _a.when, job = __rest(_a, ["environment", "envMode", "needsStages", "needsOtherComponent", "name", "needs", "jobTags", "script", "variables", "runnerVariables", "when"]);
116
+ var stage = envMode === "stagePerEnv" ? "".concat(job.stage, " ").concat(context.env) : job.stage;
116
117
  var needsFromStages = needsStages === null || needsStages === void 0 ? void 0 : needsStages.flatMap(function (n) {
117
- var _a, _b, _c, _d;
118
- var referencedComponentName = componentName;
119
- var allJobNamesFromThatStage = (_d = (_c = (_b = (_a = allJobs[referencedComponentName]) === null || _a === void 0 ? void 0 : _a[env]) === null || _b === void 0 ? void 0 : _b.filter(function (j) { return j.stage === n.stage; })) === null || _c === void 0 ? void 0 : _c.map(function (j) { return j.name; })) !== null && _d !== void 0 ? _d : [];
118
+ var _a, _b, _c;
119
+ var referencedComponentName = context.componentName;
120
+ var allJobNamesFromThatStage = (_c = (_b = (_a = allJobs
121
+ .filter(function (j) {
122
+ return j.context.componentName === referencedComponentName &&
123
+ j.context.env === context.env;
124
+ })
125
+ .flatMap(function (j) { return j.jobs; })) === null || _a === void 0 ? void 0 : _a.filter(function (j) { return j.stage === n.stage; })) === null || _b === void 0 ? void 0 : _b.map(function (j) { return j.name; })) !== null && _c !== void 0 ? _c : [];
120
126
  return allJobNamesFromThatStage.map(function (job) {
121
127
  var _a;
122
128
  return ({
@@ -131,13 +137,13 @@ var makeGitlabJob = function (componentName, env, _a, allJobs, baseRules) {
131
137
  var _a;
132
138
  return (0, lodash_1.isObject)(n)
133
139
  ? {
134
- job: getFullReferencedJobName(n.job, (_a = n.componentName) !== null && _a !== void 0 ? _a : componentName, env, allJobs),
140
+ job: getFullReferencedJobName(n.job, (_a = n.componentName) !== null && _a !== void 0 ? _a : context.componentName, context.env, allJobs),
135
141
  artifacts: n.artifacts,
136
142
  }
137
- : getFullReferencedJobName(n, componentName, env, allJobs);
143
+ : getFullReferencedJobName(n, context.componentName, context.env, allJobs);
138
144
  }).sort(function (a, b) { return getJobName(a).localeCompare(getJobName(b)); });
139
145
  var deduplicatedGitlabNeeds = __spreadArray([], __read(new Map(gitlabNeeds.map(function (n) { return [(0, lodash_1.isObject)(n) ? n.job : n, n]; })).values()), false);
140
- var fullJobName = getFullJobName(name, componentName, envMode !== "none" ? env : undefined);
146
+ var fullJobName = getFullJobName(name, context.componentName, envMode !== "none" ? context.env : undefined);
141
147
  // backwards compatibility, some may still use KUBERNETES_CPU_REQUEST, KUBERNETES_MEMORY_REQUEST, etc. in variables.
142
148
  // those should now be set in the runnerVariables as they don't work in the variables key of the catladder job, becuase those get injected
143
149
  var PIPELINE_RUNNER_VARIABLES = [
@@ -167,7 +173,7 @@ var makeGitlabJob = function (componentName, env, _a, allJobs, baseRules) {
167
173
  : [])), false);
168
174
  var modified = addGitlabEnvironment(context, environment, __assign(__assign({}, job), { rules: rules.length > 0 ? rules : undefined, variables: __assign(__assign({}, legacyRunnerVariables), runnerVariables), script: __spreadArray(__spreadArray([], __read(varsInjectScripts), false), __read(((_c = script === null || script === void 0 ? void 0 : script.filter(utils_1.notNil)) !== null && _c !== void 0 ? _c : [])), false), tags: jobTags, stage: stage,
169
175
  // sort in a predictable manner for snapshot tests
170
- needs: deduplicatedGitlabNeeds, retry: defaults_1.BASE_RETRY, interruptible: true }), componentName, env, allJobs);
176
+ needs: deduplicatedGitlabNeeds, retry: defaults_1.BASE_RETRY, interruptible: true }), context.componentName, context.env, allJobs);
171
177
  return [fullJobName, (0, removeUndefined_1.removeUndefined)(modified)];
172
178
  };
173
179
  exports.makeGitlabJob = makeGitlabJob;
@@ -200,19 +206,15 @@ allJobs) {
200
206
  };
201
207
  var createGitlabJobs = function (allJobs, baseRules) { return __awaiter(void 0, void 0, void 0, function () {
202
208
  return __generator(this, function (_a) {
203
- return [2 /*return*/, Object.keys(allJobs).flatMap(function (componentName) {
204
- var componentJobs = allJobs[componentName];
205
- return Object.keys(componentJobs).flatMap(function (env) {
206
- var jobs = componentJobs[env];
207
- return jobs.flatMap(function (job) {
208
- var _a = __read((0, exports.makeGitlabJob)(componentName, env, job, allJobs, baseRules), 2), fullJobName = _a[0], gitlabJob = _a[1];
209
- return {
210
- name: fullJobName,
211
- gitlabJob: gitlabJob,
212
- componentName: componentName,
213
- env: env,
214
- };
215
- });
209
+ return [2 /*return*/, allJobs.flatMap(function (_a) {
210
+ var context = _a.context, jobs = _a.jobs;
211
+ return jobs.map(function (job) {
212
+ var _a = __read((0, exports.makeGitlabJob)(context, job, allJobs, baseRules), 2), fullJobName = _a[0], gitlabJob = _a[1];
213
+ return {
214
+ name: fullJobName,
215
+ gitlabJob: gitlabJob,
216
+ context: context,
217
+ };
216
218
  });
217
219
  })];
218
220
  });
package/dist/pipeline/src/pipeline/gitlab/createGitlabJobs.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"createGitlabJobs.js","sourceRoot":"","sources":["../../../../../../pipeline/src/pipeline/gitlab/createGitlabJobs.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"createGitlabJobs.js","sourceRoot":"","sources":["../../../../../../pipeline/src/pipeline/gitlab/createGitlabJobs.ts"],"names":[],"mappings":"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"}
package/dist/pipeline/src/types/context.d.ts CHANGED
@@ -3,7 +3,7 @@ import type { BuildConfig } from "../build";
3
3
  import type { PredefinedVariables, SecretEnvVar } from "../context";
4
4
  import type { DeployConfig } from "../deploy";
5
5
  import type { PipelineTrigger, ComponentConfig, Config, EnvType } from "./config";
6
- import type { BaseStage, CatladderJob } from "./jobs";
6
+ import type { CatladderJob } from "./jobs";
7
7
  import type { PipelineType } from "./pipeline";
8
8
  export type UnspecifiedEnvVars = Record<string, StringOrBashExpression | undefined | null>;
9
9
  export type EnvironmentEnvVars<V extends UnspecifiedEnvVars = UnspecifiedEnvVars> = {
@@ -75,6 +75,7 @@ export type DeployContext = {
75
75
  };
76
76
  export type ComponentContext = {
77
77
  componentName: string;
78
+ env: string;
78
79
  /**
79
80
  * the merged component config.
80
81
  *
@@ -92,6 +93,3 @@ export type ComponentContext = {
92
93
  customJobs?: CatladderJob[];
93
94
  };
94
95
  export type Context = ComponentContext;
95
- export type CatladderJobWithContext<S = BaseStage> = CatladderJob<S> & {
96
- context: ComponentContext;
97
- };