Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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: 3 additions & 0 deletions .evergreen/.evg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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("{"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -214,8 +214,8 @@ public static Collection<Object[]> 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});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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":
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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("{"
Expand Down
2 changes: 1 addition & 1 deletion testing/resources/specifications
Submodule specifications updated 194 files
Loading