From aae5d5791db4bbae29ff75ac8b75b0191f8075ed Mon Sep 17 00:00:00 2001
From: Marcus Noble <github@marcusnoble.co.uk>
Date: Fri, 3 May 2024 15:17:43 +0100
Subject: [PATCH] Updated standup/teardown

Signed-off-by: Marcus Noble <github@marcusnoble.co.uk>
---
 home/.bin/gs-standup  | 17 ++---------------
 home/.bin/gs-teardown | 15 ++-------------
 2 files changed, 4 insertions(+), 28 deletions(-)

diff --git a/home/.bin/gs-standup b/home/.bin/gs-standup
index 39cf287..0fbafc6 100755
--- a/home/.bin/gs-standup
+++ b/home/.bin/gs-standup
@@ -2,9 +2,8 @@
 
 source .utils
 
-CODE_DIR="${HOME}/Code/GiantSwarm/cluster-test-suites"
-CUR_DIR=$(pwd)
-OUTPUT_DIR=${CUR_DIR}
+CODE_DIR="${HOME}/Code/GiantSwarm/cluster-standup-teardown"
+OUTPUT_DIR=$(pwd)
 
 print_usage() {
   orange "gs-standup - Standup a new test workload cluster, using the cluster-test-suites modules."
@@ -53,44 +52,32 @@ case ${#POS_ARGS[@]} in
     exit 1
     ;;
   1)
-    PROVIDER=""
     CONTEXT=""
 
     case ${POS_ARGS[0]} in
       "aws"|"capa")
-        PROVIDER="aws"
         CONTEXT="capa"
         ;;
       "azure"|"capz")
-        PROVIDER="azure"
         CONTEXT="capz"
         ;;
       "vsphere"|"capv")
-        PROVIDER="vsphere"
         CONTEXT="capv"
         ;;
       "cloud-director"|"capvcd")
-        PROVIDER="cloud-director"
         CONTEXT="capvcd"
         ;;
       "eks")
-        PROVIDER="eks"
         CONTEXT="eks"
         ;;
       "aws-private"|"capa-private")
-        PROVIDER="aws"
         CONTEXT="capa-private-proxy"
         ;;
     esac
 
-    cd ${CODE_DIR}
     go run ${CODE_DIR}/cmd/standup/main.go \
-      --provider ${PROVIDER} \
       --context ${CONTEXT} \
-      --cluster-values ${CODE_DIR}/providers/${CONTEXT}/standard/test_data/cluster_values.yaml \
-      --default-apps-values ${CODE_DIR}/providers/${CONTEXT}/standard/test_data/default-apps_values.yaml \
       --output ${OUTPUT_DIR}
-    cd ${CUR_DIR}
     ;;
   *)
     print_usage
diff --git a/home/.bin/gs-teardown b/home/.bin/gs-teardown
index 8e6dc9a..84b635f 100755
--- a/home/.bin/gs-teardown
+++ b/home/.bin/gs-teardown
@@ -2,9 +2,8 @@
 
 source .utils
 
-CODE_DIR="${HOME}/Code/GiantSwarm/cluster-test-suites"
-CUR_DIR=$(pwd)
-INPUT_DIR=${CUR_DIR}
+CODE_DIR="${HOME}/Code/GiantSwarm/cluster-standup-teardown"
+INPUT_DIR=$(pwd)
 
 print_usage() {
   orange "gs-teardown - Teardown a previously created test cluster"
@@ -53,42 +52,32 @@ case ${#POS_ARGS[@]} in
     exit 1
     ;;
   1)
-    PROVIDER=""
     CONTEXT=""
 
     case ${POS_ARGS[0]} in
       "aws"|"capa")
-        PROVIDER="aws"
         CONTEXT="capa"
         ;;
       "azure"|"capz")
-        PROVIDER="azure"
         CONTEXT="capz"
         ;;
       "vsphere"|"capv")
-        PROVIDER="vsphere"
         CONTEXT="capv"
         ;;
       "cloud-director"|"capvcd")
-        PROVIDER="cloud-director"
         CONTEXT="capvcd"
         ;;
       "eks")
-        PROVIDER="eks"
         CONTEXT="eks"
         ;;
       "aws-private"|"capa-private")
-        PROVIDER="aws"
         CONTEXT="capa-private-proxy"
         ;;
     esac
 
-    cd ${CODE_DIR}
     go run ${CODE_DIR}/cmd/teardown/main.go \
-      --provider ${PROVIDER} \
       --context ${CONTEXT} \
       --standup-directory ${INPUT_DIR}
-    cd ${CUR_DIR}
     ;;
   *)
     print_usage