Merge pull request #753 from trade-tariff/bau-fix-deploys

BAU: Fix issue with deployment
trade-tariff · Jan 18, 2024 · 9ca0594 · 9ca0594
2 parents ed52733 + 8265a31
commit 9ca0594
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 13 deletions.
diff --git 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
@@ -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
@@ -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"