From 8024c1a6c98a696f9664049c96d8fc58c9fd2435 Mon Sep 17 00:00:00 2001
From: Ang Bel <anzelikabelotelova@Anzelikas-MacBook-Air.local>
Date: Tue, 13 Aug 2024 12:30:20 +0100
Subject: replacement for events.tf variable placeholders, s3 bucket
 notifications, lambda.tf set up (function, zip, permissions), code bucket to
 store zipped lambdas

---
 terraform/vars.tf | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'terraform/vars.tf')

diff --git a/terraform/vars.tf b/terraform/vars.tf
index fa84222..cc9348a 100644
--- a/terraform/vars.tf
+++ b/terraform/vars.tf
@@ -23,6 +23,11 @@ variable "transform_lambda_name" {
     default = "transform-lambda" 
 }
 
+variable "load_lambda_name" {
+    type = string
+    default = "load-lambda" 
+}
+
 data "aws_caller_identity" "current" {}
 
 data "aws_region" "current" {}
\ No newline at end of file
-- 
cgit v1.2.3


From bb1665fd08d8abf10930875272bdc2b7f8a4c681 Mon Sep 17 00:00:00 2001
From: Ang Bel <anzelikabelotelova@Anzelikas-MacBook-Air.local>
Date: Tue, 13 Aug 2024 16:25:06 +0100
Subject: rds.tf file with some placehodlers. Additional set up is required

---
 terraform/lambda.tf | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++
 terraform/rds.tf    | 78 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 terraform/vars.tf   | 10 +++++++
 3 files changed, 162 insertions(+)
 create mode 100644 terraform/lambda.tf
 create mode 100644 terraform/rds.tf

(limited to 'terraform/vars.tf')

