Fix bigquery table google_sheets_options (#3457) (#6280)

Signed-off-by: Modular Magician <[email protected]>
hashicorp · May 4, 2020 · bff4c64 · bff4c64
1 parent 46a3ef4
commit bff4c64
Show file tree

Hide file tree

Showing 3 changed files with 91 additions and 6 deletions.
diff --git a/.changelog/3457.txt b/.changelog/3457.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+bigquery: Fixed the `google_sheets_options` at least one of logic.
+```
diff --git a/google/resource_bigquery_table.go b/google/resource_bigquery_table.go
@@ -162,16 +162,22 @@ func resourceBigQueryTable() *schema.Resource {
 									// Range: [Optional] Range of a sheet to query from. Only used when non-empty.
 									// Typical format: !:
 									"range": {
-										Type:         schema.TypeString,
-										Optional:     true,
-										AtLeastOneOf: []string{"external_data_configuration.0.google_sheets_options.0.range"},
+										Type:     schema.TypeString,
+										Optional: true,
+										AtLeastOneOf: []string{
+											"external_data_configuration.0.google_sheets_options.0.skip_leading_rows",
+											"external_data_configuration.0.google_sheets_options.0.range",
+										},
 									},
 									// SkipLeadingRows: [Optional] The number of rows at the top
 									// of the sheet that BigQuery will skip when reading the data.
 									"skip_leading_rows": {
-										Type:         schema.TypeInt,
-										Optional:     true,
-										AtLeastOneOf: []string{"external_data_configuration.0.google_sheets_options.0.skip_leading_rows"},
+										Type:     schema.TypeInt,
+										Optional: true,
+										AtLeastOneOf: []string{
+											"external_data_configuration.0.google_sheets_options.0.skip_leading_rows",
+											"external_data_configuration.0.google_sheets_options.0.range",
+										},
 									},
 								},
 							},

diff --git a/google/resource_bigquery_table_test.go b/google/resource_bigquery_table_test.go
@@ -144,6 +144,30 @@ func TestAccBigQueryExternalDataTable_CSV(t *testing.T) {
 	})
 }
 
+func TestAccBigQueryDataTable_sheet(t *testing.T) {
+	t.Parallel()
+
+	context := map[string]interface{}{
+		"random_suffix": randString(t, 10),
+	}
+
+	vcrTest(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckBigQueryTableDestroyProducer(t),
+		Steps: []resource.TestStep{
+			{
+				Config: testAccBigQueryTableFromSheet(context),
+			},
+			{
+				ResourceName:      "google_bigquery_table.table",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+		},
+	})
+}
+
 func testAccCheckBigQueryExtData(t *testing.T, expectedQuoteChar string) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		for _, rs := range s.RootModule().Resources {
@@ -451,6 +475,58 @@ resource "google_bigquery_table" "test" {
 `, datasetID, bucketName, objectName, content, tableID, format, quoteChar)
 }
 
+func testAccBigQueryTableFromSheet(context map[string]interface{}) string {
+	return Nprintf(`
+	resource "google_bigquery_table" "table" {
+		dataset_id = google_bigquery_dataset.dataset.dataset_id
+		table_id   = "tf_test_sheet_%{random_suffix}"
+
+		external_data_configuration {
+		  autodetect            = true
+		  source_format         = "GOOGLE_SHEETS"
+		  ignore_unknown_values = true
+
+		  google_sheets_options {
+			skip_leading_rows = 1
+		  }
+
+		  source_uris = [
+			"https://drive.google.com/open?id=xxxx",
+		  ]
+		}
+
+		schema = <<EOF
+	  [
+		{
+		  "name": "permalink",
+		  "type": "STRING",
+		  "mode": "NULLABLE",
+		  "description": "The Permalink"
+		},
+		{
+		  "name": "state",
+		  "type": "STRING",
+		  "mode": "NULLABLE",
+		  "description": "State where the head office is located"
+		}
+	  ]
+	  EOF
+	  }
+
+	  resource "google_bigquery_dataset" "dataset" {
+		dataset_id                  = "tf_test_ds_%{random_suffix}"
+		friendly_name               = "test"
+		description                 = "This is a test description"
+		location                    = "EU"
+		default_table_expiration_ms = 3600000
+
+		labels = {
+		  env = "default"
+		}
+	  }
+`, context)
+}
+
 var TEST_CSV = `lifelock,LifeLock,,web,Tempe,AZ,1-May-07,6850000,USD,b
 lifelock,LifeLock,,web,Tempe,AZ,1-Oct-06,6000000,USD,a
 lifelock,LifeLock,,web,Tempe,AZ,1-Jan-08,25000000,USD,c