cdk8s-cli 2.2.31 → 2.2.33
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/.projenrc.ts +1 -1
- package/lib/util.js +3 -3
- package/package.json +8 -8
- package/projenrc/integ.ts +8 -8
package/.projenrc.ts
CHANGED
|
@@ -84,7 +84,7 @@ project.gitignore.exclude('.vscode/');
|
|
|
84
84
|
// add @types/node as a regular dependency since it's needed to during "import"
|
|
85
85
|
// to compile the generated jsii code.
|
|
86
86
|
project.deps.removeDependency('@types/node', DependencyType.BUILD);
|
|
87
|
-
project.deps.addDependency('@types/node@^
|
|
87
|
+
project.deps.addDependency('@types/node@^16', DependencyType.RUNTIME);
|
|
88
88
|
|
|
89
89
|
const schemas = project.addTask('schemas');
|
|
90
90
|
schemas.exec('ts-node scripts/crd.schema.ts');
|
package/lib/util.js
CHANGED
|
@@ -35,8 +35,8 @@ const fs = __importStar(require("fs-extra"));
|
|
|
35
35
|
const yaml = __importStar(require("yaml"));
|
|
36
36
|
const validation_1 = require("./plugins/validation");
|
|
37
37
|
async function shell(program, args = [], options = {}) {
|
|
38
|
-
var _a;
|
|
39
|
-
const command = `"${program} ${args.join(' ')}" at ${path.resolve((_a = options.cwd) !== null &&
|
|
38
|
+
var _a, _b;
|
|
39
|
+
const command = `"${program} ${args.join(' ')}" at ${path.resolve((_b = (_a = options.cwd) === null || _a === void 0 ? void 0 : _a.toString()) !== null && _b !== void 0 ? _b : '.')}`;
|
|
40
40
|
return new Promise((ok, ko) => {
|
|
41
41
|
var _a;
|
|
42
42
|
const child = (0, child_process_1.spawn)(program, args, { stdio: ['inherit', 'pipe', 'inherit'], ...options });
|
|
@@ -231,4 +231,4 @@ function findConstructMetadata(directory) {
|
|
|
231
231
|
return fs.existsSync(p) ? p : undefined;
|
|
232
232
|
}
|
|
233
233
|
exports.findConstructMetadata = findConstructMetadata;
|
|
234
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"util.js","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"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","sourcesContent":["import { spawn, SpawnOptions } from 'child_process';\nimport { promises } from 'fs';\nimport * as http from 'http';\nimport * as https from 'https';\nimport * as os from 'os';\nimport * as path from 'path';\nimport { parse } from 'url';\nimport * as fs from 'fs-extra';\nimport * as yaml from 'yaml';\nimport { ValidationConfig } from './config';\nimport { PluginManager } from './plugins/_manager';\nimport { ValidationPlugin, ValidationContext, ValidationReport, Validation } from './plugins/validation';\nimport { SafeReviver } from './reviver';\n\nexport async function shell(program: string, args: string[] = [], options: SpawnOptions = { }): Promise<string> {\n  const command = `\"${program} ${args.join(' ')}\" at ${path.resolve(options.cwd ?? '.')}`;\n  return new Promise((ok, ko) => {\n    const child = spawn(program, args, { stdio: ['inherit', 'pipe', 'inherit'], ...options });\n    const data = new Array<Buffer>();\n    child.stdout?.on('data', chunk => data.push(chunk));\n\n    child.once('error', err => ko(new Error(`command ${command} failed: ${err}`)));\n    child.once('exit', code => {\n      if (code === 0) {\n        return ok(Buffer.concat(data).toString('utf-8'));\n      } else {\n        return ko(new Error(`command ${command} returned a non-zero exit code ${code}`));\n      }\n    });\n  });\n}\n\nexport async function mkdtemp(closure: (dir: string) => Promise<void>) {\n  const workdir = await fs.mkdtemp(path.join(os.tmpdir(), 'cdk8s-'));\n  try {\n    await closure(workdir);\n  } finally {\n    await fs.remove(workdir);\n  }\n}\n\nexport async function synthApp(command: string, outdir: string, stdout: boolean, metadata: boolean): Promise<SynthesizedApp> {\n  if (!stdout) {\n    console.log('Synthesizing application');\n  }\n  await shell(command, [], {\n    shell: true,\n    env: {\n      ...process.env,\n      CDK8S_OUTDIR: outdir,\n      // record metadata so that the validation report\n      // has contruct aware context.\n      CDK8S_RECORD_CONSTRUCT_METADATA: process.env.CDK8S_RECORD_CONSTRUCT_METADATA ?? (metadata ? 'true' : 'false'),\n    },\n  });\n\n  if (!await fs.pathExists(outdir)) {\n    console.error(`ERROR: synthesis failed, app expected to create \"${outdir}\"`);\n    process.exit(1);\n  }\n\n  let found = false;\n  const yamlFiles = await findManifests(outdir);\n  if (yamlFiles?.length) {\n    if (!stdout) {\n      for (const yamlFile of yamlFiles) {\n        console.log(`  - ${yamlFile}`);\n      }\n    }\n    found = true;\n  }\n\n  if (!found) {\n    console.error('No manifests synthesized');\n  }\n\n  const constructMetadata = findConstructMetadata(outdir);\n\n  return { manifests: yamlFiles, constructMetadata };\n}\n\nexport async function validateApp(\n  app: SynthesizedApp,\n  stdout: boolean,\n  validations: ValidationConfig[],\n  pluginManager: PluginManager,\n  reportsFile?: string) {\n\n  const validators: { plugin: Validation; context: ValidationContext}[] = [];\n\n  for (const validation of validations) {\n    const { plugin, context } = ValidationPlugin.load(validation, app, stdout, pluginManager);\n    validators.push({ plugin, context });\n  }\n\n  const reports: ValidationReport[] = [];\n  let success = true;\n\n  console.log('Performing validations');\n\n  for (const validator of validators) {\n    await validator.plugin.validate(validator.context);\n    const report = validator.context.report;\n    success = success && report.success;\n    reports.push(report);\n  }\n\n  console.log('Validations finished');\n\n  // now we can print them. we don't incrementally print\n  // so to not clutter the terminal in case of errors.\n  for (const report of reports) {\n    console.log('');\n    console.log(report.toString());\n    console.log('');\n  }\n\n  if (reportsFile) {\n\n    if (fs.existsSync(reportsFile)) {\n      throw new Error(`Unable to write validation reports file. Already exists: ${reportsFile}`);\n    }\n    // write the reports in JSON to a file\n    fs.writeFileSync(reportsFile, JSON.stringify({\n      reports: reports.map(r => r.toJson()),\n    }, null, 2));\n  }\n\n  // exit with failure if any report resulted in a failure\n  if (!success) {\n    console.error('Validation failed. See above reports for details');\n    process.exit(2);\n  }\n\n  console.log('Validations ended succesfully');\n\n}\n\nexport function safeParseJson(text: string, reviver: SafeReviver): any {\n  const json = JSON.parse(text);\n  reviver.sanitize(json);\n  return json;\n}\n\nexport function safeParseYaml(text: string, reviver: SafeReviver): any[] {\n\n  // parseAllDocuments doesnt accept a reviver\n  // so we first parse normally and than transform\n  // to JS using the reviver.\n  const parsed = yaml.parseAllDocuments(text);\n  const docs = [];\n  for (const doc of parsed) {\n    const json = doc.toJS();\n    reviver.sanitize(json);\n    docs.push(json);\n  }\n  return docs;\n}\n\nexport async function download(url: string): Promise<string> {\n\n  let client: typeof http | typeof https;\n  const proto = parse(url).protocol;\n\n  if (!proto || proto === 'file:') {\n    return fs.readFile(url, 'utf-8');\n  }\n\n  switch (proto) {\n    case 'https:':\n      client = https;\n      break;\n\n    case 'http:':\n      client = http;\n      break;\n\n    default:\n      throw new Error(`unsupported protocol ${proto}`);\n  }\n\n  return new Promise((ok, ko) => {\n    const req = client.get(url, res => {\n      switch (res.statusCode) {\n        case 200: {\n          const data = new Array<Buffer>();\n          res.on('data', chunk => data.push(chunk));\n          res.once('end', () => ok(Buffer.concat(data).toString('utf-8')));\n          res.once('error', ko);\n          break;\n        }\n\n        case 301:\n        case 302: {\n          if (res.headers.location) {\n            ok(download(res.headers.location));\n          }\n          break;\n        }\n\n        default: {\n          ko(new Error(`${res.statusMessage}: ${url}`));\n        }\n      }\n    });\n\n    req.once('error', ko);\n    req.end();\n  });\n}\n\nexport async function findManifests(directory: string): Promise<string[]> {\n  // Ensure path is valid\n  try {\n    await promises.access(directory);\n  } catch {\n    return [];\n  }\n\n  // Read Path contents\n  const entries = await promises.readdir(directory, { withFileTypes: true });\n\n  // Get files within the current directory\n  const files = entries\n    .filter(file => (!file.isDirectory() && file.name.endsWith('.yaml')))\n    .map(file => (directory + '/' + file.name));\n\n  // Get sub-folders within the current folder\n  const folders = entries.filter(folder => folder.isDirectory());\n\n  for (const folder of folders) {\n    files.push(...await findManifests(`${directory}/${folder.name}`));\n  }\n\n  return files;\n}\n\nexport function findConstructMetadata(directory: string): string | undefined {\n  // this file is optionally created during synthesis\n  const p = path.join(directory, 'construct-metadata.json');\n  return fs.existsSync(p) ? p : undefined;\n}\n\n/**\n * Result of synthesizing an application.\n */\nexport interface SynthesizedApp {\n\n  /**\n   * The list of manifests produced by the app.\n   */\n  readonly manifests: readonly string[];\n\n  /**\n   * The construct metadata file (if exists).\n   */\n  readonly constructMetadata?: string;\n}"]}
|
|
234
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"util.js","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"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","sourcesContent":["import { spawn, SpawnOptions } from 'child_process';\nimport { promises } from 'fs';\nimport * as http from 'http';\nimport * as https from 'https';\nimport * as os from 'os';\nimport * as path from 'path';\nimport { parse } from 'url';\nimport * as fs from 'fs-extra';\nimport * as yaml from 'yaml';\nimport { ValidationConfig } from './config';\nimport { PluginManager } from './plugins/_manager';\nimport { ValidationPlugin, ValidationContext, ValidationReport, Validation } from './plugins/validation';\nimport { SafeReviver } from './reviver';\n\nexport async function shell(program: string, args: string[] = [], options: SpawnOptions = { }): Promise<string> {\n  const command = `\"${program} ${args.join(' ')}\" at ${path.resolve(options.cwd?.toString() ?? '.')}`;\n  return new Promise((ok, ko) => {\n    const child = spawn(program, args, { stdio: ['inherit', 'pipe', 'inherit'], ...options });\n    const data = new Array<Buffer>();\n    child.stdout?.on('data', chunk => data.push(chunk));\n\n    child.once('error', err => ko(new Error(`command ${command} failed: ${err}`)));\n    child.once('exit', code => {\n      if (code === 0) {\n        return ok(Buffer.concat(data).toString('utf-8'));\n      } else {\n        return ko(new Error(`command ${command} returned a non-zero exit code ${code}`));\n      }\n    });\n  });\n}\n\nexport async function mkdtemp(closure: (dir: string) => Promise<void>) {\n  const workdir = await fs.mkdtemp(path.join(os.tmpdir(), 'cdk8s-'));\n  try {\n    await closure(workdir);\n  } finally {\n    await fs.remove(workdir);\n  }\n}\n\nexport async function synthApp(command: string, outdir: string, stdout: boolean, metadata: boolean): Promise<SynthesizedApp> {\n  if (!stdout) {\n    console.log('Synthesizing application');\n  }\n  await shell(command, [], {\n    shell: true,\n    env: {\n      ...process.env,\n      CDK8S_OUTDIR: outdir,\n      // record metadata so that the validation report\n      // has contruct aware context.\n      CDK8S_RECORD_CONSTRUCT_METADATA: process.env.CDK8S_RECORD_CONSTRUCT_METADATA ?? (metadata ? 'true' : 'false'),\n    },\n  });\n\n  if (!await fs.pathExists(outdir)) {\n    console.error(`ERROR: synthesis failed, app expected to create \"${outdir}\"`);\n    process.exit(1);\n  }\n\n  let found = false;\n  const yamlFiles = await findManifests(outdir);\n  if (yamlFiles?.length) {\n    if (!stdout) {\n      for (const yamlFile of yamlFiles) {\n        console.log(`  - ${yamlFile}`);\n      }\n    }\n    found = true;\n  }\n\n  if (!found) {\n    console.error('No manifests synthesized');\n  }\n\n  const constructMetadata = findConstructMetadata(outdir);\n\n  return { manifests: yamlFiles, constructMetadata };\n}\n\nexport async function validateApp(\n  app: SynthesizedApp,\n  stdout: boolean,\n  validations: ValidationConfig[],\n  pluginManager: PluginManager,\n  reportsFile?: string) {\n\n  const validators: { plugin: Validation; context: ValidationContext}[] = [];\n\n  for (const validation of validations) {\n    const { plugin, context } = ValidationPlugin.load(validation, app, stdout, pluginManager);\n    validators.push({ plugin, context });\n  }\n\n  const reports: ValidationReport[] = [];\n  let success = true;\n\n  console.log('Performing validations');\n\n  for (const validator of validators) {\n    await validator.plugin.validate(validator.context);\n    const report = validator.context.report;\n    success = success && report.success;\n    reports.push(report);\n  }\n\n  console.log('Validations finished');\n\n  // now we can print them. we don't incrementally print\n  // so to not clutter the terminal in case of errors.\n  for (const report of reports) {\n    console.log('');\n    console.log(report.toString());\n    console.log('');\n  }\n\n  if (reportsFile) {\n\n    if (fs.existsSync(reportsFile)) {\n      throw new Error(`Unable to write validation reports file. Already exists: ${reportsFile}`);\n    }\n    // write the reports in JSON to a file\n    fs.writeFileSync(reportsFile, JSON.stringify({\n      reports: reports.map(r => r.toJson()),\n    }, null, 2));\n  }\n\n  // exit with failure if any report resulted in a failure\n  if (!success) {\n    console.error('Validation failed. See above reports for details');\n    process.exit(2);\n  }\n\n  console.log('Validations ended succesfully');\n\n}\n\nexport function safeParseJson(text: string, reviver: SafeReviver): any {\n  const json = JSON.parse(text);\n  reviver.sanitize(json);\n  return json;\n}\n\nexport function safeParseYaml(text: string, reviver: SafeReviver): any[] {\n\n  // parseAllDocuments doesnt accept a reviver\n  // so we first parse normally and than transform\n  // to JS using the reviver.\n  const parsed = yaml.parseAllDocuments(text);\n  const docs = [];\n  for (const doc of parsed) {\n    const json = doc.toJS();\n    reviver.sanitize(json);\n    docs.push(json);\n  }\n  return docs;\n}\n\nexport async function download(url: string): Promise<string> {\n\n  let client: typeof http | typeof https;\n  const proto = parse(url).protocol;\n\n  if (!proto || proto === 'file:') {\n    return fs.readFile(url, 'utf-8');\n  }\n\n  switch (proto) {\n    case 'https:':\n      client = https;\n      break;\n\n    case 'http:':\n      client = http;\n      break;\n\n    default:\n      throw new Error(`unsupported protocol ${proto}`);\n  }\n\n  return new Promise((ok, ko) => {\n    const req = client.get(url, res => {\n      switch (res.statusCode) {\n        case 200: {\n          const data = new Array<Buffer>();\n          res.on('data', chunk => data.push(chunk));\n          res.once('end', () => ok(Buffer.concat(data).toString('utf-8')));\n          res.once('error', ko);\n          break;\n        }\n\n        case 301:\n        case 302: {\n          if (res.headers.location) {\n            ok(download(res.headers.location));\n          }\n          break;\n        }\n\n        default: {\n          ko(new Error(`${res.statusMessage}: ${url}`));\n        }\n      }\n    });\n\n    req.once('error', ko);\n    req.end();\n  });\n}\n\nexport async function findManifests(directory: string): Promise<string[]> {\n  // Ensure path is valid\n  try {\n    await promises.access(directory);\n  } catch {\n    return [];\n  }\n\n  // Read Path contents\n  const entries = await promises.readdir(directory, { withFileTypes: true });\n\n  // Get files within the current directory\n  const files = entries\n    .filter(file => (!file.isDirectory() && file.name.endsWith('.yaml')))\n    .map(file => (directory + '/' + file.name));\n\n  // Get sub-folders within the current folder\n  const folders = entries.filter(folder => folder.isDirectory());\n\n  for (const folder of folders) {\n    files.push(...await findManifests(`${directory}/${folder.name}`));\n  }\n\n  return files;\n}\n\nexport function findConstructMetadata(directory: string): string | undefined {\n  // this file is optionally created during synthesis\n  const p = path.join(directory, 'construct-metadata.json');\n  return fs.existsSync(p) ? p : undefined;\n}\n\n/**\n * Result of synthesizing an application.\n */\nexport interface SynthesizedApp {\n\n  /**\n   * The list of manifests produced by the app.\n   */\n  readonly manifests: readonly string[];\n\n  /**\n   * The construct metadata file (if exists).\n   */\n  readonly constructMetadata?: string;\n}"]}
|
package/package.json
CHANGED
|
@@ -42,7 +42,7 @@
|
|
|
42
42
|
"organization": false
|
|
43
43
|
},
|
|
44
44
|
"devDependencies": {
|
|
45
|
-
"@cdk8s/projen-common": "^0.0.
|
|
45
|
+
"@cdk8s/projen-common": "^0.0.336",
|
|
46
46
|
"@types/fs-extra": "^8",
|
|
47
47
|
"@types/glob": "^7.2.0",
|
|
48
48
|
"@types/jest": "^27",
|
|
@@ -58,7 +58,7 @@
|
|
|
58
58
|
"jest": "^27",
|
|
59
59
|
"jest-junit": "^15",
|
|
60
60
|
"npm-check-updates": "^16",
|
|
61
|
-
"projen": "^0.71.
|
|
61
|
+
"projen": "^0.71.52",
|
|
62
62
|
"standard-version": "^9",
|
|
63
63
|
"ts-jest": "^27",
|
|
64
64
|
"ts-node": "^10.9.1",
|
|
@@ -66,17 +66,17 @@
|
|
|
66
66
|
"typescript-json-schema": "^0.56.0"
|
|
67
67
|
},
|
|
68
68
|
"dependencies": {
|
|
69
|
-
"@types/node": "^
|
|
69
|
+
"@types/node": "^16",
|
|
70
70
|
"ajv": "^8.12.0",
|
|
71
|
-
"cdk8s": "^2.7.
|
|
72
|
-
"cdk8s-plus-25": "^2.7.
|
|
71
|
+
"cdk8s": "^2.7.58",
|
|
72
|
+
"cdk8s-plus-25": "^2.7.25",
|
|
73
73
|
"codemaker": "^1.81.0",
|
|
74
74
|
"colors": "1.4.0",
|
|
75
|
-
"constructs": "^10.2.
|
|
75
|
+
"constructs": "^10.2.19",
|
|
76
76
|
"fs-extra": "^8",
|
|
77
77
|
"jsii-pacmak": "^1.81.0",
|
|
78
78
|
"jsii-srcmak": "^0.1.906",
|
|
79
|
-
"json2jsii": "^0.3.
|
|
79
|
+
"json2jsii": "^0.3.327",
|
|
80
80
|
"semver": "^7.5.0",
|
|
81
81
|
"sscaff": "^1.2.274",
|
|
82
82
|
"table": "^6.8.1",
|
|
@@ -96,7 +96,7 @@
|
|
|
96
96
|
"node": ">= 14.17.0"
|
|
97
97
|
},
|
|
98
98
|
"license": "Apache-2.0",
|
|
99
|
-
"version": "2.2.
|
|
99
|
+
"version": "2.2.33",
|
|
100
100
|
"jest": {
|
|
101
101
|
"testMatch": [
|
|
102
102
|
"<rootDir>/src/**/__tests__/**/*.ts?(x)",
|
package/projenrc/integ.ts
CHANGED
|
@@ -22,15 +22,15 @@ export function addIntegTests(project: typescript.TypeScriptProject) {
|
|
|
22
22
|
}
|
|
23
23
|
}
|
|
24
24
|
|
|
25
|
-
// run all init tests on node
|
|
25
|
+
// run all init tests on node 16
|
|
26
26
|
integWorkflow.addJob('init', {
|
|
27
27
|
runsOn: ['ubuntu-latest'],
|
|
28
28
|
permissions: { contents: github.workflows.JobPermission.READ },
|
|
29
|
-
steps: runSteps(initTask.name, '
|
|
29
|
+
steps: runSteps(initTask.name, '16', true, true),
|
|
30
30
|
});
|
|
31
31
|
|
|
32
|
-
// run typescript app on node
|
|
33
|
-
const nodeVersions = [
|
|
32
|
+
// run typescript app on node 18 as well
|
|
33
|
+
const nodeVersions = [18];
|
|
34
34
|
integWorkflow.addJob('init-typescript-app', {
|
|
35
35
|
runsOn: ['ubuntu-latest'],
|
|
36
36
|
strategy: {
|
|
@@ -58,10 +58,10 @@ function jest(args: string) {
|
|
|
58
58
|
|
|
59
59
|
function runSteps(task: string, nodeVersion: string, python: boolean, go: boolean): github.workflows.JobStep[] {
|
|
60
60
|
const steps: github.workflows.JobStep[] = [
|
|
61
|
-
{ uses: 'actions/checkout@
|
|
61
|
+
{ uses: 'actions/checkout@v3' },
|
|
62
62
|
{
|
|
63
63
|
name: 'Set up Node.js',
|
|
64
|
-
uses: 'actions/setup-node@
|
|
64
|
+
uses: 'actions/setup-node@v3',
|
|
65
65
|
with: { 'node-version': nodeVersion },
|
|
66
66
|
},
|
|
67
67
|
{
|
|
@@ -73,7 +73,7 @@ function runSteps(task: string, nodeVersion: string, python: boolean, go: boolea
|
|
|
73
73
|
if (python) {
|
|
74
74
|
steps.push({
|
|
75
75
|
name: 'Set up Python 3.x',
|
|
76
|
-
uses: 'actions/setup-python@
|
|
76
|
+
uses: 'actions/setup-python@v4',
|
|
77
77
|
with: {
|
|
78
78
|
'python-version': '3.x',
|
|
79
79
|
},
|
|
@@ -87,7 +87,7 @@ function runSteps(task: string, nodeVersion: string, python: boolean, go: boolea
|
|
|
87
87
|
if (go) {
|
|
88
88
|
steps.push({
|
|
89
89
|
name: 'Set up Go',
|
|
90
|
-
uses: 'actions/setup-go@
|
|
90
|
+
uses: 'actions/setup-go@v4',
|
|
91
91
|
with: {
|
|
92
92
|
'go-version': '1.18',
|
|
93
93
|
},
|