Skip to content

Commit 2bb5028

Browse files
magreenbaummagreenbaum
committed
enable_zonal_shift and tcp_idle_timeout_seconds
1 parent 46852b8 commit 2bb5028

File tree

16 files changed

+35
-24
lines changed

16 files changed

+35
-24
lines changed

‎README.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -352,13 +352,13 @@ See [patterns.md](https://github.com/terraform-aws-modules/terraform-aws-alb/blo
352352
| Name | Version |
353353
|------|---------|
354354
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
355-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.62 |
355+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.73 |
356356

357357
## Providers
358358

359359
| Name | Version |
360360
|------|---------|
361-
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.62 |
361+
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.73 |
362362

363363
## Modules
364364

@@ -406,6 +406,7 @@ No modules.
406406
| <a name="input_enable_tls_version_and_cipher_suite_headers"></a> [enable\_tls\_version\_and\_cipher\_suite\_headers](#input\_enable\_tls\_version\_and\_cipher\_suite\_headers) | Indicates whether the two headers (`x-amzn-tls-version` and `x-amzn-tls-cipher-suite`), which contain information about the negotiated TLS version and cipher suite, are added to the client request before sending it to the target. Only valid for Load Balancers of type `application`. Defaults to `false` | `bool` | `null` | no |
407407
| <a name="input_enable_waf_fail_open"></a> [enable\_waf\_fail\_open](#input\_enable\_waf\_fail\_open) | Indicates whether to allow a WAF-enabled load balancer to route requests to targets if it is unable to forward the request to AWS WAF. Defaults to `false` | `bool` | `null` | no |
408408
| <a name="input_enable_xff_client_port"></a> [enable\_xff\_client\_port](#input\_enable\_xff\_client\_port) | Indicates whether the X-Forwarded-For header should preserve the source port that the client used to connect to the load balancer in `application` load balancers. Defaults to `false` | `bool` | `null` | no |
409+
| <a name="input_enable_zonal_shift"></a> [enable\_zonal\_shift](#input\_enable\_zonal\_shift) | Whether zonal shift is enabled | `bool` | `null` | no |
409410
| <a name="input_enforce_security_group_inbound_rules_on_private_link_traffic"></a> [enforce\_security\_group\_inbound\_rules\_on\_private\_link\_traffic](#input\_enforce\_security\_group\_inbound\_rules\_on\_private\_link\_traffic) | Indicates whether inbound security group rules are enforced for traffic originating from a PrivateLink. Only valid for Load Balancers of type network. The possible values are on and off. | `string` | `null` | no |
410411
| <a name="input_idle_timeout"></a> [idle\_timeout](#input\_idle\_timeout) | The time in seconds that the connection is allowed to be idle. Only valid for Load Balancers of type `application`. Default: `60` | `number` | `null` | no |
411412
| <a name="input_internal"></a> [internal](#input\_internal) | If true, the LB will be internal. Defaults to `false` | `bool` | `null` | no |

‎examples/complete-alb/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ Note that this example may create resources which cost money. Run `terraform des
2020
| Name | Version |
2121
|------|---------|
2222
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
23-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.62 |
23+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.73 |
2424
| <a name="requirement_null"></a> [null](#requirement\_null) | >= 2.0 |
2525
| <a name="requirement_random"></a> [random](#requirement\_random) | >= 3.6 |
2626

2727
## Providers
2828

2929
| Name | Version |
3030
|------|---------|
31-
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.62 |
31+
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.73 |
3232
| <a name="provider_null"></a> [null](#provider\_null) | >= 2.0 |
3333
| <a name="provider_random"></a> [random](#provider\_random) | >= 3.6 |
3434

‎examples/complete-alb/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.62"
7+
version = ">= 5.73"
88
}
99
null = {
1010
source = "hashicorp/null"

‎examples/complete-nlb/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ Note that this example may create resources which cost money. Run `terraform des
2020
| Name | Version |
2121
|------|---------|
2222
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
23-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.62 |
23+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.73 |
2424

2525
## Providers
2626

2727
| Name | Version |
2828
|------|---------|
29-
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.62 |
29+
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.73 |
3030

3131
## Modules
3232

‎examples/complete-nlb/main.tf‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,9 @@ module "nlb" {
9292
}
9393

9494
ex-three = {
95-
port = 83
96-
protocol = "TCP"
95+
port = 83
96+
protocol = "TCP"
97+
tcp_idle_timeout_seconds = 60
9798
forward = {
9899
target_group_key = "ex-target-three"
99100
}

‎examples/complete-nlb/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.62"
7+
version = ">= 5.73"
88
}
99
}
1010
}

‎examples/mutual-auth-alb/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@ Note that this example may create resources which cost money. Run `terraform des
2121
| Name | Version |
2222
|------|---------|
2323
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
24-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.62 |
24+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.73 |
2525
| <a name="requirement_null"></a> [null](#requirement\_null) | >= 2.0 |
2626
| <a name="requirement_tls"></a> [tls](#requirement\_tls) | >= 4.0 |
2727

2828
## Providers
2929

3030
| Name | Version |
3131
|------|---------|
32-
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.62 |
32+
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.73 |
3333
| <a name="provider_null"></a> [null](#provider\_null) | >= 2.0 |
3434
| <a name="provider_tls"></a> [tls](#provider\_tls) | >= 4.0 |
3535

‎examples/mutual-auth-alb/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.62"
7+
version = ">= 5.73"
88
}
99
null = {
1010
source = "hashicorp/null"

‎main.tf‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ resource "aws_lb" "this" {
4242
enable_tls_version_and_cipher_suite_headers = var.enable_tls_version_and_cipher_suite_headers
4343
enable_waf_fail_open = var.enable_waf_fail_open
4444
enable_xff_client_port = var.enable_xff_client_port
45+
enable_zonal_shift = var.enable_zonal_shift
4546
enforce_security_group_inbound_rules_on_private_link_traffic = var.enforce_security_group_inbound_rules_on_private_link_traffic
4647
idle_timeout = var.idle_timeout
4748
internal = var.internal
@@ -215,11 +216,12 @@ resource "aws_lb_listener" "this" {
215216
}
216217
}
217218

218-
load_balancer_arn = aws_lb.this[0].arn
219-
port = try(each.value.port, var.default_port)
220-
protocol = try(each.value.protocol, var.default_protocol)
221-
ssl_policy = contains(["HTTPS", "TLS"], try(each.value.protocol, var.default_protocol)) ? try(each.value.ssl_policy, "ELBSecurityPolicy-TLS13-1-2-Res-2021-06") : try(each.value.ssl_policy, null)
222-
tags = merge(local.tags, try(each.value.tags, {}))
219+
load_balancer_arn = aws_lb.this[0].arn
220+
port = try(each.value.port, var.default_port)
221+
protocol = try(each.value.protocol, var.default_protocol)
222+
ssl_policy = contains(["HTTPS", "TLS"], try(each.value.protocol, var.default_protocol)) ? try(each.value.ssl_policy, "ELBSecurityPolicy-TLS13-1-2-Res-2021-06") : try(each.value.ssl_policy, null)
223+
tcp_idle_timeout_seconds = try(each.value.tcp_idle_timeout_seconds, null)
224+
tags = merge(local.tags, try(each.value.tags, {}))
223225
}
224226

225227
################################################################################

‎modules/lb_trust_store/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@ module "trust_store" {
3030
| Name | Version |
3131
|------|---------|
3232
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
33-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.62 |
33+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.73 |
3434

3535
## Providers
3636

3737
| Name | Version |
3838
|------|---------|
39-
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.62 |
39+
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.73 |
4040

4141
## Modules
4242

0 commit comments

Comments
 (0)