From 84f4f3eb3e8f8abde70d8da6fe7749fa321af772 Mon Sep 17 00:00:00 2001
From: Grzegorz Huber <ghuber@aarete.com>
Date: Mon, 15 Jul 2024 16:40:40 +0200
Subject: [PATCH] test new pdf layer build

---
 bitbucket-pipelines.yml                       |  2 +-
 textract-pipeline/terraform/main.tf           | 26 ----------------
 .../aws-textract-pipeline-part3/main.tf       | 30 ++++++++++++++++++-
 3 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml
index 1a0271e..2b0e360 100644
--- a/bitbucket-pipelines.yml
+++ b/bitbucket-pipelines.yml
@@ -394,4 +394,4 @@ pipelines:
           script:
             - *aws-context-uat
             - pip install -r requirements.txt
-            - BB_PIPELINE_BRANCH="UAT" python terraform.py apply --environment=uat --module=textract-pipeline/terraform --apply-extra-args="-target=module.pdf_layer"
\ No newline at end of file
+            - BB_PIPELINE_BRANCH="UAT" python terraform.py apply --environment=uat --module=textract-pipeline/terraform
\ No newline at end of file
diff --git a/textract-pipeline/terraform/main.tf b/textract-pipeline/terraform/main.tf
index 5dd7f9e..b845072 100644
--- a/textract-pipeline/terraform/main.tf
+++ b/textract-pipeline/terraform/main.tf
@@ -194,29 +194,3 @@ resource "aws_iam_role_policy_attachment" "VPC-policy-attach" {
   policy_arn = "${data.aws_iam_policy.AWSLambdaVPCAccessExecutionRole.arn}"
 }
 
-module "pdf_layer" {
-  source              = "terraform-aws-modules/lambda/aws"
-
-  create_layer        = true
-
-  layer_name          = "pdfcryptolayer2-terraform"
-  description         = "Fixed PDF layer"
-  compatible_runtimes = ["python3.12"]
-
-  build_in_docker = true
-
-  source_path = {
-    path          = "../src/lambda-layer/pypdf2-layer-new",
-    prefix_in_zip = "python"
-    #    npm_requirements = "package.json"
-    commands = [
-      "pip install -r requirements.txt -t .",
-      ":zip . python"
-    ],
-    patterns = [
-      "!.*/.*\\.txt",    # Skip all txt files recursively
-    ],
-  }
-
-  store_on_s3         = false
-}
\ No newline at end of file
diff --git a/textract-pipeline/terraform/modules/aws-textract-pipeline-part3/main.tf b/textract-pipeline/terraform/modules/aws-textract-pipeline-part3/main.tf
index 6c249eb..825c937 100644
--- a/textract-pipeline/terraform/modules/aws-textract-pipeline-part3/main.tf
+++ b/textract-pipeline/terraform/modules/aws-textract-pipeline-part3/main.tf
@@ -438,6 +438,33 @@ module "tiff_to_pdf_lambda_function" {
   tags    = local.common_tags
 }
 
+module "pdf_validation_lambda_layer" {
+  source              = "terraform-aws-modules/lambda/aws"
+
+  create_layer        = true
+
+  layer_name          = local.pdf_validation_lambda_name
+  description         = "Fixed PDF layer"
+  compatible_runtimes = ["python3.12"]
+
+  build_in_docker = true
+
+  source_path = {
+    path          = "../src/lambda-layer/pypdf2-layer-new",
+    prefix_in_zip = "python"
+    #    npm_requirements = "package.json"
+    commands = [
+      "pip install -r requirements.txt -t .",
+      ":zip . python"
+    ],
+    patterns = [
+      "!.*/.*\\.txt",    # Skip all txt files recursively
+    ],
+  }
+
+  store_on_s3         = false
+}
+
 # pdf validation lambda function
 module "pdf_validation_lambda_function" {
   source = "terraform-aws-modules/lambda/aws"
@@ -452,8 +479,9 @@ module "pdf_validation_lambda_function" {
   ephemeral_storage_size  = var.pdf_validation_lambda.ephemeral_storage_size
   architectures = var.pdf_validation_lambda.architectures
 
+  # TODO remove the old
   layers = [
-    module.lambda_layer_pypdf2.lambda_layer_arn
+    module.pdf_validation_lambda_layer.lambda_layer_arn
   ]
 
   environment_variables = local.environment_variables