test: cleanup

Author: durran

.evergreen/config.in.yml

@@ -548,21 +548,6 @@ functions:
         args:
           - .evergreen/prepare-mongodb-aws-ecs-auth.sh
 
-  "run aws custom credential providers test":
-    - command: subprocess.exec
-      type: test
-      params:
-        include_expansions_in_env:
-          - MONGODB_URI
-          - DRIVERS_TOOLS
-          - MONGODB_AWS_SDK
-        env:
-          AWS_CREDENTIAL_TYPE: env-creds
-        working_dir: "src"
-        binary: bash
-        args:
-          - .evergreen/run-aws-custom-credential-providers-test.sh
-
   "run custom csfle tests":
     - command: subprocess.exec
       type: test

.evergreen/config.yml

@@ -485,20 +485,6 @@ functions:
         binary: bash
         args:
           - .evergreen/prepare-mongodb-aws-ecs-auth.sh
-  run aws custom credential providers test:
-    - command: subprocess.exec
-      type: test
-      params:
-        include_expansions_in_env:
-          - MONGODB_URI
-          - DRIVERS_TOOLS
-          - MONGODB_AWS_SDK
-        env:
-          AWS_CREDENTIAL_TYPE: env-creds
-        working_dir: src
-        binary: bash
-        args:
-          - .evergreen/run-aws-custom-credential-providers-test.sh
   run custom csfle tests:
     - command: subprocess.exec
       type: test

.evergreen/run-aws-custom-credential-providers-test.sh

@@ -2,6 +2,7 @@ import { expect } from 'chai';
 
 /* eslint-disable @typescript-eslint/no-restricted-imports */
 import { ClientEncryption } from '../../../src/client-side-encryption/client_encryption';
+import { getCSFLEKMSProviders } from '../../csfle-kms-providers';
 import { AWSTemporaryCredentialProvider, Binary } from '../../mongodb';
 import { getEncryptExtraOptions } from '../../tools/utils';
 
@@ -59,11 +60,13 @@ describe('25. Custom AWS Credential Providers', metadata, () => {
     let clientEncryption;
 
     beforeEach(function () {
-      clientEncryption = new ClientEncryption(keyVaultClient, {
+      const options = {
         keyVaultNamespace: 'keyvault.datakeys',
-        kmsProviders: { aws: {} },
-        credentialProviders: { aws: credentialProvider.fromNodeProviderChain() }
-      });
+        kmsProviders: getCSFLEKMSProviders(),
+        credentialProviders: { aws: credentialProvider.fromNodeProviderChain() },
+        extraOptions: getEncryptExtraOptions()
+      };
+      clientEncryption = new ClientEncryption(keyVaultClient, options);
     });
 
     it('is successful', async function () {