remove features api

NASA-IMPACT · Dec 15, 2023 · 9af5df1 · 9af5df1
1 parent 4e1bdcc
commit 9af5df1
Show file tree

Hide file tree

Showing 6 changed files with 54 additions and 59 deletions.
diff --git a/infrastructure/custom_policies/main.tf b/infrastructure/custom_policies/main.tf
@@ -59,7 +59,7 @@ data "aws_iam_policy_document" "mwaa_executor_policies" {
     ]
     resources = [
       "arn:aws:secretsmanager:${var.region}:${var.account_id}:secret:${var.cognito_app_secret}-??????",
-      "arn:aws:secretsmanager:${var.region}:${var.account_id}:secret:${var.vector_secret_name}-??????"
+      # "arn:aws:secretsmanager:${var.region}:${var.account_id}:secret:${var.vector_secret_name}-??????"
     ]
   }
 

diff --git a/infrastructure/custom_policies/variables.tf b/infrastructure/custom_policies/variables.tf
@@ -15,6 +15,6 @@ variable "assume_role_arns" {
 variable "cognito_app_secret" {
   type = string
 }
-variable "vector_secret_name" {
-  type = string
-}
+# variable "vector_secret_name" {
+#   type = string
+# }
diff --git a/infrastructure/main.tf b/infrastructure/main.tf
@@ -24,12 +24,12 @@ module "mwaa" {
       ecs_container_folder_path = "${path.module}/../docker_tasks/cogify_transfer"
       ecr_repo_name             = "${var.prefix}-veda-cogify_transfer"
     },
-    {
-      handler_file_path         = "${path.module}/../docker_tasks/vector_ingest/handler.py"
-      docker_file_path          = "${path.module}/../docker_tasks/vector_ingest/Dockerfile"
-      ecs_container_folder_path = "${path.module}/../docker_tasks/vector_ingest"
-      ecr_repo_name             = "${var.prefix}-veda-vector_ingest"
-    }
+    # {
+    #   handler_file_path         = "${path.module}/../docker_tasks/vector_ingest/handler.py"
+    #   docker_file_path          = "${path.module}/../docker_tasks/vector_ingest/Dockerfile"
+    #   ecs_container_folder_path = "${path.module}/../docker_tasks/vector_ingest"
+    #   ecr_repo_name             = "${var.prefix}-veda-vector_ingest"
+    # }
   ]
 }
 
@@ -42,7 +42,7 @@ module "custom_policy" {
   assume_role_arns   = var.assume_role_arns
   region             = local.aws_region
   cognito_app_secret = var.cognito_app_secret
-  vector_secret_name = var.vector_secret_name
+  # vector_secret_name = var.vector_secret_name
 }
 
 
@@ -97,11 +97,11 @@ resource "local_file" "mwaa_variables" {
       stac_ingestor_api_url   = var.stac_ingestor_api_url
       assume_role_read_arn    = var.assume_role_arns[0]
       assume_role_write_arn   = var.assume_role_arns[1]
-      vector_secret_name      = var.vector_secret_name
-      vector_subnet_1         = data.aws_subnets.private.ids[0]
-      vector_subnet_2         = data.aws_subnets.private.ids[1]
-      vector_security_group   = aws_security_group.vector_sg.id
-      vector_vpc              = var.vector_vpc
+      # vector_secret_name      = var.vector_secret_name
+      # vector_subnet_1         = data.aws_subnets.private.ids[0]
+      # vector_subnet_2         = data.aws_subnets.private.ids[1]
+      # vector_security_group   = aws_security_group.vector_sg.id
+      # vector_vpc              = var.vector_vpc
   })
   filename = "/tmp/mwaa_vars.json"
 }
diff --git a/infrastructure/mwaa_environment_variables.tpl b/infrastructure/mwaa_environment_variables.tpl
@@ -14,10 +14,5 @@
     "ASSUME_ROLE_READ_ARN": "${assume_role_read_arn}",
     "ASSUME_ROLE_WRITE_ARN": "${assume_role_write_arn}",
     "COGNITO_APP_SECRET": "${cognito_app_secret}",
-    "STAC_INGESTOR_API_URL": "${stac_ingestor_api_url}",
-    "VECTOR_SECRET_NAME": "${vector_secret_name}",
-    "VECTOR_ECS_CONF":{
-        "VECTOR_SECURITY_GROUP": ["${vector_security_group}"],
-        "VECTOR_SUBNETS": ["${vector_subnet_1}", "${vector_subnet_2}"]
-    }
+    "STAC_INGESTOR_API_URL": "${stac_ingestor_api_url}"
 }
diff --git a/infrastructure/task_definition.tf b/infrastructure/task_definition.tf
@@ -28,31 +28,31 @@ resource "aws_ecs_task_definition" "veda_task_definition" {
 }
 
 
-resource "aws_ecs_task_definition" "veda_vector_task_definition" {
-
-
-  container_definitions = jsonencode([
-
-    {
-      name      = "${var.prefix}-veda-vector_ingest"
-      image     = "${local.account_id}.dkr.ecr.${local.aws_region}.amazonaws.com/${var.prefix}-veda-vector_ingest"
-      essential = true,
-      logConfiguration = {
-        "logDriver" : "awslogs",
-        "options" : {
-          "awslogs-group" : module.mwaa.log_group_name,
-          "awslogs-region" : local.aws_region,
-          "awslogs-stream-prefix" : "ecs"
-        }
-      }
-    }
-
-  ])
-  family                   = "${var.prefix}-vector-tasks"
-  requires_compatibilities = ["FARGATE"]
-  network_mode             = "awsvpc"
-  execution_role_arn       = module.mwaa.mwaa_role_arn
-  task_role_arn            = module.mwaa.mwaa_role_arn
-  cpu                      = 2048
-  memory                   = 4096
-}
+# resource "aws_ecs_task_definition" "veda_vector_task_definition" {
+
+
+#   container_definitions = jsonencode([
+
+#     {
+#       name      = "${var.prefix}-veda-vector_ingest"
+#       image     = "${local.account_id}.dkr.ecr.${local.aws_region}.amazonaws.com/${var.prefix}-veda-vector_ingest"
+#       essential = true,
+#       logConfiguration = {
+#         "logDriver" : "awslogs",
+#         "options" : {
+#           "awslogs-group" : module.mwaa.log_group_name,
+#           "awslogs-region" : local.aws_region,
+#           "awslogs-stream-prefix" : "ecs"
+#         }
+#       }
+#     }
+
+#   ])
+#   family                   = "${var.prefix}-vector-tasks"
+#   requires_compatibilities = ["FARGATE"]
+#   network_mode             = "awsvpc"
+#   execution_role_arn       = module.mwaa.mwaa_role_arn
+#   task_role_arn            = module.mwaa.mwaa_role_arn
+#   cpu                      = 2048
+#   memory                   = 4096
+# }
diff --git a/infrastructure/variables.tf b/infrastructure/variables.tf
@@ -48,13 +48,13 @@ variable "min_workers" {
     production = 3
   }
 }
-variable "vector_secret_name" {
-  type = string
-}
-variable "vector_security_group" {
-  type = string
-}
-variable "vector_vpc" {
-  type = string
-}
+# variable "vector_secret_name" {
+#   type = string
+# }
+# variable "vector_security_group" {
+#   type = string
+# }
+# variable "vector_vpc" {
+#   type = string
+# }