Skip to content

Commit 6dddde7

Browse files
nbbeekennbbeeken
authored
ci(NODE-6890): add AWS variables to env from expansions in AWS auth tests (#4500)
1 parent 41dce2a commit 6dddde7

File tree

6 files changed

+91
-37
lines changed

6 files changed

+91
-37
lines changed

‎.evergreen/ci_matrix_constants.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ const versions = [
33
{ codeName: 'gallium', versionNumber: 16, npmVersion: 9 },
44
{ codeName: 'hydrogen', versionNumber: 18, npmVersion: 10 },
55
{ codeName: 'iron', versionNumber: 20, npmVersion: 'latest' },
6-
{ codeName: 'jod', versionNumber: 22, npmVersion: 'latest' },
6+
{ codeName: 'jod', versionNumber: 22, npmVersion: 'latest' }
77
];
88
const NODE_VERSIONS = versions.map(({ versionNumber }) => versionNumber).sort();
99
const LOWEST_LTS = NODE_VERSIONS[0];

‎.evergreen/config.in.yml

Lines changed: 41 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,8 @@ functions:
143143
working_dir: src
144144
binary: bash
145145
env:
146-
AUTH: 'auth'
147-
SSL: 'ssl'
146+
AUTH: "auth"
147+
SSL: "ssl"
148148
add_expansions_to_env: true
149149
args:
150150
- .evergreen/run-serverless-tests.sh
@@ -454,6 +454,9 @@ functions:
454454
- MONGODB_URI
455455
- DRIVERS_TOOLS
456456
- MONGODB_AWS_SDK
457+
- AWS_ACCESS_KEY_ID
458+
- AWS_SECRET_ACCESS_KEY
459+
- AWS_SESSION_TOKEN
457460
env:
458461
AWS_CREDENTIAL_TYPE: regular
459462
working_dir: "src"
@@ -469,6 +472,9 @@ functions:
469472
- MONGODB_URI
470473
- DRIVERS_TOOLS
471474
- MONGODB_AWS_SDK
475+
- AWS_ACCESS_KEY_ID
476+
- AWS_SECRET_ACCESS_KEY
477+
- AWS_SESSION_TOKEN
472478
env:
473479
AWS_CREDENTIAL_TYPE: assume-role
474480
working_dir: "src"
@@ -484,9 +490,12 @@ functions:
484490
- MONGODB_URI
485491
- DRIVERS_TOOLS
486492
- MONGODB_AWS_SDK
493+
- AWS_ACCESS_KEY_ID
494+
- AWS_SECRET_ACCESS_KEY
495+
- AWS_SESSION_TOKEN
487496
env:
488497
AWS_CREDENTIAL_TYPE: ec2
489-
IS_EC2: 'true'
498+
IS_EC2: "true"
490499
working_dir: src
491500
binary: bash
492501
args:
@@ -500,6 +509,9 @@ functions:
500509
- MONGODB_URI
501510
- DRIVERS_TOOLS
502511
- MONGODB_AWS_SDK
512+
- AWS_ACCESS_KEY_ID
513+
- AWS_SECRET_ACCESS_KEY
514+
- AWS_SESSION_TOKEN
503515
env:
504516
AWS_CREDENTIAL_TYPE: env-creds
505517
working_dir: "src"
@@ -515,6 +527,9 @@ functions:
515527
- MONGODB_URI
516528
- DRIVERS_TOOLS
517529
- MONGODB_AWS_SDK
530+
- AWS_ACCESS_KEY_ID
531+
- AWS_SECRET_ACCESS_KEY
532+
- AWS_SESSION_TOKEN
518533
env:
519534
AWS_CREDENTIAL_TYPE: session-creds
520535
working_dir: "src"
@@ -530,6 +545,9 @@ functions:
530545
- MONGODB_URI
531546
- DRIVERS_TOOLS
532547
- MONGODB_AWS_SDK
548+
- AWS_ACCESS_KEY_ID
549+
- AWS_SECRET_ACCESS_KEY
550+
- AWS_SESSION_TOKEN
533551
env:
534552
AWS_CREDENTIAL_TYPE: web-identity
535553
AWS_ROLE_SESSION_NAME: test
@@ -546,6 +564,9 @@ functions:
546564
- MONGODB_URI
547565
- DRIVERS_TOOLS
548566
- MONGODB_AWS_SDK
567+
- AWS_ACCESS_KEY_ID
568+
- AWS_SECRET_ACCESS_KEY
569+
- AWS_SESSION_TOKEN
549570
env:
550571
AWS_CREDENTIAL_TYPE: web-identity
551572
working_dir: "src"
@@ -562,6 +583,9 @@ functions:
562583
- MONGODB_AWS_SDK
563584
- PROJECT_DIRECTORY
564585
- MONGODB_BINARIES
586+
- AWS_ACCESS_KEY_ID
587+
- AWS_SECRET_ACCESS_KEY
588+
- AWS_SESSION_TOKEN
565589
env:
566590
AWS_CREDENTIAL_TYPE: web-identity
567591
working_dir: "src"
@@ -601,7 +625,7 @@ functions:
601625
- DRIVERS_TOOLS
602626
env:
603627
AWS_CREDENTIAL_TYPE: env-creds
604-
MONGODB_AWS_SDK: 'true'
628+
MONGODB_AWS_SDK: "true"
605629
working_dir: "src"
606630
binary: bash
607631
args:
@@ -735,12 +759,12 @@ functions:
735759
- .evergreen/docker/alpine.sh
736760

737761
tasks:
738-
- name: 'test-atlas-data-lake'
762+
- name: "test-atlas-data-lake"
739763
tags: ["datalake", "mongohouse"]
740764
commands:
741-
- func: 'install dependencies'
742-
- func: 'bootstrap mongohoused'
743-
- func: 'run data lake tests'
765+
- func: "install dependencies"
766+
- func: "bootstrap mongohoused"
767+
- func: "run data lake tests"
744768

745769
- name: "test-serverless"
746770
tags: ["serverless"]
@@ -841,7 +865,8 @@ tasks:
841865
ENVIRONMENT: k8s
842866
K8S_VARIANT: eks
843867
SCRIPT: run-oidc-prose-tests.sh
844-
include_expansions_in_env: ["AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN"]
868+
include_expansions_in_env:
869+
["AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN"]
845870
args:
846871
- .evergreen/run-oidc-tests-k8s.sh
847872

@@ -859,7 +884,8 @@ tasks:
859884
ENVIRONMENT: k8s
860885
K8S_VARIANT: gke
861886
SCRIPT: run-oidc-prose-tests.sh
862-
include_expansions_in_env: ["AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN"]
887+
include_expansions_in_env:
888+
["AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN"]
863889
args:
864890
- .evergreen/run-oidc-tests-k8s.sh
865891

@@ -877,7 +903,8 @@ tasks:
877903
ENVIRONMENT: k8s
878904
K8S_VARIANT: aks
879905
SCRIPT: run-oidc-prose-tests.sh
880-
include_expansions_in_env: ["AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN"]
906+
include_expansions_in_env:
907+
["AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN"]
881908
args:
882909
- .evergreen/run-oidc-tests-k8s.sh
883910

@@ -1144,11 +1171,12 @@ task_groups:
11441171
- command: subprocess.exec
11451172
params:
11461173
binary: bash
1147-
include_expansions_in_env: ["AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN"]
1174+
include_expansions_in_env:
1175+
["AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN"]
11481176
env:
11491177
MONGODB_VERSION: "8.0"
11501178
args:
1151-
- ${DRIVERS_TOOLS}/.evergreen/auth_oidc/setup.sh
1179+
- ${DRIVERS_TOOLS}/.evergreen/auth_oidc/setup.sh
11521180
setup_group_can_fail_task: true
11531181
setup_group_timeout_secs: 1800
11541182
tasks:

‎.evergreen/config.yml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -397,6 +397,9 @@ functions:
397397
- MONGODB_URI
398398
- DRIVERS_TOOLS
399399
- MONGODB_AWS_SDK
400+
- AWS_ACCESS_KEY_ID
401+
- AWS_SECRET_ACCESS_KEY
402+
- AWS_SESSION_TOKEN
400403
env:
401404
AWS_CREDENTIAL_TYPE: regular
402405
working_dir: src
@@ -411,6 +414,9 @@ functions:
411414
- MONGODB_URI
412415
- DRIVERS_TOOLS
413416
- MONGODB_AWS_SDK
417+
- AWS_ACCESS_KEY_ID
418+
- AWS_SECRET_ACCESS_KEY
419+
- AWS_SESSION_TOKEN
414420
env:
415421
AWS_CREDENTIAL_TYPE: assume-role
416422
working_dir: src
@@ -425,6 +431,9 @@ functions:
425431
- MONGODB_URI
426432
- DRIVERS_TOOLS
427433
- MONGODB_AWS_SDK
434+
- AWS_ACCESS_KEY_ID
435+
- AWS_SECRET_ACCESS_KEY
436+
- AWS_SESSION_TOKEN
428437
env:
429438
AWS_CREDENTIAL_TYPE: ec2
430439
IS_EC2: 'true'
@@ -440,6 +449,9 @@ functions:
440449
- MONGODB_URI
441450
- DRIVERS_TOOLS
442451
- MONGODB_AWS_SDK
452+
- AWS_ACCESS_KEY_ID
453+
- AWS_SECRET_ACCESS_KEY
454+
- AWS_SESSION_TOKEN
443455
env:
444456
AWS_CREDENTIAL_TYPE: env-creds
445457
working_dir: src
@@ -454,6 +466,9 @@ functions:
454466
- MONGODB_URI
455467
- DRIVERS_TOOLS
456468
- MONGODB_AWS_SDK
469+
- AWS_ACCESS_KEY_ID
470+
- AWS_SECRET_ACCESS_KEY
471+
- AWS_SESSION_TOKEN
457472
env:
458473
AWS_CREDENTIAL_TYPE: session-creds
459474
working_dir: src
@@ -468,6 +483,9 @@ functions:
468483
- MONGODB_URI
469484
- DRIVERS_TOOLS
470485
- MONGODB_AWS_SDK
486+
- AWS_ACCESS_KEY_ID
487+
- AWS_SECRET_ACCESS_KEY
488+
- AWS_SESSION_TOKEN
471489
env:
472490
AWS_CREDENTIAL_TYPE: web-identity
473491
AWS_ROLE_SESSION_NAME: test
@@ -483,6 +501,9 @@ functions:
483501
- MONGODB_URI
484502
- DRIVERS_TOOLS
485503
- MONGODB_AWS_SDK
504+
- AWS_ACCESS_KEY_ID
505+
- AWS_SECRET_ACCESS_KEY
506+
- AWS_SESSION_TOKEN
486507
env:
487508
AWS_CREDENTIAL_TYPE: web-identity
488509
working_dir: src
@@ -498,6 +519,9 @@ functions:
498519
- MONGODB_AWS_SDK
499520
- PROJECT_DIRECTORY
500521
- MONGODB_BINARIES
522+
- AWS_ACCESS_KEY_ID
523+
- AWS_SECRET_ACCESS_KEY
524+
- AWS_SESSION_TOKEN
501525
env:
502526
AWS_CREDENTIAL_TYPE: web-identity
503527
working_dir: src

‎.evergreen/generate_evergreen_tasks.js

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,7 @@ for (const {
443443
display_name: `${osDisplayName} Node Latest`,
444444
run_on,
445445
expansions: { NODE_LTS_VERSION: 'latest' },
446-
tasks: tasks.map(({ name }) => name),
446+
tasks: tasks.map(({ name }) => name)
447447
};
448448
if (clientEncryption) {
449449
buildVariantData.expansions.CLIENT_ENCRYPTION = true;
@@ -727,26 +727,24 @@ const coverageTask = {
727727
SINGLETON_TASKS.push(coverageTask);
728728
SINGLETON_TASKS.push(...customDependencyTests);
729729

730-
SINGLETON_TASKS.push(
731-
{
732-
name: `test-alpine-fle`,
733-
tags: ['alpine-fle'],
734-
commands: [
735-
updateExpansions({
736-
NODE_VERSION: '16.20.1',
737-
VERSION: 'latest',
738-
TOPOLOGY: 'replica_set',
739-
CLIENT_ENCRYPTION: true,
740-
TEST_CSFLE: true,
741-
MONGODB_BINARIES: '${PROJECT_DIRECTORY}/mongodb/bin',
742-
}),
743-
{ func: 'install dependencies' },
744-
{ func: 'bootstrap mongo-orchestration' },
745-
{ func: 'assume secrets manager rule' },
746-
{ func: 'build and test alpine FLE' }
747-
]
748-
}
749-
)
730+
SINGLETON_TASKS.push({
731+
name: `test-alpine-fle`,
732+
tags: ['alpine-fle'],
733+
commands: [
734+
updateExpansions({
735+
NODE_VERSION: '16.20.1',
736+
VERSION: 'latest',
737+
TOPOLOGY: 'replica_set',
738+
CLIENT_ENCRYPTION: true,
739+
TEST_CSFLE: true,
740+
MONGODB_BINARIES: '${PROJECT_DIRECTORY}/mongodb/bin'
741+
}),
742+
{ func: 'install dependencies' },
743+
{ func: 'bootstrap mongo-orchestration' },
744+
{ func: 'assume secrets manager rule' },
745+
{ func: 'build and test alpine FLE' }
746+
]
747+
});
750748

751749
function addPerformanceTasks() {
752750
const makePerfTask = (name, MONGODB_CLIENT_OPTIONS) => ({

‎.evergreen/perf_send.mjs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ const {
2323
const orderSplit = revision_order_id?.split('_');
2424
const order = Number(orderSplit ? orderSplit[orderSplit.length - 1] : undefined);
2525

26-
if (!Number.isInteger(order)) throw new Error(`Failed to parse integer from order, revision_order_id=${revision_order_id}`);
26+
if (!Number.isInteger(order))
27+
throw new Error(`Failed to parse integer from order, revision_order_id=${revision_order_id}`);
2728

2829
const results = JSON.parse(await fs.readFile(resultFile, 'utf8'));
2930

@@ -53,7 +54,7 @@ const resp = await fetch(API_PATH, {
5354
const responseText = await resp.text();
5455
let jsonResponse = null;
5556
try {
56-
jsonResponse = JSON.parse(responseText)
57+
jsonResponse = JSON.parse(responseText);
5758
} catch (cause) {
5859
console.log('Failed to parse json response', cause);
5960
}

‎.evergreen/run-lint-checks.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,8 @@ if ! git diff --exit-code ./.evergreen/config.yml; then
1515
fi
1616
set -o xtrace
1717

18+
npx prettier --check --single-quote=false .evergreen/config.in.yml
19+
npx prettier --check .evergreen/*.js .evergreen/*.mjs
20+
1821
## Checks typescript, eslint, and prettier
1922
npm run check:lint

0 commit comments

Comments
 (0)