diff --git a/terraform/lambda.tf b/terraform/lambda.tf
new file mode 100644
index 0000000..09d6697
--- /dev/null
+++ b/terraform/lambda.tf
@@ -0,0 +1,74 @@
+### EXTRACT LAMBDA SET UP
+data "archive_file" "extract_lambda_zip" {
+  type        = "zip"
+  source_file = "${path.module}/../src/extract_lambda.py"
+  output_path = "${path.module}/../extract_function.zip"
+}
+
+resource "aws_lambda_function" "extract_lambda" {
+    function_name = "${var.extract_lambda_name}"
+    s3_bucket = aws_s3_bucket.lambda_bucket.bucket
+    s3_key = "extract_lambda/extract_function.zip"
+    role = aws_iam_role.PLACEHOLDER_extract_lambda_role.arn # << lambda role placehodler
+    handler = "extract_lambda.lambda_handler" # << check that the function is called lambda handler
+    runtime = "python3.11"
+    environment {
+        variables = {
+            output = aws_s3_bucket.extract_bucket.bucket
+        }
+    }
+}
+
+resource "aws_lambda_permission" "allow_to_write_to_s3_extract_bucket" {
+  action = "lambda:InvokeFunction"
+  function_name = aws_lambda_function.extract_lambda.function_name
+  principal = "s3.amazonaws.com"
+  source_arn = aws_s3_bucket.extract_bucket.arn
+}
+
+
+### TRANSFORM LAMBDA SET UP
+data "archive_file" "transform_lambda_zip" {
+  type        = "zip"
+  source_file = "${path.module}/../src/transform_lambda.py"
+  output_path = "${path.module}/../transform_function.zip"
+}
+
+resource "aws_lambda_function" "transform_lambda" {
+    function_name = "${var.transform_lambda_name}"
+    s3_bucket = aws_s3_bucket.lambda_bucket.bucket
+    s3_key = "transform_lambda/transform_function.zip"
+    role = aws_iam_role.PLACEHOLDER_transform_lambda_role.arn # << lambda role placehodler
+    handler = "transform_lambda.lambda_handler" # << check that the function is called lambda handler
+    runtime = "python3.11"
+    environment {
+        variables = {
+            output = aws_s3_bucket.transform_bucket.bucket
+        }
+    }
+}
+
+resource "aws_lambda_permission" "allow_to_write_to_s3_transform_bucket" {
+  action = "lambda:InvokeFunction"
+  function_name = aws_lambda_function.transform_lambda.function_name
+  principal = "s3.amazonaws.com"
+  source_arn = aws_s3_bucket.transform_bucket.arn
+}
+
+
+### LOAD LAMBDA SET UP
+data "archive_file" "load_lambda_zip" {
+  type        = "zip"
+  source_file = "${path.module}/../src/load_lambda.py"
+  output_path = "${path.module}/../load_function.zip"
+}
+
+resource "aws_lambda_function" "load_lambda" {
+    function_name = "${var.load_lambda_name}"
+    s3_bucket = aws_s3_bucket.lambda_bucket.bucket
+    s3_key = "load_lambda/load_function.zip"
+    role = aws_iam_role.PLACEHOLDER_load_lambda_role.arn # << lambda role placehodler
+    handler = "load_lambda.lambda_handler" # << check that the function is called lambda handler
+    runtime = "python3.11"
+}
+
diff --git a/terraform/rds.tf b/terraform/rds.tf
new file mode 100644
index 0000000..4b25c5f
--- /dev/null
+++ b/terraform/rds.tf
@@ -0,0 +1,78 @@
+data "aws_availability_zones" "available" {}
+
+module "vpc" {
+  source  = "terraform-aws-modules/vpc/aws"
+  version = "2.77.0"
+
+  name                 = "${var.project_name}"
+  cidr                 = "10.0.0.0/16"
+  azs                  = data.aws_availability_zones.available.names
+  public_subnets       = ["10.0.4.0/24", "10.0.5.0/24", "10.0.6.0/24"]
+  enable_dns_hostnames = true
+  enable_dns_support   = true
+}
+
+resource "aws_db_subnet_group" "Terrific-Totes-sub-gr" {
+  name       = "TT-db-subnet"
+  subnet_ids = module.vpc.public_subnets
+
+  tags = {
+    Name = "${var.project_name}"
+  }
+}
+
+resource "aws_security_group" "rds" {
+  name   = "${var.project_name}-rds"
+  vpc_id = module.vpc.vpc_id
+
+  ingress {
+    from_port   = 5432
+    to_port     = 5432
+    protocol    = "tcp"
+    cidr_blocks = ["0.0.0.0/0"]
+  }
+
+  egress {
+    from_port   = 5432
+    to_port     = 5432
+    protocol    = "tcp"
+    cidr_blocks = ["0.0.0.0/0"]
+  }
+
+  tags = {
+    Name = "${var.project_name}-rds"
+  }
+}
+
+resource "aws_db_parameter_group" "Terrific-Totes-param-gr" {
+  name   = "TT-db-param"
+  family = "postgres14"
+
+  parameter {
+    name  = "log_connections"
+    value = "1"
+  }
+}
+
+resource "aws_db_instance" "Terrific-Totes-rds" {
+  db_name                = "${var.project_name}"
+  instance_class         = "db.t3.micro"
+  allocated_storage      = 5
+  engine                 = "postgres"
+  engine_version         = "14.1"
+  username               = "user credentials for the root user" # we could use .env here
+  password               = "user password for the root user" # we could use .env here
+  ### alternatively to providing username nad password we can specify:
+# resource "aws_kms_key" "example_key" {
+#       description = "Example KMS Key"
+# }
+# within the resource:
+#   manage_master_user_password   = true
+#   master_user_secret_kms_key_id = aws_kms_key.example.key_id
+# }
+  db_subnet_group_name   = aws_db_subnet_group.Terrific-Totes-sub-gr.name
+  vpc_security_group_ids = [aws_security_group.rds.id]
+  parameter_group_name   = aws_db_parameter_group.Terrific-Totes-param-gr.name
+  publicly_accessible    = false
+  skip_final_snapshot    = true
+}
\ No newline at end of file
diff --git a/terraform/vars.tf b/terraform/vars.tf
index fa84222..350c2c6 100644
--- a/terraform/vars.tf
+++ b/terraform/vars.tf
@@ -23,6 +23,16 @@ variable "transform_lambda_name" {
     default = "transform-lambda" 
 }
 
