Skip to content

Commit dab55e3

Browse files
committed
test: run with fle tests
1 parent 3792f16 commit dab55e3

3 files changed

Lines changed: 3 additions & 27 deletions

File tree

.evergreen/config.yml

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1819,21 +1819,6 @@ tasks:
18191819
- func: bootstrap mongo-orchestration
18201820
- func: assume secrets manager rule
18211821
- func: run aws auth test AssumeRoleWithWebIdentity with AWS_ROLE_SESSION_NAME set
1822-
- name: aws-latest-auth-test-run-aws-custom-credential-providers-test
1823-
commands:
1824-
- command: expansions.update
1825-
type: setup
1826-
params:
1827-
updates:
1828-
- {key: VERSION, value: latest}
1829-
- {key: AUTH, value: auth}
1830-
- {key: ORCHESTRATION_FILE, value: auth-aws.json}
1831-
- {key: TOPOLOGY, value: server}
1832-
- {key: MONGODB_AWS_SDK, value: 'true'}
1833-
- func: install dependencies
1834-
- func: bootstrap mongo-orchestration
1835-
- func: assume secrets manager rule
1836-
- func: run aws custom credential providers test
18371822
- name: aws-latest-auth-test-run-aws-auth-test-with-regular-aws-credentials-no-peer-dependencies
18381823
commands:
18391824
- command: expansions.update
@@ -3715,7 +3700,6 @@ buildvariants:
37153700
- aws-latest-auth-test-run-aws-ECS-auth-test
37163701
- aws-latest-auth-test-run-aws-auth-test-AssumeRoleWithWebIdentity-with-AWS_ROLE_SESSION_NAME-unset
37173702
- aws-latest-auth-test-run-aws-auth-test-AssumeRoleWithWebIdentity-with-AWS_ROLE_SESSION_NAME-set
3718-
- aws-latest-auth-test-run-aws-custom-credential-providers-test
37193703
- aws-latest-auth-test-run-aws-auth-test-with-regular-aws-credentials-no-peer-dependencies
37203704
- aws-latest-auth-test-run-aws-auth-test-with-assume-role-credentials-no-peer-dependencies
37213705
- aws-latest-auth-test-run-aws-auth-test-with-aws-credentials-as-environment-variables-no-peer-dependencies

.evergreen/generate_evergreen_tasks.js

Lines changed: 0 additions & 4 deletions
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

test/integration/client-side-encryption/client_side_encryption.prose.25.custom_aws_credential_providers.test.ts renamed to test/integration/client-side-encryption/client_side_encryption.prose.26.custom_aws_credential_providers.test.ts

Lines changed: 3 additions & 7 deletions
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)