From c48923bd95f6faf3173e3a1ca796731fac4e7db0 Mon Sep 17 00:00:00 2001 From: Preston Vasquez Date: Fri, 2 May 2025 10:05:45 -0600 Subject: [PATCH 1/2] GODRIVER-3549 Fix timeouts in CSE custom endpoint test (#2028) (#2031) --- .../client_side_encryption_prose_test.go | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/mongo/integration/client_side_encryption_prose_test.go b/mongo/integration/client_side_encryption_prose_test.go index 3d2b2304a2..f1f7811ba3 100644 --- a/mongo/integration/client_side_encryption_prose_test.go +++ b/mongo/integration/client_side_encryption_prose_test.go @@ -806,7 +806,7 @@ func TestClientSideEncryptionProse(t *testing.T) { "endpoint": "doesnotexist.invalid:443", }, "kmip": { - "endpoint": "doesnotexist.local:5698", + "endpoint": "doesnotexist.invalid:5698", }, } @@ -830,9 +830,8 @@ func TestClientSideEncryptionProse(t *testing.T) { "endpoint": "kms.us-east-1.amazonaws.com:443", } awsFailureConnectionError := map[string]interface{}{ - "region": "us-east-1", - "key": "arn:aws:kms:us-east-1:579766882180:key/89fcc2c4-08b0-4bd9-9f25-e30687b580d0", - "endpoint": "kms.us-east-1.amazonaws.com:12345", + "keyId": "1", + "endpoint": "localhost:12345", } awsFailureInvalidEndpoint := map[string]interface{}{ "region": "us-east-1", @@ -871,7 +870,7 @@ func TestClientSideEncryptionProse(t *testing.T) { } kmipFailureInvalidEndpoint := map[string]interface{}{ "keyId": "1", - "endpoint": "doesnotexist.local:5698", + "endpoint": "doesnotexist.invalid:5698", } const ( @@ -917,7 +916,7 @@ func TestClientSideEncryptionProse(t *testing.T) { }, { name: "Case 4: aws failure with connection error", - provider: "aws", + provider: "kmip", masterKey: awsFailureConnectionError, errorSubstring: []string{errConnectionRefused, errWindowsTLSConnectionRefused}, testInvalidClientEncryption: false, @@ -1588,7 +1587,7 @@ func TestClientSideEncryptionProse(t *testing.T) { "endpoint": "127.0.0.1:9001", } azureMasterKey := map[string]interface{}{ - "keyVaultEndpoint": "doesnotexist.local", + "keyVaultEndpoint": "doesnotexist.invalid", "keyName": "foo", } gcpMasterKey := map[string]interface{}{ From facdde5e8bb753f2cd1fd6a45c411a33b620d692 Mon Sep 17 00:00:00 2001 From: Preston Vasquez Date: Wed, 4 Jun 2025 16:09:05 -0600 Subject: [PATCH 2/2] Skip disambiguated path errors --- mongo/integration/unified/unified_spec_runner.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/mongo/integration/unified/unified_spec_runner.go b/mongo/integration/unified/unified_spec_runner.go index 485c491141..5c9db03086 100644 --- a/mongo/integration/unified/unified_spec_runner.go +++ b/mongo/integration/unified/unified_spec_runner.go @@ -25,6 +25,11 @@ import ( var ( skippedTests = map[string]string{ + // GODRIVER-3524: Change streams expanded events for MongoDB 8.2+ + "Test array truncation": "See GODRIVER-3524", + "Test insert, update, replace, and delete event types": "See GODRIVER-3524", + "disambiguatedPaths is not present when showExpandedEvents is false/unset": "see GODRIVER-3524", + // GODRIVER-1773: This test runs a "find" with limit=4 and batchSize=3. It expects batchSize values of three for // the "find" and one for the "getMore", but we send three for both. "A successful find event with a getmore and the server kills the cursor (<= 4.4)": "See GODRIVER-1773",