Skip to content

update mesh-task #84

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 3 commits into
base: main
Choose a base branch
from
Open

update mesh-task #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9d1e3eb
update mesh-task
hanshasselberg Jan 18, 2023
8b77d81
make
hanshasselberg Jan 18, 2023
2344eb3
rename secret_prefix to prefix
hanshasselberg Jan 19, 2023
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
6 changes: 3 additions & 3 deletions modules/hcp-ecs-client/loadbalancer.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
resource "aws_lb" "ingress" {
name = "${local.secret_prefix}-ingress"
name = "${local.prefix}-ingress"
internal = false
load_balancer_type = "application"
security_groups = [var.security_group_id]
subnets = var.public_subnet_ids
}

resource "aws_lb_target_group" "frontend" {
name = "${local.secret_prefix}-frontend"
name = "${local.prefix}-frontend"
port = local.frontend_port
protocol = "HTTP"
vpc_id = var.vpc_id
Expand All @@ -16,7 +16,7 @@ resource "aws_lb_target_group" "frontend" {
}

resource "aws_lb_target_group" "public-api" {
name = "${local.secret_prefix}-api"
name = "${local.prefix}-api"
port = local.public_api_port
protocol = "HTTP"
vpc_id = var.vpc_id
Expand Down
12 changes: 6 additions & 6 deletions modules/hcp-ecs-client/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
locals {
secret_prefix = random_id.id.dec
scope = random_id.id.dec
prefix = random_id.id.dec
scope = random_id.id.dec

lb_port = 80
frontend_port = 3000
Expand Down Expand Up @@ -49,7 +49,7 @@ resource "random_id" "id" {
}

resource "aws_secretsmanager_secret" "bootstrap_token" {
name = "${local.secret_prefix}-bootstrap-token"
name = "${local.prefix}-bootstrap-token"
recovery_window_in_days = 0
}

Expand All @@ -59,7 +59,7 @@ resource "aws_secretsmanager_secret_version" "bootstrap_token" {
}

resource "aws_secretsmanager_secret" "ca_cert" {
name = "${local.secret_prefix}-client-ca-cert"
name = "${local.prefix}-client-ca-cert"
recovery_window_in_days = 0
}

Expand All @@ -69,7 +69,7 @@ resource "aws_secretsmanager_secret_version" "ca_cert" {
}

resource "aws_secretsmanager_secret" "gossip_key" {
name = "${local.secret_prefix}-gossip-encryption-key"
name = "${local.prefix}-gossip-encryption-key"
recovery_window_in_days = 0
}

Expand All @@ -79,5 +79,5 @@ resource "aws_secretsmanager_secret_version" "gossip_key" {
}

resource "aws_cloudwatch_log_group" "log_group" {
name = "${local.secret_prefix}-ecs-client"
name = "${local.prefix}-ecs-client"
}
79 changes: 42 additions & 37 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 @@ -17,7 +17,7 @@ module "acl-controller" {
region = var.region
subnets = var.private_subnet_ids

name_prefix = local.secret_prefix
name_prefix = local.prefix
}

resource "aws_iam_role" "frontend-task-role" {
Expand Down Expand Up @@ -56,11 +56,13 @@ resource "aws_iam_role" "frontend-execution-role" {

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
family = "frontend"
task_role = aws_iam_role.frontend-task-role
create_task_role = false
execution_role = aws_iam_role.frontend-execution-role
create_execution_role = false
container_definitions = [
{
name = "frontend"
Expand Down Expand Up @@ -109,15 +111,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
acls = true
}

resource "aws_ecs_service" "frontend" {
Expand Down Expand Up @@ -178,11 +179,13 @@ resource "aws_iam_role" "public-api-execution-role" {

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
family = "public-api"
task_role = aws_iam_role.public-api-task-role
create_task_role = false
execution_role = aws_iam_role.public-api-execution-role
create_execution_role = false
container_definitions = [
{
name = "public-api"
Expand Down Expand Up @@ -250,15 +253,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
acls = true
}

resource "aws_ecs_service" "public-api" {
Expand Down Expand Up @@ -319,11 +321,13 @@ resource "aws_iam_role" "payment-api-execution-role" {

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
family = "payment-api"
task_role = aws_iam_role.payment-api-task-role
create_task_role = false
execution_role = aws_iam_role.payment-api-execution-role
create_execution_role = false
container_definitions = [
{
name = "payment-api"
Expand Down Expand Up @@ -364,15 +368,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
acls = true
}

resource "aws_ecs_service" "payment-api" {
Expand Down Expand Up @@ -427,11 +430,13 @@ resource "aws_iam_role" "product-api-execution-role" {

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
family = "product-api"
task_role = aws_iam_role.product-api-task-role
create_task_role = false
execution_role = aws_iam_role.product-api-execution-role
create_execution_role = false
container_definitions = [
{
name = "product-api"
Expand Down Expand Up @@ -489,15 +494,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
acls = true
}

resource "aws_ecs_service" "product-api" {
Expand Down Expand Up @@ -552,11 +556,13 @@ resource "aws_iam_role" "product-db-execution-role" {

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
family = "product-db"
task_role = aws_iam_role.product-db-task-role
create_task_role = false
execution_role = aws_iam_role.product-db-execution-role
create_execution_role = false
container_definitions = [
{
name = "product-db"
Expand Down Expand Up @@ -611,15 +617,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
acls = true
}

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