From 618442367d934c1d4c4dc7fd741b32f7dc553ee4 Mon Sep 17 00:00:00 2001 From: Elad Ben-Israel Date: Wed, 5 Dec 2018 14:24:34 +0200 Subject: [PATCH] feat(core): only include cdk libs in version reporting (#1290) Include only libraries with names that start with "@aws-cdk", "aws-cdk" or "jsii-". Fixes awslabs/cdk-ops#172 --- packages/@aws-cdk/cdk/lib/app.ts | 7 +++++++ packages/@aws-cdk/cdk/test/test.app.ts | 20 +++++++++++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/packages/@aws-cdk/cdk/lib/app.ts b/packages/@aws-cdk/cdk/lib/app.ts index 604f4295df332..bdf013f5091ac 100644 --- a/packages/@aws-cdk/cdk/lib/app.ts +++ b/packages/@aws-cdk/cdk/lib/app.ts @@ -133,6 +133,13 @@ export class App extends Root { } } + // include only libraries that are in the @aws-cdk npm scope + for (const name of Object.keys(libraries)) { + if (!name.startsWith('@aws-cdk/')) { + delete libraries[name]; + } + } + // add jsii runtime version libraries['jsii-runtime'] = getJsiiAgentVersion(); diff --git a/packages/@aws-cdk/cdk/test/test.app.ts b/packages/@aws-cdk/cdk/test/test.app.ts index dabdd852b2997..1f3712dfefc87 100644 --- a/packages/@aws-cdk/cdk/test/test.app.ts +++ b/packages/@aws-cdk/cdk/test/test.app.ts @@ -296,7 +296,25 @@ export = { delete process.env.JSII_AGENT; test.done(); - } + }, + + 'version reporting includes only @aws-cdk, aws-cdk and jsii libraries'(test: Test) { + const response = withApp({}, app => { + const stack = new Stack(app, 'stack1'); + new Resource(stack, 'MyResource', { type: 'Resource::Type' }); + }); + + const libs = response.runtime.libraries; + + const version = require('../package.json').version; + test.deepEqual(libs, { + '@aws-cdk/cdk': version, + '@aws-cdk/cx-api': version, + 'jsii-runtime': `node.js/${process.version}` + }); + + test.done(); + }, }; class MyConstruct extends Construct {