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 9f61b6190f..eabaa128bc 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 @@ -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( 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 933750843a..4d3d05f5b4 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 @@ -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"));