add can_delete optional param

hashicorp · Dec 4, 2015 · 729c081 · 729c081
1 parent 04d1ef4
commit 729c081
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 0 deletions.
diff --git a/builtin/providers/google/resource_bigquery_dataset.go b/builtin/providers/google/resource_bigquery_dataset.go
@@ -9,6 +9,7 @@ func resourceBigQueryDataset() *schema.Resource {
 	return &schema.Resource{
 		Create: resourceBigQueryDatasetCreate,
 		Read:   resourceBigQueryDatasetRead,
+		Update: resourceBigQueryDatasetUpdate,
 		Delete: resourceBigQueryDatasetDelete,
 
 		Schema: map[string]*schema.Schema{
@@ -64,6 +65,11 @@ func resourceBigQueryDatasetRead(d *schema.ResourceData, meta interface{}) error
 	return nil
 }
 
+//  basically a no-op from terraform's point of view.  but it allows can_delete
+//  setting to be altered
+func resourceBigQueryDatasetUpdate(d *schema.ResourceData, meta interface{}) error {
+	return nil
+}
 
 func resourceBigQueryDatasetDelete(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)

diff --git a/builtin/providers/google/resource_bigquery_dataset_test.go b/builtin/providers/google/resource_bigquery_dataset_test.go
@@ -65,4 +65,5 @@ func testAccBigQueryDatasetExists(n string) resource.TestCheckFunc {
 const testAccBigQueryDataset = `
 resource "google_bigquery_dataset" "foobar" {
 	name = "foobar"
+	can_delete = true
 }`
diff --git a/builtin/providers/google/resource_bigquery_table.go b/builtin/providers/google/resource_bigquery_table.go
@@ -10,6 +10,7 @@ func resourceBigQueryTable() *schema.Resource {
 		Create: resourceBigQueryTableCreate,
 		Read:   resourceBigQueryTableRead,
 		Delete: resourceBigQueryTableDelete,
+		Update: resourceBigQueryTableUpdate,
 
 		Schema: map[string]*schema.Schema{
 			"name": &schema.Schema{
@@ -68,6 +69,11 @@ func resourceBigQueryTableRead(d *schema.ResourceData, meta interface{}) error {
 	return nil
 }
 
+//  basically a no-op from terraform's point of view.  but it allows can_delete
+//  setting to be altered
+func resourceBigQueryTableUpdate(d *schema.ResourceData, meta interface{}) error {
+	return nil
+}
 
 func resourceBigQueryTableDelete(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)

diff --git a/builtin/providers/google/resource_bigquery_table_test.go b/builtin/providers/google/resource_bigquery_table_test.go
@@ -65,10 +65,12 @@ func testAccBigQueryTableExists(n string) resource.TestCheckFunc {
 const testAccBigQueryTable = `
 resource "google_bigquery_dataset" "foobar" {
 	name = "foobar"
+	can_delete = true
 }
 
 resource "google_bigquery_table" "foobar" {
 	name = "foobar"
 	datasetId = "${google_bigquery_dataset.foobar.name}"
+	can_delete = true
 }`