Merge branch '0.10' into email-templates-update

Author: iresharma

.circleci/config.yml

@@ -1,118 +1,32 @@
 version: 2.1
+
+# this allows you to use CircleCI's dynamic configuration feature
+setup: true
+
 orbs:
-    slack: circleci/[email protected]
-    jq: circleci/[email protected]
+  continuation: circleci/[email protected]
+  slack: circleci/[email protected]
+  jq: circleci/[email protected]
 jobs:
-    test-dev-tag-as-not-passed:
-        docker:
-            - image: rishabhpoddar/supertokens_go_driver_testing
-        steps:
-            - checkout
-            - run: (cd .circleci/ && ./markDevTagAsTestNotPassed.sh)
-    test-unit:
-        docker:
-            - image: rishabhpoddar/supertokens_go_driver_testing
-        resource_class: large
-        steps:
-            - checkout
-            - run: apt-get install lsof
-            - run: echo "127.0.0.1 localhost.org" >> /etc/hosts
-            - run: go version
-            - run: rm -rf /etc/alternatives/java
-            - run: ln -s /usr/java/jdk-15.0.1/bin/java /etc/alternatives/java
-            - run: go get ./...
-            - run: (cd .circleci/ && ./doUnitTests.sh)
-            - slack/status
-    test-website:
-        docker:
-            - image: rishabhpoddar/supertokens_go_driver_testing
-        resource_class: large
-        steps:
-            - checkout
-            - run: apt-get install lsof
-            - run: git config --global url."https://github.com/".insteadOf ssh://[email protected]/
-            - run: echo "127.0.0.1 localhost.org" >> /etc/hosts
-            - run: go version
-            - run: rm -rf /etc/alternatives/java
-            - run: ln -s /usr/java/jdk-15.0.1/bin/java /etc/alternatives/java
-            - run: go get ./...
-            - run: (cd .circleci/ && ./website.sh)
-            - slack/status
-    test-authreact:
-        docker:
-            - image: rishabhpoddar/supertokens_go_driver_testing
-        resource_class: large
-        steps:
-            - checkout
-            - run: apt-get install lsof
-            - run: git config --global url."https://github.com/".insteadOf ssh://[email protected]/
-            - run: curl -fsSL https://deb.nodesource.com/setup_16.x | bash
-            - run: apt install -y nodejs
-            - run: node --version
-            - run: echo "127.0.0.1 localhost.org" >> /etc/hosts
-            - run: go version
-            - run: rm -rf /etc/alternatives/java
-            - run: ln -s /usr/java/jdk-15.0.1/bin/java /etc/alternatives/java
-            - run: go get ./...
-            - run: (cd .circleci/ && ./authReact.sh)
-            - slack/status
-    test-success:
-        docker:
-            - image: rishabhpoddar/supertokens_go_driver_testing
-        steps:
-            - checkout
-            - run: (cd .circleci/ && ./markAsSuccess.sh)
-            - slack/status
+  setup:
+    machine:
+      image: ubuntu-2204:2022.04.1
+    steps:
+      - checkout
+      - run:
+          name: Generate config
+          command: |
+            cd .circleci && ./generateConfig.sh
+      - continuation/continue:
+          configuration_path: .circleci/config_continue.yml # use newly generated config to continue
 
 workflows:
-    version: 2
-    tagged-build:
-        jobs:
-            - test-dev-tag-as-not-passed:
-                filters:
-                    tags:
-                        only: /dev-v[0-9]+(\.[0-9]+)*/
-                    branches:
-                        ignore: /.*/
-            - test-unit:
-                requires:
-                    - test-dev-tag-as-not-passed
-                context:
-                    - slack-notification
-                filters:
-                    tags:
-                        only: /dev-v[0-9]+(\.[0-9]+)*/
-                    branches:
-                        ignore: /.*/
-            - test-website:
-                requires:
-                    - test-dev-tag-as-not-passed
-                context:
-                    - slack-notification
-                filters:
-                    tags:
-                        only: /dev-v[0-9]+(\.[0-9]+)*/
-                    branches:
-                        ignore: /.*/
-            - test-authreact:
-                requires:
-                    - test-dev-tag-as-not-passed
-                context:
-                    - slack-notification
-                filters:
-                    tags:
-                        only: /dev-v[0-9]+(\.[0-9]+)*/
-                    branches:
-                        ignore: /.*/
-            - test-success:
-                requires:
-                    - test-unit
-                    - test-website
-                    - test-authreact
-                context:
-                    - slack-notification
-                filters:
-                    tags:
-                        only: /dev-v[0-9]+(\.[0-9]+)*/
-                    branches:
-                        ignore: /.*/
+  version: 2
+  tagged-build:
+    jobs:
+      - setup:
+          filters:
+            tags:
+              only: /dev-v[0-9]+(\.[0-9]+)*/
+            branches:
+              ignore: /.*/

