test: clean up instance in test (#2849)

* test: clean up instance in test

Change-Id: Ib3a73e2cc24f7e27fd346eb80b7ec5175e3c11a4

* format

Change-Id: I41393dc1a87fffa0e8ec72d791a80f6e1434ab65

Author: mutianf

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

@@ -80,6 +80,7 @@ public class BigtableBackupIT {
   private static String targetClusterHot;
   private static Table testTable;
   private static Table testTableHot;
+  private static Instance testInstance;
 
   @BeforeClass
   public static void setUpClass() throws InterruptedException, IOException {
@@ -98,9 +99,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 +126,13 @@ public static void tearDownClass() {
         // Ignore.
       }
     }
+    if (testInstance != null) {
+      try {
+        instanceAdmin.deleteInstance(testInstance.getId());
+      } catch (Exception e) {
+        LOGGER.log(Level.WARNING, "Failed to clean up instance ", e);
+      }
+    }
   }
 
   private static void deleteBackupIgnoreErrors(

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

@@ -115,6 +115,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"));