Revert infrastructure changes

somleng · Sep 24, 2024 · 0ad2047 · 0ad2047
1 parent 19ccfdc
commit 0ad2047
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 28 deletions.
diff --git a/infrastructure/modules/public_gateway/health_checks.tf b/infrastructure/modules/public_gateway/health_checks.tf
diff --git a/infrastructure/modules/public_gateway/variables.tf b/infrastructure/modules/public_gateway/variables.tf
@@ -15,7 +15,6 @@ variable "db_host" {}
 variable "db_port" {}
 variable "global_accelerator" {}
 variable "logs_bucket" {}
-variable "services_function" {}
 
 variable "opensips_fifo_name" {
   default = "/var/opensips/opensips_fifo"

diff --git a/infrastructure/modules/services/iam.tf b/infrastructure/modules/services/iam.tf
@@ -51,11 +51,7 @@ resource "aws_iam_policy" "custom_policy" {
       {
         Action = [
           "ec2:DescribeInstances",
-          "ecs:DescribeContainerInstances",
-          "ecs:ListClusters",
-          "ecs:ListTasks",
-          "ecs:DescribeTasks",
-          "ecs:StopTask"
+          "ecs:DescribeContainerInstances"
         ]
         Effect = "Allow"
         Resource = [

diff --git a/infrastructure/modules/services/lambda.tf b/infrastructure/modules/services/lambda.tf
@@ -14,8 +14,6 @@ resource "aws_lambda_function" "this" {
 
   environment {
     variables = {
-      PUBLIC_GATEWAY_LOG_GROUP                    = var.public_gateway_group
-      CLIENT_GATEWAY_LOG_GROUP                    = var.client_gateway_group
       SWITCH_GROUP                                = "service:${var.switch_group}"
       MEDIA_PROXY_GROUP                           = "service:${var.media_proxy_group}"
       CLIENT_GATEWAY_GROUP                        = "service:${var.client_gateway_group}"

diff --git a/infrastructure/modules/services/variables.tf b/infrastructure/modules/services/variables.tf
@@ -4,7 +4,6 @@ variable "app_image" {}
 variable "vpc" {}
 variable "switch_group" {}
 variable "media_proxy_group" {}
-variable "public_gateway_group" {}
 variable "client_gateway_group" {}
 variable "db_password_parameter" {}
 variable "freeswitch_event_socket_password_parameter" {}

diff --git a/infrastructure/staging/public_gateway.tf b/infrastructure/staging/public_gateway.tf
@@ -9,9 +9,8 @@ module "public_gateway" {
 
   ecs_cluster = aws_ecs_cluster.this
 
-  app_image         = data.terraform_remote_state.core.outputs.public_gateway_ecr_repository.this.repository_url
-  scheduler_image   = data.terraform_remote_state.core.outputs.gateway_scheduler_ecr_repository.this.repository_url
-  services_function = module.services
+  app_image       = data.terraform_remote_state.core.outputs.public_gateway_ecr_repository.this.repository_url
+  scheduler_image = data.terraform_remote_state.core.outputs.gateway_scheduler_ecr_repository.this.repository_url
 
   min_tasks = 0
   max_tasks = 2

diff --git a/infrastructure/staging/services.tf b/infrastructure/staging/services.tf
@@ -5,7 +5,6 @@ module "services" {
   app_environment        = var.app_environment
   switch_group           = var.switch_identifier
   media_proxy_group      = var.media_proxy_identifier
-  public_gateway_group   = var.public_gateway_identifier
   client_gateway_group   = var.client_gateway_identifier
   public_gateway_db_name = var.public_gateway_db_name
   client_gateway_db_name = var.client_gateway_db_name