@catladder/cli 1.136.1 → 1.136.4
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/apps/catci/catci.js +17 -2
- package/dist/apps/catci/catci.js.map +1 -1
- package/dist/apps/catci/commands/security/commands.js +28 -18
- package/dist/apps/catci/commands/security/commands.js.map +1 -1
- package/dist/bundles/catci/index.js +6 -6
- package/dist/bundles/catenv/index.js +1 -1
- package/dist/bundles/cli/index.js +2 -2
- package/dist/gcloud/serviceAccounts.js +3 -1
- package/dist/gcloud/serviceAccounts.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +2 -2
- package/src/apps/catci/catci.ts +7 -1
- package/src/apps/catci/commands/security/commands.ts +100 -85
- package/src/gcloud/serviceAccounts.ts +2 -1
package/dist/apps/catci/catci.js
CHANGED
|
@@ -35,6 +35,15 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
35
35
|
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
36
36
|
}
|
|
37
37
|
};
|
|
38
|
+
var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
39
|
+
if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
|
|
40
|
+
if (ar || !(i in from)) {
|
|
41
|
+
if (!ar) ar = Array.prototype.slice.call(from, 0, i);
|
|
42
|
+
ar[i] = from[i];
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
return to.concat(ar || Array.prototype.slice.call(from));
|
|
46
|
+
};
|
|
38
47
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
39
48
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
40
49
|
};
|
|
@@ -43,9 +52,12 @@ exports.runCatCi = void 0;
|
|
|
43
52
|
var vorpal_1 = __importDefault(require("vorpal"));
|
|
44
53
|
var packageInfos_1 = __importDefault(require("../../packageInfos"));
|
|
45
54
|
var commands_1 = __importDefault(require("./commands/security/commands"));
|
|
55
|
+
function reconstructArgs(args) {
|
|
56
|
+
return __spreadArray([args[0]], args.slice(1).map(function (arg) { return "\"".concat(arg, "\""); }), true).join(" ");
|
|
57
|
+
}
|
|
46
58
|
function runCatCi() {
|
|
47
59
|
return __awaiter(this, void 0, void 0, function () {
|
|
48
|
-
var vorpal, isInteractive;
|
|
60
|
+
var vorpal, isInteractive, args;
|
|
49
61
|
return __generator(this, function (_a) {
|
|
50
62
|
switch (_a.label) {
|
|
51
63
|
case 0:
|
|
@@ -57,7 +69,10 @@ function runCatCi() {
|
|
|
57
69
|
if (!isInteractive) return [3 /*break*/, 1];
|
|
58
70
|
vorpal.log("Catladder CI Tools \uD83D\uDE3B\uD83D\uDD28 version ".concat(packageInfos_1["default"].version)).show();
|
|
59
71
|
return [3 /*break*/, 3];
|
|
60
|
-
case 1:
|
|
72
|
+
case 1:
|
|
73
|
+
process.exitCode = 1;
|
|
74
|
+
args = reconstructArgs(process.argv.slice(2));
|
|
75
|
+
return [4 /*yield*/, vorpal.exec(args)];
|
|
61
76
|
case 2:
|
|
62
77
|
_a.sent();
|
|
63
78
|
process.exit();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"catci.js","sourceRoot":"","sources":["../../../src/apps/catci/catci.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"catci.js","sourceRoot":"","sources":["../../../src/apps/catci/catci.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kDAA4B;AAC5B,oEAA6C;AAC7C,0EAA4D;AAE5D,SAAS,eAAe,CAAC,IAAc;IACrC,OAAO,eAAC,IAAI,CAAC,CAAC,CAAC,GAAK,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,UAAC,GAAG,IAAK,OAAA,YAAI,GAAG,OAAG,EAAV,CAAU,CAAC,QAAE,IAAI,CAAC,GAAG,CAAC,CAAC;AACxE,CAAC;AAED,SAAsB,QAAQ;;;;;;oBACtB,MAAM,GAAG,IAAI,mBAAM,EAAE,CAAC;oBAE5B,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;oBACrB,MAAM,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,yBAAW,CAAC,OAAO,CAAC,CAAC;oBAE1E,IAAA,qBAAgB,EAAC,MAAM,CAAC,CAAC;oBAEnB,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,CAAC;yBAC3C,aAAa,EAAb,wBAAa;oBACf,MAAM,CAAC,GAAG,CAAC,8DAAmC,yBAAW,CAAC,OAAO,CAAE,CAAC,CAAC,IAAI,EAAE,CAAC;;;oBAE5E,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;oBACf,IAAI,GAAG,eAAe,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;oBACpD,qBAAM,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAA;;oBAAvB,SAAuB,CAAC;oBACxB,OAAO,CAAC,IAAI,EAAE,CAAC;;;;;;CAElB;AAjBD,4BAiBC"}
|
|
@@ -39,6 +39,7 @@ exports.__esModule = true;
|
|
|
39
39
|
var evaluateSecurityAudit_1 = require("./evaluateSecurityAudit");
|
|
40
40
|
var rest_1 = require("@gitbeaker/rest");
|
|
41
41
|
var createSecurityAuditMergeRequest_1 = require("./createSecurityAuditMergeRequest");
|
|
42
|
+
var ts_results_es_1 = require("ts-results-es");
|
|
42
43
|
var GITLAB_HOST = "https://git.panter.ch";
|
|
43
44
|
function default_1(vorpal) {
|
|
44
45
|
commandCiJob(vorpal);
|
|
@@ -46,13 +47,28 @@ function default_1(vorpal) {
|
|
|
46
47
|
commandCreate(vorpal);
|
|
47
48
|
}
|
|
48
49
|
exports["default"] = default_1;
|
|
50
|
+
function resultAsExitCode(func) {
|
|
51
|
+
var _this = this;
|
|
52
|
+
return function (args) { return __awaiter(_this, void 0, void 0, function () {
|
|
53
|
+
var result;
|
|
54
|
+
return __generator(this, function (_a) {
|
|
55
|
+
switch (_a.label) {
|
|
56
|
+
case 0: return [4 /*yield*/, func(args)];
|
|
57
|
+
case 1:
|
|
58
|
+
result = _a.sent();
|
|
59
|
+
process.exitCode = result.isErr() ? 1 : 0;
|
|
60
|
+
return [2 /*return*/];
|
|
61
|
+
}
|
|
62
|
+
});
|
|
63
|
+
}); };
|
|
64
|
+
}
|
|
49
65
|
function commandCiJob(vorpal) {
|
|
50
66
|
return __awaiter(this, void 0, void 0, function () {
|
|
51
67
|
var _this = this;
|
|
52
68
|
return __generator(this, function (_a) {
|
|
53
69
|
vorpal
|
|
54
70
|
.command("security-audit-ci-job <path> <token> <mainBranch> <projectId> <userId>", "Evaluates security audit document. If the document can't be evaluated or does not exist, creates a new MR with security audit document template.\n\n<path> root path of a project with security audit document (".concat(createSecurityAuditMergeRequest_1.SECURITY_AUDIT_FILE_NAME, ")\n<token> gitlab token with 'api' scopes and permissions to create a new branch\n<main-branch> main branch name\n<project-id> project id to create security audit for\n<user-id> gitlab user id that will be assignee of the audit\n"))
|
|
55
|
-
.action(function (args) { return __awaiter(_this, void 0, void 0, function () {
|
|
71
|
+
.action(resultAsExitCode(function (args) { return __awaiter(_this, void 0, void 0, function () {
|
|
56
72
|
var evaluation, token, mainBranch, projectId, userId, api, mr;
|
|
57
73
|
return __generator(this, function (_a) {
|
|
58
74
|
switch (_a.label) {
|
|
@@ -77,26 +93,22 @@ function commandCiJob(vorpal) {
|
|
|
77
93
|
mr = _a.sent();
|
|
78
94
|
if (mr.isErr()) {
|
|
79
95
|
console.error("could not create merge request with security audit template: ".concat(mr.error));
|
|
80
|
-
|
|
81
|
-
return [2 /*return*/];
|
|
96
|
+
return [2 /*return*/, mr];
|
|
82
97
|
}
|
|
83
98
|
console.log("security audit merge request created successfully");
|
|
84
99
|
console.log("please finish the MR by updating SECURITY.md document: ".concat(mr.value.web_url));
|
|
85
|
-
|
|
86
|
-
return [2 /*return*/];
|
|
100
|
+
return [2 /*return*/, (0, ts_results_es_1.Err)("merge request created")];
|
|
87
101
|
case 3:
|
|
88
102
|
if (evaluation.value.score.answeredTopics === 0) {
|
|
89
103
|
console.error("audit document has no answered topics");
|
|
90
104
|
console.error("please answer security topics in ".concat(createSecurityAuditMergeRequest_1.SECURITY_AUDIT_FILE_NAME, " by adding responsible people and check/cross in the table"));
|
|
91
|
-
|
|
92
|
-
return [2 /*return*/];
|
|
105
|
+
return [2 /*return*/, (0, ts_results_es_1.Err)("audit document has no answered topics")];
|
|
93
106
|
}
|
|
94
|
-
process.exitCode = 0;
|
|
95
107
|
console.log((0, evaluateSecurityAudit_1.makeSecurityAuditOverview)(evaluation.value));
|
|
96
|
-
return [2 /*return
|
|
108
|
+
return [2 /*return*/, (0, ts_results_es_1.Ok)({})];
|
|
97
109
|
}
|
|
98
110
|
});
|
|
99
|
-
}); });
|
|
111
|
+
}); }));
|
|
100
112
|
return [2 /*return*/];
|
|
101
113
|
});
|
|
102
114
|
});
|
|
@@ -107,7 +119,7 @@ function commandEvaluate(vorpal) {
|
|
|
107
119
|
return __generator(this, function (_a) {
|
|
108
120
|
vorpal
|
|
109
121
|
.command("security-audit-evaluate <path>", "Evaluates security audit document in given <path>")
|
|
110
|
-
.action(function (args) { return __awaiter(_this, void 0, void 0, function () {
|
|
122
|
+
.action(resultAsExitCode(function (args) { return __awaiter(_this, void 0, void 0, function () {
|
|
111
123
|
var result;
|
|
112
124
|
return __generator(this, function (_a) {
|
|
113
125
|
switch (_a.label) {
|
|
@@ -119,15 +131,14 @@ function commandEvaluate(vorpal) {
|
|
|
119
131
|
if (result.isErr()) {
|
|
120
132
|
console.error(result.error);
|
|
121
133
|
console.error("please make sure the security audit document ".concat(createSecurityAuditMergeRequest_1.SECURITY_AUDIT_FILE_NAME, " is in the repository"));
|
|
122
|
-
process.exitCode = 1;
|
|
123
134
|
}
|
|
124
135
|
else {
|
|
125
136
|
console.log((0, evaluateSecurityAudit_1.makeSecurityAuditOverview)(result.value));
|
|
126
137
|
}
|
|
127
|
-
return [2 /*return
|
|
138
|
+
return [2 /*return*/, result];
|
|
128
139
|
}
|
|
129
140
|
});
|
|
130
|
-
}); });
|
|
141
|
+
}); }));
|
|
131
142
|
return [2 /*return*/];
|
|
132
143
|
});
|
|
133
144
|
});
|
|
@@ -138,7 +149,7 @@ function commandCreate(vorpal) {
|
|
|
138
149
|
return __generator(this, function (_a) {
|
|
139
150
|
vorpal
|
|
140
151
|
.command("security-audit-create <token> <mainBranch> <projectId> <userId>", "Creates a MR in given project with the latest security audit template document\n\n<token> gitlab token with 'api' scopes and permissions to create a new branch\n<main-branch> main branch name\n<project-id> project id to create security audit for\n<user-id> gitlab user id that will be assignee of the audit\n")
|
|
141
|
-
.action(function (args) { return __awaiter(_this, void 0, void 0, function () {
|
|
152
|
+
.action(resultAsExitCode(function (args) { return __awaiter(_this, void 0, void 0, function () {
|
|
142
153
|
var token, mainBranch, projectId, userId, api, result;
|
|
143
154
|
return __generator(this, function (_a) {
|
|
144
155
|
switch (_a.label) {
|
|
@@ -158,16 +169,15 @@ function commandCreate(vorpal) {
|
|
|
158
169
|
result = _a.sent();
|
|
159
170
|
if (result.isErr()) {
|
|
160
171
|
console.error("could not create security audit merge request: ".concat(result.error));
|
|
161
|
-
process.exitCode = 1;
|
|
162
172
|
}
|
|
163
173
|
else {
|
|
164
174
|
console.log("security audit merge request created successfully");
|
|
165
175
|
console.log("please finish the MR by updating SECURITY.md document: ".concat(result.value.web_url));
|
|
166
176
|
}
|
|
167
|
-
return [2 /*return
|
|
177
|
+
return [2 /*return*/, result];
|
|
168
178
|
}
|
|
169
179
|
});
|
|
170
|
-
}); });
|
|
180
|
+
}); }));
|
|
171
181
|
return [2 /*return*/];
|
|
172
182
|
});
|
|
173
183
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commands.js","sourceRoot":"","sources":["../../../../../src/apps/catci/commands/security/commands.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,iEAGiC;AACjC,wCAAyC;AACzC,qFAG2C;
|
|
1
|
+
{"version":3,"file":"commands.js","sourceRoot":"","sources":["../../../../../src/apps/catci/commands/security/commands.ts"],"names":[],"mappings":"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"}
|