introduce zenpy netloc environment variable for replacing zendesk

uktrade · Sep 20, 2023 · 05b3bba · 05b3bba
1 parent d606f88
commit 05b3bba
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 0 deletions.
diff --git a/dataworkspace/dataworkspace/settings/base.py b/dataworkspace/dataworkspace/settings/base.py
@@ -307,6 +307,7 @@ def aws_fargate_private_ip():
 ZENDESK_SERVICE_FIELD_ID = env["ZENDESK_SERVICE_FIELD_ID"]
 ZENDESK_SERVICE_FIELD_VALUE = env["ZENDESK_SERVICE_FIELD_VALUE"]
 
+ZENPY_FORCE_NETLOC = env["ZENPY_FORCE_NETLOC"]
 
 NOTIFY_API_KEY = env["NOTIFY_API_KEY"]
 FERNET_EMAIL_TOKEN_KEY = env["FERNET_EMAIL_TOKEN_KEY"]

diff --git a/infra/ecs_main_admin.tf b/infra/ecs_main_admin.tf
@@ -71,6 +71,7 @@ locals {
     zendesk_token = "${var.zendesk_token}"
     zendesk_service_field_id = "${var.zendesk_service_field_id}"
     zendesk_service_field_value = "${var.zendesk_service_field_value}"
+    zenpy_force_netloc = "${var.zenpy_force_netloc}"
 
     prometheus_domain = "${var.prometheus_domain}"
     metrics_service_discovery_basic_auth_user = "${var.metrics_service_discovery_basic_auth_user}"

diff --git a/infra/ecs_main_admin_container_definitions.json b/infra/ecs_main_admin_container_definitions.json
@@ -936,6 +936,10 @@
       "name": "ZENDESK_SERVICE_FIELD_VALUE",
       "value": "${zendesk_service_field_value}"
     },
+    {
+      "name": "ZENPY_FORCE_NETLOC",
+      "value": "${zenpy_force_netloc}"
+    },
     {
       "name": "QUICKSIGHT_NAMESPACE",
       "value": "${quicksight_namespace}"

diff --git a/infra/environment-template/main.tf b/infra/environment-template/main.tf
@@ -105,6 +105,7 @@ module "jupyterhub" {
   zendesk_token               = "REPLACE_ME"
   zendesk_service_field_id    = "REPLACE_ME"
   zendesk_service_field_value = "REPLACE_ME"
+  zenpy_force_netloc          = "REPLACE_ME"
 
   prometheus_whitelist = []
   metrics_service_discovery_basic_auth_user     = "REPLACE_ME"

diff --git a/infra/main.tf b/infra/main.tf
@@ -83,6 +83,7 @@ variable zendesk_subdomain {}
 variable zendesk_token {}
 variable zendesk_service_field_id {}
 variable zendesk_service_field_value {}
+variable zenpy_force_netloc {}
 
 variable prometheus_whitelist {
   type = list