Skip to content

Commit ea06223

Browse files
committed
Merge remote-tracking branch 'upstream/main' into update-service-connect-config
2 parents 804dca4 + e0b6e4b commit ea06223

13 files changed

+37
-91
lines changed

.github/auto-release.yml

-54
This file was deleted.

.github/banner.png

218 Bytes
Loading

.github/settings.yml

+2
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,5 @@ repository:
55
description: Terraform module which implements an ECS service which exposes a web service via ALB.
66
homepage: https://cloudposse.com/accelerate
77
topics: terraform, terraform-module, ecs, alb, service, task, container, docker, fargate, hcl2, terratest
8+
9+

.github/workflows/release-branch.yml .github/workflows/branch.yml

+7-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
---
2-
name: release-branch
2+
name: Branch
33
on:
4+
pull_request:
5+
branches:
6+
- main
7+
- release/**
8+
types: [opened, synchronize, reopened, labeled, unlabeled]
49
push:
510
branches:
611
- main
@@ -16,5 +21,5 @@ permissions: {}
1621

1722
jobs:
1823
terraform-module:
19-
uses: cloudposse/github-actions-workflows-terraform-module/.github/workflows/release-branch.yml@main
24+
uses: cloudposse/.github/.github/workflows/shared-terraform-module.yml@main
2025
secrets: inherit

.github/workflows/feature-branch-chatops.yml .github/workflows/chatops.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
name: feature-branch-chatops
2+
name: chatops
33
on:
44
issue_comment:
55
types: [created]
@@ -11,6 +11,6 @@ permissions:
1111

1212
jobs:
1313
terraform-module:
14-
uses: cloudposse/github-actions-workflows-terraform-module/.github/workflows/feature-branch-chatops.yml@main
14+
uses: cloudposse/.github/.github/workflows/shared-terraform-chatops.yml@main
1515
secrets:
1616
github_access_token: ${{ secrets.REPO_ACCESS_TOKEN }}

.github/workflows/feature-branch.yml

-19
This file was deleted.

.github/workflows/release-published.yml

-13
This file was deleted.

.github/workflows/release.yml

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
---
2+
name: release
3+
on:
4+
release:
5+
types:
6+
- published
7+
8+
permissions:
9+
id-token: write
10+
contents: write
11+
pull-requests: write
12+
13+
jobs:
14+
terraform-module:
15+
uses: cloudposse/.github/.github/workflows/shared-release-branches.yml@main
16+
secrets: inherit

.github/workflows/scheduled.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ permissions:
1212

1313
jobs:
1414
scheduled:
15-
uses: cloudposse/github-actions-workflows-terraform-module/.github/workflows/scheduled.yml@main
15+
uses: cloudposse/.github/.github/workflows/shared-terraform-scheduled.yml@main
1616
secrets: inherit

README.md

+1
Original file line numberDiff line numberDiff line change
@@ -345,6 +345,7 @@ Available targets:
345345
| <a name="input_task_policy_arns_map"></a> [task\_policy\_arns\_map](#input\_task\_policy\_arns\_map) | A map of name to IAM Policy ARNs to attach to the generated task role.<br>The names are arbitrary, but must be known at plan time. The purpose of the name<br>is so that changes to one ARN do not cause a ripple effect on the other ARNs.<br>If you cannot provide unique names known at plan time, use `task_policy_arns` instead. | `map(string)` | `{}` | no |
346346
| <a name="input_task_role_arn"></a> [task\_role\_arn](#input\_task\_role\_arn) | A `list(string)` of zero or one ARNs of IAM roles that allows<br>your Amazon ECS container task to make calls to other AWS services.<br>If the list is empty, a role will be created for you.<br>DEPRECATED: you can also pass a `string` with the ARN, but that<br>string must be known a "plan" time. | `any` | `[]` | no |
347347
| <a name="input_tenant"></a> [tenant](#input\_tenant) | ID element \_(Rarely used, not included by default)\_. A customer identifier, indicating who this instance of a resource is for | `string` | `null` | no |
348+
| <a name="input_track_latest"></a> [track\_latest](#input\_track\_latest) | Whether should track latest task definition or the one created with the resource. | `bool` | `false` | no |
348349
| <a name="input_use_alb_security_group"></a> [use\_alb\_security\_group](#input\_use\_alb\_security\_group) | A flag to enable/disable allowing traffic from the ALB security group to the service security group | `bool` | `false` | no |
349350
| <a name="input_use_nlb_cidr_blocks"></a> [use\_nlb\_cidr\_blocks](#input\_use\_nlb\_cidr\_blocks) | A flag to enable/disable adding the NLB ingress rule to the service security group | `bool` | `false` | no |
350351
| <a name="input_use_old_arn"></a> [use\_old\_arn](#input\_use\_old\_arn) | A flag to enable/disable tagging the ecs resources that require the new arn format | `bool` | `false` | no |

docs/terraform.md

+1
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@
136136
| <a name="input_task_policy_arns_map"></a> [task\_policy\_arns\_map](#input\_task\_policy\_arns\_map) | A map of name to IAM Policy ARNs to attach to the generated task role.<br>The names are arbitrary, but must be known at plan time. The purpose of the name<br>is so that changes to one ARN do not cause a ripple effect on the other ARNs.<br>If you cannot provide unique names known at plan time, use `task_policy_arns` instead. | `map(string)` | `{}` | no |
137137
| <a name="input_task_role_arn"></a> [task\_role\_arn](#input\_task\_role\_arn) | A `list(string)` of zero or one ARNs of IAM roles that allows<br>your Amazon ECS container task to make calls to other AWS services.<br>If the list is empty, a role will be created for you.<br>DEPRECATED: you can also pass a `string` with the ARN, but that<br>string must be known a "plan" time. | `any` | `[]` | no |
138138
| <a name="input_tenant"></a> [tenant](#input\_tenant) | ID element \_(Rarely used, not included by default)\_. A customer identifier, indicating who this instance of a resource is for | `string` | `null` | no |
139+
| <a name="input_track_latest"></a> [track\_latest](#input\_track\_latest) | Whether should track latest task definition or the one created with the resource. | `bool` | `false` | no |
139140
| <a name="input_use_alb_security_group"></a> [use\_alb\_security\_group](#input\_use\_alb\_security\_group) | A flag to enable/disable allowing traffic from the ALB security group to the service security group | `bool` | `false` | no |
140141
| <a name="input_use_nlb_cidr_blocks"></a> [use\_nlb\_cidr\_blocks](#input\_use\_nlb\_cidr\_blocks) | A flag to enable/disable adding the NLB ingress rule to the service security group | `bool` | `false` | no |
141142
| <a name="input_use_old_arn"></a> [use\_old\_arn](#input\_use\_old\_arn) | A flag to enable/disable tagging the ecs resources that require the new arn format | `bool` | `false` | no |

main.tf

+1
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ resource "aws_ecs_task_definition" "default" {
6868
pid_mode = var.pid_mode
6969
execution_role_arn = length(local.task_exec_role_arn) > 0 ? local.task_exec_role_arn : one(aws_iam_role.ecs_exec[*]["arn"])
7070
task_role_arn = length(local.task_role_arn) > 0 ? local.task_role_arn : one(aws_iam_role.ecs_task[*]["arn"])
71+
track_latest = var.track_latest
7172

7273
dynamic "proxy_configuration" {
7374
for_each = var.proxy_configuration == null ? [] : [var.proxy_configuration]

variables.tf

+6
Original file line numberDiff line numberDiff line change
@@ -582,3 +582,9 @@ variable "pid_mode" {
582582
error_message = "The pid_mode value must be one of host or task."
583583
}
584584
}
585+
586+
variable "track_latest" {
587+
type = bool
588+
description = "Whether should track latest task definition or the one created with the resource."
589+
default = false
590+
}

0 commit comments

Comments
 (0)