From 589aa05aded4f2fca9b08cdb56225fba13c87790 Mon Sep 17 00:00:00 2001
From: rohank07 <rohank_17@hotmail.ca>
Date: Tue, 18 Apr 2023 09:18:30 -0400
Subject: [PATCH 1/3] update: use internal protb url

---
 output/docker-stacks-datascience-notebook/trino-wrapper.sh | 5 ++---
 output/jupyterlab-cpu/trino-wrapper.sh                     | 5 ++---
 output/jupyterlab-pytorch/trino-wrapper.sh                 | 5 ++---
 output/jupyterlab-tensorflow/trino-wrapper.sh              | 5 ++---
 output/remote-desktop/trino-wrapper.sh                     | 5 ++---
 output/rstudio/trino-wrapper.sh                            | 5 ++---
 output/sas/trino-wrapper.sh                                | 5 ++---
 resources/common/trino-wrapper.sh                          | 5 ++---
 8 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/output/docker-stacks-datascience-notebook/trino-wrapper.sh b/output/docker-stacks-datascience-notebook/trino-wrapper.sh
index d06f41f98..d9463cc5e 100755
--- a/output/docker-stacks-datascience-notebook/trino-wrapper.sh
+++ b/output/docker-stacks-datascience-notebook/trino-wrapper.sh
@@ -4,15 +4,14 @@ then
     # Use protb trino instance
     if [ -d "/etc/protb" ]
     then
-        SERVER=https://trino-protb.aaw-dev.cloud.statcan.ca
-    else
+        SERVER=http://trino-protb.trino-protb-system.svc.cluster.local
         SERVER=https://trino.aaw-dev.cloud.statcan.ca
     fi
 # Prod cluster
 else
     if [ -d "/etc/protb" ]
     then
-        SERVER=https://trino-protb.aaw.cloud.statcan.ca
+        SERVER=http://trino-protb.aaw.cloud.statcan.ca
     else
         SERVER=https://trino.aaw.cloud.statcan.ca
     fi
diff --git a/output/jupyterlab-cpu/trino-wrapper.sh b/output/jupyterlab-cpu/trino-wrapper.sh
index d06f41f98..d9463cc5e 100755
--- a/output/jupyterlab-cpu/trino-wrapper.sh
+++ b/output/jupyterlab-cpu/trino-wrapper.sh
@@ -4,15 +4,14 @@ then
     # Use protb trino instance
     if [ -d "/etc/protb" ]
     then
-        SERVER=https://trino-protb.aaw-dev.cloud.statcan.ca
-    else
+        SERVER=http://trino-protb.trino-protb-system.svc.cluster.local
         SERVER=https://trino.aaw-dev.cloud.statcan.ca
     fi
 # Prod cluster
 else
     if [ -d "/etc/protb" ]
     then
-        SERVER=https://trino-protb.aaw.cloud.statcan.ca
+        SERVER=http://trino-protb.aaw.cloud.statcan.ca
     else
         SERVER=https://trino.aaw.cloud.statcan.ca
     fi
diff --git a/output/jupyterlab-pytorch/trino-wrapper.sh b/output/jupyterlab-pytorch/trino-wrapper.sh
index d06f41f98..d9463cc5e 100755
--- a/output/jupyterlab-pytorch/trino-wrapper.sh
+++ b/output/jupyterlab-pytorch/trino-wrapper.sh
@@ -4,15 +4,14 @@ then
     # Use protb trino instance
     if [ -d "/etc/protb" ]
     then
-        SERVER=https://trino-protb.aaw-dev.cloud.statcan.ca
-    else
+        SERVER=http://trino-protb.trino-protb-system.svc.cluster.local
         SERVER=https://trino.aaw-dev.cloud.statcan.ca
     fi
 # Prod cluster
 else
     if [ -d "/etc/protb" ]
     then
-        SERVER=https://trino-protb.aaw.cloud.statcan.ca
+        SERVER=http://trino-protb.aaw.cloud.statcan.ca
     else
         SERVER=https://trino.aaw.cloud.statcan.ca
     fi
