clean up

Author: jeffmccollum

examples/braintrust-data-plane-private/README.md

@@ -7,4 +7,3 @@ domain.
 Create the DNS record outside the module, pointing `custom_domain` at the API
 ECS ALB. Create an ACM certificate outside the module that covers
 `custom_domain`, then pass it as `custom_certificate_arn`.
-

examples/braintrust-data-plane-private/main.tf

@@ -59,8 +59,11 @@ module "braintrust-data-plane" {
   brainstore_writer_instance_type  = "c8gd.8xlarge"
 
   ### Redis configuration
-  redis_instance_type = "cache.t4g.medium"
-  redis_version       = "7.0"
+
+  # Default is acceptable for typical production deployments.
+  redis_instance_type = "cache.r7g.large"
+
+  redis_version = "7.0"
 
   ### Network configuration
   # WARNING: Choose these CIDR blocks carefully with your networking team.

main.tf

@@ -43,8 +43,6 @@ locals {
   enable_ecs_api = local.create_ecs_api && (var.enable_ecs_api || var.use_deployment_mode_private_api_ecs)
   # Lambda services are skipped for external EKS and private API ECS deployments.
   create_lambda_services = !var.use_deployment_mode_external_eks && !var.use_deployment_mode_private_api_ecs
-  # The ingress module is only needed when Lambda services own the public API path.
-  create_ingress = local.create_lambda_services
   # Brainstore reads the ECS API URL when ECS owns API/proxy behavior, otherwise the Lambda proxy URL.
   brainstore_ai_proxy_url_ssm_parameter_name = local.enable_ecs_api ? local.api_ecs_url_ssm_parameter_name : local.ai_proxy_url_ssm_parameter_name
   # api_url points at the active data-plane endpoint for the selected deployment mode.
@@ -393,7 +391,7 @@ module "api_ecs" {
 
 module "ingress" {
   source = "./modules/ingress"
-  count  = local.create_ingress ? 1 : 0
+  count  = local.create_lambda_services ? 1 : 0
 
   deployment_name                = var.deployment_name
   custom_domain                  = var.custom_domain

modules/api-ecs/main.tf

@@ -8,7 +8,6 @@ locals {
 
   using_brainstore_writer      = var.brainstore_writer_hostname != null && var.brainstore_writer_hostname != ""
   using_brainstore_fast_reader = var.brainstore_fast_reader_hostname != null && var.brainstore_fast_reader_hostname != ""
-  https_url                    = var.private_api_ecs_mode ? "https://${var.fqdn}" : null
 
   base_env_vars = merge({
     ORG_NAME                                          = var.braintrust_org_name
@@ -556,7 +555,6 @@ resource "aws_ecs_service" "api_ecs" {
   }
 
   depends_on = [
-    aws_lb_listener.api_ecs_https,
     aws_lb_listener.api_ecs_brainstore_http,
   ]
 

modules/api-ecs/outputs.tf

@@ -35,7 +35,7 @@ output "task_security_group_id" {
 
 output "client_url" {
   description = "URL clients should use for the API ECS ALB. Null unless private API ECS mode is enabled."
-  value       = local.https_url
+  value       = var.private_api_ecs_mode ? "https://${var.fqdn}" : null
 }
 
 output "fqdn" {

outputs.tf

@@ -169,17 +169,17 @@ output "api_url" {
 }
 
 output "cloudfront_distribution_domain_name" {
-  value       = local.create_ingress ? module.ingress[0].cloudfront_distribution_domain_name : null
+  value       = local.create_lambda_services ? module.ingress[0].cloudfront_distribution_domain_name : null
   description = "The domain name of the cloudfront distribution"
 }
 
 output "cloudfront_distribution_arn" {
-  value       = local.create_ingress ? module.ingress[0].cloudfront_distribution_arn : null
+  value       = local.create_lambda_services ? module.ingress[0].cloudfront_distribution_arn : null
   description = "The ARN of the cloudfront distribution"
 }
 
 output "cloudfront_distribution_hosted_zone_id" {
-  value       = local.create_ingress ? module.ingress[0].cloudfront_distribution_hosted_zone_id : null
+  value       = local.create_lambda_services ? module.ingress[0].cloudfront_distribution_hosted_zone_id : null
   description = "The hosted zone ID of the cloudfront distribution"
 }