fix

Author: mihaiplesa

README.md

@@ -344,10 +344,10 @@ module "lambda_at_edge" {
       }]
       runtime      = "nodejs16.x"
       handler      = "index.handler"
-      event_type   = "origin-response"
-      include_body = false
       memory_size  = 128
       timeout      = 3
+      event_type   = "origin-response"
+      include_body = false
     }
   }
 

README.yaml

@@ -355,10 +355,10 @@ usage: |2-
         }]
         runtime      = "nodejs16.x"
         handler      = "index.handler"
-        event_type   = "origin-response"
-        include_body = false
         memory_size  = 128
         timeout      = 3
+        event_type   = "origin-response"
+        include_body = false
       }
     }
 

examples/complete/lambda-at-edge.tf

@@ -32,29 +32,29 @@ module "lambda_at_edge" {
       }]
       runtime      = "nodejs16.x"
       handler      = "index.handler"
-      event_type   = "viewer-request"
-      include_body = false
       memory_size  = 128
       timeout      = 3
+      event_type   = "viewer-request"
+      include_body = false
     },
     # Add custom header to the response
     viewer_response = {
       source_dir   = "lib"
       runtime      = "nodejs16.x"
       handler      = "index.handler"
-      event_type   = "viewer-response"
-      include_body = false
       memory_size  = 128
       timeout      = 3
+      event_type   = "viewer-response"
+      include_body = false
     },
     origin_request = {
       source_zip   = "origin-request.zip"
       runtime      = "nodejs16.x"
       handler      = "index.handler"
-      event_type   = "origin-request"
-      include_body = false
       memory_size  = 128
       timeout      = 3
+      event_type   = "origin-request"
+      include_body = false
     },
     # Add security headers to the request from CF to the origin
     origin_response = {
@@ -85,10 +85,10 @@ module "lambda_at_edge" {
       }]
       runtime      = "nodejs16.x"
       handler      = "index.handler"
-      event_type   = "origin-response"
-      include_body = false
       memory_size  = 128
       timeout      = 3
+      event_type   = "origin-response"
+      include_body = false
     }
   }
 

modules/lambda@edge/README.md

@@ -73,7 +73,7 @@ module "lambda_at_edge" {
 | <a name="input_destruction_delay"></a> [destruction\_delay](#input\_destruction\_delay) | The delay, in [Golang ParseDuration](https://pkg.go.dev/time#ParseDuration) format, to wait before destroying the Lambda@Edge<br>functions.<br><br>This delay is meant to circumvent Lambda@Edge functions not being immediately deletable following their dissociation from<br>a CloudFront distribution, since they are replicated to CloudFront Edge servers around the world.<br><br>If set to `null`, no delay will be introduced.<br><br>By default, the delay is 20 minutes. This is because it takes about 3 minutes to destroy a CloudFront distribution, and<br>around 15 minutes until the Lambda@Edge function is available for deletion, in most cases.<br><br>For more information, see: https://github.com/hashicorp/terraform-provider-aws/issues/1721. | `string` | `"20m"` | no |
 | <a name="input_enabled"></a> [enabled](#input\_enabled) | Set to false to prevent the module from creating any resources | `bool` | `null` | no |
 | <a name="input_environment"></a> [environment](#input\_environment) | ID element. Usually used for region e.g. 'uw2', 'us-west-2', OR role 'prod', 'staging', 'dev', 'UAT' | `string` | `null` | no |
-| <a name="input_functions"></a> [functions](#input\_functions) | Lambda@Edge functions to create.<br><br>The key of this map is the name label of the Lambda@Edge function.<br><br>`source.filename` and `source.content` dictate the name and content of the files that will make up the Lambda function<br>source, respectively.<br><br>`runtime` and `handler` correspond to the attributes of the same name in the [lambda\_function](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/lambda_function)<br>resource.<br><br>`event_type` and `include_body` correspond to the attributes of the same name in the [Lambda Function association block<br>of the cloudfront\_distribution](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/cloudfront_distribution#lambda-function-association)<br>resource. | <pre>map(object({<br>    source = list(object({<br>      filename = string<br>      content  = string<br>    }))<br>    runtime      = string<br>    handler      = string<br>    event_type   = string<br>    include_body = bool<br>  }))</pre> | n/a | yes |
+| <a name="input_functions"></a> [functions](#input\_functions) | Lambda@Edge functions to create.<br><br>The key of this map is the name label of the Lambda@Edge function.<br><br>`source.filename` and `source.content` dictate the name and content of the files that will make up the Lambda function<br>source, respectively.<br><br>`runtime`, `handler`, `memory_size`, and `timeout` correspond to the attributes of the same name in the [lambda\_function](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/lambda_function)<br>resource.<br><br>`event_type` and `include_body` correspond to the attributes of the same name in the [Lambda Function association block<br>of the cloudfront\_distribution](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/cloudfront_distribution#lambda-function-association)<br>resource. | <pre>map(object({<br>    source = list(object({<br>      filename = string<br>      content  = string<br>    }))<br>    runtime      = string<br>    handler      = string<br>    memory_size  = number<br>    timeout      = number<br>    event_type   = string<br>    include_body = bool<br>  }))</pre> | n/a | yes |
 | <a name="input_id_length_limit"></a> [id\_length\_limit](#input\_id\_length\_limit) | Limit `id` to this many characters (minimum 6).<br>Set to `0` for unlimited length.<br>Set to `null` for keep the existing setting, which defaults to `0`.<br>Does not affect `id_full`. | `number` | `null` | no |
 | <a name="input_label_key_case"></a> [label\_key\_case](#input\_label\_key\_case) | Controls the letter case of the `tags` keys (label names) for tags generated by this module.<br>Does not affect keys of tags passed in via the `tags` input.<br>Possible values: `lower`, `title`, `upper`.<br>Default value: `title`. | `string` | `null` | no |
 | <a name="input_label_order"></a> [label\_order](#input\_label\_order) | The order in which the labels (ID elements) appear in the `id`.<br>Defaults to ["namespace", "environment", "stage", "name", "attributes"].<br>You can omit any of the 6 labels ("tenant" is the 6th), but at least one must be present. | `list(string)` | `null` | no |

modules/lambda@edge/main.tf

@@ -78,12 +78,12 @@ resource "aws_lambda_function" "default" {
   function_name    = module.function_label[each.key].id
   runtime          = each.value.runtime
   handler          = each.value.handler
+  memory_size      = each.value.memory_size != null ? each.value.memory_size : 128
+  timeout          = each.value.timeout != null ? each.value.timeout : 3
   role             = module.role[each.key].arn
   filename         = each.value.source_zip != null ? data.local_file.lambda_zip[each.key].filename : data.archive_file.lambda_zip[each.key].output_path
   source_code_hash = each.value.source_zip != null ? sha256(data.local_file.lambda_zip[each.key].content_base64) : data.archive_file.lambda_zip[each.key].output_base64sha256
   publish          = true
-  memory_size      = each.value.memory_size != null ? each.value.memory_size : 128
-  timeout          = each.value.timeout != null ? each.value.timeout : 3
 }
 
 resource "aws_lambda_permission" "allow_cloudfront" {

modules/lambda@edge/variables.tf

@@ -29,10 +29,10 @@ variable "functions" {
     source_zip   = optional(string)
     runtime      = string
     handler      = string
-    event_type   = string
-    include_body = bool
     memory_size  = optional(number)
     timeout      = optional(number)
+    event_type   = string
+    include_body = bool
   }))
 
   validation {