Skip to content

Commit 120f0e6

Browse files
committed
test: run with fle tests
1 parent 7db526f commit 120f0e6

File tree

3 files changed

+3
-27
lines changed

3 files changed

+3
-27
lines changed

.evergreen/config.yml

-16
Original file line numberDiff line numberDiff line change
@@ -1811,21 +1811,6 @@ tasks:
18111811
- func: bootstrap mongo-orchestration
18121812
- func: assume secrets manager rule
18131813
- func: run aws auth test AssumeRoleWithWebIdentity with AWS_ROLE_SESSION_NAME set
1814-
- name: aws-latest-auth-test-run-aws-custom-credential-providers-test
1815-
commands:
1816-
- command: expansions.update
1817-
type: setup
1818-
params:
1819-
updates:
1820-
- {key: VERSION, value: latest}
1821-
- {key: AUTH, value: auth}
1822-
- {key: ORCHESTRATION_FILE, value: auth-aws.json}
1823-
- {key: TOPOLOGY, value: server}
1824-
- {key: MONGODB_AWS_SDK, value: 'true'}
1825-
- func: install dependencies
1826-
- func: bootstrap mongo-orchestration
1827-
- func: assume secrets manager rule
1828-
- func: run aws custom credential providers test
18291814
- name: aws-latest-auth-test-run-aws-auth-test-with-regular-aws-credentials-no-peer-dependencies
18301815
commands:
18311816
- command: expansions.update
@@ -3717,7 +3702,6 @@ buildvariants:
37173702
- aws-latest-auth-test-run-aws-ECS-auth-test
37183703
- aws-latest-auth-test-run-aws-auth-test-AssumeRoleWithWebIdentity-with-AWS_ROLE_SESSION_NAME-unset
37193704
- aws-latest-auth-test-run-aws-auth-test-AssumeRoleWithWebIdentity-with-AWS_ROLE_SESSION_NAME-set
3720-
- aws-latest-auth-test-run-aws-custom-credential-providers-test
37213705
- aws-latest-auth-test-run-aws-auth-test-with-regular-aws-credentials-no-peer-dependencies
37223706
- aws-latest-auth-test-run-aws-auth-test-with-assume-role-credentials-no-peer-dependencies
37233707
- aws-latest-auth-test-run-aws-auth-test-with-aws-credentials-as-environment-variables-no-peer-dependencies

.evergreen/generate_evergreen_tasks.js

-4
Original file line numberDiff line numberDiff line change
@@ -351,10 +351,6 @@ for (const VERSION of AWS_AUTH_VERSIONS) {
351351
{
352352
func: 'run aws auth test AssumeRoleWithWebIdentity with AWS_ROLE_SESSION_NAME set',
353353
onlySdk: true
354-
},
355-
{
356-
func: 'run aws custom credential providers test',
357-
onlySdk: true
358354
}
359355
];
360356

+3-7
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,14 @@ const masterKey = {
1616
key: 'arn:aws:kms:us-east-1:579766882180:key/89fcc2c4-08b0-4bd9-9f25-e30687b580d0'
1717
};
1818

19-
const isMongoDBAWSAuthEnvironment = (process.env.MONGODB_URI ?? '').includes('MONGODB-AWS');
20-
2119
describe('25. Custom AWS Credential Providers', metadata, () => {
2220
let keyVaultClient;
2321
let credentialProvider;
2422

2523
beforeEach(async function () {
26-
this.currentTest.skipReason = !isMongoDBAWSAuthEnvironment
27-
? 'Test must run in an AWS auth testing environment'
28-
: !AWSTemporaryCredentialProvider.isAWSSDKInstalled
29-
? 'This test must run in an environment where the AWS SDK is installed.'
30-
: undefined;
24+
this.currentTest.skipReason = !AWSTemporaryCredentialProvider.isAWSSDKInstalled
25+
? 'This test must run in an environment where the AWS SDK is installed.'
26+
: undefined;
3127
this.currentTest?.skipReason && this.skip();
3228

3329
keyVaultClient = this.configuration.newClient(process.env.MONGODB_UR);

0 commit comments

Comments
 (0)