diff --git a/output/jupyterlab-tensorflow/trino-wrapper.sh b/output/jupyterlab-tensorflow/trino-wrapper.sh
index d06f41f98..d9463cc5e 100755
--- a/output/jupyterlab-tensorflow/trino-wrapper.sh
+++ b/output/jupyterlab-tensorflow/trino-wrapper.sh
@@ -4,15 +4,14 @@ then
     # Use protb trino instance
     if [ -d "/etc/protb" ]
     then
-        SERVER=https://trino-protb.aaw-dev.cloud.statcan.ca
-    else
+        SERVER=http://trino-protb.trino-protb-system.svc.cluster.local
         SERVER=https://trino.aaw-dev.cloud.statcan.ca
     fi
 # Prod cluster
 else
     if [ -d "/etc/protb" ]
     then
-        SERVER=https://trino-protb.aaw.cloud.statcan.ca
+        SERVER=http://trino-protb.aaw.cloud.statcan.ca
     else
         SERVER=https://trino.aaw.cloud.statcan.ca
     fi
diff --git a/output/remote-desktop/trino-wrapper.sh b/output/remote-desktop/trino-wrapper.sh
index d06f41f98..d9463cc5e 100755
--- a/output/remote-desktop/trino-wrapper.sh
+++ b/output/remote-desktop/trino-wrapper.sh
@@ -4,15 +4,14 @@ then
     # Use protb trino instance
     if [ -d "/etc/protb" ]
     then
-        SERVER=https://trino-protb.aaw-dev.cloud.statcan.ca
-    else
+        SERVER=http://trino-protb.trino-protb-system.svc.cluster.local
         SERVER=https://trino.aaw-dev.cloud.statcan.ca
     fi
 # Prod cluster
 else
     if [ -d "/etc/protb" ]
     then
-        SERVER=https://trino-protb.aaw.cloud.statcan.ca
+        SERVER=http://trino-protb.aaw.cloud.statcan.ca
     else
         SERVER=https://trino.aaw.cloud.statcan.ca
     fi
diff --git a/output/rstudio/trino-wrapper.sh b/output/rstudio/trino-wrapper.sh
index d06f41f98..d9463cc5e 100755
--- a/output/rstudio/trino-wrapper.sh
+++ b/output/rstudio/trino-wrapper.sh
@@ -4,15 +4,14 @@ then
     # Use protb trino instance
     if [ -d "/etc/protb" ]
     then
-        SERVER=https://trino-protb.aaw-dev.cloud.statcan.ca
-    else
+        SERVER=http://trino-protb.trino-protb-system.svc.cluster.local
         SERVER=https://trino.aaw-dev.cloud.statcan.ca
     fi
 # Prod cluster
 else
     if [ -d "/etc/protb" ]
     then
-        SERVER=https://trino-protb.aaw.cloud.statcan.ca
+        SERVER=http://trino-protb.aaw.cloud.statcan.ca
     else
         SERVER=https://trino.aaw.cloud.statcan.ca
     fi
diff --git a/output/sas/trino-wrapper.sh b/output/sas/trino-wrapper.sh
index d06f41f98..d9463cc5e 100755
--- a/output/sas/trino-wrapper.sh
+++ b/output/sas/trino-wrapper.sh
@@ -4,15 +4,14 @@ then
     # Use protb trino instance
     if [ -d "/etc/protb" ]
     then
-        SERVER=https://trino-protb.aaw-dev.cloud.statcan.ca
-    else
+        SERVER=http://trino-protb.trino-protb-system.svc.cluster.local
         SERVER=https://trino.aaw-dev.cloud.statcan.ca
     fi
 # Prod cluster
 else
     if [ -d "/etc/protb" ]
     then
-        SERVER=https://trino-protb.aaw.cloud.statcan.ca
+        SERVER=http://trino-protb.aaw.cloud.statcan.ca
     else
         SERVER=https://trino.aaw.cloud.statcan.ca
     fi
diff --git a/resources/common/trino-wrapper.sh b/resources/common/trino-wrapper.sh
index d06f41f98..d9463cc5e 100755
--- a/resources/common/trino-wrapper.sh
+++ b/resources/common/trino-wrapper.sh
@@ -4,15 +4,14 @@ then
     # Use protb trino instance
     if [ -d "/etc/protb" ]
     then
