minor(google_bigquery_table): resolved review comments

Author: sachinpro

mmv1/third_party/terraform/services/bigquery/resource_bigquery_table.go.tmpl

@@ -1839,11 +1839,9 @@ func resourceBigQueryTableRead(d *schema.ResourceData, meta interface{}) error {
 	datasetID := d.Get("dataset_id").(string)
 	tableID := d.Get("table_id").(string)
 
-	tableMetadataView := d.Get("table_metadata_view").(string)
-
 	client := config.NewBigQueryClient(userAgent).Tables.Get(project, datasetID, tableID)
-	if len(tableMetadataView) > 0 {
-	  client = client.View(tableMetadataView)
+	if tableMetadataViewRaw, ok := d.GetOk("table_metadata_view"); ok {
+		client = client.View(tableMetadataViewRaw.(string))
 	}
 	res, err := client.Do()
 
@@ -2072,7 +2070,7 @@ type TableReference struct {
 
 func resourceBigQueryTableUpdate(d *schema.ResourceData, meta interface{}) error {
 	// If only client-side fields were modified, short-circuit the Update function to avoid sending an update API request.
-	clientSideFields := map[string]bool{"deletion_protection": true}
+	clientSideFields := map[string]bool{"deletion_protection": true, "table_metadata_view": true}
 	clientSideOnly := true
 	for field := range ResourceBigQueryTable().Schema {
 		if d.HasChange(field) && !clientSideFields[field] {
@@ -2109,14 +2107,18 @@ func resourceBigQueryTableUpdate(d *schema.ResourceData, meta interface{}) error
 
 	datasetID := d.Get("dataset_id").(string)
 	tableID := d.Get("table_id").(string)
+	var tableMetadataView string
+	if tableMetadataViewRaw, ok := d.GetOk("table_metadata_view"); ok {
+		tableMetadataView = tableMetadataViewRaw.(string)
+	}
 
 	tableReference := &TableReference{
 		project:   project,
 		datasetID: datasetID,
 		tableID:   tableID,
 	}
 
-	if err = resourceBigQueryTableColumnDrop(config, userAgent, table, tableReference); err != nil {
+	if err = resourceBigQueryTableColumnDrop(config, userAgent, table, tableReference, tableMetadataView); err != nil {
 		return err
 	}
 
@@ -2127,8 +2129,13 @@ func resourceBigQueryTableUpdate(d *schema.ResourceData, meta interface{}) error
 	return resourceBigQueryTableRead(d, meta)
 }
 
-func resourceBigQueryTableColumnDrop(config *transport_tpg.Config, userAgent string, table *bigquery.Table, tableReference *TableReference) error {
-	oldTable, err := config.NewBigQueryClient(userAgent).Tables.Get(tableReference.project, tableReference.datasetID, tableReference.tableID).Do()
+func resourceBigQueryTableColumnDrop(config *transport_tpg.Config, userAgent string, table *bigquery.Table, tableReference *TableReference, tableMetadataView string) error {
+	client := config.NewBigQueryClient(userAgent).Tables.Get(tableReference.project, tableReference.datasetID, tableReference.tableID)
+	if len(tableMetadataView) > 0 {
+		client = client.View(tableMetadataView)
+	}
+	oldTable, err := client.Do()
+
 	if err != nil {
 		return err
 	}