hasura · wawhal · Oct 21, 2019 · Oct 23, 2019 · Oct 23, 2019 · Oct 23, 2019
diff --git a/.ciignore b/.ciignore
diff --git a/.circleci/ciignore.sh b/.circleci/ciignore.sh
@@ -25,11 +25,6 @@ if [[ "$CIRCLE_BRANCH" = "release-"* ]]; then
     exit
 fi
 
-if [[ ! -a "$ROOT/.ciignore" ]]; then
-    echo "Skipping check since .ciignore is not found"
-	  exit # If .ciignore doesn't exists, just quit this script
-fi
-
 # get the diff
 if [[ ! -z "$CIRCLE_COMPARE_URL" ]]; then
     # CIRCLE_COMPARE_URL is not empty, use it to get the diff
@@ -39,36 +34,21 @@ if [[ ! -z "$CIRCLE_COMPARE_URL" ]]; then
         COMMIT_RANGE=$(echo $CIRCLE_COMPARE_URL | sed 's:^.*/compare/::g')
     fi
     echo "Diff: $COMMIT_RANGE"
-    changes="$(git diff $COMMIT_RANGE --name-only)"
+    changes="$(git diff $COMMIT_RANGE --name-only -- . ':!scripts' ':!assets' ':!docs' ':!community' ':!install-manifests' ':!github' ':!*.md' ':!.ciignore' ':!.gitignore' ':!LICENSE')"
 elif [[ "$CIRCLE_BRANCH" == "master" ]]; then
     # CIRCLE_COMPARE_URL is not set, but branch is master, diff with last commit
     echo "Diff: HEAD~1"
-    changes="$(git diff HEAD~1 --name-only)"
+    changes="$(git diff HEAD~1 --name-only -- . ':!scripts' ':!assets' ':!docs' ':!community' ':!install-manifests' ':!github' ':!*.md' ':!.ciignore' ':!.gitignore' ':!LICENSE')"
 else
     # CIRCLE_COMPARE_URL is not set, branch is not master, diff with origin/master
     echo "Diff: origin/master..HEAD"
-    changes="$(git diff-tree --no-commit-id --name-only -r origin/master..HEAD)"
+    changes="$(git diff-tree --no-commit-id --name-only -r origin/master..HEAD -- . ':!scripts' ':!assets' ':!docs' ':!community' ':!install-manifests' ':!github' ':!*.md' ':!.ciignore' ':!.gitignore' ':!LICENSE')"
 fi
 
 echo "Changes in this build:"
 echo $changes
 echo
 
-# Load the patterns we want to skip into an array
-mapfile -t blacklist < "$ROOT/.ciignore"
-
-for i in "${blacklist[@]}"
-do
-	  # Remove the current pattern from the list of changes
-	  changes=( ${changes[@]/$i/} )
-
-	  if [[ ${#changes[@]} -eq 0 ]]; then
-		    # If we've exhausted the list of changes before we've finished going
-		    # through patterns, that's okay, just quit the loop
-		    break
-	  fi
-done
-
 if [[ ${#changes[@]} -gt 0 ]]; then
 	  # If there's still changes left, then we have stuff to build, leave the commit alone.
     echo "Files that are not ignored present in commits, need to build, succeed the job"

diff --git a/.circleci/test-server.sh b/.circleci/test-server.sh
@@ -561,6 +561,8 @@ wait_for_port 5001
 
 cache_control_jwk_url='{"type": "RS256", "jwk_url": "http://localhost:5001/jwk-cache-control"}'
 expires_jwk_url='{"type": "RS256", "jwk_url": "http://localhost:5001/jwk-expires"}'
+cc_nomaxage_jwk_url='{"type": "RS256", "jwk_url": "http://localhost:5001/jwk-cache-control?nomaxage"}'
+cc_nocache_jwk_url='{"type": "RS256", "jwk_url": "http://localhost:5001/jwk-cache-control?nocache"}'
 
 # start HGE with cache control JWK URL
 export HASURA_GRAPHQL_JWT_SECRET=$cache_control_jwk_url
@@ -596,6 +598,26 @@ pytest -n 1 -vv --hge-urls "$HGE_URL" --pg-urls "$HASURA_GRAPHQL_DATABASE_URL" -
 
 kill_hge_servers
 
+# start HGE with nomaxage JWK URL
+export HASURA_GRAPHQL_JWT_SECRET=$cc_nomaxage_jwk_url
+run_hge_with_args serve
+wait_for_port 8080
+
+pytest -n 1 -vv --hge-urls "$HGE_URL" --pg-urls "$HASURA_GRAPHQL_DATABASE_URL" --hge-key="$HASURA_GRAPHQL_ADMIN_SECRET" --test-jwk-url test_jwk.py -k 'test_cache_control_header'
+
+kill_hge_servers
+unset HASURA_GRAPHQL_JWT_SECRET
+
+# start HGE with nocache JWK URL
+export HASURA_GRAPHQL_JWT_SECRET=$cc_nocache_jwk_url
+run_hge_with_args serve
+wait_for_port 8080
+
+pytest -n 1 -vv --hge-urls "$HGE_URL" --pg-urls "$HASURA_GRAPHQL_DATABASE_URL" --hge-key="$HASURA_GRAPHQL_ADMIN_SECRET" --test-jwk-url test_jwk.py -k 'test_cache_control_header'
+
+kill_hge_servers
+unset HASURA_GRAPHQL_JWT_SECRET
+
 kill $JWKS_PID
 
 # end jwk url test

@@ -81,6 +81,7 @@
     "jsx-a11y/no-autofocus": 0,
     "max-len": 0,
     "no-continue": 0,
+    "eqeqeq": 0,
     "no-nested-ternary": 0
   },
   "plugins": [