fix: lambda and functions (#23)

Consensys · Oct 7, 2022 · 294dd0e · 294dd0e
1 parent 7736e85
commit 294dd0e
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 14 deletions.
diff --git a/terraform/live/main.tf b/terraform/live/main.tf
@@ -74,7 +74,7 @@ resource "aws_cloudfront_function" "starknet_redirect" {
 module "security_header_lambda" {
   source = "../modules/lambda-at-edge"
 
-  bucket_name            = local.dev_domain_name
+  bucket_name            = "security_headers_starknet_lambda"
   lambda_name            = "security_headers"
   lambda_description     = "lambda adding security headers"
   lambda_code_source_dir = "${path.root}/lambdas"
@@ -99,12 +99,12 @@ module "s3_dev" {
 module "s3_snaps_page_dev" {
   source = "../modules/aws-s3-website"
 
-  bucket_name     = local.dev_snaps_domain_name
-  domain_name     = local.dev_snaps_domain_name
-  certificate_arn = module.snaps_cert.acm_certificate_arn
-  hosted_zone_id  = local.hosted_zone_id
-  function_arn    = [aws_cloudfront_function.starknet_redirect.arn]
-  tags            = module.tags.common
+  bucket_name             = local.dev_snaps_domain_name
+  domain_name             = local.dev_snaps_domain_name
+  certificate_arn         = module.snaps_cert.acm_certificate_arn
+  hosted_zone_id          = local.hosted_zone_id
+  cloudfront_function_arn = [aws_cloudfront_function.starknet_redirect.arn]
+  tags                    = module.tags.common
 }
 
 #############

diff --git a/terraform/modules/aws-s3-website/main.tf b/terraform/modules/aws-s3-website/main.tf
@@ -104,16 +104,16 @@ resource "aws_cloudfront_distribution" "dist" {
       for_each = try(var.lambda_function_arn, null)
       content {
         event_type   = "viewer-request"
-        lambda_arn   = lambda_function_association.value["function_arn"]
+        lambda_arn   = lambda_function_association.value
         include_body = false
       }
     }
 
     dynamic "function_association" {
-      for_each = try(var.function_arn, null)
+      for_each = try(var.cloudfront_function_arn, null)
       content {
         event_type   = "viewer-request"
-        function_arn = function_association.value["function_arn"]
+        function_arn = function_association.value
       }
     }
   }

diff --git a/terraform/modules/aws-s3-website/variables.tf b/terraform/modules/aws-s3-website/variables.tf
@@ -37,7 +37,7 @@ variable "certificate_arn" {
   default     = ""
 }
 
-variable "function_arn" {
+variable "cloudfront_function_arn" {
   description = "Function arn"
   type        = list(string)
   default     = []

diff --git a/terraform/modules/lambda-at-edge/main.tf b/terraform/modules/lambda-at-edge/main.tf
@@ -1,7 +1,6 @@
 resource "aws_s3_bucket" "bucket" {
-  bucket        = var.bucket_name
-  tags          = var.tags
-  force_destroy = true
+  bucket = var.bucket_name
+  tags   = var.tags
 }
 
 resource "aws_s3_bucket_acl" "main" {