-        SERVER=https://trino-protb.aaw-dev.cloud.statcan.ca
-    else
+        SERVER=http://trino-protb.trino-protb-system.svc.cluster.local
         SERVER=https://trino.aaw-dev.cloud.statcan.ca
     fi
 # Prod cluster
 else
     if [ -d "/etc/protb" ]
     then
-        SERVER=https://trino-protb.aaw.cloud.statcan.ca
+        SERVER=http://trino-protb.aaw.cloud.statcan.ca
     else
         SERVER=https://trino.aaw.cloud.statcan.ca
     fi

From edf4a528918e0261e8d6de1b92e4f4d9f2e45fc6 Mon Sep 17 00:00:00 2001
From: rohank07 <rohank_17@hotmail.ca>
Date: Wed, 26 Apr 2023 11:40:07 -0400
Subject: [PATCH 2/3] edit

---
 output/docker-stacks-datascience-notebook/trino-wrapper.sh | 1 +
 output/jupyterlab-cpu/trino-wrapper.sh                     | 1 +
 output/jupyterlab-pytorch/trino-wrapper.sh                 | 1 +
 output/jupyterlab-tensorflow/trino-wrapper.sh              | 1 +
 output/remote-desktop/trino-wrapper.sh                     | 1 +
 output/rstudio/trino-wrapper.sh                            | 1 +
 output/sas/trino-wrapper.sh                                | 1 +
 resources/common/trino-wrapper.sh                          | 1 +
 8 files changed, 8 insertions(+)

diff --git a/output/docker-stacks-datascience-notebook/trino-wrapper.sh b/output/docker-stacks-datascience-notebook/trino-wrapper.sh
index d9463cc5e..051f01a49 100755
--- a/output/docker-stacks-datascience-notebook/trino-wrapper.sh
+++ b/output/docker-stacks-datascience-notebook/trino-wrapper.sh
@@ -5,6 +5,7 @@ then
     if [ -d "/etc/protb" ]
     then
         SERVER=http://trino-protb.trino-protb-system.svc.cluster.local
+    else
         SERVER=https://trino.aaw-dev.cloud.statcan.ca
     fi
 # Prod cluster
diff --git a/output/jupyterlab-cpu/trino-wrapper.sh b/output/jupyterlab-cpu/trino-wrapper.sh
index d9463cc5e..051f01a49 100755
--- a/output/jupyterlab-cpu/trino-wrapper.sh
+++ b/output/jupyterlab-cpu/trino-wrapper.sh
@@ -5,6 +5,7 @@ then
     if [ -d "/etc/protb" ]
     then
         SERVER=http://trino-protb.trino-protb-system.svc.cluster.local
+    else
         SERVER=https://trino.aaw-dev.cloud.statcan.ca
     fi
 # Prod cluster
diff --git a/output/jupyterlab-pytorch/trino-wrapper.sh b/output/jupyterlab-pytorch/trino-wrapper.sh
index d9463cc5e..051f01a49 100755
--- a/output/jupyterlab-pytorch/trino-wrapper.sh
+++ b/output/jupyterlab-pytorch/trino-wrapper.sh
@@ -5,6 +5,7 @@ then
     if [ -d "/etc/protb" ]
     then
         SERVER=http://trino-protb.trino-protb-system.svc.cluster.local
+    else
         SERVER=https://trino.aaw-dev.cloud.statcan.ca
     fi
 # Prod cluster
diff --git a/output/jupyterlab-tensorflow/trino-wrapper.sh b/output/jupyterlab-tensorflow/trino-wrapper.sh
index d9463cc5e..051f01a49 100755
--- a/output/jupyterlab-tensorflow/trino-wrapper.sh
+++ b/output/jupyterlab-tensorflow/trino-wrapper.sh
@@ -5,6 +5,7 @@ then
     if [ -d "/etc/protb" ]
     then
         SERVER=http://trino-protb.trino-protb-system.svc.cluster.local
+    else
         SERVER=https://trino.aaw-dev.cloud.statcan.ca
     fi
 # Prod cluster
