@aws-cdk/toolkit-lib 0.3.3 → 0.3.5
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/api-extractor.json +8 -2
- package/build-info.json +2 -2
- package/db.json.gz +0 -0
- package/lib/actions/bootstrap/private/helpers.js +3 -3
- package/lib/actions/diff/index.d.ts +2 -2
- package/lib/actions/diff/index.js +1 -1
- package/lib/actions/diff/private/helpers.js +8 -8
- package/lib/actions/refactor/index.d.ts +44 -0
- package/lib/actions/refactor/index.js +1 -1
- package/lib/api/aws-auth/awscli-compatible.d.ts +6 -5
- package/lib/api/aws-auth/awscli-compatible.js +2 -2
- package/lib/api/aws-auth/credential-plugins.d.ts +2 -2
- package/lib/api/aws-auth/credential-plugins.js +2 -2
- package/lib/api/aws-auth/provider-caching.d.ts +3 -3
- package/lib/api/aws-auth/provider-caching.js +1 -1
- package/lib/api/aws-auth/sdk-logger.d.ts +8 -2
- package/lib/api/aws-auth/sdk-logger.js +4 -4
- package/lib/api/aws-auth/sdk-provider.d.ts +4 -3
- package/lib/api/aws-auth/sdk-provider.js +2 -2
- package/lib/api/aws-auth/sdk.d.ts +7 -6
- package/lib/api/aws-auth/sdk.js +4 -4
- package/lib/api/aws-auth/tracing.d.ts +2 -2
- package/lib/api/aws-auth/tracing.js +1 -1
- package/lib/api/aws-auth/types.d.ts +3 -3
- package/lib/api/aws-auth/types.js +1 -1
- package/lib/api/bootstrap/bootstrap-environment.js +2 -2
- package/lib/api/bootstrap/bootstrap-template.yaml +12 -1
- package/lib/api/cloud-assembly/environment.js +1 -1
- package/lib/api/cloud-assembly/index.d.ts +2 -1
- package/lib/api/cloud-assembly/index.js +3 -2
- package/lib/api/cloud-assembly/private/context-aware-source.js +3 -3
- package/lib/api/cloud-assembly/private/exec.js +3 -3
- package/lib/api/cloud-assembly/private/prepare-source.js +4 -4
- package/lib/api/cloud-assembly/private/source-builder.d.ts +14 -12
- package/lib/api/cloud-assembly/private/source-builder.js +40 -23
- package/lib/api/cloud-assembly/private/stack-assembly.js +7 -7
- package/lib/api/cloud-assembly/source-builder.d.ts +19 -0
- package/lib/api/cloud-assembly/source-builder.js +1 -1
- package/lib/api/cloud-assembly/stack-collection.js +2 -2
- package/lib/api/cloudformation/evaluate-cloudformation-template.d.ts +1 -1
- package/lib/api/cloudformation/evaluate-cloudformation-template.js +2 -2
- package/lib/api/cloudformation/stack-helpers.js +2 -2
- package/lib/api/cloudformation/template-body-parameter.js +2 -2
- package/lib/api/context.js +2 -2
- package/lib/api/deployments/asset-publishing.js +2 -2
- package/lib/api/deployments/assets.js +5 -6
- package/lib/api/deployments/cfn-api.js +3 -3
- package/lib/api/deployments/checks.js +2 -2
- package/lib/api/deployments/deploy-stack.js +2 -2
- package/lib/api/deployments/deployment-result.js +2 -2
- package/lib/api/deployments/deployments.js +3 -3
- package/lib/api/diff/diff-formatter.js +2 -2
- package/lib/api/environment/environment-access.js +2 -2
- package/lib/api/environment/environment-resources.js +2 -2
- package/lib/api/environment/placeholders.js +1 -1
- package/lib/api/garbage-collection/garbage-collector.js +2 -2
- package/lib/api/garbage-collection/progress-printer.js +2 -2
- package/lib/api/garbage-collection/stack-refresh.js +2 -2
- package/lib/api/hotswap/appsync-mapping-templates.js +2 -2
- package/lib/api/hotswap/common.d.ts +2 -1
- package/lib/api/hotswap/common.js +9 -3
- package/lib/api/hotswap/ecs-services.js +3 -2
- package/lib/api/hotswap/hotswap-deployments.js +2 -2
- package/lib/api/hotswap/lambda-functions.js +2 -2
- package/lib/api/index.d.ts +0 -1
- package/lib/api/index.js +1 -2
- package/lib/api/io/private/index.d.ts +0 -1
- package/lib/api/io/private/index.js +1 -2
- package/lib/api/io/private/level-priority.js +1 -1
- package/lib/api/io/private/span.js +1 -1
- package/lib/api/logs-monitor/logs-monitor.js +2 -2
- package/lib/api/notices/cached-data-source.d.ts +13 -0
- package/lib/api/notices/cached-data-source.js +77 -0
- package/lib/api/notices/filter.d.ts +59 -0
- package/lib/api/notices/filter.js +189 -0
- package/lib/api/notices/index.d.ts +1 -0
- package/lib/api/{private.js → notices/index.js} +2 -2
- package/lib/api/notices/notices.d.ts +111 -0
- package/lib/api/notices/notices.js +131 -0
- package/lib/api/notices/types.d.ts +37 -0
- package/lib/api/notices/types.js +3 -0
- package/lib/api/notices/web-data-source.d.ts +9 -0
- package/lib/api/notices/web-data-source.js +70 -0
- package/lib/api/plugin/context-provider-plugin.js +1 -1
- package/lib/api/plugin/plugin.d.ts +4 -6
- package/lib/api/plugin/plugin.js +8 -13
- package/lib/api/refactoring/cloudformation.d.ts +23 -0
- package/lib/api/refactoring/cloudformation.js +54 -1
- package/lib/api/refactoring/exclude.d.ts +29 -0
- package/lib/api/refactoring/exclude.js +94 -0
- package/lib/api/refactoring/execution.d.ts +7 -0
- package/lib/api/refactoring/execution.js +43 -0
- package/lib/api/refactoring/index.d.ts +6 -23
- package/lib/api/refactoring/index.js +89 -60
- package/lib/api/resource-import/importer.js +2 -2
- package/lib/api/rwlock.js +2 -2
- package/lib/api/settings.js +2 -2
- package/lib/api/shared-private.js +31 -6186
- package/lib/api/toolkit-info.js +2 -2
- package/lib/api/work-graph/work-graph-builder.js +3 -3
- package/lib/api/work-graph/work-graph.js +2 -2
- package/lib/context-providers/ami.js +2 -2
- package/lib/context-providers/cc-api-provider.js +2 -2
- package/lib/context-providers/hosted-zones.js +2 -2
- package/lib/context-providers/index.js +4 -4
- package/lib/context-providers/keys.js +2 -2
- package/lib/context-providers/load-balancers.js +2 -2
- package/lib/context-providers/security-groups.js +2 -2
- package/lib/context-providers/ssm-parameters.js +2 -2
- package/lib/context-providers/vpcs.js +3 -3
- package/lib/index.d.ts +3 -1
- package/lib/index.js +4 -2
- package/lib/index_bg.wasm +0 -0
- package/lib/payloads/deploy.d.ts +8 -1
- package/lib/payloads/deploy.js +1 -1
- package/lib/payloads/hotswap.d.ts +1 -0
- package/lib/payloads/hotswap.js +1 -1
- package/lib/private/activity-printer/base.js +1 -1
- package/lib/toolkit/non-interactive-io-host.js +5 -4
- package/lib/toolkit/toolkit.d.ts +2 -2
- package/lib/toolkit/toolkit.js +82 -37
- package/lib/util/directories.js +2 -2
- package/lib/util/index.d.ts +1 -0
- package/lib/util/index.js +2 -1
- package/lib/util/json.js +1 -1
- package/lib/util/net.d.ts +9 -0
- package/lib/util/net.js +60 -0
- package/lib/util/objects.js +2 -2
- package/lib/util/types.js +1 -1
- package/lib/util/version-range.js +2 -2
- package/package.json +31 -31
- package/tsdoc.json +20 -0
- package/lib/api/io/private/sdk-logger.d.ts +0 -3
- package/lib/api/io/private/sdk-logger.js +0 -124
- package/lib/api/notices.d.ts +0 -210
- package/lib/api/notices.js +0 -430
- package/lib/api/private.d.ts +0 -1
- package/lib/api/shared-private.js.map +0 -7
- package/lib/api/shared-public.d.ts +0 -2139
- package/lib/api/shared-public.js +0 -3272
- package/lib/api/shared-public.js.map +0 -7
- package/lib/private/util.d.ts +0 -1
- package/lib/private/util.js +0 -787
- package/lib/private/util.js.map +0 -7
- /package/lib/{api → toolkit}/toolkit-error.d.ts +0 -0
- /package/lib/{api → toolkit}/toolkit-error.js +0 -0
|
@@ -0,0 +1,189 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.FilteredNotice = exports.NoticesFilter = void 0;
|
|
4
|
+
const semver = require("semver");
|
|
5
|
+
const private_1 = require("../io/private");
|
|
6
|
+
const tree_1 = require("../tree");
|
|
7
|
+
/**
|
|
8
|
+
* Normalizes the given components structure into DNF form
|
|
9
|
+
*/
|
|
10
|
+
function normalizeComponents(xs) {
|
|
11
|
+
return xs.map(x => Array.isArray(x) ? x : [x]);
|
|
12
|
+
}
|
|
13
|
+
function renderConjunction(xs) {
|
|
14
|
+
return xs.map(c => `${c.name}: ${c.version}`).join(' AND ');
|
|
15
|
+
}
|
|
16
|
+
class NoticesFilter {
|
|
17
|
+
ioMessages;
|
|
18
|
+
constructor(ioMessages) {
|
|
19
|
+
this.ioMessages = ioMessages;
|
|
20
|
+
}
|
|
21
|
+
filter(options) {
|
|
22
|
+
const components = [
|
|
23
|
+
...this.constructTreeComponents(options.outDir),
|
|
24
|
+
...this.otherComponents(options),
|
|
25
|
+
];
|
|
26
|
+
return this.findForNamedComponents(options.data, components);
|
|
27
|
+
}
|
|
28
|
+
/**
|
|
29
|
+
* From a set of input options, return the notices components we are searching for
|
|
30
|
+
*/
|
|
31
|
+
otherComponents(options) {
|
|
32
|
+
return [
|
|
33
|
+
// CLI
|
|
34
|
+
{
|
|
35
|
+
name: 'cli',
|
|
36
|
+
version: options.cliVersion,
|
|
37
|
+
},
|
|
38
|
+
// Node version
|
|
39
|
+
{
|
|
40
|
+
name: 'node',
|
|
41
|
+
version: process.version.replace(/^v/, ''), // remove the 'v' prefix.
|
|
42
|
+
dynamicName: 'node',
|
|
43
|
+
},
|
|
44
|
+
// Bootstrap environments
|
|
45
|
+
...options.bootstrappedEnvironments.flatMap(env => {
|
|
46
|
+
const semverBootstrapVersion = semver.coerce(env.bootstrapStackVersion);
|
|
47
|
+
if (!semverBootstrapVersion) {
|
|
48
|
+
// we don't throw because notices should never crash the cli.
|
|
49
|
+
this.ioMessages.warning(`While filtering notices, could not coerce bootstrap version '${env.bootstrapStackVersion}' into semver`);
|
|
50
|
+
return [];
|
|
51
|
+
}
|
|
52
|
+
return [{
|
|
53
|
+
name: 'bootstrap',
|
|
54
|
+
version: `${semverBootstrapVersion}`,
|
|
55
|
+
dynamicName: 'ENVIRONMENTS',
|
|
56
|
+
dynamicValue: env.environment.name,
|
|
57
|
+
}];
|
|
58
|
+
}),
|
|
59
|
+
];
|
|
60
|
+
}
|
|
61
|
+
/**
|
|
62
|
+
* Based on a set of component names, find all notices that match one of the given components
|
|
63
|
+
*/
|
|
64
|
+
findForNamedComponents(data, actualComponents) {
|
|
65
|
+
return data.flatMap(notice => {
|
|
66
|
+
const ors = this.resolveAliases(normalizeComponents(notice.components));
|
|
67
|
+
// Find the first set of the disjunctions of which all components match against the actual components.
|
|
68
|
+
// Return the actual components we found so that we can inject their dynamic values. A single filter
|
|
69
|
+
// component can match more than one actual component
|
|
70
|
+
for (const ands of ors) {
|
|
71
|
+
const matched = ands.map(affected => actualComponents.filter(actual => this.componentNameMatches(affected, actual) && semver.satisfies(actual.version, affected.version, { includePrerelease: true })));
|
|
72
|
+
// For every clause in the filter we matched one or more components
|
|
73
|
+
if (matched.every(xs => xs.length > 0)) {
|
|
74
|
+
const ret = new FilteredNotice(notice);
|
|
75
|
+
this.addDynamicValues(matched.flatMap(x => x), ret);
|
|
76
|
+
return [ret];
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
return [];
|
|
80
|
+
});
|
|
81
|
+
}
|
|
82
|
+
/**
|
|
83
|
+
* Whether the given "affected component" name applies to the given actual component name.
|
|
84
|
+
*
|
|
85
|
+
* The name matches if the name is exactly the same, or the name in the notice
|
|
86
|
+
* is a prefix of the node name when the query ends in '.'.
|
|
87
|
+
*/
|
|
88
|
+
componentNameMatches(pattern, actual) {
|
|
89
|
+
return pattern.name.endsWith('.') ? actual.name.startsWith(pattern.name) : pattern.name === actual.name;
|
|
90
|
+
}
|
|
91
|
+
/**
|
|
92
|
+
* Adds dynamic values from the given ActualComponents
|
|
93
|
+
*
|
|
94
|
+
* If there are multiple components with the same dynamic name, they are joined
|
|
95
|
+
* by a comma.
|
|
96
|
+
*/
|
|
97
|
+
addDynamicValues(comps, notice) {
|
|
98
|
+
const dynamicValues = {};
|
|
99
|
+
for (const comp of comps) {
|
|
100
|
+
if (comp.dynamicName) {
|
|
101
|
+
dynamicValues[comp.dynamicName] = dynamicValues[comp.dynamicName] ?? [];
|
|
102
|
+
dynamicValues[comp.dynamicName].push(comp.dynamicValue ?? comp.version);
|
|
103
|
+
}
|
|
104
|
+
}
|
|
105
|
+
for (const [key, values] of Object.entries(dynamicValues)) {
|
|
106
|
+
notice.addDynamicValue(key, values.join(','));
|
|
107
|
+
}
|
|
108
|
+
}
|
|
109
|
+
/**
|
|
110
|
+
* Treat 'framework' as an alias for either `aws-cdk-lib.` or `@aws-cdk/core.`.
|
|
111
|
+
*
|
|
112
|
+
* Because it's EITHER `aws-cdk-lib` or `@aws-cdk/core`, we need to add multiple
|
|
113
|
+
* arrays at the top level.
|
|
114
|
+
*/
|
|
115
|
+
resolveAliases(ors) {
|
|
116
|
+
return ors.flatMap(ands => {
|
|
117
|
+
const hasFramework = ands.find(c => c.name === 'framework');
|
|
118
|
+
if (!hasFramework) {
|
|
119
|
+
return [ands];
|
|
120
|
+
}
|
|
121
|
+
return [
|
|
122
|
+
ands.map(c => c.name === 'framework' ? { ...c, name: '@aws-cdk/core.' } : c),
|
|
123
|
+
ands.map(c => c.name === 'framework' ? { ...c, name: 'aws-cdk-lib.' } : c),
|
|
124
|
+
];
|
|
125
|
+
});
|
|
126
|
+
}
|
|
127
|
+
/**
|
|
128
|
+
* Load the construct tree from the given directory and return its components
|
|
129
|
+
*/
|
|
130
|
+
constructTreeComponents(manifestDir) {
|
|
131
|
+
const tree = (0, tree_1.loadTreeFromDir)(manifestDir, (msg) => void this.ioMessages.notify(private_1.IO.DEFAULT_ASSEMBLY_TRACE.msg(msg)));
|
|
132
|
+
if (!tree) {
|
|
133
|
+
return [];
|
|
134
|
+
}
|
|
135
|
+
const ret = [];
|
|
136
|
+
recurse(tree);
|
|
137
|
+
return ret;
|
|
138
|
+
function recurse(x) {
|
|
139
|
+
if (x.constructInfo?.fqn && x.constructInfo?.version) {
|
|
140
|
+
ret.push({
|
|
141
|
+
name: x.constructInfo?.fqn,
|
|
142
|
+
version: x.constructInfo?.version,
|
|
143
|
+
});
|
|
144
|
+
}
|
|
145
|
+
for (const child of Object.values(x.children ?? {})) {
|
|
146
|
+
recurse(child);
|
|
147
|
+
}
|
|
148
|
+
}
|
|
149
|
+
}
|
|
150
|
+
}
|
|
151
|
+
exports.NoticesFilter = NoticesFilter;
|
|
152
|
+
/**
|
|
153
|
+
* Notice after passing the filter. A filter can augment a notice with
|
|
154
|
+
* dynamic values as it has access to the dynamic matching data.
|
|
155
|
+
*/
|
|
156
|
+
class FilteredNotice {
|
|
157
|
+
notice;
|
|
158
|
+
dynamicValues = {};
|
|
159
|
+
constructor(notice) {
|
|
160
|
+
this.notice = notice;
|
|
161
|
+
}
|
|
162
|
+
addDynamicValue(key, value) {
|
|
163
|
+
this.dynamicValues[`{resolve:${key}}`] = value;
|
|
164
|
+
}
|
|
165
|
+
format() {
|
|
166
|
+
const componentsValue = normalizeComponents(this.notice.components).map(renderConjunction).join(', ');
|
|
167
|
+
return this.resolveDynamicValues([
|
|
168
|
+
`${this.notice.issueNumber}\t${this.notice.title}`,
|
|
169
|
+
this.formatOverview(),
|
|
170
|
+
`\tAffected versions: ${componentsValue}`,
|
|
171
|
+
`\tMore information at: https://github.com/aws/aws-cdk/issues/${this.notice.issueNumber}`,
|
|
172
|
+
].join('\n\n') + '\n');
|
|
173
|
+
}
|
|
174
|
+
formatOverview() {
|
|
175
|
+
const wrap = (s) => s.replace(/(?![^\n]{1,60}$)([^\n]{1,60})\s/g, '$1\n');
|
|
176
|
+
const heading = 'Overview: ';
|
|
177
|
+
const separator = `\n\t${' '.repeat(heading.length)}`;
|
|
178
|
+
const content = wrap(this.notice.overview)
|
|
179
|
+
.split('\n')
|
|
180
|
+
.join(separator);
|
|
181
|
+
return '\t' + heading + content;
|
|
182
|
+
}
|
|
183
|
+
resolveDynamicValues(input) {
|
|
184
|
+
const pattern = new RegExp(Object.keys(this.dynamicValues).join('|'), 'g');
|
|
185
|
+
return input.replace(pattern, (matched) => this.dynamicValues[matched] ?? matched);
|
|
186
|
+
}
|
|
187
|
+
}
|
|
188
|
+
exports.FilteredNotice = FilteredNotice;
|
|
189
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"filter.js","sourceRoot":"","sources":["filter.ts"],"names":[],"mappings":"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","sourcesContent":["import * as semver from 'semver';\nimport { IO, type IoDefaultMessages } from '../io/private';\nimport type { ConstructTreeNode } from '../tree';\nimport { loadTreeFromDir } from '../tree';\nimport type { BootstrappedEnvironment, Component, Notice } from './types';\n\n/**\n * Normalizes the given components structure into DNF form\n */\nfunction normalizeComponents(xs: Array<Component | Component[]>): Component[][] {\n  return xs.map(x => Array.isArray(x) ? x : [x]);\n}\n\nfunction renderConjunction(xs: Component[]): string {\n  return xs.map(c => `${c.name}: ${c.version}`).join(' AND ');\n}\n\ninterface ActualComponent {\n  /**\n   * Name of the component\n   */\n  readonly name: string;\n\n  /**\n   * Version of the component\n   */\n  readonly version: string;\n\n  /**\n   * If matched, under what name should it be added to the set of dynamic values\n   *\n   * These will be used to substitute placeholders in the message string, where\n   * placeholders look like `{resolve:XYZ}`.\n   *\n   * If there is more than one component with the same dynamic name, they are\n   * joined by ','.\n   *\n   * @default - Don't add to the set of dynamic values.\n   */\n  readonly dynamicName?: string;\n\n  /**\n   * If matched, what we should put in the set of dynamic values insstead of the version.\n   *\n   * Only used if `dynamicName` is set; by default we will add the actual version\n   * of the component.\n   *\n   * @default - The version.\n   */\n  readonly dynamicValue?: string;\n}\n\nexport interface NoticesFilterFilterOptions {\n  readonly data: Notice[];\n  readonly cliVersion: string;\n  readonly outDir: string;\n  readonly bootstrappedEnvironments: BootstrappedEnvironment[];\n}\n\nexport class NoticesFilter {\n  constructor(private readonly ioMessages: IoDefaultMessages) {\n  }\n\n  public filter(options: NoticesFilterFilterOptions): FilteredNotice[] {\n    const components = [\n      ...this.constructTreeComponents(options.outDir),\n      ...this.otherComponents(options),\n    ];\n\n    return this.findForNamedComponents(options.data, components);\n  }\n\n  /**\n   * From a set of input options, return the notices components we are searching for\n   */\n  private otherComponents(options: NoticesFilterFilterOptions): ActualComponent[] {\n    return [\n      // CLI\n      {\n        name: 'cli',\n        version: options.cliVersion,\n      },\n\n      // Node version\n      {\n        name: 'node',\n        version: process.version.replace(/^v/, ''), // remove the 'v' prefix.\n        dynamicName: 'node',\n      },\n\n      // Bootstrap environments\n      ...options.bootstrappedEnvironments.flatMap(env => {\n        const semverBootstrapVersion = semver.coerce(env.bootstrapStackVersion);\n        if (!semverBootstrapVersion) {\n          // we don't throw because notices should never crash the cli.\n          this.ioMessages.warning(`While filtering notices, could not coerce bootstrap version '${env.bootstrapStackVersion}' into semver`);\n          return [];\n        }\n\n        return [{\n          name: 'bootstrap',\n          version: `${semverBootstrapVersion}`,\n          dynamicName: 'ENVIRONMENTS',\n          dynamicValue: env.environment.name,\n        }];\n      }),\n    ];\n  }\n\n  /**\n   * Based on a set of component names, find all notices that match one of the given components\n   */\n  private findForNamedComponents(data: Notice[], actualComponents: ActualComponent[]): FilteredNotice[] {\n    return data.flatMap(notice => {\n      const ors = this.resolveAliases(normalizeComponents(notice.components));\n\n      // Find the first set of the disjunctions of which all components match against the actual components.\n      // Return the actual components we found so that we can inject their dynamic values. A single filter\n      // component can match more than one actual component\n      for (const ands of ors) {\n        const matched = ands.map(affected => actualComponents.filter(actual =>\n          this.componentNameMatches(affected, actual) && semver.satisfies(actual.version, affected.version, { includePrerelease: true })));\n\n        // For every clause in the filter we matched one or more components\n        if (matched.every(xs => xs.length > 0)) {\n          const ret = new FilteredNotice(notice);\n          this.addDynamicValues(matched.flatMap(x => x), ret);\n          return [ret];\n        }\n      }\n\n      return [];\n    });\n  }\n\n  /**\n   * Whether the given \"affected component\" name applies to the given actual component name.\n   *\n   * The name matches if the name is exactly the same, or the name in the notice\n   * is a prefix of the node name when the query ends in '.'.\n   */\n  private componentNameMatches(pattern: Component, actual: ActualComponent): boolean {\n    return pattern.name.endsWith('.') ? actual.name.startsWith(pattern.name) : pattern.name === actual.name;\n  }\n\n  /**\n   * Adds dynamic values from the given ActualComponents\n   *\n   * If there are multiple components with the same dynamic name, they are joined\n   * by a comma.\n   */\n  private addDynamicValues(comps: ActualComponent[], notice: FilteredNotice) {\n    const dynamicValues: Record<string, string[]> = {};\n    for (const comp of comps) {\n      if (comp.dynamicName) {\n        dynamicValues[comp.dynamicName] = dynamicValues[comp.dynamicName] ?? [];\n        dynamicValues[comp.dynamicName].push(comp.dynamicValue ?? comp.version);\n      }\n    }\n    for (const [key, values] of Object.entries(dynamicValues)) {\n      notice.addDynamicValue(key, values.join(','));\n    }\n  }\n\n  /**\n   * Treat 'framework' as an alias for either `aws-cdk-lib.` or `@aws-cdk/core.`.\n   *\n   * Because it's EITHER `aws-cdk-lib` or `@aws-cdk/core`, we need to add multiple\n   * arrays at the top level.\n   */\n  private resolveAliases(ors: Component[][]): Component[][] {\n    return ors.flatMap(ands => {\n      const hasFramework = ands.find(c => c.name === 'framework');\n      if (!hasFramework) {\n        return [ands];\n      }\n\n      return [\n        ands.map(c => c.name === 'framework' ? { ...c, name: '@aws-cdk/core.' } : c),\n        ands.map(c => c.name === 'framework' ? { ...c, name: 'aws-cdk-lib.' } : c),\n      ];\n    });\n  }\n\n  /**\n   * Load the construct tree from the given directory and return its components\n   */\n  private constructTreeComponents(manifestDir: string): ActualComponent[] {\n    const tree = loadTreeFromDir(manifestDir, (msg: string) => void this.ioMessages.notify(IO.DEFAULT_ASSEMBLY_TRACE.msg(msg)));\n    if (!tree) {\n      return [];\n    }\n\n    const ret: ActualComponent[] = [];\n    recurse(tree);\n    return ret;\n\n    function recurse(x: ConstructTreeNode) {\n      if (x.constructInfo?.fqn && x.constructInfo?.version) {\n        ret.push({\n          name: x.constructInfo?.fqn,\n          version: x.constructInfo?.version,\n        });\n      }\n\n      for (const child of Object.values(x.children ?? {})) {\n        recurse(child);\n      }\n    }\n  }\n}\n\n/**\n * Notice after passing the filter. A filter can augment a notice with\n * dynamic values as it has access to the dynamic matching data.\n */\nexport class FilteredNotice {\n  private readonly dynamicValues: { [key: string]: string } = {};\n\n  public constructor(public readonly notice: Notice) {\n  }\n\n  public addDynamicValue(key: string, value: string) {\n    this.dynamicValues[`{resolve:${key}}`] = value;\n  }\n\n  public format(): string {\n    const componentsValue = normalizeComponents(this.notice.components).map(renderConjunction).join(', ');\n    return this.resolveDynamicValues([\n      `${this.notice.issueNumber}\\t${this.notice.title}`,\n      this.formatOverview(),\n      `\\tAffected versions: ${componentsValue}`,\n      `\\tMore information at: https://github.com/aws/aws-cdk/issues/${this.notice.issueNumber}`,\n    ].join('\\n\\n') + '\\n');\n  }\n\n  private formatOverview() {\n    const wrap = (s: string) => s.replace(/(?![^\\n]{1,60}$)([^\\n]{1,60})\\s/g, '$1\\n');\n\n    const heading = 'Overview: ';\n    const separator = `\\n\\t${' '.repeat(heading.length)}`;\n    const content = wrap(this.notice.overview)\n      .split('\\n')\n      .join(separator);\n\n    return '\\t' + heading + content;\n  }\n\n  private resolveDynamicValues(input: string): string {\n    const pattern = new RegExp(Object.keys(this.dynamicValues).join('|'), 'g');\n    return input.replace(pattern, (matched) => this.dynamicValues[matched] ?? matched);\n  }\n}\n"]}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export * from './notices';
|
|
@@ -14,5 +14,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
14
14
|
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
15
|
};
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
-
__exportStar(require("./
|
|
18
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
17
|
+
__exportStar(require("./notices"), exports);
|
|
18
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJpbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsNENBQTBCIiwic291cmNlc0NvbnRlbnQiOlsiZXhwb3J0ICogZnJvbSAnLi9ub3RpY2VzJztcbiJdfQ==
|
|
@@ -0,0 +1,111 @@
|
|
|
1
|
+
import type { SdkHttpOptions } from '../aws-auth';
|
|
2
|
+
import type { Context } from '../context';
|
|
3
|
+
import type { IIoHost } from '../io';
|
|
4
|
+
import type { FilteredNotice } from './filter';
|
|
5
|
+
import type { BootstrappedEnvironment, NoticeDataSource } from './types';
|
|
6
|
+
export interface NoticesProps {
|
|
7
|
+
/**
|
|
8
|
+
* CDK context
|
|
9
|
+
*/
|
|
10
|
+
readonly context: Context;
|
|
11
|
+
/**
|
|
12
|
+
* Global CLI option for output directory for synthesized cloud assembly
|
|
13
|
+
*
|
|
14
|
+
* @default 'cdk.out'
|
|
15
|
+
*/
|
|
16
|
+
readonly output?: string;
|
|
17
|
+
/**
|
|
18
|
+
* Options for the HTTP request
|
|
19
|
+
*/
|
|
20
|
+
readonly httpOptions?: SdkHttpOptions;
|
|
21
|
+
/**
|
|
22
|
+
* Where messages are going to be sent
|
|
23
|
+
*/
|
|
24
|
+
readonly ioHost: IIoHost;
|
|
25
|
+
/**
|
|
26
|
+
* The version of the CLI
|
|
27
|
+
*/
|
|
28
|
+
readonly cliVersion: string;
|
|
29
|
+
}
|
|
30
|
+
export interface NoticesFilterOptions {
|
|
31
|
+
/**
|
|
32
|
+
* Include notices that have already been acknowledged.
|
|
33
|
+
*
|
|
34
|
+
* @default false
|
|
35
|
+
*/
|
|
36
|
+
readonly includeAcknowledged?: boolean;
|
|
37
|
+
}
|
|
38
|
+
export interface NoticesDisplayOptions extends NoticesFilterOptions {
|
|
39
|
+
/**
|
|
40
|
+
* Whether to append the total number of unacknowledged notices to the display.
|
|
41
|
+
*
|
|
42
|
+
* @default false
|
|
43
|
+
*/
|
|
44
|
+
readonly showTotal?: boolean;
|
|
45
|
+
}
|
|
46
|
+
export interface NoticesRefreshOptions {
|
|
47
|
+
/**
|
|
48
|
+
* Whether to force a cache refresh regardless of expiration time.
|
|
49
|
+
*
|
|
50
|
+
* @default false
|
|
51
|
+
*/
|
|
52
|
+
readonly force?: boolean;
|
|
53
|
+
/**
|
|
54
|
+
* Data source for fetch notices from.
|
|
55
|
+
*
|
|
56
|
+
* @default - WebsiteNoticeDataSource
|
|
57
|
+
*/
|
|
58
|
+
readonly dataSource?: NoticeDataSource;
|
|
59
|
+
}
|
|
60
|
+
/**
|
|
61
|
+
* Provides access to notices the CLI can display.
|
|
62
|
+
*/
|
|
63
|
+
export declare class Notices {
|
|
64
|
+
/**
|
|
65
|
+
* Create an instance. Note that this replaces the singleton.
|
|
66
|
+
*/
|
|
67
|
+
static create(props: NoticesProps): Notices;
|
|
68
|
+
/**
|
|
69
|
+
* Get the singleton instance. May return `undefined` if `create` has not been called.
|
|
70
|
+
*/
|
|
71
|
+
static get(): Notices | undefined;
|
|
72
|
+
private static _instance;
|
|
73
|
+
private readonly context;
|
|
74
|
+
private readonly output;
|
|
75
|
+
private readonly acknowledgedIssueNumbers;
|
|
76
|
+
private readonly httpOptions;
|
|
77
|
+
private readonly ioHelper;
|
|
78
|
+
private readonly ioMessages;
|
|
79
|
+
private readonly cliVersion;
|
|
80
|
+
private data;
|
|
81
|
+
private readonly bootstrappedEnvironments;
|
|
82
|
+
private constructor();
|
|
83
|
+
/**
|
|
84
|
+
* Add a bootstrap information to filter on. Can have multiple values
|
|
85
|
+
* in case of multi-environment deployments.
|
|
86
|
+
*/
|
|
87
|
+
addBootstrappedEnvironment(bootstrapped: BootstrappedEnvironment): void;
|
|
88
|
+
/**
|
|
89
|
+
* Refresh the list of notices this instance is aware of.
|
|
90
|
+
*
|
|
91
|
+
* This method throws an error if the data source fails to fetch notices.
|
|
92
|
+
* When using, consider if execution should halt immdiately or if catching the rror and continuing is more appropriate
|
|
93
|
+
*
|
|
94
|
+
* @throws on failure to refresh the data source
|
|
95
|
+
*/
|
|
96
|
+
refresh(options?: NoticesRefreshOptions): Promise<void>;
|
|
97
|
+
/**
|
|
98
|
+
* Filter the data sourece for relevant notices
|
|
99
|
+
*/
|
|
100
|
+
filter(options?: NoticesDisplayOptions): FilteredNotice[];
|
|
101
|
+
/**
|
|
102
|
+
* Display the relevant notices (unless context dictates we shouldn't).
|
|
103
|
+
*/
|
|
104
|
+
display(options?: NoticesDisplayOptions): Promise<void>;
|
|
105
|
+
/**
|
|
106
|
+
* List all notices available in the data source.
|
|
107
|
+
*
|
|
108
|
+
* @param includeAcknowlegded Whether to include acknowledged notices.
|
|
109
|
+
*/
|
|
110
|
+
private noticesFromData;
|
|
111
|
+
}
|
|
@@ -0,0 +1,131 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.Notices = void 0;
|
|
4
|
+
const path = require("path");
|
|
5
|
+
const util_1 = require("../../util");
|
|
6
|
+
const cached_data_source_1 = require("./cached-data-source");
|
|
7
|
+
const filter_1 = require("./filter");
|
|
8
|
+
const web_data_source_1 = require("./web-data-source");
|
|
9
|
+
const private_1 = require("../io/private");
|
|
10
|
+
const CACHE_FILE_PATH = path.join((0, util_1.cdkCacheDir)(), 'notices.json');
|
|
11
|
+
/**
|
|
12
|
+
* Provides access to notices the CLI can display.
|
|
13
|
+
*/
|
|
14
|
+
class Notices {
|
|
15
|
+
/**
|
|
16
|
+
* Create an instance. Note that this replaces the singleton.
|
|
17
|
+
*/
|
|
18
|
+
static create(props) {
|
|
19
|
+
this._instance = new Notices(props);
|
|
20
|
+
return this._instance;
|
|
21
|
+
}
|
|
22
|
+
/**
|
|
23
|
+
* Get the singleton instance. May return `undefined` if `create` has not been called.
|
|
24
|
+
*/
|
|
25
|
+
static get() {
|
|
26
|
+
return this._instance;
|
|
27
|
+
}
|
|
28
|
+
static _instance;
|
|
29
|
+
context;
|
|
30
|
+
output;
|
|
31
|
+
acknowledgedIssueNumbers;
|
|
32
|
+
httpOptions;
|
|
33
|
+
ioHelper;
|
|
34
|
+
ioMessages;
|
|
35
|
+
cliVersion;
|
|
36
|
+
data = new Set();
|
|
37
|
+
// sets don't deduplicate interfaces, so we use a map.
|
|
38
|
+
bootstrappedEnvironments = new Map();
|
|
39
|
+
constructor(props) {
|
|
40
|
+
this.context = props.context;
|
|
41
|
+
this.acknowledgedIssueNumbers = new Set(this.context.get('acknowledged-issue-numbers') ?? []);
|
|
42
|
+
this.output = props.output ?? 'cdk.out';
|
|
43
|
+
this.httpOptions = props.httpOptions ?? {};
|
|
44
|
+
this.ioHelper = (0, private_1.asIoHelper)(props.ioHost, 'notices' /* forcing a CliAction to a ToolkitAction */);
|
|
45
|
+
this.ioMessages = new private_1.IoDefaultMessages(this.ioHelper);
|
|
46
|
+
this.cliVersion = props.cliVersion;
|
|
47
|
+
}
|
|
48
|
+
/**
|
|
49
|
+
* Add a bootstrap information to filter on. Can have multiple values
|
|
50
|
+
* in case of multi-environment deployments.
|
|
51
|
+
*/
|
|
52
|
+
addBootstrappedEnvironment(bootstrapped) {
|
|
53
|
+
const key = [
|
|
54
|
+
bootstrapped.bootstrapStackVersion,
|
|
55
|
+
bootstrapped.environment.account,
|
|
56
|
+
bootstrapped.environment.region,
|
|
57
|
+
bootstrapped.environment.name,
|
|
58
|
+
].join(':');
|
|
59
|
+
this.bootstrappedEnvironments.set(key, bootstrapped);
|
|
60
|
+
}
|
|
61
|
+
/**
|
|
62
|
+
* Refresh the list of notices this instance is aware of.
|
|
63
|
+
*
|
|
64
|
+
* This method throws an error if the data source fails to fetch notices.
|
|
65
|
+
* When using, consider if execution should halt immdiately or if catching the rror and continuing is more appropriate
|
|
66
|
+
*
|
|
67
|
+
* @throws on failure to refresh the data source
|
|
68
|
+
*/
|
|
69
|
+
async refresh(options = {}) {
|
|
70
|
+
const innerDataSource = options.dataSource ?? new web_data_source_1.WebsiteNoticeDataSource(this.ioHelper, this.httpOptions);
|
|
71
|
+
const dataSource = new cached_data_source_1.CachedDataSource(this.ioMessages, CACHE_FILE_PATH, innerDataSource, options.force ?? false);
|
|
72
|
+
const notices = await dataSource.fetch();
|
|
73
|
+
this.data = new Set(notices);
|
|
74
|
+
}
|
|
75
|
+
/**
|
|
76
|
+
* Filter the data sourece for relevant notices
|
|
77
|
+
*/
|
|
78
|
+
filter(options = {}) {
|
|
79
|
+
return new filter_1.NoticesFilter(this.ioMessages).filter({
|
|
80
|
+
data: this.noticesFromData(options.includeAcknowledged ?? false),
|
|
81
|
+
cliVersion: this.cliVersion,
|
|
82
|
+
outDir: this.output,
|
|
83
|
+
bootstrappedEnvironments: Array.from(this.bootstrappedEnvironments.values()),
|
|
84
|
+
});
|
|
85
|
+
}
|
|
86
|
+
/**
|
|
87
|
+
* Display the relevant notices (unless context dictates we shouldn't).
|
|
88
|
+
*/
|
|
89
|
+
async display(options = {}) {
|
|
90
|
+
const filteredNotices = this.filter(options);
|
|
91
|
+
if (filteredNotices.length > 0) {
|
|
92
|
+
await this.ioHelper.notify(private_1.IO.CDK_TOOLKIT_I0100.msg([
|
|
93
|
+
'',
|
|
94
|
+
'NOTICES (What\'s this? https://github.com/aws/aws-cdk/wiki/CLI-Notices)',
|
|
95
|
+
'',
|
|
96
|
+
].join('\n')));
|
|
97
|
+
for (const filtered of filteredNotices) {
|
|
98
|
+
const formatted = filtered.format() + '\n';
|
|
99
|
+
switch (filtered.notice.severity) {
|
|
100
|
+
case 'warning':
|
|
101
|
+
await this.ioHelper.notify(private_1.IO.CDK_TOOLKIT_W0101.msg(formatted));
|
|
102
|
+
break;
|
|
103
|
+
case 'error':
|
|
104
|
+
await this.ioHelper.notify(private_1.IO.CDK_TOOLKIT_E0101.msg(formatted));
|
|
105
|
+
break;
|
|
106
|
+
default:
|
|
107
|
+
await this.ioHelper.notify(private_1.IO.CDK_TOOLKIT_I0101.msg(formatted));
|
|
108
|
+
break;
|
|
109
|
+
}
|
|
110
|
+
}
|
|
111
|
+
await this.ioHelper.notify(private_1.IO.CDK_TOOLKIT_I0100.msg(`If you don’t want to see a notice anymore, use "cdk acknowledge <id>". For example, "cdk acknowledge ${filteredNotices[0].notice.issueNumber}".`));
|
|
112
|
+
}
|
|
113
|
+
if (options.showTotal ?? false) {
|
|
114
|
+
await this.ioHelper.notify(private_1.IO.CDK_TOOLKIT_I0100.msg(`\nThere are ${filteredNotices.length} unacknowledged notice(s).`));
|
|
115
|
+
}
|
|
116
|
+
}
|
|
117
|
+
/**
|
|
118
|
+
* List all notices available in the data source.
|
|
119
|
+
*
|
|
120
|
+
* @param includeAcknowlegded Whether to include acknowledged notices.
|
|
121
|
+
*/
|
|
122
|
+
noticesFromData(includeAcknowlegded = false) {
|
|
123
|
+
const data = Array.from(this.data);
|
|
124
|
+
if (includeAcknowlegded) {
|
|
125
|
+
return data;
|
|
126
|
+
}
|
|
127
|
+
return data.filter(n => !this.acknowledgedIssueNumbers.has(n.issueNumber));
|
|
128
|
+
}
|
|
129
|
+
}
|
|
130
|
+
exports.Notices = Notices;
|
|
131
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"notices.js","sourceRoot":"","sources":["notices.ts"],"names":[],"mappings":"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","sourcesContent":["import * as path from 'path';\nimport { cdkCacheDir } from '../../util';\nimport type { SdkHttpOptions } from '../aws-auth';\nimport type { Context } from '../context';\nimport type { IIoHost } from '../io';\nimport { CachedDataSource } from './cached-data-source';\nimport type { FilteredNotice } from './filter';\nimport { NoticesFilter } from './filter';\nimport type { BootstrappedEnvironment, Notice, NoticeDataSource } from './types';\nimport { WebsiteNoticeDataSource } from './web-data-source';\nimport type { IoHelper } from '../io/private';\nimport { IO, asIoHelper, IoDefaultMessages } from '../io/private';\n\nconst CACHE_FILE_PATH = path.join(cdkCacheDir(), 'notices.json');\n\nexport interface NoticesProps {\n  /**\n   * CDK context\n   */\n  readonly context: Context;\n\n  /**\n   * Global CLI option for output directory for synthesized cloud assembly\n   *\n   * @default 'cdk.out'\n   */\n  readonly output?: string;\n\n  /**\n   * Options for the HTTP request\n   */\n  readonly httpOptions?: SdkHttpOptions;\n\n  /**\n   * Where messages are going to be sent\n   */\n  readonly ioHost: IIoHost;\n\n  /**\n   * The version of the CLI\n   */\n  readonly cliVersion: string;\n}\n\nexport interface NoticesFilterOptions {\n  /**\n   * Include notices that have already been acknowledged.\n   *\n   * @default false\n   */\n  readonly includeAcknowledged?: boolean;\n}\n\nexport interface NoticesDisplayOptions extends NoticesFilterOptions {\n  /**\n   * Whether to append the total number of unacknowledged notices to the display.\n   *\n   * @default false\n   */\n  readonly showTotal?: boolean;\n}\n\nexport interface NoticesRefreshOptions {\n  /**\n   * Whether to force a cache refresh regardless of expiration time.\n   *\n   * @default false\n   */\n  readonly force?: boolean;\n\n  /**\n   * Data source for fetch notices from.\n   *\n   * @default - WebsiteNoticeDataSource\n   */\n  readonly dataSource?: NoticeDataSource;\n}\n\n/**\n * Provides access to notices the CLI can display.\n */\nexport class Notices {\n  /**\n   * Create an instance. Note that this replaces the singleton.\n   */\n  public static create(props: NoticesProps): Notices {\n    this._instance = new Notices(props);\n    return this._instance;\n  }\n\n  /**\n   * Get the singleton instance. May return `undefined` if `create` has not been called.\n   */\n  public static get(): Notices | undefined {\n    return this._instance;\n  }\n\n  private static _instance: Notices | undefined;\n\n  private readonly context: Context;\n  private readonly output: string;\n  private readonly acknowledgedIssueNumbers: Set<Number>;\n  private readonly httpOptions: SdkHttpOptions;\n  private readonly ioHelper: IoHelper;\n  private readonly ioMessages: IoDefaultMessages;\n  private readonly cliVersion: string;\n\n  private data: Set<Notice> = new Set();\n\n  // sets don't deduplicate interfaces, so we use a map.\n  private readonly bootstrappedEnvironments: Map<string, BootstrappedEnvironment> = new Map();\n\n  private constructor(props: NoticesProps) {\n    this.context = props.context;\n    this.acknowledgedIssueNumbers = new Set(this.context.get('acknowledged-issue-numbers') ?? []);\n    this.output = props.output ?? 'cdk.out';\n    this.httpOptions = props.httpOptions ?? {};\n    this.ioHelper = asIoHelper(props.ioHost, 'notices' as any /* forcing a CliAction to a ToolkitAction */);\n    this.ioMessages = new IoDefaultMessages(this.ioHelper);\n    this.cliVersion = props.cliVersion;\n  }\n\n  /**\n   * Add a bootstrap information to filter on. Can have multiple values\n   * in case of multi-environment deployments.\n   */\n  public addBootstrappedEnvironment(bootstrapped: BootstrappedEnvironment) {\n    const key = [\n      bootstrapped.bootstrapStackVersion,\n      bootstrapped.environment.account,\n      bootstrapped.environment.region,\n      bootstrapped.environment.name,\n    ].join(':');\n    this.bootstrappedEnvironments.set(key, bootstrapped);\n  }\n\n  /**\n   * Refresh the list of notices this instance is aware of.\n   *\n   * This method throws an error if the data source fails to fetch notices.\n   * When using, consider if execution should halt immdiately or if catching the rror and continuing is more appropriate\n   *\n   * @throws on failure to refresh the data source\n   */\n  public async refresh(options: NoticesRefreshOptions = {}) {\n    const innerDataSource = options.dataSource ?? new WebsiteNoticeDataSource(this.ioHelper, this.httpOptions);\n    const dataSource = new CachedDataSource(this.ioMessages, CACHE_FILE_PATH, innerDataSource, options.force ?? false);\n    const notices = await dataSource.fetch();\n    this.data = new Set(notices);\n  }\n\n  /**\n   * Filter the data sourece for relevant notices\n   */\n  public filter(options: NoticesDisplayOptions = {}): FilteredNotice[] {\n    return new NoticesFilter(this.ioMessages).filter({\n      data: this.noticesFromData(options.includeAcknowledged ?? false),\n      cliVersion: this.cliVersion,\n      outDir: this.output,\n      bootstrappedEnvironments: Array.from(this.bootstrappedEnvironments.values()),\n    });\n  }\n\n  /**\n   * Display the relevant notices (unless context dictates we shouldn't).\n   */\n  public async display(options: NoticesDisplayOptions = {}): Promise<void> {\n    const filteredNotices = this.filter(options);\n\n    if (filteredNotices.length > 0) {\n      await this.ioHelper.notify(IO.CDK_TOOLKIT_I0100.msg([\n        '',\n        'NOTICES         (What\\'s this? https://github.com/aws/aws-cdk/wiki/CLI-Notices)',\n        '',\n      ].join('\\n')));\n      for (const filtered of filteredNotices) {\n        const formatted = filtered.format() + '\\n';\n        switch (filtered.notice.severity) {\n          case 'warning':\n            await this.ioHelper.notify(IO.CDK_TOOLKIT_W0101.msg(formatted));\n            break;\n          case 'error':\n            await this.ioHelper.notify(IO.CDK_TOOLKIT_E0101.msg(formatted));\n            break;\n          default:\n            await this.ioHelper.notify(IO.CDK_TOOLKIT_I0101.msg(formatted));\n            break;\n        }\n      }\n      await this.ioHelper.notify(IO.CDK_TOOLKIT_I0100.msg(\n        `If you don’t want to see a notice anymore, use \"cdk acknowledge <id>\". For example, \"cdk acknowledge ${filteredNotices[0].notice.issueNumber}\".`,\n      ));\n    }\n\n    if (options.showTotal ?? false) {\n      await this.ioHelper.notify(IO.CDK_TOOLKIT_I0100.msg(\n        `\\nThere are ${filteredNotices.length} unacknowledged notice(s).`,\n      ));\n    }\n  }\n\n  /**\n   * List all notices available in the data source.\n   *\n   * @param includeAcknowlegded Whether to include acknowledged notices.\n   */\n  private noticesFromData(includeAcknowlegded = false): Notice[] {\n    const data = Array.from(this.data);\n\n    if (includeAcknowlegded) {\n      return data;\n    }\n\n    return data.filter(n => !this.acknowledgedIssueNumbers.has(n.issueNumber));\n  }\n}\n\n"]}
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
import type { Environment } from '@aws-cdk/cx-api';
|
|
2
|
+
export interface Component {
|
|
3
|
+
name: string;
|
|
4
|
+
/**
|
|
5
|
+
* The range of affected versions
|
|
6
|
+
*/
|
|
7
|
+
version: string;
|
|
8
|
+
}
|
|
9
|
+
export interface Notice {
|
|
10
|
+
title: string;
|
|
11
|
+
issueNumber: number;
|
|
12
|
+
overview: string;
|
|
13
|
+
/**
|
|
14
|
+
* A set of affected components
|
|
15
|
+
*
|
|
16
|
+
* The canonical form of a list of components is in Disjunctive Normal Form
|
|
17
|
+
* (i.e., an OR of ANDs). This is the form when the list of components is a
|
|
18
|
+
* doubly nested array: the notice matches if all components of at least one
|
|
19
|
+
* of the top-level array matches.
|
|
20
|
+
*
|
|
21
|
+
* If the `components` is a single-level array, it is evaluated as an OR; it
|
|
22
|
+
* matches if any of the components matches.
|
|
23
|
+
*/
|
|
24
|
+
components: Array<Component | Component[]>;
|
|
25
|
+
schemaVersion: string;
|
|
26
|
+
severity?: string;
|
|
27
|
+
}
|
|
28
|
+
export interface NoticeDataSource {
|
|
29
|
+
fetch(): Promise<Notice[]>;
|
|
30
|
+
}
|
|
31
|
+
/**
|
|
32
|
+
* Information about a bootstrapped environment.
|
|
33
|
+
*/
|
|
34
|
+
export interface BootstrappedEnvironment {
|
|
35
|
+
readonly bootstrapStackVersion: number;
|
|
36
|
+
readonly environment: Environment;
|
|
37
|
+
}
|
|
@@ -0,0 +1,3 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJ0eXBlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHR5cGUgeyBFbnZpcm9ubWVudCB9IGZyb20gJ0Bhd3MtY2RrL2N4LWFwaSc7XG5cbmV4cG9ydCBpbnRlcmZhY2UgQ29tcG9uZW50IHtcbiAgbmFtZTogc3RyaW5nO1xuXG4gIC8qKlxuICAgKiBUaGUgcmFuZ2Ugb2YgYWZmZWN0ZWQgdmVyc2lvbnNcbiAgICovXG4gIHZlcnNpb246IHN0cmluZztcbn1cblxuZXhwb3J0IGludGVyZmFjZSBOb3RpY2Uge1xuICB0aXRsZTogc3RyaW5nO1xuICBpc3N1ZU51bWJlcjogbnVtYmVyO1xuICBvdmVydmlldzogc3RyaW5nO1xuICAvKipcbiAgICogQSBzZXQgb2YgYWZmZWN0ZWQgY29tcG9uZW50c1xuICAgKlxuICAgKiBUaGUgY2Fub25pY2FsIGZvcm0gb2YgYSBsaXN0IG9mIGNvbXBvbmVudHMgaXMgaW4gRGlzanVuY3RpdmUgTm9ybWFsIEZvcm1cbiAgICogKGkuZS4sIGFuIE9SIG9mIEFORHMpLiBUaGlzIGlzIHRoZSBmb3JtIHdoZW4gdGhlIGxpc3Qgb2YgY29tcG9uZW50cyBpcyBhXG4gICAqIGRvdWJseSBuZXN0ZWQgYXJyYXk6IHRoZSBub3RpY2UgbWF0Y2hlcyBpZiBhbGwgY29tcG9uZW50cyBvZiBhdCBsZWFzdCBvbmVcbiAgICogb2YgdGhlIHRvcC1sZXZlbCBhcnJheSBtYXRjaGVzLlxuICAgKlxuICAgKiBJZiB0aGUgYGNvbXBvbmVudHNgIGlzIGEgc2luZ2xlLWxldmVsIGFycmF5LCBpdCBpcyBldmFsdWF0ZWQgYXMgYW4gT1I7IGl0XG4gICAqIG1hdGNoZXMgaWYgYW55IG9mIHRoZSBjb21wb25lbnRzIG1hdGNoZXMuXG4gICAqL1xuICBjb21wb25lbnRzOiBBcnJheTxDb21wb25lbnQgfCBDb21wb25lbnRbXT47XG4gIHNjaGVtYVZlcnNpb246IHN0cmluZztcbiAgc2V2ZXJpdHk/OiBzdHJpbmc7XG59XG5cbmV4cG9ydCBpbnRlcmZhY2UgTm90aWNlRGF0YVNvdXJjZSB7XG4gIGZldGNoKCk6IFByb21pc2U8Tm90aWNlW10+O1xufVxuXG4vKipcbiAqIEluZm9ybWF0aW9uIGFib3V0IGEgYm9vdHN0cmFwcGVkIGVudmlyb25tZW50LlxuICovXG5leHBvcnQgaW50ZXJmYWNlIEJvb3RzdHJhcHBlZEVudmlyb25tZW50IHtcbiAgcmVhZG9ubHkgYm9vdHN0cmFwU3RhY2tWZXJzaW9uOiBudW1iZXI7XG4gIHJlYWRvbmx5IGVudmlyb25tZW50OiBFbnZpcm9ubWVudDtcbn1cbiJdfQ==
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import type { SdkHttpOptions } from '../aws-auth';
|
|
2
|
+
import type { Notice, NoticeDataSource } from './types';
|
|
3
|
+
import type { IoHelper } from '../io/private';
|
|
4
|
+
export declare class WebsiteNoticeDataSource implements NoticeDataSource {
|
|
5
|
+
private readonly ioHelper;
|
|
6
|
+
private readonly options;
|
|
7
|
+
constructor(ioHelper: IoHelper, options?: SdkHttpOptions);
|
|
8
|
+
fetch(): Promise<Notice[]>;
|
|
9
|
+
}
|
|
@@ -0,0 +1,70 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.WebsiteNoticeDataSource = void 0;
|
|
4
|
+
const https = require("node:https");
|
|
5
|
+
const toolkit_error_1 = require("../../toolkit/toolkit-error");
|
|
6
|
+
const util_1 = require("../../util");
|
|
7
|
+
const private_1 = require("../aws-auth/private");
|
|
8
|
+
const private_2 = require("../io/private");
|
|
9
|
+
class WebsiteNoticeDataSource {
|
|
10
|
+
ioHelper;
|
|
11
|
+
options;
|
|
12
|
+
constructor(ioHelper, options = {}) {
|
|
13
|
+
this.ioHelper = ioHelper;
|
|
14
|
+
this.options = options;
|
|
15
|
+
}
|
|
16
|
+
async fetch() {
|
|
17
|
+
const timeout = 3000;
|
|
18
|
+
const options = {
|
|
19
|
+
agent: await new private_1.ProxyAgentProvider(this.ioHelper).create(this.options),
|
|
20
|
+
};
|
|
21
|
+
const notices = await new Promise((resolve, reject) => {
|
|
22
|
+
let req;
|
|
23
|
+
let timer = setTimeout(() => {
|
|
24
|
+
if (req) {
|
|
25
|
+
req.destroy(new toolkit_error_1.ToolkitError('Request timed out'));
|
|
26
|
+
}
|
|
27
|
+
}, timeout);
|
|
28
|
+
timer.unref();
|
|
29
|
+
try {
|
|
30
|
+
req = https.get('https://cli.cdk.dev-tools.aws.dev/notices.json', options, res => {
|
|
31
|
+
if (res.statusCode === 200) {
|
|
32
|
+
res.setEncoding('utf8');
|
|
33
|
+
let rawData = '';
|
|
34
|
+
res.on('data', (chunk) => {
|
|
35
|
+
rawData += chunk;
|
|
36
|
+
});
|
|
37
|
+
res.on('end', () => {
|
|
38
|
+
try {
|
|
39
|
+
const data = JSON.parse(rawData).notices;
|
|
40
|
+
if (!data) {
|
|
41
|
+
throw new toolkit_error_1.ToolkitError("'notices' key is missing from received data");
|
|
42
|
+
}
|
|
43
|
+
resolve(data ?? []);
|
|
44
|
+
}
|
|
45
|
+
catch (e) {
|
|
46
|
+
reject(toolkit_error_1.ToolkitError.withCause(`Parse error: ${(0, util_1.formatErrorMessage)(e)}`, e));
|
|
47
|
+
}
|
|
48
|
+
});
|
|
49
|
+
res.on('error', e => {
|
|
50
|
+
reject(toolkit_error_1.ToolkitError.withCause((0, util_1.formatErrorMessage)(e), e));
|
|
51
|
+
});
|
|
52
|
+
}
|
|
53
|
+
else {
|
|
54
|
+
reject(new toolkit_error_1.ToolkitError(`${(0, util_1.humanHttpStatusError)(res.statusCode)} (Status code: ${res.statusCode})`));
|
|
55
|
+
}
|
|
56
|
+
});
|
|
57
|
+
req.on('error', e => {
|
|
58
|
+
reject(toolkit_error_1.ToolkitError.withCause((0, util_1.humanNetworkError)(e), e));
|
|
59
|
+
});
|
|
60
|
+
}
|
|
61
|
+
catch (e) {
|
|
62
|
+
reject(toolkit_error_1.ToolkitError.withCause((0, util_1.formatErrorMessage)(e), e));
|
|
63
|
+
}
|
|
64
|
+
});
|
|
65
|
+
await this.ioHelper.notify(private_2.IO.DEFAULT_TOOLKIT_DEBUG.msg('Notices refreshed'));
|
|
66
|
+
return notices;
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
exports.WebsiteNoticeDataSource = WebsiteNoticeDataSource;
|
|
70
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoid2ViLWRhdGEtc291cmNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsid2ViLWRhdGEtc291cmNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUVBLG9DQUFvQztBQUdwQywrREFBMkQ7QUFDM0QscUNBQXlGO0FBQ3pGLGlEQUF5RDtBQUV6RCwyQ0FBbUM7QUFFbkMsTUFBYSx1QkFBdUI7SUFHTDtJQUZaLE9BQU8sQ0FBaUI7SUFFekMsWUFBNkIsUUFBa0IsRUFBRSxVQUEwQixFQUFFO1FBQWhELGFBQVEsR0FBUixRQUFRLENBQVU7UUFDN0MsSUFBSSxDQUFDLE9BQU8sR0FBRyxPQUFPLENBQUM7SUFDekIsQ0FBQztJQUVELEtBQUssQ0FBQyxLQUFLO1FBQ1QsTUFBTSxPQUFPLEdBQUcsSUFBSSxDQUFDO1FBRXJCLE1BQU0sT0FBTyxHQUFtQjtZQUM5QixLQUFLLEVBQUUsTUFBTSxJQUFJLDRCQUFrQixDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQztTQUN4RSxDQUFDO1FBRUYsTUFBTSxPQUFPLEdBQUcsTUFBTSxJQUFJLE9BQU8sQ0FBVyxDQUFDLE9BQU8sRUFBRSxNQUFNLEVBQUUsRUFBRTtZQUM5RCxJQUFJLEdBQThCLENBQUM7WUFFbkMsSUFBSSxLQUFLLEdBQUcsVUFBVSxDQUFDLEdBQUcsRUFBRTtnQkFDMUIsSUFBSSxHQUFHLEVBQUUsQ0FBQztvQkFDUixHQUFHLENBQUMsT0FBTyxDQUFDLElBQUksNEJBQVksQ0FBQyxtQkFBbUIsQ0FBQyxDQUFDLENBQUM7Z0JBQ3JELENBQUM7WUFDSCxDQUFDLEVBQUUsT0FBTyxDQUFDLENBQUM7WUFFWixLQUFLLENBQUMsS0FBSyxFQUFFLENBQUM7WUFFZCxJQUFJLENBQUM7Z0JBQ0gsR0FBRyxHQUFHLEtBQUssQ0FBQyxHQUFHLENBQUMsZ0RBQWdELEVBQzlELE9BQU8sRUFDUCxHQUFHLENBQUMsRUFBRTtvQkFDSixJQUFJLEdBQUcsQ0FBQyxVQUFVLEtBQUssR0FBRyxFQUFFLENBQUM7d0JBQzNCLEdBQUcsQ0FBQyxXQUFXLENBQUMsTUFBTSxDQUFDLENBQUM7d0JBQ3hCLElBQUksT0FBTyxHQUFHLEVBQUUsQ0FBQzt3QkFDakIsR0FBRyxDQUFDLEVBQUUsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxLQUFLLEVBQUUsRUFBRTs0QkFDdkIsT0FBTyxJQUFJLEtBQUssQ0FBQzt3QkFDbkIsQ0FBQyxDQUFDLENBQUM7d0JBQ0gsR0FBRyxDQUFDLEVBQUUsQ0FBQyxLQUFLLEVBQUUsR0FBRyxFQUFFOzRCQUNqQixJQUFJLENBQUM7Z0NBQ0gsTUFBTSxJQUFJLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsQ0FBQyxPQUFtQixDQUFDO2dDQUNyRCxJQUFJLENBQUMsSUFBSSxFQUFFLENBQUM7b0NBQ1YsTUFBTSxJQUFJLDRCQUFZLENBQUMsNkNBQTZDLENBQUMsQ0FBQztnQ0FDeEUsQ0FBQztnQ0FDRCxPQUFPLENBQUMsSUFBSSxJQUFJLEVBQUUsQ0FBQyxDQUFDOzRCQUN0QixDQUFDOzRCQUFDLE9BQU8sQ0FBTSxFQUFFLENBQUM7Z0NBQ2hCLE1BQU0sQ0FBQyw0QkFBWSxDQUFDLFNBQVMsQ0FBQyxnQkFBZ0IsSUFBQSx5QkFBa0IsRUFBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUM7NEJBQzdFLENBQUM7d0JBQ0gsQ0FBQyxDQUFDLENBQUM7d0JBQ0gsR0FBRyxDQUFDLEVBQUUsQ0FBQyxPQUFPLEVBQUUsQ0FBQyxDQUFDLEVBQUU7NEJBQ2xCLE1BQU0sQ0FBQyw0QkFBWSxDQUFDLFNBQVMsQ0FBQyxJQUFBLHlCQUFrQixFQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUM7d0JBQzNELENBQUMsQ0FBQyxDQUFDO29CQUNMLENBQUM7eUJBQU0sQ0FBQzt3QkFDTixNQUFNLENBQUMsSUFBSSw0QkFBWSxDQUFDLEdBQUcsSUFBQSwyQkFBb0IsRUFBQyxHQUFHLENBQUMsVUFBVyxDQUFDLGtCQUFrQixHQUFHLENBQUMsVUFBVSxHQUFHLENBQUMsQ0FBQyxDQUFDO29CQUN4RyxDQUFDO2dCQUNILENBQUMsQ0FBQyxDQUFDO2dCQUNMLEdBQUcsQ0FBQyxFQUFFLENBQUMsT0FBTyxFQUFFLENBQUMsQ0FBQyxFQUFFO29CQUNsQixNQUFNLENBQUMsNEJBQVksQ0FBQyxTQUFTLENBQUMsSUFBQSx3QkFBaUIsRUFBQyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDO2dCQUMxRCxDQUFDLENBQUMsQ0FBQztZQUNMLENBQUM7WUFBQyxPQUFPLENBQU0sRUFBRSxDQUFDO2dCQUNoQixNQUFNLENBQUMsNEJBQVksQ0FBQyxTQUFTLENBQUMsSUFBQSx5QkFBa0IsRUFBQyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDO1lBQzNELENBQUM7UUFDSCxDQUFDLENBQUMsQ0FBQztRQUVILE1BQU0sSUFBSSxDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQUMsWUFBRSxDQUFDLHFCQUFxQixDQUFDLEdBQUcsQ0FBQyxtQkFBbUIsQ0FBQyxDQUFDLENBQUM7UUFDOUUsT0FBTyxPQUFPLENBQUM7SUFDakIsQ0FBQztDQUNGO0FBaEVELDBEQWdFQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB0eXBlIHsgQ2xpZW50UmVxdWVzdCB9IGZyb20gJ2h0dHAnO1xuaW1wb3J0IHR5cGUgeyBSZXF1ZXN0T3B0aW9ucyB9IGZyb20gJ2h0dHBzJztcbmltcG9ydCAqIGFzIGh0dHBzIGZyb20gJ25vZGU6aHR0cHMnO1xuaW1wb3J0IHR5cGUgeyBTZGtIdHRwT3B0aW9ucyB9IGZyb20gJy4uL2F3cy1hdXRoJztcbmltcG9ydCB0eXBlIHsgTm90aWNlLCBOb3RpY2VEYXRhU291cmNlIH0gZnJvbSAnLi90eXBlcyc7XG5pbXBvcnQgeyBUb29sa2l0RXJyb3IgfSBmcm9tICcuLi8uLi90b29sa2l0L3Rvb2xraXQtZXJyb3InO1xuaW1wb3J0IHsgZm9ybWF0RXJyb3JNZXNzYWdlLCBodW1hbkh0dHBTdGF0dXNFcnJvciwgaHVtYW5OZXR3b3JrRXJyb3IgfSBmcm9tICcuLi8uLi91dGlsJztcbmltcG9ydCB7IFByb3h5QWdlbnRQcm92aWRlciB9IGZyb20gJy4uL2F3cy1hdXRoL3ByaXZhdGUnO1xuaW1wb3J0IHR5cGUgeyBJb0hlbHBlciB9IGZyb20gJy4uL2lvL3ByaXZhdGUnO1xuaW1wb3J0IHsgSU8gfSBmcm9tICcuLi9pby9wcml2YXRlJztcblxuZXhwb3J0IGNsYXNzIFdlYnNpdGVOb3RpY2VEYXRhU291cmNlIGltcGxlbWVudHMgTm90aWNlRGF0YVNvdXJjZSB7XG4gIHByaXZhdGUgcmVhZG9ubHkgb3B0aW9uczogU2RrSHR0cE9wdGlvbnM7XG5cbiAgY29uc3RydWN0b3IocHJpdmF0ZSByZWFkb25seSBpb0hlbHBlcjogSW9IZWxwZXIsIG9wdGlvbnM6IFNka0h0dHBPcHRpb25zID0ge30pIHtcbiAgICB0aGlzLm9wdGlvbnMgPSBvcHRpb25zO1xuICB9XG5cbiAgYXN5bmMgZmV0Y2goKTogUHJvbWlzZTxOb3RpY2VbXT4ge1xuICAgIGNvbnN0IHRpbWVvdXQgPSAzMDAwO1xuXG4gICAgY29uc3Qgb3B0aW9uczogUmVxdWVzdE9wdGlvbnMgPSB7XG4gICAgICBhZ2VudDogYXdhaXQgbmV3IFByb3h5QWdlbnRQcm92aWRlcih0aGlzLmlvSGVscGVyKS5jcmVhdGUodGhpcy5vcHRpb25zKSxcbiAgICB9O1xuXG4gICAgY29uc3Qgbm90aWNlcyA9IGF3YWl0IG5ldyBQcm9taXNlPE5vdGljZVtdPigocmVzb2x2ZSwgcmVqZWN0KSA9PiB7XG4gICAgICBsZXQgcmVxOiBDbGllbnRSZXF1ZXN0IHwgdW5kZWZpbmVkO1xuXG4gICAgICBsZXQgdGltZXIgPSBzZXRUaW1lb3V0KCgpID0+IHtcbiAgICAgICAgaWYgKHJlcSkge1xuICAgICAgICAgIHJlcS5kZXN0cm95KG5ldyBUb29sa2l0RXJyb3IoJ1JlcXVlc3QgdGltZWQgb3V0JykpO1xuICAgICAgICB9XG4gICAgICB9LCB0aW1lb3V0KTtcblxuICAgICAgdGltZXIudW5yZWYoKTtcblxuICAgICAgdHJ5IHtcbiAgICAgICAgcmVxID0gaHR0cHMuZ2V0KCdodHRwczovL2NsaS5jZGsuZGV2LXRvb2xzLmF3cy5kZXYvbm90aWNlcy5qc29uJyxcbiAgICAgICAgICBvcHRpb25zLFxuICAgICAgICAgIHJlcyA9PiB7XG4gICAgICAgICAgICBpZiAocmVzLnN0YXR1c0NvZGUgPT09IDIwMCkge1xuICAgICAgICAgICAgICByZXMuc2V0RW5jb2RpbmcoJ3V0ZjgnKTtcbiAgICAgICAgICAgICAgbGV0IHJhd0RhdGEgPSAnJztcbiAgICAgICAgICAgICAgcmVzLm9uKCdkYXRhJywgKGNodW5rKSA9PiB7XG4gICAgICAgICAgICAgICAgcmF3RGF0YSArPSBjaHVuaztcbiAgICAgICAgICAgICAgfSk7XG4gICAgICAgICAgICAgIHJlcy5vbignZW5kJywgKCkgPT4ge1xuICAgICAgICAgICAgICAgIHRyeSB7XG4gICAgICAgICAgICAgICAgICBjb25zdCBkYXRhID0gSlNPTi5wYXJzZShyYXdEYXRhKS5ub3RpY2VzIGFzIE5vdGljZVtdO1xuICAgICAgICAgICAgICAgICAgaWYgKCFkYXRhKSB7XG4gICAgICAgICAgICAgICAgICAgIHRocm93IG5ldyBUb29sa2l0RXJyb3IoXCInbm90aWNlcycga2V5IGlzIG1pc3NpbmcgZnJvbSByZWNlaXZlZCBkYXRhXCIpO1xuICAgICAgICAgICAgICAgICAgfVxuICAgICAgICAgICAgICAgICAgcmVzb2x2ZShkYXRhID8/IFtdKTtcbiAgICAgICAgICAgICAgICB9IGNhdGNoIChlOiBhbnkpIHtcbiAgICAgICAgICAgICAgICAgIHJlamVjdChUb29sa2l0RXJyb3Iud2l0aENhdXNlKGBQYXJzZSBlcnJvcjogJHtmb3JtYXRFcnJvck1lc3NhZ2UoZSl9YCwgZSkpO1xuICAgICAgICAgICAgICAgIH1cbiAgICAgICAgICAgICAgfSk7XG4gICAgICAgICAgICAgIHJlcy5vbignZXJyb3InLCBlID0+IHtcbiAgICAgICAgICAgICAgICByZWplY3QoVG9vbGtpdEVycm9yLndpdGhDYXVzZShmb3JtYXRFcnJvck1lc3NhZ2UoZSksIGUpKTtcbiAgICAgICAgICAgICAgfSk7XG4gICAgICAgICAgICB9IGVsc2Uge1xuICAgICAgICAgICAgICByZWplY3QobmV3IFRvb2xraXRFcnJvcihgJHtodW1hbkh0dHBTdGF0dXNFcnJvcihyZXMuc3RhdHVzQ29kZSEpfSAoU3RhdHVzIGNvZGU6ICR7cmVzLnN0YXR1c0NvZGV9KWApKTtcbiAgICAgICAgICAgIH1cbiAgICAgICAgICB9KTtcbiAgICAgICAgcmVxLm9uKCdlcnJvcicsIGUgPT4ge1xuICAgICAgICAgIHJlamVjdChUb29sa2l0RXJyb3Iud2l0aENhdXNlKGh1bWFuTmV0d29ya0Vycm9yKGUpLCBlKSk7XG4gICAgICAgIH0pO1xuICAgICAgfSBjYXRjaCAoZTogYW55KSB7XG4gICAgICAgIHJlamVjdChUb29sa2l0RXJyb3Iud2l0aENhdXNlKGZvcm1hdEVycm9yTWVzc2FnZShlKSwgZSkpO1xuICAgICAgfVxuICAgIH0pO1xuXG4gICAgYXdhaXQgdGhpcy5pb0hlbHBlci5ub3RpZnkoSU8uREVGQVVMVF9UT09MS0lUX0RFQlVHLm1zZygnTm90aWNlcyByZWZyZXNoZWQnKSk7XG4gICAgcmV0dXJuIG5vdGljZXM7XG4gIH1cbn1cbiJdfQ==
|