@aws-cdk/cloud-assembly-api 2.3.0 → 2.5.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/environment.d.ts +11 -1
- package/lib/environment.js +1 -1
- package/lib/index.d.ts +4 -0
- package/lib/index.js +5 -1
- package/lib/private/color.d.ts +22 -0
- package/lib/private/color.js +47 -0
- package/lib/stack-trace.d.ts +80 -0
- package/lib/stack-trace.js +118 -0
- package/lib/validation/formatting.d.ts +30 -0
- package/lib/validation/formatting.js +187 -0
- package/lib/validation/loading.d.ts +19 -0
- package/lib/validation/loading.js +192 -0
- package/lib/validation/parsing.d.ts +51 -0
- package/lib/validation/parsing.js +121 -0
- package/package.json +12 -10
package/lib/environment.d.ts
CHANGED
|
@@ -2,7 +2,17 @@
|
|
|
2
2
|
* Models an AWS execution environment, for use within the CDK toolkit.
|
|
3
3
|
*/
|
|
4
4
|
export interface Environment {
|
|
5
|
-
/**
|
|
5
|
+
/**
|
|
6
|
+
* The display name of this environment, in the form `aws://<account>/<region>`
|
|
7
|
+
*
|
|
8
|
+
* This is always machine-generated, never user-set: it is either the
|
|
9
|
+
* artifact's `environment` field (which has this shape) or formatted from
|
|
10
|
+
* the account and region by `EnvironmentUtils.format`.
|
|
11
|
+
*
|
|
12
|
+
* Note that until the environment has been resolved, the account and region
|
|
13
|
+
* may still be the `UNKNOWN_ACCOUNT`/`UNKNOWN_REGION` placeholders, so this
|
|
14
|
+
* value is not necessarily usable as a `cdk` command line argument.
|
|
15
|
+
*/
|
|
6
16
|
readonly name: string;
|
|
7
17
|
/** The AWS account this environment deploys into */
|
|
8
18
|
readonly account: string;
|
package/lib/environment.js
CHANGED
|
@@ -37,4 +37,4 @@ class EnvironmentUtils {
|
|
|
37
37
|
}
|
|
38
38
|
}
|
|
39
39
|
exports.EnvironmentUtils = EnvironmentUtils;
|
|
40
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
40
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZW52aXJvbm1lbnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJlbnZpcm9ubWVudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSwyQ0FBcUQ7QUFFckQ7Ozs7R0FJRztBQUNILE1BQU0sYUFBYSxHQUFHLGdEQUFnRCxDQUFDO0FBMEIxRCxRQUFBLGVBQWUsR0FBRyxpQkFBaUIsQ0FBQztBQUNwQyxRQUFBLGNBQWMsR0FBRyxnQkFBZ0IsQ0FBQztBQUUvQyxNQUFhLGdCQUFnQjtJQUNwQixNQUFNLENBQUMsS0FBSyxDQUFDLFdBQW1CO1FBQ3JDLE1BQU0sR0FBRyxHQUFHLGFBQWEsQ0FBQyxJQUFJLENBQUMsV0FBVyxDQUFDLENBQUM7UUFDNUMsSUFBSSxDQUFDLEdBQUcsRUFBRSxDQUFDO1lBQ1QsTUFBTSxJQUFJLDBCQUFrQixDQUMxQiw4Q0FBOEMsV0FBVyxLQUFLO2dCQUM5RCx1Q0FBdUMsQ0FBQyxDQUFDO1FBQzdDLENBQUM7UUFFRCxNQUFNLENBQUMsRUFBRSxPQUFPLEVBQUUsTUFBTSxDQUFDLEdBQUcsR0FBRyxDQUFDO1FBQ2hDLElBQUksQ0FBQyxPQUFPLElBQUksQ0FBQyxNQUFNLEVBQUUsQ0FBQztZQUN4QixNQUFNLElBQUksMEJBQWtCLENBQUMsc0NBQXNDLFdBQVcsRUFBRSxDQUFDLENBQUM7UUFDcEYsQ0FBQztRQUVELE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSxFQUFFLElBQUksRUFBRSxXQUFXLEVBQUUsQ0FBQztJQUNoRCxDQUFDO0lBRUQ7O09BRUc7SUFDSSxNQUFNLENBQUMsSUFBSSxDQUFDLE9BQWUsRUFBRSxNQUFjO1FBQ2hELE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSxFQUFFLElBQUksRUFBRSxJQUFJLENBQUMsTUFBTSxDQUFDLE9BQU8sRUFBRSxNQUFNLENBQUMsRUFBRSxDQUFDO0lBQ2pFLENBQUM7SUFFRDs7T0FFRztJQUNJLE1BQU0sQ0FBQyxNQUFNLENBQUMsT0FBZSxFQUFFLE1BQWM7UUFDbEQsT0FBTyxTQUFTLE9BQU8sSUFBSSxNQUFNLEVBQUUsQ0FBQztJQUN0QyxDQUFDO0NBQ0Y7QUE5QkQsNENBOEJDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgQ2xvdWRBc3NlbWJseUVycm9yIH0gZnJvbSAnLi9wcml2YXRlL2Vycm9yJztcblxuLyoqXG4gKiBQYXJzZXIgZm9yIHRoZSBhcnRpZmFjdCBlbnZpcm9ubWVudCBmaWVsZC5cbiAqXG4gKiBBY2NvdW50IHZhbGlkYXRpb24gaXMgcmVsYXhlZCB0byBhbGxvdyBhY2NvdW50IGFsaWFzaW5nIGluIHRoZSBmdXR1cmUuXG4gKi9cbmNvbnN0IEFXU19FTlZfUkVHRVggPSAvYXdzXFw6XFwvXFwvKFthLXowLTlBLVpcXC1cXEBcXC5cXF9dKylcXC8oW2EtelxcLTAtOV0rKS87XG5cbi8qKlxuICogTW9kZWxzIGFuIEFXUyBleGVjdXRpb24gZW52aXJvbm1lbnQsIGZvciB1c2Ugd2l0aGluIHRoZSBDREsgdG9vbGtpdC5cbiAqL1xuZXhwb3J0IGludGVyZmFjZSBFbnZpcm9ubWVudCB7XG4gIC8qKlxuICAgKiBUaGUgZGlzcGxheSBuYW1lIG9mIHRoaXMgZW52aXJvbm1lbnQsIGluIHRoZSBmb3JtIGBhd3M6Ly88YWNjb3VudD4vPHJlZ2lvbj5gXG4gICAqXG4gICAqIFRoaXMgaXMgYWx3YXlzIG1hY2hpbmUtZ2VuZXJhdGVkLCBuZXZlciB1c2VyLXNldDogaXQgaXMgZWl0aGVyIHRoZVxuICAgKiBhcnRpZmFjdCdzIGBlbnZpcm9ubWVudGAgZmllbGQgKHdoaWNoIGhhcyB0aGlzIHNoYXBlKSBvciBmb3JtYXR0ZWQgZnJvbVxuICAgKiB0aGUgYWNjb3VudCBhbmQgcmVnaW9uIGJ5IGBFbnZpcm9ubWVudFV0aWxzLmZvcm1hdGAuXG4gICAqXG4gICAqIE5vdGUgdGhhdCB1bnRpbCB0aGUgZW52aXJvbm1lbnQgaGFzIGJlZW4gcmVzb2x2ZWQsIHRoZSBhY2NvdW50IGFuZCByZWdpb25cbiAgICogbWF5IHN0aWxsIGJlIHRoZSBgVU5LTk9XTl9BQ0NPVU5UYC9gVU5LTk9XTl9SRUdJT05gIHBsYWNlaG9sZGVycywgc28gdGhpc1xuICAgKiB2YWx1ZSBpcyBub3QgbmVjZXNzYXJpbHkgdXNhYmxlIGFzIGEgYGNka2AgY29tbWFuZCBsaW5lIGFyZ3VtZW50LlxuICAgKi9cbiAgcmVhZG9ubHkgbmFtZTogc3RyaW5nO1xuXG4gIC8qKiBUaGUgQVdTIGFjY291bnQgdGhpcyBlbnZpcm9ubWVudCBkZXBsb3lzIGludG8gKi9cbiAgcmVhZG9ubHkgYWNjb3VudDogc3RyaW5nO1xuXG4gIC8qKiBUaGUgQVdTIHJlZ2lvbiBuYW1lIHdoZXJlIHRoaXMgZW52aXJvbm1lbnQgZGVwbG95cyBpbnRvICovXG4gIHJlYWRvbmx5IHJlZ2lvbjogc3RyaW5nO1xufVxuXG5leHBvcnQgY29uc3QgVU5LTk9XTl9BQ0NPVU5UID0gJ3Vua25vd24tYWNjb3VudCc7XG5leHBvcnQgY29uc3QgVU5LTk9XTl9SRUdJT04gPSAndW5rbm93bi1yZWdpb24nO1xuXG5leHBvcnQgY2xhc3MgRW52aXJvbm1lbnRVdGlscyB7XG4gIHB1YmxpYyBzdGF0aWMgcGFyc2UoZW52aXJvbm1lbnQ6IHN0cmluZyk6IEVudmlyb25tZW50IHtcbiAgICBjb25zdCBlbnYgPSBBV1NfRU5WX1JFR0VYLmV4ZWMoZW52aXJvbm1lbnQpO1xuICAgIGlmICghZW52KSB7XG4gICAgICB0aHJvdyBuZXcgQ2xvdWRBc3NlbWJseUVycm9yKFxuICAgICAgICBgVW5hYmxlIHRvIHBhcnNlIGVudmlyb25tZW50IHNwZWNpZmljYXRpb24gXCIke2Vudmlyb25tZW50fVwiLiBgICtcbiAgICAgICAgJ0V4cGVjdGVkIGZvcm1hdDogYXdzOi8vYWNjb3VudC9yZWdpb24nKTtcbiAgICB9XG5cbiAgICBjb25zdCBbLCBhY2NvdW50LCByZWdpb25dID0gZW52O1xuICAgIGlmICghYWNjb3VudCB8fCAhcmVnaW9uKSB7XG4gICAgICB0aHJvdyBuZXcgQ2xvdWRBc3NlbWJseUVycm9yKGBJbnZhbGlkIGVudmlyb25tZW50IHNwZWNpZmljYXRpb246ICR7ZW52aXJvbm1lbnR9YCk7XG4gICAgfVxuXG4gICAgcmV0dXJuIHsgYWNjb3VudCwgcmVnaW9uLCBuYW1lOiBlbnZpcm9ubWVudCB9O1xuICB9XG5cbiAgLyoqXG4gICAqIEJ1aWxkIGFuIGVudmlyb25tZW50IG9iamVjdCBmcm9tIGFuIGFjY291bnQgYW5kIHJlZ2lvblxuICAgKi9cbiAgcHVibGljIHN0YXRpYyBtYWtlKGFjY291bnQ6IHN0cmluZywgcmVnaW9uOiBzdHJpbmcpOiBFbnZpcm9ubWVudCB7XG4gICAgcmV0dXJuIHsgYWNjb3VudCwgcmVnaW9uLCBuYW1lOiB0aGlzLmZvcm1hdChhY2NvdW50LCByZWdpb24pIH07XG4gIH1cblxuICAvKipcbiAgICogRm9ybWF0IGFuIGVudmlyb25tZW50IHN0cmluZyBmcm9tIGFuIGFjY291bnQgYW5kIHJlZ2lvblxuICAgKi9cbiAgcHVibGljIHN0YXRpYyBmb3JtYXQoYWNjb3VudDogc3RyaW5nLCByZWdpb246IHN0cmluZyk6IHN0cmluZyB7XG4gICAgcmV0dXJuIGBhd3M6Ly8ke2FjY291bnR9LyR7cmVnaW9ufWA7XG4gIH1cbn1cbiJdfQ==
|
package/lib/index.d.ts
CHANGED
|
@@ -21,3 +21,7 @@ export * from './environment';
|
|
|
21
21
|
export * from './bootstrap';
|
|
22
22
|
export * from './construct-tree';
|
|
23
23
|
export * from './template-ranges';
|
|
24
|
+
export * from './stack-trace';
|
|
25
|
+
export * from './validation/formatting';
|
|
26
|
+
export * from './validation/parsing';
|
|
27
|
+
export * from './validation/loading';
|
package/lib/index.js
CHANGED
|
@@ -37,4 +37,8 @@ __exportStar(require("./environment"), exports);
|
|
|
37
37
|
__exportStar(require("./bootstrap"), exports);
|
|
38
38
|
__exportStar(require("./construct-tree"), exports);
|
|
39
39
|
__exportStar(require("./template-ranges"), exports);
|
|
40
|
-
|
|
40
|
+
__exportStar(require("./stack-trace"), exports);
|
|
41
|
+
__exportStar(require("./validation/formatting"), exports);
|
|
42
|
+
__exportStar(require("./validation/parsing"), exports);
|
|
43
|
+
__exportStar(require("./validation/loading"), exports);
|
|
44
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJpbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsZ0RBQThCO0FBQzlCLGdEQUE4QjtBQUM5QiwwREFBd0M7QUFDeEMsK0RBQTZDO0FBQzdDLGdGQUE4RDtBQUM5RCwyREFBeUM7QUFDekMsZ0RBQThCO0FBQzlCLG9EQUFrQztBQUNsQyxtREFBaUM7QUFDakMsZ0NBQThCO0FBQzlCLHNFQUFvRDtBQUNwRCxzRUFBb0Q7QUFDcEQsa0VBQWdEO0FBQ2hELDZFQUEyRDtBQUMzRCwwREFBd0Q7QUFDeEQsbURBQWlDO0FBQ2pDLDJDQUF5QjtBQUN6Qiw2Q0FBMkI7QUFDM0IsaURBQStCO0FBQy9CLGdEQUE4QjtBQUM5Qiw4Q0FBNEI7QUFDNUIsbURBQWlDO0FBQ2pDLG9EQUFrQztBQUNsQyxnREFBOEI7QUFDOUIsMERBQXdDO0FBQ3hDLHVEQUFxQztBQUNyQyx1REFBcUMiLCJzb3VyY2VzQ29udGVudCI6WyJleHBvcnQgKiBmcm9tICcuL2NvbnRleHQvdnBjJztcbmV4cG9ydCAqIGZyb20gJy4vY29udGV4dC9hbWknO1xuZXhwb3J0ICogZnJvbSAnLi9jb250ZXh0L2xvYWQtYmFsYW5jZXInO1xuZXhwb3J0ICogZnJvbSAnLi9jb250ZXh0L2F2YWlsYWJpbGl0eS16b25lcyc7XG5leHBvcnQgKiBmcm9tICcuL2NvbnRleHQvZW5kcG9pbnQtc2VydmljZS1hdmFpbGFiaWxpdHktem9uZXMnO1xuZXhwb3J0ICogZnJvbSAnLi9jb250ZXh0L3NlY3VyaXR5LWdyb3VwJztcbmV4cG9ydCAqIGZyb20gJy4vY29udGV4dC9rZXknO1xuZXhwb3J0ICogZnJvbSAnLi9jb250ZXh0L2dlbmVyaWMnO1xuZXhwb3J0ICogZnJvbSAnLi9jbG91ZC1hcnRpZmFjdCc7XG5pbXBvcnQgJy4vY2xvdWQtYXJ0aWZhY3QtYXVnJztcbmV4cG9ydCAqIGZyb20gJy4vYXJ0aWZhY3RzL2Fzc2V0LW1hbmlmZXN0LWFydGlmYWN0JztcbmV4cG9ydCAqIGZyb20gJy4vYXJ0aWZhY3RzL2Nsb3VkZm9ybWF0aW9uLWFydGlmYWN0JztcbmV4cG9ydCAqIGZyb20gJy4vYXJ0aWZhY3RzL3RyZWUtY2xvdWQtYXJ0aWZhY3QnO1xuZXhwb3J0ICogZnJvbSAnLi9hcnRpZmFjdHMvbmVzdGVkLWNsb3VkLWFzc2VtYmx5LWFydGlmYWN0JztcbmltcG9ydCAnLi9hcnRpZmFjdHMvbmVzdGVkLWNsb3VkLWFzc2VtYmx5LWFydGlmYWN0LWF1Zyc7XG5leHBvcnQgKiBmcm9tICcuL2Nsb3VkLWFzc2VtYmx5JztcbmV4cG9ydCAqIGZyb20gJy4vYXNzZXRzJztcbmV4cG9ydCAqIGZyb20gJy4vbWV0YWRhdGEnO1xuZXhwb3J0ICogZnJvbSAnLi9wbGFjZWhvbGRlcnMnO1xuZXhwb3J0ICogZnJvbSAnLi9lbnZpcm9ubWVudCc7XG5leHBvcnQgKiBmcm9tICcuL2Jvb3RzdHJhcCc7XG5leHBvcnQgKiBmcm9tICcuL2NvbnN0cnVjdC10cmVlJztcbmV4cG9ydCAqIGZyb20gJy4vdGVtcGxhdGUtcmFuZ2VzJztcbmV4cG9ydCAqIGZyb20gJy4vc3RhY2stdHJhY2UnO1xuZXhwb3J0ICogZnJvbSAnLi92YWxpZGF0aW9uL2Zvcm1hdHRpbmcnO1xuZXhwb3J0ICogZnJvbSAnLi92YWxpZGF0aW9uL3BhcnNpbmcnO1xuZXhwb3J0ICogZnJvbSAnLi92YWxpZGF0aW9uL2xvYWRpbmcnO1xuIl19
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Functions for colorized output
|
|
3
|
+
*/
|
|
4
|
+
export declare abstract class Col {
|
|
5
|
+
static readonly RED = "31";
|
|
6
|
+
static readonly ORANGE = "38;5;208";
|
|
7
|
+
static readonly YELLOW = "33";
|
|
8
|
+
static readonly BLUE = "34";
|
|
9
|
+
static readonly BOLD = "1";
|
|
10
|
+
static readonly UNDERLINE = "4";
|
|
11
|
+
static readonly GREY = "90";
|
|
12
|
+
}
|
|
13
|
+
export declare abstract class Colorize {
|
|
14
|
+
static red(str: string): string;
|
|
15
|
+
static orange(str: string): string;
|
|
16
|
+
static yellow(str: string): string;
|
|
17
|
+
static blue(str: string): string;
|
|
18
|
+
static grey(str: string): string;
|
|
19
|
+
static bold(str: string): string;
|
|
20
|
+
static underline(str: string): string;
|
|
21
|
+
static colorize(col: string, str: string): string;
|
|
22
|
+
}
|
|
@@ -0,0 +1,47 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/**
|
|
3
|
+
* Functions for colorized output
|
|
4
|
+
*/
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.Colorize = exports.Col = void 0;
|
|
7
|
+
class Col {
|
|
8
|
+
static RED = '31';
|
|
9
|
+
static ORANGE = '38;5;208';
|
|
10
|
+
static YELLOW = '33';
|
|
11
|
+
static BLUE = '34';
|
|
12
|
+
static BOLD = '1';
|
|
13
|
+
static UNDERLINE = '4';
|
|
14
|
+
static GREY = '90';
|
|
15
|
+
}
|
|
16
|
+
exports.Col = Col;
|
|
17
|
+
class Colorize {
|
|
18
|
+
static red(str) {
|
|
19
|
+
return Colorize.colorize(Col.RED, str);
|
|
20
|
+
}
|
|
21
|
+
static orange(str) {
|
|
22
|
+
return Colorize.colorize(Col.ORANGE, str);
|
|
23
|
+
}
|
|
24
|
+
static yellow(str) {
|
|
25
|
+
return Colorize.colorize(Col.YELLOW, str);
|
|
26
|
+
}
|
|
27
|
+
static blue(str) {
|
|
28
|
+
return Colorize.colorize(Col.BLUE, str);
|
|
29
|
+
}
|
|
30
|
+
static grey(str) {
|
|
31
|
+
return Colorize.colorize(Col.GREY, str);
|
|
32
|
+
}
|
|
33
|
+
static bold(str) {
|
|
34
|
+
return Colorize.colorize(Col.BOLD, str);
|
|
35
|
+
}
|
|
36
|
+
static underline(str) {
|
|
37
|
+
return Colorize.colorize(Col.UNDERLINE, str);
|
|
38
|
+
}
|
|
39
|
+
static colorize(col, str) {
|
|
40
|
+
if (process.env.FORCE_COLOR === '0' || process.env.NO_COLOR || !process.stdout.isTTY || !process.stderr.isTTY) {
|
|
41
|
+
return str;
|
|
42
|
+
}
|
|
43
|
+
return `\x1b[${col}m${str}\x1b[0m`;
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
exports.Colorize = Colorize;
|
|
47
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29sb3IuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJjb2xvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7O0dBRUc7OztBQUVILE1BQXNCLEdBQUc7SUFDaEIsTUFBTSxDQUFVLEdBQUcsR0FBRyxJQUFJLENBQUM7SUFDM0IsTUFBTSxDQUFVLE1BQU0sR0FBRyxVQUFVLENBQUM7SUFDcEMsTUFBTSxDQUFVLE1BQU0sR0FBRyxJQUFJLENBQUM7SUFDOUIsTUFBTSxDQUFVLElBQUksR0FBRyxJQUFJLENBQUM7SUFDNUIsTUFBTSxDQUFVLElBQUksR0FBRyxHQUFHLENBQUM7SUFDM0IsTUFBTSxDQUFVLFNBQVMsR0FBRyxHQUFHLENBQUM7SUFDaEMsTUFBTSxDQUFVLElBQUksR0FBRyxJQUFJLENBQUM7O0FBUHJDLGtCQVFDO0FBRUQsTUFBc0IsUUFBUTtJQUNyQixNQUFNLENBQUMsR0FBRyxDQUFDLEdBQVc7UUFDM0IsT0FBTyxRQUFRLENBQUMsUUFBUSxDQUFDLEdBQUcsQ0FBQyxHQUFHLEVBQUUsR0FBRyxDQUFDLENBQUM7SUFDekMsQ0FBQztJQUVNLE1BQU0sQ0FBQyxNQUFNLENBQUMsR0FBVztRQUM5QixPQUFPLFFBQVEsQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFDLE1BQU0sRUFBRSxHQUFHLENBQUMsQ0FBQztJQUM1QyxDQUFDO0lBRU0sTUFBTSxDQUFDLE1BQU0sQ0FBQyxHQUFXO1FBQzlCLE9BQU8sUUFBUSxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsTUFBTSxFQUFFLEdBQUcsQ0FBQyxDQUFDO0lBQzVDLENBQUM7SUFFTSxNQUFNLENBQUMsSUFBSSxDQUFDLEdBQVc7UUFDNUIsT0FBTyxRQUFRLENBQUMsUUFBUSxDQUFDLEdBQUcsQ0FBQyxJQUFJLEVBQUUsR0FBRyxDQUFDLENBQUM7SUFDMUMsQ0FBQztJQUVNLE1BQU0sQ0FBQyxJQUFJLENBQUMsR0FBVztRQUM1QixPQUFPLFFBQVEsQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFDLElBQUksRUFBRSxHQUFHLENBQUMsQ0FBQztJQUMxQyxDQUFDO0lBRU0sTUFBTSxDQUFDLElBQUksQ0FBQyxHQUFXO1FBQzVCLE9BQU8sUUFBUSxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsSUFBSSxFQUFFLEdBQUcsQ0FBQyxDQUFDO0lBQzFDLENBQUM7SUFFTSxNQUFNLENBQUMsU0FBUyxDQUFDLEdBQVc7UUFDakMsT0FBTyxRQUFRLENBQUMsUUFBUSxDQUFDLEdBQUcsQ0FBQyxTQUFTLEVBQUUsR0FBRyxDQUFDLENBQUM7SUFDL0MsQ0FBQztJQUVNLE1BQU0sQ0FBQyxRQUFRLENBQUMsR0FBVyxFQUFFLEdBQVc7UUFDN0MsSUFBSSxPQUFPLENBQUMsR0FBRyxDQUFDLFdBQVcsS0FBSyxHQUFHLElBQUksT0FBTyxDQUFDLEdBQUcsQ0FBQyxRQUFRLElBQUksQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUFDLEtBQUssSUFBSSxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsS0FBSyxFQUFFLENBQUM7WUFDOUcsT0FBTyxHQUFHLENBQUM7UUFDYixDQUFDO1FBRUQsT0FBTyxRQUFRLEdBQUcsSUFBSSxHQUFHLFNBQVMsQ0FBQztJQUNyQyxDQUFDO0NBQ0Y7QUFwQ0QsNEJBb0NDIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiBGdW5jdGlvbnMgZm9yIGNvbG9yaXplZCBvdXRwdXRcbiAqL1xuXG5leHBvcnQgYWJzdHJhY3QgY2xhc3MgQ29sIHtcbiAgcHVibGljIHN0YXRpYyByZWFkb25seSBSRUQgPSAnMzEnO1xuICBwdWJsaWMgc3RhdGljIHJlYWRvbmx5IE9SQU5HRSA9ICczODs1OzIwOCc7XG4gIHB1YmxpYyBzdGF0aWMgcmVhZG9ubHkgWUVMTE9XID0gJzMzJztcbiAgcHVibGljIHN0YXRpYyByZWFkb25seSBCTFVFID0gJzM0JztcbiAgcHVibGljIHN0YXRpYyByZWFkb25seSBCT0xEID0gJzEnO1xuICBwdWJsaWMgc3RhdGljIHJlYWRvbmx5IFVOREVSTElORSA9ICc0JztcbiAgcHVibGljIHN0YXRpYyByZWFkb25seSBHUkVZID0gJzkwJztcbn1cblxuZXhwb3J0IGFic3RyYWN0IGNsYXNzIENvbG9yaXplIHtcbiAgcHVibGljIHN0YXRpYyByZWQoc3RyOiBzdHJpbmcpOiBzdHJpbmcge1xuICAgIHJldHVybiBDb2xvcml6ZS5jb2xvcml6ZShDb2wuUkVELCBzdHIpO1xuICB9XG5cbiAgcHVibGljIHN0YXRpYyBvcmFuZ2Uoc3RyOiBzdHJpbmcpOiBzdHJpbmcge1xuICAgIHJldHVybiBDb2xvcml6ZS5jb2xvcml6ZShDb2wuT1JBTkdFLCBzdHIpO1xuICB9XG5cbiAgcHVibGljIHN0YXRpYyB5ZWxsb3coc3RyOiBzdHJpbmcpOiBzdHJpbmcge1xuICAgIHJldHVybiBDb2xvcml6ZS5jb2xvcml6ZShDb2wuWUVMTE9XLCBzdHIpO1xuICB9XG5cbiAgcHVibGljIHN0YXRpYyBibHVlKHN0cjogc3RyaW5nKTogc3RyaW5nIHtcbiAgICByZXR1cm4gQ29sb3JpemUuY29sb3JpemUoQ29sLkJMVUUsIHN0cik7XG4gIH1cblxuICBwdWJsaWMgc3RhdGljIGdyZXkoc3RyOiBzdHJpbmcpOiBzdHJpbmcge1xuICAgIHJldHVybiBDb2xvcml6ZS5jb2xvcml6ZShDb2wuR1JFWSwgc3RyKTtcbiAgfVxuXG4gIHB1YmxpYyBzdGF0aWMgYm9sZChzdHI6IHN0cmluZyk6IHN0cmluZyB7XG4gICAgcmV0dXJuIENvbG9yaXplLmNvbG9yaXplKENvbC5CT0xELCBzdHIpO1xuICB9XG5cbiAgcHVibGljIHN0YXRpYyB1bmRlcmxpbmUoc3RyOiBzdHJpbmcpOiBzdHJpbmcge1xuICAgIHJldHVybiBDb2xvcml6ZS5jb2xvcml6ZShDb2wuVU5ERVJMSU5FLCBzdHIpO1xuICB9XG5cbiAgcHVibGljIHN0YXRpYyBjb2xvcml6ZShjb2w6IHN0cmluZywgc3RyOiBzdHJpbmcpOiBzdHJpbmcge1xuICAgIGlmIChwcm9jZXNzLmVudi5GT1JDRV9DT0xPUiA9PT0gJzAnIHx8IHByb2Nlc3MuZW52Lk5PX0NPTE9SIHx8ICFwcm9jZXNzLnN0ZG91dC5pc1RUWSB8fCAhcHJvY2Vzcy5zdGRlcnIuaXNUVFkpIHtcbiAgICAgIHJldHVybiBzdHI7XG4gICAgfVxuXG4gICAgcmV0dXJuIGBcXHgxYlske2NvbH1tJHtzdHJ9XFx4MWJbMG1gO1xuICB9XG59XG4iXX0=
|
|
@@ -0,0 +1,80 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Interface for a class that can determine whether a stack frame is interesting to the user or not.
|
|
3
|
+
*
|
|
4
|
+
* The input is a formatted stack frame, as produced by `captureCallStack` and
|
|
5
|
+
* `renderCallStackJustMyCode`. The output is a boolean indicating whether the
|
|
6
|
+
* frame is user code or not.
|
|
7
|
+
*/
|
|
8
|
+
export interface IStackFrameFinder {
|
|
9
|
+
isInterestingFrame(frame: string): boolean;
|
|
10
|
+
}
|
|
11
|
+
/**
|
|
12
|
+
* Recognize "actual" call frames by them containing ` (` and ending in `)`.
|
|
13
|
+
*
|
|
14
|
+
* The `node_modules` frames have already been masked away by
|
|
15
|
+
* `renderCallStackJustMyCode` during capture.
|
|
16
|
+
*/
|
|
17
|
+
export declare const DEFAULT_USER_CODE_FINDER: IStackFrameFinder;
|
|
18
|
+
export declare class StackTrace {
|
|
19
|
+
private readonly frames;
|
|
20
|
+
static fromNewlineSeparatedString(stackTrace: string): StackTrace;
|
|
21
|
+
constructor(frames: string[]);
|
|
22
|
+
/**
|
|
23
|
+
* Return the first user frame from a "Just My Code" call stack
|
|
24
|
+
*
|
|
25
|
+
* With all the NON-"my code" call frames redacted, the top level frame should
|
|
26
|
+
* be the last user frame that is associated with the given call stack.
|
|
27
|
+
*/
|
|
28
|
+
findAndParse(finder: IStackFrameFinder): StackFrame | undefined;
|
|
29
|
+
}
|
|
30
|
+
export declare class StackFrame {
|
|
31
|
+
/**
|
|
32
|
+
* Name of the function this call frame is in
|
|
33
|
+
*/
|
|
34
|
+
readonly functionName: string;
|
|
35
|
+
/**
|
|
36
|
+
* The file name this call frame is in
|
|
37
|
+
*/
|
|
38
|
+
readonly fileName: string;
|
|
39
|
+
/**
|
|
40
|
+
* The line and optionally column number this call frame is in
|
|
41
|
+
*
|
|
42
|
+
* Formatted as `<line> [':' <column>]`.
|
|
43
|
+
*/
|
|
44
|
+
readonly sourceLocation: string;
|
|
45
|
+
/**
|
|
46
|
+
* Parse a single line of a stack frame into a structured object
|
|
47
|
+
*
|
|
48
|
+
* This is mostly a NodeJS-flavored string we parse here, except that in
|
|
49
|
+
* a NodeJS stack trace the line would start with ` at `.
|
|
50
|
+
*
|
|
51
|
+
* Parses all of these:
|
|
52
|
+
*
|
|
53
|
+
* ```
|
|
54
|
+
* <function> (<file>:<line>:<col>)
|
|
55
|
+
* <class>.<function> (<file>:<line>:<col>)
|
|
56
|
+
* Object.<anonymous> (<file>:<line>:<col>)
|
|
57
|
+
* <function> [as somethingElse] (<file>:<line>:<col>)
|
|
58
|
+
* new <constructor> (<file>:<line>:<col>)
|
|
59
|
+
* <file>:<line>:<col>
|
|
60
|
+
* ```
|
|
61
|
+
*
|
|
62
|
+
* See https://v8.dev/docs/stack-trace-api#appendix%3A-stack-trace-format
|
|
63
|
+
*/
|
|
64
|
+
static parse(frame: string): StackFrame;
|
|
65
|
+
constructor(
|
|
66
|
+
/**
|
|
67
|
+
* Name of the function this call frame is in
|
|
68
|
+
*/
|
|
69
|
+
functionName: string,
|
|
70
|
+
/**
|
|
71
|
+
* The file name this call frame is in
|
|
72
|
+
*/
|
|
73
|
+
fileName: string,
|
|
74
|
+
/**
|
|
75
|
+
* The line and optionally column number this call frame is in
|
|
76
|
+
*
|
|
77
|
+
* Formatted as `<line> [':' <column>]`.
|
|
78
|
+
*/
|
|
79
|
+
sourceLocation: string);
|
|
80
|
+
}
|
|
@@ -0,0 +1,118 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.StackFrame = exports.StackTrace = exports.DEFAULT_USER_CODE_FINDER = void 0;
|
|
4
|
+
/**
|
|
5
|
+
* Recognize "actual" call frames by them containing ` (` and ending in `)`.
|
|
6
|
+
*
|
|
7
|
+
* The `node_modules` frames have already been masked away by
|
|
8
|
+
* `renderCallStackJustMyCode` during capture.
|
|
9
|
+
*/
|
|
10
|
+
exports.DEFAULT_USER_CODE_FINDER = {
|
|
11
|
+
isInterestingFrame(frame) {
|
|
12
|
+
return frame.includes(' (') && frame.endsWith(')');
|
|
13
|
+
},
|
|
14
|
+
};
|
|
15
|
+
class StackTrace {
|
|
16
|
+
frames;
|
|
17
|
+
static fromNewlineSeparatedString(stackTrace) {
|
|
18
|
+
return new StackTrace(stackTrace.split('\n'));
|
|
19
|
+
}
|
|
20
|
+
constructor(frames) {
|
|
21
|
+
this.frames = frames;
|
|
22
|
+
}
|
|
23
|
+
/**
|
|
24
|
+
* Return the first user frame from a "Just My Code" call stack
|
|
25
|
+
*
|
|
26
|
+
* With all the NON-"my code" call frames redacted, the top level frame should
|
|
27
|
+
* be the last user frame that is associated with the given call stack.
|
|
28
|
+
*/
|
|
29
|
+
findAndParse(finder) {
|
|
30
|
+
for (const frame of this.frames) {
|
|
31
|
+
if (finder.isInterestingFrame(frame)) {
|
|
32
|
+
return StackFrame.parse(frame);
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
return undefined;
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
exports.StackTrace = StackTrace;
|
|
39
|
+
class StackFrame {
|
|
40
|
+
functionName;
|
|
41
|
+
fileName;
|
|
42
|
+
sourceLocation;
|
|
43
|
+
/**
|
|
44
|
+
* Parse a single line of a stack frame into a structured object
|
|
45
|
+
*
|
|
46
|
+
* This is mostly a NodeJS-flavored string we parse here, except that in
|
|
47
|
+
* a NodeJS stack trace the line would start with ` at `.
|
|
48
|
+
*
|
|
49
|
+
* Parses all of these:
|
|
50
|
+
*
|
|
51
|
+
* ```
|
|
52
|
+
* <function> (<file>:<line>:<col>)
|
|
53
|
+
* <class>.<function> (<file>:<line>:<col>)
|
|
54
|
+
* Object.<anonymous> (<file>:<line>:<col>)
|
|
55
|
+
* <function> [as somethingElse] (<file>:<line>:<col>)
|
|
56
|
+
* new <constructor> (<file>:<line>:<col>)
|
|
57
|
+
* <file>:<line>:<col>
|
|
58
|
+
* ```
|
|
59
|
+
*
|
|
60
|
+
* See https://v8.dev/docs/stack-trace-api#appendix%3A-stack-trace-format
|
|
61
|
+
*/
|
|
62
|
+
static parse(frame) {
|
|
63
|
+
let fileName;
|
|
64
|
+
let functionName;
|
|
65
|
+
let sourceLocation;
|
|
66
|
+
// line = <function> (<source>) | <source>
|
|
67
|
+
const paren = frame.indexOf('(');
|
|
68
|
+
if (paren) {
|
|
69
|
+
functionName = frame.slice(0, paren - 1);
|
|
70
|
+
frame = frame.slice(paren + 1, -1);
|
|
71
|
+
}
|
|
72
|
+
else {
|
|
73
|
+
functionName = '<entry>';
|
|
74
|
+
}
|
|
75
|
+
// Object.<anonymous> looks confusing
|
|
76
|
+
if (functionName === 'Object.<anonymous>') {
|
|
77
|
+
functionName = '<anonymous>';
|
|
78
|
+
}
|
|
79
|
+
// Handle potential alias
|
|
80
|
+
let asI = functionName.indexOf(' [as ');
|
|
81
|
+
if (asI > -1) {
|
|
82
|
+
const endOfAlias = functionName.indexOf(']', asI);
|
|
83
|
+
const lastPeriod = functionName.lastIndexOf('.', asI);
|
|
84
|
+
functionName = functionName.slice(0, lastPeriod + 1) + functionName.slice(asI + 5, endOfAlias);
|
|
85
|
+
}
|
|
86
|
+
// line = <file>:<line>:<col>, but file can contain : as well.
|
|
87
|
+
// Grab at most 2 groups of only digits from the end of the string for source location
|
|
88
|
+
const m = frame.match(/(:[0-9]+){0,2}$/);
|
|
89
|
+
fileName = m ? frame.slice(0, -m[0].length) : frame;
|
|
90
|
+
sourceLocation = m ? m[0].slice(1) : '';
|
|
91
|
+
return {
|
|
92
|
+
fileName,
|
|
93
|
+
functionName,
|
|
94
|
+
sourceLocation,
|
|
95
|
+
};
|
|
96
|
+
}
|
|
97
|
+
constructor(
|
|
98
|
+
/**
|
|
99
|
+
* Name of the function this call frame is in
|
|
100
|
+
*/
|
|
101
|
+
functionName,
|
|
102
|
+
/**
|
|
103
|
+
* The file name this call frame is in
|
|
104
|
+
*/
|
|
105
|
+
fileName,
|
|
106
|
+
/**
|
|
107
|
+
* The line and optionally column number this call frame is in
|
|
108
|
+
*
|
|
109
|
+
* Formatted as `<line> [':' <column>]`.
|
|
110
|
+
*/
|
|
111
|
+
sourceLocation) {
|
|
112
|
+
this.functionName = functionName;
|
|
113
|
+
this.fileName = fileName;
|
|
114
|
+
this.sourceLocation = sourceLocation;
|
|
115
|
+
}
|
|
116
|
+
}
|
|
117
|
+
exports.StackFrame = StackFrame;
|
|
118
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"stack-trace.js","sourceRoot":"","sources":["stack-trace.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Interface for a class that can determine whether a stack frame is interesting to the user or not.\n *\n * The input is a formatted stack frame, as produced by `captureCallStack` and\n * `renderCallStackJustMyCode`. The output is a boolean indicating whether the\n * frame is user code or not.\n */\nexport interface IStackFrameFinder {\n  isInterestingFrame(frame: string): boolean;\n}\n\n/**\n * Recognize \"actual\" call frames by them containing ` (` and ending in `)`.\n *\n * The `node_modules` frames have already been masked away by\n * `renderCallStackJustMyCode` during capture.\n */\nexport const DEFAULT_USER_CODE_FINDER: IStackFrameFinder = {\n  isInterestingFrame(frame: string): boolean {\n    return frame.includes(' (') && frame.endsWith(')');\n  },\n};\n\nexport class StackTrace {\n  public static fromNewlineSeparatedString(stackTrace: string): StackTrace {\n    return new StackTrace(stackTrace.split('\\n'));\n  }\n\n  constructor(private readonly frames: string[]) {\n  }\n\n  /**\n   * Return the first user frame from a \"Just My Code\" call stack\n   *\n   * With all the NON-\"my code\" call frames redacted, the top level frame should\n   * be the last user frame that is associated with the given call stack.\n   */\n  public findAndParse(finder: IStackFrameFinder): StackFrame | undefined {\n    for (const frame of this.frames) {\n      if (finder.isInterestingFrame(frame)) {\n        return StackFrame.parse(frame);\n      }\n    }\n    return undefined;\n  }\n}\n\nexport class StackFrame {\n  /**\n   * Parse a single line of a stack frame into a structured object\n   *\n   * This is mostly a NodeJS-flavored string we parse here, except that in\n   * a NodeJS stack trace the line would start with `    at `.\n   *\n   * Parses all of these:\n   *\n   * ```\n   * <function> (<file>:<line>:<col>)\n   * <class>.<function> (<file>:<line>:<col>)\n   * Object.<anonymous> (<file>:<line>:<col>)\n   * <function> [as somethingElse] (<file>:<line>:<col>)\n   * new <constructor> (<file>:<line>:<col>)\n   * <file>:<line>:<col>\n   * ```\n   *\n   * See https://v8.dev/docs/stack-trace-api#appendix%3A-stack-trace-format\n   */\n  public static parse(frame: string): StackFrame {\n    let fileName;\n    let functionName;\n    let sourceLocation;\n\n    // line = <function> (<source>) | <source>\n    const paren = frame.indexOf('(');\n    if (paren) {\n      functionName = frame.slice(0, paren - 1);\n      frame = frame.slice(paren + 1, -1);\n    } else {\n      functionName = '<entry>';\n    }\n\n    // Object.<anonymous> looks confusing\n    if (functionName === 'Object.<anonymous>') {\n      functionName = '<anonymous>';\n    }\n\n    // Handle potential alias\n    let asI = functionName.indexOf(' [as ');\n    if (asI > -1) {\n      const endOfAlias = functionName.indexOf(']', asI);\n      const lastPeriod = functionName.lastIndexOf('.', asI);\n      functionName = functionName.slice(0, lastPeriod + 1) + functionName.slice(asI + 5, endOfAlias);\n    }\n\n    // line = <file>:<line>:<col>, but file can contain : as well.\n    // Grab at most 2 groups of only digits from the end of the string for source location\n    const m = frame.match(/(:[0-9]+){0,2}$/);\n\n    fileName = m ? frame.slice(0, -m[0].length) : frame;\n    sourceLocation = m ? m[0].slice(1) : '';\n\n    return {\n      fileName,\n      functionName,\n      sourceLocation,\n    };\n  }\n\n  constructor(\n    /**\n     * Name of the function this call frame is in\n     */\n    public readonly functionName: string,\n\n    /**\n     * The file name this call frame is in\n     */\n    public readonly fileName: string,\n\n    /**\n     * The line and optionally column number this call frame is in\n     *\n     * Formatted as `<line> [':' <column>]`.\n     */\n    public readonly sourceLocation: string,\n  ) {\n\n  }\n}\n\n"]}
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
import type { PluginReportJson } from '@aws-cdk/cloud-assembly-schema';
|
|
2
|
+
import type { IStackFrameFinder } from '../stack-trace';
|
|
3
|
+
export interface ValidationReportFormatterOptions {
|
|
4
|
+
/**
|
|
5
|
+
* Customize how to find the relevant stack frames in the source code for each violation.
|
|
6
|
+
*
|
|
7
|
+
* @default - Use the first stack frame that points to a source location
|
|
8
|
+
*/
|
|
9
|
+
readonly frameFinder?: IStackFrameFinder;
|
|
10
|
+
/**
|
|
11
|
+
* Customize how file locations are rendered in the output.
|
|
12
|
+
*
|
|
13
|
+
* @default - Render paths relative to cwd
|
|
14
|
+
*/
|
|
15
|
+
readonly fileLocationRenderer?: IFileLocationRenderer;
|
|
16
|
+
}
|
|
17
|
+
export declare class ValidationReportFormatter {
|
|
18
|
+
private readonly options;
|
|
19
|
+
private readonly fileLocationRenderer;
|
|
20
|
+
constructor(options: ValidationReportFormatterOptions);
|
|
21
|
+
formatReports(reports: PluginReportJson[]): string[];
|
|
22
|
+
private formatViolationBlock;
|
|
23
|
+
private sourceLocations;
|
|
24
|
+
private formatConstructInfo;
|
|
25
|
+
}
|
|
26
|
+
export declare function stripAnsi(x: string): string;
|
|
27
|
+
export interface IFileLocationRenderer {
|
|
28
|
+
renderAbsoluteFilePath(filePath: string): string;
|
|
29
|
+
}
|
|
30
|
+
export declare function relativeFileLocationRenderer(root: string): IFileLocationRenderer;
|
|
@@ -0,0 +1,187 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.ValidationReportFormatter = void 0;
|
|
7
|
+
exports.stripAnsi = stripAnsi;
|
|
8
|
+
exports.relativeFileLocationRenderer = relativeFileLocationRenderer;
|
|
9
|
+
/* eslint-disable @typescript-eslint/unbound-method */
|
|
10
|
+
/**
|
|
11
|
+
* Format validation results in a human-friendly way, with per-severity coloring and construct information.
|
|
12
|
+
*
|
|
13
|
+
* Same formatting is used for both the CLI and the CDK app.
|
|
14
|
+
*/
|
|
15
|
+
const path_1 = __importDefault(require("path"));
|
|
16
|
+
const color_1 = require("../private/color");
|
|
17
|
+
const stack_trace_1 = require("../stack-trace");
|
|
18
|
+
const parsing_1 = require("./parsing");
|
|
19
|
+
class ValidationReportFormatter {
|
|
20
|
+
options;
|
|
21
|
+
fileLocationRenderer;
|
|
22
|
+
constructor(options) {
|
|
23
|
+
this.options = options;
|
|
24
|
+
this.fileLocationRenderer = options.fileLocationRenderer ?? relativeFileLocationRenderer(process.cwd());
|
|
25
|
+
}
|
|
26
|
+
formatReports(reports) {
|
|
27
|
+
const successfullyExecutedPlugins = reports.filter((r) => isPluginFailure(r) === undefined);
|
|
28
|
+
const pluginFailures = reports.map(isPluginFailure).filter((e) => e !== undefined);
|
|
29
|
+
const violations = flattenViolations(successfullyExecutedPlugins);
|
|
30
|
+
violations.sort((a, b) => {
|
|
31
|
+
const aOrder = SEVERITY_ORDER[a.severity.toLowerCase()] ?? 4;
|
|
32
|
+
const bOrder = SEVERITY_ORDER[b.severity.toLowerCase()] ?? 4;
|
|
33
|
+
return aOrder - bOrder;
|
|
34
|
+
});
|
|
35
|
+
return [
|
|
36
|
+
...pluginFailures.map(formatPluginFailure),
|
|
37
|
+
...violations.map((v) => this.formatViolationBlock(v)),
|
|
38
|
+
];
|
|
39
|
+
}
|
|
40
|
+
formatViolationBlock(v) {
|
|
41
|
+
const lines = [];
|
|
42
|
+
const locations = this.sourceLocations(v.construct.stackTraces);
|
|
43
|
+
const maxTraces = 5;
|
|
44
|
+
let additional = false;
|
|
45
|
+
for (const location of locations.slice(0, maxTraces)) {
|
|
46
|
+
lines.push(`${additional ? 'or ' : ''}${color_1.Colorize.underline(sanitize(location))}`);
|
|
47
|
+
additional = true;
|
|
48
|
+
}
|
|
49
|
+
if (locations.length > maxTraces) {
|
|
50
|
+
lines.push(color_1.Colorize.grey(`(and ${locations.length - maxTraces} more...)`));
|
|
51
|
+
}
|
|
52
|
+
const pluginNs = (0, parsing_1.namespaceFromPluginName)(v.pluginName);
|
|
53
|
+
const parsed = (0, parsing_1.parseValidationId)(v.ruleName);
|
|
54
|
+
lines.push([
|
|
55
|
+
color_1.Colorize.bold(getSeverityColor(v.severity)(sanitize(v.severity))),
|
|
56
|
+
color_1.Colorize.bold(stripAckTag(sanitize(v.description))),
|
|
57
|
+
color_1.Colorize.grey(`(${sanitize(parsed.namespace ? (0, parsing_1.pluginNameFromNamespace)(parsed.namespace) : v.pluginName)})`),
|
|
58
|
+
].join(' '));
|
|
59
|
+
const constructInfo = this.formatConstructInfo(v.construct);
|
|
60
|
+
lines.push(` ${constructInfo}`);
|
|
61
|
+
if (v.suggestedFix) {
|
|
62
|
+
lines.push(` Suggested fix: ${sanitize(v.suggestedFix).replace(/\n/g, '\n ')}`);
|
|
63
|
+
}
|
|
64
|
+
const ackId = (0, parsing_1.normalizeValidationId)(v.ruleName, pluginNs);
|
|
65
|
+
if ((0, parsing_1.isSuppressibleViolation)(v)) {
|
|
66
|
+
lines.push(` ${color_1.Colorize.grey(`Acknowledge with '${sanitize(ackId)}'`)}`);
|
|
67
|
+
}
|
|
68
|
+
else {
|
|
69
|
+
// If not acknowledgeable, we should still show the rule name for reference.
|
|
70
|
+
lines.push(` ${color_1.Colorize.grey(`Rule ${sanitize(ackId)}`)}`);
|
|
71
|
+
}
|
|
72
|
+
return lines.join('\n');
|
|
73
|
+
}
|
|
74
|
+
sourceLocations(stackTraces) {
|
|
75
|
+
const ret = [];
|
|
76
|
+
for (const trace of stackTraces ?? []) {
|
|
77
|
+
const frame = stack_trace_1.StackTrace.fromNewlineSeparatedString(trace).findAndParse(this.options.frameFinder ?? stack_trace_1.DEFAULT_USER_CODE_FINDER);
|
|
78
|
+
if (frame && frame.fileName) {
|
|
79
|
+
const candidate = `${this.fileLocationRenderer.renderAbsoluteFilePath(frame.fileName)}:${frame.sourceLocation}`;
|
|
80
|
+
// No duplicates
|
|
81
|
+
if (!ret.includes(candidate)) {
|
|
82
|
+
ret.push(candidate);
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
return ret;
|
|
87
|
+
}
|
|
88
|
+
formatConstructInfo(construct) {
|
|
89
|
+
const parts = [];
|
|
90
|
+
const logicalId = sanitize(construct.cloudFormationResource?.logicalId);
|
|
91
|
+
if (construct.constructPath) {
|
|
92
|
+
const cPath = sanitize(construct.constructPath);
|
|
93
|
+
parts.push(logicalId ? `${color_1.Colorize.bold(cPath)} (${logicalId})` : color_1.Colorize.bold(cPath));
|
|
94
|
+
}
|
|
95
|
+
else {
|
|
96
|
+
// No construct information, show template path and logical ID
|
|
97
|
+
if (construct.cloudFormationResource?.templatePath) {
|
|
98
|
+
parts.push(this.fileLocationRenderer.renderAbsoluteFilePath(sanitize(construct.cloudFormationResource.templatePath)));
|
|
99
|
+
}
|
|
100
|
+
if (logicalId) {
|
|
101
|
+
parts.push(color_1.Colorize.bold(logicalId));
|
|
102
|
+
}
|
|
103
|
+
}
|
|
104
|
+
if (construct.constructFqn) {
|
|
105
|
+
parts.push(color_1.Colorize.grey(sanitize(construct.constructFqn)));
|
|
106
|
+
}
|
|
107
|
+
return parts.join(' ');
|
|
108
|
+
}
|
|
109
|
+
}
|
|
110
|
+
exports.ValidationReportFormatter = ValidationReportFormatter;
|
|
111
|
+
function flattenViolations(reports) {
|
|
112
|
+
return reports.flatMap((report) => {
|
|
113
|
+
const pluginName = report.pluginName;
|
|
114
|
+
return report.violations.flatMap((violation) => {
|
|
115
|
+
return violation.violatingConstructs.map((construct) => ({
|
|
116
|
+
severity: normalizeSeverity(violation.severity, violation.customSeverity),
|
|
117
|
+
description: violation.description,
|
|
118
|
+
ruleName: violation.ruleName,
|
|
119
|
+
pluginName,
|
|
120
|
+
construct,
|
|
121
|
+
suggestedFix: violation.suggestedFix,
|
|
122
|
+
ruleMetadata: violation.ruleMetadata,
|
|
123
|
+
}));
|
|
124
|
+
});
|
|
125
|
+
});
|
|
126
|
+
}
|
|
127
|
+
function normalizeSeverity(severity, customSeverity) {
|
|
128
|
+
switch (severity) {
|
|
129
|
+
case 'fatal':
|
|
130
|
+
case 'error':
|
|
131
|
+
case 'warning':
|
|
132
|
+
case 'info':
|
|
133
|
+
return severity.toUpperCase();
|
|
134
|
+
case 'custom':
|
|
135
|
+
return customSeverity ?? 'INFO';
|
|
136
|
+
}
|
|
137
|
+
}
|
|
138
|
+
function getSeverityColor(severity) {
|
|
139
|
+
switch (severity.toLowerCase()) {
|
|
140
|
+
case 'fatal': return color_1.Colorize.red;
|
|
141
|
+
case 'error': return color_1.Colorize.orange;
|
|
142
|
+
case 'warning': return color_1.Colorize.yellow;
|
|
143
|
+
default: return color_1.Colorize.blue;
|
|
144
|
+
}
|
|
145
|
+
}
|
|
146
|
+
function stripAckTag(description) {
|
|
147
|
+
return description.replace(/\s*\[ack:\s*[^\]]+\]\s*/g, '').trim();
|
|
148
|
+
}
|
|
149
|
+
function formatPluginFailure(f) {
|
|
150
|
+
return `${color_1.Colorize.orange('ERROR')} ${sanitize(f.error)}`;
|
|
151
|
+
}
|
|
152
|
+
// Matches C0 control chars (except \t and \n), DEL, and CSI (8-bit mode).
|
|
153
|
+
// Strips ANSI escape sequences, carriage returns, backspaces, BEL, and
|
|
154
|
+
// bidirectional overrides that could spoof terminal output.
|
|
155
|
+
const CONTROL_CHARS = /[\x00-\x08\x0B-\x1F\x7F\x9B]/g;
|
|
156
|
+
function sanitize(s) {
|
|
157
|
+
return (s ?? '').replace(CONTROL_CHARS, '�');
|
|
158
|
+
}
|
|
159
|
+
const SEVERITY_ORDER = {
|
|
160
|
+
fatal: 0,
|
|
161
|
+
error: 1,
|
|
162
|
+
warning: 2,
|
|
163
|
+
info: 3,
|
|
164
|
+
};
|
|
165
|
+
function isPluginFailure(r) {
|
|
166
|
+
if (r.conclusion === 'success' || r.violations.length > 0 || !r.metadata?.error) {
|
|
167
|
+
return undefined;
|
|
168
|
+
}
|
|
169
|
+
return { error: r.metadata.error };
|
|
170
|
+
}
|
|
171
|
+
function stripAnsi(x) {
|
|
172
|
+
const pattern = [
|
|
173
|
+
'[\\u001B\\u009B][[\\]()#;?]*(?:(?:(?:(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]+)*|[a-zA-Z\\d]+(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]*)*)?\\u0007)',
|
|
174
|
+
'(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-PR-TZcf-ntqry=><~]))',
|
|
175
|
+
].join('|');
|
|
176
|
+
const re = new RegExp(pattern, 'g');
|
|
177
|
+
return x.replaceAll(re, '');
|
|
178
|
+
}
|
|
179
|
+
function relativeFileLocationRenderer(root) {
|
|
180
|
+
return {
|
|
181
|
+
renderAbsoluteFilePath(absPath) {
|
|
182
|
+
const relPath = path_1.default.relative(root, absPath);
|
|
183
|
+
return relPath.length < absPath.length ? relPath : absPath;
|
|
184
|
+
},
|
|
185
|
+
};
|
|
186
|
+
}
|
|
187
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"formatting.js","sourceRoot":"","sources":["formatting.ts"],"names":[],"mappings":"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","sourcesContent":["/* eslint-disable @typescript-eslint/unbound-method */\n/**\n * Format validation results in a human-friendly way, with per-severity coloring and construct information.\n *\n * Same formatting is used for both the CLI and the CDK app.\n */\nimport path from 'path';\nimport type { PluginReportJson, PolicyViolationJson, PolicyViolationSeverity, ViolatingConstructJson } from '@aws-cdk/cloud-assembly-schema';\nimport { Colorize } from '../private/color';\nimport type { IStackFrameFinder } from '../stack-trace';\nimport { DEFAULT_USER_CODE_FINDER, StackTrace } from '../stack-trace';\nimport { isSuppressibleViolation, namespaceFromPluginName, normalizeValidationId, parseValidationId, pluginNameFromNamespace } from './parsing';\n\nexport interface ValidationReportFormatterOptions {\n  /**\n   * Customize how to find the relevant stack frames in the source code for each violation.\n   *\n   * @default - Use the first stack frame that points to a source location\n   */\n  readonly frameFinder?: IStackFrameFinder;\n\n  /**\n   * Customize how file locations are rendered in the output.\n   *\n   * @default - Render paths relative to cwd\n   */\n  readonly fileLocationRenderer?: IFileLocationRenderer;\n}\n\nexport class ValidationReportFormatter {\n  private readonly fileLocationRenderer: IFileLocationRenderer;\n\n  constructor(private readonly options: ValidationReportFormatterOptions) {\n    this.fileLocationRenderer = options.fileLocationRenderer ?? relativeFileLocationRenderer(process.cwd());\n  }\n\n  public formatReports(reports: PluginReportJson[]): string[] {\n    const successfullyExecutedPlugins = reports.filter((r) => isPluginFailure(r) === undefined);\n    const pluginFailures = reports.map(isPluginFailure).filter((e) => e !== undefined);\n\n    const violations = flattenViolations(successfullyExecutedPlugins);\n\n    violations.sort((a, b) => {\n      const aOrder = SEVERITY_ORDER[a.severity.toLowerCase()] ?? 4;\n      const bOrder = SEVERITY_ORDER[b.severity.toLowerCase()] ?? 4;\n      return aOrder - bOrder;\n    });\n\n    return [\n      ...pluginFailures.map(formatPluginFailure),\n      ...violations.map((v) => this.formatViolationBlock(v)),\n    ];\n  }\n\n  private formatViolationBlock(v: FlattenedViolation): string {\n    const lines: string[] = [];\n\n    const locations = this.sourceLocations(v.construct.stackTraces);\n\n    const maxTraces = 5;\n\n    let additional = false;\n    for (const location of locations.slice(0, maxTraces)) {\n      lines.push(`${additional ? 'or ' : ''}${Colorize.underline(sanitize(location))}`);\n      additional = true;\n    }\n    if (locations.length > maxTraces) {\n      lines.push(Colorize.grey(`(and ${locations.length - maxTraces} more...)`));\n    }\n\n    const pluginNs = namespaceFromPluginName(v.pluginName);\n    const parsed = parseValidationId(v.ruleName);\n\n    lines.push([\n      Colorize.bold(getSeverityColor(v.severity)(sanitize(v.severity))),\n      Colorize.bold(stripAckTag(sanitize(v.description))),\n      Colorize.grey(`(${sanitize(parsed.namespace ? pluginNameFromNamespace(parsed.namespace) : v.pluginName)})`),\n    ].join(' '));\n\n    const constructInfo = this.formatConstructInfo(v.construct);\n    lines.push(`   ${constructInfo}`);\n\n    if (v.suggestedFix) {\n      lines.push(`   Suggested fix: ${sanitize(v.suggestedFix).replace(/\\n/g, '\\n   ')}`);\n    }\n\n    const ackId = normalizeValidationId(v.ruleName, pluginNs);\n    if (isSuppressibleViolation(v)) {\n      lines.push(`   ${Colorize.grey(`Acknowledge with '${sanitize(ackId)}'`)}`);\n    } else {\n      // If not acknowledgeable, we should still show the rule name for reference.\n      lines.push(`   ${Colorize.grey(`Rule ${sanitize(ackId)}`)}`);\n    }\n\n    return lines.join('\\n');\n  }\n\n  private sourceLocations(stackTraces: string[] | undefined): string[] {\n    const ret: string[] = [];\n    for (const trace of stackTraces ?? []) {\n      const frame = StackTrace.fromNewlineSeparatedString(trace).findAndParse(this.options.frameFinder ?? DEFAULT_USER_CODE_FINDER);\n      if (frame && frame.fileName) {\n        const candidate = `${this.fileLocationRenderer.renderAbsoluteFilePath(frame.fileName)}:${frame.sourceLocation}`;\n\n        // No duplicates\n        if (!ret.includes(candidate)) {\n          ret.push(candidate);\n        }\n      }\n    }\n    return ret;\n  }\n\n  private formatConstructInfo(construct: ViolatingConstructJson): string {\n    const parts: string[] = [];\n    const logicalId = sanitize(construct.cloudFormationResource?.logicalId);\n\n    if (construct.constructPath) {\n      const cPath = sanitize(construct.constructPath);\n      parts.push(logicalId ? `${Colorize.bold(cPath)} (${logicalId})` : Colorize.bold(cPath));\n    } else {\n      // No construct information, show template path and logical ID\n      if (construct.cloudFormationResource?.templatePath) {\n        parts.push(this.fileLocationRenderer.renderAbsoluteFilePath(sanitize(construct.cloudFormationResource.templatePath)));\n      }\n      if (logicalId) {\n        parts.push(Colorize.bold(logicalId));\n      }\n    }\n\n    if (construct.constructFqn) {\n      parts.push(Colorize.grey(sanitize(construct.constructFqn)));\n    }\n\n    return parts.join(' ');\n  }\n}\n\nfunction flattenViolations(reports: PluginReportJson[]): FlattenedViolation[] {\n  return reports.flatMap((report) => {\n    const pluginName = report.pluginName;\n    return report.violations.flatMap((violation) => {\n      return violation.violatingConstructs.map((construct) => ({\n        severity: normalizeSeverity(violation.severity, violation.customSeverity),\n        description: violation.description,\n        ruleName: violation.ruleName,\n        pluginName,\n        construct,\n        suggestedFix: violation.suggestedFix,\n        ruleMetadata: violation.ruleMetadata,\n      }));\n    });\n  });\n}\n\nfunction normalizeSeverity(severity: PolicyViolationSeverity, customSeverity: string | undefined): string {\n  switch (severity) {\n    case 'fatal':\n    case 'error':\n    case 'warning':\n    case 'info':\n      return severity.toUpperCase();\n    case 'custom':\n      return customSeverity ?? 'INFO';\n  }\n}\n\nfunction getSeverityColor(severity: string): (str: string) => string {\n  switch (severity.toLowerCase()) {\n    case 'fatal': return Colorize.red;\n    case 'error': return Colorize.orange;\n    case 'warning': return Colorize.yellow;\n    default: return Colorize.blue;\n  }\n}\n\nfunction stripAckTag(description: string): string {\n  return description.replace(/\\s*\\[ack:\\s*[^\\]]+\\]\\s*/g, '').trim();\n}\n\nfunction formatPluginFailure(f: PluginError): string {\n  return `${Colorize.orange('ERROR')} ${sanitize(f.error)}`;\n}\n\n// Matches C0 control chars (except \\t and \\n), DEL, and CSI (8-bit mode).\n// Strips ANSI escape sequences, carriage returns, backspaces, BEL, and\n// bidirectional overrides that could spoof terminal output.\nconst CONTROL_CHARS = /[\\x00-\\x08\\x0B-\\x1F\\x7F\\x9B]/g;\nfunction sanitize(s: string | undefined): string {\n  return (s ?? '').replace(CONTROL_CHARS, '�');\n}\n\ntype FlattenedViolation =\n  & Pick<PluginReportJson, 'pluginName'>\n  & Pick<PolicyViolationJson, 'description' | 'ruleName' | 'suggestedFix' | 'ruleMetadata'>\n  & { severity: string; construct: ViolatingConstructJson };\n\nconst SEVERITY_ORDER: Record<string, number> = {\n  fatal: 0,\n  error: 1,\n  warning: 2,\n  info: 3,\n};\n\ninterface PluginError {\n  readonly error: string;\n}\n\nfunction isPluginFailure(r: PluginReportJson): PluginError | undefined {\n  if (r.conclusion === 'success' || r.violations.length > 0 || !r.metadata?.error) {\n    return undefined;\n  }\n  return { error: r.metadata.error };\n}\n\nexport function stripAnsi(x: string) {\n  const pattern = [\n    '[\\\\u001B\\\\u009B][[\\\\]()#;?]*(?:(?:(?:(?:;[-a-zA-Z\\\\d\\\\/#&.:=?%@~_]+)*|[a-zA-Z\\\\d]+(?:;[-a-zA-Z\\\\d\\\\/#&.:=?%@~_]*)*)?\\\\u0007)',\n    '(?:(?:\\\\d{1,4}(?:;\\\\d{0,4})*)?[\\\\dA-PR-TZcf-ntqry=><~]))',\n  ].join('|');\n\n  const re = new RegExp(pattern, 'g');\n  return x.replaceAll(re, '');\n}\n\nexport interface IFileLocationRenderer {\n  renderAbsoluteFilePath(filePath: string): string;\n}\n\nexport function relativeFileLocationRenderer(root: string): IFileLocationRenderer {\n  return {\n    renderAbsoluteFilePath(absPath: string): string {\n      const relPath = path.relative(root, absPath);\n      return relPath.length < absPath.length ? relPath : absPath;\n    },\n  };\n}\n"]}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import type * as cxschema from '@aws-cdk/cloud-assembly-schema';
|
|
2
|
+
import type { CloudFormationStackArtifact } from '../artifacts/cloudformation-artifact';
|
|
3
|
+
interface AssemblyLike {
|
|
4
|
+
readonly directory: string;
|
|
5
|
+
}
|
|
6
|
+
/**
|
|
7
|
+
* Return a validation report that contains the validation report that the CDK app has written, as well as any Construct Metadata annotations in the manifest.
|
|
8
|
+
*
|
|
9
|
+
* This function takes into account the CDK app can already have written the
|
|
10
|
+
* construct annotations into the validation report, or not, depending on the
|
|
11
|
+
* setting of a deprecated feature flag. If the annotations are already in the report,
|
|
12
|
+
* they are not copied.
|
|
13
|
+
*
|
|
14
|
+
* Afterwards, the list of violations is filtered to only include those that are relevant to the stacks selected for validation.
|
|
15
|
+
*
|
|
16
|
+
* Returns whether an explicit report file was found or not.
|
|
17
|
+
*/
|
|
18
|
+
export declare function loadUnifiedValidationReport(assembly: AssemblyLike, stacks: CloudFormationStackArtifact[]): Promise<cxschema.PluginReportJson[]>;
|
|
19
|
+
export {};
|
|
@@ -0,0 +1,192 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
+
var ownKeys = function(o) {
|
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
+
var ar = [];
|
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
+
return ar;
|
|
24
|
+
};
|
|
25
|
+
return ownKeys(o);
|
|
26
|
+
};
|
|
27
|
+
return function (mod) {
|
|
28
|
+
if (mod && mod.__esModule) return mod;
|
|
29
|
+
var result = {};
|
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
+
__setModuleDefault(result, mod);
|
|
32
|
+
return result;
|
|
33
|
+
};
|
|
34
|
+
})();
|
|
35
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
|
+
exports.loadUnifiedValidationReport = loadUnifiedValidationReport;
|
|
37
|
+
const fs_1 = require("fs");
|
|
38
|
+
const path = __importStar(require("path"));
|
|
39
|
+
const cloud_assembly_schema_1 = require("@aws-cdk/cloud-assembly-schema");
|
|
40
|
+
const metadata_1 = require("../metadata");
|
|
41
|
+
const parsing_1 = require("./parsing");
|
|
42
|
+
const VALIDATION_REPORT_FILE = 'validation-report.json';
|
|
43
|
+
/**
|
|
44
|
+
* Return a validation report that contains the validation report that the CDK app has written, as well as any Construct Metadata annotations in the manifest.
|
|
45
|
+
*
|
|
46
|
+
* This function takes into account the CDK app can already have written the
|
|
47
|
+
* construct annotations into the validation report, or not, depending on the
|
|
48
|
+
* setting of a deprecated feature flag. If the annotations are already in the report,
|
|
49
|
+
* they are not copied.
|
|
50
|
+
*
|
|
51
|
+
* Afterwards, the list of violations is filtered to only include those that are relevant to the stacks selected for validation.
|
|
52
|
+
*
|
|
53
|
+
* Returns whether an explicit report file was found or not.
|
|
54
|
+
*/
|
|
55
|
+
async function loadUnifiedValidationReport(assembly, stacks) {
|
|
56
|
+
const ret = [];
|
|
57
|
+
const reportPath = path.join(assembly.directory, VALIDATION_REPORT_FILE);
|
|
58
|
+
if (await pathExists(reportPath)) {
|
|
59
|
+
const selectedStackIds = new Set(stacks.map(stack => stack.hierarchicalId));
|
|
60
|
+
const report = cloud_assembly_schema_1.Manifest.loadValidationReport(reportPath);
|
|
61
|
+
// Filter the report to only include violations for the selected stacks
|
|
62
|
+
const filteredReports = filterReportsByStacks(report.pluginReports, selectedStackIds);
|
|
63
|
+
ret.push(...filteredReports);
|
|
64
|
+
}
|
|
65
|
+
const alreadyHasAnnotations = ret.some((r) => r.pluginName === parsing_1.ANNOTATION_PLUGIN_NAME);
|
|
66
|
+
if (!alreadyHasAnnotations) {
|
|
67
|
+
const annotationReport = pluginReportFromAnnotations(stacks);
|
|
68
|
+
if (annotationReport.violations.length > 0 || annotationReport.conclusion === 'failure') {
|
|
69
|
+
ret.push(annotationReport);
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
// Remove all inconsequential reports
|
|
73
|
+
return ret;
|
|
74
|
+
}
|
|
75
|
+
/**
|
|
76
|
+
* Report only violations that are in one of the given stacks
|
|
77
|
+
*/
|
|
78
|
+
function filterReportsByStacks(reports, selectedStackIds) {
|
|
79
|
+
const stackIds = Array.from(selectedStackIds);
|
|
80
|
+
return reports.map(filterReport);
|
|
81
|
+
function filterReport(report) {
|
|
82
|
+
// Filter the violations of this report down. In order to be backwards compatible with previously established behavior,
|
|
83
|
+
// if a violation has no constructs associated with it, we retain it. Otherwise, we remove it if it has no constructs left.
|
|
84
|
+
const violationsWithoutConstructs = new Set(report.violations.flatMap((v, i) => v.violatingConstructs.length === 0 ? [i] : []));
|
|
85
|
+
const filteredViolations = report
|
|
86
|
+
.violations.map(v => ({
|
|
87
|
+
...v,
|
|
88
|
+
violatingConstructs: v.violatingConstructs.filter(constructMatches),
|
|
89
|
+
})).filter((v, i) => v.violatingConstructs.length > 0 || violationsWithoutConstructs.has(i));
|
|
90
|
+
return {
|
|
91
|
+
...report,
|
|
92
|
+
violations: filteredViolations,
|
|
93
|
+
conclusion: filteredViolations.length > 0 ? report.conclusion : 'success',
|
|
94
|
+
};
|
|
95
|
+
}
|
|
96
|
+
function constructMatches(c) {
|
|
97
|
+
// If we don't have a construct path, we can't filter out this violation so we have to keep it.
|
|
98
|
+
return !c.constructPath || stackIds.some((stackId) => c.constructPath === stackId || c.constructPath?.startsWith(`${stackId}/`));
|
|
99
|
+
}
|
|
100
|
+
}
|
|
101
|
+
/**
|
|
102
|
+
* Collect annotation metadata (warnings and errors) from the construct tree
|
|
103
|
+
* and convert them into a NamedValidationPluginReport that can be merged
|
|
104
|
+
* into the same report pipeline as plugin violations.
|
|
105
|
+
*
|
|
106
|
+
* Effectively the same as what happens here:
|
|
107
|
+
* <https://github.com/aws/aws-cdk/blob/main/packages/aws-cdk-lib/core/lib/private/collect-annotation-report.ts>
|
|
108
|
+
*/
|
|
109
|
+
function pluginReportFromAnnotations(stacks) {
|
|
110
|
+
// The return type requires that we combine violations by rule, so we have to group them first here.
|
|
111
|
+
const ruleMap = new Map();
|
|
112
|
+
for (const stack of stacks) {
|
|
113
|
+
for (const entry of stack.messages) {
|
|
114
|
+
let severity;
|
|
115
|
+
switch (entry.level) {
|
|
116
|
+
case metadata_1.SynthesisMessageLevel.WARNING:
|
|
117
|
+
severity = 'warning';
|
|
118
|
+
break;
|
|
119
|
+
case metadata_1.SynthesisMessageLevel.ERROR:
|
|
120
|
+
severity = 'error';
|
|
121
|
+
break;
|
|
122
|
+
case metadata_1.SynthesisMessageLevel.INFO:
|
|
123
|
+
severity = 'info';
|
|
124
|
+
break;
|
|
125
|
+
}
|
|
126
|
+
const { message, ruleName } = splitDescriptionAndId(String(entry.entry.data));
|
|
127
|
+
const ruleKey = `${ruleName}|${severity}|${message}`;
|
|
128
|
+
let violation = ruleMap.get(ruleKey);
|
|
129
|
+
if (!violation) {
|
|
130
|
+
violation = {
|
|
131
|
+
ruleName: ruleName ?? `${severity}-annotation`,
|
|
132
|
+
description: message,
|
|
133
|
+
severity,
|
|
134
|
+
violatingConstructs: [],
|
|
135
|
+
ruleMetadata: {
|
|
136
|
+
'cdk:annotation': 'true',
|
|
137
|
+
},
|
|
138
|
+
};
|
|
139
|
+
ruleMap.set(ruleKey, violation);
|
|
140
|
+
}
|
|
141
|
+
violation.violatingConstructs.push({
|
|
142
|
+
constructPath: entry.id.replace(/^\//, ''), // remove leading slash
|
|
143
|
+
// TODO: see if this information can be obtained from tree.json
|
|
144
|
+
// cloudFormationResource
|
|
145
|
+
// constructFqn:
|
|
146
|
+
// libraryVersion
|
|
147
|
+
// TODO: see if we can get this from metadata stack traces. We may need to re-enable them for
|
|
148
|
+
// annotations in the core library. Otherwise we should probably get a stack trace to the resource itself.
|
|
149
|
+
// stackTraces
|
|
150
|
+
});
|
|
151
|
+
}
|
|
152
|
+
}
|
|
153
|
+
const violations = Array.from(ruleMap.values());
|
|
154
|
+
const hasErrors = violations.some(v => v.severity === 'error');
|
|
155
|
+
return {
|
|
156
|
+
pluginName: parsing_1.ANNOTATION_PLUGIN_NAME,
|
|
157
|
+
conclusion: hasErrors ? 'failure' : 'success',
|
|
158
|
+
violations,
|
|
159
|
+
};
|
|
160
|
+
}
|
|
161
|
+
/**
|
|
162
|
+
* Annotations have IDs in two places:
|
|
163
|
+
*
|
|
164
|
+
* - Warnings have `[ack:<id>]` in the message.
|
|
165
|
+
* - Errors have `(<namespace>::<id>)` in the message.
|
|
166
|
+
*
|
|
167
|
+
* Separate the rule name from the rest of the description.
|
|
168
|
+
*/
|
|
169
|
+
function splitDescriptionAndId(message) {
|
|
170
|
+
const ackMatch = message.match(/\[ack: ([^\]]+)\]/);
|
|
171
|
+
if (ackMatch) {
|
|
172
|
+
return { message: message.replace(ackMatch[0], '').trim(), ruleName: ackMatch[1] };
|
|
173
|
+
}
|
|
174
|
+
const idMatch = message.match(/\(([^()]+::[^()]+)\)$/);
|
|
175
|
+
if (idMatch) {
|
|
176
|
+
return { message: message.replace(idMatch[0], '').trim(), ruleName: idMatch[1] };
|
|
177
|
+
}
|
|
178
|
+
return { message };
|
|
179
|
+
}
|
|
180
|
+
async function pathExists(pathName) {
|
|
181
|
+
try {
|
|
182
|
+
await fs_1.promises.access(pathName);
|
|
183
|
+
return true;
|
|
184
|
+
}
|
|
185
|
+
catch (e) {
|
|
186
|
+
if (e.code !== 'ENOENT') {
|
|
187
|
+
throw e;
|
|
188
|
+
}
|
|
189
|
+
return false;
|
|
190
|
+
}
|
|
191
|
+
}
|
|
192
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"loading.js","sourceRoot":"","sources":["loading.ts"],"names":[],"mappings":"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","sourcesContent":["import { promises as fs } from 'fs';\nimport * as path from 'path';\nimport { Manifest } from '@aws-cdk/cloud-assembly-schema';\nimport type * as cxschema from '@aws-cdk/cloud-assembly-schema';\nimport type { CloudFormationStackArtifact } from '../artifacts/cloudformation-artifact';\nimport { SynthesisMessageLevel } from '../metadata';\nimport { ANNOTATION_PLUGIN_NAME } from './parsing';\n\nconst VALIDATION_REPORT_FILE = 'validation-report.json';\n\ninterface AssemblyLike {\n  readonly directory: string;\n}\n\n/**\n * Return a validation report that contains the validation report that the CDK app has written, as well as any Construct Metadata annotations in the manifest.\n *\n * This function takes into account the CDK app can already have written the\n * construct annotations into the validation report, or not, depending on the\n * setting of a deprecated feature flag. If the annotations are already in the report,\n * they are not copied.\n *\n * Afterwards, the list of violations is filtered to only include those that are relevant to the stacks selected for validation.\n *\n * Returns whether an explicit report file was found or not.\n */\nexport async function loadUnifiedValidationReport(\n  assembly: AssemblyLike,\n  stacks: CloudFormationStackArtifact[],\n): Promise<cxschema.PluginReportJson[]> {\n  const ret: cxschema.PluginReportJson[] = [];\n\n  const reportPath = path.join(assembly.directory, VALIDATION_REPORT_FILE);\n  if (await pathExists(reportPath)) {\n    const selectedStackIds = new Set(stacks.map(stack => stack.hierarchicalId));\n    const report = Manifest.loadValidationReport(reportPath);\n\n    // Filter the report to only include violations for the selected stacks\n    const filteredReports = filterReportsByStacks(report.pluginReports, selectedStackIds);\n    ret.push(...filteredReports);\n  }\n\n  const alreadyHasAnnotations = ret.some((r) => r.pluginName === ANNOTATION_PLUGIN_NAME);\n  if (!alreadyHasAnnotations) {\n    const annotationReport = pluginReportFromAnnotations(stacks);\n    if (annotationReport.violations.length > 0 || annotationReport.conclusion === 'failure') {\n      ret.push(annotationReport);\n    }\n  }\n\n  // Remove all inconsequential reports\n  return ret;\n}\n\n/**\n * Report only violations that are in one of the given stacks\n */\nfunction filterReportsByStacks(reports: cxschema.PluginReportJson[], selectedStackIds: Set<string>): cxschema.PluginReportJson[] {\n  const stackIds = Array.from(selectedStackIds);\n\n  return reports.map(filterReport);\n\n  function filterReport(report: cxschema.PluginReportJson): cxschema.PluginReportJson {\n    // Filter the violations of this report down. In order to be backwards compatible with previously established behavior,\n    // if a violation has no constructs associated with it, we retain it. Otherwise, we remove it if it has no constructs left.\n    const violationsWithoutConstructs = new Set(report.violations.flatMap((v, i) => v.violatingConstructs.length === 0 ? [i] : []));\n\n    const filteredViolations = report\n      .violations.map(v => ({\n        ...v,\n        violatingConstructs: v.violatingConstructs.filter(constructMatches),\n      })).filter((v, i) => v.violatingConstructs.length > 0 || violationsWithoutConstructs.has(i));\n\n    return {\n      ...report,\n      violations: filteredViolations,\n      conclusion: filteredViolations.length > 0 ? report.conclusion : ('success' as const),\n    };\n  }\n\n  function constructMatches(c: cxschema.ViolatingConstructJson) {\n    //  If we don't have a construct path, we can't filter out this violation so we have to keep it.\n    return !c.constructPath || stackIds.some((stackId) => c.constructPath === stackId || c.constructPath?.startsWith(`${stackId}/`));\n  }\n}\n\n/**\n * Collect annotation metadata (warnings and errors) from the construct tree\n * and convert them into a NamedValidationPluginReport that can be merged\n * into the same report pipeline as plugin violations.\n *\n * Effectively the same as what happens here:\n * <https://github.com/aws/aws-cdk/blob/main/packages/aws-cdk-lib/core/lib/private/collect-annotation-report.ts>\n */\nfunction pluginReportFromAnnotations(stacks: CloudFormationStackArtifact[]): cxschema.PluginReportJson {\n  // The return type requires that we combine violations by rule, so we have to group them first here.\n  const ruleMap = new Map<string, cxschema.PolicyViolationJson>();\n\n  for (const stack of stacks) {\n    for (const entry of stack.messages) {\n      let severity: cxschema.PolicyViolationSeverity | undefined;\n\n      switch (entry.level) {\n        case SynthesisMessageLevel.WARNING:\n          severity = 'warning';\n          break;\n        case SynthesisMessageLevel.ERROR:\n          severity = 'error';\n          break;\n        case SynthesisMessageLevel.INFO:\n          severity = 'info';\n          break;\n      }\n\n      const { message, ruleName } = splitDescriptionAndId(String(entry.entry.data));\n      const ruleKey = `${ruleName}|${severity}|${message}`;\n      let violation = ruleMap.get(ruleKey);\n      if (!violation) {\n        violation = {\n          ruleName: ruleName ?? `${severity}-annotation`,\n          description: message,\n          severity,\n          violatingConstructs: [],\n          ruleMetadata: {\n            'cdk:annotation': 'true',\n          },\n        };\n        ruleMap.set(ruleKey, violation);\n      }\n\n      violation.violatingConstructs.push({\n        constructPath: entry.id.replace(/^\\//, ''), // remove leading slash\n\n        // TODO: see if this information can be obtained from tree.json\n        // cloudFormationResource\n        // constructFqn:\n        // libraryVersion\n\n        // TODO: see if we can get this from metadata stack traces. We may need to re-enable them for\n        // annotations in the core library. Otherwise we should probably get a stack trace to the resource itself.\n        // stackTraces\n      });\n    }\n  }\n\n  const violations = Array.from(ruleMap.values());\n  const hasErrors = violations.some(v => v.severity === 'error');\n  return {\n    pluginName: ANNOTATION_PLUGIN_NAME,\n    conclusion: hasErrors ? 'failure' : 'success',\n    violations,\n  };\n}\n\n/**\n * Annotations have IDs in two places:\n *\n * - Warnings have `[ack:<id>]` in the message.\n * - Errors have `(<namespace>::<id>)` in the message.\n *\n * Separate the rule name from the rest of the description.\n */\nfunction splitDescriptionAndId(message: string): { message: string; ruleName?: string } {\n  const ackMatch = message.match(/\\[ack: ([^\\]]+)\\]/);\n  if (ackMatch) {\n    return { message: message.replace(ackMatch[0], '').trim(), ruleName: ackMatch[1] };\n  }\n\n  const idMatch = message.match(/\\(([^()]+::[^()]+)\\)$/);\n  if (idMatch) {\n    return { message: message.replace(idMatch[0], '').trim(), ruleName: idMatch[1] };\n  }\n\n  return { message };\n}\n\nasync function pathExists(pathName: string) {\n  try {\n    await fs.access(pathName);\n    return true;\n  } catch (e: any) {\n    if (e.code !== 'ENOENT') {\n      throw e;\n    }\n    return false;\n  }\n}\n"]}
|
|
@@ -0,0 +1,51 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Report whether it is possible to suppress this violation.
|
|
3
|
+
*
|
|
4
|
+
* Violations that are reported as "fatal", or that have been converted from annotations, cannot be suppressed.
|
|
5
|
+
*/
|
|
6
|
+
export declare function isSuppressibleViolation(violation: {
|
|
7
|
+
severity?: string;
|
|
8
|
+
ruleMetadata?: {
|
|
9
|
+
[key: string]: string;
|
|
10
|
+
};
|
|
11
|
+
}): boolean;
|
|
12
|
+
export interface ValidationId {
|
|
13
|
+
readonly namespace?: Namespace;
|
|
14
|
+
readonly ruleId: string;
|
|
15
|
+
}
|
|
16
|
+
/**
|
|
17
|
+
* Parse a validation ID into a namespace and rule name.
|
|
18
|
+
*
|
|
19
|
+
* `::` is used to separate the namespace from the rule name. If no namespace is provided, the `annotation` namespace is assumed.
|
|
20
|
+
*
|
|
21
|
+
* The rule name may not contain `::`, except between brackets.
|
|
22
|
+
*
|
|
23
|
+
* Right now, this parses and validates balanced brackets, because we assume the
|
|
24
|
+
* people who invent identifiers are not maniacs. If it turns out this causes
|
|
25
|
+
* too many problems, we can remove matching bracket validation and just check
|
|
26
|
+
* for whether any brackets are open, not necessarily whether they match.
|
|
27
|
+
*/
|
|
28
|
+
export declare function parseValidationId(id: string): ValidationId;
|
|
29
|
+
/**
|
|
30
|
+
* Normalize the given validation ID to a fully qualified ID, using the `annotation` namespace if no namespace is provided.
|
|
31
|
+
*/
|
|
32
|
+
export declare function normalizeValidationId(id: string | ValidationId, defaultNamespace: Namespace): string;
|
|
33
|
+
/**
|
|
34
|
+
* Normalize the given validation ID to a fully qualified ID, using the `Annotation` namespace if no namespace is provided.
|
|
35
|
+
*/
|
|
36
|
+
export declare function normalizeValidationIdForAnnotations(id: string | ValidationId): string;
|
|
37
|
+
declare const NS: unique symbol;
|
|
38
|
+
export interface Namespace {
|
|
39
|
+
[NS]: string;
|
|
40
|
+
}
|
|
41
|
+
/**
|
|
42
|
+
* Convert a plugin name to a namespace for validation IDs.
|
|
43
|
+
*/
|
|
44
|
+
export declare function namespaceFromPluginName(pluginName: string): Namespace;
|
|
45
|
+
/**
|
|
46
|
+
* Convert a namespace to a displayable plugin name
|
|
47
|
+
*/
|
|
48
|
+
export declare function pluginNameFromNamespace(namespace: Namespace): string;
|
|
49
|
+
export declare const ANNOTATION_PLUGIN_NAME = "Construct Annotations";
|
|
50
|
+
export declare const ANNOTATION_PLUGIN_NAMESPACE: Namespace;
|
|
51
|
+
export {};
|
|
@@ -0,0 +1,121 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.ANNOTATION_PLUGIN_NAMESPACE = exports.ANNOTATION_PLUGIN_NAME = void 0;
|
|
4
|
+
exports.isSuppressibleViolation = isSuppressibleViolation;
|
|
5
|
+
exports.parseValidationId = parseValidationId;
|
|
6
|
+
exports.normalizeValidationId = normalizeValidationId;
|
|
7
|
+
exports.normalizeValidationIdForAnnotations = normalizeValidationIdForAnnotations;
|
|
8
|
+
exports.namespaceFromPluginName = namespaceFromPluginName;
|
|
9
|
+
exports.pluginNameFromNamespace = pluginNameFromNamespace;
|
|
10
|
+
/**
|
|
11
|
+
* Report whether it is possible to suppress this violation.
|
|
12
|
+
*
|
|
13
|
+
* Violations that are reported as "fatal", or that have been converted from annotations, cannot be suppressed.
|
|
14
|
+
*/
|
|
15
|
+
function isSuppressibleViolation(violation) {
|
|
16
|
+
const isFatal = violation.severity?.toLowerCase() === 'fatal';
|
|
17
|
+
const isErrorAnnotation = violation.ruleMetadata?.['cdk:annotation'] && violation.severity?.toLowerCase() === 'error';
|
|
18
|
+
return !isFatal && !isErrorAnnotation;
|
|
19
|
+
}
|
|
20
|
+
/**
|
|
21
|
+
* Parse a validation ID into a namespace and rule name.
|
|
22
|
+
*
|
|
23
|
+
* `::` is used to separate the namespace from the rule name. If no namespace is provided, the `annotation` namespace is assumed.
|
|
24
|
+
*
|
|
25
|
+
* The rule name may not contain `::`, except between brackets.
|
|
26
|
+
*
|
|
27
|
+
* Right now, this parses and validates balanced brackets, because we assume the
|
|
28
|
+
* people who invent identifiers are not maniacs. If it turns out this causes
|
|
29
|
+
* too many problems, we can remove matching bracket validation and just check
|
|
30
|
+
* for whether any brackets are open, not necessarily whether they match.
|
|
31
|
+
*/
|
|
32
|
+
function parseValidationId(id) {
|
|
33
|
+
let nsSeparator = undefined;
|
|
34
|
+
// Parser loop
|
|
35
|
+
const braceStack = [];
|
|
36
|
+
for (let i = 0; i < id.length; i++) {
|
|
37
|
+
const c = id[i];
|
|
38
|
+
if (c === ':' && id[i + 1] === ':' && braceStack.length === 0) {
|
|
39
|
+
// Found a namespace separator
|
|
40
|
+
if (nsSeparator !== undefined) {
|
|
41
|
+
throw new Error(`Invalid validation rule ID '${id}'. The '::' delimiter is reserved for separating the prefix from the rule name (e.g. 'prefix::RuleName').`);
|
|
42
|
+
}
|
|
43
|
+
nsSeparator = i;
|
|
44
|
+
i += 1;
|
|
45
|
+
}
|
|
46
|
+
else if ([']', ')', '}'].includes(c)) {
|
|
47
|
+
// Found a closing brace, pop the stack
|
|
48
|
+
const lastBrace = braceStack.pop();
|
|
49
|
+
if (lastBrace === undefined) {
|
|
50
|
+
throw new Error(`Invalid validation rule ID '${id}'. Unmatched closing brace '${c}' at position ${i}.`);
|
|
51
|
+
}
|
|
52
|
+
if ((lastBrace === '(' && c !== ')') || (lastBrace === '[' && c !== ']') || (lastBrace === '{' && c !== '}')) {
|
|
53
|
+
throw new Error(`Invalid validation rule ID '${id}'. Mismatched closing brace '${c}' at position ${i}. Expected '${lastBrace === '(' ? ')' : lastBrace === '[' ? ']' : '}'}'.`);
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
else if (['[', '(', '{'].includes(c)) {
|
|
57
|
+
// Found an opening brace, push it onto the stack
|
|
58
|
+
braceStack.push(c);
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
// Handle result
|
|
62
|
+
if (nsSeparator === undefined) {
|
|
63
|
+
return { ruleId: id };
|
|
64
|
+
}
|
|
65
|
+
if (nsSeparator === 0) {
|
|
66
|
+
throw new Error(`Invalid validation rule ID '${id}'. Missing plugin name before '::'.`);
|
|
67
|
+
}
|
|
68
|
+
const namespace = namespaceFromString(id.substring(0, nsSeparator));
|
|
69
|
+
const ruleId = id.substring(nsSeparator + 2);
|
|
70
|
+
return { namespace, ruleId };
|
|
71
|
+
}
|
|
72
|
+
/**
|
|
73
|
+
* Normalize the given validation ID to a fully qualified ID, using the `annotation` namespace if no namespace is provided.
|
|
74
|
+
*/
|
|
75
|
+
function normalizeValidationId(id, defaultNamespace) {
|
|
76
|
+
const p = typeof id === 'string' ? parseValidationId(id) : id;
|
|
77
|
+
const parsed = {
|
|
78
|
+
namespace: p.namespace ? namespaceFromString(p.namespace[NS].replaceAll(/ /g, '-')) : undefined,
|
|
79
|
+
ruleId: p.ruleId.replaceAll(/ /g, '-'),
|
|
80
|
+
};
|
|
81
|
+
// Allow aliases for this namespace, but normalize it to the actual namespace we settled on.
|
|
82
|
+
if (parsed.namespace && ['annotation', 'Construct-Annotations'].includes(parsed.namespace[NS])) {
|
|
83
|
+
return `${exports.ANNOTATION_PLUGIN_NAMESPACE}::${parsed.ruleId}`;
|
|
84
|
+
}
|
|
85
|
+
return `${parsed.namespace ?? defaultNamespace[NS]}::${parsed.ruleId}`;
|
|
86
|
+
}
|
|
87
|
+
/**
|
|
88
|
+
* Normalize the given validation ID to a fully qualified ID, using the `Annotation` namespace if no namespace is provided.
|
|
89
|
+
*/
|
|
90
|
+
function normalizeValidationIdForAnnotations(id) {
|
|
91
|
+
return normalizeValidationId(id, exports.ANNOTATION_PLUGIN_NAMESPACE);
|
|
92
|
+
}
|
|
93
|
+
const NS = Symbol('namespace');
|
|
94
|
+
/**
|
|
95
|
+
* Convert a plugin name to a namespace for validation IDs.
|
|
96
|
+
*/
|
|
97
|
+
function namespaceFromPluginName(pluginName) {
|
|
98
|
+
if (pluginName === exports.ANNOTATION_PLUGIN_NAME) {
|
|
99
|
+
return exports.ANNOTATION_PLUGIN_NAMESPACE;
|
|
100
|
+
}
|
|
101
|
+
return namespaceFromString(pluginName.replace(/ /g, '-'));
|
|
102
|
+
}
|
|
103
|
+
function namespaceFromString(namespace) {
|
|
104
|
+
return Object.assign({
|
|
105
|
+
[NS]: namespace.replace(/ /g, '-'),
|
|
106
|
+
}, {
|
|
107
|
+
toString() {
|
|
108
|
+
return this[NS];
|
|
109
|
+
},
|
|
110
|
+
});
|
|
111
|
+
}
|
|
112
|
+
/**
|
|
113
|
+
* Convert a namespace to a displayable plugin name
|
|
114
|
+
*/
|
|
115
|
+
function pluginNameFromNamespace(namespace) {
|
|
116
|
+
// We do not convert the annotation namespace back to its legacy plugin name.
|
|
117
|
+
return namespace[NS].replace(/-/g, ' ');
|
|
118
|
+
}
|
|
119
|
+
exports.ANNOTATION_PLUGIN_NAME = 'Construct Annotations';
|
|
120
|
+
exports.ANNOTATION_PLUGIN_NAMESPACE = namespaceFromPluginName('Annotation');
|
|
121
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"parsing.js","sourceRoot":"","sources":["parsing.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Report whether it is possible to suppress this violation.\n *\n * Violations that are reported as \"fatal\", or that have been converted from annotations, cannot be suppressed.\n */\nexport function isSuppressibleViolation(violation: { severity?: string; ruleMetadata?: { [key: string]: string } }): boolean {\n  const isFatal = violation.severity?.toLowerCase() === 'fatal';\n  const isErrorAnnotation = violation.ruleMetadata?.['cdk:annotation'] && violation.severity?.toLowerCase() === 'error';\n  return !isFatal && !isErrorAnnotation;\n}\n\nexport interface ValidationId {\n  readonly namespace?: Namespace;\n  readonly ruleId: string;\n}\n\n/**\n * Parse a validation ID into a namespace and rule name.\n *\n * `::` is used to separate the namespace from the rule name. If no namespace is provided, the `annotation` namespace is assumed.\n *\n * The rule name may not contain `::`, except between brackets.\n *\n * Right now, this parses and validates balanced brackets, because we assume the\n * people who invent identifiers are not maniacs.  If it turns out this causes\n * too many problems, we can remove matching bracket validation and just check\n * for whether any brackets are open, not necessarily whether they match.\n */\nexport function parseValidationId(id: string): ValidationId {\n  let nsSeparator: undefined | number = undefined;\n\n  // Parser loop\n  const braceStack: string[] = [];\n  for (let i = 0; i < id.length; i++) {\n    const c = id[i];\n    if (c === ':' && id[i + 1] === ':' && braceStack.length === 0) {\n      // Found a namespace separator\n      if (nsSeparator !== undefined) {\n        throw new Error(`Invalid validation rule ID '${id}'. The '::' delimiter is reserved for separating the prefix from the rule name (e.g. 'prefix::RuleName').`);\n      }\n\n      nsSeparator = i;\n      i += 1;\n    } else if ([']', ')', '}'].includes(c)) {\n      // Found a closing brace, pop the stack\n      const lastBrace = braceStack.pop();\n      if (lastBrace === undefined) {\n        throw new Error(`Invalid validation rule ID '${id}'. Unmatched closing brace '${c}' at position ${i}.`);\n      }\n      if ((lastBrace === '(' && c !== ')') || (lastBrace === '[' && c !== ']') || (lastBrace === '{' && c !== '}')) {\n        throw new Error(`Invalid validation rule ID '${id}'. Mismatched closing brace '${c}' at position ${i}. Expected '${lastBrace === '(' ? ')' : lastBrace === '[' ? ']' : '}'}'.`);\n      }\n    } else if (['[', '(', '{'].includes(c)) {\n      // Found an opening brace, push it onto the stack\n      braceStack.push(c);\n    }\n  }\n\n  // Handle result\n  if (nsSeparator === undefined) {\n    return { ruleId: id };\n  }\n\n  if (nsSeparator === 0) {\n    throw new Error(`Invalid validation rule ID '${id}'. Missing plugin name before '::'.`);\n  }\n\n  const namespace = namespaceFromString(id.substring(0, nsSeparator));\n  const ruleId = id.substring(nsSeparator + 2);\n\n  return { namespace, ruleId };\n}\n\n/**\n * Normalize the given validation ID to a fully qualified ID, using the `annotation` namespace if no namespace is provided.\n */\nexport function normalizeValidationId(id: string | ValidationId, defaultNamespace: Namespace): string {\n  const p = typeof id === 'string' ? parseValidationId(id) : id;\n\n  const parsed = {\n    namespace: p.namespace ? namespaceFromString(p.namespace[NS].replaceAll(/ /g, '-')) : undefined,\n    ruleId: p.ruleId.replaceAll(/ /g, '-'),\n  };\n\n  // Allow aliases for this namespace, but normalize it to the actual namespace we settled on.\n  if (parsed.namespace && ['annotation', 'Construct-Annotations'].includes(parsed.namespace[NS])) {\n    return `${ANNOTATION_PLUGIN_NAMESPACE}::${parsed.ruleId}`;\n  }\n\n  return `${parsed.namespace ?? defaultNamespace[NS]}::${parsed.ruleId}`;\n}\n\n/**\n * Normalize the given validation ID to a fully qualified ID, using the `Annotation` namespace if no namespace is provided.\n */\nexport function normalizeValidationIdForAnnotations(id: string | ValidationId): string {\n  return normalizeValidationId(id, ANNOTATION_PLUGIN_NAMESPACE);\n}\n\nconst NS = Symbol('namespace');\n\nexport interface Namespace {\n  [NS]: string;\n}\n\n/**\n * Convert a plugin name to a namespace for validation IDs.\n */\nexport function namespaceFromPluginName(pluginName: string): Namespace {\n  if (pluginName === ANNOTATION_PLUGIN_NAME) {\n    return ANNOTATION_PLUGIN_NAMESPACE as Namespace;\n  }\n\n  return namespaceFromString(pluginName.replace(/ /g, '-'));\n}\n\nfunction namespaceFromString(namespace: string): Namespace {\n  return Object.assign({\n    [NS]: namespace.replace(/ /g, '-'),\n  }, {\n    toString(this: Namespace): string {\n      return this[NS];\n    },\n  });\n}\n\n/**\n * Convert a namespace to a displayable plugin name\n */\nexport function pluginNameFromNamespace(namespace: Namespace): string {\n  // We do not convert the annotation namespace back to its legacy plugin name.\n  return namespace[NS].replace(/-/g, ' ');\n}\n\nexport const ANNOTATION_PLUGIN_NAME = 'Construct Annotations';\nexport const ANNOTATION_PLUGIN_NAMESPACE = namespaceFromPluginName('Annotation');\n"]}
|
package/package.json
CHANGED
|
@@ -9,6 +9,8 @@
|
|
|
9
9
|
"scripts": {
|
|
10
10
|
"build": "projen build",
|
|
11
11
|
"bump": "projen bump",
|
|
12
|
+
"bump:next-version": "projen bump:next-version",
|
|
13
|
+
"bump:releasable-commits": "projen bump:releasable-commits",
|
|
12
14
|
"check-for-updates": "projen check-for-updates",
|
|
13
15
|
"check-licenses": "projen check-licenses",
|
|
14
16
|
"compile": "projen compile",
|
|
@@ -31,34 +33,34 @@
|
|
|
31
33
|
"organization": true
|
|
32
34
|
},
|
|
33
35
|
"devDependencies": {
|
|
34
|
-
"@aws-cdk/cloud-assembly-schema": "
|
|
35
|
-
"@cdklabs/eslint-plugin": "^2.0.
|
|
36
|
+
"@aws-cdk/cloud-assembly-schema": "55.0.0",
|
|
37
|
+
"@cdklabs/eslint-plugin": "^2.0.22",
|
|
36
38
|
"@stylistic/eslint-plugin": "^3",
|
|
37
39
|
"@types/jest": "^29.5.14",
|
|
38
40
|
"@types/json-source-map": "^0.6.0",
|
|
39
41
|
"@types/node": "^20",
|
|
40
42
|
"@typescript-eslint/eslint-plugin": "^8",
|
|
41
43
|
"@typescript-eslint/parser": "^8",
|
|
42
|
-
"commit-and-tag-version": "^
|
|
44
|
+
"commit-and-tag-version": "^13",
|
|
43
45
|
"constructs": "^10.0.0",
|
|
44
46
|
"eslint": "^9",
|
|
45
47
|
"eslint-config-prettier": "^10.1.8",
|
|
46
48
|
"eslint-import-resolver-typescript": "^4.4.5",
|
|
47
49
|
"eslint-plugin-import": "^2.32.0",
|
|
48
|
-
"eslint-plugin-jest": "^29.
|
|
50
|
+
"eslint-plugin-jest": "^29.16.6",
|
|
49
51
|
"eslint-plugin-jsdoc": "^62.9.0",
|
|
50
52
|
"eslint-plugin-prettier": "^4.2.5",
|
|
51
53
|
"jest": "^29.7.0",
|
|
52
54
|
"jest-junit": "^16",
|
|
53
55
|
"license-checker": "^25.0.1",
|
|
54
|
-
"nx": "^22.7.
|
|
56
|
+
"nx": "^22.7.12",
|
|
55
57
|
"prettier": "^2.8",
|
|
56
|
-
"projen": "^0.
|
|
57
|
-
"ts-jest": "^29.4.
|
|
58
|
+
"projen": "^0.103.27",
|
|
59
|
+
"ts-jest": "^29.4.14",
|
|
58
60
|
"typescript": "5.9"
|
|
59
61
|
},
|
|
60
62
|
"peerDependencies": {
|
|
61
|
-
"@aws-cdk/cloud-assembly-schema": ">=
|
|
63
|
+
"@aws-cdk/cloud-assembly-schema": ">=55.0.0"
|
|
62
64
|
},
|
|
63
65
|
"dependencies": {
|
|
64
66
|
"json-source-map": "^0.6.1",
|
|
@@ -85,8 +87,8 @@
|
|
|
85
87
|
"publishConfig": {
|
|
86
88
|
"access": "public"
|
|
87
89
|
},
|
|
88
|
-
"version": "2.
|
|
89
|
-
"packageManager": "yarn@4.
|
|
90
|
+
"version": "2.5.0",
|
|
91
|
+
"packageManager": "yarn@4.17.1",
|
|
90
92
|
"types": "lib/index.d.ts",
|
|
91
93
|
"//": "~~ Generated by projen. To modify, edit .projenrc.js and run \"yarn projen\"."
|
|
92
94
|
}
|