Skip to content

Commit dd7de06

Browse files
bryantbiggsbryantbiggs
committed
refactor: Initial pass at variable type definitions for service module'
1 parent 4c010d2 commit dd7de06

File tree

25 files changed

+744
-448
lines changed

25 files changed

+744
-448
lines changed

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,8 @@ module "ecs" {
159159

160160
| Name | Version |
161161
|------|---------|
162-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3 |
163-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.63 |
162+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3.10 |
163+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.77 |
164164

165165
## Providers
166166

‎examples/complete/README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@ Note that this example may create resources which will incur monetary charges on
2626

2727
| Name | Version |
2828
|------|---------|
29-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3 |
30-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.63 |
29+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3.10 |
30+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.77 |
3131

3232
## Providers
3333

3434
| Name | Version |
3535
|------|---------|
36-
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.63 |
36+
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.77 |
3737

3838
## Modules
3939

‎examples/complete/versions.tf

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
terraform {
2-
required_version = ">= 1.3"
2+
required_version = ">= 1.3.10"
33

44
required_providers {
55
aws = {
66
source = "hashicorp/aws"
7-
version = ">= 5.63"
7+
version = ">= 5.77"
88
}
99
}
1010
}

‎examples/ec2-autoscaling/README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@ Note that this example may create resources which will incur monetary charges on
2626

2727
| Name | Version |
2828
|------|---------|
29-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3 |
30-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.63 |
29+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3.10 |
30+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.77 |
3131

3232
## Providers
3333

3434
| Name | Version |
3535
|------|---------|
36-
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.63 |
36+
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.77 |
3737

3838
## Modules
3939

‎examples/ec2-autoscaling/versions.tf

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
terraform {
2-
required_version = ">= 1.3"
2+
required_version = ">= 1.3.10"
33

44
required_providers {
55
aws = {
66
source = "hashicorp/aws"
7-
version = ">= 5.63"
7+
version = ">= 5.77"
88
}
99
}
1010
}

‎examples/fargate/README.md

+3-4
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@ Note that this example may create resources which will incur monetary charges on
2626

2727
| Name | Version |
2828
|------|---------|
29-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3 |
30-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.63 |
29+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3.10 |
30+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.77 |
3131

3232
## Providers
3333

3434
| Name | Version |
3535
|------|---------|
36-
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.63 |
36+
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.77 |
3737

3838
## Modules
3939

@@ -78,7 +78,6 @@ No inputs.
7878
| <a name="output_service_security_group_id"></a> [service\_security\_group\_id](#output\_service\_security\_group\_id) | ID of the security group |
7979
| <a name="output_service_task_definition_arn"></a> [service\_task\_definition\_arn](#output\_service\_task\_definition\_arn) | Full ARN of the Task Definition (including both `family` and `revision`) |
8080
| <a name="output_service_task_definition_family"></a> [service\_task\_definition\_family](#output\_service\_task\_definition\_family) | The unique name of the task definition |
81-
| <a name="output_service_task_definition_family_revision"></a> [service\_task\_definition\_family\_revision](#output\_service\_task\_definition\_family\_revision) | The family and revision (family:revision) of the task definition |
8281
| <a name="output_service_task_definition_revision"></a> [service\_task\_definition\_revision](#output\_service\_task\_definition\_revision) | Revision of the task in a particular family |
8382
| <a name="output_service_task_exec_iam_role_arn"></a> [service\_task\_exec\_iam\_role\_arn](#output\_service\_task\_exec\_iam\_role\_arn) | Task execution IAM role ARN |
8483
| <a name="output_service_task_exec_iam_role_name"></a> [service\_task\_exec\_iam\_role\_name](#output\_service\_task\_exec\_iam\_role\_name) | Task execution IAM role name |

‎examples/fargate/main.tf

+10-14
Original file line numberDiff line numberDiff line change
@@ -160,21 +160,19 @@ module "ecs_service" {
160160
}
161161

162162
subnet_ids = module.vpc.private_subnets
163-
security_group_rules = {
163+
security_group_ingress_rules = {
164164
alb_ingress_3000 = {
165-
type = "ingress"
166-
from_port = local.container_port
167-
to_port = local.container_port
168-
protocol = "tcp"
169165
description = "Service port"
166+
from_port = local.container_port
167+
ip_protocol = "tcp"
170168
source_security_group_id = module.alb.security_group_id
171169
}
170+
}
171+
security_group_egress_rules = {
172172
egress_all = {
173-
type = "egress"
174-
from_port = 0
175173
to_port = 0
176-
protocol = "-1"
177-
cidr_blocks = ["0.0.0.0/0"]
174+
ip_protocol = "-1"
175+
cidr_ipv4 = "0.0.0.0/0"
178176
}
179177
}
180178

@@ -226,13 +224,11 @@ module "ecs_task_definition" {
226224

227225
subnet_ids = module.vpc.private_subnets
228226

229-
security_group_rules = {
227+
security_group_egress_rules = {
230228
egress_all = {
231-
type = "egress"
232-
from_port = 0
233229
to_port = 0
234-
protocol = "-1"
235-
cidr_blocks = ["0.0.0.0/0"]
230+
ip_protocol = "-1"
231+
cidr_ipv4 = "0.0.0.0/0"
236232
}
237233
}
238234

‎examples/fargate/outputs.tf

+1-6
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,6 @@ output "service_task_definition_family" {
7676
value = module.ecs_service.task_definition_family
7777
}
7878

79-
output "service_task_definition_family_revision" {
80-
description = "The family and revision (family:revision) of the task definition"
81-
value = module.ecs_service.task_definition_family_revision
82-
}
83-
8479
output "service_task_exec_iam_role_name" {
8580
description = "Task execution IAM role name"
8681
value = module.ecs_service.task_exec_iam_role_name
@@ -159,7 +154,7 @@ output "task_definition_run_task_command" {
159154
description = "awscli command to run the standalone task"
160155
value = <<EOT
161156
aws ecs run-task --cluster ${module.ecs_cluster.name} \
162-
--task-definition ${module.ecs_task_definition.task_definition_family_revision} \
157+
--task-definition ${module.ecs_task_definition.task_definition_family}:${module.ecs_task_definition.task_definition_revision} \
163158
--network-configuration "awsvpcConfiguration={subnets=[${join(",", module.vpc.private_subnets)}],securityGroups=[${module.ecs_task_definition.security_group_id}]}" \
164159
--region ${local.region}
165160
EOT

‎examples/fargate/versions.tf

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
terraform {
2-
required_version = ">= 1.3"
2+
required_version = ">= 1.3.10"
33

44
required_providers {
55
aws = {
66
source = "hashicorp/aws"
7-
version = ">= 5.63"
7+
version = ">= 5.77"
88
}
99
}
1010
}

‎main.tf

+2-1
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,8 @@ module "service" {
200200
security_group_name = try(each.value.security_group_name, null)
201201
security_group_use_name_prefix = try(each.value.security_group_use_name_prefix, true)
202202
security_group_description = try(each.value.security_group_description, null)
203-
security_group_rules = lookup(each.value, "security_group_rules", {})
203+
security_group_ingress_rules = lookup(each.value, "security_group_ingress_rules", {})
204+
security_group_egress_rules = lookup(each.value, "security_group_egress_rules", {})
204205
security_group_tags = try(each.value.security_group_tags, {})
205206

206207
tags = merge(var.tags, try(each.value.tags, {}))

‎modules/cluster/README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -136,14 +136,14 @@ module "ecs_cluster" {
136136

137137
| Name | Version |
138138
|------|---------|
139-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3 |
140-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.63 |
139+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3.10 |
140+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.77 |
141141

142142
## Providers
143143

144144
| Name | Version |
145145
|------|---------|
146-
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.63 |
146+
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.77 |
147147

148148
## Modules
149149

‎modules/cluster/versions.tf

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
terraform {
2-
required_version = ">= 1.3"
2+
required_version = ">= 1.3.10"
33

44
required_providers {
55
aws = {
66
source = "hashicorp/aws"
7-
version = ">= 5.63"
7+
version = ">= 5.77"
88
}
99
}
1010
}

‎modules/container-definition/README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -115,14 +115,14 @@ module "example_ecs_container_definition" {
115115

116116
| Name | Version |
117117
|------|---------|
118-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3 |
119-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.63 |
118+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3.10 |
119+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.77 |
120120

121121
## Providers
122122

123123
| Name | Version |
124124
|------|---------|
125-
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.63 |
125+
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.77 |
126126

127127
## Modules
128128

‎modules/container-definition/versions.tf

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
terraform {
2-
required_version = ">= 1.3"
2+
required_version = ">= 1.3.10"
33

44
required_providers {
55
aws = {
66
source = "hashicorp/aws"
7-
version = ">= 5.63"
7+
version = ">= 5.77"
88
}
99
}
1010
}

0 commit comments

Comments
 (0)