[WIP] chore: clarify build dependencies for future hermetic builds

.gitignore

@@ -39,6 +39,7 @@ yarn-error.log
 
 # Parcel default cache directory
 .parcel-cache
+nozem.json
 
 # Cloud9
 .c9

package.json

@@ -14,6 +14,9 @@
     "build-all": "tsc -b"
   },
   "devDependencies": {
+    "@types/jest": "^26.0.10",
+    "@types/node": "^10.17.25",
+    "@typescript-eslint/parser": "^2.19.2",
     "conventional-changelog-cli": "^2.1.0",
     "fs-extra": "^9.0.1",
     "graceful-fs": "^4.2.4",

packages/@aws-cdk/assert/lib/index.ts

@@ -1,6 +1,7 @@
 export * from './assertion';
 export * from './canonicalize-assets';
 export * from './expect';
+export * from './canonicalize-assets';
 export * from './inspector';
 export * from './synth-utils';
 

packages/@aws-cdk/assets/package.json

@@ -89,6 +89,9 @@
   "engines": {
     "node": ">= 10.13.0 <13 || >=13.7.0"
   },
+  "nozem": {
+    "ostools": ["rm", "tar"]
+  },
   "stability": "deprecated",
   "maturity": "deprecated",
   "awscdkio": {

packages/@aws-cdk/aws-certificatemanager/lambda-packages/dns_validated_certificate_handler/.eslintrc.js

@@ -0,0 +1,3 @@
+const baseConfig = require('cdk-build-tools/config/eslintrc');
+baseConfig.parserOptions.project = __dirname + '/tsconfig.json';
+module.exports = baseConfig;

packages/@aws-cdk/aws-certificatemanager/lambda-packages/dns_validated_certificate_handler/package.json

@@ -27,8 +27,10 @@
   },
   "license": "Apache-2.0",
   "devDependencies": {
+    "cdk-build-tools": "0.0.0",
     "aws-sdk": "^2.596.0",
     "aws-sdk-mock": "^5.0.0",
+    "sinon": "^9.0.2",
     "eslint": "^6.8.0",
     "eslint-config-standard": "^14.1.0",
     "eslint-plugin-import": "^2.19.1",

packages/@aws-cdk/aws-codedeploy/.gitignore

@@ -14,5 +14,5 @@ nyc.config.js
 .LAST_PACKAGE
 *.snk
 !.eslintrc.js
-
-junit.xml
+!test/lambda/*/*.js
+junit.xml

packages/@aws-cdk/aws-codeguruprofiler/package.json

@@ -73,6 +73,7 @@
     "pkglint": "0.0.0"
   },
   "dependencies": {
+    "constructs": "^3.0.4",
     "@aws-cdk/aws-iam": "0.0.0",
     "@aws-cdk/core": "0.0.0"
   },

packages/@aws-cdk/aws-dynamodb-global/lambda-packages/aws-global-table-coordinator/package.json

@@ -30,6 +30,7 @@
     "aws-sdk": "^2.596.0",
     "aws-sdk-mock": "^5.0.0",
     "eslint": "^6.8.0",
+    "sinon": "^9.0.2",
     "eslint-config-standard": "^14.1.0",
     "eslint-plugin-import": "^2.19.1",
     "eslint-plugin-node": "^10.0.0",

packages/@aws-cdk/aws-dynamodb/package.json

@@ -67,6 +67,7 @@
     "@aws-cdk/assert": "0.0.0",
     "@types/jest": "^26.0.10",
     "aws-sdk": "^2.739.0",
+    "@types/sinon": "^9.0.4",
     "aws-sdk-mock": "^5.1.0",
     "cdk-build-tools": "0.0.0",
     "cdk-integ-tools": "0.0.0",

packages/@aws-cdk/aws-ec2/test/userdata.test.ts

@@ -1,6 +1,6 @@
 import { Bucket } from '@aws-cdk/aws-s3';
+import { Stack } from '@aws-cdk/core';
 import { nodeunitShim, Test } from 'nodeunit-shim';
-import { Stack } from '../../core/lib';
 import * as ec2 from '../lib';
 
 nodeunitShim({

packages/@aws-cdk/aws-ecr-assets/package.json

@@ -60,6 +60,7 @@
   },
   "license": "Apache-2.0",
   "devDependencies": {
+    "@types/minimatch": "^3.0.3",
     "@aws-cdk/assert": "0.0.0",
     "@types/nodeunit": "^0.0.31",
     "@types/proxyquire": "^1.3.28",

packages/@aws-cdk/aws-eks/package.json

@@ -64,6 +64,7 @@
   "license": "Apache-2.0",
   "devDependencies": {
     "@aws-cdk/assert": "0.0.0",
+    "@types/sinon": "^9.0.4",
     "@types/nodeunit": "^0.0.31",
     "@types/yaml": "1.2.0",
     "aws-sdk": "^2.739.0",

packages/@aws-cdk/aws-events-targets/.gitignore

@@ -15,6 +15,8 @@ nyc.config.js
 *.snk
 .cdk.staging
 
+!build-tools/*
+
 lib/sdk-api-metadata.json
 !.eslintrc.js
 !jest.config.js

packages/@aws-cdk/aws-glue/jest.config.js

@@ -1,2 +1,2 @@
-const baseConfig = require('../../../tools/cdk-build-tools/config/jest.config');
+const baseConfig = require('cdk-build-tools/config/jest.config');
 module.exports = baseConfig;

packages/@aws-cdk/aws-iam/package.json

@@ -65,11 +65,14 @@
   "license": "Apache-2.0",
   "devDependencies": {
     "@aws-cdk/assert": "0.0.0",
+    "@types/aws-lambda": "^8.10.39",
     "cdk-build-tools": "0.0.0",
     "cdk-integ-tools": "0.0.0",
     "cfn2ts": "0.0.0",
     "jest": "^25.5.4",
     "pkglint": "0.0.0",
+    "aws-sdk": "^2.739.0",
+    "@types/sinon": "^9.0.4",
     "sinon": "^9.0.3"
   },
   "dependencies": {

packages/@aws-cdk/aws-lambda-nodejs/package.json

@@ -59,7 +59,9 @@
   },
   "license": "Apache-2.0",
   "devDependencies": {
+    "@types/fs-extra": "^8.1.0",
     "@aws-cdk/assert": "0.0.0",
+    "aws-sdk": "^2.713.0",
     "cdk-build-tools": "0.0.0",
     "cdk-integ-tools": "0.0.0",
     "delay": "4.4.0",
@@ -85,6 +87,10 @@
   "awscdkio": {
     "announce": false
   },
+  "nozem": {
+    "ostools": ["docker"],
+    "copyAllSourcesForTest": true
+  },
   "cdk-build": {
     "jest": true
   }

packages/@aws-cdk/aws-lambda-nodejs/test/function.test.ts

@@ -7,6 +7,10 @@ import { Stack } from '@aws-cdk/core';
 import { NodejsFunction } from '../lib';
 import { Bundling } from '../lib/bundling';
 
+const PROJECT_ROOT = process.env.NZM_SOURCE_PACKAGE
+  ? process.env.NZM_SOURCE_PACKAGE
+  : path.join(__dirname, '..');
+
 jest.mock('../lib/bundling', () => {
   return {
     Bundling: {
@@ -28,10 +32,12 @@ beforeEach(() => {
 
 test('NodejsFunction with .ts handler', () => {
   // WHEN
-  new NodejsFunction(stack, 'handler1');
+  new NodejsFunction(stack, 'handler1', {
+    projectRoot: PROJECT_ROOT,
+  });
 
   expect(Bundling.parcel).toHaveBeenCalledWith(expect.objectContaining({
-    entry: expect.stringContaining('function.test.handler1.ts'), // Automatically finds .ts handler file
+    entry: expect.stringContaining('function.test.handler1.'), // Automatically finds .ts handler file
   }));
 
   expect(stack).toHaveResource('AWS::Lambda::Function', {
@@ -41,7 +47,9 @@ test('NodejsFunction with .ts handler', () => {
 
 test('NodejsFunction with .js handler', () => {
   // WHEN
-  new NodejsFunction(stack, 'handler2');
+  new NodejsFunction(stack, 'handler2', {
+    projectRoot: PROJECT_ROOT,
+  });
 
   // THEN
   expect(Bundling.parcel).toHaveBeenCalledWith(expect.objectContaining({
@@ -52,6 +60,7 @@ test('NodejsFunction with .js handler', () => {
 test('NodejsFunction with container env vars', () => {
   // WHEN
   new NodejsFunction(stack, 'handler1', {
+    projectRoot: PROJECT_ROOT,
     parcelEnvironment: {
       KEY: 'VALUE',
     },
@@ -67,6 +76,7 @@ test('NodejsFunction with container env vars', () => {
 test('throws when entry is not js/ts', () => {
   expect(() => new NodejsFunction(stack, 'Fn', {
     entry: 'handler.py',
+    projectRoot: PROJECT_ROOT,
   })).toThrow(/Only JavaScript or TypeScript entry files are supported/);
 });
 
@@ -85,15 +95,19 @@ test('accepts tsx', () => {
 test('throws when entry does not exist', () => {
   expect(() => new NodejsFunction(stack, 'Fn', {
     entry: 'notfound.ts',
+    projectRoot: PROJECT_ROOT,
   })).toThrow(/Cannot find entry file at/);
 });
 
 test('throws when entry cannot be automatically found', () => {
-  expect(() => new NodejsFunction(stack, 'Fn')).toThrow(/Cannot find entry file./);
+  expect(() => new NodejsFunction(stack, 'Fn', {
+    projectRoot: PROJECT_ROOT,
+  })).toThrow(/Cannot find entry file./);
 });
 
 test('throws with the wrong runtime family', () => {
   expect(() => new NodejsFunction(stack, 'handler1', {
+    projectRoot: PROJECT_ROOT,
     runtime: Runtime.PYTHON_3_8,
   })).toThrow(/Only `NODEJS` runtimes are supported/);
 });
@@ -105,7 +119,7 @@ test('resolves entry to an absolute path', () => {
   });
 
   expect(Bundling.parcel).toHaveBeenCalledWith(expect.objectContaining({
-    entry: expect.stringMatching(/@aws-cdk\/aws-lambda-nodejs\/lib\/index.ts$/),
+    entry: path.resolve(__dirname, '..', 'lib', 'index.ts'),
   }));
 });
 

packages/@aws-cdk/aws-lambda-nodejs/test/integ.dependencies.ts

@@ -7,8 +7,13 @@ class TestStack extends Stack {
   constructor(scope: Construct, id: string, props?: StackProps) {
     super(scope, id, props);
 
+    const projectRoot = process.env.NZM_PACKAGE_SOURCE
+      ? path.join(process.env.NZM_PACKAGE_SOURCE, '..', '..', '..')
+      : undefined;
+
     // This function uses aws-sdk but it will not be included
     new lambda.NodejsFunction(this, 'external', {
+      projectRoot,
       entry: path.join(__dirname, 'integ-handlers/dependencies.ts'),
       runtime: Runtime.NODEJS_12_X,
       minify: true,

packages/@aws-cdk/aws-lambda-nodejs/test/integ.function.ts

@@ -7,14 +7,23 @@ class TestStack extends Stack {
   constructor(scope: Construct, id: string, props?: StackProps) {
     super(scope, id, props);
 
+    const projectRoot = process.env.NZM_PACKAGE_SOURCE
+      ? path.join(process.env.NZM_PACKAGE_SOURCE, '..', '..', '..')
+      : undefined;
+    const testRoot = process.env.NZM_PACKAGE_SOURCE
+      ? path.join(process.env.NZM_PACKAGE_SOURCE, 'test')
+      : __dirname;
+
     new lambda.NodejsFunction(this, 'ts-handler', {
-      entry: path.join(__dirname, 'integ-handlers/ts-handler.ts'),
+      projectRoot,
+      entry: path.join(testRoot, 'integ-handlers/ts-handler.ts'),
       runtime: Runtime.NODEJS_12_X,
       minify: true,
     });
 
     new lambda.NodejsFunction(this, 'js-handler', {
-      entry: path.join(__dirname, 'integ-handlers/js-handler.js'),
+      projectRoot,
+      entry: path.join(testRoot, 'integ-handlers/js-handler.js'),
       runtime: Runtime.NODEJS_12_X,
     });
   }

packages/@aws-cdk/aws-lambda-nodejs/test/util.test.ts

@@ -3,17 +3,17 @@ import { findUp } from '../lib/util';
 
 test('findUp', () => {
   // Starting at process.cwd()
-  expect(findUp('README.md')).toMatch(/aws-lambda-nodejs$/);
+  expect(findUp('README.md')).toEqual(path.resolve(__dirname, '..'));
 
   // Non existing file
   expect(findUp('non-existing-file.unknown')).toBe(undefined);
 
   // Starting at a specific path
-  expect(findUp('util.test.ts', path.join(__dirname, 'integ-handlers'))).toMatch(/aws-lambda-nodejs\/test$/);
+  expect(findUp('util.test.ts', path.join(__dirname, 'integ-handlers'))).toEqual(__dirname);
 
   // Non existing file starting at a non existing relative path
   expect(findUp('not-to-be-found.txt', 'non-existing/relative/path')).toBe(undefined);
 
   // Starting at a relative path
-  expect(findUp('util.test.ts', 'test/integ-handlers')).toMatch(/aws-lambda-nodejs\/test$/);
+  expect(findUp('util.test.ts', 'test/integ-handlers')).toEqual(__dirname);
 });

packages/@aws-cdk/aws-lambda/package.json

@@ -171,6 +171,9 @@
     ]
   },
   "stability": "stable",
+  "nozem": {
+    "ostools": ["docker"]
+  },
   "awscdkio": {
     "announce": false
   },

packages/@aws-cdk/aws-lambda/test/integ.current-version.expected.json

@@ -36,7 +36,7 @@
       "Properties": {
         "Code": {
           "S3Bucket": {
-            "Ref": "AssetParameters8811a2632ac5564a08fd269e159298f7e497f259578b0dc5e927a1f48ab24d34S3BucketB47CCF1E"
+            "Ref": "AssetParameters5bfcc5e85793015838d125d6e30f1a931da22ebe768a9bad5cd1b17fd6bd0a3cS3BucketE8900D83"
           },
           "S3Key": {
             "Fn::Join": [
@@ -49,7 +49,7 @@
                       "Fn::Split": [
                         "||",
                         {
-                          "Ref": "AssetParameters8811a2632ac5564a08fd269e159298f7e497f259578b0dc5e927a1f48ab24d34S3VersionKey80D7B84B"
+                          "Ref": "AssetParameters5bfcc5e85793015838d125d6e30f1a931da22ebe768a9bad5cd1b17fd6bd0a3cS3VersionKeyFD066EB8"
                         }
                       ]
                     }
@@ -62,7 +62,7 @@
                       "Fn::Split": [
                         "||",
                         {
-                          "Ref": "AssetParameters8811a2632ac5564a08fd269e159298f7e497f259578b0dc5e927a1f48ab24d34S3VersionKey80D7B84B"
+                          "Ref": "AssetParameters5bfcc5e85793015838d125d6e30f1a931da22ebe768a9bad5cd1b17fd6bd0a3cS3VersionKeyFD066EB8"
                         }
                       ]
                     }
@@ -127,17 +127,17 @@
     }
   },
   "Parameters": {
-    "AssetParameters8811a2632ac5564a08fd269e159298f7e497f259578b0dc5e927a1f48ab24d34S3BucketB47CCF1E": {
+    "AssetParameters5bfcc5e85793015838d125d6e30f1a931da22ebe768a9bad5cd1b17fd6bd0a3cS3BucketE8900D83": {
       "Type": "String",
-      "Description": "S3 bucket for asset \"8811a2632ac5564a08fd269e159298f7e497f259578b0dc5e927a1f48ab24d34\""
+      "Description": "S3 bucket for asset \"5bfcc5e85793015838d125d6e30f1a931da22ebe768a9bad5cd1b17fd6bd0a3c\""
     },
-    "AssetParameters8811a2632ac5564a08fd269e159298f7e497f259578b0dc5e927a1f48ab24d34S3VersionKey80D7B84B": {
+    "AssetParameters5bfcc5e85793015838d125d6e30f1a931da22ebe768a9bad5cd1b17fd6bd0a3cS3VersionKeyFD066EB8": {
       "Type": "String",
-      "Description": "S3 key for asset version \"8811a2632ac5564a08fd269e159298f7e497f259578b0dc5e927a1f48ab24d34\""
+      "Description": "S3 key for asset version \"5bfcc5e85793015838d125d6e30f1a931da22ebe768a9bad5cd1b17fd6bd0a3c\""
     },
-    "AssetParameters8811a2632ac5564a08fd269e159298f7e497f259578b0dc5e927a1f48ab24d34ArtifactHash70E274C4": {
+    "AssetParameters5bfcc5e85793015838d125d6e30f1a931da22ebe768a9bad5cd1b17fd6bd0a3cArtifactHashD5562C20": {
       "Type": "String",
-      "Description": "Artifact hash for asset \"8811a2632ac5564a08fd269e159298f7e497f259578b0dc5e927a1f48ab24d34\""
+      "Description": "Artifact hash for asset \"5bfcc5e85793015838d125d6e30f1a931da22ebe768a9bad5cd1b17fd6bd0a3c\""
     }
   }
 }