Add the same changes to aws-cdk-lib.

packages/aws-cdk-lib/.gitignore

@@ -16,4 +16,10 @@ dist
 # Ignore barrel import entry points
 /*.ts
 
-junit.xml
+junit.xml
+
+.nyc_output
+coverage
+nyc.config.js
+!jest.config.js
+!jest.setup.local.js

packages/aws-cdk-lib/.npmignore

@@ -25,3 +25,5 @@ tsconfig.json
 # exclude cdk artifacts
 **/cdk.out
 junit.xml
+jest.config.js
+jest.setup.local.js

packages/aws-cdk-lib/jest.config.js

@@ -0,0 +1,5 @@
+const baseConfig = require('cdk-build-tools/config/jest.config');
+// no point in collecting coverage for aws-cdk-lib
+baseConfig.collectCoverage = false;
+baseConfig.setupFiles = ['./jest.setup.local.js'];
+module.exports = baseConfig;

packages/aws-cdk-lib/jest.setup.local.js

@@ -0,0 +1,6 @@
+// disallow tests (and production code) in aws-cdk-lib from including the @aws-cdk/core module,
+// which effectively bans using any @aws-cdk/* module,
+// as they all depend on @aws-cdk/core
+jest.mock('@aws-cdk/core', () => {
+    throw new Error('@aws-cdk/core is not available in aws-cdk-lib tests!')
+});

packages/aws-cdk-lib/package.json

@@ -13,10 +13,10 @@
   "stability": "experimental",
   "maturity": "developer-preview",
   "scripts": {
-    "gen": "ubergen",
+    "gen": "ubergen && cfn-include-mapping-rewriter lib/cloudformation-include aws-cdk-lib",
     "build": "cdk-build",
     "lint": "cdk-lint",
-    "test": "echo done",
+    "test": "cdk-test",
     "package": "cdk-package",
     "pkglint": "pkglint -f",
     "build+test": "npm run build && npm test",
@@ -30,6 +30,7 @@
     ]
   },
   "cdk-build": {
+    "jest": true,
     "eslint": {
       "disable": true
     }
@@ -270,6 +271,7 @@
     "@types/fs-extra": "^8.1.1",
     "@types/node": "^10.17.47",
     "cdk-build-tools": "0.0.0",
+    "cfn-include-mapping-rewriter": "0.0.0",
     "constructs": "^3.2.0",
     "fs-extra": "^9.0.1",
     "pkglint": "0.0.0",

packages/aws-cdk-lib/test/cfn-include/cfn-include.test.ts

@@ -0,0 +1,13 @@
+import * as cfn_inc from '../../cloudformation-include';
+import * as s3 from '../../aws-s3';
+import { Stack } from '../../lib';
+
+test('cloudformation-include works in aws-cdk-lib', () => {
+  const stack = new Stack();
+  const cfnInclude = new cfn_inc.CfnInclude(stack, 'Template', {
+    templateFile: `${__dirname}/minimal-template.json`
+  });
+  const cfnBucket = cfnInclude.getResource('Bucket') as s3.CfnBucket;
+
+  expect(cfnBucket.bucketName).toEqual('my-bucket');
+});

packages/aws-cdk-lib/test/cfn-include/minimal-template.json

@@ -0,0 +1,10 @@
+{
+  "Resources": {
+    "Bucket": {
+      "Type": "AWS::S3::Bucket",
+      "Properties": {
+        "BucketName": "my-bucket"
+      }
+    }
+  }
+}