Fixed sweeping of incidentally-created queues (#12529) (#8885)

[upstream:5c620d651d045d3053c8f4cf86a315ff5318f3bd] Signed-off-by: Modular Magician <[email protected]>
hashicorp · Dec 10, 2024 · eea40cc · eea40cc
1 parent 339d16d
commit eea40cc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/.changelog/12529.txt b/.changelog/12529.txt
@@ -0,0 +1,3 @@
+```release-note:none
+
+```
diff --git a/google-beta/sweeper/gcp_sweeper.go b/google-beta/sweeper/gcp_sweeper.go
@@ -23,13 +23,15 @@ var testResourcePrefixes = []string{
 	// include a "-" or "_" respectively, and they are the preferred prefix for our test resources to use
 	"tf-test",
 	"tf_test",
+	// Resource-specific prefixes that should be moved to the corresponding resource sweeper as part of https://github.com/hashicorp/terraform-provider-google/issues/20638
 	"tfgen",
 	"gke-us-central1-tf",  // composer-created disks which are abandoned by design (https://cloud.google.com/composer/pricing)
 	"gcs-bucket-tf-test-", // https://github.com/hashicorp/terraform-provider-google/issues/8909
 	"df-",                 // https://github.com/hashicorp/terraform-provider-google/issues/8909
 	"resourcegroup-",      // https://github.com/hashicorp/terraform-provider-google/issues/8924
 	"cluster-",            // https://github.com/hashicorp/terraform-provider-google/issues/8924
 	"k8s-fw-",             // firewall rules are getting created and not cleaned up by k8 resources using this prefix
+	"ext-tf-test",         // Cloud Tasks Queues created automatically by tests for `google_firebase_extensions_instance`.
 }
 
 // SharedConfigForRegion returns a common config setup needed for the sweeper