Merge pull request #2034 from mongodb/merge-release/2.1-into-release/2.2-1746230656976

mongodb-drivers-pr-bot[bot] · web-flow · commit d739e423f589 · 2025-05-05T09:53:01.000-06:00
Merge release/2.1 into release/2.2
diff --git a/internal/integration/client_side_encryption_prose_test.go b/internal/integration/client_side_encryption_prose_test.go
@@ -797,7 +797,7 @@ func TestClientSideEncryptionProse(t *testing.T) {
 				"endpoint":   "doesnotexist.invalid:443",
 			},
 			"kmip": {
-				"endpoint": "doesnotexist.local:5698",
+				"endpoint": "doesnotexist.invalid:5698",
 			},
 		}
 
@@ -821,9 +821,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",
@@ -862,7 +861,7 @@ func TestClientSideEncryptionProse(t *testing.T) {
 		}
 		kmipFailureInvalidEndpoint := map[string]interface{}{
 			"keyId":    "1",
-			"endpoint": "doesnotexist.local:5698",
+			"endpoint": "doesnotexist.invalid:5698",
 		}
 
 		const (
@@ -908,7 +907,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,
@@ -1585,7 +1584,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{}{

Original file line number	Diff line number	Diff line change
`@@ -797,7 +797,7 @@ func TestClientSideEncryptionProse(t *testing.T) {`
`797`	`797`	`"endpoint": "doesnotexist.invalid:443",`
`798`	`798`	`},`
`799`	`799`	`"kmip": {`
`800`		`- "endpoint": "doesnotexist.local:5698",`
	`800`	`+ "endpoint": "doesnotexist.invalid:5698",`
`801`	`801`	`},`
`802`	`802`	`}`
`803`	`803`
`@@ -821,9 +821,8 @@ func TestClientSideEncryptionProse(t *testing.T) {`
`821`	`821`	`"endpoint": "kms.us-east-1.amazonaws.com:443",`
`822`	`822`	`}`
`823`	`823`	`awsFailureConnectionError := map[string]interface{}{`
`824`		`- "region": "us-east-1",`
`825`		`- "key": "arn:aws:kms:us-east-1:579766882180:key/89fcc2c4-08b0-4bd9-9f25-e30687b580d0",`
`826`		`- "endpoint": "kms.us-east-1.amazonaws.com:12345",`
	`824`	`+ "keyId": "1",`
	`825`	`+ "endpoint": "localhost:12345",`
`827`	`826`	`}`
`828`	`827`	`awsFailureInvalidEndpoint := map[string]interface{}{`
`829`	`828`	`"region": "us-east-1",`
`@@ -862,7 +861,7 @@ func TestClientSideEncryptionProse(t *testing.T) {`
`862`	`861`	`}`
`863`	`862`	`kmipFailureInvalidEndpoint := map[string]interface{}{`
`864`	`863`	`"keyId": "1",`
`865`		`- "endpoint": "doesnotexist.local:5698",`
	`864`	`+ "endpoint": "doesnotexist.invalid:5698",`
`866`	`865`	`}`
`867`	`866`
`868`	`867`	`const (`
`@@ -908,7 +907,7 @@ func TestClientSideEncryptionProse(t *testing.T) {`
`908`	`907`	`},`
`909`	`908`	`{`
`910`	`909`	`name: "Case 4: aws failure with connection error",`
`911`		`- provider: "aws",`
	`910`	`+ provider: "kmip",`
`912`	`911`	`masterKey: awsFailureConnectionError,`
`913`	`912`	`errorSubstring: []string{errConnectionRefused, errWindowsTLSConnectionRefused},`
`914`	`913`	`testInvalidClientEncryption: false,`
`@@ -1585,7 +1584,7 @@ func TestClientSideEncryptionProse(t *testing.T) {`
`1585`	`1584`	`"endpoint": "127.0.0.1:9001",`
`1586`	`1585`	`}`
`1587`	`1586`	`azureMasterKey := map[string]interface{}{`
`1588`		`- "keyVaultEndpoint": "doesnotexist.local",`
	`1587`	`+ "keyVaultEndpoint": "doesnotexist.invalid",`
`1589`	`1588`	`"keyName": "foo",`
`1590`	`1589`	`}`
`1591`	`1590`	`gcpMasterKey := map[string]interface{}{`