@catladder/cli 0.0.0-main-d0a1e9f1 → 0.0.0-main-67fbbdf8
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/cli/cli.js +8 -4
- package/dist/apps/cli/cli.js.map +1 -1
- package/dist/apps/cli/commands/project/commandConfigSecrets.js +20 -1
- package/dist/apps/cli/commands/project/commandConfigSecrets.js.map +1 -1
- package/dist/apps/cli/config/writeConfig.d.ts +5 -0
- package/dist/apps/cli/config/writeConfig.js +95 -0
- package/dist/apps/cli/config/writeConfig.js.map +1 -0
- package/dist/apps/cli/verify/index.d.ts +2 -0
- package/dist/apps/cli/verify/index.js +71 -0
- package/dist/apps/cli/verify/index.js.map +1 -0
- package/dist/apps/cli/verify/migration/fromv2.d.ts +3 -0
- package/dist/apps/cli/verify/migration/fromv2.js +240 -0
- package/dist/apps/cli/verify/migration/fromv2.js.map +1 -0
- package/dist/apps/cli/verify/migration/migrateSecrets.d.ts +4 -0
- package/dist/apps/cli/verify/migration/migrateSecrets.js +75 -0
- package/dist/apps/cli/verify/migration/migrateSecrets.js.map +1 -0
- package/dist/apps/cli/verify/migration/oldGitlabCi.d.ts +16 -0
- package/dist/apps/cli/verify/migration/oldGitlabCi.js +24 -0
- package/dist/apps/cli/verify/migration/oldGitlabCi.js.map +1 -0
- package/dist/config/getProjectConfig.d.ts +2 -0
- package/dist/config/getProjectConfig.js +36 -3
- package/dist/config/getProjectConfig.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/dist/utils/files.js +6 -1
- package/dist/utils/files.js.map +1 -1
- package/dist/utils/gitlab.d.ts +1 -1
- package/dist/utils/gitlab.js +30 -6
- package/dist/utils/gitlab.js.map +1 -1
- package/dist/utils/passwordstore/index.d.ts +1 -1
- package/dist/utils/passwordstore/index.js +17 -20
- package/dist/utils/passwordstore/index.js.map +1 -1
- package/dist/utils/projects/index.d.ts +1 -1
- package/package.json +2 -2
- package/src/apps/cli/cli.ts +5 -3
- package/src/apps/cli/commands/project/commandConfigSecrets.ts +22 -2
- package/src/apps/cli/config/writeConfig.ts +61 -0
- package/src/apps/cli/verify/index.ts +24 -0
- package/src/apps/cli/verify/migration/fromv2.ts +157 -0
- package/src/apps/cli/verify/migration/migrateSecrets.ts +32 -0
- package/src/apps/cli/verify/migration/oldGitlabCi.ts +40 -0
- package/src/config/getProjectConfig.ts +17 -1
- package/src/utils/editAsFile.ts +1 -1
- package/src/utils/files.ts +5 -1
- package/src/utils/gitlab.ts +18 -5
- package/src/utils/passwordstore/index.ts +19 -21
- package/src/utils/projects/index.ts +1 -1
package/dist/apps/cli/cli.js
CHANGED
|
@@ -48,15 +48,18 @@ var mongodb_1 = __importDefault(require("./commands/mongodb"));
|
|
|
48
48
|
var project_1 = __importDefault(require("./commands/project"));
|
|
49
49
|
var theStuffThatReallyMatters_1 = __importDefault(require("./commands/theStuffThatReallyMatters"));
|
|
50
50
|
var getProjectConfig_1 = require("../../config/getProjectConfig");
|
|
51
|
+
var verify_1 = require("./verify");
|
|
51
52
|
exports["default"] = (function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
52
|
-
var
|
|
53
|
+
var vorpal, welcomeMessage, projectConfig;
|
|
53
54
|
return __generator(this, function (_a) {
|
|
54
55
|
switch (_a.label) {
|
|
55
|
-
case 0:
|
|
56
|
+
case 0:
|
|
57
|
+
vorpal = new vorpal_1["default"]();
|
|
58
|
+
(0, verify_1.verify)(vorpal);
|
|
59
|
+
welcomeMessage = "catladder 2022 \uD83D\uDE3B version ".concat(packageInfos_1["default"].version);
|
|
60
|
+
return [4 /*yield*/, (0, getProjectConfig_1.getProjectConfig)()];
|
|
56
61
|
case 1:
|
|
57
62
|
projectConfig = _a.sent();
|
|
58
|
-
welcomeMessage = "catladder 2022 \uD83D\uDE3B version ".concat(packageInfos_1["default"].version);
|
|
59
|
-
vorpal = new vorpal_1["default"]();
|
|
60
63
|
vorpal
|
|
61
64
|
.delimiter("catladder $") // emoji messes with cursor :-( https://github.com/dthree/vorpal/issues/332
|
|
62
65
|
.history("catladder")
|
|
@@ -67,6 +70,7 @@ exports["default"] = (function () { return __awaiter(void 0, void 0, void 0, fun
|
|
|
67
70
|
if (projectConfig) {
|
|
68
71
|
vorpal.log("project: " + projectConfig.appName);
|
|
69
72
|
vorpal.log("customer: " + projectConfig.customerName);
|
|
73
|
+
vorpal.log("");
|
|
70
74
|
}
|
|
71
75
|
(0, general_1["default"])(vorpal);
|
|
72
76
|
(0, project_1["default"])(vorpal);
|
package/dist/apps/cli/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../../src/apps/cli/cli.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kDAA4B;AAE5B,2CAA2C;AAC3C,oEAA8C;AAC9C,uDAA8D;AAC9D,+DAAyC;AACzC,+DAAyC;AACzC,+DAAyC;AACzC,mGAA6E;AAE7E,kEAAiE;
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../../src/apps/cli/cli.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kDAA4B;AAE5B,2CAA2C;AAC3C,oEAA8C;AAC9C,uDAA8D;AAC9D,+DAAyC;AACzC,+DAAyC;AACzC,+DAAyC;AACzC,mGAA6E;AAE7E,kEAAiE;AACjE,mCAAkC;AAElC,sBAAe;;;;;gBACP,MAAM,GAAG,IAAI,mBAAM,EAAE,CAAC;gBAC5B,IAAA,eAAM,EAAC,MAAM,CAAC,CAAC;gBACT,cAAc,GAAG,8CAA6B,yBAAY,CAAC,OAAO,CAAE,CAAC;gBACrD,qBAAM,IAAA,mCAAgB,GAAE,EAAA;;gBAAxC,aAAa,GAAG,SAAwB;gBAE9C,MAAM;qBACH,SAAS,CAAC,aAAa,CAAC,CAAC,2EAA2E;qBACpG,OAAO,CAAC,WAAW,CAAC;qBACpB,IAAI,EAAE;qBACN,GAAG,CAAC,EAAE,CAAC;qBACP,GAAG,CAAC,cAAc,CAAC;qBACnB,GAAG,CAAC,EAAE,CAAC,CAAC;gBACX,IAAI,aAAa,EAAE;oBACjB,MAAM,CAAC,GAAG,CAAC,WAAW,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC;oBAChD,MAAM,CAAC,GAAG,CAAC,YAAY,GAAG,aAAa,CAAC,YAAY,CAAC,CAAC;oBACtD,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;iBAChB;gBAED,IAAA,oBAAO,EAAC,MAAM,CAAC,CAAC;gBAChB,IAAA,oBAAO,EAAC,MAAM,CAAC,CAAC;gBAChB,IAAA,oBAAO,EAAC,MAAM,CAAC,CAAC;gBAChB,IAAA,sCAAyB,EAAC,MAAM,CAAC,CAAC;gBAElC,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE;oBACjB,IAAA,iCAAmB,GAAE,CAAC;gBACxB,CAAC,CAAC,CAAC;;;;KACJ,EAAC"}
|
|
@@ -48,6 +48,24 @@ var editAsFile_1 = require("../../../../utils/editAsFile");
|
|
|
48
48
|
var gitlab_1 = require("../../../../utils/gitlab");
|
|
49
49
|
var promise_1 = require("../../../../utils/promise");
|
|
50
50
|
var autocompletions_1 = require("./utils/autocompletions");
|
|
51
|
+
/* for convenience, parse json objects. that makes it easier to edit secrets that are object */
|
|
52
|
+
var resolveJson = function (v) {
|
|
53
|
+
return Object.fromEntries(Object.entries(v).map(function (_a) {
|
|
54
|
+
var c = _a[0], secrets = _a[1];
|
|
55
|
+
return [
|
|
56
|
+
c,
|
|
57
|
+
Object.fromEntries(Object.entries(secrets).map(function (_a) {
|
|
58
|
+
var key = _a[0], value = _a[1];
|
|
59
|
+
try {
|
|
60
|
+
return [key, JSON.parse(value)];
|
|
61
|
+
}
|
|
62
|
+
catch (e) {
|
|
63
|
+
return [key, value];
|
|
64
|
+
}
|
|
65
|
+
})),
|
|
66
|
+
];
|
|
67
|
+
}));
|
|
68
|
+
};
|
|
51
69
|
var getEnvVarsToEdit = function (env, componentName) { return __awaiter(void 0, void 0, void 0, function () {
|
|
52
70
|
var secretEnvVarKeys, allEnvVars;
|
|
53
71
|
return __generator(this, function (_a) {
|
|
@@ -87,7 +105,7 @@ var doItFor = function (instance, env, components) { return __awaiter(void 0, vo
|
|
|
87
105
|
_d.label = 2;
|
|
88
106
|
case 2:
|
|
89
107
|
if (!hasErrors) return [3 /*break*/, 10];
|
|
90
|
-
return [4 /*yield*/, (0, editAsFile_1.editAsFile)(valuesToEdit, (0, common_tags_1.stripIndents)(templateObject_1 || (templateObject_1 = __makeTemplateObject(["\n Please fill in all secrets for: ", "\n\n "], ["\n Please fill in all secrets for: ", "\n\n "])), components.join(", ")))];
|
|
108
|
+
return [4 /*yield*/, (0, editAsFile_1.editAsFile)(resolveJson(valuesToEdit), (0, common_tags_1.stripIndents)(templateObject_1 || (templateObject_1 = __makeTemplateObject(["\n Please fill in all secrets for: ", "\n\n "], ["\n Please fill in all secrets for: ", "\n\n "])), components.join(", ")))];
|
|
91
109
|
case 3:
|
|
92
110
|
valuesToEdit = _d.sent();
|
|
93
111
|
// check for errors
|
|
@@ -140,6 +158,7 @@ var doItFor = function (instance, env, components) { return __awaiter(void 0, vo
|
|
|
140
158
|
return [3 /*break*/, 4];
|
|
141
159
|
case 9: return [3 /*break*/, 2];
|
|
142
160
|
case 10:
|
|
161
|
+
console.log(JSON.stringify(valuesToEdit, null, 2));
|
|
143
162
|
_c = 0, components_2 = components;
|
|
144
163
|
_d.label = 11;
|
|
145
164
|
case 11:
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commandConfigSecrets.js","sourceRoot":"","sources":["../../../../../src/apps/cli/commands/project/commandConfigSecrets.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAA0C;AAC1C,2CAA2C;AAC3C,iCAAoC;AAEpC,wEAK6C;AAC7C,2DAA0D;AAC1D,mDAA8D;AAC9D,qDAAkD;AAClD,2DAAkE;AAElE,IAAM,gBAAgB,GAAG,UAAO,GAAW,EAAE,aAAqB;;;;oBACnC,qBAAM,IAAA,iCAAc,EAAC,GAAG,EAAE,aAAa,CAAC,EAAA;;gBAA7D,gBAAgB,GAAK,CAAA,SAAwC,CAAA,iBAA7C;gBAEL,qBAAM,IAAA,6BAAU,EAAC,IAAI,EAAE,GAAG,EAAE,aAAa,CAAC,EAAA;;gBAAvD,UAAU,GAAG,SAA0C;gBAC7D,sBAAO,MAAM,CAAC,WAAW,CACvB,gBAAgB,CAAC,GAAG,CAAC,UAAC,GAAG,IAAK,OAAA,CAAC,GAAG,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC,EAAtB,CAAsB,CAAC,CACtD,EAAC;;;KACH,CAAC;AACF,IAAM,OAAO,GAAG,UACd,QAAyB,EACzB,GAAW,EACX,UAAoB;;;;;
|
|
1
|
+
{"version":3,"file":"commandConfigSecrets.js","sourceRoot":"","sources":["../../../../../src/apps/cli/commands/project/commandConfigSecrets.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,95 @@
|
|
|
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 (_) 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
|
+
exports.__esModule = true;
|
|
39
|
+
exports.writeConfig = void 0;
|
|
40
|
+
var child_process_promise_1 = require("child-process-promise");
|
|
41
|
+
var fs_extra_1 = require("fs-extra");
|
|
42
|
+
var js_yaml_1 = require("js-yaml");
|
|
43
|
+
var prettier_1 = require("prettier");
|
|
44
|
+
var projects_1 = require("../../../utils/projects");
|
|
45
|
+
var writeConfig = function (vorpal, config, options) { return __awaiter(void 0, void 0, void 0, function () {
|
|
46
|
+
var gitRoot, TS, configType, content, content;
|
|
47
|
+
return __generator(this, function (_a) {
|
|
48
|
+
switch (_a.label) {
|
|
49
|
+
case 0: return [4 /*yield*/, (0, projects_1.getGitRoot)()];
|
|
50
|
+
case 1:
|
|
51
|
+
gitRoot = _a.sent();
|
|
52
|
+
TS = "typescript (recommended)";
|
|
53
|
+
return [4 /*yield*/, vorpal.prompt({
|
|
54
|
+
type: "list",
|
|
55
|
+
name: "configType",
|
|
56
|
+
choices: [TS, "yaml"],
|
|
57
|
+
message: "In which format do you want the config? 🤔"
|
|
58
|
+
})];
|
|
59
|
+
case 2:
|
|
60
|
+
configType = (_a.sent()).configType;
|
|
61
|
+
if (!(configType === TS)) return [3 /*break*/, 5];
|
|
62
|
+
content = (0, prettier_1.format)("\n import type { Config } from \"@catladder/pipeline\";\n \n const config: Config = ".concat(JSON.stringify(config), ";\n\n export default config;\n\n \n ").concat((options === null || options === void 0 ? void 0 : options.endComment) ? "/*".concat(options.endComment, "*/") : "", "\n \n "));
|
|
63
|
+
return [4 /*yield*/, (0, fs_extra_1.writeFile)(gitRoot + "/catladder.ts", content, {
|
|
64
|
+
encoding: "utf-8"
|
|
65
|
+
})];
|
|
66
|
+
case 3:
|
|
67
|
+
_a.sent();
|
|
68
|
+
vorpal.log("adding type @catladder/pipeline....");
|
|
69
|
+
return [4 /*yield*/, (0, child_process_promise_1.spawn)("yarn add @catladder/pipeline -D", {
|
|
70
|
+
shell: true
|
|
71
|
+
})];
|
|
72
|
+
case 4:
|
|
73
|
+
_a.sent();
|
|
74
|
+
return [3 /*break*/, 7];
|
|
75
|
+
case 5:
|
|
76
|
+
content = (0, js_yaml_1.safeDump)(config);
|
|
77
|
+
return [4 /*yield*/, (0, fs_extra_1.writeFile)(gitRoot + "/catladder.yml", content +
|
|
78
|
+
"\n\n" +
|
|
79
|
+
(options.endComment
|
|
80
|
+
? "# " + options.endComment.split("\n").join("\n# ")
|
|
81
|
+
: ""), {
|
|
82
|
+
encoding: "utf-8"
|
|
83
|
+
})];
|
|
84
|
+
case 6:
|
|
85
|
+
_a.sent();
|
|
86
|
+
_a.label = 7;
|
|
87
|
+
case 7:
|
|
88
|
+
vorpal.log("done!");
|
|
89
|
+
vorpal.log("");
|
|
90
|
+
return [2 /*return*/];
|
|
91
|
+
}
|
|
92
|
+
});
|
|
93
|
+
}); };
|
|
94
|
+
exports.writeConfig = writeConfig;
|
|
95
|
+
//# sourceMappingURL=writeConfig.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"writeConfig.js","sourceRoot":"","sources":["../../../../src/apps/cli/config/writeConfig.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,+DAA8C;AAC9C,qCAAqC;AACrC,mCAAmC;AACnC,qCAAkC;AAElC,oDAAqD;AAE9C,IAAM,WAAW,GAAG,UACzB,MAAuB,EACvB,MAAc,EACd,OAEC;;;;oBAEe,qBAAM,IAAA,qBAAU,GAAE,EAAA;;gBAA5B,OAAO,GAAG,SAAkB;gBAC5B,EAAE,GAAG,0BAA0B,CAAC;gBACf,qBAAM,MAAM,CAAC,MAAM,CAAC;wBACzC,IAAI,EAAE,MAAM;wBACZ,IAAI,EAAE,YAAY;wBAClB,OAAO,EAAE,CAAC,EAAE,EAAE,MAAM,CAAC;wBACrB,OAAO,EAAE,4CAA4C;qBACtD,CAAC,EAAA;;gBALM,UAAU,GAAK,CAAA,SAKrB,CAAA,WALgB;qBAMd,CAAA,UAAU,KAAK,EAAE,CAAA,EAAjB,wBAAiB;gBACb,OAAO,GAAG,IAAA,iBAAM,EAAC,6GAGI,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,+DAK7C,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,UAAU,EAAC,CAAC,CAAC,YAAK,OAAO,CAAC,UAAU,OAAI,CAAC,CAAC,CAAC,EAAE,qBAEvD,CAAC,CAAC;gBAEL,qBAAM,IAAA,oBAAS,EAAC,OAAO,GAAG,eAAe,EAAE,OAAO,EAAE;wBAClD,QAAQ,EAAE,OAAO;qBAClB,CAAC,EAAA;;gBAFF,SAEE,CAAC;gBACH,MAAM,CAAC,GAAG,CAAC,qCAAqC,CAAC,CAAC;gBAClD,qBAAM,IAAA,6BAAK,EAAC,iCAAiC,EAAE;wBAC7C,KAAK,EAAE,IAAI;qBACZ,CAAC,EAAA;;gBAFF,SAEE,CAAC;;;gBAEG,OAAO,GAAG,IAAA,kBAAQ,EAAC,MAAM,CAAC,CAAC;gBAEjC,qBAAM,IAAA,oBAAS,EACb,OAAO,GAAG,gBAAgB,EAC1B,OAAO;wBACL,MAAM;wBACN,CAAC,OAAO,CAAC,UAAU;4BACjB,CAAC,CAAC,IAAI,GAAG,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC;4BACpD,CAAC,CAAC,EAAE,CAAC,EACT;wBACE,QAAQ,EAAE,OAAO;qBAClB,CACF,EAAA;;gBAVD,SAUC,CAAC;;;gBAEJ,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;gBACpB,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;;;;KAChB,CAAC;AApDW,QAAA,WAAW,eAoDtB"}
|
|
@@ -0,0 +1,71 @@
|
|
|
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 (_) 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
|
+
exports.__esModule = true;
|
|
39
|
+
exports.verify = void 0;
|
|
40
|
+
var getProjectConfig_1 = require("../../../config/getProjectConfig");
|
|
41
|
+
var fromv2_1 = require("./migration/fromv2");
|
|
42
|
+
var verify = function (vorpal) { return __awaiter(void 0, void 0, void 0, function () {
|
|
43
|
+
var projectConfig, gitlabCi, e_1;
|
|
44
|
+
return __generator(this, function (_a) {
|
|
45
|
+
switch (_a.label) {
|
|
46
|
+
case 0: return [4 /*yield*/, (0, getProjectConfig_1.getProjectConfig)()];
|
|
47
|
+
case 1:
|
|
48
|
+
projectConfig = _a.sent();
|
|
49
|
+
_a.label = 2;
|
|
50
|
+
case 2:
|
|
51
|
+
_a.trys.push([2, 5, , 6]);
|
|
52
|
+
gitlabCi = (0, getProjectConfig_1.getGitlabCi)();
|
|
53
|
+
if (!gitlabCi) {
|
|
54
|
+
vorpal.log("not initialized");
|
|
55
|
+
}
|
|
56
|
+
if (!!projectConfig) return [3 /*break*/, 4];
|
|
57
|
+
vorpal.log("no project config, needs migration");
|
|
58
|
+
return [4 /*yield*/, (0, fromv2_1.migrateV2)(vorpal)];
|
|
59
|
+
case 3:
|
|
60
|
+
_a.sent();
|
|
61
|
+
_a.label = 4;
|
|
62
|
+
case 4: return [3 /*break*/, 6];
|
|
63
|
+
case 5:
|
|
64
|
+
e_1 = _a.sent();
|
|
65
|
+
return [3 /*break*/, 6];
|
|
66
|
+
case 6: return [2 /*return*/];
|
|
67
|
+
}
|
|
68
|
+
});
|
|
69
|
+
}); };
|
|
70
|
+
exports.verify = verify;
|
|
71
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/apps/cli/verify/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,qEAG0C;AAC1C,6CAA+C;AAExC,IAAM,MAAM,GAAG,UAAO,MAAc;;;;oBACnB,qBAAM,IAAA,mCAAgB,GAAE,EAAA;;gBAAxC,aAAa,GAAG,SAAwB;;;;gBAEtC,QAAQ,GAAG,IAAA,8BAAW,GAAE,CAAC;gBAE/B,IAAI,CAAC,QAAQ,EAAE;oBACb,MAAM,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;iBAC/B;qBAEG,CAAC,aAAa,EAAd,wBAAc;gBAChB,MAAM,CAAC,GAAG,CAAC,oCAAoC,CAAC,CAAC;gBACjD,qBAAM,IAAA,kBAAS,EAAC,MAAM,CAAC,EAAA;;gBAAvB,SAAuB,CAAC;;;;;;;;;KAK7B,CAAC;AAhBW,QAAA,MAAM,UAgBjB"}
|
|
@@ -0,0 +1,240 @@
|
|
|
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
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
14
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
15
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
16
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
17
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
18
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
19
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
20
|
+
});
|
|
21
|
+
};
|
|
22
|
+
var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
23
|
+
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
|
|
24
|
+
return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
|
|
25
|
+
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
26
|
+
function step(op) {
|
|
27
|
+
if (f) throw new TypeError("Generator is already executing.");
|
|
28
|
+
while (_) try {
|
|
29
|
+
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;
|
|
30
|
+
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
31
|
+
switch (op[0]) {
|
|
32
|
+
case 0: case 1: t = op; break;
|
|
33
|
+
case 4: _.label++; return { value: op[1], done: false };
|
|
34
|
+
case 5: _.label++; y = op[1]; op = [0]; continue;
|
|
35
|
+
case 7: op = _.ops.pop(); _.trys.pop(); continue;
|
|
36
|
+
default:
|
|
37
|
+
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
|
|
38
|
+
if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
|
|
39
|
+
if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
|
|
40
|
+
if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
|
|
41
|
+
if (t[2]) _.ops.pop();
|
|
42
|
+
_.trys.pop(); continue;
|
|
43
|
+
}
|
|
44
|
+
op = body.call(thisArg, _);
|
|
45
|
+
} catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
|
|
46
|
+
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
47
|
+
}
|
|
48
|
+
};
|
|
49
|
+
var __rest = (this && this.__rest) || function (s, e) {
|
|
50
|
+
var t = {};
|
|
51
|
+
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
|
|
52
|
+
t[p] = s[p];
|
|
53
|
+
if (s != null && typeof Object.getOwnPropertySymbols === "function")
|
|
54
|
+
for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
|
|
55
|
+
if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
|
|
56
|
+
t[p[i]] = s[p[i]];
|
|
57
|
+
}
|
|
58
|
+
return t;
|
|
59
|
+
};
|
|
60
|
+
exports.__esModule = true;
|
|
61
|
+
exports.migrateV2 = exports.LEGACY_ENVS = void 0;
|
|
62
|
+
var fs_extra_1 = require("fs-extra");
|
|
63
|
+
var lodash_1 = require("lodash");
|
|
64
|
+
var getProjectConfig_1 = require("../../../../config/getProjectConfig");
|
|
65
|
+
var files_1 = require("../../../../utils/files");
|
|
66
|
+
var projects_1 = require("../../../../utils/projects");
|
|
67
|
+
var writeConfig_1 = require("../../config/writeConfig");
|
|
68
|
+
var migrateSecrets_1 = require("./migrateSecrets");
|
|
69
|
+
var oldGitlabCi_1 = require("./oldGitlabCi");
|
|
70
|
+
exports.LEGACY_ENVS = [
|
|
71
|
+
"dev-local",
|
|
72
|
+
"dev",
|
|
73
|
+
"review",
|
|
74
|
+
"stage",
|
|
75
|
+
"prod",
|
|
76
|
+
];
|
|
77
|
+
var arrayToRecord = function (arr) {
|
|
78
|
+
if (!arr)
|
|
79
|
+
return undefined;
|
|
80
|
+
return Object.fromEntries(arr.map(function (_a) {
|
|
81
|
+
var name = _a.name, rest = __rest(_a, ["name"]);
|
|
82
|
+
return [name, rest];
|
|
83
|
+
}));
|
|
84
|
+
};
|
|
85
|
+
var transformVars = function (rawVars) {
|
|
86
|
+
if (rawVars.fromCommponents) {
|
|
87
|
+
console.warn("cant transform legacy fromCommponents");
|
|
88
|
+
}
|
|
89
|
+
return {
|
|
90
|
+
public: rawVars.public,
|
|
91
|
+
secret: rawVars.secret ? Object.keys(rawVars.secret) : undefined
|
|
92
|
+
};
|
|
93
|
+
};
|
|
94
|
+
var transformValues = function (valuesIn) {
|
|
95
|
+
var _a, _b;
|
|
96
|
+
if ((0, lodash_1.isEmpty)(valuesIn)) {
|
|
97
|
+
return undefined;
|
|
98
|
+
}
|
|
99
|
+
(_a = valuesIn === null || valuesIn === void 0 ? void 0 : valuesIn.application) === null || _a === void 0 ? true : delete _a.hostname;
|
|
100
|
+
(_b = valuesIn === null || valuesIn === void 0 ? void 0 : valuesIn.application) === null || _b === void 0 ? true : delete _b.command;
|
|
101
|
+
return __assign(__assign({}, valuesIn), { jobs: arrayToRecord(valuesIn === null || valuesIn === void 0 ? void 0 : valuesIn.jobs), cronjobs: arrayToRecord(valuesIn === null || valuesIn === void 0 ? void 0 : valuesIn.cronjobs) });
|
|
102
|
+
};
|
|
103
|
+
var migrateV2 = function (vorpal) { return __awaiter(void 0, void 0, void 0, function () {
|
|
104
|
+
var gitlabCi, gitRoot, _a, CUSTOMER_NAME, APP_NAME, COMPONENT_NAME, APP_DIR, CLUSTER_NAME;
|
|
105
|
+
return __generator(this, function (_b) {
|
|
106
|
+
switch (_b.label) {
|
|
107
|
+
case 0: return [4 /*yield*/, (0, getProjectConfig_1.getGitlabCi)()];
|
|
108
|
+
case 1:
|
|
109
|
+
gitlabCi = _b.sent();
|
|
110
|
+
return [4 /*yield*/, (0, projects_1.getGitRoot)()];
|
|
111
|
+
case 2:
|
|
112
|
+
gitRoot = _b.sent();
|
|
113
|
+
_a = gitlabCi.variables, CUSTOMER_NAME = _a.CUSTOMER_NAME, APP_NAME = _a.APP_NAME, COMPONENT_NAME = _a.COMPONENT_NAME, APP_DIR = _a.APP_DIR, CLUSTER_NAME = _a.CLUSTER_NAME;
|
|
114
|
+
vorpal
|
|
115
|
+
.command("migrate")
|
|
116
|
+
.action(function () {
|
|
117
|
+
var _a, _b, _c;
|
|
118
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
119
|
+
var shouldContinue, _d, env, baseValues, startCommand, config, _e, _i, LEGACY_ENVS_1, env_1, comment, _f, _g, _h;
|
|
120
|
+
var _j, _k, _l;
|
|
121
|
+
var _this = this;
|
|
122
|
+
return __generator(this, function (_m) {
|
|
123
|
+
switch (_m.label) {
|
|
124
|
+
case 0:
|
|
125
|
+
this.log("⚠️ this project uses legacy catladder (v2)");
|
|
126
|
+
this.log("migrate project?");
|
|
127
|
+
return [4 /*yield*/, this.prompt({
|
|
128
|
+
"default": true,
|
|
129
|
+
message: "Migrate? 🤔",
|
|
130
|
+
name: "shouldContinue",
|
|
131
|
+
type: "confirm"
|
|
132
|
+
})];
|
|
133
|
+
case 1:
|
|
134
|
+
shouldContinue = (_m.sent()).shouldContinue;
|
|
135
|
+
if (!shouldContinue) return [3 /*break*/, 13];
|
|
136
|
+
return [4 /*yield*/, (0, files_1.readYaml)(gitRoot + "/values.yml")];
|
|
137
|
+
case 2:
|
|
138
|
+
_d = (_a = (_m.sent())) !== null && _a !== void 0 ? _a : {}, env = _d.env, baseValues = __rest(_d, ["env"]);
|
|
139
|
+
startCommand = (_c = (_b = baseValues === null || baseValues === void 0 ? void 0 : baseValues.application) === null || _b === void 0 ? void 0 : _b.command) === null || _c === void 0 ? void 0 : _c.join(" ");
|
|
140
|
+
_j = {
|
|
141
|
+
customerName: CUSTOMER_NAME,
|
|
142
|
+
appName: APP_NAME
|
|
143
|
+
};
|
|
144
|
+
_k = {};
|
|
145
|
+
_e = COMPONENT_NAME;
|
|
146
|
+
_l = {
|
|
147
|
+
vars: env ? transformVars(env) : undefined,
|
|
148
|
+
dir: APP_DIR !== null && APP_DIR !== void 0 ? APP_DIR : ".",
|
|
149
|
+
build: {
|
|
150
|
+
type: (0, oldGitlabCi_1.detectBuildConfig)(gitlabCi),
|
|
151
|
+
startCommand: startCommand
|
|
152
|
+
},
|
|
153
|
+
deploy: {
|
|
154
|
+
type: "kubernetes",
|
|
155
|
+
values: transformValues(baseValues),
|
|
156
|
+
cluster: CLUSTER_NAME
|
|
157
|
+
}
|
|
158
|
+
};
|
|
159
|
+
return [4 /*yield*/, exports.LEGACY_ENVS.reduce(function (acc, envName) { return __awaiter(_this, void 0, void 0, function () {
|
|
160
|
+
var newEnvName, envValues, env, rest, hostname, values, _a;
|
|
161
|
+
var _b;
|
|
162
|
+
var _c, _d;
|
|
163
|
+
return __generator(this, function (_e) {
|
|
164
|
+
switch (_e.label) {
|
|
165
|
+
case 0:
|
|
166
|
+
newEnvName = envName === "dev-local" ? "local" : envName;
|
|
167
|
+
return [4 /*yield*/, (0, files_1.readYaml)(gitRoot + "/values-".concat(envName, ".yml"))];
|
|
168
|
+
case 1:
|
|
169
|
+
envValues = (_c = (_e.sent())) !== null && _c !== void 0 ? _c : {};
|
|
170
|
+
env = envValues.env, rest = __rest(envValues, ["env"]);
|
|
171
|
+
hostname = (_d = rest === null || rest === void 0 ? void 0 : rest.application) === null || _d === void 0 ? void 0 : _d.hostname;
|
|
172
|
+
values = transformValues(rest);
|
|
173
|
+
_a = [{}];
|
|
174
|
+
return [4 /*yield*/, acc];
|
|
175
|
+
case 2: return [2 /*return*/, __assign.apply(void 0, [__assign.apply(void 0, _a.concat([(_e.sent())])), (_b = {}, _b[newEnvName] = {
|
|
176
|
+
hostname: hostname,
|
|
177
|
+
vars: env ? transformVars(env) : undefined,
|
|
178
|
+
deploy: values
|
|
179
|
+
? {
|
|
180
|
+
values: values
|
|
181
|
+
}
|
|
182
|
+
: undefined
|
|
183
|
+
}, _b)])];
|
|
184
|
+
}
|
|
185
|
+
});
|
|
186
|
+
}); }, Promise.resolve({}))];
|
|
187
|
+
case 3:
|
|
188
|
+
config = (_j.components = (_k[_e] = (_l.env = _m.sent(),
|
|
189
|
+
_l),
|
|
190
|
+
_k),
|
|
191
|
+
_j);
|
|
192
|
+
this.log("migrate secrets");
|
|
193
|
+
_i = 0, LEGACY_ENVS_1 = exports.LEGACY_ENVS;
|
|
194
|
+
_m.label = 4;
|
|
195
|
+
case 4:
|
|
196
|
+
if (!(_i < LEGACY_ENVS_1.length)) return [3 /*break*/, 7];
|
|
197
|
+
env_1 = LEGACY_ENVS_1[_i];
|
|
198
|
+
return [4 /*yield*/, (0, migrateSecrets_1.migrateSecrets)(this, gitlabCi, env_1)];
|
|
199
|
+
case 5:
|
|
200
|
+
_m.sent();
|
|
201
|
+
_m.label = 6;
|
|
202
|
+
case 6:
|
|
203
|
+
_i++;
|
|
204
|
+
return [3 /*break*/, 4];
|
|
205
|
+
case 7:
|
|
206
|
+
_f = "Old migrated config:\n\n";
|
|
207
|
+
_g = fs_extra_1.readFile;
|
|
208
|
+
return [4 /*yield*/, (0, getProjectConfig_1.getGitlabCiFilePath)()];
|
|
209
|
+
case 8: return [4 /*yield*/, _g.apply(void 0, [_m.sent(), {
|
|
210
|
+
encoding: "utf-8"
|
|
211
|
+
}])];
|
|
212
|
+
case 9:
|
|
213
|
+
comment = _f +
|
|
214
|
+
(_m.sent());
|
|
215
|
+
this.log("write config");
|
|
216
|
+
return [4 /*yield*/, (0, writeConfig_1.writeConfig)(this, config, {
|
|
217
|
+
endComment: comment
|
|
218
|
+
})];
|
|
219
|
+
case 10:
|
|
220
|
+
_m.sent();
|
|
221
|
+
this.log("write gitlab-ci.yml");
|
|
222
|
+
_h = fs_extra_1.writeFile;
|
|
223
|
+
return [4 /*yield*/, (0, getProjectConfig_1.getGitlabCiFilePath)()];
|
|
224
|
+
case 11: return [4 /*yield*/, _h.apply(void 0, [_m.sent(), "include: https://git.panter.ch/api/v4/projects/catladder%2Fcatladder/packages/generic/ci-includes/main/gitlab-ci.yml",
|
|
225
|
+
{ encoding: "utf-8" }])];
|
|
226
|
+
case 12:
|
|
227
|
+
_m.sent();
|
|
228
|
+
_m.label = 13;
|
|
229
|
+
case 13: return [2 /*return*/];
|
|
230
|
+
}
|
|
231
|
+
});
|
|
232
|
+
});
|
|
233
|
+
});
|
|
234
|
+
vorpal.exec("migrate");
|
|
235
|
+
return [2 /*return*/];
|
|
236
|
+
}
|
|
237
|
+
});
|
|
238
|
+
}); };
|
|
239
|
+
exports.migrateV2 = migrateV2;
|
|
240
|
+
//# sourceMappingURL=fromv2.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"fromv2.js","sourceRoot":"","sources":["../../../../../src/apps/cli/verify/migration/fromv2.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
import { CommandInstance } from "vorpal";
|
|
2
|
+
import { LEGACY_ENVS } from "./fromv2";
|
|
3
|
+
import { OldGitlabCiFile } from "./oldGitlabCi";
|
|
4
|
+
export declare const migrateSecrets: (vorpal: CommandInstance, gitlabCi: OldGitlabCiFile, env: typeof LEGACY_ENVS[number]) => Promise<void>;
|
|
@@ -0,0 +1,75 @@
|
|
|
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 (_) 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
|
+
exports.__esModule = true;
|
|
39
|
+
exports.migrateSecrets = void 0;
|
|
40
|
+
var js_yaml_1 = require("js-yaml");
|
|
41
|
+
var gitlab_1 = require("../../../../utils/gitlab");
|
|
42
|
+
var passwordstore_1 = require("../../../../utils/passwordstore");
|
|
43
|
+
var getPassPath = function (gitlabCi, env) {
|
|
44
|
+
return "".concat(gitlabCi.variables.CUSTOMER_NAME, "/").concat(gitlabCi.variables.APP_NAME, "/").concat(env, "/secrets.yml");
|
|
45
|
+
};
|
|
46
|
+
var migrateSecrets = function (vorpal, gitlabCi, env) { return __awaiter(void 0, void 0, void 0, function () {
|
|
47
|
+
var path, yamlstring, secrets, e_1;
|
|
48
|
+
return __generator(this, function (_a) {
|
|
49
|
+
switch (_a.label) {
|
|
50
|
+
case 0:
|
|
51
|
+
path = getPassPath(gitlabCi, env);
|
|
52
|
+
_a.label = 1;
|
|
53
|
+
case 1:
|
|
54
|
+
_a.trys.push([1, 5, , 6]);
|
|
55
|
+
return [4 /*yield*/, (0, passwordstore_1.readPass)(path)];
|
|
56
|
+
case 2:
|
|
57
|
+
yamlstring = _a.sent();
|
|
58
|
+
secrets = (0, js_yaml_1.load)(yamlstring);
|
|
59
|
+
return [4 /*yield*/, (0, gitlab_1.upsertAllVariables)(vorpal, secrets, env === "dev-local" ? "local" : env, gitlabCi.variables.COMPONENT_NAME)];
|
|
60
|
+
case 3:
|
|
61
|
+
_a.sent();
|
|
62
|
+
return [4 /*yield*/, (0, passwordstore_1.trashItem)(path)];
|
|
63
|
+
case 4:
|
|
64
|
+
_a.sent();
|
|
65
|
+
return [3 /*break*/, 6];
|
|
66
|
+
case 5:
|
|
67
|
+
e_1 = _a.sent();
|
|
68
|
+
console.warn("could not migrate secrets for env '".concat(env, "': ").concat(e_1));
|
|
69
|
+
return [3 /*break*/, 6];
|
|
70
|
+
case 6: return [2 /*return*/];
|
|
71
|
+
}
|
|
72
|
+
});
|
|
73
|
+
}); };
|
|
74
|
+
exports.migrateSecrets = migrateSecrets;
|
|
75
|
+
//# sourceMappingURL=migrateSecrets.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"migrateSecrets.js","sourceRoot":"","sources":["../../../../../src/apps/cli/verify/migration/migrateSecrets.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mCAA+B;AAE/B,mDAA8D;AAC9D,iEAAsE;AAItE,IAAM,WAAW,GAAG,UAAC,QAAyB,EAAE,GAAW;IACzD,OAAO,UAAG,QAAQ,CAAC,SAAS,CAAC,aAAa,cAAI,QAAQ,CAAC,SAAS,CAAC,QAAQ,cAAI,GAAG,iBAAc,CAAC;AACjG,CAAC,CAAC;AAEK,IAAM,cAAc,GAAG,UAC5B,MAAuB,EACvB,QAAyB,EACzB,GAA+B;;;;;gBAEzB,IAAI,GAAG,WAAW,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;;;;gBAEnB,qBAAM,IAAA,wBAAQ,EAAC,IAAI,CAAC,EAAA;;gBAAjC,UAAU,GAAG,SAAoB;gBACjC,OAAO,GAAG,IAAA,cAAI,EAAC,UAAU,CAAC,CAAC;gBAEjC,qBAAM,IAAA,2BAAkB,EACtB,MAAM,EACN,OAAO,EACP,GAAG,KAAK,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EACnC,QAAQ,CAAC,SAAS,CAAC,cAAc,CAClC,EAAA;;gBALD,SAKC,CAAC;gBACF,qBAAM,IAAA,yBAAS,EAAC,IAAI,CAAC,EAAA;;gBAArB,SAAqB,CAAC;;;;gBAEtB,OAAO,CAAC,IAAI,CAAC,6CAAsC,GAAG,gBAAM,GAAC,CAAE,CAAC,CAAC;;;;;KAEpE,CAAC;AApBW,QAAA,cAAc,kBAoBzB"}
|