cdk8s-cli 2.15.0 → 2.16.0

package/lib/cli/cmds/init.js

@@ -61,14 +61,13 @@ class Command {
     }
 }
 async function determineDeps() {
-    var _a;
     const cdk8s = new ModuleVersion('cdk8s', { jsii: true });
     const cdk8sPlus = new ModuleVersion('cdk8s-plus-25', { jsii: true });
     const cdk8sCli = new ModuleVersion('cdk8s-cli');
     const jsii = new ModuleVersion('jsii-pacmak');
+    const cdk8sTarball = process.env.CDK8S_TARBALL;
+    const cdk8sTarballEscaped = cdk8sTarball ? (cdk8sTarball.replace(/\\/g, '\\\\')) : undefined;
     return {
-        npm_cdk8s: cdk8s.npmDependency,
-        npm_cdk8s_plus: cdk8sPlus.npmDependency,
         pypi_cdk8s: cdk8s.pypiDependency,
         pypi_cdk8s_plus: cdk8sPlus.pypiDependency,
         mvn_cdk8s: cdk8s.mavenDependency,
@@ -77,8 +76,7 @@ async function determineDeps() {
         cdk8s_plus_version: cdk8sPlus.version,
         constructs_version: constructsVersion,
         jsii_version: jsii.version,
-        // when running tests, install the tarball created from our source
-        npm_cdk8s_cli: (_a = process.env.CDK8S_TARBALL) !== null && _a !== void 0 ? _a : cdk8sCli.npmDependency,
+        cdk8s_cli_spec: cdk8sTarballEscaped !== null && cdk8sTarballEscaped !== void 0 ? cdk8sTarballEscaped : `^${cdk8sCli.version}`,
     };
 }
 class ModuleVersion {
@@ -124,4 +122,4 @@ class ModuleVersion {
     }
 }
 module.exports = new Command();
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../src/cli/cmds/init.ts"],"names":[],"mappings":"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","sourcesContent":["import * as path from 'path';\nimport * as fs from 'fs-extra';\nimport * as pacmak from 'jsii-pacmak';\nimport * as pacmakv from 'jsii-pacmak/lib/targets/version-utils';\nimport { sscaff } from 'sscaff';\nimport * as yargs from 'yargs';\n\nconst pkgroot = path.join(__dirname, '..', '..', '..');\n\nconst pkg = fs.readJsonSync(path.join(pkgroot, 'package.json'));\nconst constructsVersion = pkg.dependencies.constructs.replace('^', '');\n\nconst templatesDir = path.join(pkgroot, 'templates');\nconst availableTemplates = fs.readdirSync(templatesDir).filter(x => !x.startsWith('.'));\n\nclass Command implements yargs.CommandModule {\n  public readonly command = 'init TYPE';\n  public readonly describe = 'Create a new cdk8s project from a template.';\n  public readonly builder = (args: yargs.Argv) => args\n    .positional('TYPE', { demandOption: true, desc: 'Project type' })\n    .showHelpOnFail(false)\n    .choices('TYPE', availableTemplates);\n\n  public async handler(argv: any) {\n    if (fs.readdirSync('.').filter(f => !f.startsWith('.')).length > 0) {\n      console.error('Cannot initialize a project in a non-empty directory');\n      process.exit(1);\n    }\n\n    console.error(`Initializing a project from the ${argv.type} template`);\n    const templatePath = path.join(templatesDir, argv.type);\n    const deps: any = await determineDeps();\n\n    try {\n      await sscaff(templatePath, '.', deps);\n    } catch (er) {\n      const e = er as any;\n      throw new Error(`error during project initialization: ${e.stack}\\nSTDOUT:\\n${e.stdout?.toString()}\\nSTDERR:\\n${e.stderr?.toString()}`);\n    }\n  }\n}\n\nasync function determineDeps(): Promise<Deps> {\n  const cdk8s = new ModuleVersion('cdk8s', { jsii: true });\n  const cdk8sPlus = new ModuleVersion('cdk8s-plus-25', { jsii: true });\n  const cdk8sCli = new ModuleVersion('cdk8s-cli');\n  const jsii = new ModuleVersion('jsii-pacmak');\n\n  return {\n    npm_cdk8s: cdk8s.npmDependency,\n    npm_cdk8s_plus: cdk8sPlus.npmDependency,\n    pypi_cdk8s: cdk8s.pypiDependency,\n    pypi_cdk8s_plus: cdk8sPlus.pypiDependency,\n    mvn_cdk8s: cdk8s.mavenDependency,\n    mvn_cdk8s_plus: cdk8sPlus.mavenDependency,\n    cdk8s_core_version: cdk8s.version,\n    cdk8s_plus_version: cdk8sPlus.version,\n    constructs_version: constructsVersion,\n    jsii_version: jsii.version,\n\n    // when running tests, install the tarball created from our source\n    npm_cdk8s_cli: process.env.CDK8S_TARBALL ?? cdk8sCli.npmDependency,\n  };\n}\n\ninterface Deps {\n  npm_cdk8s: string;\n  npm_cdk8s_cli?: string;\n  npm_cdk8s_plus: string;\n  pypi_cdk8s: string;\n  pypi_cdk8s_plus: string;\n  mvn_cdk8s: string;\n  mvn_cdk8s_plus: string;\n  cdk8s_core_version: string;\n  cdk8s_plus_version: string;\n  constructs_version: string;\n  jsii_version: string;\n}\n\nclass ModuleVersion {\n  public readonly pypiVersion: string;\n  public readonly npmVersion: string;\n  public readonly mavenVersion: string;\n  public readonly version: string;\n\n  private readonly jsii: boolean;\n\n  constructor(private readonly moduleName: string, options: { jsii?: boolean } = { }) {\n    this.version = this.resolveVersion(moduleName);\n    this.npmVersion = this.version;\n    this.pypiVersion = pacmakv.toReleaseVersion(this.version, pacmak.TargetName.PYTHON);\n    this.mavenVersion = pacmakv.toReleaseVersion(this.version, pacmak.TargetName.JAVA);\n    this.jsii = options.jsii ?? false;\n  }\n\n  public get npmTarballFile() {\n    if (this.jsii) {\n      return `${this.moduleName}@${this.version}.jsii.tgz`;\n    } else {\n      return `${this.moduleName}-v${this.version}.tgz`;\n    }\n  }\n\n  public get pypiWheelFile() {\n    const [major, minor, patch, pre] = this.pypiVersion.split('.');\n    return `${this.moduleName.replace(/-/g, '_')}-${major}.${minor}.${patch}${pre ?? ''}-py3-none-any.whl`;\n  }\n\n  public get javaJarFile() {\n    return `org/cdk8s/${this.moduleName}/${this.mavenVersion}/${this.moduleName}-${this.mavenVersion}.jar`;\n  }\n\n  public get npmDependency() {\n    return `${this.moduleName}@^${this.npmVersion}`;\n  }\n\n  public get pypiDependency() {\n    return `${this.moduleName}~=${this.pypiVersion}`;\n  }\n\n  public get mavenDependency() {\n    return this.mavenVersion;\n  }\n\n  private resolveVersion(module: string): string {\n    if (module === 'cdk8s-cli') {\n      module = '../../../';\n    }\n\n    // eslint-disable-next-line @typescript-eslint/no-require-imports\n    return require(`${module}/package.json`).version;\n  }\n}\n\n\nmodule.exports = new Command();\n"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../src/cli/cmds/init.ts"],"names":[],"mappings":"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","sourcesContent":["import * as path from 'path';\nimport * as fs from 'fs-extra';\nimport * as pacmak from 'jsii-pacmak';\nimport * as pacmakv from 'jsii-pacmak/lib/targets/version-utils';\nimport { sscaff } from 'sscaff';\nimport * as yargs from 'yargs';\n\nconst pkgroot = path.join(__dirname, '..', '..', '..');\n\nconst pkg = fs.readJsonSync(path.join(pkgroot, 'package.json'));\nconst constructsVersion = pkg.dependencies.constructs.replace('^', '');\n\nconst templatesDir = path.join(pkgroot, 'templates');\nconst availableTemplates = fs.readdirSync(templatesDir).filter(x => !x.startsWith('.'));\n\nclass Command implements yargs.CommandModule {\n  public readonly command = 'init TYPE';\n  public readonly describe = 'Create a new cdk8s project from a template.';\n  public readonly builder = (args: yargs.Argv) => args\n    .positional('TYPE', { demandOption: true, desc: 'Project type' })\n    .showHelpOnFail(false)\n    .choices('TYPE', availableTemplates);\n\n  public async handler(argv: any) {\n    if (fs.readdirSync('.').filter(f => !f.startsWith('.')).length > 0) {\n      console.error('Cannot initialize a project in a non-empty directory');\n      process.exit(1);\n    }\n\n    console.error(`Initializing a project from the ${argv.type} template`);\n    const templatePath = path.join(templatesDir, argv.type);\n    const deps: any = await determineDeps();\n\n    try {\n      await sscaff(templatePath, '.', deps);\n    } catch (er) {\n      const e = er as any;\n      throw new Error(`error during project initialization: ${e.stack}\\nSTDOUT:\\n${e.stdout?.toString()}\\nSTDERR:\\n${e.stderr?.toString()}`);\n    }\n  }\n}\n\nasync function determineDeps(): Promise<Deps> {\n  const cdk8s = new ModuleVersion('cdk8s', { jsii: true });\n  const cdk8sPlus = new ModuleVersion('cdk8s-plus-25', { jsii: true });\n  const cdk8sCli = new ModuleVersion('cdk8s-cli');\n  const jsii = new ModuleVersion('jsii-pacmak');\n\n  const cdk8sTarball = process.env.CDK8S_TARBALL;\n  const cdk8sTarballEscaped = cdk8sTarball ? (cdk8sTarball.replace(/\\\\/g, '\\\\\\\\')) : undefined;\n\n  return {\n    pypi_cdk8s: cdk8s.pypiDependency,\n    pypi_cdk8s_plus: cdk8sPlus.pypiDependency,\n    mvn_cdk8s: cdk8s.mavenDependency,\n    mvn_cdk8s_plus: cdk8sPlus.mavenDependency,\n    cdk8s_core_version: cdk8s.version,\n    cdk8s_plus_version: cdk8sPlus.version,\n    constructs_version: constructsVersion,\n    jsii_version: jsii.version,\n    cdk8s_cli_spec: cdk8sTarballEscaped ?? `^${cdk8sCli.version}`,\n  };\n}\n\ninterface Deps {\n  cdk8s_cli_spec: string;\n  pypi_cdk8s: string;\n  pypi_cdk8s_plus: string;\n  mvn_cdk8s: string;\n  mvn_cdk8s_plus: string;\n  cdk8s_core_version: string;\n  cdk8s_plus_version: string;\n  constructs_version: string;\n  jsii_version: string;\n}\n\nclass ModuleVersion {\n  public readonly pypiVersion: string;\n  public readonly npmVersion: string;\n  public readonly mavenVersion: string;\n  public readonly version: string;\n\n  private readonly jsii: boolean;\n\n  constructor(private readonly moduleName: string, options: { jsii?: boolean } = { }) {\n    this.version = this.resolveVersion(moduleName);\n    this.npmVersion = this.version;\n    this.pypiVersion = pacmakv.toReleaseVersion(this.version, pacmak.TargetName.PYTHON);\n    this.mavenVersion = pacmakv.toReleaseVersion(this.version, pacmak.TargetName.JAVA);\n    this.jsii = options.jsii ?? false;\n  }\n\n  public get npmTarballFile() {\n    if (this.jsii) {\n      return `${this.moduleName}@${this.version}.jsii.tgz`;\n    } else {\n      return `${this.moduleName}-v${this.version}.tgz`;\n    }\n  }\n\n  public get pypiWheelFile() {\n    const [major, minor, patch, pre] = this.pypiVersion.split('.');\n    return `${this.moduleName.replace(/-/g, '_')}-${major}.${minor}.${patch}${pre ?? ''}-py3-none-any.whl`;\n  }\n\n  public get javaJarFile() {\n    return `org/cdk8s/${this.moduleName}/${this.mavenVersion}/${this.moduleName}-${this.mavenVersion}.jar`;\n  }\n\n  public get npmDependency() {\n    return `${this.moduleName}@^${this.npmVersion}`;\n  }\n\n  public get pypiDependency() {\n    return `${this.moduleName}~=${this.pypiVersion}`;\n  }\n\n  public get mavenDependency() {\n    return this.mavenVersion;\n  }\n\n  private resolveVersion(module: string): string {\n    if (module === 'cdk8s-cli') {\n      module = '../../../';\n    }\n\n    // eslint-disable-next-line @typescript-eslint/no-require-imports\n    return require(`${module}/package.json`).version;\n  }\n}\n\n\nmodule.exports = new Command();\n"]}

package/package.json

@@ -75,13 +75,13 @@
   "dependencies": {
     "@types/node": "^16",
     "ajv": "^8.12.0",
-    "cdk8s": "^2.28.0",
+    "cdk8s": "^2.29.0",
     "cdk8s-plus-25": "^2.16.0",
-    "codemaker": "^1.85.0",
+    "codemaker": "^1.86.0",
     "colors": "1.4.0",
     "constructs": "^10.2.69",
     "fs-extra": "^8",
-    "jsii-pacmak": "^1.85.0",
+    "jsii-pacmak": "^1.86.0",
     "jsii-srcmak": "^0.1.949",
     "json2jsii": "^0.3.387",
     "semver": "^7.5.4",
@@ -103,7 +103,7 @@
     "node": ">= 16.20.0"
   },
   "license": "Apache-2.0",
-  "version": "2.15.0",
+  "version": "2.16.0",
   "jest": {
     "testMatch": [
       "<rootDir>/src/**/__tests__/**/*.ts?(x)",

package/templates/typescript-app/.hooks.sscaff.js

@@ -1,35 +1,11 @@
 const { execSync } = require('child_process');
 const { readFileSync } = require('fs');
-const { dirname } = require('path');
-
-const clibin = dirname(require.resolve('../../bin/cdk8s'));
 
 exports.post = ctx => {
-  const npm_cdk8s = ctx.npm_cdk8s;
-  const npm_cdk8s_plus = ctx.npm_cdk8s_plus;
-  const npm_cdk8s_cli = ctx.npm_cdk8s_cli;
-  const constructs_version = ctx.constructs_version;
-
-  if (!npm_cdk8s) { throw new Error(`missing context "npm_cdk8s"`); }
-
-  installDeps([ npm_cdk8s, npm_cdk8s_plus, `constructs@^${constructs_version}` ]);
-  installDeps([
-      '@types/node@14',
-      '@types/jest@26',
-      'jest@26',
-      'ts-jest@26',
-      'typescript@4.9.5',
-      'ts-node@10',
-  ], true);
 
   const env = { ...process.env };
 
-  // install cdk8s cli if defined
-  if (npm_cdk8s_cli) {
-    installDeps([npm_cdk8s_cli], true);
-  } else {
-    env.PATH = `${clibin}:${process.env.PATH}`;
-  }
+  execSync('npm install', { stdio: 'inherit', env });
 
   // import k8s objects
   execSync('npm run import', { stdio: 'inherit', env });
@@ -39,9 +15,3 @@ exports.post = ctx => {
 
   console.log(readFileSync('./help', 'utf-8'));
 };
-
-function installDeps(deps, isDev) {
-  const devDep = isDev ? '-D' : '';
-  execSync(`npm install ${devDep} ${deps.join(' ')}`, { stdio: 'inherit' });
-}
-

package/templates/typescript-app/package.json

@@ -14,5 +14,19 @@
     "build": "npm run compile && npm run test && npm run synth",
     "upgrade": "npm i cdk8s@latest cdk8s-cli@latest",
     "upgrade:next": "npm i cdk8s@next cdk8s-cli@next"
+  },
+  "dependencies": {
+    "cdk8s": "^{{ cdk8s_core_version }}",
+    "cdk8s-plus-25": "^{{ cdk8s_plus_version }}",
+    "constructs": "^{{ constructs_version }}"
+  },
+  "devDependencies": {
+    "cdk8s-cli": "{{ cdk8s_cli_spec }}",
+    "@types/node": "^14",
+    "@types/jest": "^26",
+    "jest": "^26",
+    "ts-jest": "^26",
+    "typescript": "^4.9.5",
+    "ts-node": "^10"
   }
 }