Consolidate setupTestEnv, cleanTestEnv, and startTestEnv

- `startTestingEnv` is now `startTestEnv` - `setupTestEnvLocal` is now `setupTestEnv --local` or `setupTestEnv` - `cleanTestEnvLocal` is now `cleanTestEnv --local` or `cleanTestEnv` - `setupTestEnvCicd` is now `setupTestEnv --cicd` - `cleanTestEnvCicd` is now `cleanTestEnv --cicd`
supertokens · Apr 22, 2022 · 8f34d07 · 8f34d07
1 parent be681f3
commit 8f34d07
Show file tree

Hide file tree

Showing 10 changed files with 93 additions and 201 deletions.
diff --git a/.idea/runConfigurations/Run_All_Tests.xml b/.idea/runConfigurations/Run_All_Tests.xml
diff --git a/.idea/runConfigurations/Start_Testing_Environment.xml b/.idea/runConfigurations/Start_Testing_Environment.xml
diff --git a/docker/README.md b/docker/README.md
@@ -1,7 +1,7 @@
 ## Docker image for testing
 
 - the script `createPostgresqlImage.sh` here is used to create docker image with postgresql plugin.
-- Before the user runs this script, they need to start the testing env (i.e. `./startTestingEnv --wait`).
+- Before the user runs this script, they need to start the testing env (i.e. `./startTestEnv --wait`).
 - This script can only be used for postgresql plugin. No other plugin is supported. So before running the script, make sure to switch to postgresql-plugin in the `modules.txt`.
 
 

diff --git a/runCore b/runCore
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 function cleanup {
-    kill %1 > /dev/null # Send exit to startTestingEnv
+    kill %1 > /dev/null # Send exit to startTestEnv
 }
 
 usage="Usage: runCore [--help] [--silent] [--cicd] [--force]"
@@ -24,15 +24,15 @@ done
 if [[ $force = true && -f .testEnvRunning ]]; then
   [[ $silent = false ]] && echo "Removing previous testing environment..."
   if [[ $cicd = true ]]; then
-    ./utils/cleanTestEnvCicd
+    ./utils/cleanTestEnv --cicd
   else
-    ./utils/cleanTestEnvLocal
+    ./utils/cleanTestEnv --local
   fi
 fi
 
 trap cleanup EXIT
 
-./startTestingEnv --wait --silent & # Run in background
+./startTestEnv --wait --silent & # Run in background
 
 [[ $silent = false ]] && echo "Waiting for testing environment to start..."
 until [[ -f .testEnvRunning ]]

diff --git a/startTestingEnv → startTestEnv b/startTestingEnv → startTestEnv
@@ -2,13 +2,13 @@
 
 function cleanup {
   if [[ $cicd = true ]]; then
-    ./utils/cleanTestEnvCicd
+    ./utils/cleanTestEnv --cicd
   else
-    ./utils/cleanTestEnvLocal
+    ./utils/cleanTestEnv --local
   fi
 }
 
-usage="Usage: startTestingEnv [--help] [--wait] [--silent] [--cicd] [--force]"
+usage="Usage: startTestEnv [--help] [--wait] [--silent] [--cicd] [--force]"
 wait=false
 silent=false
 cicd=false
@@ -36,9 +36,9 @@ trap cleanup EXIT
 
 [[ $silent = false ]] && echo "Setting up testing environment..."
 if [[ $cicd = true ]]; then
-  ./utils/setupTestEnvCicd
+  ./utils/setupTestEnv --cicd
 else
-  ./utils/setupTestEnvLocal
+  ./utils/setupTestEnv --local
 fi
 
 

diff --git a/utils/cleanTestEnv b/utils/cleanTestEnv
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+usage="Usage: cleanTestEnv [--help] [ [--cicd] | [--local] ]"
+cicd=false
+
+# Based on https://stackoverflow.com/a/33826763/11827673
+while [[ "$#" -gt 0 ]]; do
+  case $1 in
+    -h|--help)   echo "$usage"; exit ;;
+    -c|--cicd)   cicd=true   ;;
+    -l|--local)  cicd=false  ;;
+    *) echo "Unknown parameter passed: $1"; echo "$usage"; exit 1 ;;
+  esac
+  shift
+done
+
+rm -rf core
+rm -rf plugin-interface
+rm -rf plugin
+rm -rf cli
+rm -rf downloader
+rm version.yaml
+rm -rf temp
+rm install
+rm install.bat
+rm LICENSE.md
+rm .testEnvRunning
diff --git a/utils/cleanTestEnvCicd b/utils/cleanTestEnvCicd
diff --git a/utils/cleanTestEnvLocal b/utils/cleanTestEnvLocal
diff --git a/utils/setupTestEnvLocal → utils/setupTestEnv b/utils/setupTestEnvLocal → utils/setupTestEnv
@@ -1,4 +1,20 @@
 #!/bin/bash
