update examples and function location

Author: joshAtRula

README.md

@@ -261,7 +261,7 @@ No modules.
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
 | <a name="input_aliases"></a> [aliases](#input\_aliases) | Extra CNAMEs (alternate domain names), if any, for this distribution. | `list(string)` | `null` | no |
-| <a name="input_cloudfront_functions"></a> [cloudfront\_functions](#input\_cloudfront\_functions) | Map of CloudFront Function configurations. Key is used as default function name if 'name' not specified. | <pre>map(object({<br/>    name                         = optional(string)<br/>    runtime                      = optional(string, "cloudfront-js-2.0")<br/>    comment                      = optional(string)<br/>    publish                      = optional(bool, true)<br/>    code                         = string<br/>    key_value_store_associations = optional(list(string), null)<br/>  }))</pre> | `{}` | no |
+| <a name="input_cloudfront_functions"></a> [cloudfront\_functions](#input\_cloudfront\_functions) | Map of CloudFront Function configurations. Key is used as default function name if 'name' not specified. | <pre>map(object({<br/>    name                         = optional(string)<br/>    runtime                      = optional(string, "cloudfront-js-2.0")<br/>    comment                      = optional(string)<br/>    publish                      = optional(bool)<br/>    code                         = string<br/>    key_value_store_associations = optional(list(string))<br/>  }))</pre> | `{}` | no |
 | <a name="input_comment"></a> [comment](#input\_comment) | Any comments you want to include about the distribution. | `string` | `null` | no |
 | <a name="input_continuous_deployment_policy_id"></a> [continuous\_deployment\_policy\_id](#input\_continuous\_deployment\_policy\_id) | Identifier of a continuous deployment policy. This argument should only be set on a production distribution. | `string` | `null` | no |
 | <a name="input_create_cloudfront_function"></a> [create\_cloudfront\_function](#input\_create\_cloudfront\_function) | Controls if CloudFront Functions should be created | `bool` | `false` | no |

examples/complete/main.tf

@@ -351,7 +351,6 @@ module "cloudfront" {
       }
     }
   }
-
 }
 
 ######

main.tf

@@ -146,13 +146,12 @@ resource "aws_cloudfront_response_headers_policy" "this" {
 resource "aws_cloudfront_function" "this" {
   for_each = var.create_cloudfront_function && var.cloudfront_functions != null ? var.cloudfront_functions : {}
 
-  name    = try(coalesce(each.value.name, each.key))
-  runtime = each.value.runtime
-  comment = each.value.comment
-  publish = each.value.publish
-  code    = each.value.code
-
+  code                         = each.value.code
+  comment                      = each.value.comment
   key_value_store_associations = each.value.key_value_store_associations
+  name                         = try(coalesce(each.value.name, each.key))
+  publish                      = each.value.publish
+  runtime                      = each.value.runtime
 }
 
 resource "aws_cloudfront_origin_access_identity" "this" {

variables.tf

@@ -300,9 +300,9 @@ variable "cloudfront_functions" {
     name                         = optional(string)
     runtime                      = optional(string, "cloudfront-js-2.0")
     comment                      = optional(string)
-    publish                      = optional(bool, true)
+    publish                      = optional(bool)
     code                         = string
-    key_value_store_associations = optional(list(string), null)
+    key_value_store_associations = optional(list(string))
   }))
   default = {}