[feature] Terraform AWS Provider 3.0 compatibility

chanzuckerberg · Jul 7, 2021 · 3fb729e · 3fb729e
1 parent fcb46f1
commit 3fb729e
Show file tree

Hide file tree

Showing 103 changed files with 154 additions and 435 deletions.
diff --git a/aws-aurora-mysql/README.md b/aws-aurora-mysql/README.md
@@ -35,7 +35,7 @@ module "db" {
 
 | Name | Version |
 |------|---------|
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 2.44.0, < 3.0.0 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 2.44.0 |
 
 ## Providers
 
@@ -45,7 +45,7 @@ No providers.
 
 | Name | Source | Version |
 |------|--------|---------|
-| <a name="module_aurora"></a> [aurora](#module\_aurora) | ../aws-aurora |  |
+| <a name="module_aurora"></a> [aurora](#module\_aurora) | ../aws-aurora | n/a |
 
 ## Resources
 

diff --git a/aws-aurora-mysql/terraform.tf b/aws-aurora-mysql/terraform.tf
@@ -1,6 +1,6 @@
 terraform {
   required_providers {
     # ca_cert_identifier on RDS was added in 2.44.0
-    aws = ">= 2.44.0, < 3.0.0"
+    aws = ">= 2.44.0"
   }
 }
diff --git a/aws-aurora-postgres/README.md b/aws-aurora-postgres/README.md
@@ -34,7 +34,7 @@ module "db" {
 
 | Name | Version |
 |------|---------|
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 2.44.0, < 3.0.0 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 2.44.0 |
 
 ## Providers
 
@@ -44,7 +44,7 @@ No providers.
 
 | Name | Source | Version |
 |------|--------|---------|
-| <a name="module_aurora"></a> [aurora](#module\_aurora) | ../aws-aurora |  |
+| <a name="module_aurora"></a> [aurora](#module\_aurora) | ../aws-aurora | n/a |
 
 ## Resources
 
@@ -55,14 +55,14 @@ No resources.
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
 | <a name="input_apply_immediately"></a> [apply\_immediately](#input\_apply\_immediately) | If false changes will not be applied until next maintenance window. | `string` | `false` | no |
-| <a name="input_auto_minor_version_upgrade"></a> [auto\_minor\_version\_upgrade](#input\_auto\_minor\_version\_upgrade) | Set the databases to automatically upgrade minor versions. WARNING - if this is enabled, make sure engine_version is set to a *prefix* rather that a specific version so that TF won't try to downgrade DB's that have been auto-upgraded. Docs: https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/db_instance#engine_version | `bool` | `false` | no |
+| <a name="input_auto_minor_version_upgrade"></a> [auto\_minor\_version\_upgrade](#input\_auto\_minor\_version\_upgrade) | Set the databases to automatically upgrade minor versions. WARNING - if this is enabled, make sure engine\_version is set to a *prefix* rather that a specific version so that TF won't try to downgrade DB's that have been auto-upgraded. Docs: https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/db_instance#engine_version | `bool` | `false` | no |
 | <a name="input_ca_cert_identifier"></a> [ca\_cert\_identifier](#input\_ca\_cert\_identifier) | Identifier for the certificate authority. | `string` | `"rds-ca-2019"` | no |
 | <a name="input_database_name"></a> [database\_name](#input\_database\_name) | The name of the database to be created in the cluster. | `string` | n/a | yes |
 | <a name="input_database_password"></a> [database\_password](#input\_database\_password) | Password for user that will be created. | `string` | n/a | yes |
 | <a name="input_database_subnet_group"></a> [database\_subnet\_group](#input\_database\_subnet\_group) | The name of an existing database subnet group to use. | `string` | n/a | yes |
 | <a name="input_database_username"></a> [database\_username](#input\_database\_username) | Default user to be created. | `string` | n/a | yes |
 | <a name="input_db_parameters"></a> [db\_parameters](#input\_db\_parameters) | Instance params you can set. [Doc](https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/AuroraPostgreSQL.Reference.html#AuroraPostgreSQL.Reference.Parameters.Instance) | `list(any)` | `[]` | no |
-| <a name="input_engine_version"></a> [engine\_version](#input\_engine\_version) | The version of Postgres to use. This should be a *prefix* if auto version upgrades are enabled. (Docs: https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/db_instance#engine_version)| `string` | `"10"` | no |
+| <a name="input_engine_version"></a> [engine\_version](#input\_engine\_version) | The version of Postgres to use. This should be a *prefix* if auto version upgrades are enabled. (Docs: https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/db_instance#engine_version) | `string` | `"10"` | no |
 | <a name="input_env"></a> [env](#input\_env) | Env for tagging and naming. See [doc](../README.md#consistent-tagging). | `string` | n/a | yes |
 | <a name="input_iam_database_authentication_enabled"></a> [iam\_database\_authentication\_enabled](#input\_iam\_database\_authentication\_enabled) | n/a | `string` | `false` | no |
 | <a name="input_ingress_cidr_blocks"></a> [ingress\_cidr\_blocks](#input\_ingress\_cidr\_blocks) | A list of CIDR blocks that should be allowed to communicate with this Aurora cluster. | `list(string)` | `[]` | no |

diff --git a/aws-aurora-postgres/terraform.tf b/aws-aurora-postgres/terraform.tf
@@ -1,6 +1,6 @@
 terraform {
   required_providers {
     # ca_cert_identifier on RDS was added in 2.44.0
-    aws = ">= 2.44.0, < 3.0.0"
+    aws = ">= 2.44.0"
   }
 }
diff --git a/aws-aurora/README.md b/aws-aurora/README.md
@@ -7,13 +7,13 @@ This is a low-level module for creating AWS Aurora clusters. We strongly reccome
 
 | Name | Version |
 |------|---------|
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 2.44.0, < 3.0.0 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 2.44.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 2.44.0, < 3.0.0 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 2.44.0 |
 
 ## Modules
 

diff --git a/aws-aurora/terraform.tf b/aws-aurora/terraform.tf
@@ -1,6 +1,6 @@
 terraform {
   required_providers {
     # ca_cert_identifier on RDS was added in 2.44.0
-    aws = ">= 2.44.0, < 3.0.0"
+    aws = ">= 2.44.0"
   }
 }
diff --git a/aws-cloudfront-domain-redirect/README.md b/aws-cloudfront-domain-redirect/README.md
@@ -33,20 +33,20 @@ module domain-redirect {
 
 | Name | Version |
 |------|---------|
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | < 3.0.0 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.0.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | < 3.0.0 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 3.0.0 |
 
 ## Modules
 
 | Name | Source | Version |
 |------|--------|---------|
-| <a name="module_cert"></a> [cert](#module\_cert) | ../aws-acm-cert |  |
-| <a name="module_security_headers_lambda"></a> [security\_headers\_lambda](#module\_security\_headers\_lambda) | ../aws-lambda-edge-add-security-headers |  |
+| <a name="module_cert"></a> [cert](#module\_cert) | ../aws-acm-certificate | n/a |
+| <a name="module_security_headers_lambda"></a> [security\_headers\_lambda](#module\_security\_headers\_lambda) | ../aws-lambda-edge-add-security-headers | n/a |
 
 ## Resources
 

diff --git a/aws-cloudfront-domain-redirect/main.tf b/aws-cloudfront-domain-redirect/main.tf
@@ -26,14 +26,10 @@ module "security_headers_lambda" {
 }
 
 module "cert" {
-  source              = "../aws-acm-cert"
+  source              = "../aws-acm-certificate"
   cert_domain_name    = var.source_domain
   aws_route53_zone_id = var.source_domain_zone_id
-
-  project = var.project
-  owner   = var.owner
-  env     = var.env
-  service = var.service
+  tags                = local.tags
 }
 
 resource "aws_cloudfront_distribution" "cf" {

diff --git a/aws-cloudfront-domain-redirect/terraform.tf b/aws-cloudfront-domain-redirect/terraform.tf
@@ -1,5 +1,6 @@
 terraform {
+  # Uses aws-acm-certificate module, which needs AWS provider >3.0
   required_providers {
-    aws = "< 3.0.0"
+    aws = ">= 3.0.0"
   }
 }
diff --git a/aws-cloudfront-logs-bucket/README.md b/aws-cloudfront-logs-bucket/README.md
@@ -29,21 +29,19 @@ module "s3-bucket" {
 <!-- START -->
 ## Requirements
 
-| Name | Version |
-|------|---------|
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | < 3.0.0 |
+No requirements.
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | < 3.0.0 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | n/a |
 
 ## Modules
 
 | Name | Source | Version |
 |------|--------|---------|
-| <a name="module_aws-cloudfront-logs-bucket"></a> [aws-cloudfront-logs-bucket](#module\_aws-cloudfront-logs-bucket) | ../aws-s3-private-bucket |  |
+| <a name="module_aws-cloudfront-logs-bucket"></a> [aws-cloudfront-logs-bucket](#module\_aws-cloudfront-logs-bucket) | ../aws-s3-private-bucket | n/a |
 
 ## Resources
 

diff --git a/aws-cloudfront-logs-bucket/terraform.tf b/aws-cloudfront-logs-bucket/terraform.tf
diff --git a/aws-cloudwatch-log-group/README.md b/aws-cloudwatch-log-group/README.md
@@ -7,15 +7,13 @@ By default the name is `${var.project}-${var.env}-${var.service}`, but you can o
 <!-- START -->
 ## Requirements
 
-| Name | Version |
-|------|---------|
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | < 3.0.0 |
+No requirements.
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | < 3.0.0 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | n/a |
 
 ## Modules
 

diff --git a/aws-cloudwatch-log-group/terraform.tf b/aws-cloudwatch-log-group/terraform.tf
diff --git a/aws-cloudwatch-log-retention-manager/README.md b/aws-cloudwatch-log-retention-manager/README.md
@@ -17,20 +17,19 @@ module log-retention-manager {
 | Name | Version |
 |------|---------|
 | <a name="requirement_archive"></a> [archive](#requirement\_archive) | ~> 2.0 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | < 3.0.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
 | <a name="provider_archive"></a> [archive](#provider\_archive) | ~> 2.0 |
-| <a name="provider_aws"></a> [aws](#provider\_aws) | < 3.0.0 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | n/a |
 
 ## Modules
 
 | Name | Source | Version |
 |------|--------|---------|
-| <a name="module_lambda"></a> [lambda](#module\_lambda) | ../aws-lambda-function |  |
+| <a name="module_lambda"></a> [lambda](#module\_lambda) | ../aws-lambda-function | n/a |
 
 ## Resources
 

diff --git a/aws-cloudwatch-log-retention-manager/terraform.tf b/aws-cloudwatch-log-retention-manager/terraform.tf
@@ -1,6 +1,5 @@
 terraform {
   required_providers {
-    aws     = "< 3.0.0"
     archive = "~> 2.0"
   }
 }
diff --git a/aws-default-vpc-security/README.md b/aws-default-vpc-security/README.md
@@ -38,15 +38,13 @@ You will need to invoke this module with a properly configured provider for ever
 <!-- START -->
 ## Requirements
 
-| Name | Version |
-|------|---------|
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | < 3.0.0 |
+No requirements.
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | < 3.0.0 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | n/a |
 
 ## Modules
 

diff --git a/aws-default-vpc-security/terraform.tf b/aws-default-vpc-security/terraform.tf
diff --git a/aws-ecs-job-fargate/README.md b/aws-ecs-job-fargate/README.md
@@ -25,15 +25,13 @@ Since changing a service to use the new ARN requires destroying and recreating t
 <!-- START -->
 ## Requirements
 
-| Name | Version |
-|------|---------|
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | < 3.0.0 |
+No requirements.
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | < 3.0.0 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | n/a |
 
 ## Modules
 

diff --git a/aws-ecs-job-fargate/terraform.tf b/aws-ecs-job-fargate/terraform.tf
diff --git a/aws-ecs-job/README.md b/aws-ecs-job/README.md
@@ -26,15 +26,13 @@ service = false` argument can be removed.
 <!-- START -->
 ## Requirements
 
-| Name | Version |
-|------|---------|
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | < 3.0.0 |
+No requirements.
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | < 3.0.0 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | n/a |
 
 ## Modules
 

diff --git a/aws-ecs-job/terraform.tf b/aws-ecs-job/terraform.tf
diff --git a/aws-ecs-service-fargate/README.md b/aws-ecs-service-fargate/README.md
@@ -146,15 +146,13 @@ service = false` argument can be removed.
 <!-- START -->
 ## Requirements
 
-| Name | Version |
-|------|---------|
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | < 3.0.0 |
+No requirements.
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | < 3.0.0 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | n/a |
 
 ## Modules
 

diff --git a/aws-ecs-service-fargate/terraform.tf b/aws-ecs-service-fargate/terraform.tf
diff --git a/aws-ecs-service/README.md b/aws-ecs-service/README.md
@@ -138,15 +138,13 @@ service = false` argument can be removed.
 <!-- START -->
 ## Requirements
 
-| Name | Version |
-|------|---------|
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | < 3.0.0 |
+No requirements.
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | < 3.0.0 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | n/a |
 
 ## Modules
 

diff --git a/aws-ecs-service/terraform.tf b/aws-ecs-service/terraform.tf
diff --git a/aws-efs-volume/README.md b/aws-efs-volume/README.md
@@ -1,15 +1,13 @@
 <!-- START -->
 ## Requirements
 
-| Name | Version |
-|------|---------|
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | < 3.0.0 |
+No requirements.
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | < 3.0.0 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | n/a |
 
 ## Modules
 

diff --git a/aws-efs-volume/terraform.tf b/aws-efs-volume/terraform.tf
diff --git a/aws-iam-ecs-task-role/README.md b/aws-iam-ecs-task-role/README.md
@@ -23,15 +23,13 @@ output "ecs-role-arn" {
 <!-- START -->
 ## Requirements
 
-| Name | Version |
-|------|---------|
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | < 3.0.0 |
+No requirements.
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | < 3.0.0 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | n/a |
 
 ## Modules
 

diff --git a/aws-iam-ecs-task-role/terraform.tf b/aws-iam-ecs-task-role/terraform.tf