From 57d1e1ee5a13269f1bef6c3b754cb8374a657202 Mon Sep 17 00:00:00 2001
From: Alex Schofield <git@ajschof.me>
Date: Mon, 19 Aug 2024 14:55:39 +0100
Subject: style: remove redundant comment

---
 terraform/lambda.tf | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'terraform/lambda.tf')

diff --git a/terraform/lambda.tf b/terraform/lambda.tf
index e33bc79..714ffa5 100644
--- a/terraform/lambda.tf
+++ b/terraform/lambda.tf
@@ -99,13 +99,9 @@ locals {
 resource "null_resource" "prepare_layer" {
   provisioner "local-exec" {
     command = <<EOT
-      cd ${local.layer_dir}
-      rm -rf python
-      mkdir python
-      pip3 install -r ${local.requirements} -t python/
-      zip -r ${local.layer_zip} python 
+      cd 
     EOT 
-  } #removed / at the end of python in line 99
+  }
 }
 
 resource "aws_s3_object" "lambda_layer_zip" {
-- 
cgit v1.2.3


From 3b16bca30c71df786403d0e1d84a5653578b3e46 Mon Sep 17 00:00:00 2001
From: Alex Schofield <git@ajschof.me>
Date: Mon, 19 Aug 2024 15:02:39 +0100
Subject: infra(tf): modify variables & remove past zip creation

---
 terraform/lambda.tf | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'terraform/lambda.tf')

diff --git a/terraform/lambda.tf b/terraform/lambda.tf
index 714ffa5..986170f 100644
--- a/terraform/lambda.tf
+++ b/terraform/lambda.tf
@@ -90,17 +90,16 @@ resource "aws_lambda_function" "load_lambda" {
 
 # Lambda Layer Specification
 locals {
-  layer_dir    = "lambda_layer"
+  layer_dir    = "../"
   requirements = "requirements.txt"
   layer_zip    = "layer.zip"
   layer_name   = "lambda_layer_dev"
+  script_dir   = "../scripts"
 }
 
 resource "null_resource" "prepare_layer" {
   provisioner "local-exec" {
-    command = <<EOT
-      cd 
-    EOT 
+    command = "bash ${local.script_dir}/make_layer_zip.sh"
   }
 }
 
-- 
cgit v1.2.3


From 284a52df866c34d925b85ccd4f06d6141e67ce70 Mon Sep 17 00:00:00 2001
From: Alex Schofield <git@ajschof.me>
Date: Mon, 19 Aug 2024 15:12:56 +0100
Subject: fix(tf): correct layer.zip output path

---
 terraform/lambda.tf | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'terraform/lambda.tf')

diff --git a/terraform/lambda.tf b/terraform/lambda.tf
index 986170f..8a4207d 100644
--- a/terraform/lambda.tf
+++ b/terraform/lambda.tf
@@ -93,7 +93,7 @@ locals {
   layer_dir    = "../"
   requirements = "requirements.txt"
   layer_zip    = "layer.zip"
-  layer_name   = "lambda_layer_dev"
+  layer_name   = "lambda_layer"
   script_dir   = "../scripts"
 }
 
@@ -105,7 +105,7 @@ resource "null_resource" "prepare_layer" {
 
 resource "aws_s3_object" "lambda_layer_zip" {
   bucket     = aws_s3_bucket.lambda_code_bucket.id #bucket instead of id
-  key        = "lambda_layer/${local.layer_name}/${local.layer_zip}"
+  key        = "${local.layer_name}/${local.layer_zip}"
   source     = "${local.layer_dir}/${local.layer_zip}"
   depends_on = [null_resource.prepare_layer]
 }
@@ -113,7 +113,7 @@ resource "aws_s3_object" "lambda_layer_zip" {
 resource "aws_lambda_layer_version" "lambda_layer" {
   layer_name          = local.layer_name
   compatible_runtimes = ["python3.11"]
-  s3_bucket           = aws_s3_bucket.lambda_layer_bucket.id #bucket instead of id
+  s3_bucket           = aws_s3_bucket.lambda_bucket.bucket
   s3_key              = aws_s3_object.lambda_layer_zip.key
   skip_destroy        = true
   depends_on          = [aws_s3_object.lambda_layer_zip]
-- 
cgit v1.2.3


From cbf1d083dc0bf4d78da83cb169da49731f8ace65 Mon Sep 17 00:00:00 2001
From: Alex Schofield <git@ajschof.me>
Date: Mon, 19 Aug 2024 15:18:22 +0100
Subject: fix(tf): correct s3_bucket value for lambda_layer

---
 terraform/lambda.tf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'terraform/lambda.tf')

diff --git a/terraform/lambda.tf b/terraform/lambda.tf
index 8a4207d..bf96747 100644
--- a/terraform/lambda.tf
+++ b/terraform/lambda.tf
@@ -113,7 +113,7 @@ resource "aws_s3_object" "lambda_layer_zip" {
 resource "aws_lambda_layer_version" "lambda_layer" {
   layer_name          = local.layer_name
   compatible_runtimes = ["python3.11"]
-  s3_bucket           = aws_s3_bucket.lambda_bucket.bucket
+  s3_bucket           = aws_s3_bucket.lambda_code_bucket.bucket
   s3_key              = aws_s3_object.lambda_layer_zip.key
   skip_destroy        = true
   depends_on          = [aws_s3_object.lambda_layer_zip]
-- 
cgit v1.2.3


From 4b3b80a2f2177456ed6c2857a7ae0987d7304360 Mon Sep 17 00:00:00 2001
From: Alex Schofield <git@ajschof.me>
Date: Mon, 19 Aug 2024 15:40:01 +0100
Subject: chore(tf): remove unused requirements variable

---
 terraform/lambda.tf | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'terraform/lambda.tf')

diff --git a/terraform/lambda.tf b/terraform/lambda.tf
index bf96747..72aae04 100644
--- a/terraform/lambda.tf
+++ b/terraform/lambda.tf
@@ -90,11 +90,10 @@ resource "aws_lambda_function" "load_lambda" {
 
 # Lambda Layer Specification
 locals {
-  layer_dir    = "../"
-  requirements = "requirements.txt"
-  layer_zip    = "layer.zip"
-  layer_name   = "lambda_layer"
-  script_dir   = "../scripts"
+  layer_dir  = "../"
+  layer_zip  = "layer.zip"
+  layer_name = "lambda_layer"
+  script_dir = "../scripts"
 }
 
 resource "null_resource" "prepare_layer" {
-- 
cgit v1.2.3