chore: dependency update (#146)

* chore: dependency update

* fix: lint

* fix: lint

Author: ecmadao

README.md

@@ -17,7 +17,7 @@ using Terraform Bytebase Provider to prepare those instances ready for applicati
 
 - [Go](https://golang.org/doc/install) (1.19 or later)
 - [Terraform](https://developer.hashicorp.com/terraform/downloads?product_intent=terraform) (1.3.5 or later)
-- [Bytebase](https://github.com/bytebase/bytebase) (3.8.0 or later)
+- [Bytebase](https://github.com/bytebase/bytebase) (3.9.2 or later)
 
 > If you have problems running `terraform` in MacOS with Apple Silicon, you can following https://stackoverflow.com/questions/66281882/how-can-i-get-terraform-init-to-run-on-my-apple-silicon-macbook-pro-for-the-go and use the `tfenv`.
 

api/client.go

@@ -3,7 +3,7 @@ package api
 import (
 	"context"
 
-	v1pb "github.com/bytebase/bytebase/backend/generated-go/v1"
+	v1pb "buf.build/gen/go/bytebase/bytebase/protocolbuffers/go/v1"
 	v1alpha1 "google.golang.org/genproto/googleapis/api/expr/v1alpha1"
 )
 
@@ -51,15 +51,14 @@ type UserFilter struct {
 	State     v1pb.State
 }
 
+// GroupFilter is the filter for list group API.
+type GroupFilter struct {
+	Query   string
+	Project string
+}
+
 // Client is the API message for Bytebase OpenAPI client.
 type Client interface {
-	// GetCaller returns the API caller.
-	GetCaller() *v1pb.User
-	// CheckResourceExist check if the resource exists.
-	CheckResourceExist(ctx context.Context, name string) error
-	// DeleteResource force delete the resource by name.
-	DeleteResource(ctx context.Context, name string) error
-
 	// Instance
 	// ListInstance will return instances.
 	ListInstance(ctx context.Context, filter *InstanceFilter) ([]*v1pb.Instance, error)
@@ -71,6 +70,8 @@ type Client interface {
 	UpdateInstance(ctx context.Context, patch *v1pb.Instance, updateMasks []string) (*v1pb.Instance, error)
 	// UndeleteInstance undeletes the instance.
 	UndeleteInstance(ctx context.Context, instanceName string) (*v1pb.Instance, error)
+	// DeleteInstance deletes the instance.
+	DeleteInstance(ctx context.Context, instanceName string) error
 	// SyncInstanceSchema will trigger the schema sync for an instance.
 	SyncInstanceSchema(ctx context.Context, instanceName string) error
 
@@ -109,6 +110,8 @@ type Client interface {
 	UpdateProject(ctx context.Context, patch *v1pb.Project, updateMask []string) (*v1pb.Project, error)
 	// UndeleteProject undeletes the project.
 	UndeleteProject(ctx context.Context, projectName string) (*v1pb.Project, error)
+	// DeleteProject deletes the project.
+	DeleteProject(ctx context.Context, projectName string) error
 	// GetProjectIAMPolicy gets the project IAM policy by project full name.
 	GetProjectIAMPolicy(ctx context.Context, projectName string) (*v1pb.IamPolicy, error)
 	// SetProjectIAMPolicy sets the project IAM policy.
@@ -143,6 +146,8 @@ type Client interface {
 	UpdateUser(ctx context.Context, patch *v1pb.User, updateMasks []string) (*v1pb.User, error)
 	// UndeleteUser undeletes the user by name.
 	UndeleteUser(ctx context.Context, userName string) (*v1pb.User, error)
+	// DeleteUser deletes the user.
+	DeleteUser(ctx context.Context, userName string) error
 
 	// Role
 	// ListRole will returns all roles.
@@ -153,16 +158,20 @@ type Client interface {
 	GetRole(ctx context.Context, name string) (*v1pb.Role, error)
 	// UpdateRole updates the role.
 	UpdateRole(ctx context.Context, patch *v1pb.Role, updateMasks []string) (*v1pb.Role, error)
+	// DeleteRole deletes the role.
+	DeleteRole(ctx context.Context, roleName string) error
 
 	// Group
 	// ListGroup list all groups.
-	ListGroup(ctx context.Context) (*v1pb.ListGroupsResponse, error)
+	ListGroup(ctx context.Context, filter *GroupFilter) ([]*v1pb.Group, error)
 	// CreateGroup creates the group.
 	CreateGroup(ctx context.Context, email string, group *v1pb.Group) (*v1pb.Group, error)
 	// GetGroup gets the group by name.
 	GetGroup(ctx context.Context, name string) (*v1pb.Group, error)
 	// UpdateGroup updates the group.
 	UpdateGroup(ctx context.Context, patch *v1pb.Group, updateMasks []string) (*v1pb.Group, error)
+	// DeleteGroup deletes the group.
+	DeleteGroup(ctx context.Context, groupName string) error
 
 	// Workspace
 	// GetWorkspaceIAMPolicy gets the workspace IAM policy.
@@ -177,6 +186,8 @@ type Client interface {
 	GetReviewConfig(ctx context.Context, reviewName string) (*v1pb.ReviewConfig, error)
 	// UpsertReviewConfig updates or creates the review config.
 	UpsertReviewConfig(ctx context.Context, patch *v1pb.ReviewConfig, updateMasks []string) (*v1pb.ReviewConfig, error)
+	// DeleteReviewConfig deletes the review config.
+	DeleteReviewConfig(ctx context.Context, reviewConfigName string) error
 
 	// Risk
 	// ListRisk lists the risk.
@@ -187,6 +198,8 @@ type Client interface {
 	CreateRisk(ctx context.Context, risk *v1pb.Risk) (*v1pb.Risk, error)
 	// UpdateRisk updates the risk.
 	UpdateRisk(ctx context.Context, patch *v1pb.Risk, updateMasks []string) (*v1pb.Risk, error)
+	// DeleteRisk deletes the risk.
+	DeleteRisk(ctx context.Context, riskName string) error
 
 	// ListDatabaseGroup list all database groups in a project.
 	ListDatabaseGroup(ctx context.Context, project string) (*v1pb.ListDatabaseGroupsResponse, error)
@@ -196,4 +209,6 @@ type Client interface {
 	GetDatabaseGroup(ctx context.Context, name string, view v1pb.DatabaseGroupView) (*v1pb.DatabaseGroup, error)
 	// UpdateDatabaseGroup updates the database group.
 	UpdateDatabaseGroup(ctx context.Context, patch *v1pb.DatabaseGroup, updateMasks []string) (*v1pb.DatabaseGroup, error)
+	// DeleteDatabaseGroup deletes the database group.
+	DeleteDatabaseGroup(ctx context.Context, databaseGroupName string) error
 }

client/auth.go

@@ -1,40 +1,41 @@
 package client
 
 import (
+	"context"
 	"fmt"
-	"net/http"
-	"strings"
 
-	"github.com/pkg/errors"
-	"google.golang.org/protobuf/encoding/protojson"
-
-	v1pb "github.com/bytebase/bytebase/backend/generated-go/v1"
+	"connectrpc.com/connect"
 )
 
-// Login will login the user and get the response.
-func (c *client) login(request *v1pb.LoginRequest) (*v1pb.LoginResponse, error) {
-	if request.Email == "" || request.Password == "" {
-		return nil, errors.Errorf("undefined login service account or key")
-	}
-	rb, err := protojson.Marshal(request)
-	if err != nil {
-		return nil, err
-	}
-
-	req, err := http.NewRequest("POST", fmt.Sprintf("%s/%s/auth/login", c.url, c.version), strings.NewReader(string(rb)))
-	if err != nil {
-		return nil, err
-	}
+// Note: The login method has been moved to client.go and now uses Connect RPC.
+// This file is kept for backward compatibility but the implementation
+// has been migrated to use the AuthServiceClient from Connect RPC.
+// authInterceptor implements connect.Interceptor to add authentication headers.
+type authInterceptor struct {
+	token string
+}
 
-	body, err := c.doRequest(req)
-	if err != nil {
-		return nil, errors.Wrapf(err, "failed to login")
-	}
+func (a *authInterceptor) WrapUnary(next connect.UnaryFunc) connect.UnaryFunc {
+	return connect.UnaryFunc(func(ctx context.Context, req connect.AnyRequest) (connect.AnyResponse, error) {
+		if req.Spec().IsClient && a.token != "" {
+			req.Header().Set("Authorization", fmt.Sprintf("Bearer %s", a.token))
+		}
+		return next(ctx, req)
+	})
+}
 
-	ar := v1pb.LoginResponse{}
-	if err := ProtojsonUnmarshaler.Unmarshal(body, &ar); err != nil {
-		return nil, err
-	}
+func (a *authInterceptor) WrapStreamingClient(next connect.StreamingClientFunc) connect.StreamingClientFunc {
+	return connect.StreamingClientFunc(func(ctx context.Context, spec connect.Spec) connect.StreamingClientConn {
+		conn := next(ctx, spec)
+		if a.token != "" {
+			conn.RequestHeader().Set("Authorization", fmt.Sprintf("Bearer %s", a.token))
+		}
+		return conn
+	})
+}
 
-	return &ar, nil
+func (*authInterceptor) WrapStreamingHandler(next connect.StreamingHandlerFunc) connect.StreamingHandlerFunc {
+	return connect.StreamingHandlerFunc(func(ctx context.Context, conn connect.StreamingHandlerConn) error {
+		return next(ctx, conn)
+	})
 }

client/cel.go

@@ -2,43 +2,31 @@ package client
 
 import (
 	"context"
-	"fmt"
-	"net/http"
-	"strings"
 
-	v1pb "github.com/bytebase/bytebase/backend/generated-go/v1"
+	v1pb "buf.build/gen/go/bytebase/bytebase/protocolbuffers/go/v1"
+	"connectrpc.com/connect"
 	"github.com/pkg/errors"
 	v1alpha1 "google.golang.org/genproto/googleapis/api/expr/v1alpha1"
-	"google.golang.org/protobuf/encoding/protojson"
 )
 
-// ParseExpression parse the expression string.
+// ParseExpression parse the expression string using Connect RPC.
 func (c *client) ParseExpression(ctx context.Context, expression string) (*v1alpha1.Expr, error) {
-	payload, err := protojson.Marshal(&v1pb.BatchParseRequest{
-		Expressions: []string{expression},
-	})
-	if err != nil {
-		return nil, err
+	if c.celClient == nil {
+		return nil, errors.New("cel service client not initialized")
 	}
 
-	req, err := http.NewRequestWithContext(ctx, "POST", fmt.Sprintf("%s/%s/cel/batchParse", c.url, c.version), strings.NewReader(string(payload)))
-	if err != nil {
-		return nil, err
-	}
+	req := connect.NewRequest(&v1pb.BatchParseRequest{
+		Expressions: []string{expression},
+	})
 
-	body, err := c.doRequest(req)
+	resp, err := c.celClient.BatchParse(ctx, req)
 	if err != nil {
 		return nil, err
 	}
 
-	var res v1pb.BatchParseResponse
-	if err := ProtojsonUnmarshaler.Unmarshal(body, &res); err != nil {
-		return nil, err
-	}
-
-	if len(res.Expressions) != 1 {
+	if len(resp.Msg.Expressions) != 1 {
 		return nil, errors.Errorf("failed to parse the cel: %v", expression)
 	}
 
-	return res.GetExpressions()[0], nil
+	return resp.Msg.GetExpressions()[0], nil
 }

client/client.go

@@ -3,86 +3,91 @@ package client
 
 import (
 	"context"
-	"fmt"
-	"io"
 	"net/http"
+	"strings"
 	"time"
 
 	"github.com/pkg/errors"
 
-	v1pb "github.com/bytebase/bytebase/backend/generated-go/v1"
+	"buf.build/gen/go/bytebase/bytebase/connectrpc/go/v1/bytebasev1connect"
+	v1pb "buf.build/gen/go/bytebase/bytebase/protocolbuffers/go/v1"
+	"connectrpc.com/connect"
 
 	"github.com/bytebase/terraform-provider-bytebase/api"
 )
 
 // client is the API message for Bytebase API client.
 type client struct {
-	url     string
-	version string
-	client  *http.Client
-	token   string
-	caller  *v1pb.User
+	url    string
+	client *http.Client
+
+	// Connect RPC clients
+	authClient            bytebasev1connect.AuthServiceClient
+	workspaceClient       bytebasev1connect.WorkspaceServiceClient
+	instanceClient        bytebasev1connect.InstanceServiceClient
+	databaseClient        bytebasev1connect.DatabaseServiceClient
+	databaseCatalogClient bytebasev1connect.DatabaseCatalogServiceClient
+	databaseGroupClient   bytebasev1connect.DatabaseGroupServiceClient
+	projectClient         bytebasev1connect.ProjectServiceClient
+	userClient            bytebasev1connect.UserServiceClient
+	roleClient            bytebasev1connect.RoleServiceClient
+	groupClient           bytebasev1connect.GroupServiceClient
+	settingClient         bytebasev1connect.SettingServiceClient
+	orgPolicyClient       bytebasev1connect.OrgPolicyServiceClient
+	reviewConfigClient    bytebasev1connect.ReviewConfigServiceClient
+	riskClient            bytebasev1connect.RiskServiceClient
+	celClient             bytebasev1connect.CelServiceClient
 }
 
 // NewClient returns the new Bytebase API client.
-func NewClient(url, version, email, password string) (api.Client, error) {
+func NewClient(url, email, password string) (api.Client, error) {
 	c := client{
-		client:  &http.Client{Timeout: 10 * time.Second},
-		url:     url,
-		version: version,
+		url: strings.TrimSuffix(url, "/"),
 	}
 
-	response, err := c.login(&v1pb.LoginRequest{
-		Email:    email,
-		Password: password,
-	})
-	if err != nil {
-		return nil, err
+	// Use standard HTTP client that supports both HTTP/1.1 and HTTP/2
+	c.client = &http.Client{
+		Timeout: 30 * time.Second,
 	}
 
-	c.token = response.Token
-	c.caller = response.User
+	authInt := &authInterceptor{}
+	interceptors := connect.WithInterceptors(authInt)
 
-	return &c, nil
-}
+	// Create auth client without token first
+	// Try without WithGRPC first to see if it's a standard Connect/gRPC-Web service
+	c.authClient = bytebasev1connect.NewAuthServiceClient(
+		c.client,
+		c.url,
+	)
 
-func (c *client) doRequest(req *http.Request) ([]byte, error) {
-	if c.token != "" {
-		req.Header.Set("Authorization", fmt.Sprintf("Bearer %s", c.token))
-	}
-
-	res, err := c.client.Do(req)
-	if err != nil {
-		return nil, err
-	}
-	defer res.Body.Close()
+	// Login to get token
+	loginReq := connect.NewRequest(&v1pb.LoginRequest{
+		Email:    email,
+		Password: password,
+	})
 
-	body, err := io.ReadAll(res.Body)
+	loginResp, err := c.authClient.Login(context.Background(), loginReq)
 	if err != nil {
-		return nil, err
-	}
-
-	if res.StatusCode != http.StatusOK {
-		return nil, errors.Errorf("status: %d, body: %s", res.StatusCode, body)
+		return nil, errors.Wrapf(err, "failed to login")
 	}
 
-	return body, err
-}
+	authInt.token = loginResp.Msg.Token
+
+	// Initialize other clients with auth token
+	c.workspaceClient = bytebasev1connect.NewWorkspaceServiceClient(c.client, c.url, interceptors)
+	c.instanceClient = bytebasev1connect.NewInstanceServiceClient(c.client, c.url, interceptors)
+	c.databaseClient = bytebasev1connect.NewDatabaseServiceClient(c.client, c.url, interceptors)
+	c.databaseCatalogClient = bytebasev1connect.NewDatabaseCatalogServiceClient(c.client, c.url, interceptors)
+	c.databaseGroupClient = bytebasev1connect.NewDatabaseGroupServiceClient(c.client, c.url, interceptors)
+	c.projectClient = bytebasev1connect.NewProjectServiceClient(c.client, c.url, interceptors)
+	c.userClient = bytebasev1connect.NewUserServiceClient(c.client, c.url, interceptors)
+	c.roleClient = bytebasev1connect.NewRoleServiceClient(c.client, c.url, interceptors)
+	c.groupClient = bytebasev1connect.NewGroupServiceClient(c.client, c.url, interceptors)
+	c.settingClient = bytebasev1connect.NewSettingServiceClient(c.client, c.url, interceptors)
+	c.orgPolicyClient = bytebasev1connect.NewOrgPolicyServiceClient(c.client, c.url, interceptors)
+	c.reviewConfigClient = bytebasev1connect.NewReviewConfigServiceClient(c.client, c.url, interceptors)
+	c.riskClient = bytebasev1connect.NewRiskServiceClient(c.client, c.url, interceptors)
+	c.celClient = bytebasev1connect.NewCelServiceClient(c.client, c.url, interceptors)
 
-// GetCaller returns the API caller.
-func (c *client) GetCaller() *v1pb.User {
-	return c.caller
-}
-
-// CheckResourceExist check if the resource exists.
-func (c *client) CheckResourceExist(ctx context.Context, name string) error {
-	if _, err := c.getResource(ctx, name, ""); err != nil {
-		return err
-	}
-	return nil
-}
-
-// DeleteResource force delete the resource by name.
-func (c *client) DeleteResource(ctx context.Context, name string) error {
-	return c.execDelete(ctx, name)
+	return &c, nil
 }