feat: support GDC-H Credentials

gapic-generator-java-pom-parent/pom.xml

@@ -27,7 +27,7 @@
         consistent across modules in this repository -->
     <javax.annotation-api.version>1.3.2</javax.annotation-api.version>
     <grpc.version>1.55.1</grpc.version>
-    <google.auth.version>1.18.0</google.auth.version>
+    <google.auth.version>1.19.0</google.auth.version>
     <gson.version>2.10.1</gson.version>
     <guava.version>32.0.1-jre</guava.version>
     <!--  On next protobuf upgrade (to 3.23.3 or higher),

gax-java/.gitignore

@@ -15,6 +15,7 @@ target
 
 # IntelliJ
 .idea
+.ijwb
 *.iml
 out
 

gax-java/gax/clirr-ignored-differences.xml

@@ -7,6 +7,12 @@
     <className>com/google/api/gax/paging/Page</className>
     <method>* stream*(*)</method>
   </difference>
+  <difference>
+    <!-- add gdchApiAudience to ClientContext -->
+    <differenceType>7013</differenceType>
+    <className>com/google/api/gax/rpc/*</className>
+    <method>* *Gdch*(*)</method>
+  </difference>
   <difference>
     <differenceType>7006</differenceType>
     <className>com/google/api/gax/rpc/ServerStreamingCallSettings$Builder</className>

gax-java/gax/src/main/java/com/google/api/gax/rpc/ClientContext.java

@@ -29,6 +29,7 @@
  */
 package com.google.api.gax.rpc;
 
+import com.google.api.client.util.Strings;
 import com.google.api.core.ApiClock;
 import com.google.api.core.BetaApi;
 import com.google.api.core.NanoClock;
@@ -40,11 +41,13 @@
 import com.google.api.gax.tracing.ApiTracerFactory;
 import com.google.api.gax.tracing.BaseApiTracerFactory;
 import com.google.auth.Credentials;
+import com.google.auth.oauth2.GdchCredentials;
 import com.google.auto.value.AutoValue;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Sets;
 import java.io.IOException;
