Skip to content

Bump meshtask and acl controller to v0.5.x #76

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.

Sign up for GitHub

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Bump meshtask and acl controller to v0.5.x #76

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9bb811f
bump mesh-task and acl-controller to v0.5.x
v-rosa Nov 29, 2022
04dd52d
remove iam roles given they are created in mesh-task module
v-rosa Nov 29, 2022
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
207 changes: 11 additions & 196 deletions modules/hcp-ecs-client/services.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module "acl-controller" {
source = "hashicorp/consul-ecs/aws//modules/acl-controller"
version = "0.4.2"
version = "~> 0.5.0"

log_configuration = {
logDriver = "awslogs"
Expand All @@ -20,47 +20,11 @@ module "acl-controller" {
name_prefix = local.secret_prefix
}

resource "aws_iam_role" "frontend-task-role" {
name = "frontend_${local.scope}_task_role"
assume_role_policy = jsonencode({
Version = "2012-10-17"
Statement = [
{
Action = "sts:AssumeRole"
Effect = "Allow"
Principal = {
Service = "ecs-tasks.amazonaws.com"
}
}
]
})
}

resource "aws_iam_role" "frontend-execution-role" {
name = "frontend_${local.scope}_execution_role"
path = "/ecs/"

assume_role_policy = jsonencode({
Version = "2012-10-17"
Statement = [
{
Action = "sts:AssumeRole"
Effect = "Allow"
Principal = {
Service = "ecs-tasks.amazonaws.com"
}
}
]
})
}

module "frontend" {
source = "hashicorp/consul-ecs/aws//modules/mesh-task"
version = "~> 0.3.0"
version = "~> 0.5.0"

family = "frontend"
task_role = aws_iam_role.frontend-task-role
execution_role = aws_iam_role.frontend-execution-role
container_definitions = [
{
name = "frontend"
Expand Down Expand Up @@ -109,15 +73,14 @@ module "frontend" {

retry_join = var.client_retry_join
consul_datacenter = var.datacenter
consul_http_addr = var.consul_url
consul_image = "public.ecr.aws/hashicorp/consul:${var.consul_version}"

tls = true
consul_server_ca_cert_arn = aws_secretsmanager_secret.ca_cert.arn
gossip_key_secret_arn = aws_secretsmanager_secret.gossip_key.arn

acls = true
consul_client_token_secret_arn = module.acl-controller.client_token_secret_arn
acl_secret_name_prefix = local.secret_prefix
}

resource "aws_ecs_service" "frontend" {
Expand All @@ -142,47 +105,11 @@ resource "aws_ecs_service" "frontend" {
enable_execute_command = true
}

resource "aws_iam_role" "public-api-task-role" {
name = "public_api_${local.scope}_task_role"
assume_role_policy = jsonencode({
Version = "2012-10-17"
Statement = [
{
Action = "sts:AssumeRole"
Effect = "Allow"
Principal = {
Service = "ecs-tasks.amazonaws.com"
}
}
]
})
}

resource "aws_iam_role" "public-api-execution-role" {
name = "public_api_${local.scope}_execution_role"
path = "/ecs/"

assume_role_policy = jsonencode({
Version = "2012-10-17"
Statement = [
{
Action = "sts:AssumeRole"
Effect = "Allow"
Principal = {
Service = "ecs-tasks.amazonaws.com"
}
}
]
})
}

module "public-api" {
source = "hashicorp/consul-ecs/aws//modules/mesh-task"
version = "~> 0.3.0"
version = "~> 0.5.0"

family = "public-api"
task_role = aws_iam_role.public-api-task-role
execution_role = aws_iam_role.public-api-execution-role
container_definitions = [
{
name = "public-api"
Expand Down Expand Up @@ -250,15 +177,14 @@ module "public-api" {

retry_join = var.client_retry_join
consul_datacenter = var.datacenter
consul_http_addr = var.consul_url
consul_image = "public.ecr.aws/hashicorp/consul:${var.consul_version}"

tls = true
consul_server_ca_cert_arn = aws_secretsmanager_secret.ca_cert.arn
gossip_key_secret_arn = aws_secretsmanager_secret.gossip_key.arn

acls = true
consul_client_token_secret_arn = module.acl-controller.client_token_secret_arn
acl_secret_name_prefix = local.secret_prefix
}

resource "aws_ecs_service" "public-api" {
Expand All @@ -283,47 +209,11 @@ resource "aws_ecs_service" "public-api" {
enable_execute_command = true
}

resource "aws_iam_role" "payment-api-task-role" {
name = "payment_api_${local.scope}_task_role"
assume_role_policy = jsonencode({
Version = "2012-10-17"
Statement = [
{
Action = "sts:AssumeRole"
Effect = "Allow"
Principal = {
Service = "ecs-tasks.amazonaws.com"
}
}
]
})
}

resource "aws_iam_role" "payment-api-execution-role" {
name = "payment_api_${local.scope}_execution_role"
path = "/ecs/"

assume_role_policy = jsonencode({
Version = "2012-10-17"
Statement = [
{
Action = "sts:AssumeRole"
Effect = "Allow"
Principal = {
Service = "ecs-tasks.amazonaws.com"
}
}
]
})
}

module "payment-api" {
source = "hashicorp/consul-ecs/aws//modules/mesh-task"
version = "~> 0.3.0"
version = "~> 0.5.0"

family = "payment-api"
task_role = aws_iam_role.payment-api-task-role
execution_role = aws_iam_role.payment-api-execution-role
container_definitions = [
{
name = "payment-api"
Expand Down Expand Up @@ -364,15 +254,14 @@ module "payment-api" {

retry_join = var.client_retry_join
consul_datacenter = var.datacenter
consul_http_addr = var.consul_url
consul_image = "public.ecr.aws/hashicorp/consul:${var.consul_version}"

tls = true
consul_server_ca_cert_arn = aws_secretsmanager_secret.ca_cert.arn
gossip_key_secret_arn = aws_secretsmanager_secret.gossip_key.arn

acls = true
consul_client_token_secret_arn = module.acl-controller.client_token_secret_arn
acl_secret_name_prefix = local.secret_prefix
}

resource "aws_ecs_service" "payment-api" {
Expand All @@ -391,47 +280,11 @@ resource "aws_ecs_service" "payment-api" {
enable_execute_command = true
}

resource "aws_iam_role" "product-api-task-role" {
name = "product_api_${local.scope}_task_role"
assume_role_policy = jsonencode({
Version = "2012-10-17"
Statement = [
{
Action = "sts:AssumeRole"
Effect = "Allow"
Principal = {
Service = "ecs-tasks.amazonaws.com"
}
}
]
})
}

resource "aws_iam_role" "product-api-execution-role" {
name = "product_api_${local.scope}_execution_role"
path = "/ecs/"

assume_role_policy = jsonencode({
Version = "2012-10-17"
Statement = [
{
Action = "sts:AssumeRole"
Effect = "Allow"
Principal = {
Service = "ecs-tasks.amazonaws.com"
}
}
]
})
}

module "product-api" {
source = "hashicorp/consul-ecs/aws//modules/mesh-task"
version = "~> 0.3.0"
version = "~> 0.5.0"

family = "product-api"
task_role = aws_iam_role.product-api-task-role
execution_role = aws_iam_role.product-api-execution-role
container_definitions = [
{
name = "product-api"
Expand Down Expand Up @@ -489,15 +342,14 @@ module "product-api" {

retry_join = var.client_retry_join
consul_datacenter = var.datacenter
consul_http_addr = var.consul_url
consul_image = "public.ecr.aws/hashicorp/consul:${var.consul_version}"

tls = true
consul_server_ca_cert_arn = aws_secretsmanager_secret.ca_cert.arn
gossip_key_secret_arn = aws_secretsmanager_secret.gossip_key.arn

acls = true
consul_client_token_secret_arn = module.acl-controller.client_token_secret_arn
acl_secret_name_prefix = local.secret_prefix
}

resource "aws_ecs_service" "product-api" {
Expand All @@ -516,47 +368,11 @@ resource "aws_ecs_service" "product-api" {
enable_execute_command = true
}

resource "aws_iam_role" "product-db-task-role" {
name = "product_db_${local.scope}_task_role"
assume_role_policy = jsonencode({
Version = "2012-10-17"
Statement = [
{
Action = "sts:AssumeRole"
Effect = "Allow"
Principal = {
Service = "ecs-tasks.amazonaws.com"
}
}
]
})
}

resource "aws_iam_role" "product-db-execution-role" {
name = "product_db_${local.scope}_execution_role"
path = "/ecs/"

assume_role_policy = jsonencode({
Version = "2012-10-17"
Statement = [
{
Action = "sts:AssumeRole"
Effect = "Allow"
Principal = {
Service = "ecs-tasks.amazonaws.com"
}
}
]
})
}

module "product-db" {
source = "hashicorp/consul-ecs/aws//modules/mesh-task"
version = "~> 0.3.0"
version = "~> 0.5.0"

family = "product-db"
task_role = aws_iam_role.product-db-task-role
execution_role = aws_iam_role.product-db-execution-role
container_definitions = [
{
name = "product-db"
Expand Down Expand Up @@ -611,15 +427,14 @@ module "product-db" {

retry_join = var.client_retry_join
consul_datacenter = var.datacenter
consul_http_addr = var.consul_url
consul_image = "public.ecr.aws/hashicorp/consul:${var.consul_version}"

tls = true
consul_server_ca_cert_arn = aws_secretsmanager_secret.ca_cert.arn
gossip_key_secret_arn = aws_secretsmanager_secret.gossip_key.arn

acls = true
consul_client_token_secret_arn = module.acl-controller.client_token_secret_arn
acl_secret_name_prefix = local.secret_prefix
}

resource "aws_ecs_service" "product-db" {
Expand Down