Merge 201dfb0 into baeb431

.happy/config.json

@@ -16,8 +16,16 @@
             "secret_arn": "happy/env-explorer-dev-config",
             "terraform_directory": ".happy/terraform/envs/dev",
             "delete_protected": false,
-            "auto_run_migrations": true,
+            "auto_run_migrations": false,
             "log_group_prefix": "/explorer/dev"
+        },
+        "stage": {
+            "aws_profile": "single-cell-dev",
+            "secret_arn": "happy/env-explorer-staging-config",
+            "terraform_directory": ".happy/terraform/envs/staging",
+            "delete_protected": false,
+            "auto_run_migrations": false,
+            "log_group_prefix": "/explorer/staging"
         }
     },
     "tasks": {}

.happy/terraform/envs/staging/main.tf

@@ -0,0 +1,18 @@
+module stack {
+  source                       = "./modules/ecs-stack"
+  aws_account_id               = var.aws_account_id
+  aws_role                     = var.aws_role
+  happymeta_                   = var.happymeta_
+  happy_config_secret          = var.happy_config_secret
+  image_tag                    = var.image_tag
+  priority                     = var.priority
+  stack_name                   = var.stack_name
+  deployment_stage             = "staging"
+  delete_protected             = false
+  require_okta                 = false
+  stack_prefix                 = "/${var.stack_name}"
+  batch_container_memory_limit = 28000
+  memory                       = 50000
+
+  wait_for_steady_state        = var.wait_for_steady_state
+}

.happy/terraform/envs/staging/modules/dns/main.tf

@@ -0,0 +1,17 @@
+# This template creates a route53 cname for a shared alb resource.
+# 
+
+data aws_route53_zone dns_record {
+  name = var.zone
+}
+
+resource aws_route53_record dns_record_0 {
+  name    = "${var.custom_stack_name}-${var.app_name}.${var.zone}"
+  type    = "A"
+  zone_id = data.aws_route53_zone.dns_record.zone_id
+  alias {
+    name                   = var.alb_dns
+    zone_id                = var.canonical_hosted_zone
+    evaluate_target_health = false
+  }
+}

.happy/terraform/envs/staging/modules/dns/outputs.tf

@@ -0,0 +1,4 @@
+output dns_prefix {
+  value       = "${var.custom_stack_name}-${var.app_name}"
+  description = "User-facing URL for this service."
+}

.happy/terraform/envs/staging/modules/dns/variables.tf

@@ -0,0 +1,24 @@
+variable custom_stack_name {
+  type        = string
+  description = "Please provide the stack name"
+}
+
+variable app_name {
+  type        = string
+  description = "Please provide the ECS service name"
+}
+
+variable zone {
+  type        = string
+  description = "Route53 zone name. Trailing . must be OMITTED!"
+}
+
+variable alb_dns {
+  type        = string
+  description = "DNS name for the shared ALB"
+}
+
+variable canonical_hosted_zone {
+  type        = string
+  description = "Route53 zone for the shared ALB"
+}

.happy/terraform/envs/staging/modules/ecs-stack/main.tf

