Test fixes

mongodb · Apr 23, 2024 · 581ae2e · 581ae2e
1 parent df3ef8d
commit 581ae2e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/driver-core/src/main/com/mongodb/internal/authentication/GcpCredentialHelper.java b/driver-core/src/main/com/mongodb/internal/authentication/GcpCredentialHelper.java
@@ -52,7 +52,7 @@ public static CredentialInfo fetchGcpCredentialInfo(final String resource) {
         String endpoint = "http://metadata/computeMetadata/v1/instance/service-accounts/default/identity?audience="
                 + resource;
         Map<String, String> header = new HashMap<>();
-        header.put("Metadata-Flavor", "Google");;
+        header.put("Metadata-Flavor", "Google");
         String response = getHttpContents("GET", endpoint, header);
         return new CredentialInfo(
                     new BsonString(response).getValue(),

diff --git a/driver-core/src/main/com/mongodb/internal/connection/OidcAuthenticator.java b/driver-core/src/main/com/mongodb/internal/connection/OidcAuthenticator.java
@@ -80,6 +80,8 @@ public final class OidcAuthenticator extends SaslAuthenticator {
             AZURE_ENVIRONMENT, GCP_ENVIRONMENT, TEST_ENVIRONMENT);
     private static final List<String> SUPPORTS_TOKEN_RESOURCE = Arrays.asList(
             AZURE_ENVIRONMENT, GCP_ENVIRONMENT);
+    private static final List<String> ALLOWS_USERNAME = Arrays.asList(
+            AZURE_ENVIRONMENT);
 
     private static final Duration CALLBACK_TIMEOUT = Duration.ofMinutes(5);
 
@@ -622,7 +624,7 @@ public static void validateBeforeUse(final MongoCredential credential) {
                             + " must not be specified");
                 }
             } else {
-                if (userName != null) {
+                if (userName != null && !ALLOWS_USERNAME.contains(providerName)) {
                     throw new IllegalArgumentException("user name must not be specified when " + ENVIRONMENT_KEY + " is specified");
                 }
                 if (machineCallback != null) {

diff --git a/driver-core/src/test/unit/com/mongodb/ConnectionStringSpecification.groovy b/driver-core/src/test/unit/com/mongodb/ConnectionStringSpecification.groovy
@@ -601,7 +601,7 @@ class ConnectionStringSpecification extends Specification {
         new ConnectionString('mongodb://jeff@localhost/?' +
                              'authMechanism=GSSAPI' +
                              '&authMechanismProperties=' +
-                             'SERVICE_NAME:foo:bar')
+                             'SERVICE_NAMEbar') // missing =
 
         then:
         thrown(IllegalArgumentException)