fix: poppler setup needs to be a dedicated layer

Author: jacobtread

.github/workflows/build-release.yml

@@ -46,7 +46,7 @@ jobs:
               run: |
                   cp target/lambda/docbox-http-lambda/bootstrap.zip docbox-http-lambda-amd64.zip
                   cp target/lambda/docbox-presigned-cleanup-lambda/bootstrap.zip docbox-presigned-cleanup-lambda-amd64.zip
-                  cp target/lambda/docbox-upload-completion-lambda/bootstrap.zip docbox-upload-completion-lambda.zip
+                  cp target/lambda/docbox-upload-completion-lambda/bootstrap.zip docbox-upload-completion-lambda-amd64.zip
               shell: bash
 
             # Build the docker layers
@@ -56,20 +56,6 @@ jobs:
                   bash ./layers/make-poppler-layer-amd64.sh
               shell: bash
 
-            # Merge processing lambda with poppler layer
-            # (Required for processing pdf files)
-            - name: Merge processing layers
-              run: |
-                  mkdir /tmp/processing-lambda
-                  unzip docbox-upload-completion-lambda.zip -d /tmp/processing-lambda
-                  unzip poppler-lambda-layer.zip -d /tmp/processing-lambda
-                  (
-                    cd /tmp/processing-lambda
-                    zip -r /tmp/docbox-upload-completion-lambda-amd64.zip .
-                  )
-                  mv /tmp/docbox-upload-completion-lambda-amd64.zip .
-              shell: bash
-
             # Upload the built artifacts
             - name: Upload docbox-http-lambda.zip
               uses: actions/upload-artifact@v4
@@ -89,6 +75,12 @@ jobs:
                   name: docbox-upload-completion-lambda-amd64.zip
                   path: docbox-upload-completion-lambda-amd64.zip
 
+            - name: Upload poppler-lambda-layer-amd64.zip
+              uses: actions/upload-artifact@v4
+              with:
+                  name: poppler-lambda-layer-amd64.zip
+                  path: poppler-lambda-layer-amd64.zip
+
     build-arm64:
         name: Build ARM64
         runs-on: ubuntu-latest
@@ -121,7 +113,7 @@ jobs:
               run: |
                   cp target/lambda/docbox-http-lambda/bootstrap.zip docbox-http-lambda-arm64.zip
                   cp target/lambda/docbox-presigned-cleanup-lambda/bootstrap.zip docbox-presigned-cleanup-lambda-arm64.zip
-                  cp target/lambda/docbox-upload-completion-lambda/bootstrap.zip docbox-upload-completion-lambda.zip
+                  cp target/lambda/docbox-upload-completion-lambda/bootstrap.zip docbox-upload-completion-lambda-arm64.zip
               shell: bash
 
             - name: Set up QEMU
@@ -137,20 +129,6 @@ jobs:
                   bash ./layers/make-poppler-layer-arm64.sh
               shell: bash
 
-            # Merge processing lambda with poppler layer
-            # (Required for processing pdf files)
-            - name: Merge processing layers
-              run: |
-                  mkdir /tmp/processing-lambda
-                  unzip docbox-upload-completion-lambda.zip -d /tmp/processing-lambda
-                  unzip poppler-lambda-layer.zip -d /tmp/processing-lambda
-                  (
-                    cd /tmp/processing-lambda
-                    zip -r /tmp/docbox-upload-completion-lambda-arm64.zip .
-                  )
-                  mv /tmp/docbox-upload-completion-lambda-arm64.zip .
-              shell: bash
-
             # Upload the built artifacts
             - name: Upload docbox-http-lambda-arm64.zip
               uses: actions/upload-artifact@v4
@@ -170,6 +148,12 @@ jobs:
                   name: docbox-upload-completion-lambda-arm64.zip
                   path: docbox-upload-completion-lambda-arm64.zip
 
+            - name: Upload poppler-lambda-layer-arm64.zip
+              uses: actions/upload-artifact@v4
+              with:
+                  name: poppler-lambda-layer-arm64.zip
+                  path: poppler-lambda-layer-arm64.zip
+
     release:
         name: Create Release
         runs-on: ubuntu-latest

layers/make-poppler-layer-amd64.sh

@@ -6,5 +6,5 @@ docker buildx build --build-arg BASE_IMAGE=public.ecr.aws/lambda/provided:al2023
 
 # Run a container and copy out the zip then delete it
 CONTAINER_ID=$(docker create --platform linux/amd64 poppler-lambda-layer-amd64)
-docker cp $CONTAINER_ID:/tmp/poppler-lambda-layer.zip ./poppler-lambda-layer.zip
+docker cp $CONTAINER_ID:/tmp/poppler-lambda-layer.zip ./poppler-lambda-layer-amd64.zip
 docker rm $CONTAINER_ID

layers/make-poppler-layer-arm64.sh

@@ -6,5 +6,5 @@ docker buildx build --build-arg BASE_IMAGE=public.ecr.aws/lambda/provided:al2023
 
 # Run a container and copy out the zip then delete it
 CONTAINER_ID=$(docker create --platform linux/arm64 poppler-lambda-layer-arm64)
-docker cp $CONTAINER_ID:/tmp/poppler-lambda-layer.zip ./poppler-lambda-layer.zip
+docker cp $CONTAINER_ID:/tmp/poppler-lambda-layer.zip ./poppler-lambda-layer-arm64.zip
 docker rm $CONTAINER_ID