fix: api update (#67)

ecmadao · web-flow · commit 4a33fb2edd05 · 2023-07-18T15:42:42.000+08:00
* fix: api update

* chore: reset change

* fix: lint
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.0.8
+0.0.9
diff --git a/api/client.go b/api/client.go
@@ -36,7 +36,7 @@ type Client interface {
 	// UndeleteInstance undeletes the instance.
 	UndeleteInstance(ctx context.Context, instanceID string) (*InstanceMessage, error)
 	// SyncInstanceSchema will trigger the schema sync for an instance.
-	SyncInstanceSchema(ctx context.Context, instanceUID string) error
+	SyncInstanceSchema(ctx context.Context, instanceID string) error
 
 	// Role
 	// CreateRole creates the role in the instance.
diff --git a/api/database_role.go b/api/database_role.go
@@ -13,18 +13,18 @@ type RoleAttribute struct {
 
 // Role is the API message for role.
 type Role struct {
-	Name            string         `json:"name"`
-	RoleName        string         `json:"roleName"`
-	ConnectionLimit int            `json:"connectionLimit"`
-	ValidUntil      *string        `json:"validUntil"`
-	Attribute       *RoleAttribute `json:"attribute"`
+	Name            string  `json:"name"`
+	RoleName        string  `json:"roleName"`
+	ConnectionLimit int     `json:"connectionLimit"`
+	ValidUntil      *string `json:"validUntil"`
+	Attribute       *string `json:"attribute"`
 }
 
 // RoleUpsert is the API message for upserting a new role.
 type RoleUpsert struct {
-	RoleName        string         `json:"roleName"`
-	Password        *string        `json:"password"`
-	ConnectionLimit *int           `json:"connectionLimit"`
-	ValidUntil      *string        `json:"validUntil"`
-	Attribute       *RoleAttribute `json:"attribute"`
+	RoleName        string  `json:"roleName"`
+	Password        *string `json:"password"`
+	ConnectionLimit *int    `json:"connectionLimit"`
+	ValidUntil      *string `json:"validUntil"`
+	Attribute       *string `json:"attribute"`
 }
diff --git a/client/instance.go b/client/instance.go
@@ -152,9 +152,8 @@ func (c *client) UndeleteInstance(ctx context.Context, instanceID string) (*api.
 }
 
 // SyncInstanceSchema will trigger the schema sync for an instance.
-func (c *client) SyncInstanceSchema(ctx context.Context, instanceUID string) error {
-	payload := fmt.Sprintf(`{"data":{"type":"sqlSyncSchema","attributes":{"instanceId":%s}}}`, instanceUID)
-	req, err := http.NewRequestWithContext(ctx, "POST", fmt.Sprintf("%s/api/sql/sync-schema", c.url), strings.NewReader(string(payload)))
+func (c *client) SyncInstanceSchema(ctx context.Context, instanceID string) error {
+	req, err := http.NewRequestWithContext(ctx, "POST", fmt.Sprintf("%s/%s/instances/%s:sync", c.url, c.version, instanceID), nil)
 
 	if err != nil {
 		return err
diff --git a/examples/environments/main.tf b/examples/environments/main.tf
@@ -2,7 +2,7 @@
 terraform {
   required_providers {
     bytebase = {
-      version = "0.0.8"
+      version = "0.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 = "0.0.8"
+      version = "0.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 = "0.0.8"
+      version = "0.0.9"
       # For local development, please use "terraform.local/bytebase/bytebase" instead
       source = "registry.terraform.io/bytebase/bytebase"
     }
diff --git a/examples/roles/main.tf b/examples/roles/main.tf
@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     bytebase = {
-      version = "0.0.8"
+      version = "0.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 = "0.0.8"
+      version = "0.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_role_list.go b/provider/data_source_database_role_list.go
@@ -126,17 +126,7 @@ func dataSourceRoleListRead(ctx context.Context, d *schema.ResourceData, m inter
 		role["name"] = roleName
 		role["connection_limit"] = raw.ConnectionLimit
 		role["valid_until"] = raw.ValidUntil
-
-		attribute := map[string]interface{}{
-			"super_user":  raw.Attribute.SuperUser,
-			"no_inherit":  raw.Attribute.NoInherit,
-			"create_role": raw.Attribute.CreateRole,
-			"create_db":   raw.Attribute.CreateDB,
-			"can_login":   raw.Attribute.CanLogin,
-			"replication": raw.Attribute.Replication,
-			"bypass_rls":  raw.Attribute.ByPassRLS,
-		}
-		role["attribute"] = []interface{}{attribute}
+		role["attribute"] = []interface{}{convertStringToRoleAttribute(raw.Attribute)}
 
 		roles = append(roles, role)
 	}
diff --git a/provider/internal/mock_client.go b/provider/internal/mock_client.go
@@ -271,17 +271,14 @@ func (c *mockClient) CreateRole(_ context.Context, instanceID string, create *ap
 		Name:            id,
 		RoleName:        create.RoleName,
 		ConnectionLimit: -1,
-		Attribute:       &api.RoleAttribute{},
+		Attribute:       create.Attribute,
 	}
 	if v := create.ConnectionLimit; v != nil {
 		role.ConnectionLimit = *v
 	}
 	if v := create.ValidUntil; v != nil {
 		role.ValidUntil = v
 	}
-	if v := create.Attribute; v != nil {
-		role.Attribute = v
-	}
 
 	c.roleMap[id] = role
 	return role, nil
diff --git a/provider/resource_database_role.go b/provider/resource_database_role.go
@@ -3,6 +3,7 @@ package provider
 import (
 	"context"
 	"fmt"
+	"strings"
 	"time"
 
 	"github.com/hashicorp/terraform-plugin-log/tflog"
@@ -132,7 +133,7 @@ func resourceRoleCreate(ctx context.Context, d *schema.ResourceData, m interface
 
 	upsert := &api.RoleUpsert{
 		RoleName:  roleName,
-		Attribute: convertRoleAttribute(d),
+		Attribute: convertRoleAttributeToString(d),
 	}
 
 	if v := d.Get("password").(string); v != "" {
@@ -219,7 +220,7 @@ func resourceRoleUpdate(ctx context.Context, d *schema.ResourceData, m interface
 		}
 	}
 	if d.HasChange("attribute") {
-		upsert.Attribute = convertRoleAttribute(d)
+		upsert.Attribute = convertRoleAttributeToString(d)
 	}
 
 	if _, err := c.UpdateRole(ctx, instanceID, roleName, upsert); err != nil {
@@ -280,23 +281,14 @@ func setRole(d *schema.ResourceData, role *api.Role) diag.Diagnostics {
 		return diag.Errorf("cannot set valid_until for role: %s", err.Error())
 	}
 
-	attribute := map[string]interface{}{
-		"super_user":  role.Attribute.SuperUser,
-		"no_inherit":  role.Attribute.NoInherit,
-		"create_role": role.Attribute.CreateRole,
-		"create_db":   role.Attribute.CreateDB,
-		"can_login":   role.Attribute.CanLogin,
-		"replication": role.Attribute.Replication,
-		"bypass_rls":  role.Attribute.ByPassRLS,
-	}
-	if err := d.Set("attribute", []interface{}{attribute}); err != nil {
+	if err := d.Set("attribute", []interface{}{convertStringToRoleAttribute(role.Attribute)}); err != nil {
 		return diag.Errorf("cannot set attribute for role: %s", err.Error())
 	}
 
 	return nil
 }
 
-func convertRoleAttribute(d *schema.ResourceData) *api.RoleAttribute {
+func convertRoleAttributeToString(d *schema.ResourceData) *string {
 	rawList := d.Get("attribute").([]interface{})
 	if len(rawList) < 1 {
 		return nil
@@ -307,15 +299,70 @@ func convertRoleAttribute(d *schema.ResourceData) *api.RoleAttribute {
 		return nil
 	}
 
-	return &api.RoleAttribute{
-		SuperUser:   raw["super_user"].(bool),
-		NoInherit:   raw["no_inherit"].(bool),
-		CreateRole:  raw["create_role"].(bool),
-		CreateDB:    raw["create_db"].(bool),
-		CanLogin:    raw["can_login"].(bool),
-		Replication: raw["replication"].(bool),
-		ByPassRLS:   raw["bypass_rls"].(bool),
+	attributes := []string{}
+	if raw["super_user"].(bool) {
+		attributes = append(attributes, "SUPERUSER")
+	} else {
+		attributes = append(attributes, "NOSUPERUSER")
+	}
+	if raw["no_inherit"].(bool) {
+		attributes = append(attributes, "NOINHERIT")
+	} else {
+		attributes = append(attributes, "INHERIT")
+	}
+	if raw["create_role"].(bool) {
+		attributes = append(attributes, "CREATEROLE")
+	} else {
+		attributes = append(attributes, "NOCREATEROLE")
+	}
+	if raw["create_db"].(bool) {
+		attributes = append(attributes, "CREATEDB")
+	} else {
+		attributes = append(attributes, "NOCREATEDB")
+	}
+	if raw["can_login"].(bool) {
+		attributes = append(attributes, "LOGIN")
+	} else {
+		attributes = append(attributes, "NOLOGIN")
+	}
+	if raw["replication"].(bool) {
+		attributes = append(attributes, "REPLICATION")
+	} else {
+		attributes = append(attributes, "NOREPLICATION")
+	}
+	if raw["bypass_rls"].(bool) {
+		attributes = append(attributes, "BYPASSRLS")
+	} else {
+		attributes = append(attributes, "NOBYPASSRLS")
+	}
+
+	resp := strings.Join(attributes, " ")
+	return &resp
+}
+
+func convertStringToRoleAttribute(attribute *string) map[string]interface{} {
+	attr := []string{}
+	if attribute != nil {
+		attr = strings.Split(*attribute, " ")
+	}
+	return map[string]interface{}{
+		"super_user":  containsAttribute(attr, "SUPERUSER"),
+		"no_inherit":  containsAttribute(attr, "NOINHERIT"),
+		"create_role": containsAttribute(attr, "CREATEROLE"),
+		"create_db":   containsAttribute(attr, "CREATEDB"),
+		"can_login":   containsAttribute(attr, "LOGIN"),
+		"replication": containsAttribute(attr, "REPLICATION"),
+		"bypass_rls":  containsAttribute(attr, "BYPASSRLS"),
+	}
+}
+
+func containsAttribute(attributes []string, target string) bool {
+	for _, attr := range attributes {
+		if attr == target {
+			return true
+		}
 	}
+	return false
 }
 
 func validateDatetime(val interface{}, _ string) (ws []string, es []error) {
diff --git a/provider/resource_instance.go b/provider/resource_instance.go
@@ -217,7 +217,7 @@ func resourceInstanceCreate(ctx context.Context, d *schema.ResourceData, m inter
 			return diags
 		}
 
-		if err := c.SyncInstanceSchema(ctx, instance.UID); err != nil {
+		if err := c.SyncInstanceSchema(ctx, instanceID); err != nil {
 			diags = append(diags, diag.Diagnostic{
 				Severity: diag.Warning,
 				Summary:  "Instance schema sync failed",
@@ -239,7 +239,7 @@ func resourceInstanceCreate(ctx context.Context, d *schema.ResourceData, m inter
 			return diag.FromErr(err)
 		}
 
-		if err := c.SyncInstanceSchema(ctx, instance.UID); err != nil {
+		if err := c.SyncInstanceSchema(ctx, instanceID); err != nil {
 			diags = append(diags, diag.Diagnostic{
 				Severity: diag.Warning,
 				Summary:  "Instance schema sync failed",
@@ -337,11 +337,10 @@ func resourceInstanceUpdate(ctx context.Context, d *schema.ResourceData, m inter
 		patch.DataSources = dataSourceList
 	}
 
-	instance, err := c.UpdateInstance(ctx, instanceID, patch)
-	if err != nil {
+	if _, err := c.UpdateInstance(ctx, instanceID, patch); err != nil {
 		return diag.FromErr(err)
 	}
-	if err := c.SyncInstanceSchema(ctx, instance.UID); err != nil {
+	if err := c.SyncInstanceSchema(ctx, instanceID); err != nil {
 		diags = append(diags, diag.Diagnostic{
 			Severity: diag.Warning,
 			Summary:  "Instance schema sync failed",

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 = "0.0.8"`
	`5`	`+ version = "0.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 = "0.0.8"`
	`4`	`+ version = "0.0.9"`
`5`	`5`	`# For local development, please use "terraform.local/bytebase/bytebase" instead`
`6`	`6`	`source = "registry.terraform.io/bytebase/bytebase"`
`7`	`7`	`}`