Skip to content

Commit 118ad1c

Browse files
mbarrienmbarrien
authored
[feature] Terraform AWS Provider 3.0 compatibility (#322)
1 parent d49054c commit 118ad1c

File tree

103 files changed

+160
-439
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

103 files changed

+160
-439
lines changed

‎aws-aurora-mysql/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ module "db" {
3535

3636
| Name | Version |
3737
|------|---------|
38-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 2.44.0, < 3.0.0 |
38+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 2.44.0 |
3939

4040
## Providers
4141

@@ -45,7 +45,7 @@ No providers.
4545

4646
| Name | Source | Version |
4747
|------|--------|---------|
48-
| <a name="module_aurora"></a> [aurora](#module\_aurora) | ../aws-aurora | |
48+
| <a name="module_aurora"></a> [aurora](#module\_aurora) | ../aws-aurora | n/a |
4949

5050
## Resources
5151

‎aws-aurora-mysql/terraform.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
terraform {
22
required_providers {
33
# ca_cert_identifier on RDS was added in 2.44.0
4-
aws = ">= 2.44.0, < 3.0.0"
4+
aws = ">= 2.44.0"
55
}
66
}

‎aws-aurora-postgres/README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ module "db" {
3434

3535
| Name | Version |
3636
|------|---------|
37-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 2.44.0, < 3.0.0 |
37+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 2.44.0 |
3838

3939
## Providers
4040

@@ -44,7 +44,7 @@ No providers.
4444

4545
| Name | Source | Version |
4646
|------|--------|---------|
47-
| <a name="module_aurora"></a> [aurora](#module\_aurora) | ../aws-aurora | |
47+
| <a name="module_aurora"></a> [aurora](#module\_aurora) | ../aws-aurora | n/a |
4848

4949
## Resources
5050

@@ -55,14 +55,14 @@ No resources.
5555
| Name | Description | Type | Default | Required |
5656
|------|-------------|------|---------|:--------:|
5757
| <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 |
58-
| <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 |
58+
| <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 |
5959
| <a name="input_ca_cert_identifier"></a> [ca\_cert\_identifier](#input\_ca\_cert\_identifier) | Identifier for the certificate authority. | `string` | `"rds-ca-2019"` | no |
6060
| <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 |
6161
| <a name="input_database_password"></a> [database\_password](#input\_database\_password) | Password for user that will be created. | `string` | n/a | yes |
6262
| <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 |
6363
| <a name="input_database_username"></a> [database\_username](#input\_database\_username) | Default user to be created. | `string` | n/a | yes |
6464
| <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 |
65-
| <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 |
65+
| <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 |
6666
| <a name="input_env"></a> [env](#input\_env) | Env for tagging and naming. See [doc](../README.md#consistent-tagging). | `string` | n/a | yes |
6767
| <a name="input_iam_database_authentication_enabled"></a> [iam\_database\_authentication\_enabled](#input\_iam\_database\_authentication\_enabled) | n/a | `string` | `false` | no |
6868
| <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 |

‎aws-aurora-postgres/terraform.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
terraform {
22
required_providers {
33
# ca_cert_identifier on RDS was added in 2.44.0
4-
aws = ">= 2.44.0, < 3.0.0"
4+
aws = ">= 2.44.0"
55
}
66
}

‎aws-aurora/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ This is a low-level module for creating AWS Aurora clusters. We strongly reccome
77

88
| Name | Version |
99
|------|---------|
10-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 2.44.0, < 3.0.0 |
10+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 2.44.0 |
1111

1212
## Providers
1313

1414
| Name | Version |
1515
|------|---------|
16-
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 2.44.0, < 3.0.0 |
16+
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 2.44.0 |
1717

1818
## Modules
1919

‎aws-aurora/terraform.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
terraform {
22
required_providers {
33
# ca_cert_identifier on RDS was added in 2.44.0
4-
aws = ">= 2.44.0, < 3.0.0"
4+
aws = ">= 2.44.0"
55
}
66
}

‎aws-cloudfront-domain-redirect/README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -33,20 +33,20 @@ module domain-redirect {
3333

3434
| Name | Version |
3535
|------|---------|
36-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | < 3.0.0 |
36+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.0.0 |
3737

3838
## Providers
3939

4040
| Name | Version |
4141
|------|---------|
42-
| <a name="provider_aws"></a> [aws](#provider\_aws) | < 3.0.0 |
42+
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 3.0.0 |
4343

4444
## Modules
4545

4646
| Name | Source | Version |
4747
|------|--------|---------|
48-
| <a name="module_cert"></a> [cert](#module\_cert) | ../aws-acm-cert | |
49-
| <a name="module_security_headers_lambda"></a> [security\_headers\_lambda](#module\_security\_headers\_lambda) | ../aws-lambda-edge-add-security-headers | |
48+
| <a name="module_cert"></a> [cert](#module\_cert) | ../aws-acm-certificate | n/a |
49+
| <a name="module_security_headers_lambda"></a> [security\_headers\_lambda](#module\_security\_headers\_lambda) | ../aws-lambda-edge-add-security-headers | n/a |
5050

5151
## Resources
5252

‎aws-cloudfront-domain-redirect/main.tf

+7-10
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
locals {
22
tags = {
3-
env = var.env
4-
owner = var.owner
5-
service = var.service
6-
project = var.project
3+
env = var.env
4+
owner = var.owner
5+
service = var.service
6+
project = var.project
7+
managedBy = "terraform"
78
}
89
}
910

@@ -26,14 +27,10 @@ module "security_headers_lambda" {
2627
}
2728

2829
module "cert" {
29-
source = "../aws-acm-cert"
30+
source = "../aws-acm-certificate"
3031
cert_domain_name = var.source_domain
3132
aws_route53_zone_id = var.source_domain_zone_id
32-
33-
project = var.project
34-
owner = var.owner
35-
env = var.env
36-
service = var.service
33+
tags = local.tags
3734
}
3835

3936
resource "aws_cloudfront_distribution" "cf" {

‎aws-cloudfront-domain-redirect/terraform.tf

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
terraform {
2+
# Uses aws-acm-certificate module, which needs AWS provider >3.0
23
required_providers {
3-
aws = "< 3.0.0"
4+
aws = ">= 3.0.0"
45
}
56
}

‎aws-cloudfront-logs-bucket/README.md

+3-5
Original file line numberDiff line numberDiff line change
@@ -29,21 +29,19 @@ module "s3-bucket" {
2929
<!-- START -->
3030
## Requirements
3131

32-
| Name | Version |
33-
|------|---------|
34-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | < 3.0.0 |
32+
No requirements.
3533

3634
## Providers
3735

3836
| Name | Version |
3937
|------|---------|
40-
| <a name="provider_aws"></a> [aws](#provider\_aws) | < 3.0.0 |
38+
| <a name="provider_aws"></a> [aws](#provider\_aws) | n/a |
4139

4240
## Modules
4341

4442
| Name | Source | Version |
4543
|------|--------|---------|
46-
| <a name="module_aws-cloudfront-logs-bucket"></a> [aws-cloudfront-logs-bucket](#module\_aws-cloudfront-logs-bucket) | ../aws-s3-private-bucket | |
44+
| <a name="module_aws-cloudfront-logs-bucket"></a> [aws-cloudfront-logs-bucket](#module\_aws-cloudfront-logs-bucket) | ../aws-s3-private-bucket | n/a |
4745

4846
## Resources
4947

‎aws-cloudfront-logs-bucket/terraform.tf

-5
This file was deleted.

‎aws-cloudwatch-log-group/README.md

+2-4
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,13 @@ By default the name is `${var.project}-${var.env}-${var.service}`, but you can o
77
<!-- START -->
88
## Requirements
99

10-
| Name | Version |
11-
|------|---------|
12-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | < 3.0.0 |
10+
No requirements.
1311

1412
## Providers
1513

1614
| Name | Version |
1715
|------|---------|
18-
| <a name="provider_aws"></a> [aws](#provider\_aws) | < 3.0.0 |
16+
| <a name="provider_aws"></a> [aws](#provider\_aws) | n/a |
1917

2018
## Modules
2119

‎aws-cloudwatch-log-group/terraform.tf

-5
This file was deleted.

‎aws-cloudwatch-log-retention-manager/README.md

+2-3
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,19 @@ module log-retention-manager {
1717
| Name | Version |
1818
|------|---------|
1919
| <a name="requirement_archive"></a> [archive](#requirement\_archive) | ~> 2.0 |
20-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | < 3.0.0 |
2120

2221
## Providers
2322

2423
| Name | Version |
2524
|------|---------|
2625
| <a name="provider_archive"></a> [archive](#provider\_archive) | ~> 2.0 |
27-
| <a name="provider_aws"></a> [aws](#provider\_aws) | < 3.0.0 |
26+
| <a name="provider_aws"></a> [aws](#provider\_aws) | n/a |
2827

2928
## Modules
3029

3130
| Name | Source | Version |
3231
|------|--------|---------|
33-
| <a name="module_lambda"></a> [lambda](#module\_lambda) | ../aws-lambda-function | |
32+
| <a name="module_lambda"></a> [lambda](#module\_lambda) | ../aws-lambda-function | n/a |
3433

3534
## Resources
3635

‎aws-cloudwatch-log-retention-manager/terraform.tf

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
terraform {
22
required_providers {
3-
aws = "< 3.0.0"
43
archive = "~> 2.0"
54
}
65
}

‎aws-default-vpc-security/README.md

+2-4
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,13 @@ You will need to invoke this module with a properly configured provider for ever
3838
<!-- START -->
3939
## Requirements
4040

41-
| Name | Version |
42-
|------|---------|
43-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | < 3.0.0 |
41+
No requirements.
4442

4543
## Providers
4644

4745
| Name | Version |
4846
|------|---------|
49-
| <a name="provider_aws"></a> [aws](#provider\_aws) | < 3.0.0 |
47+
| <a name="provider_aws"></a> [aws](#provider\_aws) | n/a |
5048

5149
## Modules
5250

‎aws-default-vpc-security/terraform.tf

-5
This file was deleted.

‎aws-ecs-job-fargate/README.md

+2-4
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,13 @@ Since changing a service to use the new ARN requires destroying and recreating t
2525
<!-- START -->
2626
## Requirements
2727

28-
| Name | Version |
29-
|------|---------|
30-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | < 3.0.0 |
28+
No requirements.
3129

3230
## Providers
3331

3432
| Name | Version |
3533
|------|---------|
36-
| <a name="provider_aws"></a> [aws](#provider\_aws) | < 3.0.0 |
34+
| <a name="provider_aws"></a> [aws](#provider\_aws) | n/a |
3735

3836
## Modules
3937

‎aws-ecs-job-fargate/terraform.tf

-5
This file was deleted.

‎aws-ecs-job/README.md

+2-4
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,13 @@ service = false` argument can be removed.
2626
<!-- START -->
2727
## Requirements
2828

29-
| Name | Version |
30-
|------|---------|
31-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | < 3.0.0 |
29+
No requirements.
3230

3331
## Providers
3432

3533
| Name | Version |
3634
|------|---------|
37-
| <a name="provider_aws"></a> [aws](#provider\_aws) | < 3.0.0 |
35+
| <a name="provider_aws"></a> [aws](#provider\_aws) | n/a |
3836

3937
## Modules
4038

‎aws-ecs-job/terraform.tf

-5
This file was deleted.

‎aws-ecs-service-fargate/README.md

+2-4
Original file line numberDiff line numberDiff line change
@@ -146,15 +146,13 @@ service = false` argument can be removed.
146146
<!-- START -->
147147
## Requirements
148148

149-
| Name | Version |
150-
|------|---------|
151-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | < 3.0.0 |
149+
No requirements.
152150

153151
## Providers
154152

155153
| Name | Version |
156154
|------|---------|
157-
| <a name="provider_aws"></a> [aws](#provider\_aws) | < 3.0.0 |
155+
| <a name="provider_aws"></a> [aws](#provider\_aws) | n/a |
158156

159157
## Modules
160158

‎aws-ecs-service-fargate/terraform.tf

-5
This file was deleted.

‎aws-ecs-service/README.md

+2-4
Original file line numberDiff line numberDiff line change
@@ -138,15 +138,13 @@ service = false` argument can be removed.
138138
<!-- START -->
139139
## Requirements
140140

141-
| Name | Version |
142-
|------|---------|
143-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | < 3.0.0 |
141+
No requirements.
144142

145143
## Providers
146144

147145
| Name | Version |
148146
|------|---------|
149-
| <a name="provider_aws"></a> [aws](#provider\_aws) | < 3.0.0 |
147+
| <a name="provider_aws"></a> [aws](#provider\_aws) | n/a |
150148

151149
## Modules
152150

‎aws-ecs-service/terraform.tf

-5
This file was deleted.

‎aws-efs-volume/README.md

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
<!-- START -->
22
## Requirements
33

4-
| Name | Version |
5-
|------|---------|
6-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | < 3.0.0 |
4+
No requirements.
75

86
## Providers
97

108
| Name | Version |
119
|------|---------|
12-
| <a name="provider_aws"></a> [aws](#provider\_aws) | < 3.0.0 |
10+
| <a name="provider_aws"></a> [aws](#provider\_aws) | n/a |
1311

1412
## Modules
1513

‎aws-efs-volume/terraform.tf

-5
This file was deleted.

0 commit comments

Comments
 (0)