From 7e7da92ad5c34149751a3ff13ff8d5eaf8375fcd Mon Sep 17 00:00:00 2001 From: Zhenhua Li Date: Fri, 16 Jun 2023 16:13:28 -0700 Subject: [PATCH 1/2] Modify the CheckDestroy function for cloudbuild trigger tests --- .../tests/data_source_google_cloudbuild_trigger_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mmv1/third_party/terraform/tests/data_source_google_cloudbuild_trigger_test.go b/mmv1/third_party/terraform/tests/data_source_google_cloudbuild_trigger_test.go index 759c10b62e72..0e235ffa1d35 100644 --- a/mmv1/third_party/terraform/tests/data_source_google_cloudbuild_trigger_test.go +++ b/mmv1/third_party/terraform/tests/data_source_google_cloudbuild_trigger_test.go @@ -17,7 +17,7 @@ func TestAccDataSourceGoogleCloudBuildTrigger_basic(t *testing.T) { VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, ProtoV5ProviderFactories: ProtoV5ProviderFactories(t), - CheckDestroy: testAccCheckCloudRunServiceDestroyProducer(t), + CheckDestroy: testAccCheckCloudBuildTriggerDestroyProducer(t), Steps: []resource.TestStep{ { Config: testAccDataSourceGoogleCloudBuildTrigger_basic(context), From 144075cdf0ca846edbc0fc2ce0dd211cf6bc91ee Mon Sep 17 00:00:00 2001 From: Zhenhua Li Date: Fri, 16 Jun 2023 16:31:06 -0700 Subject: [PATCH 2/2] Remove CheckDestroy function --- .../tests/data_source_alloydb_supported_database_flags_test.go | 1 - 1 file changed, 1 deletion(-) diff --git a/mmv1/third_party/terraform/tests/data_source_alloydb_supported_database_flags_test.go b/mmv1/third_party/terraform/tests/data_source_alloydb_supported_database_flags_test.go index 27ec57bc9419..54a84c7d27a0 100644 --- a/mmv1/third_party/terraform/tests/data_source_alloydb_supported_database_flags_test.go +++ b/mmv1/third_party/terraform/tests/data_source_alloydb_supported_database_flags_test.go @@ -21,7 +21,6 @@ func TestAccDataSourceAlloydbSupportedDatabaseFlags_basic(t *testing.T) { VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, ProtoV5ProviderFactories: ProtoV5ProviderFactories(t), - CheckDestroy: testAccSqlDatabaseDestroyProducer(t), Steps: []resource.TestStep{ { Config: testAccDataSourceAlloydbSupportedDatabaseFlags_basic(context),