Skip to content

Commit 2ab2189

Browse files
ci(NODE-5668): remove custom dep tests against master and fix prose test 14 (#3884)
Co-authored-by: Neal Beeken <neal.beeken@mongodb.com>
1 parent 74833fb commit 2ab2189

File tree

3 files changed

+22
-78
lines changed

3 files changed

+22
-78
lines changed

.evergreen/config.yml

Lines changed: 0 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -3069,23 +3069,6 @@ tasks:
30693069
- func: bootstrap mongo-orchestration
30703070
- func: bootstrap kms servers
30713071
- func: run custom csfle tests
3072-
- name: run-custom-csfle-tests-5.0-master
3073-
tags:
3074-
- run-custom-dependency-tests
3075-
commands:
3076-
- command: expansions.update
3077-
type: setup
3078-
params:
3079-
updates:
3080-
- {key: NODE_LTS_VERSION, value: '14'}
3081-
- {key: NPM_VERSION, value: '9'}
3082-
- {key: VERSION, value: '5.0'}
3083-
- {key: TOPOLOGY, value: replica_set}
3084-
- {key: CSFLE_GIT_REF, value: master}
3085-
- func: install dependencies
3086-
- func: bootstrap mongo-orchestration
3087-
- func: bootstrap kms servers
3088-
- func: run custom csfle tests
30893072
- name: run-custom-csfle-tests-rapid-pinned-commit
30903073
tags:
30913074
- run-custom-dependency-tests
@@ -3103,23 +3086,6 @@ tasks:
31033086
- func: bootstrap mongo-orchestration
31043087
- func: bootstrap kms servers
31053088
- func: run custom csfle tests
3106-
- name: run-custom-csfle-tests-rapid-master
3107-
tags:
3108-
- run-custom-dependency-tests
3109-
commands:
3110-
- command: expansions.update
3111-
type: setup
3112-
params:
3113-
updates:
3114-
- {key: NODE_LTS_VERSION, value: '14'}
3115-
- {key: NPM_VERSION, value: '9'}
3116-
- {key: VERSION, value: rapid}
3117-
- {key: TOPOLOGY, value: replica_set}
3118-
- {key: CSFLE_GIT_REF, value: master}
3119-
- func: install dependencies
3120-
- func: bootstrap mongo-orchestration
3121-
- func: bootstrap kms servers
3122-
- func: run custom csfle tests
31233089
- name: run-custom-csfle-tests-latest-pinned-commit
31243090
tags:
31253091
- run-custom-dependency-tests
@@ -3137,23 +3103,6 @@ tasks:
31373103
- func: bootstrap mongo-orchestration
31383104
- func: bootstrap kms servers
31393105
- func: run custom csfle tests
3140-
- name: run-custom-csfle-tests-latest-master
3141-
tags:
3142-
- run-custom-dependency-tests
3143-
commands:
3144-
- command: expansions.update
3145-
type: setup
3146-
params:
3147-
updates:
3148-
- {key: NODE_LTS_VERSION, value: '14'}
3149-
- {key: NPM_VERSION, value: '9'}
3150-
- {key: VERSION, value: latest}
3151-
- {key: TOPOLOGY, value: replica_set}
3152-
- {key: CSFLE_GIT_REF, value: master}
3153-
- func: install dependencies
3154-
- func: bootstrap mongo-orchestration
3155-
- func: bootstrap kms servers
3156-
- func: run custom csfle tests
31573106
- name: test-latest-server-noauth
31583107
tags:
31593108
- latest
@@ -4483,11 +4432,8 @@ buildvariants:
44834432
run_on: rhel80-large
44844433
tasks:
44854434
- run-custom-csfle-tests-5.0-pinned-commit
4486-
- run-custom-csfle-tests-5.0-master
44874435
- run-custom-csfle-tests-rapid-pinned-commit
4488-
- run-custom-csfle-tests-rapid-master
44894436
- run-custom-csfle-tests-latest-pinned-commit
4490-
- run-custom-csfle-tests-latest-master
44914437
- name: rhel8-test-serverless
44924438
display_name: Serverless Test
44934439
run_on: rhel80-large

.evergreen/generate_evergreen_tasks.js

Lines changed: 17 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -611,28 +611,24 @@ BUILD_VARIANTS.push({
611611

612612
const oneOffFuncAsTasks = [];
613613

614-
const FLE_PINNED_COMMIT = 'c56c70340093070b1ef5c8a28190187eea21a6e9';
615-
616614
for (const version of ['5.0', 'rapid', 'latest']) {
617-
for (const ref of [FLE_PINNED_COMMIT, 'master']) {
618-
oneOffFuncAsTasks.push({
619-
name: `run-custom-csfle-tests-${version}-${ref === 'master' ? ref : 'pinned-commit'}`,
620-
tags: ['run-custom-dependency-tests'],
621-
commands: [
622-
updateExpansions({
623-
NODE_LTS_VERSION: LOWEST_LTS,
624-
NPM_VERSION: 9,
625-
VERSION: version,
626-
TOPOLOGY: 'replica_set',
627-
CSFLE_GIT_REF: ref
628-
}),
629-
{ func: 'install dependencies' },
630-
{ func: 'bootstrap mongo-orchestration' },
631-
{ func: 'bootstrap kms servers' },
632-
{ func: 'run custom csfle tests' }
633-
]
634-
});
635-
}
615+
oneOffFuncAsTasks.push({
616+
name: `run-custom-csfle-tests-${version}-pinned-commit`,
617+
tags: ['run-custom-dependency-tests'],
618+
commands: [
619+
updateExpansions({
620+
NODE_LTS_VERSION: LOWEST_LTS,
621+
NPM_VERSION: 9,
622+
VERSION: version,
623+
TOPOLOGY: 'replica_set',
624+
CSFLE_GIT_REF: 'c56c70340093070b1ef5c8a28190187eea21a6e9'
625+
}),
626+
{ func: 'install dependencies' },
627+
{ func: 'bootstrap mongo-orchestration' },
628+
{ func: 'bootstrap kms servers' },
629+
{ func: 'run custom csfle tests' }
630+
]
631+
});
636632
}
637633

638634
const coverageTask = {

test/integration/client-side-encryption/client_side_encryption.prose.14.decryption_events.test.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,12 @@ describe('14. Decryption Events', metadata, function () {
7474
keyId: keyId,
7575
algorithm: 'AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic'
7676
});
77-
// Copy ``ciphertext`` into a variable named ``malformedCiphertext``.
78-
// Change the last byte to 0. This will produce an invalid HMAC tag.
77+
// Copy ``ciphertext`` into a variable named ``malformedCiphertext``. Change the
78+
// last byte to a different value. This will produce an invalid HMAC tag.
7979
const buffer = Buffer.from(cipherText.buffer);
80-
buffer.writeInt8(0, buffer.length - 1);
80+
const lastByte = buffer.readUInt8(buffer.length - 1);
81+
const replacementByte = lastByte === 0 ? 1 : 0;
82+
buffer.writeUInt8(replacementByte, buffer.length - 1);
8183
malformedCiphertext = new Binary(buffer, 6);
8284
// Create a MongoClient named ``encryptedClient`` with these ``AutoEncryptionOpts``:
8385
// AutoEncryptionOpts {

0 commit comments

Comments
 (0)