.circleci/config_continue.yml

@@ -0,0 +1,126 @@
+version: 2.1
+orbs:
+    continuation: circleci/[email protected]
+    slack: circleci/[email protected]
+    jq: circleci/[email protected]
+jobs:
+    test-dev-tag-as-not-passed:
+        docker:
+            - image: rishabhpoddar/supertokens_go_driver_testing
+        steps:
+            - checkout
+            - run: (cd .circleci/ && ./markDevTagAsTestNotPassed.sh)
+    test-unit:
+        docker:
+            - image: rishabhpoddar/supertokens_go_driver_testing
+        resource_class: large
+        parameters:
+            cdi-version:
+                type: string
+        parallelism: 4
+        steps:
+            - checkout
+            - run: apt-get install lsof
+            - run: echo "127.0.0.1 localhost.org" >> /etc/hosts
+            - run: go version
+            - run: rm -rf /etc/alternatives/java
+            - run: ln -s /usr/java/jdk-15.0.1/bin/java /etc/alternatives/java
+            - run: go get ./...
+            - run: (cd .circleci/ && ./doUnitTests.sh << parameters.cdi-version >>)
+            - slack/status
+    test-website:
+        docker:
+            - image: rishabhpoddar/supertokens_go_driver_testing
+        resource_class: large
+        steps:
+            - checkout
+            - run: apt-get install lsof
+            - run: git config --global url."https://github.com/".insteadOf ssh://[email protected]/
+            - run: echo "127.0.0.1 localhost.org" >> /etc/hosts
+            - run: go version
+            - run: rm -rf /etc/alternatives/java
+            - run: ln -s /usr/java/jdk-15.0.1/bin/java /etc/alternatives/java
+            - run: go get ./...
+            - run: (cd .circleci/ && ./website.sh)
+            - slack/status
+    test-authreact:
+        docker:
+            - image: rishabhpoddar/supertokens_go_driver_testing
+        resource_class: large
+        steps:
+            - checkout
+            - run: apt-get install lsof
+            - run: git config --global url."https://github.com/".insteadOf ssh://[email protected]/
+            - run: curl -fsSL https://deb.nodesource.com/setup_16.x | bash
+            - run: apt install -y nodejs
+            - run: node --version
+            - run: echo "127.0.0.1 localhost.org" >> /etc/hosts
+            - run: go version
+            - run: rm -rf /etc/alternatives/java
+            - run: ln -s /usr/java/jdk-15.0.1/bin/java /etc/alternatives/java
+            - run: go get ./...
+            - run: (cd .circleci/ && ./authReact.sh)
+            - slack/status
+    test-success:
+        docker:
+            - image: rishabhpoddar/supertokens_go_driver_testing
+        steps:
+            - checkout
+            - run: (cd .circleci/ && ./markAsSuccess.sh)
+            - slack/status
+
+workflows:
+    version: 2
+    tagged-build:
+        jobs:
+            - test-dev-tag-as-not-passed:
+                filters:
+                    tags:
+                        only: /dev-v[0-9]+(\.[0-9]+)*/
+                    branches:
+                        ignore: /.*/
+            - test-unit:
+                requires:
+                    - test-dev-tag-as-not-passed
+                context:
+                    - slack-notification
+                filters:
+                    tags:
+                        only: /dev-v[0-9]+(\.[0-9]+)*/
+                    branches:
+                        ignore: /.*/
+                matrix:
+                    parameters:
+                        cdi-version: placeholder
+            - test-website:
+                requires:
+                    - test-dev-tag-as-not-passed
+                context:
+                    - slack-notification
+                filters:
+                    tags:
+                        only: /dev-v[0-9]+(\.[0-9]+)*/
+                    branches:
+                        ignore: /.*/
+            - test-authreact:
+                requires:
+                    - test-dev-tag-as-not-passed
+                context:
+                    - slack-notification
+                filters:
+                    tags:
+                        only: /dev-v[0-9]+(\.[0-9]+)*/
+                    branches:
+                        ignore: /.*/
+            - test-success:
+                requires:
+                    - test-unit
+                    - test-website
+                    - test-authreact
+                context:
+                    - slack-notification
+                filters:
+                    tags:
+                        only: /dev-v[0-9]+(\.[0-9]+)*/
+                    branches:
+                        ignore: /.*/

