add deletion protection for big_query_table (#4478)

GoogleCloudPlatform · Feb 11, 2021 · e3dce68 · e3dce68
1 parent 74186b5
commit e3dce68
Show file tree

Hide file tree

Showing 17 changed files with 269 additions and 101 deletions.
diff --git a/mmv1/templates/terraform/examples/bigquery_bigquery_table.tf.erb b/mmv1/templates/terraform/examples/bigquery_bigquery_table.tf.erb
@@ -1,53 +1,54 @@
 resource "google_bigquery_dataset" "test" {
-	dataset_id = "<%= ctx[:vars]['dataset_id'] %>"
+  dataset_id = "<%= ctx[:vars]['dataset_id'] %>"
 }
 
 resource "google_bigquery_table" "test" {
-	table_id   = "<%= ctx[:vars]['table_id'] %>"
-	dataset_id = google_bigquery_dataset.test.dataset_id
-	time_partitioning {
-		type = "DAY"
-	}
-	schema = <<EOH
+  deletion_protection = false
+  table_id   = "<%= ctx[:vars]['table_id'] %>"
+  dataset_id = google_bigquery_dataset.test.dataset_id
+  time_partitioning {
+    type = "DAY"
+  }
+  schema = <<EOH
 [
-	{
-		"name": "city",
-		"type": "RECORD",
-		"fields": [
-	{
-		"name": "id",
-		"type": "INTEGER"
-	},
-	{
-		"name": "coord",
-		"type": "RECORD",
-		"fields": [
-		{
-			"name": "lon",
-			"type": "FLOAT"
-		},
-		{
-			"name": "lat",
-			"type": "FLOAT"
-		}
-		]
-	}
-		]
-	},
-	{
-		"name": "country",
-		"type": "RECORD",
-		"fields": [
-	{
-		"name": "id",
-		"type": "INTEGER"
-	},
-	{
-		"name": "name",
-		"type": "STRING"
-	}
-		]
-	}
+  {
+    "name": "city",
+    "type": "RECORD",
+    "fields": [
+  {
+    "name": "id",
+    "type": "INTEGER"
+  },
+  {
+    "name": "coord",
+    "type": "RECORD",
+    "fields": [
+    {
+      "name": "lon",
+      "type": "FLOAT"
+    },
+    {
+      "name": "lat",
+      "type": "FLOAT"
+    }
+    ]
+  }
+    ]
+  },
+  {
+    "name": "country",
+    "type": "RECORD",
+    "fields": [
+  {
+    "name": "id",
+    "type": "INTEGER"
+  },
+  {
+    "name": "name",
+    "type": "STRING"
+  }
+    ]
+  }
 ]
 EOH
 }
diff --git a/mmv1/templates/terraform/examples/bigquery_dataset_access_view.tf.erb b/mmv1/templates/terraform/examples/bigquery_dataset_access_view.tf.erb
@@ -16,6 +16,7 @@ resource "google_bigquery_dataset" "public" {
 }
 
 resource "google_bigquery_table" "public" {
+  deletion_protection = false
   dataset_id = google_bigquery_dataset.public.dataset_id
   table_id   = "<%= ctx[:vars]['table_id'] %>"
 

diff --git a/mmv1/templates/terraform/examples/bigquery_job_copy.tf.erb b/mmv1/templates/terraform/examples/bigquery_job_copy.tf.erb
@@ -1,4 +1,5 @@
 resource "google_bigquery_table" "source" {
+  deletion_protection = false
   count = length(google_bigquery_dataset.source)
 
   dataset_id = google_bigquery_dataset.source[count.index].dataset_id
@@ -35,6 +36,7 @@ resource "google_bigquery_dataset" "source" {
 }
 
 resource "google_bigquery_table" "dest" {
+  deletion_protection = false
   dataset_id = google_bigquery_dataset.dest.dataset_id
   table_id   = "<%= ctx[:vars]['job_id'] %>_dest_table"
 

diff --git a/mmv1/templates/terraform/examples/bigquery_job_copy_table_reference.tf.erb b/mmv1/templates/terraform/examples/bigquery_job_copy_table_reference.tf.erb
@@ -1,4 +1,5 @@
 resource "google_bigquery_table" "source" {
+  deletion_protection = false
   count = length(google_bigquery_dataset.source)
 
   dataset_id = google_bigquery_dataset.source[count.index].dataset_id
@@ -35,6 +36,7 @@ resource "google_bigquery_dataset" "source" {
 }
 
 resource "google_bigquery_table" "dest" {
+  deletion_protection = false
   dataset_id = google_bigquery_dataset.dest.dataset_id
   table_id   = "<%= ctx[:vars]['job_id'] %>_dest_table"
 

diff --git a/mmv1/templates/terraform/examples/bigquery_job_extract.tf.erb b/mmv1/templates/terraform/examples/bigquery_job_extract.tf.erb
@@ -1,4 +1,5 @@
 resource "google_bigquery_table" "source-one" {
+  deletion_protection = false
   dataset_id = google_bigquery_dataset.source-one.dataset_id
   table_id   = "<%= ctx[:vars]['job_id'] %>_table"
 

diff --git a/mmv1/templates/terraform/examples/bigquery_job_extract_table_reference.tf.erb b/mmv1/templates/terraform/examples/bigquery_job_extract_table_reference.tf.erb
@@ -1,4 +1,5 @@
 resource "google_bigquery_table" "source-one" {
+  deletion_protection = false
   dataset_id = google_bigquery_dataset.source-one.dataset_id
   table_id   = "<%= ctx[:vars]['job_id'] %>_table"
 

diff --git a/mmv1/templates/terraform/examples/bigquery_job_load.tf.erb b/mmv1/templates/terraform/examples/bigquery_job_load.tf.erb
@@ -1,4 +1,5 @@
 resource "google_bigquery_table" "foo" {
+  deletion_protection = false
   dataset_id = google_bigquery_dataset.bar.dataset_id
   table_id   = "<%= ctx[:vars]['job_id'] %>_table"
 }

diff --git a/mmv1/templates/terraform/examples/bigquery_job_load_table_reference.tf.erb b/mmv1/templates/terraform/examples/bigquery_job_load_table_reference.tf.erb
@@ -1,4 +1,5 @@
 resource "google_bigquery_table" "foo" {
+  deletion_protection = false
   dataset_id = google_bigquery_dataset.bar.dataset_id
   table_id   = "<%= ctx[:vars]['job_id'] %>_table"
 }

diff --git a/mmv1/templates/terraform/examples/bigquery_job_query.tf.erb b/mmv1/templates/terraform/examples/bigquery_job_query.tf.erb
@@ -1,4 +1,5 @@
 resource "google_bigquery_table" "foo" {
+  deletion_protection = false
   dataset_id = google_bigquery_dataset.bar.dataset_id
   table_id   = "<%= ctx[:vars]['job_id'] %>_table"
 }

diff --git a/mmv1/templates/terraform/examples/bigquery_job_query_table_reference.tf.erb b/mmv1/templates/terraform/examples/bigquery_job_query_table_reference.tf.erb
@@ -1,4 +1,5 @@
 resource "google_bigquery_table" "foo" {
+  deletion_protection = false
   dataset_id = google_bigquery_dataset.bar.dataset_id
   table_id   = "<%= ctx[:vars]['job_id'] %>_table"
 }

diff --git a/mmv1/third_party/terraform/resources/resource_bigquery_table.go b/mmv1/third_party/terraform/resources/resource_bigquery_table.go
@@ -857,6 +857,13 @@ func resourceBigQueryTable() *schema.Resource {
 				Computed:    true,
 				Description: `Describes the table type.`,
 			},
+
+			"deletion_protection": {
+				Type:        schema.TypeBool,
+				Optional:    true,
+				Default:     true,
+				Description: `Whether or not to allow Terraform to destroy the instance. Unless this field is set to false in Terraform state, a terraform destroy or terraform apply that would delete the instance will fail.`,
+			},
 		},
 		UseJSONNumber: true,
 	}
@@ -1167,6 +1174,9 @@ func resourceBigQueryTableUpdate(d *schema.ResourceData, meta interface{}) error
 }
 
 func resourceBigQueryTableDelete(d *schema.ResourceData, meta interface{}) error {
+	if d.Get("deletion_protection").(bool) {
+		return fmt.Errorf("cannot destroy instance without setting deletion_protection=false and running `terraform apply`")
+	}
 	config := meta.(*Config)
 	userAgent, err := generateUserAgentString(d, config.userAgent)
 	if err != nil {
@@ -1575,6 +1585,11 @@ func resourceBigQueryTableImport(d *schema.ResourceData, meta interface{}) ([]*s
 		return nil, err
 	}
 
+	// Explicitly set virtual fields to default values on import
+	if err := d.Set("deletion_protection", true); err != nil {
+		return nil, fmt.Errorf("Error setting deletion_protection: %s", err)
+	}
+
 	// Replace import id for the resource id
 	id, err := replaceVars(d, config, "projects/{{project}}/datasets/{{dataset_id}}/tables/{{table_id}}")
 	if err != nil {

diff --git a/mmv1/third_party/terraform/resources/resource_sql_ssl_cert_test.go b/mmv1/third_party/terraform/resources/resource_sql_ssl_cert_test.go
@@ -100,7 +100,7 @@ func testGoogleSqlClientCert_mysql(instance string) string {
 	resource "google_sql_database_instance" "instance" {
 		name = "%s"
 		region = "us-central1"
-		deletion_protection = false
+	  deletion_protection = false
 		settings {
 			tier = "db-f1-micro"
 		}
@@ -124,7 +124,7 @@ func testGoogleSqlClientCert_postgres(instance string) string {
 		name = "%s"
 		region = "us-central1"
 		database_version = "POSTGRES_9_6"
-		deletion_protection = false
+	  deletion_protection = false
 		settings {
 			tier = "db-f1-micro"
 		}

diff --git a/mmv1/third_party/terraform/tests/resource_big_query_dataset_test.go b/mmv1/third_party/terraform/tests/resource_big_query_dataset_test.go
@@ -297,6 +297,7 @@ resource "google_bigquery_dataset" "other_dataset" {
 }
 
 resource "google_bigquery_table" "table_with_view" {
+  deletion_protection = false
   table_id   = "%s"
   dataset_id = google_bigquery_dataset.other_dataset.dataset_id
 

diff --git a/mmv1/third_party/terraform/tests/resource_bigquery_dataset_access_test.go b/mmv1/third_party/terraform/tests/resource_bigquery_dataset_access_test.go
@@ -290,6 +290,7 @@ resource "google_bigquery_dataset" "public" {
 }
 
 resource "google_bigquery_table" "public" {
+  deletion_protection = false
   dataset_id = google_bigquery_dataset.public.dataset_id
   table_id   = "%s"
 

diff --git a/mmv1/third_party/terraform/tests/resource_bigquery_job_test.go b/mmv1/third_party/terraform/tests/resource_bigquery_job_test.go
@@ -42,6 +42,7 @@ func TestAccBigQueryJob_withLocation(t *testing.T) {
 func testAccBigQueryJob_withLocation(context map[string]interface{}) string {
 	return Nprintf(`
 resource "google_bigquery_table" "foo" {
+  deletion_protection = false
   dataset_id = google_bigquery_dataset.bar.dataset_id
   table_id   = "tf_test_job_query%{random_suffix}_table"
 }