From 30e308232db134a880a12ec5cea2333c38b65684 Mon Sep 17 00:00:00 2001
From: MarkCalvert <37602611+MarkCalvert@users.noreply.github.com>
Date: Thu, 12 Oct 2023 16:38:27 +1300
Subject: [PATCH] Set default env variable values for E2E Estuary

---
 scripts/trigger-e2e.sh | 32 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/scripts/trigger-e2e.sh b/scripts/trigger-e2e.sh
index e2705a549..c5db57a66 100644
--- a/scripts/trigger-e2e.sh
+++ b/scripts/trigger-e2e.sh
@@ -45,20 +45,18 @@ else
     }'
 fi
 
-if [ -z $E2E_ESTUARY_URL ] || [ -z $E2E_ESTUARY_TOKEN_PATH ]; then
-  echo "Error: No Estuary URL or token path found, end to end is not triggered. Please make sure E2E_ESTUARY_URL and E2E_ESTUARY_TOKEN_PATH are set up."
-else
-  # Trigger GitHub Action to run the nightwatch workflow via estuary
-  curl --location --request POST "$E2E_ESTUARY_URL" \
-    --header "Authorization: Bearer $(cat $E2E_ESTUARY_TOKEN_PATH)" \
-    --header "Content-Type: application/json" \
-    --data-raw '{
-      "owner": "dpc-sdp",
-      "repo": "ripple",
-      "workflow": "nightwatch.yml",
-      "ref": "'"$BRANCH"'",
-      "be_url": "'"$BE_URL"'",
-      "fe_url": "'"$FE_URL"'",
-      "project": "reference"
-    }'
-fi
+E2E_ESTUARY_URL="${E2E_ESTUARY_URL:-http://estuary.sdp-services:8080/v1/actions/trigger-e2e}"
+E2E_ESTUARY_TOKEN_PATH="${E2E_ESTUARY_TOKEN_PATH:-/run/secrets/kubernetes.io/serviceaccount/token}"
+# Trigger GitHub Action to run the nightwatch workflow via estuary
+curl --location --request POST "$E2E_ESTUARY_URL" \
+  --header "Authorization: Bearer $(cat $E2E_ESTUARY_TOKEN_PATH)" \
+  --header "Content-Type: application/json" \
+  --data-raw '{
+    "owner": "dpc-sdp",
+    "repo": "ripple",
+    "workflow": "nightwatch.yml",
+    "ref": "'"$BRANCH"'",
+    "be_url": "'"$BE_URL"'",
+    "fe_url": "'"$FE_URL"'",
+    "project": "reference"
+  }'