WIP

somleng · Sep 11, 2024 · c4f7ff7 · c4f7ff7
1 parent 0441f39
commit c4f7ff7
Show file tree

Hide file tree

Showing 14 changed files with 72 additions and 34 deletions.
diff --git a/.github/workflows/gateway_commons.yml b/.github/workflows/gateway_commons.yml
@@ -18,7 +18,7 @@ jobs:
           [
             {
               "identifier": "gateway-commons-staging",
-              "branch": "modularize_infrastructure",
+              "branch": "develop",
               "image_tag": "staging"
             },
             {

diff --git a/.github/workflows/public_gateway.yml b/.github/workflows/public_gateway.yml
@@ -28,7 +28,7 @@ jobs:
           [
             {
               "identifier": "public-gateway-staging",
-              "branch": "modularize_infrastructure",
+              "branch": "develop",
               "image_tag": "staging",
               "ecs_service": "public-gateway-staging",
               "ecs_cluster": "somleng-switch-staging",

diff --git a/.github/workflows/services.yml b/.github/workflows/services.yml
@@ -61,7 +61,7 @@ jobs:
             {
               "identifier": "switch-services-staging",
               "environment": "staging",
-              "branch": "modularize_infrastructure",
+              "branch": "develop",
               "image_tag": "staging"
             },
             {

diff --git a/.github/workflows/switch.yml b/.github/workflows/switch.yml
@@ -61,7 +61,7 @@ jobs:
             {
               "identifier": "switch-staging",
               "environment": "staging",
-              "branch": "modularize_infrastructure",
+              "branch": "develop",
               "image_tag": "staging",
               "ecs_service": "switch-staging",
               "ecs_cluster": "somleng-switch-staging"

diff --git a/infrastructure/modules/services/lambda.tf b/infrastructure/modules/services/lambda.tf
@@ -45,30 +45,6 @@ resource "aws_lambda_function" "this" {
   }
 }
 
-resource "aws_lambda_permission" "this" {
-  action        = "lambda:InvokeFunction"
-  function_name = aws_lambda_function.this.arn
-  principal     = "events.amazonaws.com"
-  source_arn    = aws_cloudwatch_event_rule.this.arn
-}
-
-resource "aws_cloudwatch_event_rule" "this" {
-  name = var.identifier
-
-  event_pattern = jsonencode({
-    source      = ["aws.ecs"],
-    detail-type = ["ECS Task State Change"],
-    detail = {
-      clusterArn = [var.ecs_cluster.arn]
-    }
-  })
-}
-
-resource "aws_cloudwatch_event_target" "this" {
-  arn  = aws_lambda_function.this.arn
-  rule = aws_cloudwatch_event_rule.this.id
-}
-
 resource "aws_lambda_event_source_mapping" "sqs" {
   event_source_arn                   = aws_sqs_queue.this.arn
   function_name                      = aws_lambda_function.this.arn

diff --git a/infrastructure/modules/services/variables.tf b/infrastructure/modules/services/variables.tf
@@ -17,4 +17,3 @@ variable "sip_alternative_port" {}
 variable "public_gateway_db_name" {}
 variable "client_gateway_db_name" {}
 variable "media_proxy_ng_port" {}
-variable "ecs_cluster" {}
diff --git a/infrastructure/modules/switch/outputs.tf b/infrastructure/modules/switch/outputs.tf
@@ -109,3 +109,7 @@ output "target_group" {
 output "target_event_bus" {
   value = var.target_event_bus == null ? var.region.event_bus : var.target_event_bus
 }
+
+output "lb_rule_index" {
+  value = var.lb_rule_index
+}
diff --git a/infrastructure/production/ecs.tf b/infrastructure/production/ecs.tf
@@ -1,5 +1,5 @@
 resource "aws_ecs_cluster" "this" {
-  name = "somleng-switch"
+  name = var.ecs_cluster_name
 }
 
 resource "aws_ecs_cluster_capacity_providers" "this" {
@@ -12,3 +12,19 @@ resource "aws_ecs_cluster_capacity_providers" "this" {
     module.media_proxy.capacity_provider.name
   ]
 }
+
+resource "aws_ecs_cluster" "helium" {
+  name = var.ecs_cluster_name
+
+  provider = aws.helium
+}
+
+resource "aws_ecs_cluster_capacity_providers" "helium" {
+  cluster_name = aws_ecs_cluster.helium.name
+
+  capacity_providers = [
+    module.switch_helium.capacity_provider.name
+  ]
+
+  provider = aws.helium
+}
diff --git a/infrastructure/production/services.tf b/infrastructure/production/services.tf
@@ -23,5 +23,4 @@ module "services" {
   sip_alternative_port         = var.sip_alternative_port
   freeswitch_event_socket_port = var.freeswitch_event_socket_port
   media_proxy_ng_port          = module.media_proxy.ng_port
-  ecs_cluster                  = aws_ecs_cluster.this
 }
diff --git a/infrastructure/production/switch.tf b/infrastructure/production/switch.tf
@@ -32,6 +32,47 @@ module "switch" {
   alternative_rtp_ip                                 = data.terraform_remote_state.core_infrastructure.outputs.hydrogen_region.nat_instance.public_ip
 }
 
+module "switch_helium" {
+  source = "../modules/switch"
+
+  region                                        = data.terraform_remote_state.core_infrastructure.outputs.helium_region
+  ecs_cluster                                   = aws_ecs_cluster.helium
+  external_rtp_ip                               = data.terraform_remote_state.core_infrastructure.outputs.helium_region.vpc.nat_public_ips[0]
+  alternative_sip_outbound_ip                   = data.terraform_remote_state.core_infrastructure.outputs.helium_region.vpc.nat_public_ips[0]
+  alternative_rtp_ip                            = data.terraform_remote_state.core_infrastructure.outputs.helium_region.vpc.nat_public_ips[0]
+  identifier                                    = module.switch.identifier
+  lb_rule_index                                 = module.switch.lb_rule_index
+  app_environment                               = module.switch.app_environment
+  json_cdr_url                                  = module.switch.json_cdr_url
+  cache_name                                    = module.switch.cache_name
+  recordings_bucket                             = module.switch.recordings_bucket
+  recordings_bucket_access_key_id_parameter     = module.switch.recordings_bucket_access_key_id_parameter
+  recordings_bucket_secret_access_key_parameter = module.switch.recordings_bucket_secret_access_key_parameter
+  application_master_key_parameter              = module.switch.application_master_key_parameter
+  rayo_password_parameter                       = module.switch.rayo_password_parameter
+  freeswitch_event_socket_password_parameter    = module.switch.freeswitch_event_socket_password_parameter
+  container_instance_profile                    = module.switch.container_instances.iam_instance_profile
+  iam_task_role                                 = module.switch.iam_task_role
+  iam_task_execution_role                       = module.switch.iam_task_execution_role
+  min_tasks                                     = module.switch.min_tasks
+  max_tasks                                     = module.switch.max_tasks
+  sip_port                                      = module.switch.sip_port
+  sip_alternative_port                          = module.switch.sip_alternative_port
+  freeswitch_event_socket_port                  = module.switch.freeswitch_event_socket_port
+  json_cdr_password_parameter                   = module.switch.json_cdr_password_parameter
+  services_function                             = module.switch.services_function
+  app_image                                     = module.switch.app_image
+  nginx_image                                   = module.switch.nginx_image
+  freeswitch_image                              = module.switch.freeswitch_image
+  freeswitch_event_logger_image                 = module.switch.freeswitch_event_logger_image
+  internal_route53_zone                         = module.switch.internal_route53_zone
+  target_event_bus                              = module.switch.target_event_bus
+
+  providers = {
+    aws = aws.helium
+  }
+}
+
 resource "aws_route53_record" "switch_legacy" {
   zone_id = data.terraform_remote_state.core_infrastructure.outputs.route53_zone_internal_somleng_org_old.zone_id
   name    = "switch"

diff --git a/infrastructure/production/variables.tf b/infrastructure/production/variables.tf
@@ -10,6 +10,10 @@ variable "app_environment" {
   default = "production"
 }
 
+variable "ecs_cluster_name" {
+  default = "somleng-switch"
+}
+
 variable "switch_identifier" {
   default = "switch"
 }

diff --git a/infrastructure/staging/ecs.tf b/infrastructure/staging/ecs.tf
@@ -20,7 +20,7 @@ resource "aws_ecs_cluster" "helium" {
 }
 
 resource "aws_ecs_cluster_capacity_providers" "helium" {
-  cluster_name = aws_ecs_cluster.this.name
+  cluster_name = aws_ecs_cluster.helium.name
 
   capacity_providers = [
     module.switch_helium.capacity_provider.name

diff --git a/infrastructure/staging/services.tf b/infrastructure/staging/services.tf
@@ -23,5 +23,4 @@ module "services" {
   sip_alternative_port         = var.sip_alternative_port
   freeswitch_event_socket_port = var.freeswitch_event_socket_port
   media_proxy_ng_port          = module.media_proxy.ng_port
-  ecs_cluster                  = aws_ecs_cluster.this
 }
diff --git a/infrastructure/staging/switch.tf b/infrastructure/staging/switch.tf
@@ -36,13 +36,13 @@ module "switch" {
 module "switch_helium" {
   source = "../modules/switch"
 
-  lb_rule_index                                 = 121
   region                                        = data.terraform_remote_state.core_infrastructure.outputs.helium_region
   ecs_cluster                                   = aws_ecs_cluster.helium
   external_rtp_ip                               = data.terraform_remote_state.core_infrastructure.outputs.helium_region.vpc.nat_public_ips[0]
   alternative_sip_outbound_ip                   = data.terraform_remote_state.core_infrastructure.outputs.helium_region.vpc.nat_public_ips[0]
   alternative_rtp_ip                            = data.terraform_remote_state.core_infrastructure.outputs.helium_region.vpc.nat_public_ips[0]
   identifier                                    = module.switch.identifier
+  lb_rule_index                                 = module.switch.lb_rule_index
   app_environment                               = module.switch.app_environment
   json_cdr_url                                  = module.switch.json_cdr_url
   cache_name                                    = module.switch.cache_name