Remove ID field from query and visualization structs

Author: pietern

sqlanalytics/resource_query.go

@@ -13,7 +13,6 @@ import (
 
 // QueryEntity defines the parameters that can be set in the resource.
 type QueryEntity struct {
-	ID           string           `json:"id,omitempty" tf:"computed"`
 	DataSourceID string           `json:"data_source_id"`
 	Name         string           `json:"name"`
 	Description  string           `json:"description,omitempty"`
@@ -143,7 +142,7 @@ func (q *QueryEntity) toAPIObject(schema map[string]*schema.Schema, data *schema
 
 	// Transform to API object.
 	var aq api.Query
-	aq.ID = q.ID
+	aq.ID = data.Id()
 	aq.DataSourceID = q.DataSourceID
 	aq.Name = q.Name
 	aq.Description = q.Description
@@ -244,7 +243,6 @@ func (q *QueryEntity) toAPIObject(schema map[string]*schema.Schema, data *schema
 
 func (q *QueryEntity) fromAPIObject(aq *api.Query, schema map[string]*schema.Schema, data *schema.ResourceData) error {
 	// Copy from API object.
-	q.ID = aq.ID
 	q.DataSourceID = aq.DataSourceID
 	q.Name = aq.Name
 	q.Description = aq.Description

sqlanalytics/resource_visualization.go

@@ -15,7 +15,6 @@ import (
 
 // VisualizationEntity defines the parameters that can be set in the resource.
 type VisualizationEntity struct {
-	ID          string `json:"id,omitempty" tf:"computed"`
 	QueryID     string `json:"query_id"`
 	Type        string `json:"type"`
 	Name        string `json:"name"`
@@ -32,8 +31,8 @@ func (v *VisualizationEntity) toAPIObject(schema map[string]*schema.Schema, data
 	// Transform to API object.
 	var av api.Visualization
 
-	if v.ID != "" {
-		id, err := strconv.Atoi(v.ID)
+	if data.Id() != "" {
+		id, err := strconv.Atoi(data.Id())
 		if err != nil {
 			return nil, err
 		}
@@ -50,7 +49,6 @@ func (v *VisualizationEntity) toAPIObject(schema map[string]*schema.Schema, data
 
 func (v *VisualizationEntity) fromAPIObject(av *api.Visualization, schema map[string]*schema.Schema, data *schema.ResourceData) error {
 	// Copy from API object.
-	v.ID = strconv.Itoa(av.ID)
 	v.QueryID = av.QueryID
 	v.Type = strings.ToLower(av.Type)
 	v.Name = av.Name