From 8265a31c5e2100b45e1cb46073fc05f88e1d59c0 Mon Sep 17 00:00:00 2001 From: Amber Cronin Date: Thu, 18 Jan 2024 14:11:06 +0000 Subject: [PATCH] BAU: Fix issue with deployment --- .pre-commit-config.yaml | 2 +- terraform/locals.tf | 1 + terraform/main.tf | 16 ++++------------ 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 9ff71efb..b6d8f95c 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -8,7 +8,7 @@ files: | repos: - repo: https://github.com/antonbabenko/pre-commit-terraform - rev: v1.83.5 + rev: v1.86.0 hooks: - id: terraform_fmt - id: terraform_validate diff --git a/terraform/locals.tf b/terraform/locals.tf index f4d833d0..7fc124c9 100644 --- a/terraform/locals.tf +++ b/terraform/locals.tf @@ -4,4 +4,5 @@ locals { uk = "http://backend-uk.tariff.internal:8080" xi = "http://backend-xi.tariff.internal:8080" } + govuk_app_domain = var.environment != "production" ? var.environment == "development" ? "tariff-duty-calculator-dev" : "tariff-duty-calculator-staging" : "tariff-duty-calculator" } diff --git a/terraform/main.tf b/terraform/main.tf index c85996ea..407714f3 100644 --- a/terraform/main.tf +++ b/terraform/main.tf @@ -42,20 +42,12 @@ module "service" { value = "true" }, { - name = "NEW_RELIC_APP_NAME" - value = "tariff-${local.service}-${var.environment}" + name = "GOVUK_APP_DOMAIN" + value = "${local.govuk_app_domain}.london.cloudapps.digital" }, { - name = "NEW_RELIC_ENV" - value = var.environment - }, - { - name = "NEW_RELIG_LOG" - value = "stdout" - }, - { - name = "NEW_RELIC_DISTRIBUTED_TRACING" - value = "false" + name = "GOVUK_WEBSITE_ROOT" + value = "https://www.gov.uk" }, { name = "RAILS_ENV"