PR fixes

driver-core/src/main/com/mongodb/internal/authentication/AzureCredentialHelper.java

@@ -23,6 +23,8 @@
 import org.bson.BsonString;
 import org.bson.json.JsonParseException;
 
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
 import java.time.Duration;
 import java.util.HashMap;
 import java.util.Map;
@@ -72,7 +74,7 @@ public static BsonDocument obtainFromEnvironment() {
  public static CredentialInfo fetchAzureCredentialInfo(final String resource, @Nullable final String clientId) {
  String endpoint = "http://169.254.169.254:80"
  + "/metadata/identity/oauth2/token?api-version=2018-02-01"
- + "&resource=" + resource
+ + "&resource=" + getEncoded(resource)
  + (clientId == null ? "" : "&client_id=" + clientId);
 
  Map<String, String> headers = new HashMap<>();
@@ -99,6 +101,14 @@ public static CredentialInfo fetchAzureCredentialInfo(final String resource, @Nu
  return new CredentialInfo(accessToken, Duration.ofSeconds(expiresInSeconds));
  }
 
+ static String getEncoded(final String resource) {
+ try {
+ return URLEncoder.encode(resource, "UTF-8");
+ } catch (UnsupportedEncodingException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
  private AzureCredentialHelper() {
  }
 }

driver-core/src/main/com/mongodb/internal/authentication/GcpCredentialHelper.java

@@ -18,12 +18,12 @@
 
 import com.mongodb.MongoClientException;
 import org.bson.BsonDocument;
-import org.bson.BsonString;
 
 import java.time.Duration;
 import java.util.HashMap;
 import java.util.Map;
 
+import static com.mongodb.internal.authentication.AzureCredentialHelper.getEncoded;
 import static com.mongodb.internal.authentication.HttpHelper.getHttpContents;
 
 /**
@@ -46,14 +46,14 @@ public static BsonDocument obtainFromEnvironment() {
  }
  }
 
- public static CredentialInfo fetchGcpCredentialInfo(final String resource) {
+ public static CredentialInfo fetchGcpCredentialInfo(final String audience) {
  String endpoint = "http://metadata/computeMetadata/v1/instance/service-accounts/default/identity?audience="
- + resource;
+ + getEncoded(audience);
  Map<String, String> header = new HashMap<>();
  header.put("Metadata-Flavor", "Google");
  String response = getHttpContents("GET", endpoint, header);
  return new CredentialInfo(
- new BsonString(response).getValue(),
+ response,
  Duration.ZERO);
  }
 

driver-sync/src/test/functional/com/mongodb/client/unified/Entities.java

@@ -27,7 +27,6 @@
 import com.mongodb.ServerApiVersion;
 import com.mongodb.TransactionOptions;
 import com.mongodb.WriteConcern;
-import com.mongodb.assertions.Assertions;
 import com.mongodb.client.ClientSession;
 import com.mongodb.client.MongoClient;
 import com.mongodb.client.MongoCollection;
@@ -92,6 +91,8 @@
 import static com.mongodb.ClusterFixture.getMultiMongosConnectionString;
 import static com.mongodb.ClusterFixture.isLoadBalanced;
 import static com.mongodb.ClusterFixture.isSharded;
+import static com.mongodb.assertions.Assertions.assertNotNull;
+import static com.mongodb.assertions.Assertions.notNull;
 import static com.mongodb.client.Fixture.getMongoClientSettingsBuilder;
 import static com.mongodb.client.Fixture.getMultiMongosMongoClientSettingsBuilder;
 import static com.mongodb.client.unified.EventMatcher.getReasonString;
@@ -530,13 +531,11 @@ private void initClient(final BsonDocument entity, final String id,
  boolean hasPlaceholder = authMechanismProperties.equals(
  new BsonDocument("$$placeholder", new BsonInt32(1)));
  if (!hasPlaceholder) {
- throw new UnsupportedOperationException("Unsupported authMechanism: " + value);
+ throw new UnsupportedOperationException(
+ "Unsupported authMechanismProperties for authMechanism: " + value);
  }
 
- String env = getenv("OIDC_ENV");
- if (env == null) {
- env = "test";
- }
+ String env = assertNotNull(getenv("OIDC_ENV"));
  MongoCredential oidcCredential = MongoCredential
  .createOidcCredential(null)
  .withMechanismProperty("ENVIRONMENT", env);
@@ -723,7 +722,7 @@ private void initClientEncryption(final BsonDocument entity, final String id,
  }
  }
 
- putEntity(id, clientEncryptionSupplier.apply(Assertions.notNull("mongoClient", mongoClient), builder.build()), clientEncryptions);
+ putEntity(id, clientEncryptionSupplier.apply(notNull("mongoClient", mongoClient), builder.build()), clientEncryptions);
  }
 
  private TransactionOptions getTransactionOptions(final BsonDocument options) {