Changed key for encodedLocations and changed tests.

Author: vverman

oauth2_http/java/com/google/auth/oauth2/ComputeEngineCredentials.java

@@ -131,8 +131,6 @@ public class ComputeEngineCredentials extends GoogleCredentials
 
   private String universeDomainFromMetadata = null;
 
-//  private final boolean trustBoundaryEnabled;
-
   /**
    * Experimental Feature.
    *
@@ -222,7 +220,6 @@ private ComputeEngineCredentials(ComputeEngineCredentials.Builder builder) {
     this.transport = builder.getGoogleAuthTransport();
     this.bindingEnforcement = builder.getBindingEnforcement();
     this.name = GoogleCredentialsInfo.COMPUTE_ENGINE_CREDENTIALS.getCredentialName();
-//    this.trustBoundaryEnabled = builder.isTrustBoundaryEnabled();
   }
 
   @Override

oauth2_http/java/com/google/auth/oauth2/DefaultCredentialsProvider.java

@@ -115,7 +115,6 @@ class DefaultCredentialsProvider {
    */
   final GoogleCredentials getDefaultCredentials(HttpTransportFactory transportFactory)
       throws IOException {
-    LOGGER.log(Level.FINE, "ajbhdabjh");
     synchronized (this) {
       if (cachedCredentials == null) {
         cachedCredentials = getDefaultCredentialsUnsynchronized(transportFactory);

oauth2_http/java/com/google/auth/oauth2/TrustBoundary.java

@@ -31,7 +31,14 @@
 
 package com.google.auth.oauth2;
 
-import com.google.api.client.http.*;
+import com.google.api.client.http.GenericUrl;
+import com.google.api.client.http.HttpBackOffIOExceptionHandler;
+import com.google.api.client.http.HttpBackOffUnsuccessfulResponseHandler;
+import com.google.api.client.http.HttpIOExceptionHandler;
+import com.google.api.client.http.HttpRequest;
+import com.google.api.client.http.HttpRequestFactory;
+import com.google.api.client.http.HttpResponse;
+import com.google.api.client.http.HttpUnsuccessfulResponseHandler;
 import com.google.api.client.json.GenericJson;
 import com.google.api.client.json.JsonParser;
 import com.google.api.client.util.ExponentialBackOff;
@@ -81,7 +88,7 @@ public boolean isNoOp() {
 
   /** Represents the JSON response from the trust boundary endpoint. */
   public static class TrustBoundaryResponse extends GenericJson {
-    @Key("encoded_locations")
+    @Key("encodedLocations")
     private String encodedLocations;
 
     @Key("locations")
@@ -149,7 +156,7 @@ static TrustBoundary refresh(
     if (cachedTrustBoundary != null) {
       String headerValue =
           cachedTrustBoundary.isNoOp() ? "" : cachedTrustBoundary.getEncodedLocations();
-      // request.getHeaders().set(TRUST_BOUNDARY_KEY, headerValue);
+      request.getHeaders().set(TRUST_BOUNDARY_KEY, headerValue);
     }
 
     // Add retry logic

oauth2_http/javatests/com/google/auth/oauth2/ComputeEngineCredentialsTest.java

@@ -1177,7 +1177,9 @@ public void refresh_trustBoundaryFails_throwsIOException() throws IOException {
     TrustBoundary.setEnvironmentProviderForTest(environmentProvider);
     environmentProvider.setEnv("GOOGLE_AUTH_TRUST_BOUNDARY_ENABLE_EXPERIMENT", "1");
 
+    String defaultAccountEmail = "[email protected]";
     MockMetadataServerTransportFactory transportFactory = new MockMetadataServerTransportFactory();
+    transportFactory.transport.setServiceAccountEmail(defaultAccountEmail);
 
     ComputeEngineCredentials credentials =
         ComputeEngineCredentials.newBuilder().setHttpTransportFactory(transportFactory).build();

oauth2_http/javatests/com/google/auth/oauth2/MockIAMCredentialsServiceTransport.java

@@ -237,7 +237,7 @@ public LowLevelHttpResponse execute() throws IOException {
               }
               GenericJson responseJson = new GenericJson();
               responseJson.setFactory(OAuth2Utils.JSON_FACTORY);
-              responseJson.put("encoded_locations", trustBoundary.getEncodedLocations());
+              responseJson.put("encodedLocations", trustBoundary.getEncodedLocations());
               responseJson.put("locations", trustBoundary.getLocations());
               String content = responseJson.toPrettyString();
               return new MockLowLevelHttpResponse()

oauth2_http/javatests/com/google/auth/oauth2/MockMetadataServerTransport.java

@@ -379,7 +379,7 @@ public LowLevelHttpResponse execute() throws IOException {
         }
         GenericJson responseJson = new GenericJson();
         responseJson.setFactory(OAuth2Utils.JSON_FACTORY);
-        responseJson.put("encoded_locations", trustBoundary.getEncodedLocations());
+        responseJson.put("encodedLocations", trustBoundary.getEncodedLocations());
         responseJson.put("locations", trustBoundary.getLocations());
         String content = responseJson.toPrettyString();
         return new MockLowLevelHttpResponse().setContentType(Json.MEDIA_TYPE).setContent(content);

oauth2_http/javatests/com/google/auth/oauth2/MockTokenServerTransport.java

@@ -336,7 +336,7 @@ public LowLevelHttpResponse execute() throws IOException {
               }
               GenericJson responseJson = new GenericJson();
               responseJson.setFactory(JSON_FACTORY);
-              responseJson.put("encoded_locations", trustBoundary.getEncodedLocations());
+              responseJson.put("encodedLocations", trustBoundary.getEncodedLocations());
               responseJson.put("locations", trustBoundary.getLocations());
               String content = responseJson.toPrettyString();
               return new MockLowLevelHttpResponse()