+variable "load_lambda_name" {
+    type = string
+    default = "load-lambda" 
+}
+
+variable "project_name" {
+    type = string
+    default = "Terrific-Totes"
+}
+
 data "aws_caller_identity" "current" {}
 
 data "aws_region" "current" {}
\ No newline at end of file
-- 
cgit v1.2.3


From 911b2a4ba08e59f46a53b5252a044a5853796f78 Mon Sep 17 00:00:00 2001
From: Alex Schofield <git@ajschof.me>
Date: Wed, 14 Aug 2024 16:38:36 +0100
Subject: test(tf): attempt to solve ResourceConflictException

---
 terraform/events.tf |  35 ++++++++---------
 terraform/iam.tf    |  60 +++++++++++++++++++++--------
 terraform/lambda.tf | 109 +++++++++++++++++++++++++---------------------------
 terraform/main.tf   |  26 ++++++-------
 terraform/s3.tf     |  43 ++-------------------
 terraform/vars.tf   |  26 ++++++-------
 6 files changed, 139 insertions(+), 160 deletions(-)

(limited to 'terraform/vars.tf')

diff --git a/terraform/events.tf b/terraform/events.tf
index 9fd89e4..d2e2eb5 100644
--- a/terraform/events.tf
+++ b/terraform/events.tf
@@ -1,23 +1,18 @@
-resource "aws_cloudwatch_event_target" "extract_lambda_cw_event" {
-  rule      = aws_cloudwatch_event_rule.lambda_trigger.name
-  target_id = "TargetFunctionV1"
-  arn       = aws_lambda_function.extract_lambda.arn #replaced lambda name placeholder
-  force_destroy = true
-}
-
 resource "aws_cloudwatch_event_rule" "lambda_trigger" {
   name                = "lambda-scheduled-trigger"
   description         = "Schedule to trigger the Lambda function"
   schedule_expression = "rate(30 minutes)"
-  force_destroy = true
-  # depends_on = [ 
-  #   aws_cloudwatch_event_target.extract_lambda_cw_event]
-  
-#   event_pattern = jsonencode({
-#     detail-type = 
-#       "AWS Console Sign In via CloudTrail"
-#     ]
-#   })
+
+  lifecycle {
+    create_before_destroy = true
+  }
+}
+
+resource "aws_cloudwatch_event_target" "extract_lambda_cw_event" {
+  rule       = aws_cloudwatch_event_rule.lambda_trigger.name
+  target_id  = "TargetFunctionV1"
+  arn        = aws_lambda_function.extract_lambda.arn #replaced lambda name placeholder
+  depends_on = [aws_lambda_permission.allow_eventbridge]
 }
 
 resource "aws_lambda_permission" "allow_eventbridge" {
@@ -25,7 +20,7 @@ resource "aws_lambda_permission" "allow_eventbridge" {
   action        = "lambda:InvokeFunction"
   function_name = aws_lambda_function.extract_lambda.function_name #replaced lambda name placeholder
   principal     = "events.amazonaws.com"
-  source_arn    = aws_cloudwatch_event_rule.lambda_trigger.arn  
+  source_arn    = aws_cloudwatch_event_rule.lambda_trigger.arn
 }
 
 
@@ -43,7 +38,7 @@ resource "aws_s3_bucket_notification" "extract_bucket_notification" {
   bucket = aws_s3_bucket.extract_bucket.id #replaced bucket name placeholder
 
   lambda_function {
-    events             = ["s3:ObjectCreated:*"]  
+    events              = ["s3:ObjectCreated:*"]
     lambda_function_arn = aws_lambda_function.transform_lambda.arn #replaced lambda name placeholder
   }
 
@@ -65,9 +60,9 @@ resource "aws_s3_bucket_notification" "transform_bucket_notification" {
   bucket = aws_s3_bucket.transform_bucket.id #replaced bucket name placeholder
 
   lambda_function {
-    events             = ["s3:ObjectCreated:*"]  
+    events              = ["s3:ObjectCreated:*"]
     lambda_function_arn = aws_lambda_function.transform_lambda.arn #replaced lambda name placeholder
   }
 
   depends_on = [aws_lambda_permission.allow_s3_transform_bucket]
-}
\ No newline at end of file
+}
diff --git a/terraform/iam.tf b/terraform/iam.tf
index cf4902a..6c6b4fc 100644
--- a/terraform/iam.tf
+++ b/terraform/iam.tf
@@ -16,9 +16,7 @@ resource "aws_iam_role" "multi_service_role" {
         Principal = {
           Service = [
             "lambda.amazonaws.com",
-            "cloudwatch.amazonaws.com",
-            "events.amazonaws.com",
-            "s3.amazonaws.com"
+            "scheduler.amazonaws.com"
           ]
         }
       }
@@ -57,22 +55,22 @@ data "aws_iam_policy_document" "s3_data_policy_doc" {
 ########################################################################
 
 resource "aws_iam_policy" "lambda_execution_policy" {
-  name = "lambda_execution_policy"
-  path = "/"
+  name        = "lambda_execution_policy"
+  path        = "/"
   description = "IAM policy for Lambda execution"
 
   policy = jsonencode({
     Version = "2012-10-17"
     Statement = [
-        {
+      {
         Effect = "Allow"
         Action = [
           "lambda:InvokeFunction",
           "lambda:GetFunction"
         ]
         Resource = "*"
-        }
-      ]
+      }
+    ]
     }
   )
 }
@@ -87,7 +85,7 @@ data "aws_iam_policy_document" "cw_document" {
     actions = ["logs:CreateLogGroup"]
     resources = [
       "arn:aws:logs:${data.aws_region.current.name}:${data.aws_caller_identity.current.account_id}:*"
-      ]
+    ]
   }
 
   statement {
@@ -95,15 +93,15 @@ data "aws_iam_policy_document" "cw_document" {
       "logs:CreateLogStream",
       "logs:CreateLogGroup",
       "logs:PutLogEvents"
-      ]
-      resources = [
-        "arn:aws:logs:${data.aws_region.current.name}:${data.aws_caller_identity.current.account_id}:log-group:/aws/lambda/*"
-      ]
+    ]
+    resources = [
+      "arn:aws:logs:${data.aws_region.current.name}:${data.aws_caller_identity.current.account_id}:log-group:/aws/lambda/*"
+    ]
   }
 }
 
 resource "aws_iam_policy" "cw_policy" {
-  name = "cw_policy"
+  name   = "cw_policy"
   policy = data.aws_iam_policy_document.cw_document.json
 }
 
