Skip to content

Commit de63d45

Browse files
committed
fix: Remove unused variables regarding listener ARNs count
The following variables have been removed from upstream module `cloudposse/alb-ingress/aws`, and stopped being used since `v0.58.0` [1]: * `alb_ingress_unauthenticated_listener_arns_count` * `alb_ingress_authenticated_listener_arns_count` [1] 20a8d1c#diff-dc46acf24afd63ef8c556b77c126ccc6e578bc87e3aa09a931f33d9bf2532fbbR24
1 parent 9ae7e79 commit de63d45

File tree

8 files changed

+7
-29
lines changed

8 files changed

+7
-29
lines changed

README.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ module "default_backend_web_app" {
6767
name = "appname"
6868
vpc_id = module.vpc.vpc_id
6969
alb_ingress_unauthenticated_listener_arns = module.alb.listener_arns
70-
alb_ingress_unauthenticated_listener_arns_count = 1
7170
aws_logs_region = "us-east-2"
7271
ecs_cluster_arn = aws_ecs_cluster.default.arn
7372
ecs_cluster_name = aws_ecs_cluster.default.name
@@ -159,7 +158,6 @@ Available targets:
159158
| <a name="input_alb_container_name"></a> [alb\_container\_name](#input\_alb\_container\_name) | The name of the container to associate with the ALB. If not provided, the generated container will be used | `string` | `null` | no |
160159
| <a name="input_alb_ingress_authenticated_hosts"></a> [alb\_ingress\_authenticated\_hosts](#input\_alb\_ingress\_authenticated\_hosts) | Authenticated hosts to match in Hosts header | `list(string)` | `[]` | no |
161160
| <a name="input_alb_ingress_authenticated_listener_arns"></a> [alb\_ingress\_authenticated\_listener\_arns](#input\_alb\_ingress\_authenticated\_listener\_arns) | A list of authenticated ALB listener ARNs to attach ALB listener rules to | `list(string)` | `[]` | no |
162-
| <a name="input_alb_ingress_authenticated_listener_arns_count"></a> [alb\_ingress\_authenticated\_listener\_arns\_count](#input\_alb\_ingress\_authenticated\_listener\_arns\_count) | The number of authenticated ARNs in `alb_ingress_authenticated_listener_arns`. This is necessary to work around a limitation in Terraform where counts cannot be computed | `number` | `0` | no |
163161
| <a name="input_alb_ingress_authenticated_paths"></a> [alb\_ingress\_authenticated\_paths](#input\_alb\_ingress\_authenticated\_paths) | Authenticated path pattern to match (a maximum of 1 can be defined) | `list(string)` | `[]` | no |
164162
| <a name="input_alb_ingress_enable_default_target_group"></a> [alb\_ingress\_enable\_default\_target\_group](#input\_alb\_ingress\_enable\_default\_target\_group) | If true, create a default target group for the ALB ingress | `bool` | `true` | no |
165163
| <a name="input_alb_ingress_health_check_healthy_threshold"></a> [alb\_ingress\_health\_check\_healthy\_threshold](#input\_alb\_ingress\_health\_check\_healthy\_threshold) | The number of consecutive health checks successes required before healthy | `number` | `2` | no |
@@ -178,7 +176,6 @@ Available targets:
178176
| <a name="input_alb_ingress_target_type"></a> [alb\_ingress\_target\_type](#input\_alb\_ingress\_target\_type) | Target type for the ALB ingress. One of `ip`, `instance`, `lambda` or `container`. Defaults to `ip`, for bridge networking mode should be `instance` | `string` | `"ip"` | no |
179177
| <a name="input_alb_ingress_unauthenticated_hosts"></a> [alb\_ingress\_unauthenticated\_hosts](#input\_alb\_ingress\_unauthenticated\_hosts) | Unauthenticated hosts to match in Hosts header | `list(string)` | `[]` | no |
180178
| <a name="input_alb_ingress_unauthenticated_listener_arns"></a> [alb\_ingress\_unauthenticated\_listener\_arns](#input\_alb\_ingress\_unauthenticated\_listener\_arns) | A list of unauthenticated ALB listener ARNs to attach ALB listener rules to | `list(string)` | `[]` | no |
181-
| <a name="input_alb_ingress_unauthenticated_listener_arns_count"></a> [alb\_ingress\_unauthenticated\_listener\_arns\_count](#input\_alb\_ingress\_unauthenticated\_listener\_arns\_count) | The number of unauthenticated ARNs in `alb_ingress_unauthenticated_listener_arns`. This is necessary to work around a limitation in Terraform where counts cannot be computed | `number` | `0` | no |
182179
| <a name="input_alb_ingress_unauthenticated_paths"></a> [alb\_ingress\_unauthenticated\_paths](#input\_alb\_ingress\_unauthenticated\_paths) | Unauthenticated path pattern to match (a maximum of 1 can be defined) | `list(string)` | `[]` | no |
183180
| <a name="input_alb_security_group"></a> [alb\_security\_group](#input\_alb\_security\_group) | Security group of the ALB | `string` | n/a | yes |
184181
| <a name="input_alb_stickiness_cookie_duration"></a> [alb\_stickiness\_cookie\_duration](#input\_alb\_stickiness\_cookie\_duration) | The time period, in seconds, during which requests from a client should be routed to the same target. After this time period expires, the load balancer-generated cookie is considered stale. The range is 1 second to 1 week (604800 seconds). The default value is 1 day (86400 seconds) | `number` | `86400` | no |

README.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ usage: |-
9090
name = "appname"
9191
vpc_id = module.vpc.vpc_id
9292
alb_ingress_unauthenticated_listener_arns = module.alb.listener_arns
93-
alb_ingress_unauthenticated_listener_arns_count = 1
9493
aws_logs_region = "us-east-2"
9594
ecs_cluster_arn = aws_ecs_cluster.default.arn
9695
ecs_cluster_name = aws_ecs_cluster.default.name

docs/terraform.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
| <a name="input_alb_container_name"></a> [alb\_container\_name](#input\_alb\_container\_name) | The name of the container to associate with the ALB. If not provided, the generated container will be used | `string` | `null` | no |
4343
| <a name="input_alb_ingress_authenticated_hosts"></a> [alb\_ingress\_authenticated\_hosts](#input\_alb\_ingress\_authenticated\_hosts) | Authenticated hosts to match in Hosts header | `list(string)` | `[]` | no |
4444
| <a name="input_alb_ingress_authenticated_listener_arns"></a> [alb\_ingress\_authenticated\_listener\_arns](#input\_alb\_ingress\_authenticated\_listener\_arns) | A list of authenticated ALB listener ARNs to attach ALB listener rules to | `list(string)` | `[]` | no |
45-
| <a name="input_alb_ingress_authenticated_listener_arns_count"></a> [alb\_ingress\_authenticated\_listener\_arns\_count](#input\_alb\_ingress\_authenticated\_listener\_arns\_count) | The number of authenticated ARNs in `alb_ingress_authenticated_listener_arns`. This is necessary to work around a limitation in Terraform where counts cannot be computed | `number` | `0` | no |
4645
| <a name="input_alb_ingress_authenticated_paths"></a> [alb\_ingress\_authenticated\_paths](#input\_alb\_ingress\_authenticated\_paths) | Authenticated path pattern to match (a maximum of 1 can be defined) | `list(string)` | `[]` | no |
4746
| <a name="input_alb_ingress_enable_default_target_group"></a> [alb\_ingress\_enable\_default\_target\_group](#input\_alb\_ingress\_enable\_default\_target\_group) | If true, create a default target group for the ALB ingress | `bool` | `true` | no |
4847
| <a name="input_alb_ingress_health_check_healthy_threshold"></a> [alb\_ingress\_health\_check\_healthy\_threshold](#input\_alb\_ingress\_health\_check\_healthy\_threshold) | The number of consecutive health checks successes required before healthy | `number` | `2` | no |
@@ -61,7 +60,6 @@
6160
| <a name="input_alb_ingress_target_type"></a> [alb\_ingress\_target\_type](#input\_alb\_ingress\_target\_type) | Target type for the ALB ingress. One of `ip`, `instance`, `lambda` or `container`. Defaults to `ip`, for bridge networking mode should be `instance` | `string` | `"ip"` | no |
6261
| <a name="input_alb_ingress_unauthenticated_hosts"></a> [alb\_ingress\_unauthenticated\_hosts](#input\_alb\_ingress\_unauthenticated\_hosts) | Unauthenticated hosts to match in Hosts header | `list(string)` | `[]` | no |
6362
| <a name="input_alb_ingress_unauthenticated_listener_arns"></a> [alb\_ingress\_unauthenticated\_listener\_arns](#input\_alb\_ingress\_unauthenticated\_listener\_arns) | A list of unauthenticated ALB listener ARNs to attach ALB listener rules to | `list(string)` | `[]` | no |
64-
| <a name="input_alb_ingress_unauthenticated_listener_arns_count"></a> [alb\_ingress\_unauthenticated\_listener\_arns\_count](#input\_alb\_ingress\_unauthenticated\_listener\_arns\_count) | The number of unauthenticated ARNs in `alb_ingress_unauthenticated_listener_arns`. This is necessary to work around a limitation in Terraform where counts cannot be computed | `number` | `0` | no |
6563
| <a name="input_alb_ingress_unauthenticated_paths"></a> [alb\_ingress\_unauthenticated\_paths](#input\_alb\_ingress\_unauthenticated\_paths) | Unauthenticated path pattern to match (a maximum of 1 can be defined) | `list(string)` | `[]` | no |
6664
| <a name="input_alb_security_group"></a> [alb\_security\_group](#input\_alb\_security\_group) | Security group of the ALB | `string` | n/a | yes |
6765
| <a name="input_alb_stickiness_cookie_duration"></a> [alb\_stickiness\_cookie\_duration](#input\_alb\_stickiness\_cookie\_duration) | The time period, in seconds, during which requests from a client should be routed to the same target. After this time period expires, the load balancer-generated cookie is considered stale. The range is 1 second to 1 week (604800 seconds). The default value is 1 day (86400 seconds) | `number` | `86400` | no |

examples/complete/main.tf

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -109,11 +109,10 @@ module "ecs_web_app" {
109109
container_port = var.container_port
110110

111111
# ALB
112-
alb_arn_suffix = module.alb.alb_arn_suffix
113-
alb_security_group = module.alb.security_group_id
114-
alb_ingress_unauthenticated_listener_arns = [module.alb.http_listener_arn]
115-
alb_ingress_unauthenticated_listener_arns_count = 1
116-
alb_ingress_healthcheck_path = var.alb_ingress_healthcheck_path
112+
alb_arn_suffix = module.alb.alb_arn_suffix
113+
alb_security_group = module.alb.security_group_id
114+
alb_ingress_unauthenticated_listener_arns = [module.alb.http_listener_arn]
115+
alb_ingress_healthcheck_path = var.alb_ingress_healthcheck_path
117116

118117
# CodePipeline
119118
codepipeline_enabled = var.codepipeline_enabled

examples/with_cognito_authentication/main.tf

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,7 @@ module "web_app" {
126126
alb_ingress_healthcheck_path = "/"
127127

128128
# NOTE: Cognito and OIDC authentication only supported on HTTPS endpoints; here we provide `https_listener_arn` from ALB
129-
alb_ingress_authenticated_listener_arns = module.alb.https_listener_arn
130-
alb_ingress_authenticated_listener_arns_count = 1
129+
alb_ingress_authenticated_listener_arns = module.alb.https_listener_arn
131130

132131
# Unauthenticated paths (with higher priority than the authenticated paths)
133132
alb_ingress_unauthenticated_paths = ["/events"]

examples/with_google_oidc_authentication/main.tf

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,7 @@ module "web_app" {
127127
alb_ingress_healthcheck_path = "/"
128128

129129
# NOTE: Cognito and OIDC authentication only supported on HTTPS endpoints; here we provide `https_listener_arn` from ALB
130-
alb_ingress_authenticated_listener_arns = module.alb.https_listener_arn
131-
alb_ingress_authenticated_listener_arns_count = 1
130+
alb_ingress_authenticated_listener_arns = module.alb.https_listener_arn
132131

133132
# Unauthenticated paths (with higher priority than the authenticated paths)
134133
alb_ingress_unauthenticated_paths = ["/events"]

examples/without_authentication/main.tf

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,7 @@ module "web_app" {
127127
alb_ingress_healthcheck_path = "/"
128128

129129
# Without authentication, both HTTP and HTTPS endpoints are supported
130-
alb_ingress_unauthenticated_listener_arns = module.alb.listener_arns
131-
alb_ingress_unauthenticated_listener_arns_count = 2
130+
alb_ingress_unauthenticated_listener_arns = module.alb.listener_arns
132131

133132
# All paths are unauthenticated
134133
alb_ingress_unauthenticated_paths = ["/*"]

variables.tf

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -935,24 +935,12 @@ variable "alb_ingress_unauthenticated_listener_arns" {
935935
default = []
936936
}
937937

938-
variable "alb_ingress_unauthenticated_listener_arns_count" {
939-
type = number
940-
description = "The number of unauthenticated ARNs in `alb_ingress_unauthenticated_listener_arns`. This is necessary to work around a limitation in Terraform where counts cannot be computed"
941-
default = 0
942-
}
943-
944938
variable "alb_ingress_authenticated_listener_arns" {
945939
type = list(string)
946940
description = "A list of authenticated ALB listener ARNs to attach ALB listener rules to"
947941
default = []
948942
}
949943

950-
variable "alb_ingress_authenticated_listener_arns_count" {
951-
type = number
952-
description = "The number of authenticated ARNs in `alb_ingress_authenticated_listener_arns`. This is necessary to work around a limitation in Terraform where counts cannot be computed"
953-
default = 0
954-
}
955-
956944
variable "authentication_type" {
957945
type = string
958946
description = "Authentication type. Supported values are `COGNITO` and `OIDC`"

0 commit comments

Comments
 (0)