Add environment variables to serverless and terraform

cisagov · Nov 6, 2023 · 5f80360 · 5f80360
1 parent 3b05728
commit 5f80360
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 2 deletions.
diff --git a/backend/env.yml b/backend/env.yml
@@ -44,6 +44,9 @@ staging:
   CLOUDWATCH_BUCKET_NAME: cisa-crossfeed-staging-cloudwatch
   SQS_QUEUE_URL: { Ref: WorkerQueue }
   STAGE: staging
+  PE_CLUSTER_NAME: pe-staging-worker
+  SHODAN_QUEUE_URL: ${ssm:/crossfeed/staging/SHODAN_QUEUE_URL}
+  SHODAN_SERVICE_NAME: pe-staging-shodan
 
 prod:
   DB_DIALECT: 'postgres'
@@ -82,6 +85,9 @@ prod:
   CLOUDWATCH_BUCKET_NAME: cisa-crossfeed-prod-cloudwatch
   SQS_QUEUE_URL: { Ref: WorkerQueue }
   STAGE: prod
+  PE_CLUSTER_NAME: pe-prod-worker
+  SHODAN_QUEUE_URL: ${ssm:/crossfeed/prod/SHODAN_QUEUE_URL}
+  SHODAN_SERVICE_NAME: pe-prod-shodan
 
 dev-vpc:
   securityGroupIds:

diff --git a/backend/src/tasks/scanExecution.ts b/backend/src/tasks/scanExecution.ts
@@ -8,7 +8,7 @@ const sqs = new AWS.SQS();
 export const handler: Handler = async (event) => {
   try {
     let desiredCount;
-    const clusterName = process.env.FARGATE_CLUSTER_NAME!;
+    const clusterName = process.env.PE_CLUSTER_NAME!;
 
     // Get the Control SQS record and message body
     const sqsRecord: SQSRecord = event.Records[0];

diff --git a/infrastructure/pe_worker.tf b/infrastructure/pe_worker.tf
@@ -147,7 +147,7 @@ resource "aws_ecs_task_definition" "pe_worker" {
       },
       {
         "name": "SHODAN_QUEUE_URL",
-        "valueFrom": "${aws_ssm_parameter.shodan_queue_url.arn}"
+        "valueFrom": "${data.aws_ssm_parameter.shodan_queue_url.arn}"
       }
     ]
   }

diff --git a/infrastructure/prod.tfvars b/infrastructure/prod.tfvars
@@ -34,6 +34,7 @@ ssm_sixgill_client_id                = "/crossfeed/prod/SIXGILL_CLIENT_ID"
 ssm_sixgill_client_secret            = "/crossfeed/prod/SIXGILL_CLIENT_SECRET"
 ssm_lg_api_key                       = "/crossfeed/prod/LG_API_KEY"
 ssm_lg_workspace_name                = "/crossfeed/prod/LG_WORKSPACE_NAME"
+ssm_shodan_queue_url                 = "/crossfeed/prod/SHODAN_QUEUE_URL"
 cloudfront_name                      = "Crossfeed Prod Frontend"
 db_group_name                        = "crossfeed-prod-db-group"
 worker_ecs_repository_name           = "crossfeed-prod-worker"

diff --git a/infrastructure/stage.tfvars b/infrastructure/stage.tfvars
@@ -34,6 +34,7 @@ ssm_sixgill_client_id                = "/crossfeed/staging/SIXGILL_CLIENT_ID"
 ssm_sixgill_client_secret            = "/crossfeed/staging/SIXGILL_CLIENT_SECRET"
 ssm_lg_api_key                       = "/crossfeed/staging/LG_API_KEY"
 ssm_lg_workspace_name                = "/crossfeed/staging/LG_WORKSPACE_NAME"
+ssm_shodan_queue_url                 = "/crossfeed/staging/SHODAN_QUEUE_URL"
 cloudfront_name                      = "Crossfeed Staging Frontend"
 db_group_name                        = "crossfeed-staging-db-group"
 worker_ecs_repository_name           = "crossfeed-staging-worker"

diff --git a/infrastructure/vars.tf b/infrastructure/vars.tf
@@ -232,6 +232,12 @@ variable "ssm_lg_workspace_name" {
   default     = "/crossfeed/staging/LG_WORKSPACE_NAME"
 }
 
+variable "ssm_shodan_queue_url" {
+  description = "ssm_shodan_queue_url"
+  type        = string
+  default     = "/crossfeed/staging/SHODAN_QUEUE_URL"
+}
+
 variable "cloudfront_name" {
   description = "cloudfront_name"
   type        = string

diff --git a/infrastructure/worker.tf b/infrastructure/worker.tf
@@ -84,6 +84,7 @@ resource "aws_iam_role_policy" "worker_task_execution_role_policy" {
           "${data.aws_ssm_parameter.sixgill_client_secret.arn}",
           "${data.aws_ssm_parameter.lg_api_key.arn}",
           "${data.aws_ssm_parameter.lg_workspace_name.arn}",
+          "${data.aws_ssm_parameter.shodan_queue_url.arn}",
           "${aws_ssm_parameter.es_endpoint.arn}"
         ]
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -147,7 +147,7 @@ resource "aws_ecs_task_definition" "pe_worker" { @@
           },
           {
             "name": "SHODAN_QUEUE_URL",
-            "valueFrom": "${aws_ssm_parameter.shodan_queue_url.arn}"
+            "valueFrom": "${data.aws_ssm_parameter.shodan_queue_url.arn}"
           }
         ]
       }
@@ Expand Down @@