From edb9530ae7baa448d8e0253390730fe59c705fa5 Mon Sep 17 00:00:00 2001
From: Chen Zhiling <chnzhlng@gmail.com>
Date: Sat, 9 Feb 2019 01:09:14 +0800
Subject: [PATCH] Add force_destroy option to bigquery dataset (#2986)

* Add force_destroy option to bigquery dataset

* Change option name to force_destroy

* Rename option to delete_contents_on_destroy

* Add option description

* Add tests for dataset with content added in

* Add diff suppress func
---
 google/resource_bigquery_dataset.go      | 13 ++++-
 google/resource_bigquery_dataset_test.go | 63 ++++++++++++++++++++++++
 2 files changed, 75 insertions(+), 1 deletion(-)

diff --git a/google/resource_bigquery_dataset.go b/google/resource_bigquery_dataset.go
index 7b1da355..9f937ca2 100644
--- a/google/resource_bigquery_dataset.go
+++ b/google/resource_bigquery_dataset.go
@@ -184,6 +184,16 @@ func resourceBigQueryDataset() *schema.Resource {
 				},
 			},
 
+			// Delete Contents on Destroy: [Optional] If True, delete all the tables in the dataset.
+			// If False and the dataset contains tables, the request will fail.
+			// Default is False.
+			"delete_contents_on_destroy": {
+				Type:             schema.TypeBool,
+				Optional:         true,
+				Default:          false,
+				DiffSuppressFunc: emptyOrDefaultStringSuppress("false"),
+			},
+
 			// SelfLink: [Output-only] A URL that can be used to access the resource
 			// again. You can use this URL in Get or Update requests to the
 			// resource.
@@ -407,7 +417,8 @@ func resourceBigQueryDatasetDelete(d *schema.ResourceData, meta interface{}) err
 		return err
 	}
 
-	if err := config.clientBigQuery.Datasets.Delete(id.Project, id.DatasetId).Do(); err != nil {
+	deleteContents := d.Get("delete_contents_on_destroy").(bool)
+	if err := config.clientBigQuery.Datasets.Delete(id.Project, id.DatasetId).DeleteContents(deleteContents).Do(); err != nil {
 		return err
 	}
 
diff --git a/google/resource_bigquery_dataset_test.go b/google/resource_bigquery_dataset_test.go
index 439c1a20..6d9931f3 100644
--- a/google/resource_bigquery_dataset_test.go
+++ b/google/resource_bigquery_dataset_test.go
@@ -7,6 +7,7 @@ import (
 	"github.com/hashicorp/terraform/helper/acctest"
 	"github.com/hashicorp/terraform/helper/resource"
 	"github.com/hashicorp/terraform/terraform"
+	"google.golang.org/api/bigquery/v2"
 )
 
 func TestAccBigQueryDataset_basic(t *testing.T) {
@@ -39,6 +40,31 @@ func TestAccBigQueryDataset_basic(t *testing.T) {
 	})
 }
 
+func TestAccBigQueryDataset_datasetWithContents(t *testing.T) {
+	t.Parallel()
+
+	datasetID := fmt.Sprintf("tf_test_%s", acctest.RandString(10))
+	tableID := fmt.Sprintf("tf_test_%s", acctest.RandString(10))
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckBigQueryDatasetDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccBigQueryDatasetDeleteContents(datasetID),
+				Check:  testAccAddTable(datasetID, tableID),
+			},
+			{
+				ResourceName:            "google_bigquery_dataset.contents_test",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"delete_contents_on_destroy"},
+			},
+		},
+	})
+}
+
 func TestAccBigQueryDataset_access(t *testing.T) {
 	t.Parallel()
 
@@ -180,6 +206,25 @@ func testAccCheckBigQueryDatasetDestroy(s *terraform.State) error {
 	return nil
 }
 
+func testAccAddTable(datasetID string, tableID string) resource.TestCheckFunc {
+	// Not actually a check, but adds a table independently of terraform
+	return func(s *terraform.State) error {
+		config := testAccProvider.Meta().(*Config)
+		table := &bigquery.Table{
+			TableReference: &bigquery.TableReference{
+				DatasetId: datasetID,
+				TableId:   tableID,
+				ProjectId: config.Project,
+			},
+		}
+		_, err := config.clientBigQuery.Tables.Insert(config.Project, datasetID, table).Do()
+		if err != nil {
+			return fmt.Errorf("Could not create table")
+		}
+		return nil
+	}
+}
+
 func testAccBigQueryDataset(datasetID string) string {
 	return fmt.Sprintf(`
 resource "google_bigquery_dataset" "test" {
@@ -214,6 +259,24 @@ resource "google_bigquery_dataset" "test" {
 }`, datasetID)
 }
 
+func testAccBigQueryDatasetDeleteContents(datasetID string) string {
+	return fmt.Sprintf(`
+resource "google_bigquery_dataset" "contents_test" {
+  dataset_id                  = "%s"
+  friendly_name               = "foo"
+  description                 = "This is a foo description"
+  location                    = "EU"
+  default_partition_expiration_ms = 3600000
+  default_table_expiration_ms = 3600000
+  delete_contents_on_destroy = true
+
+  labels = {
+    env                         = "foo"
+    default_table_expiration_ms = 3600000
+  }
+}`, datasetID)
+}
+
 func testAccBigQueryRegionalDataset(datasetID string, location string) string {
 	return fmt.Sprintf(`
 resource "google_bigquery_dataset" "test" {