Issue/data platform robust (#933)

* add elbscheme to elastic beanstalk

* update name to v2

* add DATA_PLATFORM_HOST to analysis-dashboard and airflow

* add list of ports for the listeners

* remove v2

* use container port mappings

* fix

* fix

* fix default

* fix

Author: peterdudfield

terraform/india/development/main.tf

@@ -189,7 +189,9 @@ module "analysis_dashboard" {
   container-name     = "analysis-dashboard"
   container-tag      = var.analysis_dashboard_version
   container-registry = "ghcr.io/openclimatefix"
-  container-port = 8501
+  container-port-mappings = [
+    {"host":"80", "container": "8501"},
+  ]
   eb-app_name    = "analysis-dashboard"
   eb-instance_type = "t3.small"
   s3_bucket = [

terraform/modules/services/eb_app/eb.tf

@@ -98,12 +98,15 @@ resource "aws_elastic_beanstalk_environment" "eb-environment" {
   }
 
   # Following https://discuss.streamlit.io/t/howto-streamlit-on-aws-with-elastic-beanstalk-and-docker/10353
-  setting {
-    namespace = "aws:elb:listener:80"
-    name      = "ListenerProtocol"
-    value     = "TCP"
-    resource  = ""
-  }
+  dynamic "setting" {
+    for_each = var.elb_ports
+        content {
+            namespace = "aws:elb:listener:${setting.value}"
+            name      = "ListenerProtocol"
+            value     = "TCP"
+            resource  = ""
+        }
+    }
 
 
   ###=========================== Logging ========================== ###

terraform/modules/services/eb_app/s3.tf

@@ -16,7 +16,7 @@ resource "aws_s3_object" "eb-object" {
         "environment" = [for kv in var.container-env_vars : format("%s=$%s", kv.name, kv.name)],
         "container_name" = (var.container-name),
         "command" = (var.container-command),
-        "ports" = ["${var.container-host-port}:${var.container-port}"],
+        "ports" = [for mapping in var.container-port-mappings : format("%s:%s", mapping.host, mapping.container)],
       }
     }
   })

terraform/modules/services/eb_app/variables.tf

@@ -64,16 +64,25 @@ variable container-command {
   description = "Command to run in the container"
 }
 
-variable container-port {
-  type = number
-  description = "Port on which the container listens"
-  default = 80
+variable elb_ports {
+  type = list
+  description = "List of ports for listeners for the load balancer"
+  default = ["80"]
 }
 
-variable container-host-port {
-  type = number
-  description = "Host Port feed to container port"
-  default = 80
+variable container-port-mappings {
+  type = list(object({
+      host = string
+      container = string
+  }))
+  description = <<EOT
+    container-port-mappings = {
+      container : "The port number within the container that's listening for connections"
+      host : "The port number on your host machine where you want to receive traffic"
+    }
+    container-port-mappings : "Mapping of ports to and from container"
+  EOT
+  default = [{"host":"80", "container":"80"}]
 }
 
 // EB configuration --------------------------------------------------------

terraform/nowcasting/development/main.tf

@@ -157,6 +157,7 @@ module "airflow" {
     { "name" : "LOGLEVEL", "value" : "INFO" },
     { "name" : "SENTRY_DSN", "value" : var.sentry_dsn_api },
     { "name" : "URL", "value" : var.airflow_url },
+    { "name" : "DATA_PLATFORM_HOST", "value": module.data_platform_api.api_url}, 
   ]
 }
 
@@ -179,11 +180,14 @@ module "analysis_dashboard" {
     { "name" : "AUTH0_CLIENT_ID", "value" : var.auth_dashboard_client_id },
     { "name" : "REGION", "value": local.domain},
     { "name" : "ENVIRONMENT", "value": local.environment},
+    { "name" : "DATA_PLATFORM_HOST", "value": module.data_platform_api.api_url}, 
   ]
   container-name = "analysis-dashboard"
   container-tag  = var.internal_ui_version
   container-registry = "ghcr.io/openclimatefix"
-  container-port = 8501
+  container-port-mappings = [
+    {"host":"80", "container": "8501"},
+  ]
   eb-app_name    = "internal-ui"
   eb-instance_type = "t3.small"
   s3_bucket = [
@@ -303,10 +307,13 @@ module "data_platform_api" {
   container-name = "data-platform"
   container-tag  = var.data_platform_api_version
   container-registry = "ghcr.io/openclimatefix"
-  eb-app_name    = "data-platform-api-v2"
+  eb-app_name    = "data-platform-api"
   eb-instance_type = "t3.micro"
   s3_bucket = []
-  container-host-port = "50051"
-  container-port = "50051"
+  container-port-mappings = [
+    {"host":"50051", "container": "50051"},
+    {"host":"80", "container": "50051"},
+  ]
   elbscheme="internal"
+  elb_ports=["80","50051"]
 }