Skip to content

Commit 44f97fc

Browse files
magreenbaummagreenbaum
authored
feat!: Support timeouts, cidr_routing_policy, MSV of AWS provider v5 (#116)
1 parent 91f5b54 commit 44f97fc

File tree

17 files changed

+72
-23
lines changed

17 files changed

+72
-23
lines changed

‎examples/complete/README.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ Note that this example may create resources which cost money. Run `terraform des
2222
| Name | Version |
2323
|------|---------|
2424
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3.2 |
25-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.37 |
25+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.91 |
2626

2727
## Providers
2828

2929
| Name | Version |
3030
|------|---------|
31-
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.37 |
32-
| <a name="provider_aws.second_account"></a> [aws.second\_account](#provider\_aws.second\_account) | >= 5.37 |
31+
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.91 |
32+
| <a name="provider_aws.second_account"></a> [aws.second\_account](#provider\_aws.second\_account) | >= 5.91 |
3333

3434
## Modules
3535

@@ -57,6 +57,7 @@ Note that this example may create resources which cost money. Run `terraform des
5757

5858
| Name | Type |
5959
|------|------|
60+
| [aws_route53_cidr_collection.example](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/route53_cidr_collection) | resource |
6061
| [aws_route53_health_check.failover](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/route53_health_check) | resource |
6162
| [aws_route53_resolver_rule.sys](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/route53_resolver_rule) | resource |
6263
| [aws_availability_zones.available](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/availability_zones) | data source |

‎examples/complete/main.tf

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,11 @@ module "zones" {
2828
tags = {
2929
Name = "terraform-aws-modules-example.com"
3030
}
31+
timeouts = {
32+
create = "2h"
33+
update = "3h"
34+
delete = "1h"
35+
}
3136
}
3237

3338
"app.terraform-aws-modules-example.com" = {
@@ -91,6 +96,11 @@ module "records" {
9196
records = [
9297
"${module.zones.primary_name_server[local.zone_name]}. awsdns-hostmaster.amazon.com. 1 7200 900 1209600 60",
9398
]
99+
timeouts = {
100+
create = "2h"
101+
update = "2h"
102+
delete = "1h"
103+
}
94104
},
95105
{
96106
name = ""
@@ -99,6 +109,11 @@ module "records" {
99109
records = [
100110
"10.10.10.10",
101111
]
112+
set_identifier = "dev"
113+
cidr_routing_policy = {
114+
collection_id = aws_route53_cidr_collection.example.id
115+
location_name = "*"
116+
}
102117
},
103118
{
104119
key = "s3-bucket"
@@ -514,3 +529,7 @@ resource "aws_route53_resolver_rule" "sys" {
514529
domain_name = "sys-example.com"
515530
rule_type = "SYSTEM"
516531
}
532+
533+
resource "aws_route53_cidr_collection" "example" {
534+
name = "collection-1"
535+
}

‎examples/complete/versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ terraform {
44
required_providers {
55
aws = {
66
source = "hashicorp/aws"
7-
version = ">= 5.37"
7+
version = ">= 5.91"
88
}
99
}
1010
}

‎modules/delegation-sets/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,13 @@ module "zones" {
4848
| Name | Version |
4949
|------|---------|
5050
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3.2 |
51-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.56 |
51+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.91 |
5252

5353
## Providers
5454

5555
| Name | Version |
5656
|------|---------|
57-
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 3.56 |
57+
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.91 |
5858

5959
## Modules
6060

‎modules/delegation-sets/versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ terraform {
44
required_providers {
55
aws = {
66
source = "hashicorp/aws"
7-
version = ">= 3.56"
7+
version = ">= 5.91"
88
}
99
}
1010
}

‎modules/records/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@ records_jsonencoded = jsonencode([
3232
| Name | Version |
3333
|------|---------|
3434
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3.2 |
35-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.37 |
35+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.91 |
3636

3737
## Providers
3838

3939
| Name | Version |
4040
|------|---------|
41-
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.37 |
41+
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.91 |
4242

4343
## Modules
4444

‎modules/records/main.tf

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,4 +91,23 @@ resource "aws_route53_record" "this" {
9191
}
9292
}
9393
}
94+
95+
dynamic "cidr_routing_policy" {
96+
for_each = try([each.value.cidr_routing_policy], [])
97+
98+
content {
99+
collection_id = cidr_routing_policy.value.collection_id
100+
location_name = cidr_routing_policy.value.location_name
101+
}
102+
}
103+
104+
dynamic "timeouts" {
105+
for_each = try([each.value.timeouts], [])
106+
107+
content {
108+
create = try(timeouts.value.create, null)
109+
update = try(timeouts.value.update, null)
110+
delete = try(timeouts.value.delete, null)
111+
}
112+
}
94113
}

‎modules/records/versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ terraform {
44
required_providers {
55
aws = {
66
source = "hashicorp/aws"
7-
version = ">= 5.37"
7+
version = ">= 5.91"
88
}
99
}
1010
}

‎modules/resolver-endpoints/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ This module creates Route53 Resolver Endpoints.
88
| Name | Version |
99
|------|---------|
1010
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3.2 |
11-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.32 |
11+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.91 |
1212

1313
## Providers
1414

1515
| Name | Version |
1616
|------|---------|
17-
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.32 |
17+
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.91 |
1818

1919
## Modules
2020

‎modules/resolver-endpoints/versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ terraform {
44
required_providers {
55
aws = {
66
source = "hashicorp/aws"
7-
version = ">= 5.32"
7+
version = ">= 5.91"
88
}
99
}
1010
}

‎modules/resolver-rule-associations/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@ module "resolver_rule_associations" {
3232
| Name | Version |
3333
|------|---------|
3434
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3.2 |
35-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.56 |
35+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.91 |
3636

3737
## Providers
3838

3939
| Name | Version |
4040
|------|---------|
41-
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 3.56 |
41+
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.91 |
4242

4343
## Modules
4444

‎modules/resolver-rule-associations/versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ terraform {
44
required_providers {
55
aws = {
66
source = "hashicorp/aws"
7-
version = ">= 3.56"
7+
version = ">= 5.91"
88
}
99
}
1010
}

‎modules/zone-cross-account-vpc-association/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,14 @@ module "zone_cross_account_vpc_association" {
4141
| Name | Version |
4242
|------|---------|
4343
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3.2 |
44-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.56 |
44+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.91 |
4545

4646
## Providers
4747

4848
| Name | Version |
4949
|------|---------|
50-
| <a name="provider_aws.r53_owner"></a> [aws.r53\_owner](#provider\_aws.r53\_owner) | >= 3.56 |
51-
| <a name="provider_aws.vpc_owner"></a> [aws.vpc\_owner](#provider\_aws.vpc\_owner) | >= 3.56 |
50+
| <a name="provider_aws.r53_owner"></a> [aws.r53\_owner](#provider\_aws.r53\_owner) | >= 5.91 |
51+
| <a name="provider_aws.vpc_owner"></a> [aws.vpc\_owner](#provider\_aws.vpc\_owner) | >= 5.91 |
5252

5353
## Modules
5454

‎modules/zone-cross-account-vpc-association/versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ terraform {
44
required_providers {
55
aws = {
66
source = "hashicorp/aws"
7-
version = ">= 3.56"
7+
version = ">= 5.91"
88
configuration_aliases = [aws.r53_owner, aws.vpc_owner]
99
}
1010
}

‎modules/zones/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ This module creates Route53 zones.
88
| Name | Version |
99
|------|---------|
1010
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3.2 |
11-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.36.0 |
11+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.91 |
1212

1313
## Providers
1414

1515
| Name | Version |
1616
|------|---------|
17-
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4.36.0 |
17+
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.91 |
1818

1919
## Modules
2020

‎modules/zones/main.tf

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,14 @@ resource "aws_route53_zone" "this" {
2020
lookup(each.value, "tags", {}),
2121
var.tags
2222
)
23+
24+
dynamic "timeouts" {
25+
for_each = try([each.value.timeouts], [])
26+
27+
content {
28+
create = try(timeouts.value.create, null)
29+
update = try(timeouts.value.update, null)
30+
delete = try(timeouts.value.delete, null)
31+
}
32+
}
2333
}

‎modules/zones/versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ terraform {
44
required_providers {
55
aws = {
66
source = "hashicorp/aws"
7-
version = ">= 4.36.0"
7+
version = ">= 5.91"
88
}
99
}
1010
}

0 commit comments

Comments
 (0)