@@ -0,0 +1,79 @@
+# This deploys an Explorer stack.
+#
+
+data aws_secretsmanager_secret_version config {
+  secret_id = var.happy_config_secret
+}
+
+locals {
+  secret  = jsondecode(data.aws_secretsmanager_secret_version.config.secret_string)
+  alb_key = var.require_okta ? "private_albs" : "public_albs"
+
+  custom_stack_name            = var.stack_name
+  image_tag                    = var.image_tag
+  priority                     = var.priority
+  deployment_stage             = var.deployment_stage
+  remote_dev_prefix            = var.stack_prefix
+  wait_for_steady_state        = var.wait_for_steady_state
+
+  vpc_id                          = local.secret["vpc_id"]
+  subnets                         = local.secret["private_subnets"]
+  security_groups                 = local.secret["security_groups"]
+  zone                            = local.secret["zone_id"]
+  cluster                         = local.secret["cluster_arn"]
+  external_dns                    = local.secret["external_zone_name"]
+  internal_dns                    = local.secret["internal_zone_name"]
+
+  explorer_listener_arn = try(local.secret[local.alb_key]["explorer"]["listener_arn"], "")
+  explorer_alb_dns      = try(local.secret[local.alb_key]["explorer"]["dns_name"], "")
+  explorer_alb_zone     = try(local.secret[local.alb_key]["explorer"]["zone_id"], "")
+
+  frontend_url        = try(join("", [
+    "https://", module.explorer_dns[0].dns_prefix, ".", local.external_dns
+  ]), var.frontend_url)
+  explorer_image_repo = local.secret["ecrs"]["explorer"]["url"]
+  explorer_cmd        = ["gunicorn", "--worker-class", "gevent", "--bind", "0.0.0.0:5000", "server.eb.app:application", "--timeout", "60"]
+  # TODO end explorer stuff
+
+  artifact_bucket            = try(local.secret["s3_buckets"]["artifact"]["name"], "")
+  cellxgene_bucket           = try(local.secret["s3_buckets"]["cellxgene"]["name"], "")
+
+  ecs_role_arn          = local.secret["service_roles"]["ecs_role"]
+
+}
+
+module explorer_dns {
+  count                 = var.require_okta ? 1 : 0
+  source                = "../dns"
+  custom_stack_name     = local.custom_stack_name
+  app_name              = "explorer"
+  alb_dns               = local.explorer_alb_dns
+  canonical_hosted_zone = local.explorer_alb_zone
+  zone                  = local.internal_dns
+}
+
+module explorer_service {
+  source            = "../service"
+  custom_stack_name = local.custom_stack_name
+  app_name          = "explorer"
+  vpc               = local.vpc_id
+  image             = "${local.explorer_image_repo}:${local.image_tag}"
+  cluster           = local.cluster
+  desired_count     = var.explorer_instance_count
+  listener          = local.explorer_listener_arn
+  subnets           = local.subnets
+  security_groups   = local.security_groups
+  task_role_arn     = local.ecs_role_arn
+  service_port      = 5000
+  memory            = var.memory
+  cmd               = local.explorer_cmd
+  deployment_stage  = local.deployment_stage
+  health_check_path = "/cellxgene/health"
+  host_match        = try(join(".", [module.explorer_dns[0].dns_prefix, local.external_dns]), "")
+  priority          = local.priority
+  api_url           = local.frontend_url
+  frontend_url      = local.frontend_url
+  remote_dev_prefix = local.remote_dev_prefix
+
+  wait_for_steady_state = local.wait_for_steady_state
+}

.happy/terraform/envs/staging/modules/ecs-stack/outputs.tf

@@ -0,0 +1,4 @@
+output frontend_url {
+  value       = local.frontend_url
+  description = "The URL endpoint for the website service"
+}

.happy/terraform/envs/staging/modules/ecs-stack/variables.tf

@@ -0,0 +1,89 @@
+variable aws_account_id {
+  type        = string
+  description = "AWS account ID to apply changes to"
+  default     = ""
+}
+
+variable aws_role {
+  type        = string
+  description = "Name of the AWS role to assume to apply changes"
+  default     = ""
+}
+
+variable image_tag {
+   type        = string
+  description = "Please provide an image tag"
+}
+
+variable priority {
+  type        = number
+  description = "Listener rule priority number within the given listener"
+}
+
+variable happymeta_ {
+  type        = string
+  description = "Happy Path metadata. Ignored by actual terraform."
+}
+
+variable stack_name {
+  type        = string
+  description = "Happy Path stack name"
+}
+
+variable happy_config_secret {
+  type        = string
+  description = "Happy Path configuration secret name"
+}
+
+variable deployment_stage {
+  type        = string
+  description = "Deployment stage for the app"
+}
+
+variable delete_protected {
+  type        = bool
+  description = "Whether to protect this stack from being deleted."
+  default     = false
+}
+
+variable require_okta {
+  type        = bool
+  description = "Whether the ALB's should be on private subnets"
+  default     = true
+}
+
+variable stack_prefix {
+  type        = string
+  description = "Do bucket storage paths and db schemas need to be prefixed with the stack name? (Usually '/{stack_name}' for dev stacks, and '' for staging/prod stacks)"
+  default     = ""
+}
+
+variable wait_for_steady_state {
+  type        = bool
+  description = "Should terraform block until ECS services reach a steady state?"
+  default     = false
+}
+
+variable batch_container_memory_limit {
+  type        = number
+  description = "Memory hard limit for the batch container"
+  default     = 28000
+}
+
+variable frontend_url {
+  type        = string
+  description = "For non-proxied stacks, send in the canonical front/backend URL's"
+  default     = ""
+}
+
+variable explorer_instance_count {
+  type        = number
+  description = "How many backend tasks to run"
+  default     = 1
+}
+
+variable memory {
+  type        = number
+  description = "Allocated memory"
+  default     = 1536
+}