chore: make some tests less directory dependent (#24605)

In order to make these tests work post repo-restructure, change them to correctly use `__dirname` in order to point to relative files like assets when needed.

Author: MrArnoldPalmer

packages/@aws-cdk/aws-ecr-assets/test/tarball-asset.test.ts

@@ -11,12 +11,13 @@ import { TarballImageAsset } from '../lib';
 
 
 describe('image asset', () => {
+  const tarballFile = path.join(__dirname, 'demo-tarball', 'empty.tar');
   test('test instantiating Asset Image', () => {
     // GIVEN
     const app = new App();
     const stack = new Stack(app);
     const asset = new TarballImageAsset(stack, 'Image', {
-      tarballFile: __dirname + '/demo-tarball/empty.tar',
+      tarballFile,
     });
 
     // WHEN
@@ -56,7 +57,7 @@ describe('image asset', () => {
     const stack = new Stack();
     const user = new iam.User(stack, 'MyUser');
     const asset = new TarballImageAsset(stack, 'Image', {
-      tarballFile: 'test/demo-tarball/empty.tar',
+      tarballFile,
     });
 
     // WHEN
@@ -118,7 +119,7 @@ describe('image asset', () => {
     const app = new App();
     const stack = new Stack(app);
     const image = new TarballImageAsset(stack, 'MyAsset', {
-      tarballFile: 'test/demo-tarball/empty.tar',
+      tarballFile,
     });
 
     const session = app.synth();
@@ -145,10 +146,10 @@ describe('image asset', () => {
       }),
     });
     const asset1 = new TarballImageAsset(stack1, 'MyAsset', {
-      tarballFile: 'test/demo-tarball/empty.tar',
+      tarballFile,
     });
     const asset2 = new TarballImageAsset(stack2, 'MyAsset', {
-      tarballFile: 'test/demo-tarball/empty.tar',
+      tarballFile,
     });
 
     test('stack with default synthesizer', () => {

packages/@aws-cdk/aws-lambda-go/test/docker.test.ts

@@ -1,12 +1,13 @@
 import { spawnSync } from 'child_process';
 import * as path from 'path';
 
+const docker = process.env.CDK_DOCKER ?? 'docker';
 beforeAll(() => {
-  spawnSync('docker', ['build', '-t', 'golang', path.join(__dirname, '../lib')]);
+  spawnSync(docker, ['build', '-t', 'golang', path.join(__dirname, '../lib')]);
 });
 
 test('golang is available', async () => {
-  const proc = spawnSync('docker', [
+  const proc = spawnSync(docker, [
     'run', 'golang',
     'sh', '-c',
     'go version',

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

@@ -43,7 +43,7 @@ test('GoFunction with defaults', () => {
 test('GoFunction with using provided runtime', () => {
   // WHEN
   new GoFunction(stack, 'handler', {
-    entry: 'test/lambda-handler-vendor/cmd/api',
+    entry: path.join(__dirname, 'lambda-handler-vendor/cmd/api'),
     runtime: Runtime.PROVIDED,
   });
 
@@ -60,7 +60,7 @@ test('GoFunction with using provided runtime', () => {
 test('GoFunction with using golang runtime', () => {
   // WHEN
   new GoFunction(stack, 'handler', {
-    entry: 'test/lambda-handler-vendor/cmd/api',
+    entry: path.join(__dirname, 'lambda-handler-vendor/cmd/api'),
     runtime: Runtime.GO_1_X,
   });
 
@@ -77,7 +77,7 @@ test('GoFunction with using golang runtime', () => {
 test('GoFunction with container env vars', () => {
   // WHEN
   new GoFunction(stack, 'handler', {
-    entry: 'test/lambda-handler-vendor/cmd/api',
+    entry: path.join(__dirname, 'lambda-handler-vendor/cmd/api'),
     bundling: {
       environment: {
         KEY: 'VALUE',
@@ -94,15 +94,15 @@ test('GoFunction with container env vars', () => {
 
 test('throws with the wrong runtime family', () => {
   expect(() => new GoFunction(stack, 'handler', {
-    entry: 'test/lambda-handler-vendor/cmd/api',
+    entry: path.join(__dirname, 'lambda-handler-vendor/cmd/api'),
     runtime: Runtime.PYTHON_3_8,
   })).toThrow(/Only `go` and `provided` runtimes are supported/);
 });
 
 test('resolves entry to an absolute path', () => {
   // WHEN
   new GoFunction(stack, 'fn', {
-    entry: 'test/lambda-handler-vendor/cmd/api/main.go',
+    entry: path.join(__dirname, 'lambda-handler-vendor/cmd/api/main.go'),
   });
 
   expect(Bundling.bundle).toHaveBeenCalledWith(expect.objectContaining({
@@ -112,22 +112,22 @@ test('resolves entry to an absolute path', () => {
 
 test('throws with no existing go.mod file', () => {
   expect(() => new GoFunction(stack, 'handler', {
-    entry: 'test/lambda-handler-vendor/cmd/api',
+    entry: path.join(__dirname, 'lambda-handler-vendor/cmd/api'),
     moduleDir: '/does/not/exist/go.mod',
   })).toThrow(/go.mod file at \/does\/not\/exist\/go.mod doesn't exist/);
 });
 
 test('throws with incorrect moduleDir file', () => {
   expect(() => new GoFunction(stack, 'handler', {
-    entry: 'test/lambda-handler-vendor/cmd/api',
+    entry: path.join(__dirname, 'lambda-handler-vendor/cmd/api'),
     moduleDir: '/does/not/exist.mod',
   })).toThrow(/moduleDir is specifying a file that is not go.mod/);
 });
 
 test('custom moduleDir can be used', () => {
   new GoFunction(stack, 'handler', {
-    entry: 'test/lambda-handler-vendor/cmd/api',
-    moduleDir: 'test/lambda-handler-vendor',
+    entry: path.join(__dirname, 'lambda-handler-vendor/cmd/api'),
+    moduleDir: path.join(__dirname, 'lambda-handler-vendor'),
   });
 
   Template.fromStack(stack).hasResourceProperties('AWS::Lambda::Function', {
@@ -137,8 +137,8 @@ test('custom moduleDir can be used', () => {
 
 test('custom moduleDir with file path can be used', () => {
   new GoFunction(stack, 'handler', {
-    entry: 'test/lambda-handler-vendor/cmd/api',
-    moduleDir: 'test/lambda-handler-vendor/go.mod',
+    entry: path.join(__dirname, 'lambda-handler-vendor/cmd/api'),
+    moduleDir: path.join(__dirname, 'lambda-handler-vendor/go.mod'),
   });
 
   Template.fromStack(stack).hasResourceProperties('AWS::Lambda::Function', {

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

@@ -1,4 +1,5 @@
 import * as child_process from 'child_process';
+import * as fs from 'fs';
 import * as os from 'os';
 import * as path from 'path';
 import { Architecture, Code, Runtime, RuntimeFamily } from '@aws-cdk/aws-lambda';
@@ -641,7 +642,7 @@ test('esbuild bundling with pre compilations', () => {
     architecture: Architecture.X86_64,
   });
 
-  const compilerOptions = util.getTsconfigCompilerOptions(path.join(__dirname, '..', 'tsconfig.json'));
+  const compilerOptions = util.getTsconfigCompilerOptions(findParentTsConfigPath(__dirname));
 
   // Correctly bundles with esbuild
   expect(Code.fromAsset).toHaveBeenCalledWith(path.dirname(packageLock), {
@@ -845,3 +846,14 @@ test('Custom bundling file copy variant', () => {
     }),
   });
 });
+
+function findParentTsConfigPath(dir: string, depth: number = 1, limit: number = 5): string {
+  const target = path.join(dir, 'tsconfig.json');
+  if (fs.existsSync(target)) {
+    return target;
+  } else if (depth < limit) {
+    return findParentTsConfigPath(path.join(dir, '..'), depth + 1, limit);
+  }
+
+  throw new Error(`No \`package.json\` file found within ${depth} parent directories`);
+}

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

@@ -1,20 +1,21 @@
 import { spawnSync } from 'child_process';
 import * as path from 'path';
 
+const docker = process.env.CDK_DOCKER ?? 'docker';
 beforeAll(() => {
-  spawnSync('docker', ['build', '-t', 'esbuild', path.join(__dirname, '../lib')]);
+  spawnSync(docker, ['build', '-t', 'esbuild', path.join(__dirname, '../lib')]);
 });
 
 test('esbuild is available', () => {
-  const proc = spawnSync('docker', [
+  const proc = spawnSync(docker, [
     'run', 'esbuild',
     'esbuild', '--version',
   ]);
   expect(proc.status).toEqual(0);
 });
 
 test('can npm install with non root user', () => {
-  const proc = spawnSync('docker', [
+  const proc = spawnSync(docker, [
     'run', '-u', '1000:1000',
     'esbuild',
     'bash', '-c', [
@@ -27,7 +28,7 @@ test('can npm install with non root user', () => {
 });
 
 test('can yarn install with non root user', () => {
-  const proc = spawnSync('docker', [
+  const proc = spawnSync(docker, [
     'run', '-u', '500:500',
     'esbuild',
     'bash', '-c', [
@@ -40,7 +41,7 @@ test('can yarn install with non root user', () => {
 });
 
 test('can pnpm install with non root user', () => {
-  const proc = spawnSync('docker', [
+  const proc = spawnSync(docker, [
     'run', '-u', '500:500',
     'esbuild',
     'bash', '-c', [
@@ -53,7 +54,7 @@ test('can pnpm install with non root user', () => {
 });
 
 test('cache folders have the right permissions', () => {
-  const proc = spawnSync('docker', [
+  const proc = spawnSync(docker, [
     'run', 'esbuild',
     'bash', '-c', [
       'stat -c \'%a\' /tmp/npm-cache',

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

@@ -47,7 +47,7 @@ beforeEach(() => {
 
 test('PythonFunction with defaults', () => {
   new PythonFunction(stack, 'handler', {
-    entry: 'test/lambda-handler',
+    entry: path.join(__dirname, 'lambda-handler'),
     runtime: Runtime.PYTHON_3_8,
   });
 
@@ -62,7 +62,7 @@ test('PythonFunction with defaults', () => {
 
 test('PythonFunction with index in a subdirectory', () => {
   new PythonFunction(stack, 'handler', {
-    entry: 'test/lambda-handler-sub',
+    entry: path.join(__dirname, 'lambda-handler-sub'),
     index: 'inner/custom_index.py',
     handler: 'custom_handler',
     runtime: Runtime.PYTHON_3_8,
@@ -79,7 +79,7 @@ test('PythonFunction with index in a subdirectory', () => {
 
 test('PythonFunction with index in a nested subdirectory', () => {
   new PythonFunction(stack, 'handler', {
-    entry: 'test/lambda-handler-sub-nested',
+    entry: path.join(__dirname, 'lambda-handler-sub-nested'),
     index: 'inner/inner2/custom_index.py',
     handler: 'custom_handler',
     runtime: Runtime.PYTHON_3_8,
@@ -96,7 +96,7 @@ test('PythonFunction with index in a nested subdirectory', () => {
 
 test('throws when index is not py', () => {
   expect(() => new PythonFunction(stack, 'Fn', {
-    entry: 'test/lambda-handler',
+    entry: path.join(__dirname, 'lambda-handler'),
     index: 'index.js',
     runtime: Runtime.PYTHON_3_8,
   })).toThrow(/Only Python \(\.py\) index files are supported/);
@@ -111,37 +111,37 @@ test('throws when entry does not exist', () => {
 
 test('throws with the wrong runtime family', () => {
   expect(() => new PythonFunction(stack, 'handler1', {
-    entry: 'test/lambda-handler',
+    entry: path.join(__dirname, 'lambda-handler'),
     runtime: Runtime.NODEJS_14_X,
   })).toThrow(/Only `PYTHON` runtimes are supported/);
 });
 
 test('allows specifying hash type', () => {
   new PythonFunction(stack, 'source1', {
-    entry: 'test/lambda-handler-nodeps',
+    entry: path.join(__dirname, 'lambda-handler-nodeps'),
     index: 'index.py',
     handler: 'handler',
     runtime: Runtime.PYTHON_3_8,
   });
 
   new PythonFunction(stack, 'source2', {
-    entry: 'test/lambda-handler-nodeps',
+    entry: path.join(__dirname, 'lambda-handler-nodeps'),
     index: 'index.py',
     handler: 'handler',
     runtime: Runtime.PYTHON_3_8,
     bundling: { assetHashType: AssetHashType.SOURCE },
   });
 
   new PythonFunction(stack, 'output', {
-    entry: 'test/lambda-handler-nodeps',
+    entry: path.join(__dirname, 'lambda-handler-nodeps'),
     index: 'index.py',
     handler: 'handler',
     runtime: Runtime.PYTHON_3_8,
     bundling: { assetHashType: AssetHashType.OUTPUT },
   });
 
   new PythonFunction(stack, 'custom', {
-    entry: 'test/lambda-handler-nodeps',
+    entry: path.join(__dirname, 'lambda-handler-nodeps'),
     index: 'index.py',
     handler: 'handler',
     runtime: Runtime.PYTHON_3_8,

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

@@ -21,6 +21,7 @@ import { AdotLambdaLayerJavaSdkVersion } from '../lib/adot-layers';
 import { calculateFunctionHash } from '../lib/function-hash';
 
 describe('function', () => {
+  const dockerLambdaHandlerPath = path.join(__dirname, 'docker-lambda-handler');
   test('default function', () => {
     const stack = new cdk.Stack();
 
@@ -1211,7 +1212,7 @@ describe('function', () => {
     const stack = new cdk.Stack();
 
     new lambda.Function(stack, 'MyLambda', {
-      code: lambda.Code.fromAssetImage(path.join(__dirname, 'docker-lambda-handler')),
+      code: lambda.Code.fromAssetImage(dockerLambdaHandlerPath),
       handler: lambda.Handler.FROM_IMAGE,
       runtime: lambda.Runtime.FROM_IMAGE,
     });
@@ -2622,13 +2623,13 @@ describe('function', () => {
       const stack = new cdk.Stack();
 
       expect(() => new lambda.Function(stack, 'Fn1', {
-        code: lambda.Code.fromAssetImage('test/docker-lambda-handler'),
+        code: lambda.Code.fromAssetImage(dockerLambdaHandlerPath),
         handler: lambda.Handler.FROM_IMAGE,
         runtime: lambda.Runtime.FROM_IMAGE,
       })).not.toThrow();
 
       expect(() => new lambda.Function(stack, 'Fn2', {
-        code: lambda.Code.fromAssetImage('test/docker-lambda-handler'),
+        code: lambda.Code.fromAssetImage(dockerLambdaHandlerPath),
         handler: 'index.handler',
         runtime: lambda.Runtime.FROM_IMAGE,
       })).toThrow(/handler must be.*FROM_IMAGE/);
@@ -2638,13 +2639,13 @@ describe('function', () => {
       const stack = new cdk.Stack();
 
       expect(() => new lambda.Function(stack, 'Fn1', {
-        code: lambda.Code.fromAssetImage('test/docker-lambda-handler'),
+        code: lambda.Code.fromAssetImage(dockerLambdaHandlerPath),
         handler: lambda.Handler.FROM_IMAGE,
         runtime: lambda.Runtime.FROM_IMAGE,
       })).not.toThrow();
 
       expect(() => new lambda.Function(stack, 'Fn2', {
-        code: lambda.Code.fromAssetImage('test/docker-lambda-handler'),
+        code: lambda.Code.fromAssetImage(dockerLambdaHandlerPath),
         handler: lambda.Handler.FROM_IMAGE,
         runtime: lambda.Runtime.GO_1_X,
       })).toThrow(/runtime must be.*FROM_IMAGE/);
@@ -2737,7 +2738,7 @@ describe('function', () => {
     });
 
     expect(() => new lambda.DockerImageFunction(stack, 'MyLambda', {
-      code: lambda.DockerImageCode.fromImageAsset(path.join(__dirname, 'docker-lambda-handler')),
+      code: lambda.DockerImageCode.fromImageAsset(dockerLambdaHandlerPath),
       layers: [layer],
     })).toThrow(/Layers are not supported for container image functions/);
   });
@@ -3087,7 +3088,7 @@ describe('function', () => {
     expect(
       () =>
         new lambda.DockerImageFunction(stack, 'MyLambda', {
-          code: lambda.DockerImageCode.fromImageAsset(path.join(__dirname, 'docker-lambda-handler')),
+          code: lambda.DockerImageCode.fromImageAsset(dockerLambdaHandlerPath),
           adotInstrumentation: {
             layerVersion: lambda.AdotLayerVersion.fromJavaSdkLayerVersion(AdotLambdaLayerJavaSdkVersion.V1_19_0),
             execWrapper: lambda.AdotLambdaExecWrapper.REGULAR_HANDLER,