Skip to content

[PLT-1445] Service module adoption for AB2D contracts, events and worker services #1663

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
jscott-nava wants to merge 3 commits into
base: main
Choose a base branch
from
Open

[PLT-1445] Service module adoption for AB2D contracts, events and worker services #1663

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
98676da
Migrating worker service onto CDAP service module.
jscott-nava Dec 17, 2025
789e27b
Migrating AB2D contracts to CDAP service module.
jscott-nava Dec 17, 2025
8b76940
Migrating events service to CDAP service module.
jscott-nava Dec 18, 2025
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
186 changes: 86 additions & 100 deletions ops/services/20-microservices/contracts.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,106 +10,6 @@ locals {
hpms_url_arn = module.platform.ssm.core.hpms_url.arn
}

resource "aws_ecs_task_definition" "contracts" {
family = "${local.service_prefix}-contracts"
network_mode = "awsvpc"
execution_role_arn = data.aws_iam_role.task_execution_role.arn
task_role_arn = data.aws_iam_role.task_execution_role.arn #TODO task/execution role probably ought to be different 😕
requires_compatibilities = ["FARGATE"]
cpu = 1024
memory = 2048
container_definitions = nonsensitive(jsonencode([{
name : "contracts-service-container", #TODO: Consider simplifying this name, just use "contracts"
image : local.contracts_image_uri,
readonlyRootFilesystem = true
essential : true,
secrets : [
{ name : "AB2D_DB_DATABASE", valueFrom : local.db_database_arn },
{ name : "AB2D_DB_PASSWORD", valueFrom : local.db_password_arn },
{ name : "AB2D_DB_USER", valueFrom : local.db_user_arn },
{ name : "AB2D_HPMS_API_PARAMS", valueFrom : local.hpms_api_params_arn },
{ name : "AB2D_HPMS_URL", valueFrom : local.hpms_url_arn },
{ name : "HPMS_AUTH_KEY_ID", valueFrom : local.hpms_auth_key_id_arn },
{ name : "HPMS_AUTH_KEY_SECRET", valueFrom : local.hpms_auth_key_secret_arn }
],
environment : [
{ name : "AB2D_DB_HOST", value : local.ab2d_db_host },
{ name : "AB2D_DB_PORT", value : "5432" },
{ name : "AB2D_DB_SSL_MODE", value : "require" },
{ name : "AB2D_EXECUTION_ENV", value : local.benv },
{ name : "AWS_SQS_URL", value : local.events_sqs_url }
],
portMappings : [
{
containerPort : 8070
}
],
logConfiguration : {
logDriver : "awslogs",
options : {
awslogs-group = "/aws/ecs/fargate/${local.service_prefix}/ab2d_contracts",
awslogs-create-group : "true",
awslogs-region : local.aws_region,
awslogs-stream-prefix : local.service_prefix
}
},
healthCheck : null
mountPoints = [
{
"containerPath" : "/tmp",
"sourceVolume" : "tmp",
"readOnly" : false
},
{
"containerPath" : "/newrelic/logs",
"sourceVolume" : "newrelic_logs",
"readOnly" : false
},
{
"containerPath" : "/var/log",
"sourceVolume" : "var_log",
"readOnly" : false
}
]
}]))
# The NewRelic agent needs access to these
volume {
name = "tmp"
}
volume {
name = "newrelic_logs"
}
volume {
name = "var_log"
}
}

resource "aws_ecs_service" "contracts" {
name = "${local.service_prefix}-contracts"
cluster = module.cluster.this.id
task_definition = aws_ecs_task_definition.contracts.arn
desired_count = 1
launch_type = "FARGATE"
platform_version = "1.4.0"
force_new_deployment = anytrue([var.force_contracts_deployment, var.contracts_service_image_tag != null])
propagate_tags = "SERVICE"

tags = {
service = "contracts"
}

network_configuration {
subnets = keys(module.platform.private_subnets)
assign_public_ip = false
security_groups = [data.aws_security_group.api.id]
}
load_balancer {
target_group_arn = aws_lb_target_group.contracts.arn
container_name = "contracts-service-container"
container_port = 8070
}
}

resource "aws_security_group_rule" "contracts_to_worker_egress_access" {
type = "egress"
from_port = 8070
Expand Down Expand Up @@ -178,3 +78,89 @@ resource "aws_lb_listener_rule" "contracts" {
}
}
}

