Skip to content
This repository was archived by the owner on May 8, 2026. It is now read-only.

Commit f175207

Browse files
committed
chore: clean up resouce created by test
1 parent 8d3dca4 commit f175207

3 files changed

Lines changed: 17 additions & 3 deletions

File tree

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

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import com.google.cloud.bigtable.admin.v2.models.CreateBackupRequest;
3232
import com.google.cloud.bigtable.admin.v2.models.CreateInstanceRequest;
3333
import com.google.cloud.bigtable.admin.v2.models.CreateTableRequest;
34+
import com.google.cloud.bigtable.admin.v2.models.Instance;
3435
import com.google.cloud.bigtable.admin.v2.models.Instance.Type;
3536
import com.google.cloud.bigtable.admin.v2.models.RestoreTableRequest;
3637
import com.google.cloud.bigtable.admin.v2.models.RestoredTableResult;
@@ -78,6 +79,7 @@ public class BigtableBackupIT {
7879

7980
private static String targetCluster;
8081
private static String targetClusterHot;
82+
private static Instance testInstance;
8183
private static Table testTable;
8284
private static Table testTableHot;
8385

@@ -98,9 +100,12 @@ public static void setUpClass() throws InterruptedException, IOException {
98100
String newInstanceId = PrefixGenerator.newPrefix("backupIT");
99101
targetClusterHot = newInstanceId + "-c1";
100102

101-
instanceAdmin.createInstance(
102-
CreateInstanceRequest.of(newInstanceId)
103-
.addCluster(targetClusterHot, testEnvRule.env().getPrimaryZone(), 1, StorageType.SSD));
103+
testInstance =
104+
instanceAdmin.createInstance(
105+
CreateInstanceRequest.of(newInstanceId)
106+
.setDisplayName("BigtableBackupIT")
107+
.addCluster(
108+
targetClusterHot, testEnvRule.env().getPrimaryZone(), 1, StorageType.SSD));
104109

105110
tableAdminHot =
106111
BigtableTableAdminClient.create(
@@ -122,6 +127,13 @@ public static void tearDownClass() {
122127
// Ignore.
123128
}
124129
}
130+
if (testInstance != null) {
131+
try {
132+
instanceAdmin.deleteInstance(testInstance.getId());
133+
} catch (Exception e) {
134+
// Ignore.
135+
}
136+
}
125137
}
126138

127139
private static void deleteBackupIgnoreErrors(

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ public static void validatePlatform() throws IOException {
114114
LOGGER.info("Creating cluster in zone: " + zones.get(0));
115115
instanceAdmin.createInstance(
116116
CreateInstanceRequest.of(instanceId)
117+
.setDisplayName("BigtableCmekIT")
117118
.addCmekCluster(clusterId1, zones.get(0), 1, StorageType.SSD, kmsKeyName));
118119
// Create a table. Key is inherited from the cluster configuration
119120
tableAdmin.createTable(CreateTableRequest.of(TEST_TABLE_ID).addFamily("cf"));

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ public static void createInstance() throws IOException {
7878
Instance instance =
7979
client.createInstance(
8080
CreateInstanceRequest.of(new PrefixGenerator().newPrefix())
81+
.setDisplayName("BigtableMaterializedViewIT")
8182
.addCluster("my-cluster", "us-east1-c", 3, StorageType.SSD));
8283
instanceId = instance.getId();
8384
tableAdminClient =

0 commit comments

Comments
 (0)