From caa622e32ab40de333e968176667cdfffd0a830a Mon Sep 17 00:00:00 2001
From: Igor Bernstein <igorbernstein@google.com>
Date: Wed, 4 Dec 2024 15:56:22 -0500
Subject: [PATCH] test: fix clean up of protected & cdc tables (#2445)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: Id15852b2b3bbb62746861d7ec02842353612ae77

Thank you for opening a Pull Request! Before submitting your PR, there are a few things you can do to make sure it goes smoothly:
- [ ] Make sure to open an issue as a [bug/issue](https://togithub.com/googleapis/java-bigtable/issues/new/choose) before writing your code!  That way we can discuss the change, evaluate designs, and agree on the general idea
- [ ] Ensure the tests and linter pass
- [ ] Code coverage does not decrease (if any source code was changed)
- [ ] Appropriate docs were updated (if necessary)
- [ ] Rollback plan is reviewed and LGTMed
- [ ] All new data plane features have a completed end to end testing plan

Fixes #<issue_number_goes_here> ☕️

If you write sample code, please follow the [samples format](
https://togithub.com/GoogleCloudPlatform/java-docs-samples/blob/main/SAMPLE_FORMAT.md).
---
 README.md                                         |  2 +-
 .../bigtable/test_helpers/env/TestEnvRule.java    | 15 ++++++++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 837665a4aa..111bc7245f 100644
--- a/README.md
+++ b/README.md
@@ -41,7 +41,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 <dependency>
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-bigtable</artifactId>
-  <version>2.40.0</version>
+  <version>2.48.0</version>
 </dependency>
 
 ```
diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/test_helpers/env/TestEnvRule.java b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/test_helpers/env/TestEnvRule.java
index b6e4651c6b..c64d7995a7 100644
--- a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/test_helpers/env/TestEnvRule.java
+++ b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/test_helpers/env/TestEnvRule.java
@@ -24,7 +24,9 @@
 import com.google.cloud.bigtable.admin.v2.models.AppProfile;
 import com.google.cloud.bigtable.admin.v2.models.Cluster;
 import com.google.cloud.bigtable.admin.v2.models.Instance;
+import com.google.cloud.bigtable.admin.v2.models.Table;
 import com.google.cloud.bigtable.admin.v2.models.UpdateAuthorizedViewRequest;
+import com.google.cloud.bigtable.admin.v2.models.UpdateTableRequest;
 import com.google.common.collect.ImmutableSet;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -178,8 +180,19 @@ private void cleanupStaleTables(String stalePrefix) {
   }
 
   private void prepTableForDelete(String tableId) {
-    // Unprotected views
     if (!(env() instanceof EmulatorEnv)) {
+      // unprotect table
+      Table table = env().getTableAdminClient().getTable(tableId);
+      if (table.isDeletionProtected() || table.getChangeStreamRetention() != null) {
+        env()
+            .getTableAdminClient()
+            .updateTable(
+                UpdateTableRequest.of(tableId)
+                    .setDeletionProtection(false)
+                    .disableChangeStreamRetention());
+      }
+
+      // Unprotected views
       for (String viewId : env().getTableAdminClient().listAuthorizedViews(tableId)) {
         try {
           env()