chore: upgrade proto deps, auto-resolve workspace parent, and release 3.16.0 (#173)

* chore: upgrade bytebase

* chore: update

* fix: lint

Author: ecmadao

README.md

@@ -15,7 +15,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.15.0 or later)
+- [Bytebase](https://github.com/bytebase/bytebase) (3.16.0 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`.
 

VERSION

@@ -1 +1 @@
-3.15.2
+3.16.0

api/client.go

@@ -44,11 +44,10 @@ type DatabaseFilter struct {
 
 // UserFilter is the filter for list users API.
 type UserFilter struct {
-	Name      string
-	Email     string
-	Project   string
-	UserTypes []v1pb.UserType
-	State     v1pb.State
+	Name    string
+	Email   string
+	Project string
+	State   v1pb.State
 }
 
 // GroupFilter is the filter for list group API.
@@ -59,6 +58,9 @@ type GroupFilter struct {
 
 // Client is the API message for Bytebase OpenAPI client.
 type Client interface {
+	// GetWorkspaceName returns the workspace resource name in "workspaces/{workspace-id}" format.
+	GetWorkspaceName() string
+
 	// Instance
 	// ListInstance will return instances.
 	ListInstance(ctx context.Context, filter *InstanceFilter) ([]*v1pb.Instance, error)

client/client.go

@@ -3,6 +3,7 @@ package client
 
 import (
 	"context"
+	"fmt"
 	"net/http"
 	"strings"
 	"time"
@@ -18,10 +19,12 @@ import (
 
 // client is the API message for Bytebase API client.
 type client struct {
-	url    string
-	client *http.Client
+	url           string
+	workspaceName string
+	client        *http.Client
 
 	// Connect RPC clients
+	actuatorClient         bytebasev1connect.ActuatorServiceClient
 	authClient             bytebasev1connect.AuthServiceClient
 	workspaceClient        bytebasev1connect.WorkspaceServiceClient
 	instanceClient         bytebasev1connect.InstanceServiceClient
@@ -40,6 +43,11 @@ type client struct {
 	workloadIdentityClient bytebasev1connect.WorkloadIdentityServiceClient
 }
 
+// GetWorkspaceName returns the workspace resource name.
+func (c *client) GetWorkspaceName() string {
+	return c.workspaceName
+}
+
 // NewClient returns the new Bytebase API client.
 func NewClient(url, email, password string) (api.Client, error) {
 	c := client{
@@ -55,7 +63,6 @@ func NewClient(url, email, password string) (api.Client, error) {
 	interceptors := connect.WithInterceptors(authInt)
 
 	// 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,
@@ -75,6 +82,7 @@ func NewClient(url, email, password string) (api.Client, error) {
 	authInt.token = loginResp.Msg.Token
 
 	// Initialize other clients with auth token
+	c.actuatorClient = bytebasev1connect.NewActuatorServiceClient(c.client, c.url, interceptors)
 	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)
@@ -91,5 +99,12 @@ func NewClient(url, email, password string) (api.Client, error) {
 	c.serviceAccountClient = bytebasev1connect.NewServiceAccountServiceClient(c.client, c.url, interceptors)
 	c.workloadIdentityClient = bytebasev1connect.NewWorkloadIdentityServiceClient(c.client, c.url, interceptors)
 
+	// Fetch workspace ID from actuator
+	actuatorResp, err := c.actuatorClient.GetActuatorInfo(context.Background(), connect.NewRequest(&v1pb.GetActuatorInfoRequest{}))
+	if err != nil {
+		return nil, errors.Wrapf(err, "failed to get actuator info")
+	}
+	c.workspaceName = fmt.Sprintf("workspaces/%s", actuatorResp.Msg.GetWorkspaceId())
+
 	return &c, nil
 }

client/user.go

@@ -27,13 +27,6 @@ func buildUserFilter(filter *api.UserFilter) string {
 	if v := filter.Project; v != "" {
 		params = append(params, fmt.Sprintf(`project == "%s"`, v))
 	}
-	if v := filter.UserTypes; len(v) > 0 {
-		userTypes := []string{}
-		for _, t := range v {
-			userTypes = append(userTypes, fmt.Sprintf(`"%s"`, t.String()))
-		}
-		params = append(params, fmt.Sprintf(`user_type in [%s]`, strings.Join(userTypes, ", ")))
-	}
 	if filter.State == v1pb.State_DELETED {
 		params = append(params, fmt.Sprintf(`state == "%s"`, filter.State.String()))
 	}

client/workspace.go

@@ -15,7 +15,7 @@ func (c *client) GetWorkspaceIAMPolicy(ctx context.Context) (*v1pb.IamPolicy, er
 	}
 
 	req := connect.NewRequest(&v1pb.GetIamPolicyRequest{
-		Resource: "workspaces/-",
+		Resource: c.workspaceName,
 	})
 
 	resp, err := c.workspaceClient.GetIamPolicy(ctx, req)
@@ -34,7 +34,7 @@ func (c *client) SetWorkspaceIAMPolicy(ctx context.Context, setIamPolicyRequest
 
 	// Ensure the resource is set correctly
 	if setIamPolicyRequest.Resource == "" {
-		setIamPolicyRequest.Resource = "workspaces/-"
+		setIamPolicyRequest.Resource = c.workspaceName
 	}
 
 	req := connect.NewRequest(setIamPolicyRequest)

docs/data-sources/database_list.md

@@ -15,17 +15,14 @@ The database data source list.
 <!-- schema generated by tfplugindocs -->
 ## Schema
 
-### Required
-
-- `parent` (String)
-
 ### Optional
 
 - `engines` (Set of String) Filter databases by engines.
 - `environment` (String) The environment full name. Filter databases by environment.
 - `exclude_unassigned` (Boolean) If not include unassigned databases in the response.
 - `instance` (String) The instance full name. Filter databases by instance.
 - `labels` (Map of String) Filter databases by labels
+- `parent` (String) The parent resource. Format: workspaces/{workspace id}, instances/{instance id}, or projects/{project id}. Defaults to the workspace if not specified.
 - `project` (String) The project full name. Filter databases by project.
 - `query` (String) Filter databases by name with wildcard
 

docs/data-sources/iam_policy.md

@@ -15,13 +15,10 @@ The IAM policy data source.
 <!-- schema generated by tfplugindocs -->
 ## Schema
 
-### Required
-
-- `parent` (String) The IAM policy parent name for the policy, support "projects/{resource id}" or "workspaces/-"
-
 ### Optional
 
 - `iam_policy` (Block List, Max: 1) (see [below for nested schema](#nestedblock--iam_policy))
+- `parent` (String) The IAM policy parent name for the policy, support "projects/{resource id}" or "workspaces/{workspace id}". Defaults to the workspace if not specified.
 
 ### Read-Only
 

docs/data-sources/policy.md

@@ -17,13 +17,13 @@ The policy data source.
 
 ### Required
 
-- `parent` (String) The policy parent name for the policy, support projects/{resource id}, environments/{resource id}, instances/{resource id}, or instances/{resource id}/databases/{database name}
 - `type` (String) The policy type.
 
 ### Optional
 
 - `global_masking_policy` (Block List, Max: 1) (see [below for nested schema](#nestedblock--global_masking_policy))
 - `masking_exemption_policy` (Block List, Max: 1) (see [below for nested schema](#nestedblock--masking_exemption_policy))
+- `parent` (String) The policy parent name for the policy, support workspaces/{workspace id}, projects/{resource id}, environments/{resource id}, instances/{resource id}, or instances/{resource id}/databases/{database name}. Defaults to the workspace if not specified.
 - `query_data_policy` (Block List, Max: 1) The policy for query data (see [below for nested schema](#nestedblock--query_data_policy))
 - `rollout_policy` (Block List, Max: 1) Control issue rollout. Learn more: https://docs.bytebase.com/administration/environment-policy/rollout-policy (see [below for nested schema](#nestedblock--rollout_policy))
 

docs/data-sources/policy_list.md

@@ -17,7 +17,7 @@ The policy data source list.
 
 ### Optional
 
-- `parent` (String) The policy parent name for the policy, support projects/{resource id}, environments/{resource id}, instances/{resource id}, or instances/{resource id}/databases/{database name}
+- `parent` (String) The policy parent name for the policy, support workspaces/{workspace id}, projects/{resource id}, environments/{resource id}, instances/{resource id}, or instances/{resource id}/databases/{database name}. Defaults to the workspace if not specified.
 
 ### Read-Only