chore: use set for unordered collection

ecmadao · ecmadao · commit 6ee12bbbe67c · 2025-02-05T14:54:48.000+08:00
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.0.8
+1.0.9
diff --git a/api/client.go b/api/client.go
@@ -59,6 +59,8 @@ type Client interface {
 	ListDatabase(ctx context.Context, instanceID, filter string) (*v1pb.ListDatabasesResponse, error)
 	// UpdateDatabase patches the database.
 	UpdateDatabase(ctx context.Context, patch *v1pb.Database, updateMasks []string) (*v1pb.Database, error)
+	// BatchUpdateDatabases batch updates databases.
+	BatchUpdateDatabases(ctx context.Context, request *v1pb.BatchUpdateDatabasesRequest) (*v1pb.BatchUpdateDatabasesResponse, error)
 	// GetDatabaseCatalog gets the database catalog by the database full name.
 	GetDatabaseCatalog(ctx context.Context, databaseName string) (*v1pb.DatabaseCatalog, error)
 	// UpdateDatabaseCatalog patches the database catalog.
diff --git a/client/database.go b/client/database.go
@@ -5,8 +5,10 @@ import (
 	"fmt"
 	"net/http"
 	"net/url"
+	"strings"
 
 	v1pb "github.com/bytebase/bytebase/proto/generated-go/v1"
+	"google.golang.org/protobuf/encoding/protojson"
 )
 
 // GetDatabase gets the database by the database full name.
@@ -64,6 +66,32 @@ func (c *client) UpdateDatabase(ctx context.Context, patch *v1pb.Database, updat
 	return &res, nil
 }
 
+// BatchUpdateDatabases batch updates databases.
+func (c *client) BatchUpdateDatabases(ctx context.Context, request *v1pb.BatchUpdateDatabasesRequest) (*v1pb.BatchUpdateDatabasesResponse, error) {
+	requestURL := fmt.Sprintf("%s/%s/instances/-/databases:batchUpdate", c.url, c.version)
+	payload, err := protojson.Marshal(request)
+	if err != nil {
+		return nil, err
+	}
+
+	req, err := http.NewRequestWithContext(ctx, "POST", requestURL, strings.NewReader(string(payload)))
+	if err != nil {
+		return nil, err
+	}
+
+	body, err := c.doRequest(req)
+	if err != nil {
+		return nil, err
+	}
+
+	var res v1pb.BatchUpdateDatabasesResponse
+	if err := ProtojsonUnmarshaler.Unmarshal(body, &res); err != nil {
+		return nil, err
+	}
+
+	return &res, nil
+}
+
 // GetDatabaseCatalog gets the database catalog by the database full name.
 func (c *client) GetDatabaseCatalog(ctx context.Context, databaseName string) (*v1pb.DatabaseCatalog, error) {
 	body, err := c.getResource(ctx, fmt.Sprintf("%s/catalog", databaseName))
diff --git a/examples/environments/main.tf b/examples/environments/main.tf
@@ -2,7 +2,7 @@
 terraform {
   required_providers {
     bytebase = {
-      version = "1.0.8"
+      version = "1.0.9"
       # For local development, please use "terraform.local/bytebase/bytebase" instead
       source = "registry.terraform.io/bytebase/bytebase"
     }
diff --git a/examples/groups/main.tf b/examples/groups/main.tf
@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     bytebase = {
-      version = "1.0.8"
+      version = "1.0.9"
       # For local development, please use "terraform.local/bytebase/bytebase" instead
       source = "registry.terraform.io/bytebase/bytebase"
     }
diff --git a/examples/instances/main.tf b/examples/instances/main.tf
@@ -2,7 +2,7 @@
 terraform {
   required_providers {
     bytebase = {
-      version = "1.0.8"
+      version = "1.0.9"
       # For local development, please use "terraform.local/bytebase/bytebase" instead
       source = "registry.terraform.io/bytebase/bytebase"
     }
diff --git a/examples/policies/main.tf b/examples/policies/main.tf
@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     bytebase = {
-      version = "1.0.8"
+      version = "1.0.9"
       # For local development, please use "terraform.local/bytebase/bytebase" instead
       source = "registry.terraform.io/bytebase/bytebase"
     }
diff --git a/examples/projects/main.tf b/examples/projects/main.tf
@@ -2,7 +2,7 @@
 terraform {
   required_providers {
     bytebase = {
-      version = "1.0.8"
+      version = "1.0.9"
       # For local development, please use "terraform.local/bytebase/bytebase" instead
       source = "registry.terraform.io/bytebase/bytebase"
     }
diff --git a/examples/settings/main.tf b/examples/settings/main.tf
@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     bytebase = {
-      version = "1.0.8"
+      version = "1.0.9"
       # For local development, please use "terraform.local/bytebase/bytebase" instead
       source = "registry.terraform.io/bytebase/bytebase"
     }
diff --git a/examples/setup/main.tf b/examples/setup/main.tf
@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     bytebase = {
-      version = "1.0.8"
+      version = "1.0.9"
       # For local development, please use "terraform.local/bytebase/bytebase" instead
       source = "registry.terraform.io/bytebase/bytebase"
     }
diff --git a/examples/users/main.tf b/examples/users/main.tf
@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     bytebase = {
-      version = "1.0.8"
+      version = "1.0.9"
       # For local development, please use "terraform.local/bytebase/bytebase" instead
       source = "registry.terraform.io/bytebase/bytebase"
     }
diff --git a/examples/vcs/main.tf b/examples/vcs/main.tf
@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     bytebase = {
-      version = "1.0.8"
+      version = "1.0.9"
       # For local development, please use "terraform.local/bytebase/bytebase" instead
       source = "registry.terraform.io/bytebase/bytebase"
     }
diff --git a/provider/data_source_database_catalog.go b/provider/data_source_database_catalog.go
@@ -1,6 +1,7 @@
 package provider
 
 import (
+	"bytes"
 	"context"
 	"fmt"
 	"regexp"
@@ -29,7 +30,7 @@ func dataSourceDatabaseCatalog() *schema.Resource {
 			},
 			"schemas": {
 				Computed: true,
-				Type:     schema.TypeList,
+				Type:     schema.TypeSet,
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
 						"name": {
@@ -38,7 +39,7 @@ func dataSourceDatabaseCatalog() *schema.Resource {
 						},
 						"tables": {
 							Computed: true,
-							Type:     schema.TypeList,
+							Type:     schema.TypeSet,
 							Elem: &schema.Resource{
 								Schema: map[string]*schema.Schema{
 									"name": {
@@ -52,7 +53,7 @@ func dataSourceDatabaseCatalog() *schema.Resource {
 									},
 									"columns": {
 										Computed: true,
-										Type:     schema.TypeList,
+										Type:     schema.TypeSet,
 										Elem: &schema.Resource{
 											Schema: map[string]*schema.Schema{
 												"name": {
@@ -76,12 +77,19 @@ func dataSourceDatabaseCatalog() *schema.Resource {
 												},
 											},
 										},
+										Set: func(i interface{}) int {
+											return internal.ToHashcodeInt(columnHash(i))
+										},
 									},
 								},
 							},
+							Set: func(i interface{}) int {
+								return internal.ToHashcodeInt(tableHash(i))
+							},
 						},
 					},
 				},
+				Set: schemaHash,
 			},
 		},
 	}
@@ -108,11 +116,11 @@ func setDatabaseCatalog(d *schema.ResourceData, catalog *v1pb.DatabaseCatalog) d
 	}
 
 	schemaList := []interface{}{}
-	for _, schema := range catalog.Schemas {
+	for _, schemaCatalog := range catalog.Schemas {
 		rawSchema := map[string]interface{}{}
 
 		tableList := []interface{}{}
-		for _, table := range schema.Tables {
+		for _, table := range schemaCatalog.Tables {
 			rawTable := map[string]interface{}{}
 			rawTable["name"] = table.Name
 			rawTable["classification"] = table.Classification
@@ -126,15 +134,64 @@ func setDatabaseCatalog(d *schema.ResourceData, catalog *v1pb.DatabaseCatalog) d
 				rawColumn["labels"] = column.Labels
 				columnList = append(columnList, rawColumn)
 			}
-			rawTable["columns"] = columnList
+			rawTable["columns"] = schema.NewSet(func(i interface{}) int {
+				return internal.ToHashcodeInt(columnHash(i))
+			}, columnList)
 			tableList = append(tableList, rawTable)
 		}
-		rawSchema["tables"] = tableList
+		rawSchema["tables"] = schema.NewSet(func(i interface{}) int {
+			return internal.ToHashcodeInt(tableHash(i))
+		}, tableList)
 		schemaList = append(schemaList, rawSchema)
 	}
 
-	if err := d.Set("schemas", schemaList); err != nil {
+	if err := d.Set("schemas", schema.NewSet(schemaHash, schemaList)); err != nil {
 		return diag.Errorf("cannot set schemas: %s", err.Error())
 	}
 	return nil
 }
+
+func columnHash(rawColumn interface{}) string {
+	var buf bytes.Buffer
+	column := rawColumn.(map[string]interface{})
+
+	if v, ok := column["name"].(string); ok {
+		_, _ = buf.WriteString(fmt.Sprintf("%s-", v))
+	}
+
+	return buf.String()
+}
+
+func tableHash(rawTable interface{}) string {
+	var buf bytes.Buffer
+	table := rawTable.(map[string]interface{})
+
+	if v, ok := table["name"].(string); ok {
+		_, _ = buf.WriteString(fmt.Sprintf("%s-", v))
+	}
+	if columns, ok := table["columns"].(*schema.Set); ok {
+		for _, column := range columns.List() {
+			rawColumn := column.(map[string]interface{})
+			_, _ = buf.WriteString(columnHash(rawColumn))
+		}
+	}
+
+	return buf.String()
+}
+
+func schemaHash(rawSchema interface{}) int {
+	var buf bytes.Buffer
+	raw := rawSchema.(map[string]interface{})
+
+	if v, ok := raw["name"].(string); ok {
+		_, _ = buf.WriteString(fmt.Sprintf("%s-", v))
+	}
+	if tables, ok := raw["tables"].(*schema.Set); ok {
+		for _, table := range tables.List() {
+			rawTable := table.(map[string]interface{})
+			_, _ = buf.WriteString(tableHash(rawTable))
+		}
+	}
+
+	return internal.ToHashcodeInt(buf.String())
+}
diff --git a/provider/data_source_instance.go b/provider/data_source_instance.go
@@ -63,7 +63,7 @@ func dataSourceInstance() *schema.Resource {
 				Description: "The maximum number of connections. The default value is 10.",
 			},
 			"data_sources": {
-				Type:     schema.TypeList,
+				Type:     schema.TypeSet,
 				Computed: true,
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
@@ -123,6 +123,7 @@ func dataSourceInstance() *schema.Resource {
 						},
 					},
 				},
+				Set: dataSourceHash,
 			},
 		},
 	}
diff --git a/provider/data_source_policy.go b/provider/data_source_policy.go
@@ -1,6 +1,7 @@
 package provider
 
 import (
+	"bytes"
 	"context"
 	"fmt"
 	"regexp"
@@ -83,7 +84,7 @@ func getMaskingExceptionPolicySchema(computed bool) *schema.Schema {
 					Optional: true,
 					Default:  nil,
 					MinItems: 0,
-					Type:     schema.TypeList,
+					Type:     schema.TypeSet,
 					Elem: &schema.Resource{
 						Schema: map[string]*schema.Schema{
 							"database": {
@@ -134,6 +135,7 @@ func getMaskingExceptionPolicySchema(computed bool) *schema.Schema {
 							},
 						},
 					},
+					Set: exceptionHash,
 				},
 			},
 		},
@@ -243,7 +245,36 @@ func flattenMaskingExceptionPolicy(p *v1pb.MaskingExceptionPolicy) ([]interface{
 		exceptionList = append(exceptionList, raw)
 	}
 	policy := map[string]interface{}{
-		"exceptions": exceptionList,
+		"exceptions": schema.NewSet(exceptionHash, exceptionList),
 	}
 	return []interface{}{policy}, nil
 }
+
+func exceptionHash(rawException interface{}) int {
+	var buf bytes.Buffer
+	exception := rawException.(map[string]interface{})
+
+	if v, ok := exception["database"].(string); ok {
+		_, _ = buf.WriteString(fmt.Sprintf("%s-", v))
+	}
+	if v, ok := exception["schema"].(string); ok {
+		_, _ = buf.WriteString(fmt.Sprintf("%s-", v))
+	}
+	if v, ok := exception["table"].(string); ok {
+		_, _ = buf.WriteString(fmt.Sprintf("%s-", v))
+	}
+	if v, ok := exception["column"].(string); ok {
+		_, _ = buf.WriteString(fmt.Sprintf("%s-", v))
+	}
+	if v, ok := exception["member"].(string); ok {
+		_, _ = buf.WriteString(fmt.Sprintf("%s-", v))
+	}
+	if v, ok := exception["action"].(string); ok {
+		_, _ = buf.WriteString(fmt.Sprintf("%s-", v))
+	}
+	if v, ok := exception["expire_timestamp"].(string); ok {
+		_, _ = buf.WriteString(fmt.Sprintf("%s-", v))
+	}
+
+	return internal.ToHashcodeInt(buf.String())
+}
diff --git a/provider/data_source_project.go b/provider/data_source_project.go
@@ -87,7 +87,7 @@ func dataSourceProject() *schema.Resource {
 
 func getProjectDatabasesSchema(computed bool) *schema.Schema {
 	return &schema.Schema{
-		Type:        schema.TypeList,
+		Type:        schema.TypeSet,
 		Computed:    computed,
 		Optional:    !computed,
 		Description: "The databases in the project.",
@@ -128,6 +128,7 @@ func getProjectDatabasesSchema(computed bool) *schema.Schema {
 				},
 			},
 		},
+		Set: databaseHash,
 	}
 }
 
@@ -352,7 +353,8 @@ func setProject(
 		return diag.Errorf("cannot set postgres_database_tenant_mode for project: %s", err.Error())
 	}
 
-	if err := d.Set("databases", flattenDatabaseList(listDBResponse.Databases)); err != nil {
+	databaseList := flattenDatabaseList(listDBResponse.Databases)
+	if err := d.Set("databases", schema.NewSet(databaseHash, databaseList)); err != nil {
 		return diag.Errorf("cannot set databases for project: %s", err.Error())
 	}
 
@@ -367,6 +369,16 @@ func setProject(
 	return nil
 }
 
+func databaseHash(rawDatabase interface{}) int {
+	var buf bytes.Buffer
+	database := rawDatabase.(map[string]interface{})
+
+	if v, ok := database["name"].(string); ok {
+		_, _ = buf.WriteString(fmt.Sprintf("%s-", v))
+	}
+	return internal.ToHashcodeInt(buf.String())
+}
+
 func memberHash(rawMember interface{}) int {
 	var buf bytes.Buffer
 	member := rawMember.(map[string]interface{})
diff --git a/provider/data_source_setting.go b/provider/data_source_setting.go
diff --git a/provider/internal/mock_client.go b/provider/internal/mock_client.go
diff --git a/provider/resource_database_catalog.go b/provider/resource_database_catalog.go
diff --git a/provider/resource_instance.go b/provider/resource_instance.go
diff --git a/provider/resource_policy.go b/provider/resource_policy.go
diff --git a/provider/resource_project.go b/provider/resource_project.go
diff --git a/provider/resource_setting.go b/provider/resource_setting.go

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`terraform {`
`3`	`3`	`required_providers {`
`4`	`4`	`bytebase = {`
`5`		`- version = "1.0.8"`
	`5`	`+ version = "1.0.9"`
`6`	`6`	`# For local development, please use "terraform.local/bytebase/bytebase" instead`
`7`	`7`	`source = "registry.terraform.io/bytebase/bytebase"`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`terraform {`
`2`	`2`	`required_providers {`
`3`	`3`	`bytebase = {`
`4`		`- version = "1.0.8"`
	`4`	`+ version = "1.0.9"`
`5`	`5`	`# For local development, please use "terraform.local/bytebase/bytebase" instead`
`6`	`6`	`source = "registry.terraform.io/bytebase/bytebase"`
`7`	`7`	`}`