module "contracts_service" {
source = "github.com/CMSgov/cdap//terraform/modules/service?ref=jscott/PLT-1445"

awslogs_group_override = "ab2d_contracts"
cluster_arn = module.cluster.this.id
container_name_override = "contracts-service-container"
cpu = 1024
desired_count = 1
execution_role_arn = data.aws_iam_role.task_execution_role.arn
force_new_deployment = anytrue([var.force_contracts_deployment, var.contracts_service_image_tag != null])
health_check_grace_period_seconds = null
image = local.contracts_image_uri
memory = 2048
platform = module.platform
platform_version = "1.4.0"
security_groups = [data.aws_security_group.api.id]
service_name_override = "contracts"
task_role_arn = data.aws_iam_role.task_execution_role.arn

container_environment = [
{ name = "AB2D_DB_HOST", value = local.ab2d_db_host },
{ name = "AB2D_DB_PORT", value = "5432" },
{ name = "AB2D_DB_SSL_MODE", value = "require" },
{ name = "AB2D_EXECUTION_ENV", value = local.benv },
{ name = "AWS_SQS_URL", value = local.events_sqs_url }
]

container_secrets = [
{ name = "AB2D_DB_DATABASE", valueFrom = local.db_database_arn },
{ name = "AB2D_DB_PASSWORD", valueFrom = local.db_password_arn },
{ name = "AB2D_DB_USER", valueFrom = local.db_user_arn },
{ name = "AB2D_HPMS_API_PARAMS", valueFrom = local.hpms_api_params_arn },
{ name = "AB2D_HPMS_URL", valueFrom = local.hpms_url_arn },
{ name = "HPMS_AUTH_KEY_ID", valueFrom = local.hpms_auth_key_id_arn },
{ name = "HPMS_AUTH_KEY_SECRET", valueFrom = local.hpms_auth_key_secret_arn }
]

load_balancers = [{
target_group_arn = aws_lb_target_group.contracts.arn
container_name = "contracts-service-container"
container_port = 8070

}]

mount_points = [
{
"containerPath" = "/tmp",
"sourceVolume" = "tmp",
"readOnly" = false
},
{
"containerPath" = "/newrelic/logs",
"sourceVolume" = "newrelic_logs",
"readOnly" = false
},
{
"containerPath" = "/var/log",
"sourceVolume" = "var_log",
"readOnly" = false
}
]

port_mappings = [
{
containerPort = 8070
hostPort = 8070
protocol = "tcp"
}
]

volumes = [
{
configure_at_launch = false
name = "tmp"
},
{
configure_at_launch = false
name = "newrelic_logs"
},
{
configure_at_launch = false
name = "var_log"
}
]
}
166 changes: 74 additions & 92 deletions ops/services/20-microservices/events.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,101 +18,83 @@ resource "aws_sns_topic_subscription" "events" {
endpoint = data.aws_sqs_queue.events.arn
}

