Skip to content

Commit c673491

Browse files
ci(NODE-6926): unskip failing FLE KMS test (#4524)
1 parent de2c955 commit c673491

File tree

2 files changed

+8
-18
lines changed

2 files changed

+8
-18
lines changed

test/integration/client-side-encryption/client_side_encryption.prose.test.js

+8-17
Original file line numberDiff line numberDiff line change
@@ -853,7 +853,7 @@ describe('Client Side Encryption Prose Tests', metadata, function () {
853853
const invalidKmsProviders = getKmsProviders();
854854
invalidKmsProviders.azure.identityPlatformEndpoint = 'doesnotexist.invalid:443';
855855
invalidKmsProviders.gcp.endpoint = 'doesnotexist.invalid:443';
856-
invalidKmsProviders.kmip.endpoint = 'doesnotexist.local:5698';
856+
invalidKmsProviders.kmip.endpoint = 'doesnotexist.invalid:5698';
857857

858858
return this.client.connect().then(() => {
859859
this.clientEncryption = new ClientEncryption(this.client, {
@@ -918,14 +918,9 @@ describe('Client Side Encryption Prose Tests', metadata, function () {
918918
succeed: true
919919
},
920920
{
921-
description: '4. aws: custom endpoint with bad url',
922-
provider: 'aws',
923-
masterKey: {
924-
region: 'us-east-1',
925-
key: 'arn:aws:kms:us-east-1:579766882180:key/89fcc2c4-08b0-4bd9-9f25-e30687b580d0',
926-
endpoint: 'kms.us-east-1.amazonaws.com:12345'
927-
},
928-
skipReason: 'TODO(NODE-6928): Fix failing aws bad URI test',
921+
description: '4. bad url',
922+
provider: 'kmip',
923+
masterKey: { keyId: '1', endpoint: 'localhost:12345' },
929924
succeed: false,
930925
errorValidator: err => {
931926
expect(err)
@@ -1029,7 +1024,7 @@ describe('Client Side Encryption Prose Tests', metadata, function () {
10291024
provider: 'kmip',
10301025
masterKey: {
10311026
keyId: '1',
1032-
endpoint: 'doesnotexist.local:5698'
1027+
endpoint: 'doesnotexist.invalid:5698'
10331028
},
10341029
succeed: false,
10351030
errorValidator: err => {
@@ -1043,10 +1038,6 @@ describe('Client Side Encryption Prose Tests', metadata, function () {
10431038

10441039
testCases.forEach(testCase => {
10451040
it(testCase.description, metadata, function () {
1046-
if (testCase.skipReason) {
1047-
this.skipReason = testCase.skipReason;
1048-
this.skip();
1049-
}
10501041
// Call `client_encryption.createDataKey()` with <provider> as the provider and the following masterKey:
10511042
// .. code:: javascript
10521043
// {
@@ -1564,7 +1555,7 @@ describe('Client Side Encryption Prose Tests', metadata, function () {
15641555
// Case 2.
15651556
context('Case 2: Azure', metadata, function () {
15661557
const masterKey = {
1567-
keyVaultEndpoint: 'doesnotexist.local',
1558+
keyVaultEndpoint: 'doesnotexist.invalid',
15681559
keyName: 'foo'
15691560
};
15701561

@@ -1834,7 +1825,7 @@ describe('Client Side Encryption Prose Tests', metadata, function () {
18341825
// Call `client_encryption_with_names.createDataKey()` with "aws:no_client_cert" as the provider and the following masterKey.
18351826
const error = await clientEncryptionWithNames
18361827
.createDataKey('azure:no_client_cert', {
1837-
masterKey: { keyVaultEndpoint: 'doesnotexist.local', keyName: 'foo' }
1828+
masterKey: { keyVaultEndpoint: 'doesnotexist.invalid', keyName: 'foo' }
18381829
})
18391830
.catch(e => e);
18401831

@@ -1846,7 +1837,7 @@ describe('Client Side Encryption Prose Tests', metadata, function () {
18461837
// Call `client_encryption_with_names.createDataKey()` with "aws:with_tls" as the provider and the same masterKey.
18471838
const error = await clientEncryptionWithNames
18481839
.createDataKey('azure:with_tls', {
1849-
masterKey: { keyVaultEndpoint: 'doesnotexist.local', keyName: 'foo' }
1840+
masterKey: { keyVaultEndpoint: 'doesnotexist.invalid', keyName: 'foo' }
18501841
})
18511842
.catch(e => e);
18521843

test/tools/runner/flaky.ts

-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ export const flakyTests = [
3131
'Client Side Encryption Prose Tests 16. Rewrap Case 1: Rewrap with separate ClientEncryption should rewrap data key from local to kmip',
3232
'Client Side Encryption Prose Tests 16. Rewrap Case 1: Rewrap with separate ClientEncryption should rewrap data key from local to local',
3333
'Client Side Encryption Prose Tests 16. Rewrap Case 2: RewrapManyDataKeyOpts.provider is not optional when provider field is missing raises an error',
34-
'Client Side Encryption Prose Tests Custom Endpoint Test 4. aws: custom endpoint with bad url',
3534
'CSOT spec tests legacy timeouts behave correctly for retryable operations operation fails after two consecutive socket timeouts - aggregate on collection',
3635
'CSOT spec tests legacy timeouts behave correctly for retryable operations operation succeeds after one socket timeout - aggregate on collection',
3736
'CSOT spec tests operations ignore deprecated timeout options if timeoutMS is set socketTimeoutMS is ignored if timeoutMS is set - dropIndex on collection',

0 commit comments

Comments
 (0)