From ac983a97abb6c7ca6d90ba80c5bf1a7368a8d13b Mon Sep 17 00:00:00 2001 From: Luke Heath Date: Mon, 3 Apr 2023 14:12:16 -0500 Subject: [PATCH] Update the sentry environment variable name (#10943) --- .github/workflows/dogfood-deploy.yml | 2 +- infrastructure/dogfood/terraform/aws-tf-module/main.tf | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/dogfood-deploy.yml b/.github/workflows/dogfood-deploy.yml index 0e20f801ed..6c5e87568f 100644 --- a/.github/workflows/dogfood-deploy.yml +++ b/.github/workflows/dogfood-deploy.yml @@ -27,7 +27,7 @@ env: TF_VAR_fleet_image: ${{ github.event.inputs.DOCKER_IMAGE || 'fleetdm/fleet:main' }} TF_VAR_fleet_license: ${{ secrets.DOGFOOD_LICENSE_KEY }} TF_VAR_slack_webhook: ${{ secrets.SLACK_G_HELP_P1_WEBHOOK_URL }} - TF_VAR_sentry_dsn: ${{ secrets.DOGFOOD_SENTRY_DSN }} + TF_VAR_fleet_sentry_dsn: ${{ secrets.DOGFOOD_SENTRY_DSN }} permissions: id-token: write diff --git a/infrastructure/dogfood/terraform/aws-tf-module/main.tf b/infrastructure/dogfood/terraform/aws-tf-module/main.tf index d979157638..a77a400465 100644 --- a/infrastructure/dogfood/terraform/aws-tf-module/main.tf +++ b/infrastructure/dogfood/terraform/aws-tf-module/main.tf @@ -28,7 +28,7 @@ variable "fleet_license" {} variable "fleet_image" { default = "160035666661.dkr.ecr.us-east-2.amazonaws.com/fleet:1f68e7a5e39339d763da26a0c8ae3e459b2e1f016538d7962312310493381f7c" } -variable "sentry_dsn" { +variable "fleet_sentry_dsn" { } data "aws_caller_identity" "current" {} @@ -45,7 +45,7 @@ locals { FLEET_OSQUERY_ENABLE_ASYNC_HOST_PROCESSING = "false" } sentry_secrets = { - SENTRY_DSN = "${aws_secretsmanager_secret.sentry.arn}:SENTRY_DSN::" + FLEET_SENTRY_DSN = "${aws_secretsmanager_secret.sentry.arn}:FLEET_SENTRY_DSN::" } } @@ -153,7 +153,7 @@ resource "aws_secretsmanager_secret" "sentry" { resource "aws_secretsmanager_secret_version" "sentry" { secret_id = aws_secretsmanager_secret.sentry.id secret_string = jsonencode({ - SENTRY_DSN = var.sentry_dsn + FLEET_SENTRY_DSN = var.fleet_sentry_dsn }) }