Only pass through the redirector headers when using the redirector service

Author: mcasperson

domain/url/build_url.py

@@ -2,6 +2,7 @@
 from urllib.parse import urlparse, urlencode, urlunsplit
 
 from domain.validation.argument_validation import ensure_string_not_empty
+from infrastructure.octopus import get_octopus_headers
 
 
 def build_unredirected_url(base_url, path, query=None):
@@ -28,7 +29,7 @@ def build_unredirected_url(base_url, path, query=None):
     return urlunsplit((parsed.scheme, parsed.netloc, path, query, ""))
 
 
-def build_url(base_url, path, query=None):
+def build_url(base_url, api_key, path, query=None):
     """
     Create a URL from the Octopus URL, additional path, and query params
     :param base_url: The Octopus URL
@@ -52,11 +53,24 @@ def build_url(base_url, path, query=None):
         os.environ.get("DISABLE_REDIRECTION", "false").lower() == "true"
     )
 
+    headers = get_octopus_headers(api_key) if api_key else {}
+
+    redirector_headers = {
+        "X_REDIRECTION_SERVICE_API_KEY": os.environ.get(
+            "REDIRECTION_SERVICE_APIKEY", "Unknown"
+        ),
+        "X_REDIRECTION_UPSTREAM_HOST": parsed.hostname,
+    }
+
     if disable_redirector or is_octopus_cloud_local_or_example(parsed):
-        return urlunsplit((parsed.scheme, parsed.netloc, path, query, ""))
+        return urlunsplit((parsed.scheme, parsed.netloc, path, query, "")), headers
 
     # For everyone else, we have to route requests through the redirection service
-    return urlunsplit(("https", os.environ.get("REDIRECTION_HOST"), path, query, ""))
+    headers.update(redirector_headers)
+    return (
+        urlunsplit(("https", os.environ.get("REDIRECTION_HOST"), path, query, "")),
+        headers,
+    )
 
 
 def is_octopus_cloud_local_or_example(url):