resource "aws_ecs_task_definition" "events" {
family = "${local.service_prefix}-events"
network_mode = "awsvpc"
execution_role_arn = data.aws_iam_role.task_execution_role.arn
task_role_arn = data.aws_iam_role.task_execution_role.arn
module "events_service" {
source = "github.com/CMSgov/cdap//terraform/modules/service?ref=jscott/PLT-1445"

requires_compatibilities = ["FARGATE"]
cpu = 512
memory = 1024
container_definitions = nonsensitive(jsonencode([{
name : "events-service-container", #TODO: Consider simplifying this name, just use "events"
image : local.events_image_uri,
readonlyRootFilesystem = true
essential : true,
secrets : [
{ name : "AB2D_DB_DATABASE", valueFrom : local.db_database_arn },
{ name : "AB2D_DB_PASSWORD", valueFrom : local.db_password_arn },
{ name : "AB2D_DB_USER", valueFrom : local.db_user_arn },
{ name : "AB2D_KEYSTORE_LOCATION", valueFrom : local.ab2d_keystore_location_arn }, #FIXME: is this even used?
{ name : "AB2D_KEYSTORE_PASSWORD", valueFrom : local.ab2d_keystore_password_arn }, #FIXME: is this even used?
{ name : "AB2D_OKTA_JWT_ISSUER", valueFrom : local.ab2d_okta_jwt_issuer_arn }, #FIXME: is this even used?
{ name : "AB2D_SLACK_ALERT_WEBHOOKS", valueFrom : local.ab2d_slack_alert_webhooks_arn },
{ name : "AB2D_SLACK_TRACE_WEBHOOKS", valueFrom : local.ab2d_slack_trace_webhooks_arn }
],
environment : [
{ name : "AB2D_DB_HOST", value : local.ab2d_db_host },
{ name : "AB2D_DB_PORT", value : "5432" },
{ name : "AB2D_DB_SSL_MODE", value : "require" },
{ name : "AB2D_EXECUTION_ENV", value : local.benv },
{ name : "AWS_SQS_FEATURE_FLAG", value : "true" }, #FIXME: is this even used?
{ name : "AWS_SQS_URL", value : local.events_sqs_url },
{ name : "IMAGE_VERSION", value : local.events_image_tag } #FIXME: is this even used?
],
portMappings : [
{
containerPort : 8010 #FIXME is this even necessary?
}
],
logConfiguration : {
logDriver : "awslogs",
options : {
awslogs-group = "/aws/ecs/fargate/${local.service_prefix}/ab2d_events",
awslogs-create-group : "true",
awslogs-region : local.aws_region,
awslogs-stream-prefix : local.service_prefix
}
awslogs_group_override = "ab2d_events"
cluster_arn = module.cluster.this.id
container_name_override = "events-service-container"
cpu = 512
desired_count = 1
execution_role_arn = data.aws_iam_role.task_execution_role.arn
force_new_deployment = anytrue([var.force_events_deployment, var.events_service_image_tag != null])
health_check_grace_period_seconds = null
image = local.events_image_uri
memory = 1024
platform = module.platform
platform_version = "1.4.0"
security_groups = [data.aws_security_group.api.id]
service_name_override = "events"
task_role_arn = data.aws_iam_role.task_execution_role.arn

container_environment = [
{ name = "AB2D_DB_HOST", value = local.ab2d_db_host },
{ name = "AB2D_DB_PORT", value = "5432" },
{ name = "AB2D_DB_SSL_MODE", value = "require" },
{ name = "AB2D_EXECUTION_ENV", value = local.benv },
{ name = "AWS_SQS_FEATURE_FLAG", value = "true" }, #FIXME: is this even used?
{ name = "AWS_SQS_URL", value = local.events_sqs_url },
{ name = "IMAGE_VERSION", value = local.events_image_tag } #FIXME: is this even used?
]

container_secrets = [
{ name = "AB2D_DB_DATABASE", valueFrom = local.db_database_arn },
{ name = "AB2D_DB_PASSWORD", valueFrom = local.db_password_arn },
{ name = "AB2D_DB_USER", valueFrom = local.db_user_arn },
{ name = "AB2D_KEYSTORE_LOCATION", valueFrom = local.ab2d_keystore_location_arn }, #FIXME: is this even used?
{ name = "AB2D_KEYSTORE_PASSWORD", valueFrom = local.ab2d_keystore_password_arn }, #FIXME: is this even used?
{ name = "AB2D_OKTA_JWT_ISSUER", valueFrom = local.ab2d_okta_jwt_issuer_arn }, #FIXME: is this even used?
{ name = "AB2D_SLACK_ALERT_WEBHOOKS", valueFrom = local.ab2d_slack_alert_webhooks_arn },
{ name = "AB2D_SLACK_TRACE_WEBHOOKS", valueFrom = local.ab2d_slack_trace_webhooks_arn }
]

mount_points = [
{
"containerPath" = "/tmp",
"sourceVolume" = "tmp",
"readOnly" = false
},
healthCheck : null
mountPoints = [
{
"containerPath" : "/tmp",
"sourceVolume" : "tmp",
"readOnly" : false
},
{
"containerPath" : "/newrelic/logs",
"sourceVolume" : "newrelic_logs",
"readOnly" : false
},
{
"containerPath" : "/var/log",
"sourceVolume" : "var_log",
"readOnly" : false
}
]
}]))
# The NewRelic agent needs access to these
volume {
name = "tmp"
}
volume {
name = "newrelic_logs"
}
volume {
name = "var_log"
}
}
{
"containerPath" = "/newrelic/logs",
"sourceVolume" = "newrelic_logs",
"readOnly" = false
},
{
"containerPath" = "/var/log",
"sourceVolume" = "var_log",
"readOnly" = false
}
]

resource "aws_ecs_service" "events" {
name = "${local.service_prefix}-events"
cluster = module.cluster.this.id
task_definition = aws_ecs_task_definition.events.arn
desired_count = 1
launch_type = "FARGATE"
platform_version = "1.4.0"
force_new_deployment = anytrue([var.force_events_deployment, var.events_service_image_tag != null])
propagate_tags = "SERVICE"
port_mappings = [
{
containerPort = 8010 #FIXME is this even necessary?
}
]

tags = {
service = "events"
}
volumes = [
{
configure_at_launch = false
name = "tmp"
},
{
configure_at_launch = false
name = "newrelic_logs"
},
{
configure_at_launch = false
name = "var_log"
}

network_configuration {
subnets = keys(module.platform.private_subnets)
assign_public_ip = false
security_groups = [data.aws_security_group.api.id]
}
]
}
19 changes: 19 additions & 0 deletions ops/services/20-microservices/moved.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
moved {
from = aws_ecs_task_definition.contracts
to = module.contracts_service.aws_ecs_task_definition.this
}

moved {
from = aws_ecs_service.contracts
to = module.contracts_service.aws_ecs_service.this
}

moved {
from = aws_ecs_task_definition.events
to = module.events_service.aws_ecs_task_definition.this
}

moved {
from = aws_ecs_service.events
to = module.events_service.aws_ecs_service.this
}
Loading
Loading