From f1752079b87018c9c88504a0ee11ce5463fab099 Mon Sep 17 00:00:00 2001
From: Mattie Fu <mattiefu@google.com>
Date: Tue, 3 Jun 2025 15:22:12 -0400
Subject: [PATCH] chore: clean up resouce created by test

---
 .../bigtable/admin/v2/it/BigtableBackupIT.java | 18 +++++++++++++++---
 .../bigtable/admin/v2/it/BigtableCmekIT.java   |  1 +
 .../v2/it/BigtableMaterializedViewIT.java      |  1 +
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/it/BigtableBackupIT.java b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/it/BigtableBackupIT.java
index e58783e466..baf22e6176 100644
--- a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/it/BigtableBackupIT.java
+++ b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/it/BigtableBackupIT.java
@@ -31,6 +31,7 @@
 import com.google.cloud.bigtable.admin.v2.models.CreateBackupRequest;
 import com.google.cloud.bigtable.admin.v2.models.CreateInstanceRequest;
 import com.google.cloud.bigtable.admin.v2.models.CreateTableRequest;
+import com.google.cloud.bigtable.admin.v2.models.Instance;
 import com.google.cloud.bigtable.admin.v2.models.Instance.Type;
 import com.google.cloud.bigtable.admin.v2.models.RestoreTableRequest;
 import com.google.cloud.bigtable.admin.v2.models.RestoredTableResult;
@@ -78,6 +79,7 @@ public class BigtableBackupIT {
 
   private static String targetCluster;
   private static String targetClusterHot;
+  private static Instance testInstance;
   private static Table testTable;
   private static Table testTableHot;
 
@@ -98,9 +100,12 @@ public static void setUpClass() throws InterruptedException, IOException {
     String newInstanceId = PrefixGenerator.newPrefix("backupIT");
     targetClusterHot = newInstanceId + "-c1";
 
-    instanceAdmin.createInstance(
-        CreateInstanceRequest.of(newInstanceId)
-            .addCluster(targetClusterHot, testEnvRule.env().getPrimaryZone(), 1, StorageType.SSD));
+    testInstance =
+        instanceAdmin.createInstance(
+            CreateInstanceRequest.of(newInstanceId)
+                .setDisplayName("BigtableBackupIT")
+                .addCluster(
+                    targetClusterHot, testEnvRule.env().getPrimaryZone(), 1, StorageType.SSD));
 
     tableAdminHot =
         BigtableTableAdminClient.create(
@@ -122,6 +127,13 @@ public static void tearDownClass() {
         // Ignore.
       }
     }
+    if (testInstance != null) {
+      try {
+        instanceAdmin.deleteInstance(testInstance.getId());
+      } catch (Exception e) {
+        // Ignore.
+      }
+    }
   }
 
   private static void deleteBackupIgnoreErrors(
diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/it/BigtableCmekIT.java b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/it/BigtableCmekIT.java
index f26594a62b..bdc50ac794 100644
--- a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/it/BigtableCmekIT.java
+++ b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/it/BigtableCmekIT.java
@@ -114,6 +114,7 @@ public static void validatePlatform() throws IOException {
     LOGGER.info("Creating cluster in zone: " + zones.get(0));
     instanceAdmin.createInstance(
         CreateInstanceRequest.of(instanceId)
+            .setDisplayName("BigtableCmekIT")
             .addCmekCluster(clusterId1, zones.get(0), 1, StorageType.SSD, kmsKeyName));
     // Create a table. Key is inherited from the cluster configuration
     tableAdmin.createTable(CreateTableRequest.of(TEST_TABLE_ID).addFamily("cf"));
diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/it/BigtableMaterializedViewIT.java b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/it/BigtableMaterializedViewIT.java
index 62a2f794b0..1c5bdbad9d 100644
--- a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/it/BigtableMaterializedViewIT.java
+++ b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/it/BigtableMaterializedViewIT.java
@@ -78,6 +78,7 @@ public static void createInstance() throws IOException {
     Instance instance =
         client.createInstance(
             CreateInstanceRequest.of(new PrefixGenerator().newPrefix())
+                .setDisplayName("BigtableMaterializedViewIT")
                 .addCluster("my-cluster", "us-east1-c", 3, StorageType.SSD));
     instanceId = instance.getId();
     tableAdminClient =