add deletion_protection=false to tests with sql_database_instance (#4096

) (#7508) * add deletion_protection=false to tests with sql_database_instance * ignore deletion_protection on datasource test Signed-off-by: Modular Magician <[email protected]>
hashicorp · Oct 13, 2020 · 71c2368 · 71c2368
1 parent d2f32d3
commit 71c2368
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 4 deletions.
diff --git a/.changelog/4096.txt b/.changelog/4096.txt
@@ -0,0 +1,3 @@
+```release-note:none
+
+```
diff --git a/google/data_source_google_sql_ca_certs_test.go b/google/data_source_google_sql_ca_certs_test.go
@@ -78,6 +78,8 @@ resource "google_sql_database_instance" "foo" {
     tier                   = "db-f1-micro"
     crash_safe_replication = false
   }
+
+  deletion_protection = false
 }
 
 data "google_sql_ca_certs" "ca_certs" {

diff --git a/google/data_source_sql_database_instance_test.go b/google/data_source_sql_database_instance_test.go
@@ -20,7 +20,13 @@ func TestAccDataSourceSqlDatabaseInstance_basic(t *testing.T) {
 			{
 				Config: testAccDataSourceSqlDatabaseInstance_basic(context),
 				Check: resource.ComposeTestCheckFunc(
-					checkDataSourceStateMatchesResourceState("data.google_sql_database_instance.qa", "google_sql_database_instance.master"),
+					checkDataSourceStateMatchesResourceStateWithIgnores(
+						"data.google_sql_database_instance.qa",
+						"google_sql_database_instance.master",
+						map[string]struct{}{
+							"deletion_protection": {},
+						},
+					),
 				),
 			},
 		},
@@ -39,6 +45,8 @@ resource "google_sql_database_instance" "master" {
     # type. See argument reference below.
     tier = "db-f1-micro"
   }
+
+  deletion_protection = false
 }
 
 data "google_sql_database_instance" "qa" {

diff --git a/google/resource_cloud_run_service_generated_test.go b/google/resource_cloud_run_service_generated_test.go
@@ -78,8 +78,9 @@ func TestAccCloudRunService_cloudRunServiceSqlExample(t *testing.T) {
 	t.Parallel()
 
 	context := map[string]interface{}{
-		"project":       getTestProjectFromEnv(),
-		"random_suffix": randString(t, 10),
+		"project":             getTestProjectFromEnv(),
+		"deletion_protection": false,
+		"random_suffix":       randString(t, 10),
 	}
 
 	vcrTest(t, resource.TestCase{
@@ -133,6 +134,8 @@ resource "google_sql_database_instance" "instance" {
   settings {
     tier = "db-f1-micro"
   }
+
+  deletion_protection  = "%{deletion_protection}"
 }
 `, context)
 }

diff --git a/google/resource_sql_database_generated_test.go b/google/resource_sql_database_generated_test.go
@@ -27,7 +27,8 @@ func TestAccSQLDatabase_sqlDatabaseBasicExample(t *testing.T) {
 	t.Parallel()
 
 	context := map[string]interface{}{
-		"random_suffix": randString(t, 10),
+		"deletion_protection": false,
+		"random_suffix":       randString(t, 10),
 	}
 
 	vcrTest(t, resource.TestCase{
@@ -63,6 +64,8 @@ resource "google_sql_database_instance" "instance" {
   settings {
     tier = "db-f1-micro"
   }
+
+  deletion_protection  = "%{deletion_protection}"
 }
 `, context)
 }

diff --git a/website/docs/r/cloud_run_service.html.markdown b/website/docs/r/cloud_run_service.html.markdown
@@ -108,6 +108,8 @@ resource "google_sql_database_instance" "instance" {
   settings {
     tier = "db-f1-micro"
   }
+
+  deletion_protection  = "true"
 }
 ```
 <div class = "oics-button" style="float: right; margin: 0 0 -15px">

diff --git a/website/docs/r/sql_database.html.markdown b/website/docs/r/sql_database.html.markdown
@@ -48,6 +48,8 @@ resource "google_sql_database_instance" "instance" {
   settings {
     tier = "db-f1-micro"
   }
+
+  deletion_protection  = "true"
 }
 ```