@catladder/cli 1.150.2 → 1.151.0
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 +1 -1
- package/dist/bundles/cli/index.js +20 -20
- package/dist/cli/src/apps/cli/commands/project/commandRenewToken.d.ts +3 -0
- package/dist/cli/src/apps/cli/commands/project/commandRenewToken.js +58 -0
- package/dist/cli/src/apps/cli/commands/project/commandRenewToken.js.map +1 -0
- package/dist/cli/src/apps/cli/commands/project/index.js +2 -0
- package/dist/cli/src/apps/cli/commands/project/index.js.map +1 -1
- package/dist/cli/src/apps/cli/commands/project/setup/setupAccessTokens.js +43 -37
- package/dist/cli/src/apps/cli/commands/project/setup/setupAccessTokens.js.map +1 -1
- package/dist/cli/src/catenv.js +0 -2
- package/dist/cli/src/catenv.js.map +1 -1
- package/dist/pipeline/src/context/createComponentContext.js +1 -0
- package/dist/pipeline/src/context/createComponentContext.js.map +1 -1
- 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/pipeline/gitlab/gitlabReleaseJobs.d.ts +2 -0
- package/dist/pipeline/src/pipeline/gitlab/gitlabReleaseJobs.js +3 -0
- package/dist/pipeline/src/pipeline/gitlab/gitlabReleaseJobs.js.map +1 -1
- package/dist/pipeline/src/types/context.d.ts +2 -4
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/apps/cli/commands/project/commandRenewToken.ts +12 -0
- package/src/apps/cli/commands/project/index.ts +2 -0
- package/src/apps/cli/commands/project/setup/setupAccessTokens.ts +48 -35
- package/src/catenv.ts +0 -2
|
@@ -0,0 +1,58 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
+
});
|
|
10
|
+
};
|
|
11
|
+
var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
12
|
+
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
|
|
13
|
+
return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
|
|
14
|
+
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
15
|
+
function step(op) {
|
|
16
|
+
if (f) throw new TypeError("Generator is already executing.");
|
|
17
|
+
while (g && (g = 0, op[0] && (_ = 0)), _) try {
|
|
18
|
+
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
|
|
19
|
+
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
20
|
+
switch (op[0]) {
|
|
21
|
+
case 0: case 1: t = op; break;
|
|
22
|
+
case 4: _.label++; return { value: op[1], done: false };
|
|
23
|
+
case 5: _.label++; y = op[1]; op = [0]; continue;
|
|
24
|
+
case 7: op = _.ops.pop(); _.trys.pop(); continue;
|
|
25
|
+
default:
|
|
26
|
+
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
|
|
27
|
+
if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
|
|
28
|
+
if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
|
|
29
|
+
if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
|
|
30
|
+
if (t[2]) _.ops.pop();
|
|
31
|
+
_.trys.pop(); continue;
|
|
32
|
+
}
|
|
33
|
+
op = body.call(thisArg, _);
|
|
34
|
+
} catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
|
|
35
|
+
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
36
|
+
}
|
|
37
|
+
};
|
|
38
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
|
+
var setupAccessTokens_1 = require("./setup/setupAccessTokens");
|
|
40
|
+
exports.default = (function (vorpal) { return __awaiter(void 0, void 0, void 0, function () {
|
|
41
|
+
return __generator(this, function (_a) {
|
|
42
|
+
return [2 /*return*/, vorpal
|
|
43
|
+
.command("project-renew-token", "Configures the project access token for semantic release.")
|
|
44
|
+
.action(function () {
|
|
45
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
46
|
+
return __generator(this, function (_a) {
|
|
47
|
+
switch (_a.label) {
|
|
48
|
+
case 0: return [4 /*yield*/, (0, setupAccessTokens_1.setupAccessTokens)(this)];
|
|
49
|
+
case 1:
|
|
50
|
+
_a.sent();
|
|
51
|
+
return [2 /*return*/];
|
|
52
|
+
}
|
|
53
|
+
});
|
|
54
|
+
});
|
|
55
|
+
})];
|
|
56
|
+
});
|
|
57
|
+
}); });
|
|
58
|
+
//# sourceMappingURL=commandRenewToken.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"commandRenewToken.js","sourceRoot":"","sources":["../../../../../../../src/apps/cli/commands/project/commandRenewToken.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,+DAA8D;AAE9D,mBAAe,UAAO,MAAc;;QAClC,sBAAA,MAAM;iBACH,OAAO,CACN,qBAAqB,EACrB,2DAA2D,CAC5D;iBACA,MAAM,CAAC;;;;oCACN,qBAAM,IAAA,qCAAiB,EAAC,IAAI,CAAC,EAAA;;gCAA7B,SAA6B,CAAC;;;;;aAC/B,CAAC,EAAA;;KAAA,EAAC"}
|
|
@@ -48,6 +48,7 @@ var commandGetMyTotalWorktime_1 = __importDefault(require("./commandGetMyTotalWo
|
|
|
48
48
|
var commandGetShell_1 = __importDefault(require("./commandGetShell"));
|
|
49
49
|
var commandGitlabCi_1 = __importDefault(require("./commandGitlabCi"));
|
|
50
50
|
var commandSetup_1 = __importDefault(require("./commandSetup"));
|
|
51
|
+
var commandRenewToken_1 = __importDefault(require("./commandRenewToken"));
|
|
51
52
|
var commandListPods_1 = __importDefault(require("./commandListPods"));
|
|
52
53
|
var commandMigrateHelm3_1 = __importDefault(require("./commandMigrateHelm3"));
|
|
53
54
|
var commandNamespace_1 = __importDefault(require("./commandNamespace"));
|
|
@@ -67,6 +68,7 @@ var commandSecurityEvaluate_1 = __importDefault(require("./commandSecurityEvalua
|
|
|
67
68
|
exports.default = (function (vorpal) { return __awaiter(void 0, void 0, void 0, function () {
|
|
68
69
|
return __generator(this, function (_a) {
|
|
69
70
|
(0, commandSetup_1.default)(vorpal);
|
|
71
|
+
(0, commandRenewToken_1.default)(vorpal);
|
|
70
72
|
(0, commandEnvVars_1.default)(vorpal);
|
|
71
73
|
(0, commandNamespace_1.default)(vorpal);
|
|
72
74
|
(0, commandListPods_1.default)(vorpal);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../src/apps/cli/commands/project/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,gFAA0D;AAC1D,gFAA0D;AAE1D,0EAAoD;AACpD,gFAA0D;AAC1D,oEAA8C;AAC9C,0FAAoE;AACpE,sEAAgD;AAChD,sEAAgD;AAChD,gEAA0C;AAC1C,sEAAgD;AAChD,8EAAwD;AACxD,wEAAkD;AAClD,wFAAkE;AAClE,gFAA0D;AAC1D,oEAA8C;AAC9C,oEAA8C;AAC9C,sEAAgD;AAChD,8EAAwD;AACxD,4EAAsD;AACtD,4EAAsD;AACtD,kFAA4D;AAE5D,kFAA4D;AAC5D,4FAAsE;AACtE,+FAAyE;AACzE,sFAAgE;AAEhE,mBAAe,UAAO,MAAc;;QAClC,IAAA,sBAAY,EAAC,MAAM,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../src/apps/cli/commands/project/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,gFAA0D;AAC1D,gFAA0D;AAE1D,0EAAoD;AACpD,gFAA0D;AAC1D,oEAA8C;AAC9C,0FAAoE;AACpE,sEAAgD;AAChD,sEAAgD;AAChD,gEAA0C;AAC1C,0EAAoD;AACpD,sEAAgD;AAChD,8EAAwD;AACxD,wEAAkD;AAClD,wFAAkE;AAClE,gFAA0D;AAC1D,oEAA8C;AAC9C,oEAA8C;AAC9C,sEAAgD;AAChD,8EAAwD;AACxD,4EAAsD;AACtD,4EAAsD;AACtD,kFAA4D;AAE5D,kFAA4D;AAC5D,4FAAsE;AACtE,+FAAyE;AACzE,sFAAgE;AAEhE,mBAAe,UAAO,MAAc;;QAClC,IAAA,sBAAY,EAAC,MAAM,CAAC,CAAC;QACrB,IAAA,2BAAiB,EAAC,MAAM,CAAC,CAAC;QAE1B,IAAA,wBAAc,EAAC,MAAM,CAAC,CAAC;QAEvB,IAAA,0BAAgB,EAAC,MAAM,CAAC,CAAC;QACzB,IAAA,yBAAe,EAAC,MAAM,CAAC,CAAC;QACxB,IAAA,6BAAmB,EAAC,MAAM,CAAC,CAAC;QAC5B,IAAA,8BAAoB,EAAC,MAAM,CAAC,CAAC;QAE7B,IAAA,8BAAoB,EAAC,MAAM,CAAC,CAAC;QAE7B,IAAA,yBAAe,EAAC,MAAM,CAAC,CAAC;QAExB,IAAA,kCAAwB,EAAC,MAAM,CAAC,CAAC;QAEjC,IAAA,4BAAkB,EAAC,MAAM,CAAC,CAAC;QAC3B,IAAA,+BAAqB,EAAC,MAAM,CAAC,CAAC;QAC9B,IAAA,8BAAoB,EAAC,MAAM,CAAC,CAAC;QAC7B,IAAA,iCAAuB,EAAC,MAAM,CAAC,CAAC;QAChC,IAAA,wBAAc,EAAC,MAAM,CAAC,CAAC;QACvB,IAAA,wBAAc,EAAC,MAAM,CAAC,CAAC;QACvB,IAAA,+BAAqB,EAAC,MAAM,CAAC,CAAC;QAC9B,IAAA,8BAAoB,EAAC,MAAM,CAAC,CAAC;QAC7B,IAAA,oCAA0B,EAAC,MAAM,CAAC,CAAC;QACnC,IAAA,2BAAiB,EAAC,MAAM,CAAC,CAAC;QAE1B,IAAA,yBAAe,EAAC,MAAM,CAAC,CAAC;QACxB,IAAA,4BAAkB,EAAC,MAAM,CAAC,CAAC;QAE3B,IAAA,yBAAe,EAAC,MAAM,CAAC,CAAC;QAExB,IAAA,mCAAyB,EAAC,MAAM,CAAC,CAAC;QAClC,IAAA,6BAAmB,EAAC,MAAM,CAAC,CAAC;QAC5B,IAAA,iCAAuB,EAAC,MAAM,CAAC,CAAC;;;KACjC,EAAC"}
|
|
@@ -40,62 +40,68 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
40
40
|
};
|
|
41
41
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
42
42
|
exports.setupAccessTokens = void 0;
|
|
43
|
-
var
|
|
43
|
+
var dayjs_1 = __importDefault(require("dayjs"));
|
|
44
44
|
var gitlab_1 = require("../../../../../utils/gitlab");
|
|
45
|
+
var TOKEN_NAME = "semantic-release";
|
|
45
46
|
var setupAccessTokens = function (instance) { return __awaiter(void 0, void 0, void 0, function () {
|
|
46
|
-
var
|
|
47
|
+
var projectId, projectTokens, token, expires_at, newToken, _a, e_1;
|
|
47
48
|
return __generator(this, function (_b) {
|
|
48
49
|
switch (_b.label) {
|
|
49
50
|
case 0: return [4 /*yield*/, (0, gitlab_1.getProjectInfo)(instance)];
|
|
50
51
|
case 1:
|
|
51
|
-
|
|
52
|
-
|
|
52
|
+
projectId = (_b.sent()).id;
|
|
53
|
+
return [4 /*yield*/, (0, gitlab_1.doGitlabRequest)(instance, "projects/".concat(projectId, "/access_tokens"))];
|
|
53
54
|
case 2:
|
|
54
|
-
_b.
|
|
55
|
-
|
|
55
|
+
projectTokens = _b.sent();
|
|
56
|
+
token = projectTokens.find(function (t) { return t.name === TOKEN_NAME && t.active === true; });
|
|
57
|
+
expires_at = (0, dayjs_1.default)()
|
|
58
|
+
.add(1, "year")
|
|
59
|
+
.subtract(1, "day")
|
|
60
|
+
.format("YYYY-MM-DD");
|
|
61
|
+
if (!token) return [3 /*break*/, 4];
|
|
62
|
+
return [4 /*yield*/, (0, gitlab_1.doGitlabRequest)(instance, "projects/".concat(projectId, "/access_tokens/").concat(token.id, "/rotate"), { expires_at: expires_at }, "POST")];
|
|
56
63
|
case 3:
|
|
64
|
+
_a = _b.sent();
|
|
65
|
+
return [3 /*break*/, 6];
|
|
66
|
+
case 4: return [4 /*yield*/, (0, gitlab_1.doGitlabRequest)(instance, "projects/".concat(projectId, "/access_tokens"), {
|
|
67
|
+
name: TOKEN_NAME,
|
|
68
|
+
scopes: ["api", "read_repository"],
|
|
69
|
+
access_level: 40, // Maintainer
|
|
70
|
+
expires_at: expires_at,
|
|
71
|
+
}, "POST")];
|
|
72
|
+
case 5:
|
|
73
|
+
_a = _b.sent();
|
|
74
|
+
_b.label = 6;
|
|
75
|
+
case 6:
|
|
76
|
+
newToken = _a;
|
|
77
|
+
_b.label = 7;
|
|
78
|
+
case 7:
|
|
79
|
+
_b.trys.push([7, 10, , 12]);
|
|
80
|
+
return [4 /*yield*/, (0, gitlab_1.doGitlabRequest)(instance, "projects/".concat(projectId, "/variables/GL_TOKEN"))];
|
|
81
|
+
case 8:
|
|
82
|
+
_b.sent();
|
|
83
|
+
return [4 /*yield*/, (0, gitlab_1.doGitlabRequest)(instance, "projects/".concat(projectId, "/variables/GL_TOKEN"), { value: newToken.token }, "PUT")];
|
|
84
|
+
case 9:
|
|
57
85
|
_b.sent();
|
|
58
|
-
return [3 /*break*/,
|
|
59
|
-
case
|
|
86
|
+
return [3 /*break*/, 12];
|
|
87
|
+
case 10:
|
|
60
88
|
e_1 = _b.sent();
|
|
61
89
|
if (e_1.message !== "not found") {
|
|
62
90
|
throw e_1;
|
|
63
91
|
}
|
|
64
92
|
// not found
|
|
65
|
-
instance.log("I need add a GL_TOKEN to the project, so that semantic release will work\n");
|
|
66
|
-
instance.log("👉 Please please create a project access token in gitlab and copy its value into clipboard\n\n - name: something like 'semantic-release'\n - expires: leave empty\n - role: maintainer - scopes: api, read_repository");
|
|
67
|
-
instance.log("\n");
|
|
68
|
-
return [4 /*yield*/, instance.prompt({
|
|
69
|
-
default: true,
|
|
70
|
-
message: "Understood and open gitlab now? 🤔",
|
|
71
|
-
name: "understood",
|
|
72
|
-
type: "confirm",
|
|
73
|
-
})];
|
|
74
|
-
case 5:
|
|
75
|
-
understood = (_b.sent()).understood;
|
|
76
|
-
if (!understood) {
|
|
77
|
-
instance.log("continuing anyway...");
|
|
78
|
-
}
|
|
79
|
-
(0, open_1.default)("".concat(projectWebUrl, "/-/settings/access_tokens"));
|
|
80
|
-
instance.log("\n");
|
|
81
|
-
instance.log("Enter your copied token now: ");
|
|
82
|
-
instance.log("\n");
|
|
83
|
-
return [4 /*yield*/, instance.prompt({
|
|
84
|
-
type: "password",
|
|
85
|
-
name: "GL_TOKEN",
|
|
86
|
-
message: "Access Token: ",
|
|
87
|
-
})];
|
|
88
|
-
case 6:
|
|
89
|
-
GL_TOKEN = (_b.sent()).GL_TOKEN;
|
|
90
93
|
return [4 /*yield*/, (0, gitlab_1.doGitlabRequest)(instance, "projects/".concat(projectId, "/variables"), {
|
|
91
94
|
key: "GL_TOKEN",
|
|
92
|
-
value:
|
|
95
|
+
value: newToken.token,
|
|
93
96
|
masked: true,
|
|
94
97
|
}, "POST")];
|
|
95
|
-
case
|
|
98
|
+
case 11:
|
|
99
|
+
// not found
|
|
96
100
|
_b.sent();
|
|
97
|
-
return [3 /*break*/,
|
|
98
|
-
case
|
|
101
|
+
return [3 /*break*/, 12];
|
|
102
|
+
case 12:
|
|
103
|
+
instance.log("Token configured for semantic release. Renew me again in a year!");
|
|
104
|
+
return [2 /*return*/];
|
|
99
105
|
}
|
|
100
106
|
});
|
|
101
107
|
}); };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setupAccessTokens.js","sourceRoot":"","sources":["../../../../../../../../src/apps/cli/commands/project/setup/setupAccessTokens.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"setupAccessTokens.js","sourceRoot":"","sources":["../../../../../../../../src/apps/cli/commands/project/setup/setupAccessTokens.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,gDAA0B;AAC1B,sDAA8E;AAE9E,IAAM,UAAU,GAAG,kBAAkB,CAAC;AAE/B,IAAM,iBAAiB,GAAG,UAAO,QAAyB;;;;oBACrC,qBAAM,IAAA,uBAAc,EAAC,QAAQ,CAAC,EAAA;;gBAA5C,SAAS,GAAK,CAAA,SAA8B,CAAA,GAAnC;gBAEC,qBAAM,IAAA,wBAAe,EACzC,QAAQ,EACR,mBAAY,SAAS,mBAAgB,CACtC,EAAA;;gBAHK,aAAa,GAAG,SAGrB;gBACK,KAAK,GAAG,aAAa,CAAC,IAAI,CAC9B,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,IAAI,KAAK,UAAU,IAAI,CAAC,CAAC,MAAM,KAAK,IAAI,EAA1C,CAA0C,CAClD,CAAC;gBAEI,UAAU,GAAG,IAAA,eAAK,GAAE;qBACvB,GAAG,CAAC,CAAC,EAAE,MAAM,CAAC;qBACd,QAAQ,CAAC,CAAC,EAAE,KAAK,CAAC;qBAClB,MAAM,CAAC,YAAY,CAAC,CAAC;qBAEP,KAAK,EAAL,wBAAK;gBAClB,qBAAM,IAAA,wBAAe,EACnB,QAAQ,EACR,mBAAY,SAAS,4BAAkB,KAAK,CAAC,EAAE,YAAS,EACxD,EAAE,UAAU,YAAA,EAAE,EACd,MAAM,CACP,EAAA;;gBALD,KAAA,SAKC,CAAA;;oBACD,qBAAM,IAAA,wBAAe,EACnB,QAAQ,EACR,mBAAY,SAAS,mBAAgB,EACrC;oBACE,IAAI,EAAE,UAAU;oBAChB,MAAM,EAAE,CAAC,KAAK,EAAE,iBAAiB,CAAC;oBAClC,YAAY,EAAE,EAAE,EAAE,aAAa;oBAC/B,UAAU,YAAA;iBACX,EACD,MAAM,CACP,EAAA;;gBAVD,KAAA,SAUC,CAAA;;;gBAjBC,QAAQ,KAiBT;;;;gBAGH,qBAAM,IAAA,wBAAe,EAAC,QAAQ,EAAE,mBAAY,SAAS,wBAAqB,CAAC,EAAA;;gBAA3E,SAA2E,CAAC;gBAC5E,qBAAM,IAAA,wBAAe,EACnB,QAAQ,EACR,mBAAY,SAAS,wBAAqB,EAC1C,EAAE,KAAK,EAAE,QAAQ,CAAC,KAAK,EAAE,EACzB,KAAK,CACN,EAAA;;gBALD,SAKC,CAAC;;;;gBAEF,IAAI,GAAC,CAAC,OAAO,KAAK,WAAW,EAAE,CAAC;oBAC9B,MAAM,GAAC,CAAC;gBACV,CAAC;gBACD,YAAY;gBACZ,qBAAM,IAAA,wBAAe,EACnB,QAAQ,EACR,mBAAY,SAAS,eAAY,EACjC;wBACE,GAAG,EAAE,UAAU;wBACf,KAAK,EAAE,QAAQ,CAAC,KAAK;wBACrB,MAAM,EAAE,IAAI;qBACb,EACD,MAAM,CACP,EAAA;;gBAVD,YAAY;gBACZ,SASC,CAAC;;;gBAGJ,QAAQ,CAAC,GAAG,CACV,kEAAkE,CACnE,CAAC;;;;KACH,CAAC;AA/DW,QAAA,iBAAiB,qBA+D5B"}
|
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
|
});
|
|
@@ -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,
|
|
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"}
|
|
@@ -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;
|
|
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"}
|
|
@@ -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":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;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,CACrC,UAAC,CAAC,IAAK,OAAA,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,aAAa,EAA7B,CAA6B,CACrC,CAAC;oBACF,IAAM,MAAM,GAAG,cAAc,CAAC,SAAS,CACrC,UAAC,CAAC,IAAK,OAAA,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,aAAa,EAA7B,CAA6B,CACrC,CAAC;oBACF,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;AA7DW,QAAA,kBAAkB,sBA6D7B;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,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,6 +3,7 @@ export declare const getGitlabReleaseJobs: () => {
|
|
|
3
3
|
stage: string;
|
|
4
4
|
image: string;
|
|
5
5
|
script: string[];
|
|
6
|
+
after_script: string[];
|
|
6
7
|
rules: {
|
|
7
8
|
if?: string;
|
|
8
9
|
changes?: import("../../types/gitlab-ci-yml").Changes;
|
|
@@ -18,6 +19,7 @@ export declare const getGitlabReleaseJobs: () => {
|
|
|
18
19
|
stage: string;
|
|
19
20
|
image: string;
|
|
20
21
|
script: string[];
|
|
22
|
+
after_script: string[];
|
|
21
23
|
needs: any[];
|
|
22
24
|
rules: {
|
|
23
25
|
if?: string;
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.getGitlabReleaseJobs = void 0;
|
|
4
4
|
var rules_1 = require("../../rules");
|
|
5
5
|
var runner_1 = require("../../runner");
|
|
6
|
+
var EXPIRED_TOKEN_HELP = "echo '👉 The project access token might be invald - run `project-renew-token` in catladder CLI to fix.'";
|
|
6
7
|
var getGitlabReleaseJobs = function () {
|
|
7
8
|
var _a;
|
|
8
9
|
return _a = {},
|
|
@@ -10,12 +11,14 @@ var getGitlabReleaseJobs = function () {
|
|
|
10
11
|
stage: "release",
|
|
11
12
|
image: (0, runner_1.getRunnerImage)("semantic-release"),
|
|
12
13
|
script: ["semanticRelease"],
|
|
14
|
+
after_script: [EXPIRED_TOKEN_HELP],
|
|
13
15
|
rules: rules_1.RULES_RELEASE,
|
|
14
16
|
},
|
|
15
17
|
_a["⚠️ force create release"] = {
|
|
16
18
|
stage: "release",
|
|
17
19
|
image: (0, runner_1.getRunnerImage)("semantic-release"),
|
|
18
20
|
script: ["semanticRelease"],
|
|
21
|
+
after_script: [EXPIRED_TOKEN_HELP],
|
|
19
22
|
needs: [],
|
|
20
23
|
rules: rules_1.RULES_MANUAL_RELEASE,
|
|
21
24
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gitlabReleaseJobs.js","sourceRoot":"","sources":["../../../../../../pipeline/src/pipeline/gitlab/gitlabReleaseJobs.ts"],"names":[],"mappings":";;;AAAA,qCAAkE;AAClE,uCAA8C;
|
|
1
|
+
{"version":3,"file":"gitlabReleaseJobs.js","sourceRoot":"","sources":["../../../../../../pipeline/src/pipeline/gitlab/gitlabReleaseJobs.ts"],"names":[],"mappings":";;;AAAA,qCAAkE;AAClE,uCAA8C;AAE9C,IAAM,kBAAkB,GACtB,yGAAyG,CAAC;AAErG,IAAM,oBAAoB,GAAG;;IAClC;QACE,GAAC,gBAAgB,IAAG;YAClB,KAAK,EAAE,SAAS;YAChB,KAAK,EAAE,IAAA,uBAAc,EAAC,kBAAkB,CAAC;YACzC,MAAM,EAAE,CAAC,iBAAiB,CAAC;YAC3B,YAAY,EAAE,CAAC,kBAAkB,CAAC;YAClC,KAAK,EAAE,qBAAa;SACrB;QACD,GAAC,yBAAyB,IAAG;YAC3B,KAAK,EAAE,SAAS;YAChB,KAAK,EAAE,IAAA,uBAAc,EAAC,kBAAkB,CAAC;YACzC,MAAM,EAAE,CAAC,iBAAiB,CAAC;YAC3B,YAAY,EAAE,CAAC,kBAAkB,CAAC;YAClC,KAAK,EAAE,EAAE;YACT,KAAK,EAAE,4BAAoB;SAC5B;WACD;AACJ,CAAC,CAAC;AAlBW,QAAA,oBAAoB,wBAkB/B"}
|
|
@@ -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> = {
|
|
@@ -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
|
-
};
|