Fix bundling tests and force Docker bundling for Integration tests to…

… guarantee same behavior between local / CI tests
cdklabs · Jan 31, 2024 · 32837fa · 32837fa
1 parent aad2573
commit 32837fa
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 3 deletions.
diff --git a/src/bundling.ts b/src/bundling.ts
@@ -111,7 +111,7 @@ export class Bundling implements CdkBundlingOptions {
       !checkInstalledTarget(toTarget(this.props.architecture));
     this.image = shouldBuildImage
       ? props.dockerImage ??
-        DockerImage.fromBuild(__dirname, {
+        DockerImage.fromBuild(path.join(__dirname, '../'), {
           buildArgs: {
             ...(props.buildArgs ?? {}),
             // If runtime isn't passed use regional default, lowest common denominator is node18

diff --git a/test/bundling.test.ts b/test/bundling.test.ts
@@ -80,7 +80,7 @@ describe('Bundling in Docker', () => {
     );
 
     expect(DockerImage.fromBuild).toHaveBeenCalledWith(
-      expect.stringMatching(/aws-lambda-rust\/lib$/),
+      expect.stringMatching(/aws-lambda-rust\/$/),
       expect.objectContaining({
         buildArgs: expect.objectContaining({
           IMAGE: expect.stringMatching(/build-provided.al2023$/),
@@ -274,7 +274,7 @@ describe('Bundling in Docker', () => {
     });
 
     expect(DockerImage.fromBuild).toHaveBeenCalledWith(
-      expect.stringMatching(/lib$/),
+      expect.stringMatching(/aws-lambda-rust\/$/),
       expect.objectContaining({
         buildArgs: expect.objectContaining({
           HELLO: 'WORLD',

diff --git a/test/integ.function-bins.ts b/test/integ.function-bins.ts
@@ -15,6 +15,9 @@ class TestStack extends Stack {
     const fn = new RustFunction(this, 'binary1', {
       entry: 'rust-bins/Cargo.toml',
       binaryName: 'my_lambda1',
+      bundling: {
+        forceDockerBundling: true,
+      },
     });
     this.functionName = fn.functionName;
 

diff --git a/test/integ.function-workspace.ts b/test/integ.function-workspace.ts
@@ -15,6 +15,9 @@ class TestStack extends Stack {
     const fn = new RustFunction(this, 'binary1', {
       entry: 'rust-workspaces/Cargo.toml',
       binaryName: 'my_lambda2',
+      bundling: {
+        forceDockerBundling: true,
+      },
     });
     this.functionName = fn.functionName;
 

diff --git a/test/integ.function.ts b/test/integ.function.ts
@@ -14,6 +14,9 @@ class TestStack extends Stack {
 
     const fn = new RustFunction(this, 'binary1', {
       entry: 'rust-standalone/Cargo.toml',
+      bundling: {
+        forceDockerBundling: true,
+      },
     });
     this.functionName = fn.functionName;