.circleci/doUnitTests.sh

@@ -1,55 +1,27 @@
-coreDriverJson=`cat ../coreDriverInterfaceSupported.json`
-coreDriverLength=`echo $coreDriverJson | jq ".versions | length"`
-coreDriverArray=`echo $coreDriverJson | jq ".versions"`
-echo "got core driver relations"
+echo "Starting tests for CDI $1";
 
-frontendDriverJson=`cat ../frontendDriverInterfaceSupported.json`
-frontendDriverLength=`echo $frontendDriverJson | jq ".versions | length"`
-frontendDriverArray=`echo $frontendDriverJson | jq ".versions"`
-echo "got frontend driver relations"
-
-# get driver version
-version=`cat ../supertokens/constants.go | grep -e 'const VERSION'`
-while IFS='"' read -ra ADDR; do
-    counter=0
-    for i in "${ADDR[@]}"; do
-        if [ $counter == 1 ]
-        then
-            version=$i
-        fi
-        counter=$(($counter+1))
-    done
-done <<< "$version"
+if [ -z "$SUPERTOKENS_API_KEY" ]; then
+    echo "SUPERTOKENS_API_KEY not set"
+    exit 1
+fi
 
-someTestsRan=false
-i=0
-while [ $i -lt $coreDriverLength ]; do 
-    coreDriverVersion=`echo $coreDriverArray | jq ".[$i]"`
-    coreDriverVersion=`echo $coreDriverVersion | tr -d '"'`
-    i=$((i+1))
+coreDriverVersion=$1
+coreDriverVersion=`echo $coreDriverVersion | tr -d '"'`
 
-    coreFree=`curl -s -X GET \
+coreFree=`curl -s -X GET \
     "https://api.supertokens.io/0/core-driver-interface/dependency/core/latest?password=$SUPERTOKENS_API_KEY&planType=FREE&mode=DEV&version=$coreDriverVersion" \
     -H 'api-version: 0'`
-    if [[ `echo $coreFree | jq .core` == "null" ]]
-    then
-        echo "fetching latest X.Y version for core given core-driver-interface X.Y version: $coreDriverVersion, planType: FREE gave response: $coreFree. Please make sure all relevant cores have been pushed."
-        exit 1
-    fi
-    coreFree=$(echo $coreFree | jq .core | tr -d '"')
-
-    someTestsRan=true
-    ./setupAndTestWithFreeCore.sh $coreFree $coreDriverVersion
-    if [[ $? -ne 0 ]]
-    then
-        echo "test failed... exiting!"
-        exit 1
-    fi
-    rm -rf ../../supertokens-root
-done
+if [[ `echo $coreFree | jq .core` == "null" ]]
+then
+    echo "fetching latest X.Y version for core given core-driver-interface X.Y version: $coreDriverVersion, planType: FREE gave response: $coreFree. Please make sure all relevant cores have been pushed."
+    exit 1
+fi
+coreFree=$(echo $coreFree | jq .core | tr -d '"')
 
-if [[ $someTestsRan = "false" ]]
+./setupAndTestWithFreeCore.sh $coreFree $coreDriverVersion
+if [[ $? -ne 0 ]]
 then
-    echo "no tests ran... failing!"
+    echo "test failed... exiting!"
     exit 1
-fi
+fi
+rm -rf ../../supertokens-root

.circleci/generateConfig.sh

@@ -0,0 +1,9 @@
+coreDriverJson=`cat ../coreDriverInterfaceSupported.json`
+coreDriverArray=`echo $coreDriverJson | jq ".versions"`
+
+if [ -z "$SUPERTOKENS_API_KEY" ]; then
+    echo "SUPERTOKENS_API_KEY missing"
+    exit 1;
+fi
+
+sed -i -e 's/cdi-version: placeholder/cdi-version: '`printf "%q" $coreDriverArray`'/' config_continue.yml

.circleci/setupAndTestWithFrontend.sh

@@ -52,8 +52,8 @@ cd ../project/test/frontendIntegration/
 go run main.go &
 go run main.go 8082 &
 cd ../../../supertokens-website/test/server
-npm i -d
 npm i git+https://github.com:supertokens/supertokens-node.git#$3
+npm i
 cd ../../
 npm i -d
 SUPERTOKENS_CORE_TAG=$coreTag NODE_PORT=8081 INSTALL_PATH=../supertokens-root npm test

.gitignore

@@ -21,4 +21,4 @@ gin/
 apiPassword
 releasePassword
 .vscode/
-.idea
+.idea/