+import java.net.URI;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -109,6 +112,13 @@ public abstract class ClientContext {
   @Nonnull
   public abstract ApiTracerFactory getTracerFactory();
 
+  /**
+   * Gets the API audience used when creating a Client that uses {@link
+   * com.google.auth.oauth2.GdchCredentials}
+   */
+  @Nullable
+  public abstract String getGdchApiAudience();
+
   public static Builder newBuilder() {
     return new AutoValue_ClientContext.Builder()
         .setBackgroundResources(Collections.<BackgroundResource>emptyList())
@@ -119,7 +129,8 @@ public static Builder newBuilder() {
         .setStreamWatchdog(null)
         .setStreamWatchdogCheckInterval(Duration.ZERO)
         .setTracerFactory(BaseApiTracerFactory.getInstance())
-        .setQuotaProjectId(null);
+        .setQuotaProjectId(null)
+        .setGdchApiAudience(null);
   }
 
   public abstract Builder toBuilder();
@@ -167,6 +178,30 @@ public static ClientContext create(StubSettings settings) throws IOException {
 
     Credentials credentials = settings.getCredentialsProvider().getCredentials();
 
+    String settingsGdchApiAudience = settings.getGdchApiAudience();
+    if (credentials instanceof GdchCredentials) {
+      // We recompute the GdchCredentials with the audience
+      String audienceString;
+      if (!Strings.isNullOrEmpty(settingsGdchApiAudience)) {
+        audienceString = settingsGdchApiAudience;
+      } else if (!Strings.isNullOrEmpty(settings.getEndpoint())) {
+        audienceString = settings.getEndpoint();
+      } else {
+        throw new IllegalArgumentException("Could not infer GDCH api audience from settings");
+      }
+
+      URI gdchAudienceUri;
+      try {
+        gdchAudienceUri = URI.create(audienceString);
+      } catch (IllegalArgumentException ex) { // thrown when passing a malformed uri string
+        throw new IllegalArgumentException("The GDC-H API audience string is not a valid URI", ex);
+      }
+      credentials = ((GdchCredentials) credentials).createWithGdchAudience(gdchAudienceUri);
+    } else if (!Strings.isNullOrEmpty(settingsGdchApiAudience)) {
+      throw new IllegalArgumentException(
+          "GDC-H API audience can only be set when using GdchCredentials");
+    }
+
     if (settings.getQuotaProjectId() != null && credentials != null) {
       // If the quotaProjectId is set, wrap original credentials with correct quotaProjectId as
       // QuotaProjectIdHidingCredentials.
@@ -325,6 +360,17 @@ public abstract static class Builder {
     @BetaApi("The surface for tracing is not stable yet and may change in the future.")
     public abstract Builder setTracerFactory(ApiTracerFactory tracerFactory);
 
+    /**
+     * Sets the API audience used by {@link com.google.auth.oauth2.GdchCredentials} It cannot be
+     * used if other type of {@link com.google.auth.Credentials} is used
+     *
+     * <p>If the provided credentials already contain an api audience, it will be overriden by this
+     * one
+     *
+     * @param gdchApiAudience the audience to be used - must be a valid URI string
+     */
+    public abstract Builder setGdchApiAudience(String gdchApiAudience);
+
     public abstract ClientContext build();
   }
 }

gax-java/gax/src/main/java/com/google/api/gax/rpc/ClientSettings.java

@@ -111,6 +111,11 @@ public final Duration getWatchdogCheckInterval() {
     return stubSettings.getStreamWatchdogCheckInterval();
   }
 
+  /** Gets the GDCH API audience that was previously set in this Builder */
+  public final String getGdchApiAudience() {
+    return stubSettings.getGdchApiAudience();
+  }
+
   public String toString() {
     return MoreObjects.toStringHelper(this)
         .add("executorProvider", getExecutorProvider())
@@ -124,6 +129,7 @@ public String toString() {
         .add("quotaProjectId", getQuotaProjectId())
         .add("watchdogProvider", getWatchdogProvider())
         .add("watchdogCheckInterval", getWatchdogCheckInterval())
+        .add("gdchApiAudience", getGdchApiAudience())
         .toString();
   }
 
@@ -255,6 +261,18 @@ public B setWatchdogCheckInterval(@Nullable Duration checkInterval) {
       return self();
     }
 
+    /**
+     * Sets the GDC-H api audience. This is intended only to be used with {@link
+     * com.google.auth.oauth2.GdchCredentials} If this field is set and other type of {@link
+     * com.google.auth.Credentials} is used then an {@link IllegalArgumentException} will be thrown.
+     * If the provided credentials already have an api audience, then it will be overriden by this
+     * audience
+     */
+    public B setGdchApiAudience(@Nullable String gdchApiAudience) {
+      stubSettings.setGdchApiAudience(gdchApiAudience);
+      return self();
+    }
+
     /**
      * Gets the ExecutorProvider that was previously set on this Builder. This ExecutorProvider is
      * to use for running asynchronous API call logic (such as retries and long-running operations),
@@ -322,6 +340,12 @@ public Duration getWatchdogCheckInterval() {
       return stubSettings.getStreamWatchdogCheckInterval();
     }
 
+    /** Gets the GDCH API audience that was previously set in this Builder */
+    @Nullable
+    public String getGdchApiAudience() {
+      return stubSettings.getGdchApiAudience();
+    }
+
     /** Applies the given settings updater function to the given method settings builders. */
     protected static void applyToAllUnaryMethods(
         Iterable<UnaryCallSettings.Builder<?, ?>> methodSettingsBuilders,
@@ -344,6 +368,7 @@ public String toString() {
           .add("quotaProjectId", getQuotaProjectId())
           .add("watchdogProvider", getWatchdogProvider())
           .add("watchdogCheckInterval", getWatchdogCheckInterval())
+          .add("gdchApiAudience", getGdchApiAudience())
           .toString();
     }
   }

gax-java/gax/src/main/java/com/google/api/gax/rpc/StubSettings.java

@@ -73,6 +73,7 @@ public abstract class StubSettings<SettingsT extends StubSettings<SettingsT>> {
   private final String endpoint;
   private final String mtlsEndpoint;
   private final String quotaProjectId;
+  @Nullable private final String gdchApiAudience;
   @Nullable private final WatchdogProvider streamWatchdogProvider;
   @Nonnull private final Duration streamWatchdogCheckInterval;
   @Nonnull private final ApiTracerFactory tracerFactory;
@@ -103,6 +104,7 @@ protected StubSettings(Builder builder) {
     this.streamWatchdogCheckInterval = builder.streamWatchdogCheckInterval;
     this.tracerFactory = builder.tracerFactory;
     this.deprecatedExecutorProviderSet = builder.deprecatedExecutorProviderSet;
+    this.gdchApiAudience = builder.gdchApiAudience;
   }
 
   /** @deprecated Please use {@link #getBackgroundExecutorProvider()}. */
@@ -172,6 +174,12 @@ public ApiTracerFactory getTracerFactory() {
     return tracerFactory;
   }
 
+  /** Gets the GDCH API audience to be used with {@link com.google.auth.oauth2.GdchCredentials} */
+  @Nullable
+  public final String getGdchApiAudience() {
+    return gdchApiAudience;
+  }
+
   @Override
   public String toString() {
     return MoreObjects.toStringHelper(this)
@@ -188,6 +196,7 @@ public String toString() {
         .add("streamWatchdogProvider", streamWatchdogProvider)
         .add("streamWatchdogCheckInterval", streamWatchdogCheckInterval)
         .add("tracerFactory", tracerFactory)
+        .add("gdchApiAudience", gdchApiAudience)
         .toString();
   }
 
@@ -205,6 +214,7 @@ public abstract static class Builder<
     private String endpoint;
     private String mtlsEndpoint;
     private String quotaProjectId;
+    @Nullable private String gdchApiAudience;
     @Nullable private WatchdogProvider streamWatchdogProvider;
     @Nonnull private Duration streamWatchdogCheckInterval;
     @Nonnull private ApiTracerFactory tracerFactory;
@@ -234,6 +244,7 @@ protected Builder(StubSettings settings) {
       this.streamWatchdogCheckInterval = settings.streamWatchdogCheckInterval;
       this.tracerFactory = settings.tracerFactory;
       this.deprecatedExecutorProviderSet = settings.deprecatedExecutorProviderSet;
+      this.gdchApiAudience = settings.gdchApiAudience;
     }
 
     /** Get Quota Project ID from Client Context * */
@@ -268,6 +279,7 @@ protected Builder(ClientContext clientContext) {
         this.streamWatchdogCheckInterval = Duration.ofSeconds(10);
         this.tracerFactory = BaseApiTracerFactory.getInstance();
         this.deprecatedExecutorProviderSet = false;
+        this.gdchApiAudience = null;
       } else {
         ExecutorProvider fixedExecutorProvider =
             FixedExecutorProvider.create(clientContext.getExecutor());
@@ -289,6 +301,7 @@ protected Builder(ClientContext clientContext) {
         this.streamWatchdogCheckInterval = clientContext.getStreamWatchdogCheckInterval();
         this.tracerFactory = clientContext.getTracerFactory();
         this.quotaProjectId = getQuotaProjectIdFromClientContext(clientContext);
+        this.gdchApiAudience = clientContext.getGdchApiAudience();
       }
     }
 
@@ -435,6 +448,18 @@ public B setStreamWatchdogCheckInterval(@Nonnull Duration checkInterval) {
       return self();
     }
 
+    /**
+     * Sets the API audience used by {@link com.google.auth.oauth2.GdchCredentials} It cannot be
+     * used if other type of {@link com.google.auth.Credentials} is used. If the provided
+     * credentials already have an api audience set, then it will be overriden by this audience
+     *
+     * @param gdchApiAudience the audience to be used - must be a valid URI string
+     */
+    public B setGdchApiAudience(String gdchApiAudience) {
+      this.gdchApiAudience = gdchApiAudience;
+      return self();
+    }
+
     /**
      * Configures the {@link ApiTracerFactory} that will be used to generate traces.
      *
@@ -513,6 +538,11 @@ public ApiTracerFactory getTracerFactory() {
       return tracerFactory;
     }
 
+    /** Gets the GDCH API audience that was previously set in this Builder */
+    public String getGdchApiAudience() {
+      return gdchApiAudience;
+    }
+
     /** Applies the given settings updater function to the given method settings builders. */
     protected static void applyToAllUnaryMethods(
         Iterable<UnaryCallSettings.Builder<?, ?>> methodSettingsBuilders,
@@ -540,6 +570,7 @@ public String toString() {
           .add("streamWatchdogProvider", streamWatchdogProvider)
           .add("streamWatchdogCheckInterval", streamWatchdogCheckInterval)
           .add("tracerFactory", tracerFactory)
+          .add("gdchApiAudience", gdchApiAudience)
           .toString();
     }
   }