Skip to content

feat: TLS configuration support #270

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,7 @@ No resources.
| <a name="input_create_task_exec_policy"></a> [create\_task\_exec\_policy](#input\_create\_task\_exec\_policy) | Determines whether the ECS task definition IAM policy should be created. This includes permissions included in AmazonECSTaskExecutionRolePolicy as well as access to secrets and SSM parameters | `bool` | `true` | no |
| <a name="input_default_capacity_provider_use_fargate"></a> [default\_capacity\_provider\_use\_fargate](#input\_default\_capacity\_provider\_use\_fargate) | Determines whether to use Fargate or autoscaling for default capacity provider strategy | `bool` | `true` | no |
| <a name="input_fargate_capacity_providers"></a> [fargate\_capacity\_providers](#input\_fargate\_capacity\_providers) | Map of Fargate capacity provider definitions to use for the cluster | `any` | `{}` | no |
| <a name="input_managed_storage_configuration"></a> [managed\_storage\_configuration](#input\_managed\_storage\_configuration) | Configuration for the managed storage | `any` | `{}` | no |
| <a name="input_services"></a> [services](#input\_services) | Map of service definitions to create | `any` | `{}` | no |
| <a name="input_tags"></a> [tags](#input\_tags) | A map of tags to add to all resources | `map(string)` | `{}` | no |
| <a name="input_task_exec_iam_role_description"></a> [task\_exec\_iam\_role\_description](#input\_task\_exec\_iam\_role\_description) | Description of the role | `string` | `null` | no |
Expand Down
2 changes: 2 additions & 0 deletions examples/fargate/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,14 @@ Note that this example may create resources which will incur monetary charges on
| <a name="module_ecs_cluster"></a> [ecs\_cluster](#module\_ecs\_cluster) | ../../modules/cluster | n/a |
| <a name="module_ecs_service"></a> [ecs\_service](#module\_ecs\_service) | ../../modules/service | n/a |
| <a name="module_ecs_task_definition"></a> [ecs\_task\_definition](#module\_ecs\_task\_definition) | ../../modules/service | n/a |
| <a name="module_tls_role"></a> [tls\_role](#module\_tls\_role) | terraform-aws-modules/iam/aws//modules/iam-assumable-role | 5.41.0 |
| <a name="module_vpc"></a> [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | ~> 5.0 |

## Resources

| Name | Type |
|------|------|
| [aws_acmpca_certificate_authority.this](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/acmpca_certificate_authority) | resource |
| [aws_service_discovery_http_namespace.this](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/service_discovery_http_namespace) | resource |
| [aws_availability_zones.available](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/availability_zones) | data source |
| [aws_ssm_parameter.fluentbit](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/ssm_parameter) | data source |
Expand Down
48 changes: 48 additions & 0 deletions examples/fargate/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,13 @@ module "ecs_service" {
}
port_name = local.container_name
discovery_name = local.container_name

tls = {
role_arn = module.tls_role.iam_role_arn
issuer_cert_authority = {
aws_pca_authority_arn = aws_acmpca_certificate_authority.this.arn
}
}
}
}

Expand Down Expand Up @@ -331,3 +338,44 @@ module "vpc" {

tags = local.tags
}

module "tls_role" {
source = "terraform-aws-modules/iam/aws//modules/iam-assumable-role"
version = "5.41.0"

create_role = true

role_name = "ServiceRoleForECSConnectTLS"
role_description = "ECS service role to access Private CA for TLS Service Connect"
role_requires_mfa = false

custom_role_policy_arns = ["arn:aws:iam::aws:policy/service-role/AmazonECSInfrastructureRolePolicyForServiceConnectTransportLayerSecurity"]

trusted_role_services = ["ecs.amazonaws.com", "ecs-tasks.amazonaws.com"]

tags = local.tags
}

resource "aws_acmpca_certificate_authority" "this" {
enabled = true

usage_mode = "SHORT_LIVED_CERTIFICATE"
type = "ROOT"

certificate_authority_configuration {
key_algorithm = "EC_secp384r1"
signing_algorithm = "SHA512WITHECDSA"

subject {
common_name = "example.com"
}
}

revocation_configuration {
ocsp_configuration {
enabled = false
}
}

tags = local.tags
}
2 changes: 1 addition & 1 deletion main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ module "cluster" {
cluster_configuration = var.cluster_configuration
cluster_settings = var.cluster_settings
cluster_service_connect_defaults = var.cluster_service_connect_defaults

managed_storage_configuration = var.managed_storage_configuration
# Cluster Cloudwatch log group
create_cloudwatch_log_group = var.create_cloudwatch_log_group
cloudwatch_log_group_name = var.cloudwatch_log_group_name
Expand Down
1 change: 1 addition & 0 deletions modules/cluster/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,7 @@ No modules.
| <a name="input_create_task_exec_policy"></a> [create\_task\_exec\_policy](#input\_create\_task\_exec\_policy) | Determines whether the ECS task definition IAM policy should be created. This includes permissions included in AmazonECSTaskExecutionRolePolicy as well as access to secrets and SSM parameters | `bool` | `true` | no |
| <a name="input_default_capacity_provider_use_fargate"></a> [default\_capacity\_provider\_use\_fargate](#input\_default\_capacity\_provider\_use\_fargate) | Determines whether to use Fargate or autoscaling for default capacity provider strategy | `bool` | `true` | no |
| <a name="input_fargate_capacity_providers"></a> [fargate\_capacity\_providers](#input\_fargate\_capacity\_providers) | Map of Fargate capacity provider definitions to use for the cluster | `any` | `{}` | no |
| <a name="input_managed_storage_configuration"></a> [managed\_storage\_configuration](#input\_managed\_storage\_configuration) | Configuration for the managed storage | `any` | `{}` | no |
| <a name="input_tags"></a> [tags](#input\_tags) | A map of tags to add to all resources | `map(string)` | `{}` | no |
| <a name="input_task_exec_iam_role_description"></a> [task\_exec\_iam\_role\_description](#input\_task\_exec\_iam\_role\_description) | Description of the role | `string` | `null` | no |
| <a name="input_task_exec_iam_role_name"></a> [task\_exec\_iam\_role\_name](#input\_task\_exec\_iam\_role\_name) | Name to use on IAM role created | `string` | `null` | no |
Expand Down
18 changes: 18 additions & 0 deletions modules/cluster/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,15 @@ resource "aws_ecs_cluster" "this" {
}
}
}

dynamic "managed_storage_configuration" {
for_each = try([var.managed_storage_configuration], [])

content {
fargate_ephemeral_storage_kms_key_id = try(managed_storage_configuration.value.fargate_ephemeral_storage_kms_key_id, null)
kms_key_id = try(managed_storage_configuration.value.kms_key_id, null)
}
}
}
}

Expand Down Expand Up @@ -67,6 +76,15 @@ resource "aws_ecs_cluster" "this" {
}
}
}

dynamic "managed_storage_configuration" {
for_each = try([var.managed_storage_configuration], [])

content {
fargate_ephemeral_storage_kms_key_id = try(managed_storage_configuration.value.fargate_ephemeral_storage_kms_key_id, null)
kms_key_id = try(managed_storage_configuration.value.kms_key_id, null)
}
}
}
}

Expand Down
6 changes: 6 additions & 0 deletions modules/cluster/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,12 @@ variable "cluster_service_connect_defaults" {
default = {}
}

variable "managed_storage_configuration" {
description = "Configuration for the managed storage"
type = any
default = {}
}

################################################################################
# CloudWatch Log Group
################################################################################
Expand Down
24 changes: 24 additions & 0 deletions modules/service/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,18 @@ resource "aws_ecs_service" "this" {
}
}

dynamic "tls" {
for_each = try([service.value.tls], [])

content {
kms_key = try(tls.value.kms_key, null)
role_arn = try(tls.value.role_arn, null)
issuer_cert_authority {
aws_pca_authority_arn = try(tls.value.issuer_cert_authority.aws_pca_authority_arn, null)
}
}
}

discovery_name = try(service.value.discovery_name, null)
ingress_port_override = try(service.value.ingress_port_override, null)
port_name = service.value.port_name
Expand Down Expand Up @@ -356,6 +368,18 @@ resource "aws_ecs_service" "ignore_task_definition" {
}
}

dynamic "tls" {
for_each = try([service.value.tls], [])

content {
kms_key = try(tls.value.kms_key, null)
role_arn = try(tls.value.role_arn, null)
issuer_cert_authority {
aws_pca_authority_arn = try(tls.value.issuer_cert_authority.aws_pca_authority_arn, null)
}
}
}

discovery_name = try(service.value.discovery_name, null)
ingress_port_override = try(service.value.ingress_port_override, null)
port_name = service.value.port_name
Expand Down
6 changes: 6 additions & 0 deletions variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,12 @@ variable "cluster_tags" {
default = {}
}

variable "managed_storage_configuration" {
description = "Configuration for the managed storage"
type = any
default = {}
}

################################################################################
# CloudWatch Log Group
################################################################################
Expand Down
1 change: 1 addition & 0 deletions wrappers/cluster/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ module "wrapper" {
create_task_exec_policy = try(each.value.create_task_exec_policy, var.defaults.create_task_exec_policy, true)
default_capacity_provider_use_fargate = try(each.value.default_capacity_provider_use_fargate, var.defaults.default_capacity_provider_use_fargate, true)
fargate_capacity_providers = try(each.value.fargate_capacity_providers, var.defaults.fargate_capacity_providers, {})
managed_storage_configuration = try(each.value.managed_storage_configuration, var.defaults.managed_storage_configuration, {})
tags = try(each.value.tags, var.defaults.tags, {})
task_exec_iam_role_description = try(each.value.task_exec_iam_role_description, var.defaults.task_exec_iam_role_description, null)
task_exec_iam_role_name = try(each.value.task_exec_iam_role_name, var.defaults.task_exec_iam_role_name, null)
Expand Down
1 change: 1 addition & 0 deletions wrappers/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ module "wrapper" {
create_task_exec_policy = try(each.value.create_task_exec_policy, var.defaults.create_task_exec_policy, true)
default_capacity_provider_use_fargate = try(each.value.default_capacity_provider_use_fargate, var.defaults.default_capacity_provider_use_fargate, true)
fargate_capacity_providers = try(each.value.fargate_capacity_providers, var.defaults.fargate_capacity_providers, {})
managed_storage_configuration = try(each.value.managed_storage_configuration, var.defaults.managed_storage_configuration, {})
services = try(each.value.services, var.defaults.services, {})
tags = try(each.value.tags, var.defaults.tags, {})
task_exec_iam_role_description = try(each.value.task_exec_iam_role_description, var.defaults.task_exec_iam_role_description, null)
Expand Down