cdk8s-cli 2.7.0 → 2.9.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/lib/config.d.ts +1 -0
- package/lib/config.js +17 -2
- package/lib/import/dispatch.js +3 -1
- package/package.json +3 -3
package/lib/config.d.ts
CHANGED
package/lib/config.js
CHANGED
|
@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
23
23
|
return result;
|
|
24
24
|
};
|
|
25
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
-
exports.readConfigSync = void 0;
|
|
26
|
+
exports.addImportToConfig = exports.readConfigSync = void 0;
|
|
27
27
|
const os = __importStar(require("os"));
|
|
28
28
|
const path = __importStar(require("path"));
|
|
29
29
|
const fs = __importStar(require("fs-extra"));
|
|
@@ -44,4 +44,19 @@ function readConfigSync() {
|
|
|
44
44
|
return config;
|
|
45
45
|
}
|
|
46
46
|
exports.readConfigSync = readConfigSync;
|
|
47
|
-
|
|
47
|
+
async function addImportToConfig(source) {
|
|
48
|
+
var _a, _b;
|
|
49
|
+
let curConfig = readConfigSync();
|
|
50
|
+
const curImports = (_a = curConfig.imports) !== null && _a !== void 0 ? _a : [];
|
|
51
|
+
if (!curImports.includes(source)) {
|
|
52
|
+
const importsList = (_b = curConfig.imports) !== null && _b !== void 0 ? _b : [];
|
|
53
|
+
importsList.push(source);
|
|
54
|
+
let config = {
|
|
55
|
+
...curConfig,
|
|
56
|
+
imports: importsList,
|
|
57
|
+
};
|
|
58
|
+
await fs.outputFile(CONFIG_FILE, yaml.stringify(config));
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
exports.addImportToConfig = addImportToConfig;
|
|
62
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2NvbmZpZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLHVDQUF5QjtBQUN6QiwyQ0FBNkI7QUFDN0IsNkNBQStCO0FBQy9CLDJDQUE2QjtBQUc3QixNQUFNLFdBQVcsR0FBRyxZQUFZLENBQUM7QUF5QmpDLE1BQU0sUUFBUSxHQUFXO0lBQ3ZCLE1BQU0sRUFBRSxNQUFNO0lBQ2QsZ0JBQWdCLEVBQUUsSUFBSSxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsT0FBTyxFQUFFLEVBQUUsUUFBUSxFQUFFLFNBQVMsQ0FBQztDQUMvRCxDQUFDO0FBRUYsU0FBZ0IsY0FBYztJQUM1QixJQUFJLE1BQU0sR0FBVyxRQUFRLENBQUM7SUFDOUIsSUFBSSxFQUFFLENBQUMsVUFBVSxDQUFDLFdBQVcsQ0FBQyxFQUFFO1FBQzlCLE1BQU0sR0FBRztZQUNQLEdBQUcsTUFBTTtZQUNULEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxFQUFFLENBQUMsWUFBWSxDQUFDLFdBQVcsRUFBRSxPQUFPLENBQUMsQ0FBQztTQUNyRCxDQUFDO0tBQ0g7SUFDRCxPQUFPLE1BQU0sQ0FBQztBQUNoQixDQUFDO0FBVEQsd0NBU0M7QUFFTSxLQUFLLFVBQVUsaUJBQWlCLENBQUMsTUFBYzs7SUFDcEQsSUFBSSxTQUFTLEdBQUcsY0FBYyxFQUFFLENBQUM7SUFFakMsTUFBTSxVQUFVLEdBQUcsTUFBQSxTQUFTLENBQUMsT0FBTyxtQ0FBSSxFQUFFLENBQUM7SUFDM0MsSUFBSSxDQUFDLFVBQVUsQ0FBQyxRQUFRLENBQUMsTUFBTSxDQUFDLEVBQUU7UUFDaEMsTUFBTSxXQUFXLEdBQUcsTUFBQSxTQUFTLENBQUMsT0FBTyxtQ0FBSSxFQUFFLENBQUM7UUFDNUMsV0FBVyxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUN6QixJQUFJLE1BQU0sR0FBRztZQUNYLEdBQUcsU0FBUztZQUNaLE9BQU8sRUFBRSxXQUFXO1NBQ3JCLENBQUM7UUFDRixNQUFNLEVBQUUsQ0FBQyxVQUFVLENBQUMsV0FBVyxFQUFFLElBQUksQ0FBQyxTQUFTLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQztLQUMxRDtBQUNILENBQUM7QUFiRCw4Q0FhQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCAqIGFzIG9zIGZyb20gJ29zJztcbmltcG9ydCAqIGFzIHBhdGggZnJvbSAncGF0aCc7XG5pbXBvcnQgKiBhcyBmcyBmcm9tICdmcy1leHRyYSc7XG5pbXBvcnQgKiBhcyB5YW1sIGZyb20gJ3lhbWwnO1xuaW1wb3J0IHsgTGFuZ3VhZ2UgfSBmcm9tICcuL2ltcG9ydC9iYXNlJztcblxuY29uc3QgQ09ORklHX0ZJTEUgPSAnY2RrOHMueWFtbCc7XG5cbmV4cG9ydCBpbnRlcmZhY2UgSW1wb3J0U3BlYyB7XG4gIHJlYWRvbmx5IG1vZHVsZU5hbWVQcmVmaXg/OiBzdHJpbmc7XG4gIHJlYWRvbmx5IHNvdXJjZTogc3RyaW5nO1xufVxuXG5leHBvcnQgaW50ZXJmYWNlIFZhbGlkYXRpb25Db25maWcge1xuXG4gIHJlYWRvbmx5IHBhY2thZ2U6IHN0cmluZztcbiAgcmVhZG9ubHkgdmVyc2lvbjogc3RyaW5nO1xuICByZWFkb25seSBjbGFzczogc3RyaW5nO1xuICByZWFkb25seSBpbnN0YWxsRW52PzogeyBba2V5OiBzdHJpbmddOiBhbnkgfTtcbiAgcmVhZG9ubHkgcHJvcGVydGllcz86IHsgW2tleTogc3RyaW5nXTogYW55IH07XG59XG5cbmV4cG9ydCBpbnRlcmZhY2UgQ29uZmlnIHtcbiAgcmVhZG9ubHkgYXBwPzogc3RyaW5nO1xuICByZWFkb25seSBsYW5ndWFnZT86IExhbmd1YWdlO1xuICByZWFkb25seSBvdXRwdXQ/OiBzdHJpbmc7XG4gIHJlYWRvbmx5IGltcG9ydHM/OiBzdHJpbmdbXTtcbiAgcmVhZG9ubHkgcGx1Z2luc0RpcmVjdG9yeT86IHN0cmluZztcbiAgcmVhZG9ubHkgdmFsaWRhdGlvbnM/OiBzdHJpbmcgfCBWYWxpZGF0aW9uQ29uZmlnW107XG59XG5cbmNvbnN0IERFRkFVTFRTOiBDb25maWcgPSB7XG4gIG91dHB1dDogJ2Rpc3QnLFxuICBwbHVnaW5zRGlyZWN0b3J5OiBwYXRoLmpvaW4ob3MuaG9tZWRpcigpLCAnLmNkazhzJywgJ3BsdWdpbnMnKSxcbn07XG5cbmV4cG9ydCBmdW5jdGlvbiByZWFkQ29uZmlnU3luYygpOiBDb25maWcge1xuICBsZXQgY29uZmlnOiBDb25maWcgPSBERUZBVUxUUztcbiAgaWYgKGZzLmV4aXN0c1N5bmMoQ09ORklHX0ZJTEUpKSB7XG4gICAgY29uZmlnID0ge1xuICAgICAgLi4uY29uZmlnLFxuICAgICAgLi4ueWFtbC5wYXJzZShmcy5yZWFkRmlsZVN5bmMoQ09ORklHX0ZJTEUsICd1dGYtOCcpKSxcbiAgICB9O1xuICB9XG4gIHJldHVybiBjb25maWc7XG59XG5cbmV4cG9ydCBhc3luYyBmdW5jdGlvbiBhZGRJbXBvcnRUb0NvbmZpZyhzb3VyY2U6IHN0cmluZykge1xuICBsZXQgY3VyQ29uZmlnID0gcmVhZENvbmZpZ1N5bmMoKTtcblxuICBjb25zdCBjdXJJbXBvcnRzID0gY3VyQ29uZmlnLmltcG9ydHMgPz8gW107XG4gIGlmICghY3VySW1wb3J0cy5pbmNsdWRlcyhzb3VyY2UpKSB7XG4gICAgY29uc3QgaW1wb3J0c0xpc3QgPSBjdXJDb25maWcuaW1wb3J0cyA/PyBbXTtcbiAgICBpbXBvcnRzTGlzdC5wdXNoKHNvdXJjZSk7XG4gICAgbGV0IGNvbmZpZyA9IHtcbiAgICAgIC4uLmN1ckNvbmZpZyxcbiAgICAgIGltcG9ydHM6IGltcG9ydHNMaXN0LFxuICAgIH07XG4gICAgYXdhaXQgZnMub3V0cHV0RmlsZShDT05GSUdfRklMRSwgeWFtbC5zdHJpbmdpZnkoY29uZmlnKSk7XG4gIH1cbn0iXX0=
|
package/lib/import/dispatch.js
CHANGED
|
@@ -4,6 +4,7 @@ exports.importDispatch = void 0;
|
|
|
4
4
|
const crd_1 = require("./crd");
|
|
5
5
|
const crds_dev_1 = require("./crds-dev");
|
|
6
6
|
const k8s_1 = require("./k8s");
|
|
7
|
+
const config_1 = require("../config");
|
|
7
8
|
async function importDispatch(imports, argv, options) {
|
|
8
9
|
for (const importSpec of imports) {
|
|
9
10
|
const importer = await matchImporter(importSpec, argv);
|
|
@@ -15,6 +16,7 @@ async function importDispatch(imports, argv, options) {
|
|
|
15
16
|
moduleNamePrefix: importSpec.moduleNamePrefix,
|
|
16
17
|
...options,
|
|
17
18
|
});
|
|
19
|
+
await (0, config_1.addImportToConfig)(importSpec.source);
|
|
18
20
|
}
|
|
19
21
|
}
|
|
20
22
|
exports.importDispatch = importDispatch;
|
|
@@ -32,4 +34,4 @@ async function matchImporter(importSpec, argv) {
|
|
|
32
34
|
// default to a normal CRD
|
|
33
35
|
return crd_1.ImportCustomResourceDefinition.fromSpec(importSpec);
|
|
34
36
|
}
|
|
35
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
37
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGlzcGF0Y2guanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvaW1wb3J0L2Rpc3BhdGNoLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUNBLCtCQUF1RDtBQUN2RCx5Q0FBNkM7QUFDN0MsK0JBQTRDO0FBQzVDLHNDQUEwRDtBQUVuRCxLQUFLLFVBQVUsY0FBYyxDQUFDLE9BQXFCLEVBQUUsSUFBUyxFQUFFLE9BQXNCO0lBQzNGLEtBQUssTUFBTSxVQUFVLElBQUksT0FBTyxFQUFFO1FBQ2hDLE1BQU0sUUFBUSxHQUFHLE1BQU0sYUFBYSxDQUFDLFVBQVUsRUFBRSxJQUFJLENBQUMsQ0FBQztRQUV2RCxJQUFJLENBQUMsUUFBUSxFQUFFO1lBQ2IsTUFBTSxJQUFJLEtBQUssQ0FBQyx3Q0FBd0MsVUFBVSxHQUFHLENBQUMsQ0FBQztTQUN4RTtRQUVELE9BQU8sQ0FBQyxLQUFLLENBQUMscURBQXFELENBQUMsQ0FBQztRQUVyRSxNQUFNLFFBQVEsQ0FBQyxNQUFNLENBQUM7WUFDcEIsZ0JBQWdCLEVBQUUsVUFBVSxDQUFDLGdCQUFnQjtZQUM3QyxHQUFHLE9BQU87U0FDWCxDQUFDLENBQUM7UUFDSCxNQUFNLElBQUEsMEJBQWlCLEVBQUMsVUFBVSxDQUFDLE1BQU0sQ0FBQyxDQUFDO0tBQzVDO0FBQ0gsQ0FBQztBQWhCRCx3Q0FnQkM7QUFFRCxLQUFLLFVBQVUsYUFBYSxDQUFDLFVBQXNCLEVBQUUsSUFBUztJQUU1RCxxQ0FBcUM7SUFDckMsTUFBTSxHQUFHLEdBQUcsTUFBTSx5QkFBbUIsQ0FBQyxLQUFLLENBQUMsVUFBVSxFQUFFLElBQUksQ0FBQyxDQUFDO0lBQzlELElBQUksR0FBRyxFQUFFO1FBQ1AsT0FBTyxJQUFJLHlCQUFtQixDQUFDLEdBQUcsQ0FBQyxDQUFDO0tBQ3JDO0lBRUQscUNBQXFDO0lBQ3JDLE1BQU0sVUFBVSxHQUFHLElBQUEsMEJBQWUsRUFBQyxVQUFVLENBQUMsTUFBTSxDQUFDLENBQUM7SUFDdEQsSUFBSSxVQUFVLEVBQUU7UUFDZCxPQUFPLG9DQUE4QixDQUFDLFFBQVEsQ0FBQyxFQUFFLE1BQU0sRUFBRSxVQUFVLEVBQUUsZ0JBQWdCLEVBQUUsVUFBVSxDQUFDLGdCQUFnQixFQUFFLENBQUMsQ0FBQztLQUN2SDtJQUVELDBCQUEwQjtJQUMxQixPQUFPLG9DQUE4QixDQUFDLFFBQVEsQ0FBQyxVQUFVLENBQUMsQ0FBQztBQUM3RCxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgSW1wb3J0QmFzZSwgSW1wb3J0T3B0aW9ucyB9IGZyb20gJy4vYmFzZSc7XG5pbXBvcnQgeyBJbXBvcnRDdXN0b21SZXNvdXJjZURlZmluaXRpb24gfSBmcm9tICcuL2NyZCc7XG5pbXBvcnQgeyBtYXRjaENyZHNEZXZVcmwgfSBmcm9tICcuL2NyZHMtZGV2JztcbmltcG9ydCB7IEltcG9ydEt1YmVybmV0ZXNBcGkgfSBmcm9tICcuL2s4cyc7XG5pbXBvcnQgeyBJbXBvcnRTcGVjLCBhZGRJbXBvcnRUb0NvbmZpZyB9IGZyb20gJy4uL2NvbmZpZyc7XG5cbmV4cG9ydCBhc3luYyBmdW5jdGlvbiBpbXBvcnREaXNwYXRjaChpbXBvcnRzOiBJbXBvcnRTcGVjW10sIGFyZ3Y6IGFueSwgb3B0aW9uczogSW1wb3J0T3B0aW9ucykge1xuICBmb3IgKGNvbnN0IGltcG9ydFNwZWMgb2YgaW1wb3J0cykge1xuICAgIGNvbnN0IGltcG9ydGVyID0gYXdhaXQgbWF0Y2hJbXBvcnRlcihpbXBvcnRTcGVjLCBhcmd2KTtcblxuICAgIGlmICghaW1wb3J0ZXIpIHtcbiAgICAgIHRocm93IG5ldyBFcnJvcihgdW5hYmxlIHRvIGRldGVybWluZSBpbXBvcnQgdHlwZSBmb3IgXCIke2ltcG9ydFNwZWN9XCJgKTtcbiAgICB9XG5cbiAgICBjb25zb2xlLmVycm9yKCdJbXBvcnRpbmcgcmVzb3VyY2VzLCB0aGlzIG1heSB0YWtlIGEgZmV3IG1vbWVudHMuLi4nKTtcblxuICAgIGF3YWl0IGltcG9ydGVyLmltcG9ydCh7XG4gICAgICBtb2R1bGVOYW1lUHJlZml4OiBpbXBvcnRTcGVjLm1vZHVsZU5hbWVQcmVmaXgsXG4gICAgICAuLi5vcHRpb25zLFxuICAgIH0pO1xuICAgIGF3YWl0IGFkZEltcG9ydFRvQ29uZmlnKGltcG9ydFNwZWMuc291cmNlKTtcbiAgfVxufVxuXG5hc3luYyBmdW5jdGlvbiBtYXRjaEltcG9ydGVyKGltcG9ydFNwZWM6IEltcG9ydFNwZWMsIGFyZ3Y6IGFueSk6IFByb21pc2U8SW1wb3J0QmFzZT4ge1xuXG4gIC8vIGZpcnN0IGNoZWNrIGlmIGl0cyBhIGBrOHNAYCBpbXBvcnRcbiAgY29uc3QgazhzID0gYXdhaXQgSW1wb3J0S3ViZXJuZXRlc0FwaS5tYXRjaChpbXBvcnRTcGVjLCBhcmd2KTtcbiAgaWYgKGs4cykge1xuICAgIHJldHVybiBuZXcgSW1wb3J0S3ViZXJuZXRlc0FwaShrOHMpO1xuICB9XG5cbiAgLy8gbm93IGNoZWNrIGlmIGl0cyBhIGNyZHMuZGV2IGltcG9ydFxuICBjb25zdCBjcmRzRGV2VXJsID0gbWF0Y2hDcmRzRGV2VXJsKGltcG9ydFNwZWMuc291cmNlKTtcbiAgaWYgKGNyZHNEZXZVcmwpIHtcbiAgICByZXR1cm4gSW1wb3J0Q3VzdG9tUmVzb3VyY2VEZWZpbml0aW9uLmZyb21TcGVjKHsgc291cmNlOiBjcmRzRGV2VXJsLCBtb2R1bGVOYW1lUHJlZml4OiBpbXBvcnRTcGVjLm1vZHVsZU5hbWVQcmVmaXggfSk7XG4gIH1cblxuICAvLyBkZWZhdWx0IHRvIGEgbm9ybWFsIENSRFxuICByZXR1cm4gSW1wb3J0Q3VzdG9tUmVzb3VyY2VEZWZpbml0aW9uLmZyb21TcGVjKGltcG9ydFNwZWMpO1xufVxuIl19
|
package/package.json
CHANGED
|
@@ -75,8 +75,8 @@
|
|
|
75
75
|
"dependencies": {
|
|
76
76
|
"@types/node": "^16",
|
|
77
77
|
"ajv": "^8.12.0",
|
|
78
|
-
"cdk8s": "^2.
|
|
79
|
-
"cdk8s-plus-25": "^2.
|
|
78
|
+
"cdk8s": "^2.16.0",
|
|
79
|
+
"cdk8s-plus-25": "^2.12.1",
|
|
80
80
|
"codemaker": "^1.85.0",
|
|
81
81
|
"colors": "1.4.0",
|
|
82
82
|
"constructs": "^10.2.69",
|
|
@@ -103,7 +103,7 @@
|
|
|
103
103
|
"node": ">= 16.20.0"
|
|
104
104
|
},
|
|
105
105
|
"license": "Apache-2.0",
|
|
106
|
-
"version": "2.
|
|
106
|
+
"version": "2.9.0",
|
|
107
107
|
"jest": {
|
|
108
108
|
"testMatch": [
|
|
109
109
|
"<rootDir>/src/**/__tests__/**/*.ts?(x)",
|