fix: patch jwt audience for test (#4491)

Author: mutianf

bigtable-client-core-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/BigtableOptionsFactory.java

@@ -16,6 +16,7 @@
 package com.google.cloud.bigtable.hbase;
 
 import com.google.api.core.BetaApi;
+import com.google.api.core.InternalApi;
 import com.google.api.core.InternalExtensionOnly;
 import com.google.common.annotations.VisibleForTesting;
 
@@ -341,4 +342,8 @@ public class BigtableOptionsFactory {
   /** Sets if client side metrics should be enabled. Client side metrics is enabled by default. */
   public static final String BIGTABLE_ENABLE_CLIENT_SIDE_METRICS =
       "google.bigtable.enable.client.side.metrics";
+
+  /** Override jwt audience in test environment. * */
+  @InternalApi
+  public static final String BIGTABLE_JWT_AUDIENCE_KEY = "google.bigtable.jwt.audience";
 }

bigtable-client-core-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/wrappers/veneer/BigtableHBaseVeneerSettings.java

@@ -32,6 +32,7 @@
 import static com.google.cloud.bigtable.hbase.BigtableOptionsFactory.BIGTABLE_ENABLE_BULK_MUTATION_FLOW_CONTROL;
 import static com.google.cloud.bigtable.hbase.BigtableOptionsFactory.BIGTABLE_ENABLE_CLIENT_SIDE_METRICS;
 import static com.google.cloud.bigtable.hbase.BigtableOptionsFactory.BIGTABLE_HOST_KEY;
+import static com.google.cloud.bigtable.hbase.BigtableOptionsFactory.BIGTABLE_JWT_AUDIENCE_KEY;
 import static com.google.cloud.bigtable.hbase.BigtableOptionsFactory.BIGTABLE_MUTATE_RPC_ATTEMPT_TIMEOUT_MS_KEY;
 import static com.google.cloud.bigtable.hbase.BigtableOptionsFactory.BIGTABLE_MUTATE_RPC_TIMEOUT_MS_KEY;
 import static com.google.cloud.bigtable.hbase.BigtableOptionsFactory.BIGTABLE_NULL_CREDENTIAL_ENABLE_KEY;
@@ -83,6 +84,7 @@
 import com.google.cloud.bigtable.data.v2.models.Row;
 import com.google.cloud.bigtable.data.v2.stub.BigtableBatchingCallSettings;
 import com.google.cloud.bigtable.data.v2.stub.BigtableBulkReadRowsCallSettings;
+import com.google.cloud.bigtable.data.v2.stub.EnhancedBigtableStubSettings;
 import com.google.cloud.bigtable.data.v2.stub.metrics.NoopMetricsProvider;
 import com.google.cloud.bigtable.hbase.BigtableConfiguration;
 import com.google.cloud.bigtable.hbase.BigtableExtendedConfiguration;
@@ -461,6 +463,8 @@ private void configureConnection(
     Optional<String> hostOverride = Optional.fromNullable(configuration.get(endpointKey));
     Optional<String> portOverride = Optional.fromNullable(configuration.get(BIGTABLE_PORT_KEY));
     Optional<String> endpointOverride = Optional.absent();
+    Optional<String> jwtAudienceOverride =
+        Optional.fromNullable(configuration.get(BIGTABLE_JWT_AUDIENCE_KEY));
 
     if (hostOverride.isPresent() || portOverride.isPresent()) {
       endpointOverride =
@@ -478,6 +482,12 @@ private void configureConnection(
       LOG.debug("%s is configured at %s", endpointKey, endpointOverride);
     }
 
+    if (jwtAudienceOverride.isPresent()
+        && stubSettings instanceof EnhancedBigtableStubSettings.Builder) {
+      ((EnhancedBigtableStubSettings.Builder) stubSettings)
+          .setJwtAudience(jwtAudienceOverride.get());
+    }
+
     final InstantiatingGrpcChannelProvider.Builder channelProvider =
         ((InstantiatingGrpcChannelProvider) stubSettings.getTransportChannelProvider()).toBuilder();
 

pom.xml

@@ -55,8 +55,8 @@ limitations under the License.
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
     <!-- core dependency versions -->
-    <bigtable.version>2.57.3</bigtable.version>
-    <google-cloud-bigtable-emulator.version>0.185.0</google-cloud-bigtable-emulator.version>
+    <bigtable.version>2.58.2</bigtable.version>
+    <google-cloud-bigtable-emulator.version>0.195.2</google-cloud-bigtable-emulator.version>
     <bigtable-metrics-api.version>1.29.2</bigtable-metrics-api.version>
     <!-- Optional dep for bigtable-metrics-api used for tests -->
     <dropwizard-metrics.version>4.2.22</dropwizard-metrics.version>