From 408fbe4f76aa0dba5508bd636b5253e378c28f94 Mon Sep 17 00:00:00 2001
From: Matt Moyer <moyerm@vmware.com>
Date: Thu, 3 Dec 2020 12:45:56 -0600
Subject: [PATCH] Parameterize the `supervisor_redirect_uri` in the test env
 Dex.

Signed-off-by: Matt Moyer <moyerm@vmware.com>
---
 hack/lib/tilt/Tiltfile                | 5 ++++-
 hack/prepare-for-integration-tests.sh | 4 ++++
 test/deploy/dex/dex.yaml              | 2 +-
 test/deploy/dex/values.yaml           | 2 ++
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/hack/lib/tilt/Tiltfile b/hack/lib/tilt/Tiltfile
index 0c176e2c..675b61a5 100644
--- a/hack/lib/tilt/Tiltfile
+++ b/hack/lib/tilt/Tiltfile
@@ -23,7 +23,10 @@ local_resource(
 #
 
 # Render the IDP installation manifest using ytt.
-k8s_yaml(local(['ytt','--file', '../../../test/deploy/dex']))
+k8s_yaml(local(['ytt',
+    '--file', '../../../test/deploy/dex',
+    '--data-value', 'supervisor_redirect_uri=https://pinniped-supervisor-clusterip.supervisor.svc.cluster.local/some/path/callback',
+]))
 # Tell tilt to watch all of those files for changes.
 watch_file('../../../test/deploy/dex')
 
diff --git a/hack/prepare-for-integration-tests.sh b/hack/prepare-for-integration-tests.sh
index 97bdcceb..4634330c 100755
--- a/hack/prepare-for-integration-tests.sh
+++ b/hack/prepare-for-integration-tests.sh
@@ -184,6 +184,10 @@ if ! tilt_mode; then
 
   log_note "Deploying Dex to the cluster..."
   ytt --file . >"$manifest"
+  ytt --file . \
+    --data-value "supervisor_redirect_uri=https://pinniped-supervisor-clusterip.supervisor.svc.cluster.local/some/path/callback" \
+    >"$manifest"
+
   kubectl apply --dry-run=client -f "$manifest" # Validate manifest schema.
   kapp deploy --yes --app dex --diff-changes --file "$manifest"
 
diff --git a/test/deploy/dex/dex.yaml b/test/deploy/dex/dex.yaml
index 6a5ecfec..cee9f382 100644
--- a/test/deploy/dex/dex.yaml
+++ b/test/deploy/dex/dex.yaml
@@ -28,7 +28,7 @@ staticClients:
   name: 'Pinniped Supervisor'
   secret: pinniped-supervisor-secret
   redirectURIs:
-  - https://pinniped-supervisor-clusterip.supervisor.svc.cluster.local/some/path/callback
+  - #@ data.values.supervisor_redirect_uri
 enablePasswordDB: true
 staticPasswords:
 - username: "pinny"
diff --git a/test/deploy/dex/values.yaml b/test/deploy/dex/values.yaml
index 27022cdb..8bb90da5 100644
--- a/test/deploy/dex/values.yaml
+++ b/test/deploy/dex/values.yaml
@@ -15,3 +15,5 @@ ports:
   #! External port where the proxy ends up exposed on localhost during tests. This value comes from
   #! our Kind configuration which maps 127.0.0.1:12346 to port 31235 on the Kind worker node.
   local: 12346
+
+supervisor_redirect_uri: ""
\ No newline at end of file