Skip to content

Commit c4e3cb1

Browse files
authored
Fix ClusterFixture#hasEncryptionTestsEnabled to correctly detect env vars (#1343)
JAVA-5311
1 parent 6280158 commit c4e3cb1

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

driver-core/src/test/functional/com/mongodb/ClusterFixture.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -198,10 +198,11 @@ public static List<Integer> getVersionList(final String versionString) {
198198
}
199199

200200
public static boolean hasEncryptionTestsEnabled() {
201-
List<String> requiredSystemProperties = asList("awsAccessKeyId", "awsSecretAccessKey", "azureTenantId", "azureClientId",
202-
"azureClientSecret", "gcpEmail", "gcpPrivateKey", "tmpAwsAccessKeyId", "tmpAwsSecretAccessKey", "tmpAwsSessionToken");
201+
List<String> requiredSystemProperties = asList("AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AZURE_TENANT_ID", "AZURE_CLIENT_ID",
202+
"AZURE_CLIENT_SECRET", "GCP_EMAIL", "GCP_PRIVATE_KEY", "AWS_TEMP_ACCESS_KEY_ID", "AWS_TEMP_SECRET_ACCESS_KEY",
203+
"AWS_TEMP_SESSION_TOKEN");
203204
return requiredSystemProperties.stream()
204-
.map(name -> getEnv("org.mongodb.test." + name, ""))
205+
.map(name -> getEnv(name, ""))
205206
.filter(s -> !s.isEmpty())
206207
.count() == requiredSystemProperties.size();
207208
}

0 commit comments

Comments
 (0)