Skip to content

Commit 1cab2a5

Browse files
chore: formatter is on
1 parent 4493dc4 commit 1cab2a5

File tree

7 files changed

+47
-32
lines changed

7 files changed

+47
-32
lines changed

README.md

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,27 +55,37 @@ module "ecs-services" {
5555

5656
## Providers
5757

58-
No providers.
58+
| Name | Version |
59+
|------|---------|
60+
| <a name="provider_aws"></a> [aws](#provider\_aws) | n/a |
5961

6062
## Modules
6163

6264
No modules.
6365

6466
## Resources
6567

66-
No resources.
68+
| Name | Type |
69+
|------|------|
70+
| [aws_ecs_task_definition.this](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/ecs_task_definition) | resource |
71+
| [aws_iam_role.ecs_task_execution_role](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role) | resource |
72+
| [aws_iam_role.ecs_task_role](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role) | resource |
73+
| [aws_iam_role_policy_attachment.ecs_task_execution_role_policy_attachment](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role_policy_attachment) | resource |
6774

6875
## Inputs
6976

7077
| Name | Description | Type | Default | Required |
7178
|------|-------------|------|---------|:--------:|
72-
| <a name="input_variable"></a> [variable](#input\_variable) | defaul,description,type | `string` | `"variable"` | no |
79+
| <a name="input_services"></a> [services](#input\_services) | Map of ECS managed services to create. | `any` | `{}` | no |
80+
| <a name="input_tags"></a> [tags](#input\_tags) | A mapping of tags to assign to all resources | `map(string)` | `{}` | no |
7381

7482
## Outputs
7583

7684
| Name | Description |
7785
|------|-------------|
78-
| <a name="output_used"></a> [used](#output\_used) | used value |
86+
| <a name="output_ecs_task_definitions"></a> [ecs\_task\_definitions](#output\_ecs\_task\_definitions) | A revision of an ECS task definition to be used in aws\_ecs\_service |
87+
| <a name="output_ecs_task_execution_roles"></a> [ecs\_task\_execution\_roles](#output\_ecs\_task\_execution\_roles) | AWS Docs https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task_execution_IAM_role.html |
88+
| <a name="output_ecs_task_roles"></a> [ecs\_task\_roles](#output\_ecs\_task\_roles) | AWS Docs https://docs.aws.amazon.com/AmazonECS/latest/userguide/task-iam-roles.html |
7989
<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
8090

8191

examples/basic/README.md

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,23 @@ No requirements.
99

1010
## Providers
1111

12-
No providers.
12+
| Name | Version |
13+
|------|---------|
14+
| <a name="provider_aws"></a> [aws](#provider\_aws) | n/a |
1315

1416
## Modules
1517

1618
| Name | Source | Version |
1719
|------|--------|---------|
18-
| <a name="module_ecrs"></a> [ecrs](#module\_ecrs) | terraform-module/ecrs/aws | ~> 1.0 |
20+
| <a name="module_ecs"></a> [ecs](#module\_ecs) | terraform-aws-modules/ecs/aws | ~> 3 |
21+
| <a name="module_ecs_services"></a> [ecs\_services](#module\_ecs\_services) | terraform-module/ecs-services/aws | ~> 1 |
1922

2023
## Resources
2124

22-
No resources.
25+
| Name | Type |
26+
|------|------|
27+
| [aws_iam_policy.access_permissions](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_policy) | resource |
28+
| [aws_iam_role_policy_attachment.ecs_task_policy_attachment_secrets](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role_policy_attachment) | resource |
2329

2430
## Inputs
2531

@@ -29,6 +35,5 @@ No inputs.
2935

3036
| Name | Description |
3137
|------|-------------|
32-
| <a name="output_ecr_repositores"></a> [ecr\_repositores](#output\_ecr\_repositores) | Provides an Elastic Container Registry Repository. |
33-
| <a name="output_ecr_repository_url"></a> [ecr\_repository\_url](#output\_ecr\_repository\_url) | The URL of the repository (in the form aws\_account\_id.dkr.ecr.region.amazonaws.com/repositoryName) |
38+
| <a name="output_ecs_task_execution_role_arns"></a> [ecs\_task\_execution\_role\_arns](#output\_ecs\_task\_execution\_role\_arns) | AWS Docs https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task_execution_IAM_role.html |
3439
<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->

examples/basic/main.tf

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,18 @@ locals {
88

99
services = {
1010
api = {
11-
create = true
12-
description = "API service"
13-
tags = { Name = "api-task-dev", Service = "api" }
11+
create = true
12+
description = "API service"
13+
tags = { Name = "api-task-dev", Service = "api" }
1414
# task_definition
15-
network_mode = "awsvpc"
15+
network_mode = "awsvpc"
1616
compatibilities = ["FARGATE"]
17-
cpu = 256
18-
memory = 512
17+
cpu = 256
18+
memory = 512
1919
container_definitions = [{
20-
name = "api"
21-
image = "cloudkats/hello-world-rest:latest"
22-
essential = true
20+
name = "api"
21+
image = "cloudkats/hello-world-rest:latest"
22+
essential = true
2323
environment = [
2424
{ "name" : "DBPORT", "value" : "5432" },
2525
{ "name" : "PORT", "value" : "3000" },
@@ -30,10 +30,10 @@ locals {
3030
hostPort = 3000
3131
}]
3232
secrets = [
33-
{ Name : "DBHOST", ValueFrom: "arn:aws:ssm:eu-west-1:01479bc8:parameter/dev/database/host" },
34-
{ Name : "DB", ValueFrom: "arn:aws:ssm:eu-west-1:01479bc8:parameter/dev/database/name" },
35-
{ Name : "DBUSER", ValueFrom: "arn:aws:ssm:eu-west-1:01479bc8:parameter/dev/database/username" },
36-
{ Name : "DBPASS", ValueFrom: "arn:aws:ssm:eu-west-1:01479bc8:parameter/dev/database/password" },
33+
{ Name : "DBHOST", ValueFrom : "arn:aws:ssm:eu-west-1:01479bc8:parameter/dev/database/host" },
34+
{ Name : "DB", ValueFrom : "arn:aws:ssm:eu-west-1:01479bc8:parameter/dev/database/name" },
35+
{ Name : "DBUSER", ValueFrom : "arn:aws:ssm:eu-west-1:01479bc8:parameter/dev/database/username" },
36+
{ Name : "DBPASS", ValueFrom : "arn:aws:ssm:eu-west-1:01479bc8:parameter/dev/database/password" },
3737
]
3838
}]
3939
}
@@ -111,5 +111,5 @@ resource "aws_iam_role_policy_attachment" "ecs_task_policy_attachment_secrets" {
111111

112112
output "ecs_task_execution_role_arns" {
113113
description = "AWS Docs https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task_execution_IAM_role.html"
114-
value = { for k, v in module.ecs_services.ecs_task_execution_roles: k => v.arn }
114+
value = { for k, v in module.ecs_services.ecs_task_execution_roles : k => v.arn }
115115
}

iam.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,12 @@ resource "aws_iam_role" "ecs_task_role" {
4646
}
4747
EOF
4848

49-
depends_on = [ aws_iam_role.ecs_task_execution_role ]
49+
depends_on = [aws_iam_role.ecs_task_execution_role]
5050
}
5151

5252
# Why: https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task_execution_IAM_role.html
5353
resource "aws_iam_role_policy_attachment" "ecs_task_execution_role_policy_attachment" {
54-
for_each = { for k, v in aws_iam_role.ecs_task_execution_role: k => v }
54+
for_each = { for k, v in aws_iam_role.ecs_task_execution_role : k => v }
5555
role = each.value.name
5656
policy_arn = "arn:aws:iam::aws:policy/service-role/AmazonECSTaskExecutionRolePolicy"
5757
}

locals.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ locals {
55
desired_count = 2
66

77
deregistration_delay = 30
8-
network_mode = "awsvpc"
9-
compatibilities = ["FARGATE"]
8+
network_mode = "awsvpc"
9+
compatibilities = ["FARGATE"]
1010
}
1111
}

main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ resource "aws_ecs_task_definition" "this" {
1111
memory = try(each.value.memory, local.defaults.memory)
1212
execution_role_arn = aws_iam_role.ecs_task_execution_role[each.key].arn
1313
task_role_arn = aws_iam_role.ecs_task_role[each.key].arn
14-
container_definitions = jsonencode(each.value.container_definitions)
14+
container_definitions = jsonencode(each.value.container_definitions)
1515

1616
tags = merge(var.tags, try(each.value.tags, null), {
17-
Name = format("%s-task", try(each.value.name, each.key))
17+
Name = format("%s-task", try(each.value.name, each.key))
1818
})
1919
}

outputs.tf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
output "ecs_task_execution_roles" {
22
description = "AWS Docs https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task_execution_IAM_role.html"
3-
value = { for k, v in aws_iam_role.ecs_task_execution_role: k => v }
3+
value = { for k, v in aws_iam_role.ecs_task_execution_role : k => v }
44
}
55

66
output "ecs_task_roles" {
77
description = "AWS Docs https://docs.aws.amazon.com/AmazonECS/latest/userguide/task-iam-roles.html"
8-
value = { for k, v in aws_iam_role.ecs_task_role: k => v }
8+
value = { for k, v in aws_iam_role.ecs_task_role : k => v }
99
}
1010

1111
output "ecs_task_definitions" {
1212
description = "A revision of an ECS task definition to be used in aws_ecs_service"
13-
value = { for k, v in aws_ecs_task_definition.this: k => v }
13+
value = { for k, v in aws_ecs_task_definition.this : k => v }
1414
}

0 commit comments

Comments
 (0)