From a6e43fcc4dd8aee88c460a9aefedc867b3c5964d Mon Sep 17 00:00:00 2001 From: Nabil Hachicha Date: Tue, 1 Sep 2026 14:24:46 +0100 Subject: [PATCH] JAVA-6231: Migrate Azure KMS credentials to corporate account Bump spec submodule and set FLE_AZURE_USE_CORPORATE=YES for the CSFLE/QE Azure KMS prose tests. --- .evergreen/.evg.yml | 3 +++ .../ClientEncryptionDataKeyAndDoubleEncryptionTest.java | 4 ++-- .../client/AbstractClientEncryptionCustomEndpointTest.java | 4 ++-- .../AbstractClientEncryptionRewrapManyDataKeyProseTest.java | 4 ++-- .../client/AbstractClientSideEncryptionKmsTlsTest.java | 4 ++-- .../ClientEncryptionDataKeyAndDoubleEncryptionTest.java | 4 ++-- testing/resources/specifications | 2 +- 7 files changed, 14 insertions(+), 11 deletions(-) diff --git a/.evergreen/.evg.yml b/.evergreen/.evg.yml index 1cc9508af3f..a169f5491d5 100644 --- a/.evergreen/.evg.yml +++ b/.evergreen/.evg.yml @@ -264,6 +264,9 @@ functions: working_dir: "src" binary: "bash" include_expansions_in_env: ["AWS_SECRET_ACCESS_KEY", "AWS_ACCESS_KEY_ID", "AWS_SESSION_TOKEN"] + env: + # Use the corporate Azure KMS credentials (DRIVERS-3392 key vault) + FLE_AZURE_USE_CORPORATE: "YES" args: - ${DRIVERS_TOOLS}/.evergreen/csfle/setup.sh diff --git a/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/ClientEncryptionDataKeyAndDoubleEncryptionTest.java b/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/ClientEncryptionDataKeyAndDoubleEncryptionTest.java index 81e1380f307..d328117c352 100644 --- a/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/ClientEncryptionDataKeyAndDoubleEncryptionTest.java +++ b/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/ClientEncryptionDataKeyAndDoubleEncryptionTest.java @@ -192,8 +192,8 @@ private BsonDocument getMasterKey() { + "}"); case "azure": return BsonDocument.parse("{" - + " \"keyVaultEndpoint\": \"key-vault-csfle.vault.azure.net\"," - + " \"keyName\": \"key-name-csfle\"" + + " \"keyVaultEndpoint\": \"drivers-3392-key-vault.vault.azure.net\"," + + " \"keyName\": \"drivers-3392-keyname\"" + "}"); case "gcp": return BsonDocument.parse("{" diff --git a/driver-sync/src/test/functional/com/mongodb/client/AbstractClientEncryptionCustomEndpointTest.java b/driver-sync/src/test/functional/com/mongodb/client/AbstractClientEncryptionCustomEndpointTest.java index 976c51844f8..bd2f05560c8 100644 --- a/driver-sync/src/test/functional/com/mongodb/client/AbstractClientEncryptionCustomEndpointTest.java +++ b/driver-sync/src/test/functional/com/mongodb/client/AbstractClientEncryptionCustomEndpointTest.java @@ -214,8 +214,8 @@ public static Collection data() { data.add(new Object[]{"7. [azure] valid and invalid kms providers test", "azure", BsonDocument.parse("{\n" - + " \"keyVaultEndpoint\": \"key-vault-csfle.vault.azure.net\",\n" - + " \"keyName\": \"key-name-csfle\"\n" + + " \"keyVaultEndpoint\": \"drivers-3392-key-vault.vault.azure.net\",\n" + + " \"keyName\": \"drivers-3392-keyname\"\n" + "}"), true, MongoClientException.class, UnknownHostException.class, null}); diff --git a/driver-sync/src/test/functional/com/mongodb/client/AbstractClientEncryptionRewrapManyDataKeyProseTest.java b/driver-sync/src/test/functional/com/mongodb/client/AbstractClientEncryptionRewrapManyDataKeyProseTest.java index 9de4e2a6951..b727e34323b 100644 --- a/driver-sync/src/test/functional/com/mongodb/client/AbstractClientEncryptionRewrapManyDataKeyProseTest.java +++ b/driver-sync/src/test/functional/com/mongodb/client/AbstractClientEncryptionRewrapManyDataKeyProseTest.java @@ -62,8 +62,8 @@ public abstract class AbstractClientEncryptionRewrapManyDataKeyProseTest { + " \"key\": \"arn:aws:kms:us-east-1:579766882180:key/89fcc2c4-08b0-4bd9-9f25-e30687b580d0\"\n" + "}")); MASTER_KEYS_BY_PROVIDER.put("azure", BsonDocument.parse("{\n" - + " \"keyVaultEndpoint\": \"key-vault-csfle.vault.azure.net\",\n" - + " \"keyName\": \"key-name-csfle\"\n" + + " \"keyVaultEndpoint\": \"drivers-3392-key-vault.vault.azure.net\",\n" + + " \"keyName\": \"drivers-3392-keyname\"\n" + "}")); MASTER_KEYS_BY_PROVIDER.put("gcp", BsonDocument.parse("{\n" + " \"projectId\": \"devprod-drivers\",\n" diff --git a/driver-sync/src/test/functional/com/mongodb/client/AbstractClientSideEncryptionKmsTlsTest.java b/driver-sync/src/test/functional/com/mongodb/client/AbstractClientSideEncryptionKmsTlsTest.java index 3c307aa468c..40fce4ba720 100644 --- a/driver-sync/src/test/functional/com/mongodb/client/AbstractClientSideEncryptionKmsTlsTest.java +++ b/driver-sync/src/test/functional/com/mongodb/client/AbstractClientSideEncryptionKmsTlsTest.java @@ -262,8 +262,8 @@ String getMasterKey(final String kmsProvider) { case "azure": case "azure:named": return "{" - + " \"keyVaultEndpoint\": \"key-vault-csfle.vault.azure.net\"," - + " \"keyName\": \"key-name-csfle\"" + + " \"keyVaultEndpoint\": \"drivers-3392-key-vault.vault.azure.net\"," + + " \"keyName\": \"drivers-3392-keyname\"" + "}"; case "gcp": case "gcp:named": diff --git a/driver-sync/src/test/functional/com/mongodb/client/ClientEncryptionDataKeyAndDoubleEncryptionTest.java b/driver-sync/src/test/functional/com/mongodb/client/ClientEncryptionDataKeyAndDoubleEncryptionTest.java index def52e4ba22..319bd110b7f 100644 --- a/driver-sync/src/test/functional/com/mongodb/client/ClientEncryptionDataKeyAndDoubleEncryptionTest.java +++ b/driver-sync/src/test/functional/com/mongodb/client/ClientEncryptionDataKeyAndDoubleEncryptionTest.java @@ -181,8 +181,8 @@ private BsonDocument getMasterKey() { + "}"); case "azure": return BsonDocument.parse("{" - + " \"keyVaultEndpoint\": \"key-vault-csfle.vault.azure.net\"," - + " \"keyName\": \"key-name-csfle\"" + + " \"keyVaultEndpoint\": \"drivers-3392-key-vault.vault.azure.net\"," + + " \"keyName\": \"drivers-3392-keyname\"" + "}"); case "gcp": return BsonDocument.parse("{" diff --git a/testing/resources/specifications b/testing/resources/specifications index d4d0cdf2645..92b3c0b9287 160000 --- a/testing/resources/specifications +++ b/testing/resources/specifications @@ -1 +1 @@ -Subproject commit d4d0cdf264513676b1c12c3fcb899dd1e4b789b6 +Subproject commit 92b3c0b9287bfba1b0ec4084300858d05c654f8c