change to two files for local testing

Author: aditi-khare-mongoDB

.gitignore

@@ -68,4 +68,4 @@ examples/ecommerce-netlify-functions/.netlify/state.json
 notes.md
 list.out
 
-encrypted-cluster
+encrypted-cluster

CONTRIBUTING.md

@@ -46,7 +46,7 @@ If you have a question about Mongoose (not a bug report) please post it to eithe
   * execute `npm run test-tsd` to run the typescript tests
   * execute `npm run ts-benchmark` to run the typescript benchmark "performance test" for a single time.
   * execute `npm run ts-benchmark-watch` to run the typescript benchmark "performance test" while watching changes on types folder. Note: Make sure to commit all changes before executing this command.
-* in order to run tests that require an encrypted cluster locally, run `npm run test-encryption-local`. Alternatively, you can start an encrypted cluster using the `scripts/encrypted-cluster.sh` file
+* in order to run tests that require an encrypted cluster locally, run `npm run test-encryption-local`. Alternatively, you can start an encrypted cluster using the `scripts/start-encrypted-cluster.sh` file
 
 ## Documentation
 

package.json

@@ -107,7 +107,7 @@
     "test-rs": "START_REPLICA_SET=1 mocha --timeout 30000 --exit ./test/*.test.js",
     "test-tsd": "node ./test/types/check-types-filename && tsd",
     "test-encryption": "mocha --exit ./test/encryption/*.test.js",
-    "test-encryption-local": "chmod +x scripts/encrypted-cluster.sh && scripts/encrypted-cluster.sh",
+    "test-encryption-local": "chmod +x scripts/run-encryption-tests-local.sh && scripts/run-encryption-tests-local.sh",
     "tdd": "mocha ./test/*.test.js --inspect --watch --recursive --watch-files ./**/*.{js,ts}",
     "test-coverage": "nyc --reporter=html --reporter=text npm test",
     "ts-benchmark": "cd ./benchmarks/typescript/simple && npm install && npm run benchmark | node ../../../scripts/tsc-diagnostics-check"

scripts/encrypted-cluster.sh renamed to scripts/run-encryption-tests-local.sh

@@ -2,34 +2,12 @@
 
 # sets up an encrypted mongodb cluster
 
+export CWD=$(pwd);
+
 if [ -d "encrypted-cluster" ]; then
   cd encrypted-cluster
 else
-  mkdir encrypted-cluster
-  cd encrypted-cluster
-
-  if [-d drivers-evergreen-tools]; then 
-    git clone --depth=1 "https://github.com/mongodb-labs/drivers-evergreen-tools.git"
-  fi
-
-  export DRIVERS_TOOLS=$(pwd)/drivers-evergreen-tools
-  export MONGODB_VERSION=8.0
-  export AUTH=true
-  export MONGODB_BINARIES=$DRIVERS_TOOLS/mongodb/bin
-  export NODE_DRIVER=~/dev/node-mongodb-native
-  export MONGO_ORCHESTRATION_HOME=$DRIVERS_TOOLS/mo
-  export PROJECT_ORCHESTRATION_HOME=$DRIVERS_TOOLS/.evergreen/orchestration
-  export TOPOLOGY=sharded_cluster
-  export SSL=nossl
-
-  cd $DRIVERS_TOOLS
-  rm -rf mongosh mongodb mo
-  mkdir mo
-  cd -
-
-  rm expansions.sh 2> /dev/null
-
-  bash $DRIVERS_TOOLS/.evergreen/run-orchestration.sh
+  source $CWD/scripts/start-encrypted-cluster.sh
 fi
 
 # IMPORTANT: extracts mongodb-uri, and starts the cluster of servers, store the uri for GitHub output

scripts/start-encrypted-cluster.sh

@@ -0,0 +1,27 @@
+
+export CWD=$(pwd);
+mkdir encrypted-cluster
+cd encrypted-cluster
+
+if [ ! -d "drivers-evergreen-tools/" ]; then
+ git clone --depth=1 "https://github.com/mongodb-labs/drivers-evergreen-tools.git"
+fi
+
+export DRIVERS_TOOLS=$CWD/encrypted-cluster/drivers-evergreen-tools
+export MONGODB_VERSION=8.0
+export AUTH=true
+export MONGODB_BINARIES=$DRIVERS_TOOLS/mongodb/bin
+export NODE_DRIVER=~/dev/node-mongodb-native
+export MONGO_ORCHESTRATION_HOME=$DRIVERS_TOOLS/mo
+export PROJECT_ORCHESTRATION_HOME=$DRIVERS_TOOLS/.evergreen/orchestration
+export TOPOLOGY=sharded_cluster
+export SSL=nossl
+
+cd $DRIVERS_TOOLS
+rm -rf mongosh mongodb mo
+mkdir mo
+cd -
+
+rm expansions.sh 2> /dev/null
+
+bash $DRIVERS_TOOLS/.evergreen/run-orchestration.sh