Merge branch 'master' into sub

Author: mergify[bot]

packages/@aws-cdk/core/lib/private/runtime-info.ts

@@ -4,6 +4,8 @@ import { major as nodeMajorVersion } from './node-version';
 
 // list of NPM scopes included in version reporting e.g. @aws-cdk and @aws-solutions-konstruk
 const WHITELIST_SCOPES = ['@aws-cdk', '@aws-solutions-konstruk', '@aws-solutions-constructs'];
+// list of NPM packages included in version reporting
+const WHITELIST_PACKAGES = ['aws-rfdk'];
 
 /**
  * Returns a list of loaded modules and their versions.
@@ -26,6 +28,7 @@ export function collectRuntimeInformation(): cxschema.RuntimeInfo {
         foundMatch = true;
       }
     }
+    foundMatch = foundMatch || WHITELIST_PACKAGES.includes(name);
 
     if (!foundMatch) {
       delete libraries[name];

packages/@aws-cdk/core/test/test.runtime-info.ts

@@ -32,6 +32,34 @@ export = {
     test.done();
   },
 
+  'version reporting finds aws-rfdk package'(test: Test) {
+    const pkgdir = fs.mkdtempSync(path.join(os.tmpdir(), 'runtime-info-rfdk'));
+    const mockVersion = '1.2.3';
+
+    fs.writeFileSync(path.join(pkgdir, 'index.js'), 'module.exports = \'this is foo\';');
+    fs.writeFileSync(path.join(pkgdir, 'package.json'), JSON.stringify({
+      name: 'aws-rfdk',
+      version: mockVersion,
+    }));
+
+    // eslint-disable-next-line @typescript-eslint/no-require-imports, import/no-extraneous-dependencies
+    require(pkgdir);
+
+    const runtimeInfo = collectRuntimeInformation();
+
+    // eslint-disable-next-line @typescript-eslint/no-require-imports
+    const version = require('../package.json').version;
+    test.deepEqual(runtimeInfo.libraries , {
+      '@aws-cdk/core': version,
+      '@aws-cdk/cx-api': version,
+      '@aws-cdk/cloud-assembly-schema': version,
+      '@aws-solutions-konstruk/foo': mockVersion, // picks up the module from the other test.
+      'aws-rfdk': mockVersion,
+      'jsii-runtime': `node.js/${process.version}`,
+    });
+    test.done();
+  },
+
   'version reporting finds no version with no associated package.json'(test: Test) {
     const pkgdir = fs.mkdtempSync(path.join(os.tmpdir(), 'runtime-info-find-npm-package-fixture'));
     const mockVersion = '1.2.3';