Skip to content

chore(NODE-6847): fix flaky KMS closed error in should pass corpus without client schema #4458

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

chore(NODE-6847): fix flaky KMS closed error in should pass corpus without client schema #4458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/client-side-encryption/state_machine.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,8 +367,9 @@ export class StateMachine {
return new MongoCryptError('KMS request failed', { cause });
}

const closeError = new MongoCryptError('KMS request will close');
function onclose() {
return new MongoCryptError('KMS request closed');
return new MongoCryptError('KMS request closed', { cause: closeError });
}

const tlsOptions = this.options.tlsOptions;
Expand Down
22 changes: 14 additions & 8 deletions test/integration/client-side-encryption/client_side_encryption.prose.06.corpus.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@ import { expect } from 'chai';
import * as fs from 'fs';
import * as path from 'path';

import { type ClientEncryptionEncryptOptions } from '../../../mongodb';
// eslint-disable-next-line @typescript-eslint/no-restricted-imports
import { ClientEncryption } from '../../../src/client-side-encryption/client_encryption';
import { getCSFLEKMSProviders } from '../../csfle-kms-providers';
import { type MongoClient, WriteConcern } from '../../mongodb';
import { type AutoEncryptionOptions, type MongoClient, WriteConcern } from '../../mongodb';
import { getEncryptExtraOptions } from '../../tools/utils';

describe('Client Side Encryption Prose Corpus Test', function () {
Expand Down Expand Up @@ -68,7 +69,7 @@ describe('Client Side Encryption Prose Corpus Test', function () {
const algorithmMap = new Map([
['rand', 'AEAD_AES_256_CBC_HMAC_SHA_512-Random'],
['det', 'AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic']
]);
] as const);
const identifierMap = new Map([
['local', corpusKeyLocal._id],
['aws', corpusKeyAws._id],
Expand Down Expand Up @@ -161,7 +162,12 @@ describe('Client Side Encryption Prose Corpus Test', function () {

afterEach(() => client?.close());

function defineCorpusTests(corpus, corpusEncryptedExpected, useClientSideSchema: boolean) {
function defineCorpusTests(
corpus,
corpusEncryptedExpected,
useClientSideSchema: boolean,
i?: number
) {
let clientEncrypted: MongoClient, clientEncryption: ClientEncryption;
beforeEach(async function () {
// 2. Using ``client``, drop and create the collection ``db.coll`` configured with the included JSON schema `corpus/corpus-schema.json <../corpus/corpus-schema.json>`_.
Expand Down Expand Up @@ -197,7 +203,7 @@ describe('Client Side Encryption Prose Corpus Test', function () {
}
};
const extraOptions = getEncryptExtraOptions();
const autoEncryption = {
const autoEncryption: AutoEncryptionOptions = {
keyVaultNamespace,
kmsProviders,
tlsOptions,
Expand All @@ -221,10 +227,10 @@ describe('Client Side Encryption Prose Corpus Test', function () {
afterEach(() => clientEncrypted.close());

it(
`should pass corpus ${useClientSideSchema ? 'with' : 'without'} client schema`,
`should pass corpus ${useClientSideSchema ? 'with' : 'without'} client schema` + i,
metadata,
async function () {
const corpusCopied = {};
const corpusCopied: Record<string, any> = {};

// 5. Load `corpus/corpus.json <../corpus/corpus.json>`_ to a variable named ``corpus``. The corpus contains subdocuments with the following fields:
//
Expand Down Expand Up @@ -262,7 +268,7 @@ describe('Client Side Encryption Prose Corpus Test', function () {
continue;
}
if (field.method === 'explicit') {
const encryptOptions = {
const encryptOptions: ClientEncryptionEncryptOptions = {
algorithm: algorithmMap.get(field.algo)
};
if (field.identifier === 'id') {
Expand Down Expand Up @@ -359,7 +365,7 @@ describe('Client Side Encryption Prose Corpus Test', function () {
// });
// });

defineCorpusTests(corpusAll, corpusEncryptedExpectedAll, false);
for (let i = 0; i < 100; i++) defineCorpusTests(corpusAll, corpusEncryptedExpectedAll, false, i);

// 9. Repeat steps 1-8 with a local JSON schema. I.e. amend step 4 to configure the schema on ``client_encrypted`` with the ``schema_map`` option.
defineCorpusTests(corpusAll, corpusEncryptedExpectedAll, true);
Expand Down