feat: Added support for connection_attempts, connection_timeout, and origin_shield (#47)

Author: dudicoco

README.md

@@ -86,14 +86,14 @@ module "cdn" {
 
 | Name | Version |
 |------|---------|
-| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13.0 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.41.0 |
+| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.43 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 3.41.0 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 3.43 |
 
 ## Modules
 

examples/complete/README.md

@@ -26,16 +26,16 @@ Note that this example may create resources which cost money. Run `terraform des
 
 | Name | Version |
 |------|---------|
-| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13.0 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.28.0 |
+| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.28 |
 | <a name="requirement_null"></a> [null](#requirement\_null) | ~> 2 |
 | <a name="requirement_random"></a> [random](#requirement\_random) | ~> 2 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 3.28.0 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 3.28 |
 | <a name="provider_null"></a> [null](#provider\_null) | ~> 2 |
 | <a name="provider_random"></a> [random](#provider\_random) | ~> 2 |
 
@@ -47,7 +47,7 @@ Note that this example may create resources which cost money. Run `terraform des
 | <a name="module_cloudfront"></a> [cloudfront](#module\_cloudfront) | ../../ |  |
 | <a name="module_lambda_function"></a> [lambda\_function](#module\_lambda\_function) | terraform-aws-modules/lambda/aws | ~> 2.0 |
 | <a name="module_log_bucket"></a> [log\_bucket](#module\_log\_bucket) | terraform-aws-modules/s3-bucket/aws | ~> 2.0 |
-| <a name="module_records"></a> [records](#module\_records) | terraform-aws-modules/route53/aws//modules/records | ~> 2.0 |
+| <a name="module_records"></a> [records](#module\_records) | terraform-aws-modules/route53/aws//modules/records | 2.0.0 |
 | <a name="module_s3_one"></a> [s3\_one](#module\_s3\_one) | terraform-aws-modules/s3-bucket/aws | ~> 2.0 |
 
 ## Resources

examples/complete/main.tf

@@ -58,6 +58,11 @@ module "cloudfront" {
           value = "SAMEORIGIN"
         }
       ]
+
+      origin_shield = {
+        enabled              = true
+        origin_shield_region = "us-east-1"
+      }
     }
 
     s3_one = {
@@ -237,7 +242,7 @@ module "lambda_function" {
 
 module "records" {
   source  = "terraform-aws-modules/route53/aws//modules/records"
-  version = "~> 2.0"
+  version = "2.0.0" # @todo: revert to "~> 2.0" once 2.1.0 is fixed properly
 
   zone_id = data.aws_route53_zone.this.zone_id
 

examples/complete/versions.tf

@@ -1,8 +1,8 @@
 terraform {
-  required_version = ">= 0.13.0"
+  required_version = ">= 0.13"
 
   required_providers {
-    aws    = ">= 3.28.0"
+    aws    = ">= 3.28"
     random = "~> 2"
     null   = "~> 2"
   }

main.tf

@@ -37,19 +37,23 @@ resource "aws_cloudfront_distribution" "this" {
     for_each = var.origin
 
     content {
-      domain_name = origin.value.domain_name
-      origin_id   = lookup(origin.value, "origin_id", origin.key)
-      origin_path = lookup(origin.value, "origin_path", "")
+      domain_name         = origin.value.domain_name
+      origin_id           = lookup(origin.value, "origin_id", origin.key)
+      origin_path         = lookup(origin.value, "origin_path", "")
+      connection_attempts = lookup(origin.value, "connection_attempts", null)
+      connection_timeout  = lookup(origin.value, "connection_timeout", null)
 
       dynamic "s3_origin_config" {
         for_each = length(keys(lookup(origin.value, "s3_origin_config", {}))) == 0 ? [] : [lookup(origin.value, "s3_origin_config", {})]
+
         content {
           origin_access_identity = lookup(s3_origin_config.value, "cloudfront_access_identity_path", lookup(lookup(aws_cloudfront_origin_access_identity.this, lookup(s3_origin_config.value, "origin_access_identity", ""), {}), "cloudfront_access_identity_path", null))
         }
       }
 
       dynamic "custom_origin_config" {
         for_each = length(lookup(origin.value, "custom_origin_config", "")) == 0 ? [] : [lookup(origin.value, "custom_origin_config", "")]
+
         content {
           http_port                = custom_origin_config.value.http_port
           https_port               = custom_origin_config.value.https_port
@@ -62,11 +66,21 @@ resource "aws_cloudfront_distribution" "this" {
 
       dynamic "custom_header" {
         for_each = lookup(origin.value, "custom_header", [])
+
         content {
           name  = custom_header.value.name
           value = custom_header.value.value
         }
       }
+
+      dynamic "origin_shield" {
+        for_each = length(keys(lookup(origin.value, "origin_shield", {}))) == 0 ? [] : [lookup(origin.value, "origin_shield", {})]
+
+        content {
+          enabled              = origin_shield.value.enabled
+          origin_shield_region = origin_shield.value.origin_shield_region
+        }
+      }
     }
   }
 

versions.tf

@@ -1,7 +1,7 @@
 terraform {
-  required_version = ">= 0.13.0"
+  required_version = ">= 0.13"
 
   required_providers {
-    aws = ">= 3.41.0"
+    aws = ">= 3.43"
   }
 }