@catladder/cli 0.0.0-main-02cd837f → 0.0.0-main-74e213c5
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/commands/project/commandInitProject.js +3 -3
- package/dist/apps/cli/commands/project/commandInitProject.js.map +1 -1
- package/dist/apps/cli/commands/project/commandListPods.js +2 -2
- package/dist/apps/cli/commands/project/commandListPods.js.map +1 -1
- package/dist/apps/cli/config/writeConfig.js +1 -1
- package/dist/apps/cli/config/writeConfig.js.map +1 -1
- package/dist/apps/cli/utils/getGoogleAuthUserNumber.d.ts +1 -1
- package/dist/apps/cli/verify/migration/fromv2.js.map +1 -1
- package/dist/config/getProjectConfig.d.ts +1 -1
- package/dist/config/getProjectConfig.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/dist/utils/editAsFile.js +10 -10
- package/dist/utils/editAsFile.js.map +1 -1
- package/dist/utils/files.d.ts +1 -1
- package/dist/utils/files.js.map +1 -1
- package/dist/utils/gitlab.d.ts +1 -1
- package/dist/utils/gitlab.js +2 -1
- package/dist/utils/gitlab.js.map +1 -1
- package/dist/utils/preferences/index.d.ts +1 -1
- package/dist/utils/preferences/index.js +11 -11
- package/dist/utils/preferences/index.js.map +1 -1
- package/package.json +3 -3
- package/src/apps/cli/commands/project/commandInitProject.ts +4 -4
- package/src/apps/cli/commands/project/commandListPods.ts +2 -4
- package/src/apps/cli/config/writeConfig.ts +2 -2
- package/src/apps/cli/verify/migration/fromv2.ts +2 -1
- package/src/config/getProjectConfig.ts +2 -2
- package/src/utils/editAsFile.ts +3 -3
- package/src/utils/files.ts +2 -2
- package/src/utils/gitlab.ts +3 -2
- package/src/utils/preferences/index.ts +6 -3
package/dist/utils/editAsFile.js
CHANGED
|
@@ -41,7 +41,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
41
41
|
exports.__esModule = true;
|
|
42
42
|
exports.editAsFile = void 0;
|
|
43
43
|
var tmp_promise_1 = require("tmp-promise");
|
|
44
|
-
var js_yaml_1 =
|
|
44
|
+
var js_yaml_1 = require("js-yaml");
|
|
45
45
|
var fs_extra_1 = require("fs-extra");
|
|
46
46
|
var getEditor_1 = __importDefault(require("./getEditor"));
|
|
47
47
|
var editAsFile = function (inObject, preamble) { return __awaiter(void 0, void 0, void 0, function () {
|
|
@@ -52,24 +52,24 @@ var editAsFile = function (inObject, preamble) { return __awaiter(void 0, void 0
|
|
|
52
52
|
fullPreamble = preamble
|
|
53
53
|
? "#\n# ".concat(preamble.split("\n").join("\n# "), "\n#\n\n")
|
|
54
54
|
: "\n";
|
|
55
|
-
asString = fullPreamble + js_yaml_1
|
|
55
|
+
asString = fullPreamble + (0, js_yaml_1.dump)(inObject, { noRefs: true });
|
|
56
56
|
return [4 /*yield*/, (0, tmp_promise_1.withFile)(function (_a) {
|
|
57
57
|
var tmpFilePath = _a.path;
|
|
58
58
|
return __awaiter(void 0, void 0, void 0, function () {
|
|
59
|
-
var _b
|
|
60
|
-
return __generator(this, function (
|
|
61
|
-
switch (
|
|
59
|
+
var _b;
|
|
60
|
+
return __generator(this, function (_c) {
|
|
61
|
+
switch (_c.label) {
|
|
62
62
|
case 0: return [4 /*yield*/, (0, fs_extra_1.writeFile)(tmpFilePath, asString)];
|
|
63
63
|
case 1:
|
|
64
|
-
|
|
64
|
+
_c.sent();
|
|
65
65
|
return [4 /*yield*/, (0, getEditor_1["default"])()];
|
|
66
|
-
case 2: return [4 /*yield*/, (
|
|
66
|
+
case 2: return [4 /*yield*/, (_c.sent()).open(tmpFilePath)];
|
|
67
67
|
case 3:
|
|
68
|
-
|
|
69
|
-
|
|
68
|
+
_c.sent();
|
|
69
|
+
_b = js_yaml_1.load;
|
|
70
70
|
return [4 /*yield*/, (0, fs_extra_1.readFile)(tmpFilePath)];
|
|
71
71
|
case 4:
|
|
72
|
-
newContent =
|
|
72
|
+
newContent = _b.apply(void 0, [(_c.sent()).toString("utf-8")]);
|
|
73
73
|
return [2 /*return*/];
|
|
74
74
|
}
|
|
75
75
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"editAsFile.js","sourceRoot":"","sources":["../../src/utils/editAsFile.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAAuC;AACvC,
|
|
1
|
+
{"version":3,"file":"editAsFile.js","sourceRoot":"","sources":["../../src/utils/editAsFile.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAAuC;AACvC,mCAAqC;AAErC,qCAA+C;AAC/C,0DAAoC;AAE7B,IAAM,UAAU,GAAG,UACxB,QAAW,EACX,QAAiB;;;;;gBAEX,YAAY,GAAG,QAAQ;oBAC3B,CAAC,CAAC,eACF,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,YAGpC;oBACG,CAAC,CAAC,IAAI,CAAC;gBACH,QAAQ,GAAG,YAAY,GAAG,IAAA,cAAI,EAAC,QAAQ,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;gBAGjE,qBAAM,IAAA,sBAAQ,EACZ,UAAO,EAAqB;4BAAb,WAAW,UAAA;;;;;4CACxB,qBAAM,IAAA,oBAAS,EAAC,WAAW,EAAE,QAAQ,CAAC,EAAA;;wCAAtC,SAAsC,CAAC;wCAChC,qBAAM,IAAA,sBAAS,GAAE,EAAA;4CAAxB,qBAAM,CAAC,SAAiB,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,EAAA;;wCAA3C,SAA2C,CAAC;wCAC/B,KAAA,cAAI,CAAA;wCAAE,qBAAM,IAAA,mBAAQ,EAAC,WAAW,CAAC,EAAA;;wCAA9C,UAAU,GAAG,kBAAK,CAAC,SAA2B,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAM,CAAC;;;;;qBACzE,EACD,EAAE,OAAO,EAAE,MAAM,EAAE,CACpB,EAAA;;gBAPD,SAOC,CAAC;gBAEF,sBAAO,UAAU,EAAC;;;KACnB,CAAC;AAxBW,QAAA,UAAU,cAwBrB"}
|
package/dist/utils/files.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
export declare const readFileOrError: (filePath: string) => Promise<any[]>;
|
|
2
|
-
export declare const readYaml: (filename: string) => Promise<
|
|
2
|
+
export declare const readYaml: <T = Record<string, any>>(filename: string) => Promise<T>;
|
package/dist/utils/files.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"files.js","sourceRoot":"","sources":["../../src/utils/files.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sDAA0B;AAC1B,oDAA2B;AAE3B,IAAM,QAAQ,GAAG,UAAO,IAAY;IAClC,sBAAA,qBAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,EAAA;SAAA,CAAC;AAEpC,IAAM,eAAe,GAAG,UAAO,QAAgB;;;;;;gBAErC,qBAAM,QAAQ,CAAC,QAAQ,CAAC,EAAA;;gBAA/B,IAAI,GAAG,SAAwB;gBACrC,sBAAO,CAAC,IAAI,EAAE,IAAI,CAAC,EAAC;;;gBAEpB,sBAAO,CAAC,GAAC,CAAC,EAAC;;;;KAEd,CAAC;AAPW,QAAA,eAAe,mBAO1B;AAEK,IAAM,QAAQ,GAAG,
|
|
1
|
+
{"version":3,"file":"files.js","sourceRoot":"","sources":["../../src/utils/files.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sDAA0B;AAC1B,oDAA2B;AAE3B,IAAM,QAAQ,GAAG,UAAO,IAAY;IAClC,sBAAA,qBAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,EAAA;SAAA,CAAC;AAEpC,IAAM,eAAe,GAAG,UAAO,QAAgB;;;;;;gBAErC,qBAAM,QAAQ,CAAC,QAAQ,CAAC,EAAA;;gBAA/B,IAAI,GAAG,SAAwB;gBACrC,sBAAO,CAAC,IAAI,EAAE,IAAI,CAAC,EAAC;;;gBAEpB,sBAAO,CAAC,GAAC,CAAC,EAAC;;;;KAEd,CAAC;AAPW,QAAA,eAAe,mBAO1B;AAEK,IAAM,QAAQ,GAAG,UAAgC,QAAgB;;;;;;gBAE7D,KAAA,CAAA,KAAA,oBAAI,CAAA,CAAC,IAAI,CAAA;gBAAC,qBAAM,QAAQ,CAAC,QAAQ,CAAC,EAAA;oBAAzC,sBAAO,cAAU,SAAwB,EAAM,EAAC;;;gBAEhD,sBAAO,IAAI,EAAC;;;;KAEf,CAAC;AANW,QAAA,QAAQ,YAMnB"}
|
package/dist/utils/gitlab.d.ts
CHANGED
|
@@ -2,7 +2,7 @@ import memoizee from "memoizee";
|
|
|
2
2
|
import { CommandInstance } from "vorpal";
|
|
3
3
|
export declare const hasGitlabToken: () => Promise<boolean>;
|
|
4
4
|
export declare const setupGitlabToken: (vorpal: CommandInstance) => Promise<void>;
|
|
5
|
-
export declare const getGitlabToken: (vorpal: CommandInstance) => Promise<
|
|
5
|
+
export declare const getGitlabToken: (vorpal: CommandInstance) => Promise<string>;
|
|
6
6
|
export declare const doGitlabRequest: <T = any>(vorpal: CommandInstance, path: string, data?: any, update?: boolean) => Promise<T>;
|
|
7
7
|
export declare const getProjectInfo: (vorpal: CommandInstance) => Promise<{
|
|
8
8
|
id: string;
|
package/dist/utils/gitlab.js
CHANGED
|
@@ -50,6 +50,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
50
50
|
exports.__esModule = true;
|
|
51
51
|
exports.upsertAllVariables = exports.getAllVariables = exports.getProjectInfo = exports.doGitlabRequest = exports.getGitlabToken = exports.setupGitlabToken = exports.hasGitlabToken = void 0;
|
|
52
52
|
var child_process_promise_1 = require("child-process-promise");
|
|
53
|
+
var pipeline_1 = require("@catladder/pipeline");
|
|
53
54
|
var lodash_1 = require("lodash");
|
|
54
55
|
var memoizee_1 = __importDefault(require("memoizee"));
|
|
55
56
|
var node_fetch_1 = __importDefault(require("node-fetch"));
|
|
@@ -229,7 +230,7 @@ var upsertAllVariables = function (vorpal, variables, env, componentName) { retu
|
|
|
229
230
|
case 2:
|
|
230
231
|
if (!(_i < _a.length)) return [3 /*break*/, 9];
|
|
231
232
|
_b = _a[_i], key = _b[0], value = _b[1];
|
|
232
|
-
fullKey =
|
|
233
|
+
fullKey = (0, pipeline_1.getSecretVarName)(env, componentName, key);
|
|
233
234
|
valueSanitized = (0, lodash_1.isObject)(value) ? JSON.stringify(value) : "".concat(value);
|
|
234
235
|
_c.label = 3;
|
|
235
236
|
case 3:
|
package/dist/utils/gitlab.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gitlab.js","sourceRoot":"","sources":["../../src/utils/gitlab.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+DAA6C;AAC7C,
|
|
1
|
+
{"version":3,"file":"gitlab.js","sourceRoot":"","sources":["../../src/utils/gitlab.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
export declare const hasPreference: (key: string) => Promise<boolean>;
|
|
2
|
-
export declare const getPreference: (key: string) => Promise<
|
|
2
|
+
export declare const getPreference: (key: string) => Promise<string>;
|
|
3
3
|
export declare const setPreference: (key: string, value: string | number) => Promise<void>;
|
|
@@ -53,25 +53,25 @@ exports.__esModule = true;
|
|
|
53
53
|
exports.setPreference = exports.getPreference = exports.hasPreference = void 0;
|
|
54
54
|
var fs_extra_1 = __importDefault(require("fs-extra"));
|
|
55
55
|
var os_1 = require("os");
|
|
56
|
-
var js_yaml_1 =
|
|
56
|
+
var js_yaml_1 = require("js-yaml");
|
|
57
57
|
var directory = "".concat((0, os_1.homedir)(), "/.catladder");
|
|
58
58
|
var file = "".concat(directory, "/preferences.yml");
|
|
59
59
|
var getPreferences = function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
60
|
-
var _a
|
|
61
|
-
var
|
|
62
|
-
return __generator(this, function (
|
|
63
|
-
switch (
|
|
60
|
+
var _a;
|
|
61
|
+
var _b;
|
|
62
|
+
return __generator(this, function (_c) {
|
|
63
|
+
switch (_c.label) {
|
|
64
64
|
case 0: return [4 /*yield*/, fs_extra_1["default"].pathExists(file)];
|
|
65
65
|
case 1:
|
|
66
|
-
if (!!(
|
|
66
|
+
if (!!(_c.sent())) return [3 /*break*/, 3];
|
|
67
67
|
return [4 /*yield*/, fs_extra_1["default"].createFile(file)];
|
|
68
68
|
case 2:
|
|
69
|
-
|
|
70
|
-
|
|
69
|
+
_c.sent();
|
|
70
|
+
_c.label = 3;
|
|
71
71
|
case 3:
|
|
72
|
-
|
|
72
|
+
_a = js_yaml_1.load;
|
|
73
73
|
return [4 /*yield*/, fs_extra_1["default"].readFile(file, { encoding: "utf-8" })];
|
|
74
|
-
case 4: return [2 /*return*/, (
|
|
74
|
+
case 4: return [2 /*return*/, ((_b = _a.apply(void 0, [_c.sent()])) !== null && _b !== void 0 ? _b : {})];
|
|
75
75
|
}
|
|
76
76
|
});
|
|
77
77
|
}); };
|
|
@@ -108,7 +108,7 @@ var setPreference = function (key, value) { return __awaiter(void 0, void 0, voi
|
|
|
108
108
|
case 1:
|
|
109
109
|
preferences = _b.sent();
|
|
110
110
|
newPreferences = __assign(__assign({}, preferences), (_a = {}, _a[key] = value, _a));
|
|
111
|
-
return [4 /*yield*/, fs_extra_1["default"].writeFile(file, js_yaml_1
|
|
111
|
+
return [4 /*yield*/, fs_extra_1["default"].writeFile(file, (0, js_yaml_1.dump)(newPreferences))];
|
|
112
112
|
case 2:
|
|
113
113
|
_b.sent();
|
|
114
114
|
return [2 /*return*/];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utils/preferences/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sDAA0B;AAC1B,yBAA6B;AAE7B,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utils/preferences/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sDAA0B;AAC1B,yBAA6B;AAE7B,mCAAqC;AACrC,IAAM,SAAS,GAAG,UAAG,IAAA,YAAO,GAAE,gBAAa,CAAC;AAC5C,IAAM,IAAI,GAAG,UAAG,SAAS,qBAAkB,CAAC;AAE5C,IAAM,cAAc,GAAG;;;;;oBACf,qBAAM,qBAAE,CAAC,UAAU,CAAC,IAAI,CAAC,EAAA;;qBAA3B,CAAC,CAAC,SAAyB,CAAC,EAA5B,wBAA4B;gBAC9B,qBAAM,qBAAE,CAAC,UAAU,CAAC,IAAI,CAAC,EAAA;;gBAAzB,SAAyB,CAAC;;;gBAEpB,KAAA,cAAI,CAAA;gBAAC,qBAAM,qBAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,EAAA;oBAA3D,sBAAO,CAAC,MAAA,kBAAK,SAA8C,EAAC,mCAAI,EAAE,CAGjE,EAAC;;;KACH,CAAC;AAEK,IAAM,aAAa,GAAG,UAAO,GAAW;;;;oBACzB,qBAAM,cAAc,EAAE,EAAA;;gBAApC,WAAW,GAAG,SAAsB;gBAC1C,sBAAO,GAAG,IAAI,WAAW,EAAC;;;KAC3B,CAAC;AAHW,QAAA,aAAa,iBAGxB;AACK,IAAM,aAAa,GAAG,UAAO,GAAW;;;;oBACzB,qBAAM,cAAc,EAAE,EAAA;;gBAApC,WAAW,GAAG,SAAsB;gBAC1C,sBAAO,WAAW,CAAC,GAAG,CAAC,EAAC;;;KACzB,CAAC;AAHW,QAAA,aAAa,iBAGxB;AAEK,IAAM,aAAa,GAAG,UAAO,GAAW,EAAE,KAAsB;;;;;oBACjD,qBAAM,cAAc,EAAE,EAAA;;gBAApC,WAAW,GAAG,SAAsB;gBAEpC,cAAc,yBACf,WAAW,gBACb,GAAG,IAAG,KAAK,MACb,CAAC;gBAEF,qBAAM,qBAAE,CAAC,SAAS,CAAC,IAAI,EAAE,IAAA,cAAI,EAAC,cAAc,CAAC,CAAC,EAAA;;gBAA9C,SAA8C,CAAC;;;;KAChD,CAAC;AATW,QAAA,aAAa,iBASxB"}
|
package/package.json
CHANGED
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
},
|
|
18
18
|
"dependencies": {
|
|
19
19
|
"@bitwarden/cli": "^1.8.0",
|
|
20
|
-
"@catladder/pipeline": "0.0.0-main-
|
|
20
|
+
"@catladder/pipeline": "0.0.0-main-74e213c5",
|
|
21
21
|
"@kubernetes/client-node": "^0.16.1",
|
|
22
22
|
"child-process-promise": "^2.2.1",
|
|
23
23
|
"clipboardy": "^2.2.0",
|
|
@@ -47,7 +47,7 @@
|
|
|
47
47
|
"@tsconfig/node14": "^1.0.1",
|
|
48
48
|
"@types/common-tags": "^1.8.0",
|
|
49
49
|
"@types/fs-extra": "^5.0.4",
|
|
50
|
-
"@types/js-yaml": "^
|
|
50
|
+
"@types/js-yaml": "^4.0.5",
|
|
51
51
|
"@types/lodash": "^4.14.119",
|
|
52
52
|
"@types/memoizee": "^0.4.2",
|
|
53
53
|
"@types/node-fetch": "^2.1.4",
|
|
@@ -60,6 +60,6 @@
|
|
|
60
60
|
"eslint": "^8.7.0",
|
|
61
61
|
"typescript": "^4.5.4"
|
|
62
62
|
},
|
|
63
|
-
"version": "0.0.0-main-
|
|
63
|
+
"version": "0.0.0-main-74e213c5",
|
|
64
64
|
"stableVersion": "0.0.0-test7"
|
|
65
65
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { readFile, writeFile } from "fs-extra";
|
|
2
|
-
import {
|
|
2
|
+
import { dump } from "js-yaml";
|
|
3
3
|
import { mapKeys, snakeCase, toUpper } from "lodash";
|
|
4
4
|
import path from "path";
|
|
5
5
|
import Vorpal from "vorpal";
|
|
@@ -157,7 +157,7 @@ const PLATFORMS: { [platformName: string]: PlatformDefinition } = {
|
|
|
157
157
|
{
|
|
158
158
|
filename: "values-review.yml",
|
|
159
159
|
content: async () =>
|
|
160
|
-
|
|
160
|
+
dump({
|
|
161
161
|
jobs: {
|
|
162
162
|
"db-prepare-seed": {
|
|
163
163
|
hook: "post-install",
|
|
@@ -259,7 +259,7 @@ export default async (vorpal: Vorpal) =>
|
|
|
259
259
|
variables: transformedVariables,
|
|
260
260
|
};
|
|
261
261
|
|
|
262
|
-
const gitlabCiContent =
|
|
262
|
+
const gitlabCiContent = dump(gitlabCiContentObj);
|
|
263
263
|
await writeFile(".gitlab-ci.yml", gitlabCiContent);
|
|
264
264
|
|
|
265
265
|
allFilesToCreate.forEach(async ({ filename, content }) => {
|
|
@@ -268,7 +268,7 @@ export default async (vorpal: Vorpal) =>
|
|
|
268
268
|
await writeFile(filename, theContent);
|
|
269
269
|
});
|
|
270
270
|
|
|
271
|
-
await writeFile("values.yml",
|
|
271
|
+
await writeFile("values.yml", dump(values));
|
|
272
272
|
|
|
273
273
|
this.log("");
|
|
274
274
|
this.log("gitlab-ci created! 💪😻");
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import
|
|
1
|
+
import { dump } from "js-yaml";
|
|
2
2
|
import { pick } from "lodash";
|
|
3
3
|
import Vorpal from "vorpal";
|
|
4
4
|
import { getProjectPods } from "../../../../utils/projects";
|
|
@@ -13,8 +13,6 @@ export default async (vorpal: Vorpal) =>
|
|
|
13
13
|
await ensureCluster.call(this, envComponent);
|
|
14
14
|
const pods = await getProjectPods(envComponent);
|
|
15
15
|
this.log(
|
|
16
|
-
|
|
17
|
-
pods.map((p) => pick(p, ["metadata.name", "status.startTime"]))
|
|
18
|
-
)
|
|
16
|
+
dump(pods.map((p) => pick(p, ["metadata.name", "status.startTime"])))
|
|
19
17
|
);
|
|
20
18
|
});
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Config } from "@catladder/pipeline";
|
|
2
2
|
import { spawn, exec } from "child-process-promise";
|
|
3
3
|
import { writeFile } from "fs-extra";
|
|
4
|
-
import {
|
|
4
|
+
import { dump } from "js-yaml";
|
|
5
5
|
import { format } from "prettier";
|
|
6
6
|
import { CommandInstance } from "vorpal";
|
|
7
7
|
import { getGitRoot } from "../../../utils/projects";
|
|
@@ -49,7 +49,7 @@ export const writeConfig = async (
|
|
|
49
49
|
});
|
|
50
50
|
await exec("git add " + gitRoot + "/catladder.ts");
|
|
51
51
|
} else {
|
|
52
|
-
const content =
|
|
52
|
+
const content = dump(config);
|
|
53
53
|
|
|
54
54
|
await writeFile(
|
|
55
55
|
gitRoot + "/catladder.yml",
|
|
@@ -15,6 +15,7 @@ import {
|
|
|
15
15
|
import { isEmpty } from "lodash";
|
|
16
16
|
import { join } from "path";
|
|
17
17
|
import Vorpal from "vorpal";
|
|
18
|
+
import { string } from "yargs";
|
|
18
19
|
import {
|
|
19
20
|
getGitlabCi,
|
|
20
21
|
getGitlabCiFilePath,
|
|
@@ -79,7 +80,7 @@ const transformValues = (
|
|
|
79
80
|
};
|
|
80
81
|
};
|
|
81
82
|
export const migrateV2 = async (vorpal: Vorpal) => {
|
|
82
|
-
const gitlabCi
|
|
83
|
+
const gitlabCi = await getGitlabCi<OldGitlabCiFile>();
|
|
83
84
|
const gitRoot = await getGitRoot();
|
|
84
85
|
|
|
85
86
|
const {
|
|
@@ -31,9 +31,9 @@ export const getGitlabCiFilePath = async () => {
|
|
|
31
31
|
const gitRoot = await getGitRoot();
|
|
32
32
|
return gitRoot + "/.gitlab-ci.yml";
|
|
33
33
|
};
|
|
34
|
-
export const getGitlabCi = async () => {
|
|
34
|
+
export const getGitlabCi = async <T = Record<string, any>>() => {
|
|
35
35
|
try {
|
|
36
|
-
return readYaml(await getGitlabCiFilePath())
|
|
36
|
+
return readYaml(await getGitlabCiFilePath()) as Promise<T>;
|
|
37
37
|
} catch (e) {
|
|
38
38
|
// ignore
|
|
39
39
|
return null;
|
package/src/utils/editAsFile.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { withFile } from "tmp-promise";
|
|
2
|
-
import
|
|
2
|
+
import { dump, load } from "js-yaml";
|
|
3
3
|
|
|
4
4
|
import { readFile, writeFile } from "fs-extra";
|
|
5
5
|
import getEditor from "./getEditor";
|
|
@@ -15,14 +15,14 @@ export const editAsFile = async <T>(
|
|
|
15
15
|
|
|
16
16
|
`
|
|
17
17
|
: "\n";
|
|
18
|
-
const asString = fullPreamble +
|
|
18
|
+
const asString = fullPreamble + dump(inObject, { noRefs: true });
|
|
19
19
|
let newContent: T;
|
|
20
20
|
|
|
21
21
|
await withFile(
|
|
22
22
|
async ({ path: tmpFilePath }) => {
|
|
23
23
|
await writeFile(tmpFilePath, asString);
|
|
24
24
|
await (await getEditor()).open(tmpFilePath);
|
|
25
|
-
newContent =
|
|
25
|
+
newContent = load((await readFile(tmpFilePath)).toString("utf-8")) as T;
|
|
26
26
|
},
|
|
27
27
|
{ postfix: ".yml" }
|
|
28
28
|
);
|
package/src/utils/files.ts
CHANGED
|
@@ -13,9 +13,9 @@ export const readFileOrError = async (filePath: string) => {
|
|
|
13
13
|
}
|
|
14
14
|
};
|
|
15
15
|
|
|
16
|
-
export const readYaml = async (filename: string) => {
|
|
16
|
+
export const readYaml = async <T = Record<string, any>>(filename: string) => {
|
|
17
17
|
try {
|
|
18
|
-
return yaml.load(await readFile(filename));
|
|
18
|
+
return yaml.load(await readFile(filename)) as T;
|
|
19
19
|
} catch (e) {
|
|
20
20
|
return null;
|
|
21
21
|
}
|
package/src/utils/gitlab.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { exec } from "child-process-promise";
|
|
2
|
-
import {
|
|
2
|
+
import { getSecretVarName } from "@catladder/pipeline";
|
|
3
|
+
import { isObject } from "lodash";
|
|
3
4
|
import memoizee from "memoizee";
|
|
4
5
|
import fetch from "node-fetch";
|
|
5
6
|
import open from "open";
|
|
@@ -162,7 +163,7 @@ export const upsertAllVariables = async (
|
|
|
162
163
|
const { id } = await getProjectInfo(vorpal);
|
|
163
164
|
|
|
164
165
|
for (const [key, value] of Object.entries(variables ?? {})) {
|
|
165
|
-
const fullKey =
|
|
166
|
+
const fullKey = getSecretVarName(env, componentName, key);
|
|
166
167
|
const valueSanitized = isObject(value) ? JSON.stringify(value) : `${value}`;
|
|
167
168
|
try {
|
|
168
169
|
await updateVariable(vorpal, id, fullKey, valueSanitized);
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import fs from "fs-extra";
|
|
2
2
|
import { homedir } from "os";
|
|
3
3
|
|
|
4
|
-
import
|
|
4
|
+
import { load, dump } from "js-yaml";
|
|
5
5
|
const directory = `${homedir()}/.catladder`;
|
|
6
6
|
const file = `${directory}/preferences.yml`;
|
|
7
7
|
|
|
@@ -9,7 +9,10 @@ const getPreferences = async () => {
|
|
|
9
9
|
if (!(await fs.pathExists(file))) {
|
|
10
10
|
await fs.createFile(file);
|
|
11
11
|
}
|
|
12
|
-
return
|
|
12
|
+
return (load(await fs.readFile(file, { encoding: "utf-8" })) ?? {}) as Record<
|
|
13
|
+
string,
|
|
14
|
+
string
|
|
15
|
+
>;
|
|
13
16
|
};
|
|
14
17
|
|
|
15
18
|
export const hasPreference = async (key: string) => {
|
|
@@ -29,5 +32,5 @@ export const setPreference = async (key: string, value: string | number) => {
|
|
|
29
32
|
[key]: value,
|
|
30
33
|
};
|
|
31
34
|
|
|
32
|
-
await fs.writeFile(file,
|
|
35
|
+
await fs.writeFile(file, dump(newPreferences));
|
|
33
36
|
};
|