awslint 2.97.0-alpha.0 → 2.98.0-alpha.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/bin/awslint.js +48 -14
- package/bin/awslint.ts +49 -14
- package/lib/rules/cfn-resource.js +3 -6
- package/lib/rules/cfn-resource.ts +2 -5
- package/lib/rules/cloudwatch-events.js +3 -3
- package/lib/rules/cloudwatch-events.ts +2 -2
- package/lib/rules/construct.d.ts +1 -0
- package/lib/rules/construct.js +8 -5
- package/lib/rules/construct.ts +8 -4
- package/lib/rules/core-types.d.ts +4 -0
- package/lib/rules/core-types.js +17 -8
- package/lib/rules/core-types.ts +17 -7
- package/lib/rules/docs.js +5 -5
- package/lib/rules/docs.ts +6 -4
- package/lib/rules/integrations.js +2 -2
- package/lib/rules/integrations.ts +1 -1
- package/lib/rules/public-static-properties.js +2 -2
- package/lib/rules/public-static-properties.ts +1 -1
- package/lib/rules/resource.js +12 -2
- package/lib/rules/resource.ts +14 -1
- package/package.json +3 -3
package/bin/awslint.js
CHANGED
|
@@ -18,12 +18,12 @@ async function main() {
|
|
|
18
18
|
.command('$0', 'lint the current module (default)')
|
|
19
19
|
.command('list', 'list all available rules')
|
|
20
20
|
.option('include', { alias: 'i', type: 'array', desc: 'evaluate only this rule(s)', default: ['*'] })
|
|
21
|
-
.option('exclude', { alias: 'x', type: 'array', desc: 'do not
|
|
22
|
-
.option('save', { type: 'boolean', desc: 'updates package.json with "exclude" statements for all failing rules', default: false })
|
|
21
|
+
.option('exclude', { alias: 'x', type: 'array', desc: 'do not evaluate these rules (takes priority over --include)', default: [] })
|
|
22
|
+
.option('save', { type: 'boolean', desc: 'updates package.json (or awslint.json if it exists) with "exclude" statements for all failing rules', default: false })
|
|
23
23
|
.option('verbose', { alias: 'v', type: 'boolean', desc: 'verbose output (prints all assertions)', default: false })
|
|
24
24
|
.option('quiet', { alias: 'q', type: 'boolean', desc: 'quiet mode - shows only errors', default: true })
|
|
25
25
|
.option('force', { type: 'boolean', desc: 'succeed silently if this is not a jsii module', default: true })
|
|
26
|
-
.option('config', { type: 'boolean', desc: 'reads options from the "awslint" section in package.json', default: true })
|
|
26
|
+
.option('config', { type: 'boolean', desc: 'reads options from "awslint.json" if it exists, and otherwise from the "awslint" section in package.json', default: true })
|
|
27
27
|
.option('debug', { type: 'boolean', desc: 'debug output', default: false })
|
|
28
28
|
.option('compile', { alias: 'c', type: 'boolean', desc: 'always run the jsii compiler (use "--no-compile" to never run the compiler, even if .jsii doesn\'t exist)' })
|
|
29
29
|
.group('include', 'Filtering')
|
|
@@ -50,7 +50,8 @@ async function main() {
|
|
|
50
50
|
}
|
|
51
51
|
const command = args._[0] || 'lint';
|
|
52
52
|
const workdir = process.cwd();
|
|
53
|
-
const
|
|
53
|
+
const pkgConfig = path.join(workdir, 'package.json');
|
|
54
|
+
const awslintConfig = path.join(workdir, 'awslint.json');
|
|
54
55
|
if (command === 'list') {
|
|
55
56
|
for (const rule of lib_1.ALL_RULES_LINTER.rules) {
|
|
56
57
|
console.info(`${chalk.cyan(rule.code)}: ${rule.message}`);
|
|
@@ -58,10 +59,10 @@ async function main() {
|
|
|
58
59
|
return;
|
|
59
60
|
}
|
|
60
61
|
// if no package.json and force is true (default), just don't do anything
|
|
61
|
-
if (!await fs.pathExists(
|
|
62
|
+
if (!await fs.pathExists(pkgConfig) && args.force) {
|
|
62
63
|
return;
|
|
63
64
|
}
|
|
64
|
-
const pkg = await fs.readJSON(
|
|
65
|
+
const pkg = await fs.readJSON(pkgConfig);
|
|
65
66
|
// if this is not a jsii module we have nothing to look for
|
|
66
67
|
if (!pkg.jsii) {
|
|
67
68
|
if (args.force) {
|
|
@@ -74,9 +75,19 @@ async function main() {
|
|
|
74
75
|
if (await shouldCompile()) {
|
|
75
76
|
await shell('jsii');
|
|
76
77
|
}
|
|
78
|
+
// awslint.json takes precedence over package.json for awslint options.
|
|
79
|
+
const standloneOptions = await readStandaloneOptions(awslintConfig);
|
|
77
80
|
// read "awslint" from package.json
|
|
78
81
|
if (args.config) {
|
|
79
|
-
|
|
82
|
+
if (standloneOptions) {
|
|
83
|
+
if (pkg.awslint) {
|
|
84
|
+
console.warn('awslint options in package.json will be ignored since awslint.json exists.');
|
|
85
|
+
}
|
|
86
|
+
mergeOptions(args, standloneOptions);
|
|
87
|
+
}
|
|
88
|
+
else {
|
|
89
|
+
mergeOptions(args, pkg.awslint);
|
|
90
|
+
}
|
|
80
91
|
}
|
|
81
92
|
if (args.debug) {
|
|
82
93
|
console.error('command: ' + command);
|
|
@@ -129,20 +140,36 @@ async function main() {
|
|
|
129
140
|
}
|
|
130
141
|
}
|
|
131
142
|
if (excludesToSave.length > 0) {
|
|
132
|
-
if (
|
|
133
|
-
|
|
143
|
+
if (standloneOptions) {
|
|
144
|
+
if (!standloneOptions.exclude) {
|
|
145
|
+
standloneOptions.exclude = [];
|
|
146
|
+
}
|
|
134
147
|
}
|
|
135
|
-
|
|
136
|
-
pkg.awslint
|
|
148
|
+
else {
|
|
149
|
+
if (!pkg.awslint) {
|
|
150
|
+
pkg.awslint = {};
|
|
151
|
+
}
|
|
152
|
+
if (!pkg.awslint.exclude) {
|
|
153
|
+
pkg.awslint.exclude = [];
|
|
154
|
+
}
|
|
137
155
|
}
|
|
138
|
-
const excludes = pkg.awslint.exclude;
|
|
156
|
+
const excludes = standloneOptions ? standloneOptions.exclude : pkg.awslint.exclude;
|
|
139
157
|
for (const exclude of excludesToSave) {
|
|
140
158
|
if (excludes.indexOf(exclude) === -1) {
|
|
141
159
|
excludes.push(exclude);
|
|
142
160
|
}
|
|
143
161
|
}
|
|
144
162
|
if (excludes.length > 0) {
|
|
145
|
-
|
|
163
|
+
if (standloneOptions) {
|
|
164
|
+
// If awslint.json exists, write the excludes there instead of the old package.json (legacy format).
|
|
165
|
+
if (pkg.awslint) {
|
|
166
|
+
console.warn('Excludes will be written to awslint.json.');
|
|
167
|
+
}
|
|
168
|
+
await fs.writeJSON(awslintConfig, standloneOptions, { spaces: 2 });
|
|
169
|
+
}
|
|
170
|
+
else {
|
|
171
|
+
await fs.writeJSON(pkgConfig, pkg, { spaces: 2 });
|
|
172
|
+
}
|
|
146
173
|
}
|
|
147
174
|
}
|
|
148
175
|
if (errors && !args.save) {
|
|
@@ -206,6 +233,13 @@ function mergeOptions(dest, pkg) {
|
|
|
206
233
|
}
|
|
207
234
|
return dest;
|
|
208
235
|
}
|
|
236
|
+
async function readStandaloneOptions(awslintConfig) {
|
|
237
|
+
if (!await fs.pathExists(awslintConfig)) {
|
|
238
|
+
return;
|
|
239
|
+
}
|
|
240
|
+
const options = await fs.readJSON(awslintConfig);
|
|
241
|
+
return options;
|
|
242
|
+
}
|
|
209
243
|
async function shell(command) {
|
|
210
244
|
const child = child_process.spawn(command, [], { stdio: ['inherit', 'inherit', 'inherit'] });
|
|
211
245
|
return new Promise((ok, ko) => {
|
|
@@ -220,4 +254,4 @@ async function shell(command) {
|
|
|
220
254
|
child.once('error', ko);
|
|
221
255
|
});
|
|
222
256
|
}
|
|
223
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"awslint.js","sourceRoot":"","sources":["awslint.ts"],"names":[],"mappings":"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","sourcesContent":["/* eslint-disable max-len */\n/* eslint-disable no-console */\nimport * as child_process from 'child_process';\nimport * as path from 'path';\nimport * as chalk from 'chalk';\nimport * as fs from 'fs-extra';\nimport * as reflect from 'jsii-reflect';\nimport * as yargs from 'yargs';\nimport { ALL_RULES_LINTER, DiagnosticLevel } from '../lib';\n\nlet stackTrace = false;\n\nasync function main() {\n  const argv = yargs\n    .env('AWSLINT')\n    .usage('awslint [options] [command]')\n    .showHelpOnFail(true)\n    .command('$0', 'lint the current module (default)')\n    .command('list', 'list all available rules')\n    .option('include', { alias: 'i', type: 'array', desc: 'evaluate only this rule(s)', default: ['*'] })\n    .option('exclude', { alias: 'x', type: 'array', desc: 'do not evaludate these rules (takes priority over --include)', default: [] })\n    .option('save', { type: 'boolean', desc: 'updates package.json with \"exclude\" statements for all failing rules', default: false })\n    .option('verbose', { alias: 'v', type: 'boolean', desc: 'verbose output (prints all assertions)', default: false })\n    .option('quiet', { alias: 'q', type: 'boolean', desc: 'quiet mode - shows only errors', default: true })\n    .option('force', { type: 'boolean', desc: 'succeed silently if this is not a jsii module', default: true })\n    .option('config', { type: 'boolean', desc: 'reads options from the \"awslint\" section in package.json', default: true })\n    .option('debug', { type: 'boolean', desc: 'debug output', default: false })\n    .option('compile', { alias: 'c', type: 'boolean', desc: 'always run the jsii compiler (use \"--no-compile\" to never run the compiler, even if .jsii doesn\\'t exist)' })\n    .group('include', 'Filtering')\n    .group('exclude', 'Filtering')\n    .group('config', 'Configuration')\n    .group('save', 'Configuration')\n    .group('verbose', 'Output')\n    .group('quiet', 'Output')\n    .group('debug', 'Output')\n    .group('compile', 'Build')\n    .example('awslint', 'lints the current module against all rules')\n    .example('awslint -v -i \"resource*\" -i \"import*\"', 'lints against all rules that start with \"resource\" or \"import\" and print successes')\n    .example('awslint -x \"*:@aws-cdk/aws-s3*\"', 'evaluate all rules in all scopes besides ones that begin with \"@aws-cdk/aws-s3\"')\n    .example('awslint --save', 'updated \"package.json\" with \"exclude\"s for all failing rules');\n\n  if (!process.stdout.isTTY) {\n    // Disable chalk color highlighting\n    process.env.FORCE_COLOR = '0';\n  }\n\n  const args = argv.argv;\n\n  stackTrace = args.verbose || args.debug;\n\n  if (args._.length > 1) {\n    argv.showHelp();\n    process.exit(1);\n  }\n\n  const command = args._[0] || 'lint';\n  const workdir = process.cwd();\n\n  const config = path.join(workdir, 'package.json');\n\n  if (command === 'list') {\n    for (const rule of ALL_RULES_LINTER.rules) {\n      console.info(`${chalk.cyan(rule.code)}: ${rule.message}`);\n    }\n    return;\n  }\n\n  // if no package.json and force is true (default), just don't do anything\n  if (!await fs.pathExists(config) && args.force) {\n    return;\n  }\n\n  const pkg = await fs.readJSON(config);\n\n  // if this is not a jsii module we have nothing to look for\n  if (!pkg.jsii) {\n    if (args.force) {\n      return; // just silently succeed\n    }\n\n    throw new Error(`Module in ${workdir} is not a jsii module (no \"jsii\" section in package.json)`);\n  }\n\n  // if package.json contains a `jsii` section but there is no .jsii file\n  // it means we haven't compiled the module.\n  if (await shouldCompile()) {\n    await shell('jsii');\n  }\n\n  // read \"awslint\" from package.json\n  if (args.config) {\n    mergeOptions(args, pkg.awslint);\n  }\n\n  if (args.debug) {\n    console.error('command: ' + command);\n    console.error('options: ' + JSON.stringify(args, undefined, 2));\n  }\n\n  if (command === 'lint') {\n    const assembly = await loadModule(workdir);\n    if (!assembly) {\n      return;\n    }\n\n    const excludesToSave = new Array<string>();\n    let errors = 0;\n\n    const results = [];\n\n    results.push(...ALL_RULES_LINTER.eval(assembly, {\n      include: args.include,\n      exclude: args.exclude,\n    }));\n\n    // Sort errors to the top (highest severity first)\n    results.sort((a, b) => b.level - a.level);\n\n    // process results\n\n    for (const diag of results) {\n      const suppressionKey = `${diag.rule.code}:${diag.scope}`;\n\n      let color;\n      switch (diag.level) {\n        case DiagnosticLevel.Success:\n          if (args.verbose) {\n            color = chalk.gray;\n          }\n          break;\n        case DiagnosticLevel.Error:\n          errors++;\n          color = chalk.red;\n          if (args.save) {\n            excludesToSave.push(suppressionKey);\n          }\n          break;\n        case DiagnosticLevel.Warning:\n          if (!args.quiet) {\n            color = chalk.yellow;\n          }\n          break;\n        case DiagnosticLevel.Skipped:\n          if (!args.quiet) {\n            color = chalk.blue;\n          }\n          break;\n      }\n\n      if (color) {\n        console.error(color(`${DiagnosticLevel[diag.level].toLowerCase()}: [${chalk.bold(`awslint:${diag.rule.code}`)}:${chalk.bold(diag.scope)}] ${diag.message}`));\n      }\n    }\n\n    if (excludesToSave.length > 0) {\n      if (!pkg.awslint) {\n        pkg.awslint = { };\n      }\n\n      if (!pkg.awslint.exclude) {\n        pkg.awslint.exclude = [];\n      }\n\n      const excludes: string[] = pkg.awslint.exclude;\n\n      for (const exclude of excludesToSave) {\n        if (excludes.indexOf(exclude) === -1) {\n          excludes.push(exclude);\n        }\n      }\n\n      if (excludes.length > 0) {\n        await fs.writeJSON(config, pkg, { spaces: 2 });\n      }\n    }\n\n    if (errors && !args.save) {\n      process.exit(1);\n    }\n\n    return;\n  }\n\n  argv.showHelp();\n  throw new Error(`Invalid command: ${command}`);\n\n  async function shouldCompile() {\n\n    // if --compile is explicitly enabled then just compile always\n    if (args.compile === true) {\n      return true;\n    }\n\n    // if we have a .jsii file and we are not forced to compile, then don't compile\n    if (await fs.pathExists(path.join(workdir, '.jsii'))) {\n      return false;\n    }\n\n    // we don't have a .jsii file, and --no-compile is explicily set, then it's an error\n    if (args.compile === false) {\n      throw new Error('No .jsii file and --no-compile is set');\n    }\n\n    // compile!\n    return true;\n  }\n\n}\n\nmain().catch(e => {\n  console.error(chalk.red(e.message));\n  if (stackTrace) {\n    console.error(e.stack);\n  }\n  process.exit(1);\n});\n\nasync function loadModule(dir: string) {\n  const ts = new reflect.TypeSystem();\n  await ts.load(dir, { validate: false }); // Don't validate to save 66% of execution time (20s vs 1min).\n  // We run 'awslint' during build time, assemblies are guaranteed to be ok.\n\n  if (ts.roots.length !== 1) {\n    throw new Error('Expecting only a single root assembly');\n  }\n\n  return ts.roots[0];\n}\n\nfunction mergeOptions(dest: any, pkg?: any) {\n  if (!pkg) { return; } // no options in package.json\n\n  for (const [key, value] of Object.entries(pkg)) {\n\n    // if this is an array option, then add values to destination\n    if (Array.isArray(value)) {\n      const arr = dest[key] || [];\n      arr.push(...value);\n      dest[key] = arr;\n      continue;\n    }\n\n    // objects are not allowed\n    if (typeof value === 'object') {\n      throw new Error(`Invalid option \"${key}\" in package.json: ${JSON.stringify(value)}`);\n    }\n\n    // primitives simply override\n    dest[key] = value;\n  }\n\n  return dest;\n}\n\nasync function shell(command: string) {\n  const child = child_process.spawn(command, [], { stdio: ['inherit', 'inherit', 'inherit'] });\n  return new Promise<void>((ok, ko) => {\n    child.once('exit', (status: any) => {\n      if (status === 0) {\n        return ok();\n      } else {\n        return ko(new Error(`${command} exited with status ${status}`));\n      }\n    });\n    child.once('error', ko);\n  });\n}\n"]}
|
|
257
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"awslint.js","sourceRoot":"","sources":["awslint.ts"],"names":[],"mappings":"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","sourcesContent":["/* eslint-disable max-len */\n/* eslint-disable no-console */\nimport * as child_process from 'child_process';\nimport * as path from 'path';\nimport * as chalk from 'chalk';\nimport * as fs from 'fs-extra';\nimport * as reflect from 'jsii-reflect';\nimport * as yargs from 'yargs';\nimport { ALL_RULES_LINTER, DiagnosticLevel } from '../lib';\n\nlet stackTrace = false;\n\nasync function main() {\n  const argv = yargs\n    .env('AWSLINT')\n    .usage('awslint [options] [command]')\n    .showHelpOnFail(true)\n    .command('$0', 'lint the current module (default)')\n    .command('list', 'list all available rules')\n    .option('include', { alias: 'i', type: 'array', desc: 'evaluate only this rule(s)', default: ['*'] })\n    .option('exclude', { alias: 'x', type: 'array', desc: 'do not evaluate these rules (takes priority over --include)', default: [] })\n    .option('save', { type: 'boolean', desc: 'updates package.json (or awslint.json if it exists) with \"exclude\" statements for all failing rules', default: false })\n    .option('verbose', { alias: 'v', type: 'boolean', desc: 'verbose output (prints all assertions)', default: false })\n    .option('quiet', { alias: 'q', type: 'boolean', desc: 'quiet mode - shows only errors', default: true })\n    .option('force', { type: 'boolean', desc: 'succeed silently if this is not a jsii module', default: true })\n    .option('config', { type: 'boolean', desc: 'reads options from \"awslint.json\" if it exists, and otherwise from the \"awslint\" section in package.json', default: true })\n    .option('debug', { type: 'boolean', desc: 'debug output', default: false })\n    .option('compile', { alias: 'c', type: 'boolean', desc: 'always run the jsii compiler (use \"--no-compile\" to never run the compiler, even if .jsii doesn\\'t exist)' })\n    .group('include', 'Filtering')\n    .group('exclude', 'Filtering')\n    .group('config', 'Configuration')\n    .group('save', 'Configuration')\n    .group('verbose', 'Output')\n    .group('quiet', 'Output')\n    .group('debug', 'Output')\n    .group('compile', 'Build')\n    .example('awslint', 'lints the current module against all rules')\n    .example('awslint -v -i \"resource*\" -i \"import*\"', 'lints against all rules that start with \"resource\" or \"import\" and print successes')\n    .example('awslint -x \"*:@aws-cdk/aws-s3*\"', 'evaluate all rules in all scopes besides ones that begin with \"@aws-cdk/aws-s3\"')\n    .example('awslint --save', 'updated \"package.json\" with \"exclude\"s for all failing rules');\n\n  if (!process.stdout.isTTY) {\n    // Disable chalk color highlighting\n    process.env.FORCE_COLOR = '0';\n  }\n\n  const args = argv.argv;\n\n  stackTrace = args.verbose || args.debug;\n\n  if (args._.length > 1) {\n    argv.showHelp();\n    process.exit(1);\n  }\n\n  const command = args._[0] || 'lint';\n  const workdir = process.cwd();\n\n  const pkgConfig = path.join(workdir, 'package.json');\n  const awslintConfig = path.join(workdir, 'awslint.json');\n\n  if (command === 'list') {\n    for (const rule of ALL_RULES_LINTER.rules) {\n      console.info(`${chalk.cyan(rule.code)}: ${rule.message}`);\n    }\n    return;\n  }\n\n  // if no package.json and force is true (default), just don't do anything\n  if (!await fs.pathExists(pkgConfig) && args.force) {\n    return;\n  }\n\n  const pkg = await fs.readJSON(pkgConfig);\n\n  // if this is not a jsii module we have nothing to look for\n  if (!pkg.jsii) {\n    if (args.force) {\n      return; // just silently succeed\n    }\n\n    throw new Error(`Module in ${workdir} is not a jsii module (no \"jsii\" section in package.json)`);\n  }\n\n  // if package.json contains a `jsii` section but there is no .jsii file\n  // it means we haven't compiled the module.\n  if (await shouldCompile()) {\n    await shell('jsii');\n  }\n\n  // awslint.json takes precedence over package.json for awslint options.\n  const standloneOptions = await readStandaloneOptions(awslintConfig);\n\n  // read \"awslint\" from package.json\n  if (args.config) {\n    if (standloneOptions) {\n      if (pkg.awslint) {\n        console.warn('awslint options in package.json will be ignored since awslint.json exists.');\n      }\n      mergeOptions(args, standloneOptions);\n    } else {\n      mergeOptions(args, pkg.awslint);\n    }\n  }\n\n\n  if (args.debug) {\n    console.error('command: ' + command);\n    console.error('options: ' + JSON.stringify(args, undefined, 2));\n  }\n\n  if (command === 'lint') {\n    const assembly = await loadModule(workdir);\n    if (!assembly) {\n      return;\n    }\n\n    const excludesToSave = new Array<string>();\n    let errors = 0;\n\n    const results = [];\n\n    results.push(...ALL_RULES_LINTER.eval(assembly, {\n      include: args.include,\n      exclude: args.exclude,\n    }));\n\n    // Sort errors to the top (highest severity first)\n    results.sort((a, b) => b.level - a.level);\n\n    // process results\n\n    for (const diag of results) {\n      const suppressionKey = `${diag.rule.code}:${diag.scope}`;\n\n      let color;\n      switch (diag.level) {\n        case DiagnosticLevel.Success:\n          if (args.verbose) {\n            color = chalk.gray;\n          }\n          break;\n        case DiagnosticLevel.Error:\n          errors++;\n          color = chalk.red;\n          if (args.save) {\n            excludesToSave.push(suppressionKey);\n          }\n          break;\n        case DiagnosticLevel.Warning:\n          if (!args.quiet) {\n            color = chalk.yellow;\n          }\n          break;\n        case DiagnosticLevel.Skipped:\n          if (!args.quiet) {\n            color = chalk.blue;\n          }\n          break;\n      }\n\n      if (color) {\n        console.error(color(`${DiagnosticLevel[diag.level].toLowerCase()}: [${chalk.bold(`awslint:${diag.rule.code}`)}:${chalk.bold(diag.scope)}] ${diag.message}`));\n      }\n    }\n\n    if (excludesToSave.length > 0) {\n      if (standloneOptions) {\n        if (!standloneOptions.exclude) {\n          standloneOptions.exclude = [];\n        }\n      } else {\n        if (!pkg.awslint) {\n          pkg.awslint = { };\n        }\n\n        if (!pkg.awslint.exclude) {\n          pkg.awslint.exclude = [];\n        }\n      }\n\n      const excludes: string[] = standloneOptions ? standloneOptions.exclude : pkg.awslint.exclude;\n\n      for (const exclude of excludesToSave) {\n        if (excludes.indexOf(exclude) === -1) {\n          excludes.push(exclude);\n        }\n      }\n\n      if (excludes.length > 0) {\n        if (standloneOptions) {\n          // If awslint.json exists, write the excludes there instead of the old package.json (legacy format).\n          if (pkg.awslint) {\n            console.warn('Excludes will be written to awslint.json.');\n          }\n          await fs.writeJSON(awslintConfig, standloneOptions, { spaces: 2 });\n        } else {\n          await fs.writeJSON(pkgConfig, pkg, { spaces: 2 });\n        }\n      }\n    }\n\n    if (errors && !args.save) {\n      process.exit(1);\n    }\n\n    return;\n  }\n\n  argv.showHelp();\n  throw new Error(`Invalid command: ${command}`);\n\n  async function shouldCompile() {\n\n    // if --compile is explicitly enabled then just compile always\n    if (args.compile === true) {\n      return true;\n    }\n\n    // if we have a .jsii file and we are not forced to compile, then don't compile\n    if (await fs.pathExists(path.join(workdir, '.jsii'))) {\n      return false;\n    }\n\n    // we don't have a .jsii file, and --no-compile is explicily set, then it's an error\n    if (args.compile === false) {\n      throw new Error('No .jsii file and --no-compile is set');\n    }\n\n    // compile!\n    return true;\n  }\n\n}\n\nmain().catch(e => {\n  console.error(chalk.red(e.message));\n  if (stackTrace) {\n    console.error(e.stack);\n  }\n  process.exit(1);\n});\n\nasync function loadModule(dir: string) {\n  const ts = new reflect.TypeSystem();\n  await ts.load(dir, { validate: false }); // Don't validate to save 66% of execution time (20s vs 1min).\n  // We run 'awslint' during build time, assemblies are guaranteed to be ok.\n\n  if (ts.roots.length !== 1) {\n    throw new Error('Expecting only a single root assembly');\n  }\n\n  return ts.roots[0];\n}\n\nfunction mergeOptions(dest: any, pkg?: any) {\n  if (!pkg) { return; } // no options in package.json\n\n  for (const [key, value] of Object.entries(pkg)) {\n\n    // if this is an array option, then add values to destination\n    if (Array.isArray(value)) {\n      const arr = dest[key] || [];\n      arr.push(...value);\n      dest[key] = arr;\n      continue;\n    }\n\n    // objects are not allowed\n    if (typeof value === 'object') {\n      throw new Error(`Invalid option \"${key}\" in package.json: ${JSON.stringify(value)}`);\n    }\n\n    // primitives simply override\n    dest[key] = value;\n  }\n\n  return dest;\n}\n\nasync function readStandaloneOptions(awslintConfig: string) {\n  if (!await fs.pathExists(awslintConfig)) {\n    return;\n  }\n\n  const options = await fs.readJSON(awslintConfig);\n  return options;\n}\n\nasync function shell(command: string) {\n  const child = child_process.spawn(command, [], { stdio: ['inherit', 'inherit', 'inherit'] });\n  return new Promise<void>((ok, ko) => {\n    child.once('exit', (status: any) => {\n      if (status === 0) {\n        return ok();\n      } else {\n        return ko(new Error(`${command} exited with status ${status}`));\n      }\n    });\n    child.once('error', ko);\n  });\n}\n"]}
|
package/bin/awslint.ts
CHANGED
|
@@ -18,12 +18,12 @@ async function main() {
|
|
|
18
18
|
.command('$0', 'lint the current module (default)')
|
|
19
19
|
.command('list', 'list all available rules')
|
|
20
20
|
.option('include', { alias: 'i', type: 'array', desc: 'evaluate only this rule(s)', default: ['*'] })
|
|
21
|
-
.option('exclude', { alias: 'x', type: 'array', desc: 'do not
|
|
22
|
-
.option('save', { type: 'boolean', desc: 'updates package.json with "exclude" statements for all failing rules', default: false })
|
|
21
|
+
.option('exclude', { alias: 'x', type: 'array', desc: 'do not evaluate these rules (takes priority over --include)', default: [] })
|
|
22
|
+
.option('save', { type: 'boolean', desc: 'updates package.json (or awslint.json if it exists) with "exclude" statements for all failing rules', default: false })
|
|
23
23
|
.option('verbose', { alias: 'v', type: 'boolean', desc: 'verbose output (prints all assertions)', default: false })
|
|
24
24
|
.option('quiet', { alias: 'q', type: 'boolean', desc: 'quiet mode - shows only errors', default: true })
|
|
25
25
|
.option('force', { type: 'boolean', desc: 'succeed silently if this is not a jsii module', default: true })
|
|
26
|
-
.option('config', { type: 'boolean', desc: 'reads options from the "awslint" section in package.json', default: true })
|
|
26
|
+
.option('config', { type: 'boolean', desc: 'reads options from "awslint.json" if it exists, and otherwise from the "awslint" section in package.json', default: true })
|
|
27
27
|
.option('debug', { type: 'boolean', desc: 'debug output', default: false })
|
|
28
28
|
.option('compile', { alias: 'c', type: 'boolean', desc: 'always run the jsii compiler (use "--no-compile" to never run the compiler, even if .jsii doesn\'t exist)' })
|
|
29
29
|
.group('include', 'Filtering')
|
|
@@ -56,7 +56,8 @@ async function main() {
|
|
|
56
56
|
const command = args._[0] || 'lint';
|
|
57
57
|
const workdir = process.cwd();
|
|
58
58
|
|
|
59
|
-
const
|
|
59
|
+
const pkgConfig = path.join(workdir, 'package.json');
|
|
60
|
+
const awslintConfig = path.join(workdir, 'awslint.json');
|
|
60
61
|
|
|
61
62
|
if (command === 'list') {
|
|
62
63
|
for (const rule of ALL_RULES_LINTER.rules) {
|
|
@@ -66,11 +67,11 @@ async function main() {
|
|
|
66
67
|
}
|
|
67
68
|
|
|
68
69
|
// if no package.json and force is true (default), just don't do anything
|
|
69
|
-
if (!await fs.pathExists(
|
|
70
|
+
if (!await fs.pathExists(pkgConfig) && args.force) {
|
|
70
71
|
return;
|
|
71
72
|
}
|
|
72
73
|
|
|
73
|
-
const pkg = await fs.readJSON(
|
|
74
|
+
const pkg = await fs.readJSON(pkgConfig);
|
|
74
75
|
|
|
75
76
|
// if this is not a jsii module we have nothing to look for
|
|
76
77
|
if (!pkg.jsii) {
|
|
@@ -87,11 +88,22 @@ async function main() {
|
|
|
87
88
|
await shell('jsii');
|
|
88
89
|
}
|
|
89
90
|
|
|
91
|
+
// awslint.json takes precedence over package.json for awslint options.
|
|
92
|
+
const standloneOptions = await readStandaloneOptions(awslintConfig);
|
|
93
|
+
|
|
90
94
|
// read "awslint" from package.json
|
|
91
95
|
if (args.config) {
|
|
92
|
-
|
|
96
|
+
if (standloneOptions) {
|
|
97
|
+
if (pkg.awslint) {
|
|
98
|
+
console.warn('awslint options in package.json will be ignored since awslint.json exists.');
|
|
99
|
+
}
|
|
100
|
+
mergeOptions(args, standloneOptions);
|
|
101
|
+
} else {
|
|
102
|
+
mergeOptions(args, pkg.awslint);
|
|
103
|
+
}
|
|
93
104
|
}
|
|
94
105
|
|
|
106
|
+
|
|
95
107
|
if (args.debug) {
|
|
96
108
|
console.error('command: ' + command);
|
|
97
109
|
console.error('options: ' + JSON.stringify(args, undefined, 2));
|
|
@@ -153,15 +165,21 @@ async function main() {
|
|
|
153
165
|
}
|
|
154
166
|
|
|
155
167
|
if (excludesToSave.length > 0) {
|
|
156
|
-
if (
|
|
157
|
-
|
|
158
|
-
|
|
168
|
+
if (standloneOptions) {
|
|
169
|
+
if (!standloneOptions.exclude) {
|
|
170
|
+
standloneOptions.exclude = [];
|
|
171
|
+
}
|
|
172
|
+
} else {
|
|
173
|
+
if (!pkg.awslint) {
|
|
174
|
+
pkg.awslint = { };
|
|
175
|
+
}
|
|
159
176
|
|
|
160
|
-
|
|
161
|
-
|
|
177
|
+
if (!pkg.awslint.exclude) {
|
|
178
|
+
pkg.awslint.exclude = [];
|
|
179
|
+
}
|
|
162
180
|
}
|
|
163
181
|
|
|
164
|
-
const excludes: string[] = pkg.awslint.exclude;
|
|
182
|
+
const excludes: string[] = standloneOptions ? standloneOptions.exclude : pkg.awslint.exclude;
|
|
165
183
|
|
|
166
184
|
for (const exclude of excludesToSave) {
|
|
167
185
|
if (excludes.indexOf(exclude) === -1) {
|
|
@@ -170,7 +188,15 @@ async function main() {
|
|
|
170
188
|
}
|
|
171
189
|
|
|
172
190
|
if (excludes.length > 0) {
|
|
173
|
-
|
|
191
|
+
if (standloneOptions) {
|
|
192
|
+
// If awslint.json exists, write the excludes there instead of the old package.json (legacy format).
|
|
193
|
+
if (pkg.awslint) {
|
|
194
|
+
console.warn('Excludes will be written to awslint.json.');
|
|
195
|
+
}
|
|
196
|
+
await fs.writeJSON(awslintConfig, standloneOptions, { spaces: 2 });
|
|
197
|
+
} else {
|
|
198
|
+
await fs.writeJSON(pkgConfig, pkg, { spaces: 2 });
|
|
199
|
+
}
|
|
174
200
|
}
|
|
175
201
|
}
|
|
176
202
|
|
|
@@ -252,6 +278,15 @@ function mergeOptions(dest: any, pkg?: any) {
|
|
|
252
278
|
return dest;
|
|
253
279
|
}
|
|
254
280
|
|
|
281
|
+
async function readStandaloneOptions(awslintConfig: string) {
|
|
282
|
+
if (!await fs.pathExists(awslintConfig)) {
|
|
283
|
+
return;
|
|
284
|
+
}
|
|
285
|
+
|
|
286
|
+
const options = await fs.readJSON(awslintConfig);
|
|
287
|
+
return options;
|
|
288
|
+
}
|
|
289
|
+
|
|
255
290
|
async function shell(command: string) {
|
|
256
291
|
const child = child_process.spawn(command, [], { stdio: ['inherit', 'inherit', 'inherit'] });
|
|
257
292
|
return new Promise<void>((ok, ko) => {
|
|
@@ -34,17 +34,14 @@ class CfnResourceReflection {
|
|
|
34
34
|
* Returns all CFN resource classes within an assembly.
|
|
35
35
|
*/
|
|
36
36
|
static findAll(assembly) {
|
|
37
|
-
return assembly.
|
|
37
|
+
return assembly.allClasses
|
|
38
38
|
.filter(c => core_types_1.CoreTypes.isCfnResource(c))
|
|
39
39
|
.map(c => new CfnResourceReflection(c));
|
|
40
40
|
}
|
|
41
41
|
constructor(cls) {
|
|
42
42
|
this.classType = cls;
|
|
43
43
|
this.basename = cls.name.slice('Cfn'.length);
|
|
44
|
-
|
|
45
|
-
const initializerDoc = (cls.initializer && cls.initializer.docs.docs.summary) || '';
|
|
46
|
-
const out = /a new `([^`]+)`/.exec(initializerDoc);
|
|
47
|
-
const fullname = out && out[1];
|
|
44
|
+
const fullname = cls.docs.customTag('cloudformationResource');
|
|
48
45
|
if (!fullname) {
|
|
49
46
|
throw new Error(`Unable to extract CloudFormation resource name from initializer documentation of ${cls}`);
|
|
50
47
|
}
|
|
@@ -65,4 +62,4 @@ class CfnResourceReflection {
|
|
|
65
62
|
}
|
|
66
63
|
}
|
|
67
64
|
exports.CfnResourceReflection = CfnResourceReflection;
|
|
68
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
65
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2ZuLXJlc291cmNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiY2ZuLXJlc291cmNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLHVDQUF1QztBQUV2Qyw2Q0FBeUM7QUFDekMseUNBQWdEO0FBQ2hELHNDQUFtQztBQUVuQyx5RkFBeUY7QUFDekYsZ0ZBQWdGO0FBQ25FLFFBQUEsaUJBQWlCLEdBQUcsSUFBSSxlQUFNLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxxQkFBcUIsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztBQUVuRix5QkFBaUIsQ0FBQyxHQUFHLENBQUM7SUFDcEIsSUFBSSxFQUFFLGdCQUFnQjtJQUN0QixPQUFPLEVBQUUsdUZBQXVGO0lBQ2hHLE9BQU8sRUFBRSxJQUFJO0lBQ2IsSUFBSSxFQUFFLENBQUMsQ0FBQyxFQUFFO1FBQ1IsTUFBTSxFQUFFLEdBQUcsNkJBQWtCLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUMsU0FBUyxDQUFDLFFBQVEsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUMsUUFBUSxLQUFLLENBQUMsQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDLENBQUM7UUFDN0csQ0FBQyxDQUFDLE1BQU0sQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxRQUFRLEVBQUUsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQUMsQ0FBQztJQUMvQyxDQUFDO0NBQ0YsQ0FBQyxDQUFDO0FBRUgsTUFBYSxxQkFBcUI7SUFDaEM7OztPQUdHO0lBQ0ksTUFBTSxDQUFDLFVBQVUsQ0FBQyxHQUF1QixFQUFFLFFBQWdCO1FBQ2hFLEtBQUssTUFBTSxHQUFHLElBQUksR0FBRyxDQUFDLE9BQU8sRUFBRTtZQUM3QixJQUFJLEdBQUcsQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLHdCQUF3QixDQUFDLEVBQUUsaUJBQWlCLEVBQUUsS0FBSyxRQUFRLENBQUMsaUJBQWlCLEVBQUUsRUFBRTtnQkFDdEcsT0FBTyxJQUFJLHFCQUFxQixDQUFDLEdBQUcsQ0FBQyxDQUFDO2FBQ3ZDO1NBQ0Y7UUFFRCxPQUFPLFNBQVMsQ0FBQztJQUNuQixDQUFDO0lBRUQ7O09BRUc7SUFDSSxNQUFNLENBQUMsT0FBTyxDQUFDLFFBQTBCO1FBQzlDLE9BQU8sUUFBUSxDQUFDLFVBQVU7YUFDdkIsTUFBTSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsc0JBQVMsQ0FBQyxhQUFhLENBQUMsQ0FBQyxDQUFDLENBQUM7YUFDdkMsR0FBRyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsSUFBSSxxQkFBcUIsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQzVDLENBQUM7SUFTRCxZQUFZLEdBQXNCO1FBQ2hDLElBQUksQ0FBQyxTQUFTLEdBQUcsR0FBRyxDQUFDO1FBRXJCLElBQUksQ0FBQyxRQUFRLEdBQUcsR0FBRyxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBRTdDLE1BQU0sUUFBUSxHQUFHLEdBQUcsQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLHdCQUF3QixDQUFDLENBQUM7UUFDOUQsSUFBSSxDQUFDLFFBQVEsRUFBRTtZQUNiLE1BQU0sSUFBSSxLQUFLLENBQUMsb0ZBQW9GLEdBQUcsRUFBRSxDQUFDLENBQUM7U0FDNUc7UUFFRCxJQUFJLENBQUMsUUFBUSxHQUFHLFFBQVEsQ0FBQztRQUV6QixJQUFJLENBQUMsU0FBUyxHQUFHLFFBQVEsQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7UUFFN0QsSUFBSSxDQUFDLGNBQWMsR0FBRyxHQUFHLENBQUMsYUFBYTthQUNwQyxNQUFNLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLE1BQU0sSUFBSSxFQUFFLENBQUMsQ0FBQyx1QkFBdUIsQ0FBQzthQUMvRCxHQUFHLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyx5QkFBeUIsQ0FBQyxJQUFJLFNBQVMsQ0FBQzthQUNsRSxHQUFHLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxJQUFJLENBQUMsZ0NBQWdDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztRQUV0RCxJQUFJLENBQUMsR0FBRyxHQUFHLEdBQUcsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLEdBQUcsSUFBSSxFQUFFLENBQUM7SUFDckMsQ0FBQztJQUVPLGdDQUFnQyxDQUFDLElBQVk7UUFFbkQsb0VBQW9FO1FBQ3BFLElBQUksSUFBSSxDQUFDLFFBQVEsS0FBSyxlQUFlLElBQUksSUFBSSxLQUFLLFNBQVMsRUFBRTtZQUMzRCxPQUFPLElBQUksQ0FBQztTQUNiO1FBRUQsT0FBTyxTQUFTLENBQUMsSUFBSSxFQUFFLEVBQUUsVUFBVSxFQUFFLElBQUksRUFBRSxDQUFDLENBQUM7SUFDL0MsQ0FBQztDQUNGO0FBOURELHNEQThEQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCAqIGFzIGNhbWVsY2FzZSBmcm9tICdjYW1lbGNhc2UnO1xuaW1wb3J0ICogYXMgcmVmbGVjdCBmcm9tICdqc2lpLXJlZmxlY3QnO1xuaW1wb3J0IHsgQ29yZVR5cGVzIH0gZnJvbSAnLi9jb3JlLXR5cGVzJztcbmltcG9ydCB7IFJlc291cmNlUmVmbGVjdGlvbiB9IGZyb20gJy4vcmVzb3VyY2UnO1xuaW1wb3J0IHsgTGludGVyIH0gZnJvbSAnLi4vbGludGVyJztcblxuLy8gdGhpcyBsaW50ZXIgdmVyaWZpZXMgdGhhdCB3ZSBoYXZlIEwyIGNvdmVyYWdlLiBpdCBmaW5kcyBhbGwgXCJDZm5cIiBjbGFzc2VzIGFuZCB2ZXJpZmllc1xuLy8gdGhhdCB3ZSBoYXZlIGEgY29ycmVzcG9uZGluZyBMMSBjbGFzcyBmb3IgaXQgdGhhdCdzIGlkZW50aWZpZWQgYXMgYSByZXNvdXJjZS5cbmV4cG9ydCBjb25zdCBjZm5SZXNvdXJjZUxpbnRlciA9IG5ldyBMaW50ZXIoYSA9PiBDZm5SZXNvdXJjZVJlZmxlY3Rpb24uZmluZEFsbChhKSk7XG5cbmNmblJlc291cmNlTGludGVyLmFkZCh7XG4gIGNvZGU6ICdyZXNvdXJjZS1jbGFzcycsXG4gIG1lc3NhZ2U6ICdldmVyeSByZXNvdXJjZSBtdXN0IGhhdmUgYSByZXNvdXJjZSBjbGFzcyAoTDIpLCBhZGQgXFwnQHJlc291cmNlICVzXFwnIHRvIGl0cyBkb2NzdHJpbmcnLFxuICB3YXJuaW5nOiB0cnVlLFxuICBldmFsOiBlID0+IHtcbiAgICBjb25zdCBsMiA9IFJlc291cmNlUmVmbGVjdGlvbi5maW5kQWxsKGUuY3R4LmNsYXNzVHlwZS5hc3NlbWJseSkuZmluZChyID0+IHIuY2ZuLmZ1bGxuYW1lID09PSBlLmN0eC5mdWxsbmFtZSk7XG4gICAgZS5hc3NlcnQobDIsIGUuY3R4LmZ1bGxuYW1lLCBlLmN0eC5mdWxsbmFtZSk7XG4gIH0sXG59KTtcblxuZXhwb3J0IGNsYXNzIENmblJlc291cmNlUmVmbGVjdGlvbiB7XG4gIC8qKlxuICAgKiBGaW5kcyBhIENmbiByZXNvdXJjZSBjbGFzcyBieSBmdWxsIENsb3VkRm9ybWF0aW9uIHJlc291cmNlIG5hbWUgKGUuZy4gYEFXUzo6UzM6OkJ1Y2tldGApXG4gICAqIEBwYXJhbSBmdWxsTmFtZSBmaXJzdCB0d28gY29tcG9uZW50cyBhcmUgY2FzZS1pbnNlbnNpdGl2ZSAoZS5nLiBgYXdzOjpzMzo6QnVja2V0YCBpcyBlcXVpdmFsZW50IHRvIGBBd3M6OlMzOjpCdWNrZXRgKVxuICAgKi9cbiAgcHVibGljIHN0YXRpYyBmaW5kQnlOYW1lKHN5czogcmVmbGVjdC5UeXBlU3lzdGVtLCBmdWxsTmFtZTogc3RyaW5nKSB7XG4gICAgZm9yIChjb25zdCBjbHMgb2Ygc3lzLmNsYXNzZXMpIHtcbiAgICAgIGlmIChjbHMuZG9jcy5jdXN0b21UYWcoJ2Nsb3VkZm9ybWF0aW9uUmVzb3VyY2UnKT8udG9Mb2NhbGVMb3dlckNhc2UoKSA9PT0gZnVsbE5hbWUudG9Mb2NhbGVMb3dlckNhc2UoKSkge1xuICAgICAgICByZXR1cm4gbmV3IENmblJlc291cmNlUmVmbGVjdGlvbihjbHMpO1xuICAgICAgfVxuICAgIH1cblxuICAgIHJldHVybiB1bmRlZmluZWQ7XG4gIH1cblxuICAvKipcbiAgICogUmV0dXJucyBhbGwgQ0ZOIHJlc291cmNlIGNsYXNzZXMgd2l0aGluIGFuIGFzc2VtYmx5LlxuICAgKi9cbiAgcHVibGljIHN0YXRpYyBmaW5kQWxsKGFzc2VtYmx5OiByZWZsZWN0LkFzc2VtYmx5KSB7XG4gICAgcmV0dXJuIGFzc2VtYmx5LmFsbENsYXNzZXNcbiAgICAgIC5maWx0ZXIoYyA9PiBDb3JlVHlwZXMuaXNDZm5SZXNvdXJjZShjKSlcbiAgICAgIC5tYXAoYyA9PiBuZXcgQ2ZuUmVzb3VyY2VSZWZsZWN0aW9uKGMpKTtcbiAgfVxuXG4gIHB1YmxpYyByZWFkb25seSBjbGFzc1R5cGU6IHJlZmxlY3QuQ2xhc3NUeXBlO1xuICBwdWJsaWMgcmVhZG9ubHkgZnVsbG5hbWU6IHN0cmluZzsgLy8gQVdTOjpTMzo6QnVja2V0XG4gIHB1YmxpYyByZWFkb25seSBuYW1lc3BhY2U6IHN0cmluZzsgLy8gQVdTOjpTM1xuICBwdWJsaWMgcmVhZG9ubHkgYmFzZW5hbWU6IHN0cmluZzsgLy8gQnVja2V0XG4gIHB1YmxpYyByZWFkb25seSBhdHRyaWJ1dGVOYW1lczogc3RyaW5nW107IC8vIChub3JtYWxpemVkKSBidWNrZXRBcm4sIGJ1Y2tldE5hbWUsIHF1ZXVlVXJsXG4gIHB1YmxpYyByZWFkb25seSBkb2M6IHN0cmluZzsgLy8gbGluayB0byBDbG91ZEZvcm1hdGlvbiBkb2NzXG5cbiAgY29uc3RydWN0b3IoY2xzOiByZWZsZWN0LkNsYXNzVHlwZSkge1xuICAgIHRoaXMuY2xhc3NUeXBlID0gY2xzO1xuXG4gICAgdGhpcy5iYXNlbmFtZSA9IGNscy5uYW1lLnNsaWNlKCdDZm4nLmxlbmd0aCk7XG5cbiAgICBjb25zdCBmdWxsbmFtZSA9IGNscy5kb2NzLmN1c3RvbVRhZygnY2xvdWRmb3JtYXRpb25SZXNvdXJjZScpO1xuICAgIGlmICghZnVsbG5hbWUpIHtcbiAgICAgIHRocm93IG5ldyBFcnJvcihgVW5hYmxlIHRvIGV4dHJhY3QgQ2xvdWRGb3JtYXRpb24gcmVzb3VyY2UgbmFtZSBmcm9tIGluaXRpYWxpemVyIGRvY3VtZW50YXRpb24gb2YgJHtjbHN9YCk7XG4gICAgfVxuXG4gICAgdGhpcy5mdWxsbmFtZSA9IGZ1bGxuYW1lO1xuXG4gICAgdGhpcy5uYW1lc3BhY2UgPSBmdWxsbmFtZS5zcGxpdCgnOjonKS5zbGljZSgwLCAyKS5qb2luKCc6OicpO1xuXG4gICAgdGhpcy5hdHRyaWJ1dGVOYW1lcyA9IGNscy5vd25Qcm9wZXJ0aWVzXG4gICAgICAuZmlsdGVyKHAgPT4gKHAuZG9jcy5kb2NzLmN1c3RvbSB8fCB7fSkuY2xvdWRmb3JtYXRpb25BdHRyaWJ1dGUpXG4gICAgICAubWFwKHAgPT4gcC5kb2NzLmN1c3RvbVRhZygnY2xvdWRmb3JtYXRpb25BdHRyaWJ1dGUnKSB8fCAnPGVycm9yPicpXG4gICAgICAubWFwKHAgPT4gdGhpcy5hdHRyaWJ1dGVQcm9wZXJ0eU5hbWVGcm9tQ2ZuTmFtZShwKSk7XG5cbiAgICB0aGlzLmRvYyA9IGNscy5kb2NzLmRvY3Muc2VlIHx8ICcnO1xuICB9XG5cbiAgcHJpdmF0ZSBhdHRyaWJ1dGVQcm9wZXJ0eU5hbWVGcm9tQ2ZuTmFtZShuYW1lOiBzdHJpbmcpOiBzdHJpbmcge1xuXG4gICAgLy8gc3BlY2lhbCBjYXNlIChzb21lb25lIHdhcyBzbWFydCksIHNwZWNpYWwgY2FzZSBjb3BpZWQgZnJvbSBjZm4ydHNcbiAgICBpZiAodGhpcy5iYXNlbmFtZSA9PT0gJ1NlY3VyaXR5R3JvdXAnICYmIG5hbWUgPT09ICdHcm91cElkJykge1xuICAgICAgcmV0dXJuICdJZCc7XG4gICAgfVxuXG4gICAgcmV0dXJuIGNhbWVsY2FzZShuYW1lLCB7IHBhc2NhbENhc2U6IHRydWUgfSk7XG4gIH1cbn1cbiJdfQ==
|
|
@@ -37,7 +37,7 @@ export class CfnResourceReflection {
|
|
|
37
37
|
* Returns all CFN resource classes within an assembly.
|
|
38
38
|
*/
|
|
39
39
|
public static findAll(assembly: reflect.Assembly) {
|
|
40
|
-
return assembly.
|
|
40
|
+
return assembly.allClasses
|
|
41
41
|
.filter(c => CoreTypes.isCfnResource(c))
|
|
42
42
|
.map(c => new CfnResourceReflection(c));
|
|
43
43
|
}
|
|
@@ -54,10 +54,7 @@ export class CfnResourceReflection {
|
|
|
54
54
|
|
|
55
55
|
this.basename = cls.name.slice('Cfn'.length);
|
|
56
56
|
|
|
57
|
-
|
|
58
|
-
const initializerDoc = (cls.initializer && cls.initializer.docs.docs.summary) || '';
|
|
59
|
-
const out = /a new `([^`]+)`/.exec(initializerDoc);
|
|
60
|
-
const fullname = out && out[1];
|
|
57
|
+
const fullname = cls.docs.customTag('cloudformationResource');
|
|
61
58
|
if (!fullname) {
|
|
62
59
|
throw new Error(`Unable to extract CloudFormation resource name from initializer documentation of ${cls}`);
|
|
63
60
|
}
|
|
@@ -16,8 +16,8 @@ class EventsReflection extends construct_1.ConstructReflection {
|
|
|
16
16
|
}
|
|
17
17
|
}
|
|
18
18
|
exports.EventsReflection = EventsReflection;
|
|
19
|
-
const ON_EVENT_OPTIONS_FQN = '
|
|
20
|
-
const EVENT_RULE_FQN = '
|
|
19
|
+
const ON_EVENT_OPTIONS_FQN = 'aws-cdk-lib.aws_events.OnEventOptions';
|
|
20
|
+
const EVENT_RULE_FQN = 'aws-cdk-lib.aws_events.Rule';
|
|
21
21
|
exports.eventsLinter.add({
|
|
22
22
|
code: 'events-in-interface',
|
|
23
23
|
message: '\'onXxx()\' methods should also be defined on construct interface',
|
|
@@ -66,4 +66,4 @@ function isDirectEventMethod(m) {
|
|
|
66
66
|
function isCloudTrailEventMethod(m) {
|
|
67
67
|
return m.name.startsWith('onCloudTrail');
|
|
68
68
|
}
|
|
69
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
69
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xvdWR3YXRjaC1ldmVudHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJjbG91ZHdhdGNoLWV2ZW50cy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFDQSwyQ0FBa0Q7QUFDbEQsNkNBQXlDO0FBQ3pDLHNDQUFtQztBQUV0QixRQUFBLFlBQVksR0FBRyxJQUFJLGVBQU0sQ0FBbUIsUUFBUSxDQUFDLEVBQUUsQ0FBQyxRQUFRLENBQUMsT0FBTztLQUNsRixNQUFNLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxzQkFBUyxDQUFDLGdCQUFnQixDQUFDLENBQUMsQ0FBQyxDQUFDO0tBQzFDLEdBQUcsQ0FBQyxTQUFTLENBQUMsRUFBRSxDQUFDLElBQUksZ0JBQWdCLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQyxDQUFDO0FBRXRELE1BQWEsZ0JBQWlCLFNBQVEsK0JBQW1CO0lBQ3ZELElBQVcsa0JBQWtCO1FBQzNCLE9BQU8sSUFBSSxDQUFDLFNBQVMsQ0FBQyxVQUFVLENBQUMsTUFBTSxDQUFDLG1CQUFtQixDQUFDLENBQUM7SUFDL0QsQ0FBQztJQUVELElBQVcsc0JBQXNCO1FBQy9CLE9BQU8sSUFBSSxDQUFDLFNBQVMsQ0FBQyxVQUFVLENBQUMsTUFBTSxDQUFDLHVCQUF1QixDQUFDLENBQUM7SUFDbkUsQ0FBQztDQUNGO0FBUkQsNENBUUM7QUFFRCxNQUFNLG9CQUFvQixHQUFHLHVDQUF1QyxDQUFDO0FBQ3JFLE1BQU0sY0FBYyxHQUFHLDZCQUE2QixDQUFDO0FBRXJELG9CQUFZLENBQUMsR0FBRyxDQUFDO0lBQ2YsSUFBSSxFQUFFLHFCQUFxQjtJQUMzQixPQUFPLEVBQUUsbUVBQW1FO0lBQzVFLElBQUksRUFBRSxDQUFDLENBQUMsRUFBRTtRQUNSLEtBQUssTUFBTSxNQUFNLElBQUksQ0FBQyxDQUFDLEdBQUcsQ0FBQyxrQkFBa0IsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxzQkFBc0IsQ0FBQyxFQUFFO1lBQ2xG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b3J0IHsgQ29uc3RydWN0UmVmbGVjdGlvbiB9IGZyb20gJy4vY29uc3RydWN0JztcbmltcG9ydCB7IENvcmVUeXBlcyB9IGZyb20gJy4vY29yZS10eXBlcyc7XG5pbXBvcnQgeyBMaW50ZXIgfSBmcm9tICcuLi9saW50ZXInO1xuXG5leHBvcnQgY29uc3QgZXZlbnRzTGludGVyID0gbmV3IExpbnRlcjxFdmVudHNSZWZsZWN0aW9uPihhc3NlbWJseSA9PiBhc3NlbWJseS5jbGFzc2VzXG4gIC5maWx0ZXIodCA9PiBDb3JlVHlwZXMuaXNDb25zdHJ1Y3RDbGFzcyh0KSlcbiAgLm1hcChjb25zdHJ1Y3QgPT4gbmV3IEV2ZW50c1JlZmxlY3Rpb24oY29uc3RydWN0KSkpO1xuXG5leHBvcnQgY2xhc3MgRXZlbnRzUmVmbGVjdGlvbiBleHRlbmRzIENvbnN0cnVjdFJlZmxlY3Rpb24ge1xuICBwdWJsaWMgZ2V0IGRpcmVjdEV2ZW50TWV0aG9kcygpIHtcbiAgICByZXR1cm4gdGhpcy5jbGFzc1R5cGUuYWxsTWV0aG9kcy5maWx0ZXIoaXNEaXJlY3RFdmVudE1ldGhvZCk7XG4gIH1cblxuICBwdWJsaWMgZ2V0IGNsb3VkVHJhaWxFdmVudE1ldGhvZHMoKSB7XG4gICAgcmV0dXJuIHRoaXMuY2xhc3NUeXBlLmFsbE1ldGhvZHMuZmlsdGVyKGlzQ2xvdWRUcmFpbEV2ZW50TWV0aG9kKTtcbiAgfVxufVxuXG5jb25zdCBPTl9FVkVOVF9PUFRJT05TX0ZRTiA9ICdhd3MtY2RrLWxpYi5hd3NfZXZlbnRzLk9uRXZlbnRPcHRpb25zJztcbmNvbnN0IEVWRU5UX1JVTEVfRlFOID0gJ2F3cy1jZGstbGliLmF3c19ldmVudHMuUnVsZSc7XG5cbmV2ZW50c0xpbnRlci5hZGQoe1xuICBjb2RlOiAnZXZlbnRzLWluLWludGVyZmFjZScsXG4gIG1lc3NhZ2U6ICdcXCdvblh4eCgpXFwnIG1ldGhvZHMgc2hvdWxkIGFsc28gYmUgZGVmaW5lZCBvbiBjb25zdHJ1Y3QgaW50ZXJmYWNlJyxcbiAgZXZhbDogZSA9PiB7XG4gICAgZm9yIChjb25zdCBtZXRob2Qgb2YgZS5jdHguZGlyZWN0RXZlbnRNZXRob2RzLmNvbmNhdChlLmN0eC5jbG91ZFRyYWlsRXZlbnRNZXRob2RzKSkge1xuICAgICAgZS5hc3NlcnQoIWUuY3R4LmludGVyZmFjZVR5cGUgfHwgZS5jdHguaW50ZXJmYWNlVHlwZS5hbGxNZXRob2RzLmZpbHRlcihtID0+ICFtLnByb3RlY3RlZCkuc29tZShtID0+IG0ubmFtZSA9PT0gbWV0aG9kLm5hbWUpLCBgJHtlLmN0eC5mcW59LiR7bWV0aG9kLm5hbWV9YCk7XG4gICAgfVxuICB9LFxufSk7XG5cbmV2ZW50c0xpbnRlci5hZGQoe1xuICBjb2RlOiAnZXZlbnRzLWdlbmVyaWMnLFxuICBtZXNzYWdlOiAnaWYgdGhlcmUgYXJlIHNwZWNpZmljIFxcJ29uWHh4KClcXCcgbWV0aG9kcywgdGhlcmUgc2hvdWxkIGFsc28gYmUgYSBnZW5lcmljIFxcJ29uRXZlbnQoKVxcJyBtZXRob2QnLFxuICBldmFsOiBlID0+IHtcbiAgICBlLmFzc2VydChlLmN0eC5kaXJlY3RFdmVudE1ldGhvZHMubGVuZ3RoID09PSAwIHx8IGUuY3R4LmNsYXNzVHlwZS5hbGxNZXRob2RzLnNvbWUobSA9PiBtLm5hbWUgPT09ICdvbkV2ZW50JyksIGUuY3R4LmZxbik7XG4gIH0sXG59KTtcblxuZXZlbnRzTGludGVyLmFkZCh7XG4gIGNvZGU6ICdldmVudHMtZ2VuZXJpYy1jbG91ZHRyYWlsJyxcbiAgbWVzc2FnZTogJ2lmIHRoZXJlIGFyZSBzcGVjaWZpYyBcXCdvbkNsb3VkVHJhaWxYeHgoKVxcJyBtZXRob2RzLCB0aGVyZSBzaG91bGQgYWxzbyBiZSBhIGdlbmVyaWMgXFwnb25DbG91ZFRyYWlsRXZlbnQoKVxcJyBtZXRob2QnLFxuICBldmFsOiBlID0+IHtcbiAgICBlLmFzc2VydChlLmN0eC5jbG91ZFRyYWlsRXZlbnRNZXRob2RzLmxlbmd0aCA9PT0gMCB8fCBlLmN0eC5jbGFzc1R5cGUuYWxsTWV0aG9kcy5zb21lKG0gPT4gbS5uYW1lID09PSAnb25DbG91ZFRyYWlsRXZlbnQnKSwgZS5jdHguZnFuKTtcbiAgfSxcbn0pO1xuXG5ldmVudHNMaW50ZXIuYWRkKHtcbiAgY29kZTogJ2V2ZW50cy1tZXRob2Qtc2lnbmF0dXJlJyxcbiAgbWVzc2FnZTogJ2FsbCBcXCdvblh4eCgpXFwnIG1ldGhvZHMgc2hvdWxkIGhhdmUgdGhlIENsb3VkV2F0Y2ggRXZlbnRzIHNpZ25hdHVyZSAoaWQ6IHN0cmluZywgb3B0aW9uczogZXZlbnRzLk9uRXZlbnRPcHRpb25zID0ge30pID0+IGV2ZW50cy5SdWxlJyxcbiAgZXZhbDogZSA9PiB7XG4gICAgZm9yIChjb25zdCBtZXRob2Qgb2YgZS5jdHguZGlyZWN0RXZlbnRNZXRob2RzKSB7XG4gICAgICAvLyBnaXZlIHNsYWNrIHRvIHByb3RlY3RlZCBtZXRob2RzIGxpa2UgXCJvblN5bnRoZXNpemVcIiwgXCJvblByZXBhcmVcIiwgLi4uXG4gICAgICBpZiAobWV0aG9kLnByb3RlY3RlZCkge1xuICAgICAgICBjb250aW51ZTtcbiAgICAgIH1cbiAgICAgIGUuYXNzZXJ0U2lnbmF0dXJlKG1ldGhvZCwge1xuICAgICAgICBwYXJhbWV0ZXJzOiBbXG4gICAgICAgICAgeyB0eXBlOiAnc3RyaW5nJyB9LFxuICAgICAgICAgIHsgdHlwZTogT05fRVZFTlRfT1BUSU9OU19GUU4sIHN1YnR5cGVBbGxvd2VkOiB0cnVlLCBvcHRpb25hbDogdHJ1ZSB9LFxuICAgICAgICBdLFxuICAgICAgICByZXR1cm5zOiBFVkVOVF9SVUxFX0ZRTixcbiAgICAgIH0pO1xuICAgIH1cbiAgfSxcbn0pO1xuXG5mdW5jdGlvbiBpc0RpcmVjdEV2ZW50TWV0aG9kKG06IHJlZmxlY3QuTWV0aG9kKSB7XG4gIHJldHVybiAhbS5wcm90ZWN0ZWQgJiYgbS5uYW1lLnN0YXJ0c1dpdGgoJ29uJykgJiYgISBtLm5hbWUuc3RhcnRzV2l0aCgnb25DbG91ZFRyYWlsJyk7XG59XG5cbmZ1bmN0aW9uIGlzQ2xvdWRUcmFpbEV2ZW50TWV0aG9kKG06IHJlZmxlY3QuTWV0aG9kKSB7XG4gIHJldHVybiBtLm5hbWUuc3RhcnRzV2l0aCgnb25DbG91ZFRyYWlsJyk7XG59XG4iXX0=
|
|
@@ -17,8 +17,8 @@ export class EventsReflection extends ConstructReflection {
|
|
|
17
17
|
}
|
|
18
18
|
}
|
|
19
19
|
|
|
20
|
-
const ON_EVENT_OPTIONS_FQN = '
|
|
21
|
-
const EVENT_RULE_FQN = '
|
|
20
|
+
const ON_EVENT_OPTIONS_FQN = 'aws-cdk-lib.aws_events.OnEventOptions';
|
|
21
|
+
const EVENT_RULE_FQN = 'aws-cdk-lib.aws_events.Rule';
|
|
22
22
|
|
|
23
23
|
eventsLinter.add({
|
|
24
24
|
code: 'events-in-interface',
|
package/lib/rules/construct.d.ts
CHANGED