@@ -128,20 +126,48 @@ resource "aws_iam_policy" "s3_write_policy" {
 # }
 
 resource "aws_iam_role_policy_attachment" "s3_attachment" {
-  role = aws_iam_role.multi_service_role.name
+  role       = aws_iam_role.multi_service_role.name
   policy_arn = aws_iam_policy.s3_write_policy.arn
 }
 
 resource "aws_iam_role_policy_attachment" "lambda_attachment" {
-  role = aws_iam_role.multi_service_role.name
+  role       = aws_iam_role.multi_service_role.name
   policy_arn = aws_iam_policy.lambda_execution_policy.arn
 }
 
 resource "aws_iam_role_policy_attachment" "cw_attachment" {
-  role = aws_iam_role.multi_service_role.name
+  role       = aws_iam_role.multi_service_role.name
   policy_arn = aws_iam_policy.cw_policy.arn
 }
 
 ################
 # RDS POLICIES #
 ################
+
+###################
+# EVENTS POLICIES #
+###################
+
+data "aws_iam_policy_document" "cloudwatch_events_policy" {
+  statement {
+    actions = [
+      "events:PutRule",
+      "events:PutTargets",
+      "events:RemoveTargets",
+      "events:DeleteRule",
+      "events:PutEvents"
+    ]
+    resources = ["*"]
+    effect    = "Allow"
+  }
+}
+
+resource "aws_iam_policy" "cloudwatch_events_policy" {
+  name   = "cloudwatch_events_policy"
+  policy = data.aws_iam_policy_document.cloudwatch_events_policy.json
+}
+
+resource "aws_iam_role_policy_attachment" "cloudwatch_events_attachment" {
+  role       = aws_iam_role.multi_service_role.name
+  policy_arn = aws_iam_policy.cloudwatch_events_policy.arn
+}
diff --git a/terraform/lambda.tf b/terraform/lambda.tf
index a5da972..fb0a666 100644
--- a/terraform/lambda.tf
+++ b/terraform/lambda.tf
@@ -1,73 +1,68 @@
-### EXTRACT LAMBDA SET UP
-data "archive_file" "extract_lambda_zip" {
-  type        = "zip"
-  source_file = "${path.module}/../src/extract_lambda.py"
-  output_path = "${path.module}/../extract_function.zip"
+# Extract Lambda Function
+resource "aws_s3_object" "extract_lambda_code" {
+  bucket = aws_s3_bucket.lambda_code_bucket.bucket
+  key    = "${var.extract_lambda_name}/extract_function.zip"
+  source = "${path.module}/../extract_function.zip"
+  etag   = filemd5("${path.module}/../extract_function.zip")
 }
 
 resource "aws_lambda_function" "extract_lambda" {
-    function_name = "${var.extract_lambda_name}"
-    s3_bucket = aws_s3_bucket.lambda_code_bucket.bucket
-    s3_key = "extract-lambda/extract_function.zip"
-    role = aws_iam_role.multi_service_role.arn #<< lambda role placehodler
-    handler = "extract_lambda.lambda_handler" # << check that the function is called lambda handler
-    runtime = "python3.11"
-    environment {
-        variables = {
-            output = aws_s3_bucket.extract_bucket.bucket
-        }
-    }
-}
+  function_name = var.extract_lambda_name
+  s3_bucket     = aws_s3_bucket.lambda_code_bucket.bucket
+  s3_key        = aws_s3_object.extract_lambda_code.key
+  role          = aws_iam_role.multi_service_role.arn
+  handler       = "extract_lambda.extract"
+  runtime       = "python3.11"
 
-resource "aws_lambda_permission" "allow_to_write_to_s3_extract_bucket" {
-  action = "lambda:InvokeFunction"
-  function_name = aws_lambda_function.extract_lambda.function_name
-  principal = "s3.amazonaws.com"
-  source_arn = aws_s3_bucket.extract_bucket.arn
-}
+  lifecycle {
+    create_before_destroy = true
+  }
 
+  depends_on = [aws_s3_object.extract_lambda_code]
+}
 
-### TRANSFORM LAMBDA SET UP
-data "archive_file" "transform_lambda_zip" {
-  type        = "zip"
-  source_file = "${path.module}/../src/transform_lambda.py"
-  output_path = "${path.module}/../transform_function.zip"
+# Transform Lambda Function
+resource "aws_s3_object" "transform_lambda_code" {
+  bucket = aws_s3_bucket.lambda_code_bucket.bucket
+  key    = "${var.transform_lambda_name}/transform_function.zip"
+  source = "${path.module}/../transform_function.zip"
+  etag   = filemd5("${path.module}/../transform_function.zip")
 }
 
 resource "aws_lambda_function" "transform_lambda" {
-    function_name = "${var.transform_lambda_name}"
-    s3_bucket = aws_s3_bucket.lambda_code_bucket.bucket
-    s3_key = "transform-lambda/transform_function.zip"
-    role = aws_iam_role.multi_service_role.arn # << lambda role placehodler
-    handler = "transform_lambda.lambda_handler" # << check that the function is called lambda handler
-    runtime = "python3.11"
-    environment {
-        variables = {
-            output = aws_s3_bucket.transform_bucket.bucket
-        }
-    }
-}
+  function_name = var.transform_lambda_name
+  s3_bucket     = aws_s3_bucket.lambda_code_bucket.bucket
+  s3_key        = aws_s3_object.transform_lambda_code.key
+  role          = aws_iam_role.multi_service_role.arn
+  handler       = "transform_lambda.transform"
+  runtime       = "python3.11"
 
-resource "aws_lambda_permission" "allow_to_write_to_s3_transform_bucket" {
-  action = "lambda:InvokeFunction"
-  function_name = aws_lambda_function.transform_lambda.function_name
-  principal = "s3.amazonaws.com"
-  source_arn = aws_s3_bucket.transform_bucket.arn
+  lifecycle {
+    create_before_destroy = true
+  }
+
+  depends_on = [aws_s3_object.transform_lambda_code]
 }
 
-### LOAD LAMBDA SET UP
-data "archive_file" "load_lambda_zip" {
-  type        = "zip"
-  source_file = "${path.module}/../src/load_lambda.py"
-  output_path = "${path.module}/../load_function.zip"
+# Load Lambda Function
+resource "aws_s3_object" "load_lambda_code" {
+  bucket = aws_s3_bucket.lambda_code_bucket.bucket
+  key    = "${var.load_lambda_name}/load_function.zip"
+  source = "${path.module}/../load_function.zip"
+  etag   = filemd5("${path.module}/../load_function.zip")
 }
 
 resource "aws_lambda_function" "load_lambda" {
-    function_name = "${var.load_lambda_name}"
-    s3_bucket = aws_s3_bucket.lambda_code_bucket.bucket
-    s3_key = "load-lambda/load_function.zip"
-    role = aws_iam_role.multi_service_role.arn # << lambda role placehodler
-    handler = "load_lambda.lambda_handler" # << check that the function is called lambda handler
-    runtime = "python3.11"
-}
+  function_name = var.load_lambda_name
+  s3_bucket     = aws_s3_bucket.lambda_code_bucket.bucket
+  s3_key        = aws_s3_object.load_lambda_code.key
+  role          = aws_iam_role.multi_service_role.arn
+  handler       = "load_lambda.load"
+  runtime       = "python3.11"
 
+  lifecycle {
+    create_before_destroy = true
+  }
+
+  depends_on = [aws_s3_object.load_lambda_code]
+}
diff --git a/terraform/main.tf b/terraform/main.tf
index 2a048b9..3b06701 100644
--- a/terraform/main.tf
+++ b/terraform/main.tf
@@ -1,26 +1,26 @@
 terraform {
   required_providers {
     aws = {
-        source = "hashicorp/aws"
-        version = "~>5.0"
+      source  = "hashicorp/aws"
+      version = "~>5.0"
     }
   }
   backend "s3" {
     bucket = "bentley-project-secrets"
-    key = "bentley-project/terraform.tfstate"
+    key    = "bentley-project/terraform.tfstate"
     region = "eu-west-2"
   }
 }
 
 provider "aws" {
-    region =  "eu-west-2" 
-    default_tags {
-      tags = {
-        ProjectName = "Terrific-Totes"
-        Team = "Team-Bentley"
-        Environment = "Dev"
-        GitHubRepo = "de-project-bentley"
-        ManagedBy = "Terraform"
-      }
+  region = "eu-west-2"
+  default_tags {
+    tags = {
+      ProjectName = "Terrific-Totes"
+      Team        = "Team-Bentley"
+      Environment = "Dev"
+      GitHubRepo  = "de-project-bentley"
+      ManagedBy   = "Terraform"
     }
-}
\ No newline at end of file
+  }
+}
diff --git a/terraform/s3.tf b/terraform/s3.tf
index 4c06b8e..d5cdee3 100644
--- a/terraform/s3.tf
+++ b/terraform/s3.tf
@@ -1,51 +1,14 @@
 ### EXTRACT BUCKET SET-UP
 resource "aws_s3_bucket" "extract_bucket" {
-    bucket_prefix = "${var.s3_extract_bucket_name}-"
+  bucket_prefix = "${var.s3_extract_bucket_name}-"
 }
 
-# resource "aws_s3_bucket_notification" "extract_bucket_notification" {
-#   bucket = aws_s3_bucket.extract_bucket.id
-#   lambda_function {
-#     lambda_function_arn = aws_lambda_function.extract_lambda.arn
-#     events              = ["s3:ObjectCreated:*"]
-#   }
-#   depends_on = [aws_lambda_permission.allow_to_write_to_s3_extract_bucket]
-# }  # << is this the correct permission dependency?
-
 ### TRANSFORM BUCKET SET-UP
 resource "aws_s3_bucket" "transform_bucket" {
-    bucket_prefix = "${var.s3_transform_bucket_name}-"
+  bucket_prefix = "${var.s3_transform_bucket_name}-"
 }
 
-# resource "aws_s3_bucket_notification" "transform_bucket_notification" {
-#   bucket = aws_s3_bucket.transform_bucket.id
-#   lambda_function {
-#     lambda_function_arn = aws_lambda_function.transform_lambda.arn
-#     events              = ["s3:ObjectCreated:*"]
-#   }
-#   depends_on = [aws_lambda_permission.allow_to_write_to_s3_transform_bucket]
-# }  # << is this the correct permission dependency?
-
-
 ### LAMBDA BUCKET
 resource "aws_s3_bucket" "lambda_code_bucket" {
-    bucket_prefix = "${var.s3_code_bucket_name}-"
+  bucket_prefix = "${var.s3_code_bucket_name}-"
 }
-
-# resource "aws_s3_object" "extract_lambda_code" {
-#   bucket = aws_s3_bucket.lambda_code_bucket.bucket
-#   key = "${var.extract_lambda_name}/extract_function.zip"
-#   source = "${path.module}/../extract_function.zip"
-# } # << can't figure out how this is being used but we seem to need it
-
-# resource "aws_s3_object" "transform_lambda_code" {
-#   bucket = aws_s3_bucket.lambda_code_bucket.bucket
-#   key = "${var.transform_lambda_name}/transform_function.zip"
-#   source = "${path.module}/../transform_function.zip"
-# } # << can't figure out how this is being used but we seem to need it
-
-# resource "aws_s3_object" "load_lambda_code" {
-#   bucket = aws_s3_bucket.lambda_code_bucket.bucket
-#   key = "${var.load_lambda_name}/load_function.zip"
-#   source = "${path.module}/../load_function.zip"
-# }
\ No newline at end of file
diff --git a/terraform/vars.tf b/terraform/vars.tf
index cc9348a..84824ce 100644
--- a/terraform/vars.tf
+++ b/terraform/vars.tf
@@ -1,33 +1,33 @@
 variable "s3_extract_bucket_name" {
-    type = string
-    default = "extract-bucket"
+  type    = string
+  default = "extract-bucket"
 }
 
 variable "s3_transform_bucket_name" {
-    type = string
-    default = "transform-bucket"
+  type    = string
+  default = "transform-bucket"
 }
 
 variable "s3_code_bucket_name" {
-    type = string
-    default = "lambda-bucket"
+  type    = string
+  default = "lambda-bucket"
 }
 
 variable "extract_lambda_name" {
-    type = string
-    default = "extract-lambda"
+  type    = string
+  default = "extract-lambda"
 }
 
 variable "transform_lambda_name" {
-    type = string
-    default = "transform-lambda" 
+  type    = string
+  default = "transform-lambda"
 }
 
 variable "load_lambda_name" {
-    type = string
-    default = "load-lambda" 
+  type    = string
+  default = "load-lambda"
 }
 
 data "aws_caller_identity" "current" {}
 
-data "aws_region" "current" {}
\ No newline at end of file
+data "aws_region" "current" {}
-- 
cgit v1.2.3