+
+usage="Usage: setupTestEnvLocal [--help] [ [--cicd] | [--local] ]"
+cicd=false
+
+# Based on https://stackoverflow.com/a/33826763/11827673
+while [[ "$#" -gt 0 ]]; do
+  case $1 in
+    -h|--help)   echo "$usage"; exit ;;
+    -c|--cicd)   cicd=true   ;;
+    -l|--local)  cicd=false  ;;
+    *) echo "Unknown parameter passed: $1"; echo "$usage"; exit 1 ;;
+  esac
+  shift
+done
+
+# load version and jars
 # setup jars, dependencies and version
 
 ./gradlew clean
@@ -43,7 +59,9 @@ do
  		    (cd $dir_name/downloader/ && ./runBuild noJarFolderChange)
  			mkdir core > /dev/null 2>&1
  			cp $dir_name/build/libs/* core
- 			cp $dir_name/build/dependencies/* core > /dev/null 2>&1
+ 			if [[ $cicd = false ]]; then
+ 			  cp $dir_name/build/dependencies/* core > /dev/null 2>&1
+ 			fi
 
  			# add to version_temp.yaml
  			core_version=`cat $dir_name/build.gradle | grep -e "version =" -e "version="`
@@ -58,10 +76,24 @@ do
 				done
 			done <<< "$core_version"
 			echo "core_version: $core_version" >> version_temp.yaml
-
+
+            if [[ $cicd = true ]]; then
+              curl -X GET \
+                  "https://api.supertokens.io/core/dependency/jars?version=$core_version&planType=FREE&mode=DEV&withSource=false" \
+                  -H 'api-version: 0' | jq '.links' | jq -c '.[]' | while read i; do \
+                  wget -P core/ `echo $i | sed -e 's/^"//' -e 's/"$//'`; done
+            fi
             mkdir cli > /dev/null 2>&1
             cp $dir_name/cli/build/libs/* cli
-            cp $dir_name/cli/build/dependencies/* cli > /dev/null 2>&1
+            if [[ $cicd = true ]]; then
+              curl -X GET \
+                  "https://api.supertokens.io/cli/dependency/jars?version=$core_version&planType=FREE&mode=DEV
+                  &withSource=false" \
+                  -H 'api-version: 0' | jq '.links' | jq -c '.[]' | while read i; do \
+                  wget -P cli/ `echo $i | sed -e 's/^"//' -e 's/"$//'`; done
+            else
+              cp $dir_name/cli/build/dependencies/* cli > /dev/null 2>&1
+            fi
 
             mkdir downloader > /dev/null 2>&1
             cp $dir_name/downloader/build/libs/* downloader
@@ -74,7 +106,9 @@ do
  		then
  			mkdir plugin-interface > /dev/null 2>&1
  			cp $dir_name/build/libs/* plugin-interface
- 			cp $dir_name/build/dependencies/* plugin-interface > /dev/null 2>&1
+ 			if [[ $cicd = false ]]; then
+ 			  cp $dir_name/build/dependencies/* plugin-interface > /dev/null 2>&1
+      fi
 
  			# add to version_temp.yaml
  			pi_version=`cat $dir_name/build.gradle | grep -e "version =" -e "version="`
@@ -90,11 +124,20 @@ do
 			done <<< "$pi_version"
 			echo "plugin_interface_version: $pi_version" >> version_temp.yaml
 
+			if [[ $cicd = true ]]; then
+			  curl -X GET \
+          "https://api.supertokens.io/plugin-interface/dependency/jars?version=$pi_version&planType=FREE&mode=DEV&withSource=false" \
+          -H 'api-version: 0' | jq '.links' | jq -c '.[]' | while read i; do \
+          wget -P plugin-interface/ `echo $i | sed -e 's/^"//' -e 's/"$//'`; done
+      fi
+
  		elif [[ $repo_name != "sqlite-plugin" ]]
  		then
  			mkdir plugin > /dev/null 2>&1
  			cp $dir_name/build/libs/* plugin
- 			cp $dir_name/build/dependencies/* plugin > /dev/null 2>&1
+ 			if [[ $cicd = false ]]; then
+ 			  cp $dir_name/build/dependencies/* plugin > /dev/null 2>&1
+ 			fi
 
 
  			# add to version_temp.yaml
@@ -122,6 +165,12 @@ do
 			done <<< "$p_name"
 			echo "plugin_version: $p_version" >> version_temp.yaml
 			echo "plugin_name: $p_name" >> version_temp.yaml
+			if [[ $cicd = true ]]; then
+			  curl -X GET \
+          "https://api.supertokens.io/plugin/dependency/jars?version=$p_version&name=$p_name&planType=FREE&mode=DEV&withSource=false" \
+          -H 'api-version: 0' | jq '.links' | jq -c '.[]' | while read i; do \
+          wget -P plugin/ `echo $i | sed -e 's/^"//' -e 's/"$//'`; done
+      fi
 		else
 		    mkdir plugin > /dev/null 2>&1
  		fi