fix: Fix Dockerfile reference issue (#35)

* fix: Fix Dockerfile reference issue

* Moving Dockerfile to be packged by CI

* Fixing docker tests

* Fix bundling tests and force Docker bundling for Integration tests to guarantee same behavior between local / CI tests

Author: stevehouel

src/Dockerfile Dockerfile

@@ -111,7 +111,7 @@ export class Bundling implements CdkBundlingOptions {
       !checkInstalledTarget(toTarget(this.props.architecture));
     this.image = shouldBuildImage
       ? props.dockerImage ??
-        DockerImage.fromBuild(path.join(__dirname, '../src'), {
+        DockerImage.fromBuild(path.join(__dirname, '../'), {
           buildArgs: {
             ...(props.buildArgs ?? {}),
             // If runtime isn't passed use regional default, lowest common denominator is node18

src/bundling.ts

@@ -80,7 +80,7 @@ describe('Bundling in Docker', () => {
     );
 
     expect(DockerImage.fromBuild).toHaveBeenCalledWith(
-      expect.stringMatching(/aws-lambda-rust\/src$/),
+      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(/src$/),
+      expect.stringMatching(/aws-lambda-rust\/$/),
       expect.objectContaining({
         buildArgs: expect.objectContaining({
           HELLO: 'WORLD',

test/bundling.test.ts

@@ -6,7 +6,7 @@ const docker = process.env.CDK_DOCKER ?? 'docker';
 beforeAll(() => {
   const process = spawnSync(
     docker,
-    ['build', '-t', 'cargo-builder', path.join(__dirname, '../src')],
+    ['build', '-t', 'cargo-builder', path.join(__dirname, '../')],
     { stdio: 'inherit' },
   );
   expect(process.error).toBeUndefined();

test/docker.test.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;
 

test/integ.function-bins.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;
 

test/integ.function-workspace.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;