@catladder/cli 0.0.0-main-85a0b1ad → 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.
- package/dist/bundles/catenv/index.js +35 -45
- package/dist/bundles/cli/index.js +35 -45
- package/dist/pipeline/src/pipeline/createAllJobs.d.ts +6 -6
- package/dist/pipeline/src/pipeline/createAllJobs.js +7 -19
- package/dist/pipeline/src/pipeline/createAllJobs.js.map +1 -1
- package/dist/pipeline/src/pipeline/createMainPipeline.js +2 -2
- package/dist/pipeline/src/pipeline/createMainPipeline.js.map +1 -1
- package/dist/pipeline/src/pipeline/gitlab/createGitlabJobs.d.ts +4 -4
- package/dist/pipeline/src/pipeline/gitlab/createGitlabJobs.js +26 -24
- package/dist/pipeline/src/pipeline/gitlab/createGitlabJobs.js.map +1 -1
- package/dist/pipeline/src/types/context.d.ts +1 -4
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -7427,17 +7427,6 @@ exports["default"] = ownPkg;
|
|
|
7427
7427
|
|
|
7428
7428
|
"use strict";
|
|
7429
7429
|
|
|
7430
|
-
var __assign = (this && this.__assign) || function () {
|
|
7431
|
-
__assign = Object.assign || function(t) {
|
|
7432
|
-
for (var s, i = 1, n = arguments.length; i < n; i++) {
|
|
7433
|
-
s = arguments[i];
|
|
7434
|
-
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
|
|
7435
|
-
t[p] = s[p];
|
|
7436
|
-
}
|
|
7437
|
-
return t;
|
|
7438
|
-
};
|
|
7439
|
-
return __assign.apply(this, arguments);
|
|
7440
|
-
};
|
|
7441
7430
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
7442
7431
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
7443
7432
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -7523,14 +7512,13 @@ var createAllJobs = function (_a) { return __awaiter(void 0, [_a], void 0, funct
|
|
|
7523
7512
|
})];
|
|
7524
7513
|
case 1:
|
|
7525
7514
|
allComponentContext = _c.sent();
|
|
7526
|
-
return [2 /*return*/, allComponentContext.
|
|
7527
|
-
var
|
|
7528
|
-
|
|
7529
|
-
|
|
7530
|
-
|
|
7531
|
-
|
|
7532
|
-
|
|
7533
|
-
}, {})];
|
|
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
|
+
})];
|
|
7534
7522
|
}
|
|
7535
7523
|
});
|
|
7536
7524
|
}); };
|
|
@@ -7819,8 +7807,8 @@ var createMainPipeline = function (pipelineType, config) { return __awaiter(void
|
|
|
7819
7807
|
// this is purely for better readability in git diffs when you add new components
|
|
7820
7808
|
.sort(function (a, b) {
|
|
7821
7809
|
var componentNames = Object.keys(config.components);
|
|
7822
|
-
var aIndex = componentNames.findIndex(function (c) { return c === a.componentName; });
|
|
7823
|
-
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; });
|
|
7824
7812
|
return aIndex - bIndex;
|
|
7825
7813
|
})
|
|
7826
7814
|
.reduce(function (acc, _a) {
|
|
@@ -8150,7 +8138,8 @@ var getFullJobName = function (name, componentName, env) {
|
|
|
8150
8138
|
};
|
|
8151
8139
|
var getFullReferencedJobName = function (referencedJobName, componentName, env, allJobs) {
|
|
8152
8140
|
var _a, _b;
|
|
8153
|
-
var referencedJob = (_b = (_a = allJobs
|
|
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; });
|
|
8154
8143
|
if (!referencedJob) {
|
|
8155
8144
|
throw new Error("unknown job referenced: '".concat(referencedJobName, "' from '").concat(env, ":").concat(componentName, "'"));
|
|
8156
8145
|
}
|
|
@@ -8160,14 +8149,19 @@ var getFullReferencedJobName = function (referencedJobName, componentName, env,
|
|
|
8160
8149
|
var getJobName = function (need) {
|
|
8161
8150
|
return (0, lodash_1.isObject)(need) ? need.job : need;
|
|
8162
8151
|
};
|
|
8163
|
-
var makeGitlabJob = function (
|
|
8152
|
+
var makeGitlabJob = function (context, _a, allJobs, baseRules) {
|
|
8164
8153
|
var _b, _c;
|
|
8165
|
-
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,
|
|
8166
|
-
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;
|
|
8167
8156
|
var needsFromStages = needsStages === null || needsStages === void 0 ? void 0 : needsStages.flatMap(function (n) {
|
|
8168
|
-
var _a, _b, _c
|
|
8169
|
-
var referencedComponentName = componentName;
|
|
8170
|
-
var allJobNamesFromThatStage = (
|
|
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 : [];
|
|
8171
8165
|
return allJobNamesFromThatStage.map(function (job) {
|
|
8172
8166
|
var _a;
|
|
8173
8167
|
return ({
|
|
@@ -8182,13 +8176,13 @@ var makeGitlabJob = function (componentName, env, _a, allJobs, baseRules) {
|
|
|
8182
8176
|
var _a;
|
|
8183
8177
|
return (0, lodash_1.isObject)(n)
|
|
8184
8178
|
? {
|
|
8185
|
-
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),
|
|
8186
8180
|
artifacts: n.artifacts,
|
|
8187
8181
|
}
|
|
8188
|
-
: getFullReferencedJobName(n, componentName, env, allJobs);
|
|
8182
|
+
: getFullReferencedJobName(n, context.componentName, context.env, allJobs);
|
|
8189
8183
|
}).sort(function (a, b) { return getJobName(a).localeCompare(getJobName(b)); });
|
|
8190
8184
|
var deduplicatedGitlabNeeds = __spreadArray([], __read(new Map(gitlabNeeds.map(function (n) { return [(0, lodash_1.isObject)(n) ? n.job : n, n]; })).values()), false);
|
|
8191
|
-
var fullJobName = getFullJobName(name, componentName, envMode !== "none" ? env : undefined);
|
|
8185
|
+
var fullJobName = getFullJobName(name, context.componentName, envMode !== "none" ? context.env : undefined);
|
|
8192
8186
|
// backwards compatibility, some may still use KUBERNETES_CPU_REQUEST, KUBERNETES_MEMORY_REQUEST, etc. in variables.
|
|
8193
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
|
|
8194
8188
|
var PIPELINE_RUNNER_VARIABLES = [
|
|
@@ -8218,7 +8212,7 @@ var makeGitlabJob = function (componentName, env, _a, allJobs, baseRules) {
|
|
|
8218
8212
|
: [])), false);
|
|
8219
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,
|
|
8220
8214
|
// sort in a predictable manner for snapshot tests
|
|
8221
|
-
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);
|
|
8222
8216
|
return [fullJobName, (0, removeUndefined_1.removeUndefined)(modified)];
|
|
8223
8217
|
};
|
|
8224
8218
|
exports.makeGitlabJob = makeGitlabJob;
|
|
@@ -8251,19 +8245,15 @@ allJobs) {
|
|
|
8251
8245
|
};
|
|
8252
8246
|
var createGitlabJobs = function (allJobs, baseRules) { return __awaiter(void 0, void 0, void 0, function () {
|
|
8253
8247
|
return __generator(this, function (_a) {
|
|
8254
|
-
return [2 /*return*/,
|
|
8255
|
-
var
|
|
8256
|
-
return
|
|
8257
|
-
var
|
|
8258
|
-
return
|
|
8259
|
-
|
|
8260
|
-
|
|
8261
|
-
|
|
8262
|
-
|
|
8263
|
-
componentName: componentName,
|
|
8264
|
-
env: env,
|
|
8265
|
-
};
|
|
8266
|
-
});
|
|
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
|
+
};
|
|
8267
8257
|
});
|
|
8268
8258
|
})];
|
|
8269
8259
|
});
|
|
@@ -14873,17 +14873,6 @@ exports["default"] = ownPkg;
|
|
|
14873
14873
|
|
|
14874
14874
|
"use strict";
|
|
14875
14875
|
|
|
14876
|
-
var __assign = (this && this.__assign) || function () {
|
|
14877
|
-
__assign = Object.assign || function(t) {
|
|
14878
|
-
for (var s, i = 1, n = arguments.length; i < n; i++) {
|
|
14879
|
-
s = arguments[i];
|
|
14880
|
-
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
|
|
14881
|
-
t[p] = s[p];
|
|
14882
|
-
}
|
|
14883
|
-
return t;
|
|
14884
|
-
};
|
|
14885
|
-
return __assign.apply(this, arguments);
|
|
14886
|
-
};
|
|
14887
14876
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
14888
14877
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
14889
14878
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -14969,14 +14958,13 @@ var createAllJobs = function (_a) { return __awaiter(void 0, [_a], void 0, funct
|
|
|
14969
14958
|
})];
|
|
14970
14959
|
case 1:
|
|
14971
14960
|
allComponentContext = _c.sent();
|
|
14972
|
-
return [2 /*return*/, allComponentContext.
|
|
14973
|
-
var
|
|
14974
|
-
|
|
14975
|
-
|
|
14976
|
-
|
|
14977
|
-
|
|
14978
|
-
|
|
14979
|
-
}, {})];
|
|
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
|
+
})];
|
|
14980
14968
|
}
|
|
14981
14969
|
});
|
|
14982
14970
|
}); };
|
|
@@ -15265,8 +15253,8 @@ var createMainPipeline = function (pipelineType, config) { return __awaiter(void
|
|
|
15265
15253
|
// this is purely for better readability in git diffs when you add new components
|
|
15266
15254
|
.sort(function (a, b) {
|
|
15267
15255
|
var componentNames = Object.keys(config.components);
|
|
15268
|
-
var aIndex = componentNames.findIndex(function (c) { return c === a.componentName; });
|
|
15269
|
-
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; });
|
|
15270
15258
|
return aIndex - bIndex;
|
|
15271
15259
|
})
|
|
15272
15260
|
.reduce(function (acc, _a) {
|
|
@@ -15596,7 +15584,8 @@ var getFullJobName = function (name, componentName, env) {
|
|
|
15596
15584
|
};
|
|
15597
15585
|
var getFullReferencedJobName = function (referencedJobName, componentName, env, allJobs) {
|
|
15598
15586
|
var _a, _b;
|
|
15599
|
-
var referencedJob = (_b = (_a = allJobs
|
|
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; });
|
|
15600
15589
|
if (!referencedJob) {
|
|
15601
15590
|
throw new Error("unknown job referenced: '".concat(referencedJobName, "' from '").concat(env, ":").concat(componentName, "'"));
|
|
15602
15591
|
}
|
|
@@ -15606,14 +15595,19 @@ var getFullReferencedJobName = function (referencedJobName, componentName, env,
|
|
|
15606
15595
|
var getJobName = function (need) {
|
|
15607
15596
|
return (0, lodash_1.isObject)(need) ? need.job : need;
|
|
15608
15597
|
};
|
|
15609
|
-
var makeGitlabJob = function (
|
|
15598
|
+
var makeGitlabJob = function (context, _a, allJobs, baseRules) {
|
|
15610
15599
|
var _b, _c;
|
|
15611
|
-
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,
|
|
15612
|
-
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;
|
|
15613
15602
|
var needsFromStages = needsStages === null || needsStages === void 0 ? void 0 : needsStages.flatMap(function (n) {
|
|
15614
|
-
var _a, _b, _c
|
|
15615
|
-
var referencedComponentName = componentName;
|
|
15616
|
-
var allJobNamesFromThatStage = (
|
|
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 : [];
|
|
15617
15611
|
return allJobNamesFromThatStage.map(function (job) {
|
|
15618
15612
|
var _a;
|
|
15619
15613
|
return ({
|
|
@@ -15628,13 +15622,13 @@ var makeGitlabJob = function (componentName, env, _a, allJobs, baseRules) {
|
|
|
15628
15622
|
var _a;
|
|
15629
15623
|
return (0, lodash_1.isObject)(n)
|
|
15630
15624
|
? {
|
|
15631
|
-
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),
|
|
15632
15626
|
artifacts: n.artifacts,
|
|
15633
15627
|
}
|
|
15634
|
-
: getFullReferencedJobName(n, componentName, env, allJobs);
|
|
15628
|
+
: getFullReferencedJobName(n, context.componentName, context.env, allJobs);
|
|
15635
15629
|
}).sort(function (a, b) { return getJobName(a).localeCompare(getJobName(b)); });
|
|
15636
15630
|
var deduplicatedGitlabNeeds = __spreadArray([], __read(new Map(gitlabNeeds.map(function (n) { return [(0, lodash_1.isObject)(n) ? n.job : n, n]; })).values()), false);
|
|
15637
|
-
var fullJobName = getFullJobName(name, componentName, envMode !== "none" ? env : undefined);
|
|
15631
|
+
var fullJobName = getFullJobName(name, context.componentName, envMode !== "none" ? context.env : undefined);
|
|
15638
15632
|
// backwards compatibility, some may still use KUBERNETES_CPU_REQUEST, KUBERNETES_MEMORY_REQUEST, etc. in variables.
|
|
15639
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
|
|
15640
15634
|
var PIPELINE_RUNNER_VARIABLES = [
|
|
@@ -15664,7 +15658,7 @@ var makeGitlabJob = function (componentName, env, _a, allJobs, baseRules) {
|
|
|
15664
15658
|
: [])), false);
|
|
15665
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,
|
|
15666
15660
|
// sort in a predictable manner for snapshot tests
|
|
15667
|
-
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);
|
|
15668
15662
|
return [fullJobName, (0, removeUndefined_1.removeUndefined)(modified)];
|
|
15669
15663
|
};
|
|
15670
15664
|
exports.makeGitlabJob = makeGitlabJob;
|
|
@@ -15697,19 +15691,15 @@ allJobs) {
|
|
|
15697
15691
|
};
|
|
15698
15692
|
var createGitlabJobs = function (allJobs, baseRules) { return __awaiter(void 0, void 0, void 0, function () {
|
|
15699
15693
|
return __generator(this, function (_a) {
|
|
15700
|
-
return [2 /*return*/,
|
|
15701
|
-
var
|
|
15702
|
-
return
|
|
15703
|
-
var
|
|
15704
|
-
return
|
|
15705
|
-
|
|
15706
|
-
|
|
15707
|
-
|
|
15708
|
-
|
|
15709
|
-
componentName: componentName,
|
|
15710
|
-
env: env,
|
|
15711
|
-
};
|
|
15712
|
-
});
|
|
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
|
+
};
|
|
15713
15703
|
});
|
|
15714
15704
|
})];
|
|
15715
15705
|
});
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import type {
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
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;
|
|
@@ -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.
|
|
99
|
-
var
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
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
|
}); };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createAllJobs.js","sourceRoot":"","sources":["../../../../../pipeline/src/pipeline/createAllJobs.ts"],"names":[],"mappings":"
|
|
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"}
|
|
@@ -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) {
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"createMainPipeline.js","sourceRoot":"","sources":["../../../../../pipeline/src/pipeline/createMainPipeline.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
|
-
import type {
|
|
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
|
-
|
|
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: (
|
|
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>;
|
|
@@ -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
|
|
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 (
|
|
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,
|
|
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
|
|
118
|
-
var referencedComponentName = componentName;
|
|
119
|
-
var allJobNamesFromThatStage = (
|
|
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*/,
|
|
204
|
-
var
|
|
205
|
-
return
|
|
206
|
-
var
|
|
207
|
-
return
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
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
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createGitlabJobs.js","sourceRoot":"","sources":["../../../../../../pipeline/src/pipeline/gitlab/createGitlabJobs.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iCAAyC;AACzC,sEAAqE;AACrE,2CAA4C;
|
|
1
|
+
{"version":3,"file":"createGitlabJobs.js","sourceRoot":"","sources":["../../../../../../pipeline/src/pipeline/gitlab/createGitlabJobs.ts"],"names":[],"mappings":"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"}
|
|
@@ -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 {
|
|
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> = {
|
|
@@ -93,6 +93,3 @@ export type ComponentContext = {
|
|
|
93
93
|
customJobs?: CatladderJob[];
|
|
94
94
|
};
|
|
95
95
|
export type Context = ComponentContext;
|
|
96
|
-
export type CatladderJobWithContext<S = BaseStage> = CatladderJob<S> & {
|
|
97
|
-
context: ComponentContext;
|
|
98
|
-
};
|