aws-cdk 2.15.0 → 2.16.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/build-info.json +2 -2
- package/does-not-exist.json +1 -1
- package/lib/api/logs/logs-monitor.js +6 -5
- package/lib/cdk-toolkit.js +2 -2
- package/lib/cli.js +10 -8
- package/lib/index.js +357 -141
- package/lib/notices.js +7 -9
- package/package.json +9 -9
- package/test/api/logs/logs-monitor.test.js +33 -5
- package/test/cdk-toolkit.test.js +12 -6
- package/test/integ/cli/cli.integtest.js +13 -1
- package/test/integ/run-against-release +11 -1
package/lib/notices.js
CHANGED
|
@@ -24,12 +24,13 @@ async function displayNotices(props) {
|
|
|
24
24
|
exports.displayNotices = displayNotices;
|
|
25
25
|
async function generateMessage(dataSource, props) {
|
|
26
26
|
const data = await dataSource.fetch();
|
|
27
|
-
const
|
|
27
|
+
const filteredNotices = filterNotices(data, {
|
|
28
28
|
outdir: props.outdir,
|
|
29
29
|
acknowledgedIssueNumbers: new Set(props.acknowledgedIssueNumbers),
|
|
30
|
-
})
|
|
31
|
-
if (
|
|
32
|
-
|
|
30
|
+
});
|
|
31
|
+
if (filteredNotices.length > 0) {
|
|
32
|
+
const individualMessages = formatNotices(filteredNotices);
|
|
33
|
+
return finalMessage(individualMessages, filteredNotices[0].issueNumber);
|
|
33
34
|
}
|
|
34
35
|
return '';
|
|
35
36
|
}
|
|
@@ -62,16 +63,13 @@ class WebsiteNoticeDataSource {
|
|
|
62
63
|
fetch() {
|
|
63
64
|
const timeout = 3000;
|
|
64
65
|
return new Promise((resolve) => {
|
|
66
|
+
setTimeout(() => resolve([]), timeout);
|
|
65
67
|
try {
|
|
66
68
|
const req = https.get('https://cli.cdk.dev-tools.aws.dev/notices.json', { timeout }, res => {
|
|
67
|
-
const startTime = Date.now();
|
|
68
69
|
if (res.statusCode === 200) {
|
|
69
70
|
res.setEncoding('utf8');
|
|
70
71
|
let rawData = '';
|
|
71
72
|
res.on('data', (chunk) => {
|
|
72
|
-
if (Date.now() - startTime > timeout) {
|
|
73
|
-
resolve([]);
|
|
74
|
-
}
|
|
75
73
|
rawData += chunk;
|
|
76
74
|
});
|
|
77
75
|
res.on('end', () => {
|
|
@@ -280,4 +278,4 @@ function some(node, predicate) {
|
|
|
280
278
|
return false;
|
|
281
279
|
}
|
|
282
280
|
}
|
|
283
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"notices.js","sourceRoot":"","sources":["notices.ts"],"names":[],"mappings":"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","sourcesContent":["import * as https from 'https';\nimport * as path from 'path';\nimport * as fs from 'fs-extra';\nimport * as semver from 'semver';\nimport { debug, print } from './logging';\nimport { flatMap } from './util';\nimport { cdkCacheDir } from './util/directories';\nimport { versionNumber } from './version';\n\nconst CACHE_FILE_PATH = path.join(cdkCacheDir(), 'notices.json');\n\nexport interface DisplayNoticesProps {\n  /**\n   * The cloud assembly directory. Usually 'cdk.out'.\n   */\n  readonly outdir: string;\n\n  /**\n   * Issue numbers of notices that have been acknowledged by a user\n   * of the current CDK repository. These notices will be skipped.\n   */\n  readonly acknowledgedIssueNumbers: number[];\n\n  /**\n   * Whether cached notices should be ignored. Setting this property\n   * to true will force the CLI to download fresh data\n   *\n   * @default false\n   */\n  readonly ignoreCache?: boolean;\n}\n\nexport async function refreshNotices() {\n  const dataSource = dataSourceReference(false);\n  return dataSource.fetch();\n}\n\nexport async function displayNotices(props: DisplayNoticesProps) {\n  const dataSource = dataSourceReference(props.ignoreCache ?? false);\n  print(await generateMessage(dataSource, props));\n  return 0;\n}\n\nexport async function generateMessage(dataSource: NoticeDataSource, props: DisplayNoticesProps) {\n  const data = await dataSource.fetch();\n  const individualMessages = formatNotices(filterNotices(data, {\n    outdir: props.outdir,\n    acknowledgedIssueNumbers: new Set(props.acknowledgedIssueNumbers),\n  }));\n\n  if (individualMessages.length > 0) {\n    return finalMessage(individualMessages, data[0].issueNumber);\n  }\n  return '';\n}\n\nfunction dataSourceReference(ignoreCache: boolean): NoticeDataSource {\n  return new CachedDataSource(CACHE_FILE_PATH, new WebsiteNoticeDataSource(), ignoreCache);\n}\n\nfunction finalMessage(individualMessages: string[], exampleNumber: number): string {\n  return [\n    '\\nNOTICES',\n    ...individualMessages,\n    `If you don’t want to see a notice anymore, use \"cdk acknowledge <id>\". For example, \"cdk acknowledge ${exampleNumber}\".`,\n  ].join('\\n\\n');\n}\n\nexport interface FilterNoticeOptions {\n  outdir?: string,\n  cliVersion?: string,\n  frameworkVersion?: string,\n  acknowledgedIssueNumbers?: Set<number>,\n}\n\nexport function filterNotices(data: Notice[], options: FilterNoticeOptions): Notice[] {\n  const filter = new NoticeFilter({\n    cliVersion: options.cliVersion ?? versionNumber(),\n    acknowledgedIssueNumbers: options.acknowledgedIssueNumbers ?? new Set(),\n    tree: loadTree(options.outdir ?? 'cdk.out').tree,\n  });\n  return data.filter(notice => filter.apply(notice));\n}\n\nexport function formatNotices(data: Notice[]): string[] {\n  return data.map(formatNotice);\n}\n\nexport interface Component {\n  name: string;\n  version: string;\n}\n\nexport interface Notice {\n  title: string;\n  issueNumber: number;\n  overview: string;\n  components: Component[];\n  schemaVersion: string;\n}\n\nexport interface NoticeDataSource {\n  fetch(): Promise<Notice[]>,\n}\n\nexport class WebsiteNoticeDataSource implements NoticeDataSource {\n  fetch(): Promise<Notice[]> {\n    const timeout = 3000;\n\n    return new Promise((resolve) => {\n      try {\n        const req = https.get('https://cli.cdk.dev-tools.aws.dev/notices.json',\n          { timeout },\n          res => {\n            const startTime = Date.now();\n            if (res.statusCode === 200) {\n              res.setEncoding('utf8');\n              let rawData = '';\n              res.on('data', (chunk) => {\n                if (Date.now() - startTime > timeout) {\n                  resolve([]);\n                }\n                rawData += chunk;\n              });\n              res.on('end', () => {\n                try {\n                  const data = JSON.parse(rawData).notices as Notice[];\n                  resolve(data ?? []);\n                } catch (e) {\n                  debug(`Failed to parse notices: ${e}`);\n                  resolve([]);\n                }\n              });\n              res.on('error', e => {\n                debug(`Failed to fetch notices: ${e}`);\n                resolve([]);\n              });\n            } else {\n              debug(`Failed to fetch notices. Status code: ${res.statusCode}`);\n              resolve([]);\n            }\n          });\n        req.on('error', e => {\n          debug(`Error on request: ${e}`);\n          resolve([]);\n        });\n        req.on('timeout', _ => resolve([]));\n      } catch (e) {\n        debug(`HTTPS 'get' call threw an error: ${e}`);\n        resolve([]);\n      }\n    });\n  }\n}\n\ninterface CachedNotices {\n  expiration: number,\n  notices: Notice[],\n}\n\nconst TIME_TO_LIVE = 60 * 60 * 1000; // 1 hour\n\nexport class CachedDataSource implements NoticeDataSource {\n  constructor(\n    private readonly fileName: string,\n    private readonly dataSource: NoticeDataSource,\n    private readonly skipCache?: boolean) {\n  }\n\n  async fetch(): Promise<Notice[]> {\n    const cachedData = await this.load();\n    const data = cachedData.notices;\n    const expiration = cachedData.expiration ?? 0;\n\n    if (Date.now() > expiration || this.skipCache) {\n      const freshData = {\n        expiration: Date.now() + TIME_TO_LIVE,\n        notices: await this.dataSource.fetch(),\n      };\n      await this.save(freshData);\n      return freshData.notices;\n    } else {\n      return data;\n    }\n  }\n\n  private async load(): Promise<CachedNotices> {\n    const defaultValue = {\n      expiration: 0,\n      notices: [],\n    };\n\n    try {\n      return fs.existsSync(this.fileName)\n        ? await fs.readJSON(this.fileName) as CachedNotices\n        : defaultValue;\n    } catch (e) {\n      debug(`Failed to load notices from cache: ${e}`);\n      return defaultValue;\n    }\n  }\n\n  private async save(cached: CachedNotices): Promise<void> {\n    try {\n      await fs.writeJSON(this.fileName, cached);\n    } catch (e) {\n      debug(`Failed to store notices in the cache: ${e}`);\n    }\n  }\n}\n\nexport interface NoticeFilterProps {\n  cliVersion: string,\n  acknowledgedIssueNumbers: Set<number>,\n  tree: ConstructTreeNode,\n}\n\nexport class NoticeFilter {\n  private readonly acknowledgedIssueNumbers: Set<number>;\n\n  constructor(private readonly props: NoticeFilterProps) {\n    this.acknowledgedIssueNumbers = props.acknowledgedIssueNumbers;\n  }\n\n  /**\n   * Returns true iff we should show this notice.\n   */\n  apply(notice: Notice): boolean {\n    if (this.acknowledgedIssueNumbers.has(notice.issueNumber)) {\n      return false;\n    }\n\n    return this.applyVersion(notice, 'cli', this.props.cliVersion) ||\n      match(resolveAliases(notice.components), this.props.tree);\n  }\n\n  /**\n   * Returns true iff we should show the notice.\n   */\n  private applyVersion(notice: Notice, name: string, compareToVersion: string | undefined) {\n    if (compareToVersion === undefined) { return false; }\n\n    const affectedComponent = notice.components.find(component => component.name === name);\n    const affectedRange = affectedComponent?.version;\n    return affectedRange != null && semver.satisfies(compareToVersion, affectedRange);\n  }\n}\n\n/**\n * Some component names are aliases to actual component names. For example \"framework\"\n * is an alias for either the core library (v1) or the whole CDK library (v2).\n *\n * This function converts all aliases to their actual counterpart names, to be used to\n * match against the construct tree.\n *\n * @param components a list of components. Components whose name is an alias will be\n * transformed and all others will be left intact.\n */\nfunction resolveAliases(components: Component[]): Component[] {\n  return flatMap(components, component => {\n    if (component.name === 'framework') {\n      return [{\n        name: '@aws-cdk/core.',\n        version: component.version,\n      }, {\n        name: 'aws-cdk-lib.',\n        version: component.version,\n      }];\n    } else {\n      return [component];\n    }\n  });\n}\n\nfunction formatNotice(notice: Notice): string {\n  const componentsValue = notice.components.map(c => `${c.name}: ${c.version}`).join(', ');\n  return [\n    `${notice.issueNumber}\\t${notice.title}`,\n    formatOverview(notice.overview),\n    `\\tAffected versions: ${componentsValue}`,\n    `\\tMore information at: https://github.com/aws/aws-cdk/issues/${notice.issueNumber}`,\n  ].join('\\n\\n') + '\\n';\n}\n\nfunction formatOverview(text: string) {\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(text)\n    .split('\\n')\n    .join(separator);\n\n  return '\\t' + heading + content;\n}\n\n/**\n * Whether any component in the tree matches any component in the query.\n * A match happens when:\n *\n * 1. The version of the node matches the version in the query, interpreted\n * as a semver range.\n *\n * 2. The name in the query is a prefix of the node name when the query ends in '.',\n * or the two names are exactly the same, otherwise.\n */\nfunction match(query: Component[], tree: ConstructTreeNode): boolean {\n  return some(tree, node => {\n    return query.some(component =>\n      compareNames(component.name, node.constructInfo?.fqn) &&\n      compareVersions(component.version, node.constructInfo?.version));\n  });\n\n  function compareNames(pattern: string, target: string | undefined): boolean {\n    if (target == null) { return false; }\n    return pattern.endsWith('.') ? target.startsWith(pattern) : pattern === target;\n  }\n\n  function compareVersions(pattern: string, target: string | undefined): boolean {\n    return semver.satisfies(target ?? '', pattern);\n  }\n}\n\nfunction loadTree(outdir: string) {\n  try {\n    return fs.readJSONSync(path.join(outdir, 'tree.json'));\n  } catch (e) {\n    debug(`Failed to get tree.json file: ${e}`);\n    return {};\n  }\n}\n\n/**\n * Source information on a construct (class fqn and version)\n */\ninterface ConstructInfo {\n  readonly fqn: string;\n  readonly version: string;\n}\n\n/**\n * A node in the construct tree.\n * @internal\n */\ninterface ConstructTreeNode {\n  readonly id: string;\n  readonly path: string;\n  readonly children?: { [key: string]: ConstructTreeNode };\n  readonly attributes?: { [key: string]: any };\n\n  /**\n   * Information on the construct class that led to this node, if available\n   */\n  readonly constructInfo?: ConstructInfo;\n}\n\nfunction some(node: ConstructTreeNode, predicate: (n: ConstructTreeNode) => boolean): boolean {\n  return node != null && (predicate(node) || findInChildren());\n\n  function findInChildren(): boolean {\n    if (node.children == null) { return false; }\n\n    for (const name in node.children) {\n      if (some(node.children[name], predicate)) {\n        return true;\n      }\n    }\n    return false;\n  }\n}\n"]}
|
|
281
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"notices.js","sourceRoot":"","sources":["notices.ts"],"names":[],"mappings":"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","sourcesContent":["import * as https from 'https';\nimport * as path from 'path';\nimport * as fs from 'fs-extra';\nimport * as semver from 'semver';\nimport { debug, print } from './logging';\nimport { flatMap } from './util';\nimport { cdkCacheDir } from './util/directories';\nimport { versionNumber } from './version';\n\nconst CACHE_FILE_PATH = path.join(cdkCacheDir(), 'notices.json');\n\nexport interface DisplayNoticesProps {\n  /**\n   * The cloud assembly directory. Usually 'cdk.out'.\n   */\n  readonly outdir: string;\n\n  /**\n   * Issue numbers of notices that have been acknowledged by a user\n   * of the current CDK repository. These notices will be skipped.\n   */\n  readonly acknowledgedIssueNumbers: number[];\n\n  /**\n   * Whether cached notices should be ignored. Setting this property\n   * to true will force the CLI to download fresh data\n   *\n   * @default false\n   */\n  readonly ignoreCache?: boolean;\n}\n\nexport async function refreshNotices() {\n  const dataSource = dataSourceReference(false);\n  return dataSource.fetch();\n}\n\nexport async function displayNotices(props: DisplayNoticesProps) {\n  const dataSource = dataSourceReference(props.ignoreCache ?? false);\n  print(await generateMessage(dataSource, props));\n  return 0;\n}\n\nexport async function generateMessage(dataSource: NoticeDataSource, props: DisplayNoticesProps) {\n  const data = await dataSource.fetch();\n  const filteredNotices = filterNotices(data, {\n    outdir: props.outdir,\n    acknowledgedIssueNumbers: new Set(props.acknowledgedIssueNumbers),\n  });\n\n  if (filteredNotices.length > 0) {\n    const individualMessages = formatNotices(filteredNotices);\n    return finalMessage(individualMessages, filteredNotices[0].issueNumber);\n  }\n  return '';\n}\n\nfunction dataSourceReference(ignoreCache: boolean): NoticeDataSource {\n  return new CachedDataSource(CACHE_FILE_PATH, new WebsiteNoticeDataSource(), ignoreCache);\n}\n\nfunction finalMessage(individualMessages: string[], exampleNumber: number): string {\n  return [\n    '\\nNOTICES',\n    ...individualMessages,\n    `If you don’t want to see a notice anymore, use \"cdk acknowledge <id>\". For example, \"cdk acknowledge ${exampleNumber}\".`,\n  ].join('\\n\\n');\n}\n\nexport interface FilterNoticeOptions {\n  outdir?: string,\n  cliVersion?: string,\n  frameworkVersion?: string,\n  acknowledgedIssueNumbers?: Set<number>,\n}\n\nexport function filterNotices(data: Notice[], options: FilterNoticeOptions): Notice[] {\n  const filter = new NoticeFilter({\n    cliVersion: options.cliVersion ?? versionNumber(),\n    acknowledgedIssueNumbers: options.acknowledgedIssueNumbers ?? new Set(),\n    tree: loadTree(options.outdir ?? 'cdk.out').tree,\n  });\n  return data.filter(notice => filter.apply(notice));\n}\n\nexport function formatNotices(data: Notice[]): string[] {\n  return data.map(formatNotice);\n}\n\nexport interface Component {\n  name: string;\n  version: string;\n}\n\nexport interface Notice {\n  title: string;\n  issueNumber: number;\n  overview: string;\n  components: Component[];\n  schemaVersion: string;\n}\n\nexport interface NoticeDataSource {\n  fetch(): Promise<Notice[]>,\n}\n\nexport class WebsiteNoticeDataSource implements NoticeDataSource {\n  fetch(): Promise<Notice[]> {\n    const timeout = 3000;\n\n    return new Promise((resolve) => {\n      setTimeout(() => resolve([]), timeout);\n      try {\n        const req = https.get('https://cli.cdk.dev-tools.aws.dev/notices.json',\n          { timeout },\n          res => {\n            if (res.statusCode === 200) {\n              res.setEncoding('utf8');\n              let rawData = '';\n              res.on('data', (chunk) => {\n                rawData += chunk;\n              });\n              res.on('end', () => {\n                try {\n                  const data = JSON.parse(rawData).notices as Notice[];\n                  resolve(data ?? []);\n                } catch (e) {\n                  debug(`Failed to parse notices: ${e}`);\n                  resolve([]);\n                }\n              });\n              res.on('error', e => {\n                debug(`Failed to fetch notices: ${e}`);\n                resolve([]);\n              });\n            } else {\n              debug(`Failed to fetch notices. Status code: ${res.statusCode}`);\n              resolve([]);\n            }\n          });\n        req.on('error', e => {\n          debug(`Error on request: ${e}`);\n          resolve([]);\n        });\n        req.on('timeout', _ => resolve([]));\n      } catch (e) {\n        debug(`HTTPS 'get' call threw an error: ${e}`);\n        resolve([]);\n      }\n    });\n  }\n}\n\ninterface CachedNotices {\n  expiration: number,\n  notices: Notice[],\n}\n\nconst TIME_TO_LIVE = 60 * 60 * 1000; // 1 hour\n\nexport class CachedDataSource implements NoticeDataSource {\n  constructor(\n    private readonly fileName: string,\n    private readonly dataSource: NoticeDataSource,\n    private readonly skipCache?: boolean) {\n  }\n\n  async fetch(): Promise<Notice[]> {\n    const cachedData = await this.load();\n    const data = cachedData.notices;\n    const expiration = cachedData.expiration ?? 0;\n\n    if (Date.now() > expiration || this.skipCache) {\n      const freshData = {\n        expiration: Date.now() + TIME_TO_LIVE,\n        notices: await this.dataSource.fetch(),\n      };\n      await this.save(freshData);\n      return freshData.notices;\n    } else {\n      return data;\n    }\n  }\n\n  private async load(): Promise<CachedNotices> {\n    const defaultValue = {\n      expiration: 0,\n      notices: [],\n    };\n\n    try {\n      return fs.existsSync(this.fileName)\n        ? await fs.readJSON(this.fileName) as CachedNotices\n        : defaultValue;\n    } catch (e) {\n      debug(`Failed to load notices from cache: ${e}`);\n      return defaultValue;\n    }\n  }\n\n  private async save(cached: CachedNotices): Promise<void> {\n    try {\n      await fs.writeJSON(this.fileName, cached);\n    } catch (e) {\n      debug(`Failed to store notices in the cache: ${e}`);\n    }\n  }\n}\n\nexport interface NoticeFilterProps {\n  cliVersion: string,\n  acknowledgedIssueNumbers: Set<number>,\n  tree: ConstructTreeNode,\n}\n\nexport class NoticeFilter {\n  private readonly acknowledgedIssueNumbers: Set<number>;\n\n  constructor(private readonly props: NoticeFilterProps) {\n    this.acknowledgedIssueNumbers = props.acknowledgedIssueNumbers;\n  }\n\n  /**\n   * Returns true iff we should show this notice.\n   */\n  apply(notice: Notice): boolean {\n    if (this.acknowledgedIssueNumbers.has(notice.issueNumber)) {\n      return false;\n    }\n\n    return this.applyVersion(notice, 'cli', this.props.cliVersion) ||\n      match(resolveAliases(notice.components), this.props.tree);\n  }\n\n  /**\n   * Returns true iff we should show the notice.\n   */\n  private applyVersion(notice: Notice, name: string, compareToVersion: string | undefined) {\n    if (compareToVersion === undefined) { return false; }\n\n    const affectedComponent = notice.components.find(component => component.name === name);\n    const affectedRange = affectedComponent?.version;\n    return affectedRange != null && semver.satisfies(compareToVersion, affectedRange);\n  }\n}\n\n/**\n * Some component names are aliases to actual component names. For example \"framework\"\n * is an alias for either the core library (v1) or the whole CDK library (v2).\n *\n * This function converts all aliases to their actual counterpart names, to be used to\n * match against the construct tree.\n *\n * @param components a list of components. Components whose name is an alias will be\n * transformed and all others will be left intact.\n */\nfunction resolveAliases(components: Component[]): Component[] {\n  return flatMap(components, component => {\n    if (component.name === 'framework') {\n      return [{\n        name: '@aws-cdk/core.',\n        version: component.version,\n      }, {\n        name: 'aws-cdk-lib.',\n        version: component.version,\n      }];\n    } else {\n      return [component];\n    }\n  });\n}\n\nfunction formatNotice(notice: Notice): string {\n  const componentsValue = notice.components.map(c => `${c.name}: ${c.version}`).join(', ');\n  return [\n    `${notice.issueNumber}\\t${notice.title}`,\n    formatOverview(notice.overview),\n    `\\tAffected versions: ${componentsValue}`,\n    `\\tMore information at: https://github.com/aws/aws-cdk/issues/${notice.issueNumber}`,\n  ].join('\\n\\n') + '\\n';\n}\n\nfunction formatOverview(text: string) {\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(text)\n    .split('\\n')\n    .join(separator);\n\n  return '\\t' + heading + content;\n}\n\n/**\n * Whether any component in the tree matches any component in the query.\n * A match happens when:\n *\n * 1. The version of the node matches the version in the query, interpreted\n * as a semver range.\n *\n * 2. The name in the query is a prefix of the node name when the query ends in '.',\n * or the two names are exactly the same, otherwise.\n */\nfunction match(query: Component[], tree: ConstructTreeNode): boolean {\n  return some(tree, node => {\n    return query.some(component =>\n      compareNames(component.name, node.constructInfo?.fqn) &&\n      compareVersions(component.version, node.constructInfo?.version));\n  });\n\n  function compareNames(pattern: string, target: string | undefined): boolean {\n    if (target == null) { return false; }\n    return pattern.endsWith('.') ? target.startsWith(pattern) : pattern === target;\n  }\n\n  function compareVersions(pattern: string, target: string | undefined): boolean {\n    return semver.satisfies(target ?? '', pattern);\n  }\n}\n\nfunction loadTree(outdir: string) {\n  try {\n    return fs.readJSONSync(path.join(outdir, 'tree.json'));\n  } catch (e) {\n    debug(`Failed to get tree.json file: ${e}`);\n    return {};\n  }\n}\n\n/**\n * Source information on a construct (class fqn and version)\n */\ninterface ConstructInfo {\n  readonly fqn: string;\n  readonly version: string;\n}\n\n/**\n * A node in the construct tree.\n * @internal\n */\ninterface ConstructTreeNode {\n  readonly id: string;\n  readonly path: string;\n  readonly children?: { [key: string]: ConstructTreeNode };\n  readonly attributes?: { [key: string]: any };\n\n  /**\n   * Information on the construct class that led to this node, if available\n   */\n  readonly constructInfo?: ConstructInfo;\n}\n\nfunction some(node: ConstructTreeNode, predicate: (n: ConstructTreeNode) => boolean): boolean {\n  return node != null && (predicate(node) || findInChildren());\n\n  function findInChildren(): boolean {\n    if (node.children == null) { return false; }\n\n    for (const name in node.children) {\n      if (some(node.children[name], predicate)) {\n        return true;\n      }\n    }\n    return false;\n  }\n}\n"]}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "aws-cdk",
|
|
3
3
|
"description": "CDK Toolkit, the command line tool for CDK apps",
|
|
4
|
-
"version": "2.
|
|
4
|
+
"version": "2.16.0",
|
|
5
5
|
"bin": {
|
|
6
6
|
"cdk": "bin/cdk"
|
|
7
7
|
},
|
|
@@ -58,7 +58,7 @@
|
|
|
58
58
|
},
|
|
59
59
|
"license": "Apache-2.0",
|
|
60
60
|
"devDependencies": {
|
|
61
|
-
"@aws-cdk/core": "2.
|
|
61
|
+
"@aws-cdk/core": "2.16.0",
|
|
62
62
|
"@octokit/rest": "^18.12.0",
|
|
63
63
|
"@types/archiver": "^5.3.1",
|
|
64
64
|
"@types/fs-extra": "^8.1.2",
|
|
@@ -75,27 +75,27 @@
|
|
|
75
75
|
"@types/wrap-ansi": "^3.0.0",
|
|
76
76
|
"@types/yargs": "^15.0.14",
|
|
77
77
|
"aws-sdk-mock": "5.6.0",
|
|
78
|
-
"@aws-cdk/cdk-build-tools": "2.
|
|
78
|
+
"@aws-cdk/cdk-build-tools": "2.16.0",
|
|
79
79
|
"jest": "^27.5.1",
|
|
80
80
|
"madge": "^5.0.1",
|
|
81
81
|
"constructs": "^10.0.0",
|
|
82
82
|
"make-runnable": "^1.3.10",
|
|
83
83
|
"mockery": "^2.1.0",
|
|
84
84
|
"nock": "^13.2.4",
|
|
85
|
-
"@aws-cdk/pkglint": "2.
|
|
85
|
+
"@aws-cdk/pkglint": "2.16.0",
|
|
86
86
|
"sinon": "^9.2.4",
|
|
87
87
|
"ts-jest": "^27.1.3",
|
|
88
88
|
"ts-mock-imports": "^1.3.8",
|
|
89
89
|
"xml-js": "^1.6.11",
|
|
90
|
-
"@aws-cdk/cloud-assembly-schema": "2.
|
|
91
|
-
"@aws-cdk/cloudformation-diff": "2.
|
|
92
|
-
"@aws-cdk/cx-api": "2.
|
|
93
|
-
"@aws-cdk/region-info": "2.
|
|
90
|
+
"@aws-cdk/cloud-assembly-schema": "2.16.0",
|
|
91
|
+
"@aws-cdk/cloudformation-diff": "2.16.0",
|
|
92
|
+
"@aws-cdk/cx-api": "2.16.0",
|
|
93
|
+
"@aws-cdk/region-info": "2.16.0",
|
|
94
94
|
"@jsii/check-node": "1.54.0",
|
|
95
95
|
"archiver": "^5.3.0",
|
|
96
96
|
"aws-sdk": "^2.979.0",
|
|
97
97
|
"camelcase": "^6.3.0",
|
|
98
|
-
"cdk-assets": "2.
|
|
98
|
+
"cdk-assets": "2.16.0",
|
|
99
99
|
"chokidar": "^3.5.3",
|
|
100
100
|
"chalk": "^4",
|
|
101
101
|
"decamelize": "^5.0.1",
|
|
@@ -12,17 +12,45 @@ beforeEach(() => {
|
|
|
12
12
|
stderrMock = jest.spyOn(process.stderr, 'write').mockImplementation(() => { return true; });
|
|
13
13
|
sdk = new mock_sdk_1.MockSdk();
|
|
14
14
|
});
|
|
15
|
-
|
|
15
|
+
afterEach(() => {
|
|
16
16
|
stderrMock.mockRestore();
|
|
17
17
|
monitor.deactivate();
|
|
18
18
|
});
|
|
19
|
-
test('
|
|
19
|
+
test('process events', async () => {
|
|
20
20
|
// GIVEN
|
|
21
21
|
const eventDate = new Date(T0 + 102 * 1000);
|
|
22
22
|
sdk.stubCloudWatchLogs({
|
|
23
23
|
filterLogEvents() {
|
|
24
24
|
return {
|
|
25
25
|
events: [event(102, 'message', eventDate)],
|
|
26
|
+
};
|
|
27
|
+
},
|
|
28
|
+
});
|
|
29
|
+
monitor.addLogGroups({
|
|
30
|
+
name: 'name',
|
|
31
|
+
account: '11111111111',
|
|
32
|
+
region: 'us-east-1',
|
|
33
|
+
}, sdk, ['loggroup']);
|
|
34
|
+
// WHEN
|
|
35
|
+
monitor.activate();
|
|
36
|
+
// need time for the log processing to occur
|
|
37
|
+
await aws_1.sleep(1000);
|
|
38
|
+
// THEN
|
|
39
|
+
const expectedLocaleTimeString = eventDate.toLocaleTimeString();
|
|
40
|
+
expect(stderrMock).toHaveBeenCalledTimes(1);
|
|
41
|
+
expect(stderrMock.mock.calls[0][0]).toContain(`[${chalk_1.blue('loggroup')}] ${chalk_1.yellow(expectedLocaleTimeString)} message`);
|
|
42
|
+
});
|
|
43
|
+
test('process truncated events', async () => {
|
|
44
|
+
// GIVEN
|
|
45
|
+
const eventDate = new Date(T0 + 102 * 1000);
|
|
46
|
+
const events = [];
|
|
47
|
+
for (let i = 0; i < 100; i++) {
|
|
48
|
+
events.push(event(102 + i, 'message' + i, eventDate));
|
|
49
|
+
}
|
|
50
|
+
sdk.stubCloudWatchLogs({
|
|
51
|
+
filterLogEvents() {
|
|
52
|
+
return {
|
|
53
|
+
events,
|
|
26
54
|
nextToken: 'some-token',
|
|
27
55
|
};
|
|
28
56
|
},
|
|
@@ -38,9 +66,9 @@ test('continue to the next page if it exists', async () => {
|
|
|
38
66
|
await aws_1.sleep(1000);
|
|
39
67
|
// THEN
|
|
40
68
|
const expectedLocaleTimeString = eventDate.toLocaleTimeString();
|
|
41
|
-
expect(stderrMock).toHaveBeenCalledTimes(
|
|
69
|
+
expect(stderrMock).toHaveBeenCalledTimes(101);
|
|
42
70
|
expect(stderrMock.mock.calls[0][0]).toContain(`[${chalk_1.blue('loggroup')}] ${chalk_1.yellow(expectedLocaleTimeString)} message`);
|
|
43
|
-
expect(stderrMock.mock.calls[
|
|
71
|
+
expect(stderrMock.mock.calls[100][0]).toContain(`[${chalk_1.blue('loggroup')}] ${chalk_1.yellow(expectedLocaleTimeString)} >>> \`watch\` shows only the first 100 log messages - the rest have been truncated...`);
|
|
44
72
|
});
|
|
45
73
|
const T0 = 1597837230504;
|
|
46
74
|
const T100 = T0 + 100 * 1000;
|
|
@@ -52,4 +80,4 @@ function event(nr, message, timestamp) {
|
|
|
52
80
|
ingestionTime: timestamp.getTime(),
|
|
53
81
|
};
|
|
54
82
|
}
|
|
55
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
83
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9ncy1tb25pdG9yLnRlc3QuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJsb2dzLW1vbml0b3IudGVzdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLGlDQUFxQztBQUNyQyxxRUFBK0U7QUFDL0UsaURBQWdEO0FBQ2hELGtEQUE4QztBQUU5QyxJQUFJLEdBQVksQ0FBQztBQUNqQixJQUFJLFVBQTRCLENBQUM7QUFDakMsSUFBSSxPQUFrQyxDQUFDO0FBQ3ZDLFVBQVUsQ0FBQyxHQUFHLEVBQUU7SUFDZCxPQUFPLEdBQUcsSUFBSSx3Q0FBeUIsQ0FBQyxJQUFJLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDO0lBQ3hELFVBQVUsR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxNQUFNLEVBQUUsT0FBTyxDQUFDLENBQUMsa0JBQWtCLENBQUMsR0FBRyxFQUFFLEdBQUcsT0FBTyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUM1RixHQUFHLEdBQUcsSUFBSSxrQkFBTyxFQUFFLENBQUM7QUFDdEIsQ0FBQyxDQUFDLENBQUM7QUFFSCxTQUFTLENBQUMsR0FBRyxFQUFFO0lBQ2IsVUFBVSxDQUFDLFdBQVcsRUFBRSxDQUFDO0lBQ3pCLE9BQU8sQ0FBQyxVQUFVLEVBQUUsQ0FBQztBQUN2QixDQUFDLENBQUMsQ0FBQztBQUVILElBQUksQ0FBQyxnQkFBZ0IsRUFBRSxLQUFLLElBQUksRUFBRTtJQUNoQyxRQUFRO0lBQ1IsTUFBTSxTQUFTLEdBQUcsSUFBSSxJQUFJLENBQUMsRUFBRSxHQUFHLEdBQUcsR0FBRyxJQUFJLENBQUMsQ0FBQztJQUM1QyxHQUFHLENBQUMsa0JBQWtCLENBQUM7UUFDckIsZUFBZTtZQUNiLE9BQU87Z0JBQ0wsTUFBTSxFQUFFLENBQUMsS0FBSyxDQUFDLEdBQUcsRUFBRSxTQUFTLEVBQUUsU0FBUyxDQUFDLENBQUM7YUFDM0MsQ0FBQztRQUNKLENBQUM7S0FDRixDQUFDLENBQUM7SUFDSCxPQUFPLENBQUMsWUFBWSxDQUNsQjtRQUNFLElBQUksRUFBRSxNQUFNO1FBQ1osT0FBTyxFQUFFLGFBQWE7UUFDdEIsTUFBTSxFQUFFLFdBQVc7S0FDcEIsRUFDRCxHQUFHLEVBQ0gsQ0FBQyxVQUFVLENBQUMsQ0FDYixDQUFDO0lBQ0YsT0FBTztJQUNQLE9BQU8sQ0FBQyxRQUFRLEVBQUUsQ0FBQztJQUNuQiw0Q0FBNEM7SUFDNUMsTUFBTSxXQUFLLENBQUMsSUFBSSxDQUFDLENBQUM7SUFFbEIsT0FBTztJQUNQLE1BQU0sd0JBQXdCLEdBQUcsU0FBUyxDQUFDLGtCQUFrQixFQUFFLENBQUM7SUFDaEUsTUFBTSxDQUFDLFVBQVUsQ0FBQyxDQUFDLHFCQUFxQixDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQzVDLE1BQU0sQ0FBQyxVQUFVLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLFNBQVMsQ0FDM0MsSUFBSSxZQUFJLENBQUMsVUFBVSxDQUFDLEtBQUssY0FBTSxDQUFDLHdCQUF3QixDQUFDLFVBQVUsQ0FDcEUsQ0FBQztBQUNKLENBQUMsQ0FBQyxDQUFDO0FBRUgsSUFBSSxDQUFDLDBCQUEwQixFQUFFLEtBQUssSUFBSSxFQUFFO0lBQzFDLFFBQVE7SUFDUixNQUFNLFNBQVMsR0FBRyxJQUFJLElBQUksQ0FBQyxFQUFFLEdBQUcsR0FBRyxHQUFHLElBQUksQ0FBQyxDQUFDO0lBQzVDLE1BQU0sTUFBTSxHQUF5QyxFQUFFLENBQUM7SUFDeEQsS0FBSyxJQUFJLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxHQUFHLEdBQUcsRUFBRSxDQUFDLEVBQUUsRUFBRTtRQUM1QixNQUFNLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxHQUFHLEdBQUMsQ0FBQyxFQUFFLFNBQVMsR0FBRyxDQUFDLEVBQUUsU0FBUyxDQUFDLENBQUMsQ0FBQztLQUNyRDtJQUVELEdBQUcsQ0FBQyxrQkFBa0IsQ0FBQztRQUNyQixlQUFlO1lBQ2IsT0FBTztnQkFDTCxNQUFNO2dCQUNOLFNBQVMsRUFBRSxZQUFZO2FBQ3hCLENBQUM7UUFDSixDQUFDO0tBQ0YsQ0FBQyxDQUFDO0lBQ0gsT0FBTyxDQUFDLFlBQVksQ0FDbEI7UUFDRSxJQUFJLEVBQUUsTUFBTTtRQUNaLE9BQU8sRUFBRSxhQUFhO1FBQ3RCLE1BQU0sRUFBRSxXQUFXO0tBQ3BCLEVBQ0QsR0FBRyxFQUNILENBQUMsVUFBVSxDQUFDLENBQ2IsQ0FBQztJQUNGLE9BQU87SUFDUCxPQUFPLENBQUMsUUFBUSxFQUFFLENBQUM7SUFDbkIsNENBQTRDO0lBQzVDLE1BQU0sV0FBSyxDQUFDLElBQUksQ0FBQyxDQUFDO0lBRWxCLE9BQU87SUFDUCxNQUFNLHdCQUF3QixHQUFHLFNBQVMsQ0FBQyxrQkFBa0IsRUFBRSxDQUFDO0lBQ2hFLE1BQU0sQ0FBQyxVQUFVLENBQUMsQ0FBQyxxQkFBcUIsQ0FBQyxHQUFHLENBQUMsQ0FBQztJQUM5QyxNQUFNLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxTQUFTLENBQzNDLElBQUksWUFBSSxDQUFDLFVBQVUsQ0FBQyxLQUFLLGNBQU0sQ0FBQyx3QkFBd0IsQ0FBQyxVQUFVLENBQ3BFLENBQUM7SUFDRixNQUFNLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxTQUFTLENBQzdDLElBQUksWUFBSSxDQUFDLFVBQVUsQ0FBQyxLQUFLLGNBQU0sQ0FBQyx3QkFBd0IsQ0FBQyx3RkFBd0YsQ0FDbEosQ0FBQztBQUNKLENBQUMsQ0FBQyxDQUFDO0FBRUgsTUFBTSxFQUFFLEdBQUcsYUFBYSxDQUFDO0FBQ3pCLE1BQU0sSUFBSSxHQUFHLEVBQUUsR0FBRyxHQUFHLEdBQUcsSUFBSSxDQUFDO0FBQzdCLFNBQVMsS0FBSyxDQUFDLEVBQVUsRUFBRSxPQUFlLEVBQUUsU0FBZTtJQUN6RCxPQUFPO1FBQ0wsT0FBTyxFQUFFLEdBQUcsRUFBRSxFQUFFO1FBQ2hCLE9BQU87UUFDUCxTQUFTLEVBQUUsU0FBUyxDQUFDLE9BQU8sRUFBRTtRQUM5QixhQUFhLEVBQUUsU0FBUyxDQUFDLE9BQU8sRUFBRTtLQUNuQyxDQUFDO0FBQ0osQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IGJsdWUsIHllbGxvdyB9IGZyb20gJ2NoYWxrJztcbmltcG9ydCB7IENsb3VkV2F0Y2hMb2dFdmVudE1vbml0b3IgfSBmcm9tICcuLi8uLi8uLi9saWIvYXBpL2xvZ3MvbG9ncy1tb25pdG9yJztcbmltcG9ydCB7IHNsZWVwIH0gZnJvbSAnLi4vLi4vaW50ZWcvaGVscGVycy9hd3MnO1xuaW1wb3J0IHsgTW9ja1NkayB9IGZyb20gJy4uLy4uL3V0aWwvbW9jay1zZGsnO1xuXG5sZXQgc2RrOiBNb2NrU2RrO1xubGV0IHN0ZGVyck1vY2s6IGplc3QuU3B5SW5zdGFuY2U7XG5sZXQgbW9uaXRvcjogQ2xvdWRXYXRjaExvZ0V2ZW50TW9uaXRvcjtcbmJlZm9yZUVhY2goKCkgPT4ge1xuICBtb25pdG9yID0gbmV3IENsb3VkV2F0Y2hMb2dFdmVudE1vbml0b3IobmV3IERhdGUoVDEwMCkpO1xuICBzdGRlcnJNb2NrID0gamVzdC5zcHlPbihwcm9jZXNzLnN0ZGVyciwgJ3dyaXRlJykubW9ja0ltcGxlbWVudGF0aW9uKCgpID0+IHsgcmV0dXJuIHRydWU7IH0pO1xuICBzZGsgPSBuZXcgTW9ja1NkaygpO1xufSk7XG5cbmFmdGVyRWFjaCgoKSA9PiB7XG4gIHN0ZGVyck1vY2subW9ja1Jlc3RvcmUoKTtcbiAgbW9uaXRvci5kZWFjdGl2YXRlKCk7XG59KTtcblxudGVzdCgncHJvY2VzcyBldmVudHMnLCBhc3luYyAoKSA9PiB7XG4gIC8vIEdJVkVOXG4gIGNvbnN0IGV2ZW50RGF0ZSA9IG5ldyBEYXRlKFQwICsgMTAyICogMTAwMCk7XG4gIHNkay5zdHViQ2xvdWRXYXRjaExvZ3Moe1xuICAgIGZpbHRlckxvZ0V2ZW50cygpIHtcbiAgICAgIHJldHVybiB7XG4gICAgICAgIGV2ZW50czogW2V2ZW50KDEwMiwgJ21lc3NhZ2UnLCBldmVudERhdGUpXSxcbiAgICAgIH07XG4gICAgfSxcbiAgfSk7XG4gIG1vbml0b3IuYWRkTG9nR3JvdXBzKFxuICAgIHtcbiAgICAgIG5hbWU6ICduYW1lJyxcbiAgICAgIGFjY291bnQ6ICcxMTExMTExMTExMScsXG4gICAgICByZWdpb246ICd1cy1lYXN0LTEnLFxuICAgIH0sXG4gICAgc2RrLFxuICAgIFsnbG9nZ3JvdXAnXSxcbiAgKTtcbiAgLy8gV0hFTlxuICBtb25pdG9yLmFjdGl2YXRlKCk7XG4gIC8vIG5lZWQgdGltZSBmb3IgdGhlIGxvZyBwcm9jZXNzaW5nIHRvIG9jY3VyXG4gIGF3YWl0IHNsZWVwKDEwMDApO1xuXG4gIC8vIFRIRU5cbiAgY29uc3QgZXhwZWN0ZWRMb2NhbGVUaW1lU3RyaW5nID0gZXZlbnREYXRlLnRvTG9jYWxlVGltZVN0cmluZygpO1xuICBleHBlY3Qoc3RkZXJyTW9jaykudG9IYXZlQmVlbkNhbGxlZFRpbWVzKDEpO1xuICBleHBlY3Qoc3RkZXJyTW9jay5tb2NrLmNhbGxzWzBdWzBdKS50b0NvbnRhaW4oXG4gICAgYFske2JsdWUoJ2xvZ2dyb3VwJyl9XSAke3llbGxvdyhleHBlY3RlZExvY2FsZVRpbWVTdHJpbmcpfSBtZXNzYWdlYCxcbiAgKTtcbn0pO1xuXG50ZXN0KCdwcm9jZXNzIHRydW5jYXRlZCBldmVudHMnLCBhc3luYyAoKSA9PiB7XG4gIC8vIEdJVkVOXG4gIGNvbnN0IGV2ZW50RGF0ZSA9IG5ldyBEYXRlKFQwICsgMTAyICogMTAwMCk7XG4gIGNvbnN0IGV2ZW50czogQVdTLkNsb3VkV2F0Y2hMb2dzLkZpbHRlcmVkTG9nRXZlbnRzID0gW107XG4gIGZvciAobGV0IGkgPSAwOyBpIDwgMTAwOyBpKyspIHtcbiAgICBldmVudHMucHVzaChldmVudCgxMDIraSwgJ21lc3NhZ2UnICsgaSwgZXZlbnREYXRlKSk7XG4gIH1cblxuICBzZGsuc3R1YkNsb3VkV2F0Y2hMb2dzKHtcbiAgICBmaWx0ZXJMb2dFdmVudHMoKSB7XG4gICAgICByZXR1cm4ge1xuICAgICAgICBldmVudHMsXG4gICAgICAgIG5leHRUb2tlbjogJ3NvbWUtdG9rZW4nLFxuICAgICAgfTtcbiAgICB9LFxuICB9KTtcbiAgbW9uaXRvci5hZGRMb2dHcm91cHMoXG4gICAge1xuICAgICAgbmFtZTogJ25hbWUnLFxuICAgICAgYWNjb3VudDogJzExMTExMTExMTExJyxcbiAgICAgIHJlZ2lvbjogJ3VzLWVhc3QtMScsXG4gICAgfSxcbiAgICBzZGssXG4gICAgWydsb2dncm91cCddLFxuICApO1xuICAvLyBXSEVOXG4gIG1vbml0b3IuYWN0aXZhdGUoKTtcbiAgLy8gbmVlZCB0aW1lIGZvciB0aGUgbG9nIHByb2Nlc3NpbmcgdG8gb2NjdXJcbiAgYXdhaXQgc2xlZXAoMTAwMCk7XG5cbiAgLy8gVEhFTlxuICBjb25zdCBleHBlY3RlZExvY2FsZVRpbWVTdHJpbmcgPSBldmVudERhdGUudG9Mb2NhbGVUaW1lU3RyaW5nKCk7XG4gIGV4cGVjdChzdGRlcnJNb2NrKS50b0hhdmVCZWVuQ2FsbGVkVGltZXMoMTAxKTtcbiAgZXhwZWN0KHN0ZGVyck1vY2subW9jay5jYWxsc1swXVswXSkudG9Db250YWluKFxuICAgIGBbJHtibHVlKCdsb2dncm91cCcpfV0gJHt5ZWxsb3coZXhwZWN0ZWRMb2NhbGVUaW1lU3RyaW5nKX0gbWVzc2FnZWAsXG4gICk7XG4gIGV4cGVjdChzdGRlcnJNb2NrLm1vY2suY2FsbHNbMTAwXVswXSkudG9Db250YWluKFxuICAgIGBbJHtibHVlKCdsb2dncm91cCcpfV0gJHt5ZWxsb3coZXhwZWN0ZWRMb2NhbGVUaW1lU3RyaW5nKX0gPj4+IFxcYHdhdGNoXFxgIHNob3dzIG9ubHkgdGhlIGZpcnN0IDEwMCBsb2cgbWVzc2FnZXMgLSB0aGUgcmVzdCBoYXZlIGJlZW4gdHJ1bmNhdGVkLi4uYCxcbiAgKTtcbn0pO1xuXG5jb25zdCBUMCA9IDE1OTc4MzcyMzA1MDQ7XG5jb25zdCBUMTAwID0gVDAgKyAxMDAgKiAxMDAwO1xuZnVuY3Rpb24gZXZlbnQobnI6IG51bWJlciwgbWVzc2FnZTogc3RyaW5nLCB0aW1lc3RhbXA6IERhdGUpOiBBV1MuQ2xvdWRXYXRjaExvZ3MuRmlsdGVyZWRMb2dFdmVudCB7XG4gIHJldHVybiB7XG4gICAgZXZlbnRJZDogYCR7bnJ9YCxcbiAgICBtZXNzYWdlLFxuICAgIHRpbWVzdGFtcDogdGltZXN0YW1wLmdldFRpbWUoKSxcbiAgICBpbmdlc3Rpb25UaW1lOiB0aW1lc3RhbXAuZ2V0VGltZSgpLFxuICB9O1xufVxuIl19
|