test(fix): use consistent endpoint for all table admin clients in test (#533)

Author: liubonan

google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/it/BigtableBackupIT.java

@@ -102,14 +102,14 @@ public static void createClient()
     // Setup a prefix to avoid collisions between concurrent test runs
     prefix = String.format("020%d", System.currentTimeMillis());
 
-    tableAdmin = BigtableTableAdminClient.create(testEnvRule.env().getProjectId(), targetInstance);
+    tableAdmin = testEnvRule.env().getTableAdminClientForInstance(targetInstance);
 
     testTable =
         tableAdmin.createTable(
             CreateTableRequest.of(generateId(TEST_TABLE_SUFFIX)).addFamily("cf1"));
 
     // Populate test data.
-    dataClient = BigtableDataClient.create(testEnvRule.env().getProjectId(), targetInstance);
+    dataClient = testEnvRule.env().getDataClientForInstance(targetInstance);
     byte[] rowBytes = new byte[1024];
     Random random = new Random();
     random.nextBytes(rowBytes);

google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/test_helpers/env/AbstractTestEnv.java

@@ -22,6 +22,7 @@
 import com.google.cloud.bigtable.admin.v2.models.Instance;
 import com.google.cloud.bigtable.data.v2.BigtableDataClient;
 import com.google.cloud.bigtable.data.v2.BigtableDataSettings;
+import java.io.IOException;
 import org.threeten.bp.Instant;
 import org.threeten.bp.temporal.ChronoUnit;
 
@@ -42,8 +43,13 @@ public abstract class AbstractTestEnv {
 
   public abstract BigtableDataClient getDataClient();
 
+  public abstract BigtableDataClient getDataClientForInstance(String instanceId) throws IOException;
+
   public abstract BigtableTableAdminClient getTableAdminClient();
 
+  public abstract BigtableTableAdminClient getTableAdminClientForInstance(String instanceId)
+      throws IOException;
+
   public abstract BigtableInstanceAdminClient getInstanceAdminClient();
 
   public abstract BigtableDataSettings getDataClientSettings();

google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/test_helpers/env/CloudEnv.java

@@ -152,11 +152,35 @@ public BigtableDataClient getDataClient() {
     return dataClient;
   }
 
+  @Override
+  public BigtableDataClient getDataClientForInstance(String instanceId) throws IOException {
+    BigtableDataSettings.Builder settings =
+        BigtableDataSettings.newBuilder()
+            .setProjectId(dataSettings.getProjectId())
+            .setInstanceId(instanceId);
+    settings
+        .stubSettings()
+        .setEndpoint(dataSettings.stubSettings().getEndpoint())
+        .setTransportChannelProvider(dataSettings.stubSettings().getTransportChannelProvider());
+    return BigtableDataClient.create(settings.build());
+  }
+
   @Override
   public BigtableTableAdminClient getTableAdminClient() {
     return tableAdminClient;
   }
 
+  @Override
+  public BigtableTableAdminClient getTableAdminClientForInstance(String instanceId)
+      throws IOException {
+    BigtableTableAdminSettings.Builder settings =
+        BigtableTableAdminSettings.newBuilder()
+            .setProjectId(tableAdminSettings.getProjectId())
+            .setInstanceId(instanceId);
+    settings.stubSettings().setEndpoint(tableAdminSettings.stubSettings().getEndpoint());
+    return BigtableTableAdminClient.create(settings.build());
+  }
+
   @Override
   public BigtableInstanceAdminClient getInstanceAdminClient() {
     return instanceAdminClient;

google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/test_helpers/env/EmulatorEnv.java

@@ -23,6 +23,7 @@
 import com.google.cloud.bigtable.data.v2.BigtableDataSettings;
 import com.google.cloud.bigtable.emulator.v2.Emulator;
 import com.google.common.base.Strings;
+import java.io.IOException;
 import java.nio.file.Paths;
 
 public class EmulatorEnv extends AbstractTestEnv {
@@ -104,11 +105,22 @@ public BigtableDataClient getDataClient() {
     return dataClient;
   }
 
+  @Override
+  public BigtableDataClient getDataClientForInstance(String instanceId) throws IOException {
+    throw new UnsupportedOperationException("Could not create a data client for another instance.");
+  }
+
   @Override
   public BigtableTableAdminClient getTableAdminClient() {
     return tableAdminClient;
   }
 
+  @Override
+  public BigtableTableAdminClient getTableAdminClientForInstance(String instanceId)
+      throws IOException {
+    throw new UnsupportedOperationException("Could not create a table admin for another instance.");
+  }
+
   @Override
   public BigtableInstanceAdminClient getInstanceAdminClient() {
     throw new UnsupportedOperationException("InstanceAdminClient is not supported with emulator");