add missing VAULT_APPLICATION variable

thewca · Oct 18, 2023 · 006f149 · 006f149
1 parent cedada6
commit 006f149
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 7 deletions.
diff --git a/env_config.rb b/env_config.rb
@@ -11,6 +11,7 @@
     mandatory :QUEUE_URL, :string
     mandatory :WCA_HOST, :string
     mandatory :REDIS_URL, :string
+    mandatory :VAULT_APPLICATION, :string
   else
     mandatory :LOCALSTACK_ENDPOINT, :string
     # Have to be the same as in localstack to simulate authentication

diff --git a/infra/handler/main.tf b/infra/handler/main.tf
@@ -20,9 +20,13 @@ locals {
       name = "VAULT_ADDR"
       value = var.vault_address
     },
+    {
+      name = "VAULT_APPLICATION",
+      value = "wca-registration-production"
+    },
     {
       name = "REGISTRATION_LIVE_SITE",
-      value = true
+      value = "true"
     },
     {
       name = "TASK_ROLE"
@@ -152,9 +156,9 @@ resource "aws_ecs_task_definition" "this" {
       logConfiguration = {
         logDriver = "awslogs"
         options = {
-          awslogs-group         = "${aws_cloudwatch_log_group.this.name}"
-          awslogs-region        = "${var.region}"
-          awslogs-stream-prefix = "${var.name_prefix}"
+          awslogs-group         = aws_cloudwatch_log_group.this.name
+          awslogs-region        = var.region
+          awslogs-stream-prefix = var.name_prefix
         }
       }
       environment = local.app_environment

diff --git a/infra/staging/main.tf b/infra/staging/main.tf
@@ -32,7 +32,11 @@ locals {
     },
     {
       name = "REGISTRATION_LIVE_SITE",
-      value = false
+      value = "false"
+    },
+    {
+      name = "VAULT_APPLICATION",
+      value = "wca-registration-staging"
     },
     {
       name = "HOST",

diff --git a/infra/staging/variables.tf b/infra/staging/variables.tf
@@ -5,7 +5,7 @@ variable "env" {
 }
 
 variable "host" {
-  type = string,
+  type = string
   description = "The address of the service"
   default = "staging.registration.worldcubeassociation.org"
 }

diff --git a/infra/worker/lambda.tf b/infra/worker/lambda.tf
@@ -52,7 +52,7 @@ data "aws_iam_policy_document" "lambda_policy" {
       "dynamodb:DeleteItem",
       "dynamodb:DescribeTable",
     ]
-    resources = [var.shared_resources.dynamo_registration_table, "${var.shared_resources.dynamo_registration_table}/*"]
+    resources = [var.shared_resources.dynamo_registration_table.arn, "${var.shared_resources.dynamo_registration_table.arn}/*"]
   }
   statement {
     effect = "Allow"