diff --git a/output/remote-desktop/trino-wrapper.sh b/output/remote-desktop/trino-wrapper.sh
index d9463cc5e..051f01a49 100755
--- a/output/remote-desktop/trino-wrapper.sh
+++ b/output/remote-desktop/trino-wrapper.sh
@@ -5,6 +5,7 @@ then
     if [ -d "/etc/protb" ]
     then
         SERVER=http://trino-protb.trino-protb-system.svc.cluster.local
+    else
         SERVER=https://trino.aaw-dev.cloud.statcan.ca
     fi
 # Prod cluster
diff --git a/output/rstudio/trino-wrapper.sh b/output/rstudio/trino-wrapper.sh
index d9463cc5e..051f01a49 100755
--- a/output/rstudio/trino-wrapper.sh
+++ b/output/rstudio/trino-wrapper.sh
@@ -5,6 +5,7 @@ then
     if [ -d "/etc/protb" ]
     then
         SERVER=http://trino-protb.trino-protb-system.svc.cluster.local
+    else
         SERVER=https://trino.aaw-dev.cloud.statcan.ca
     fi
 # Prod cluster
diff --git a/output/sas/trino-wrapper.sh b/output/sas/trino-wrapper.sh
index d9463cc5e..051f01a49 100755
--- a/output/sas/trino-wrapper.sh
+++ b/output/sas/trino-wrapper.sh
@@ -5,6 +5,7 @@ then
     if [ -d "/etc/protb" ]
     then
         SERVER=http://trino-protb.trino-protb-system.svc.cluster.local
+    else
         SERVER=https://trino.aaw-dev.cloud.statcan.ca
     fi
 # Prod cluster
diff --git a/resources/common/trino-wrapper.sh b/resources/common/trino-wrapper.sh
index d9463cc5e..051f01a49 100755
--- a/resources/common/trino-wrapper.sh
+++ b/resources/common/trino-wrapper.sh
@@ -5,6 +5,7 @@ then
     if [ -d "/etc/protb" ]
     then
         SERVER=http://trino-protb.trino-protb-system.svc.cluster.local
+    else
         SERVER=https://trino.aaw-dev.cloud.statcan.ca
     fi
 # Prod cluster

From 4b17a7fd716106dfa5eab1cfe6a62d12467ce793 Mon Sep 17 00:00:00 2001
From: rohank07 <rohank_17@hotmail.ca>
Date: Wed, 26 Apr 2023 13:19:37 -0400
Subject: [PATCH 3/3] edit

---
 .../docker-stacks-datascience-notebook/trino-wrapper.sh   | 8 ++++++--
 output/jupyterlab-cpu/trino-wrapper.sh                    | 8 ++++++--
 output/jupyterlab-pytorch/trino-wrapper.sh                | 8 ++++++--
 output/jupyterlab-tensorflow/trino-wrapper.sh             | 8 ++++++--
 output/remote-desktop/trino-wrapper.sh                    | 8 ++++++--
 output/rstudio/trino-wrapper.sh                           | 8 ++++++--
 output/sas/trino-wrapper.sh                               | 8 ++++++--
 resources/common/trino-wrapper.sh                         | 8 ++++++--
 8 files changed, 48 insertions(+), 16 deletions(-)

diff --git a/output/docker-stacks-datascience-notebook/trino-wrapper.sh b/output/docker-stacks-datascience-notebook/trino-wrapper.sh
index 051f01a49..f5485f7af 100755
--- a/output/docker-stacks-datascience-notebook/trino-wrapper.sh
+++ b/output/docker-stacks-datascience-notebook/trino-wrapper.sh
@@ -5,17 +5,21 @@ then
     if [ -d "/etc/protb" ]
     then
         SERVER=http://trino-protb.trino-protb-system.svc.cluster.local
+        trino-original --server $SERVER --debug  "$@"
     else
         SERVER=https://trino.aaw-dev.cloud.statcan.ca
+        trino-original --server $SERVER --debug --external-authentication "$@"
     fi
+
 # Prod cluster
 else
     if [ -d "/etc/protb" ]
     then
         SERVER=http://trino-protb.aaw.cloud.statcan.ca
+        trino-original --server $SERVER --debug  "$@"
     else
         SERVER=https://trino.aaw.cloud.statcan.ca
+        trino-original --server $SERVER --debug --external-authentication "$@"
     fi
 fi
