Create the queue in Serverless instead of terraform

cisagov · Oct 4, 2023 · 3f3316a · 3f3316a
1 parent 6df8f35
commit 3f3316a
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 41 deletions.
diff --git a/backend/env.yml b/backend/env.yml
@@ -41,7 +41,6 @@ staging:
   EXPORT_BUCKET_NAME: cisa-crossfeed-staging-exports
   PE_API_URL: ${ssm:/crossfeed/staging/PE_API_URL}
   REPORTS_BUCKET_NAME: cisa-crossfeed-staging-reports
-  SQS_QUEUE_ARN: ${ssm:/crossfeed/staging/SQS_QUEUE_ARN}
   CLOUDWATCH_BUCKET_NAME: cisa-crossfeed-staging-cloudwatch
 
 prod:
@@ -78,7 +77,6 @@ prod:
   EXPORT_BUCKET_NAME: cisa-crossfeed-prod-exports
   PE_API_URL: ${ssm:/crossfeed/staging/PE_API_URL}
   REPORTS_BUCKET_NAME: cisa-crossfeed-prod-reports
-  SQS_QUEUE_ARN: ${ssm:/crossfeed/prod/SQS_QUEUE_ARN}
   CLOUDWATCH_BUCKET_NAME: cisa-crossfeed-prod-cloudwatch
 
 dev-vpc:

diff --git a/backend/serverless.yml b/backend/serverless.yml
@@ -79,6 +79,13 @@ provider:
             - logs:StopLiveTail
           Resource: '*'
 
+resources:
+  Resources:
+    MySQSQueue:
+      Type: AWS::SQS::Queue
+      Properties:
+        QueueName: ${self:provider.stage}-worker-queue
+
 functions:
   - ${file(./src/tasks/functions.yml)}
   - ${file(./src/api/functions.yml)}

diff --git a/backend/src/tasks/functions.yml b/backend/src/tasks/functions.yml
@@ -35,7 +35,9 @@ scanExecution:
   events:
     - sqs:
         arn:
-          Fn::ImportValue: ${file(env.yml):${self:provider.stage}.SQS_QUEUE_ARN, ''}
+          Fn::GetAtt:
+            - ${self:provider.stage}-worker-queue
+            - Arn
         batchSize: 5 # Number of messages the lambda can continue to process while a Fargate is still running
 
 updateScanTaskStatus:

diff --git a/infrastructure/prod.tfvars b/infrastructure/prod.tfvars
@@ -70,5 +70,3 @@ create_db_accessor_instance       = true
 db_accessor_instance_class        = "t3.2xlarge"
 create_elk_instance               = false
 elk_instance_class                = "t3.2xlarge"
-sqs_queue_name                    = "crossfeed-prod-worker-queue"
-ssm_sqs_queue_arn                 = "/crossfeed/prod/SQS_QUEUE_ARN"
diff --git a/infrastructure/sqs.tf b/infrastructure/sqs.tf
diff --git a/infrastructure/stage.tfvars b/infrastructure/stage.tfvars
@@ -70,5 +70,3 @@ create_db_accessor_instance       = true
 db_accessor_instance_class        = "t3.2xlarge"
 create_elk_instance               = true
 elk_instance_class                = "t3.2xlarge"
-sqs_queue_name                    = "crossfeed-staging-worker-queue"
-ssm_sqs_queue_arn                 = "/crossfeed/staging/SQS_QUEUE_ARN"
diff --git a/infrastructure/vars.tf b/infrastructure/vars.tf
@@ -117,12 +117,6 @@ variable "ssm_worker_subnet" {
   default     = "/crossfeed/staging/WORKER_SUBNET_ID"
 }
 
-variable "ssm_sqs_queue_arn" {
-  description = "ssm_sqs_queue_arn"
-  type        = string
-  default     = "/crossfeed/staging/SQS_QUEUE_ARN"
-}
-
 variable "ssm_worker_arn" {
   description = "ssm_worker_arn"
   type        = string
@@ -435,10 +429,3 @@ variable "create_elk_instance" {
   type        = bool
   default     = false
 }
-
-variable "sqs_queue_name" {
-  description = "sqs_queue_name"
-  type        = string
-  default     = "crossfeed-staging-worker-queue"
-}
-