fix field specification and add a VCR skip for the new acceptance test

wj-chen · Aug 8, 2023 · 52cbc9c · 52cbc9c
1 parent b56cb63
commit 52cbc9c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/mmv1/third_party/terraform/services/bigquery/resource_bigquery_table.go b/mmv1/third_party/terraform/services/bigquery/resource_bigquery_table.go
@@ -492,7 +492,6 @@ func ResourceBigQueryTable() *schema.Resource {
 						// Schema: Optional] The schema for the  data.
 						// Schema is required for CSV and JSON formats if autodetect is not on.
 						// Schema is disallowed for Google Cloud Bigtable, Cloud Datastore backups, Avro, Iceberg, ORC, and Parquet formats.
-						// Schema is mutually exclusive with View and Materialized View.
 						"schema": {
 							Type:         schema.TypeString,
 							Optional:     true,
@@ -503,8 +502,7 @@ func ResourceBigQueryTable() *schema.Resource {
 								json, _ := structure.NormalizeJsonString(v)
 								return json
 							},
-							Description:   `A JSON schema for the external table. Schema is required for CSV and JSON formats and is disallowed for Google Cloud Bigtable, Cloud Datastore backups, and Avro formats when using external tables.`,
-							ConflictsWith: []string{"view", "materialized_view"},
+							Description: `A JSON schema for the external table. Schema is required for CSV and JSON formats and is disallowed for Google Cloud Bigtable, Cloud Datastore backups, and Avro formats when using external tables.`,
 						},
 						// CsvOptions: [Optional] Additional properties to set if
 						// sourceFormat is set to CSV.
@@ -763,6 +761,7 @@ func ResourceBigQueryTable() *schema.Resource {
 			},
 
 			// Schema: [Optional] Describes the schema of this table.
+			// Schema is mutually exclusive with View and Materialized View.
 			"schema": {
 				Type:         schema.TypeString,
 				Optional:     true,
@@ -774,6 +773,7 @@ func ResourceBigQueryTable() *schema.Resource {
 				},
 				DiffSuppressFunc: bigQueryTableSchemaDiffSuppress,
 				Description:      `A JSON schema for the table.`,
+				ConflictsWith:    []string{"view", "materialized_view"},
 			},
 			// View: [Optional] If specified, configures this table as a view.
 			// View is mutually exclusive with Schema and Materialized View.

diff --git a/mmv1/third_party/terraform/tests/resource_bigquery_table_test.go b/mmv1/third_party/terraform/tests/resource_bigquery_table_test.go
@@ -475,6 +475,8 @@ func TestAccBigQueryTable_MaterializedView_DailyTimePartioning_Update(t *testing
 
 func TestAccBigQueryTable_MaterializedView_WithSchema(t *testing.T) {
 	t.Parallel()
+	// Pending VCR support in https://github.com/hashicorp/terraform-provider-google/issues/15427.
+	acctest.SkipIfVcr(t)
 
 	datasetID := fmt.Sprintf("tf_test_%s", RandString(t, 10))
 	tableID := fmt.Sprintf("tf_test_%s", RandString(t, 10))
@@ -977,7 +979,7 @@ func TestAccBigQueryTable_emptySchema(t *testing.T) {
 
 func TestAccBigQueryTable_invalidSchemas(t *testing.T) {
 	t.Parallel()
-	// Not an acceptance test.
+	// Pending VCR support in https://github.com/hashicorp/terraform-provider-google/issues/15427.
 	acctest.SkipIfVcr(t)
 
 	datasetID := fmt.Sprintf("tf_test_%s", RandString(t, 10))