-# Trino client pass in server, user, access token and additional options the user can configures
-trino-original --server $SERVER --debug --external-authentication "$@"
+
diff --git a/output/jupyterlab-cpu/trino-wrapper.sh b/output/jupyterlab-cpu/trino-wrapper.sh
index 051f01a49..f5485f7af 100755
--- a/output/jupyterlab-cpu/trino-wrapper.sh
+++ b/output/jupyterlab-cpu/trino-wrapper.sh
@@ -5,17 +5,21 @@ then
     if [ -d "/etc/protb" ]
     then
         SERVER=http://trino-protb.trino-protb-system.svc.cluster.local
+        trino-original --server $SERVER --debug  "$@"
     else
         SERVER=https://trino.aaw-dev.cloud.statcan.ca
+        trino-original --server $SERVER --debug --external-authentication "$@"
     fi
+
 # Prod cluster
 else
     if [ -d "/etc/protb" ]
     then
         SERVER=http://trino-protb.aaw.cloud.statcan.ca
+        trino-original --server $SERVER --debug  "$@"
     else
         SERVER=https://trino.aaw.cloud.statcan.ca
+        trino-original --server $SERVER --debug --external-authentication "$@"
     fi
 fi
-# Trino client pass in server, user, access token and additional options the user can configures
-trino-original --server $SERVER --debug --external-authentication "$@"
+
diff --git a/output/jupyterlab-pytorch/trino-wrapper.sh b/output/jupyterlab-pytorch/trino-wrapper.sh
index 051f01a49..f5485f7af 100755
--- a/output/jupyterlab-pytorch/trino-wrapper.sh
+++ b/output/jupyterlab-pytorch/trino-wrapper.sh
@@ -5,17 +5,21 @@ then
     if [ -d "/etc/protb" ]
     then
         SERVER=http://trino-protb.trino-protb-system.svc.cluster.local
+        trino-original --server $SERVER --debug  "$@"
     else
         SERVER=https://trino.aaw-dev.cloud.statcan.ca
+        trino-original --server $SERVER --debug --external-authentication "$@"
     fi
+
 # Prod cluster
 else
     if [ -d "/etc/protb" ]
     then
         SERVER=http://trino-protb.aaw.cloud.statcan.ca
+        trino-original --server $SERVER --debug  "$@"
     else
         SERVER=https://trino.aaw.cloud.statcan.ca
+        trino-original --server $SERVER --debug --external-authentication "$@"
     fi
 fi
-# Trino client pass in server, user, access token and additional options the user can configures
-trino-original --server $SERVER --debug --external-authentication "$@"
+
diff --git a/output/jupyterlab-tensorflow/trino-wrapper.sh b/output/jupyterlab-tensorflow/trino-wrapper.sh
index 051f01a49..f5485f7af 100755
--- a/output/jupyterlab-tensorflow/trino-wrapper.sh
+++ b/output/jupyterlab-tensorflow/trino-wrapper.sh
@@ -5,17 +5,21 @@ then
     if [ -d "/etc/protb" ]
     then
         SERVER=http://trino-protb.trino-protb-system.svc.cluster.local
+        trino-original --server $SERVER --debug  "$@"
     else
         SERVER=https://trino.aaw-dev.cloud.statcan.ca
+        trino-original --server $SERVER --debug --external-authentication "$@"
     fi
+
 # Prod cluster
 else
     if [ -d "/etc/protb" ]
     then
         SERVER=http://trino-protb.aaw.cloud.statcan.ca
+        trino-original --server $SERVER --debug  "$@"
     else
         SERVER=https://trino.aaw.cloud.statcan.ca
+        trino-original --server $SERVER --debug --external-authentication "$@"
     fi
 fi
-# Trino client pass in server, user, access token and additional options the user can configures
-trino-original --server $SERVER --debug --external-authentication "$@"
+
diff --git a/output/remote-desktop/trino-wrapper.sh b/output/remote-desktop/trino-wrapper.sh
index 051f01a49..f5485f7af 100755
--- a/output/remote-desktop/trino-wrapper.sh
+++ b/output/remote-desktop/trino-wrapper.sh
@@ -5,17 +5,21 @@ then
     if [ -d "/etc/protb" ]
     then
         SERVER=http://trino-protb.trino-protb-system.svc.cluster.local
