test: use same unified script

Author: durran

.evergreen/run-oidc-auth-tests.sh

@@ -22,17 +22,15 @@ if [ "$PROVIDER_NAME" = "azure" ]; then
   MONGODB_URI="${MONGODB_URI}&authMechanismProperties=PROVIDER_NAME:azure"
   MONGODB_URI="${MONGODB_URI},TOKEN_AUDIENCE:api%3A%2F%2F${AZUREOIDC_CLIENTID}"
   export MONGODB_URI="${MONGODB_URI},TOKEN_CLIENT_ID:${AZUREOIDC_TOKENCLIENT}"
-  export UTIL_CLIENT_USER="bob"
-  export UTIL_CLIENT_PASSWORD="pwd123"
-  npm run check:oidc-auth-azure
 else
   if [ -z "${OIDC_TOKEN_DIR}" ]; then
     echo "Must specify OIDC_TOKEN_DIR"
     exit 1
   fi
 
   export MONGODB_URI="${MONGODB_URI}/test?authMechanism=MONGODB-OIDC&authMechanismProperties=PROVIDER_NAME:aws"
-  export UTIL_CLIENT_USER="bob"
-  export UTIL_CLIENT_PASSWORD="pwd123"
-  npm run check:oidc-auth-aws
-fi
+fi
+
+export UTIL_CLIENT_USER="bob"
+export UTIL_CLIENT_PASSWORD="pwd123"
+npm run check:oidc-auth

package.json

@@ -148,7 +148,7 @@
     "check:adl": "mocha --config test/mocha_mongodb.json test/manual/atlas-data-lake-testing",
     "check:aws": "nyc mocha --config test/mocha_mongodb.json test/integration/auth/mongodb_aws.test.ts",
     "check:oidc": "mocha --config test/mocha_mongodb.json test/manual/mongodb_oidc.prose.test.ts",
-    "check:oidc-auth-aws": "mocha --config test/mocha_mongodb.json test/integration/auth/auth.spec.test.ts",
+    "check:oidc-auth": "mocha --config test/mocha_mongodb.json test/integration/auth/auth.spec.test.ts",
     "check:oidc-azure": "mocha --config test/mocha_mongodb.json test/integration/auth/mongodb_oidc_azure.prose.test.ts",
     "check:ocsp": "mocha --config test/manual/mocharc.json test/manual/ocsp_support.test.js",
     "check:kerberos": "nyc mocha --config test/manual/mocharc.json test/manual/kerberos.test.ts",