+        trino-original --server $SERVER --debug  "$@"
     else
         SERVER=https://trino.aaw-dev.cloud.statcan.ca
+        trino-original --server $SERVER --debug --external-authentication "$@"
     fi
+
 # Prod cluster
 else
     if [ -d "/etc/protb" ]
     then
         SERVER=http://trino-protb.aaw.cloud.statcan.ca
+        trino-original --server $SERVER --debug  "$@"
     else
         SERVER=https://trino.aaw.cloud.statcan.ca
+        trino-original --server $SERVER --debug --external-authentication "$@"
     fi
 fi
-# Trino client pass in server, user, access token and additional options the user can configures
-trino-original --server $SERVER --debug --external-authentication "$@"
+
diff --git a/output/rstudio/trino-wrapper.sh b/output/rstudio/trino-wrapper.sh
index 051f01a49..f5485f7af 100755
--- a/output/rstudio/trino-wrapper.sh
+++ b/output/rstudio/trino-wrapper.sh
@@ -5,17 +5,21 @@ then
     if [ -d "/etc/protb" ]
     then
         SERVER=http://trino-protb.trino-protb-system.svc.cluster.local
+        trino-original --server $SERVER --debug  "$@"
     else
         SERVER=https://trino.aaw-dev.cloud.statcan.ca
+        trino-original --server $SERVER --debug --external-authentication "$@"
     fi
+
 # Prod cluster
 else
     if [ -d "/etc/protb" ]
     then
         SERVER=http://trino-protb.aaw.cloud.statcan.ca
+        trino-original --server $SERVER --debug  "$@"
     else
         SERVER=https://trino.aaw.cloud.statcan.ca
+        trino-original --server $SERVER --debug --external-authentication "$@"
     fi
 fi
-# Trino client pass in server, user, access token and additional options the user can configures
-trino-original --server $SERVER --debug --external-authentication "$@"
+
diff --git a/output/sas/trino-wrapper.sh b/output/sas/trino-wrapper.sh
index 051f01a49..f5485f7af 100755
--- a/output/sas/trino-wrapper.sh
+++ b/output/sas/trino-wrapper.sh
@@ -5,17 +5,21 @@ then
     if [ -d "/etc/protb" ]
     then
         SERVER=http://trino-protb.trino-protb-system.svc.cluster.local
+        trino-original --server $SERVER --debug  "$@"
     else
         SERVER=https://trino.aaw-dev.cloud.statcan.ca
+        trino-original --server $SERVER --debug --external-authentication "$@"
     fi
+
 # Prod cluster
 else
     if [ -d "/etc/protb" ]
     then
         SERVER=http://trino-protb.aaw.cloud.statcan.ca
+        trino-original --server $SERVER --debug  "$@"
     else
         SERVER=https://trino.aaw.cloud.statcan.ca
+        trino-original --server $SERVER --debug --external-authentication "$@"
     fi
 fi
-# Trino client pass in server, user, access token and additional options the user can configures
-trino-original --server $SERVER --debug --external-authentication "$@"
+
diff --git a/resources/common/trino-wrapper.sh b/resources/common/trino-wrapper.sh
index 051f01a49..f5485f7af 100755
--- a/resources/common/trino-wrapper.sh
+++ b/resources/common/trino-wrapper.sh
@@ -5,17 +5,21 @@ then
     if [ -d "/etc/protb" ]
     then
         SERVER=http://trino-protb.trino-protb-system.svc.cluster.local
+        trino-original --server $SERVER --debug  "$@"
     else
         SERVER=https://trino.aaw-dev.cloud.statcan.ca
+        trino-original --server $SERVER --debug --external-authentication "$@"
     fi
+
 # Prod cluster
 else
     if [ -d "/etc/protb" ]
     then
         SERVER=http://trino-protb.aaw.cloud.statcan.ca
+        trino-original --server $SERVER --debug  "$@"
     else
         SERVER=https://trino.aaw.cloud.statcan.ca
+        trino-original --server $SERVER --debug --external-authentication "$@"
     fi
 fi
-# Trino client pass in server, user, access token and additional options the user can configures
-trino-original --server $SERVER --debug --external-authentication "$@"
+