Database governance built for humans and agents — controlling changes and access across every major database.
Go cicddata-governancedata-maskingdata-securitydatabase-accessdatabase-governancedevopsdevsecopsflywaygitopsliquibasemongodbmysqloraclepostgresqlschema-migrationssecuritysql-clientsqlservertidb
refactor: use workspace id (#19578)
ecmadao4ebe6e0fd599
diff --git a/backend/api/mcp/gen/openapi.yaml b/backend/api/mcp/gen/openapi.yamlindex a9dc98940b..e8faef437a 100644--- a/backend/api/mcp/gen/openapi.yaml+++ b/backend/api/mcp/gen/openapi.yaml@@ -5404,7 +5404,7 @@ paths:summary: CreateServiceAccountdescription: |-Creates a new service account.- For workspace-level: parent is workspaces/-, permission bb.serviceAccounts.create on workspace.+ For workspace-level: parent is workspaces/{id}, permission bb.serviceAccounts.create on workspace.For project-level: parent is projects/{project}, permission bb.serviceAccounts.create on project.operationId: bytebase.v1.ServiceAccountService.CreateServiceAccountparameters:@@ -5519,7 +5519,7 @@ paths:summary: ListServiceAccountsdescription: |-Lists service accounts.- For workspace-level: parent is workspaces/-, permission bb.serviceAccounts.list on workspace.+ For workspace-level: parent is workspaces/{id}, permission bb.serviceAccounts.list on workspace.For project-level: parent is projects/{project}, permission bb.serviceAccounts.list on project.operationId: bytebase.v1.ServiceAccountService.ListServiceAccountsparameters:@@ -6286,7 +6286,7 @@ paths:summary: CreateWorkloadIdentitydescription: |-Creates a new workload identity.- For workspace-level: parent is workspaces/-, permission bb.workloadIdentities.create on workspace.+ For workspace-level: parent is workspaces/{id}, permission bb.workloadIdentities.create on workspace.For project-level: parent is projects/{project}, permission bb.workloadIdentities.create on project.operationId: bytebase.v1.WorkloadIdentityService.CreateWorkloadIdentityparameters:@@ -6401,7 +6401,7 @@ paths:summary: ListWorkloadIdentitiesdescription: |-Lists workload identities.- For workspace-level: parent is workspaces/-, permission bb.workloadIdentities.list on workspace.+ For workspace-level: parent is workspaces/{id}, permission bb.workloadIdentities.list on workspace.For project-level: parent is projects/{project}, permission bb.workloadIdentities.list on project.operationId: bytebase.v1.WorkloadIdentityService.ListWorkloadIdentitiesparameters:@@ -8902,7 +8902,7 @@ components:title: parentdescription: |-The parent resource where this service account will be created.- Format: projects/{project} for project-level, workspaces/- for workspace-level.+ Format: projects/{project} for project-level, workspaces/{id} for workspace-level.serviceAccountId:type: stringtitle: service_account_id@@ -8949,7 +8949,7 @@ components:title: parentdescription: |-The parent resource where this workload identity will be created.- Format: projects/{project} for project-level, workspaces/- for workspace-level.+ Format: projects/{project} for project-level, workspaces/{id} for workspace-level.workloadIdentityId:type: stringtitle: workload_identity_id@@ -12048,7 +12048,7 @@ components:title: parentdescription: |-- projects/{project}: list databases in a project, require "bb.projects.get" permission.- - workspaces/-: list databases in the workspace, require "bb.databases.list" permission.+ - workspaces/{id}: list databases in the workspace, require "bb.databases.list" permission.- instances/{instances}: list databases in a instance, require "bb.instances.get" permissionpageSize:type: integer@@ -12905,7 +12905,7 @@ components:title: parentdescription: |-The parent resource.- Format: projects/{project} for project-level, workspaces/- for workspace-level.+ Format: projects/{project} for project-level, workspaces/{id} for workspace-level.pageSize:type: integertitle: page_size@@ -13080,7 +13080,7 @@ components:title: parentdescription: |-The parent resource.- Format: projects/{project} for project-level, workspaces/- for workspace-level.+ Format: projects/{project} for project-level, workspaces/{id} for workspace-level.pageSize:type: integertitle: page_sizediff --git a/backend/api/mcp/skills/grant-permission.md b/backend/api/mcp/skills/grant-permission.mdindex ee926d0d1a..7a8c0dec63 100644--- a/backend/api/mcp/skills/grant-permission.md+++ b/backend/api/mcp/skills/grant-permission.md@@ -56,7 +56,7 @@ search_api(operationId="WorkspaceService/GetIamPolicy")``````call_api(operationId="WorkspaceService/GetIamPolicy", body={- "resource": "workspaces/-"+ "resource": "workspaces/{id}"})```@@ -82,7 +82,7 @@ search_api(operationId="WorkspaceService/SetIamPolicy")``````call_api(operationId="WorkspaceService/SetIamPolicy", body={- "resource": "workspaces/-",+ "resource": "workspaces/{id}","etag": "{etag-from-get}","policy": {"bindings": [diff --git a/backend/api/mcp/skills/query.md b/backend/api/mcp/skills/query.mdindex a1edd82ea3..6aa7ef791a 100644--- a/backend/api/mcp/skills/query.md+++ b/backend/api/mcp/skills/query.md@@ -24,7 +24,7 @@ Run SQL queries against databases managed by Bytebase.2. **List databases** (if needed):```call_api(operationId="DatabaseService/ListDatabases", body={- "parent": "workspaces/-",+ "parent": "workspaces/{id}","filter": "name.matches(\"db_name\")"})```diff --git a/backend/api/v1/service_account_service.go b/backend/api/v1/service_account_service.goindex 73f9221ff1..fa98522396 100644--- a/backend/api/v1/service_account_service.go+++ b/backend/api/v1/service_account_service.go@@ -46,10 +46,10 @@ func (s *ServiceAccountService) CreateServiceAccount(ctx context.Context, reques}projectID = &pidcase strings.HasPrefix(parent, common.WorkspacePrefix):- // workspace-level service account: parent = "workspaces/-"+ // workspace-level service account: parent = "workspaces/{id}"// projectID remains nildefault:- return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("invalid parent format %q, expected projects/{project} or workspaces/-", parent))+ return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("invalid parent format %q, expected projects/{project} or workspaces/{id}", parent))}serviceAccountID := request.Msg.ServiceAccountId@@ -140,12 +140,12 @@ func (s *ServiceAccountService) ListServiceAccounts(ctx context.Context, request}projectID = &pidcase strings.HasPrefix(parent, common.WorkspacePrefix):- // workspace-level list: parent = "workspaces/-"+ // workspace-level list: parent = "workspaces/{id}"// use empty string to filter workspace-level SAsemptyProjectID := ""projectID = &emptyProjectIDdefault:- return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("invalid parent format %q, expected projects/{project} or workspaces/-", parent))+ return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("invalid parent format %q, expected projects/{project} or workspaces/{id}", parent))}offset, err := parseLimitAndOffset(&pageSize{diff --git a/backend/api/v1/workload_identity_service.go b/backend/api/v1/workload_identity_service.goindex df57b604d2..8cd2c6f049 100644--- a/backend/api/v1/workload_identity_service.go+++ b/backend/api/v1/workload_identity_service.go@@ -45,10 +45,10 @@ func (s *WorkloadIdentityService) CreateWorkloadIdentity(ctx context.Context, re}projectID = &pidcase strings.HasPrefix(parent, common.WorkspacePrefix):- // workspace-level workload identity: parent = "workspaces/-"+ // workspace-level workload identity: parent = "workspaces/{id}"// projectID remains nildefault:- return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("invalid parent format %q, expected projects/{project} or workspaces/-", parent))+ return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("invalid parent format %q, expected projects/{project} or workspaces/{id}", parent))}workloadIdentityID := request.Msg.WorkloadIdentityId@@ -129,12 +129,12 @@ func (s *WorkloadIdentityService) ListWorkloadIdentities(ctx context.Context, re}projectID = &pidcase strings.HasPrefix(parent, common.WorkspacePrefix):- // workspace-level list: parent = "workspaces/-"+ // workspace-level list: parent = "workspaces/{id}"// use empty string to filter workspace-level WIsemptyProjectID := ""projectID = &emptyProjectIDdefault:- return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("invalid parent format %q, expected projects/{project} or workspaces/-", parent))+ return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("invalid parent format %q, expected projects/{project} or workspaces/{id}", parent))}offset, err := parseLimitAndOffset(&pageSize{diff --git a/backend/api/v1/workspace_service.go b/backend/api/v1/workspace_service.goindex bd68d00934..e3dfec98e6 100644--- a/backend/api/v1/workspace_service.go+++ b/backend/api/v1/workspace_service.go@@ -32,7 +32,11 @@ func NewWorkspaceService(store *store.Store, iamManager *iam.Manager) *Workspace}}-func (s *WorkspaceService) GetIamPolicy(ctx context.Context, _ *connect.Request[v1pb.GetIamPolicyRequest]) (*connect.Response[v1pb.IamPolicy], error) {+func (s *WorkspaceService) GetIamPolicy(ctx context.Context, req *connect.Request[v1pb.GetIamPolicyRequest]) (*connect.Response[v1pb.IamPolicy], error) {+ if err := s.validateWorkspaceResource(ctx, req.Msg.Resource); err != nil {+ return nil, err+ }+policy, err := s.store.GetWorkspaceIamPolicy(ctx)if err != nil {return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to find iam policy"))@@ -46,8 +50,26 @@ func (s *WorkspaceService) GetIamPolicy(ctx context.Context, _ *connect.Request[return connect.NewResponse(v1Policy), nil}+func (s *WorkspaceService) validateWorkspaceResource(ctx context.Context, resource string) error {+ workspaceID, err := common.GetWorkspaceID(resource)+ if err != nil {+ return connect.NewError(connect.CodeInvalidArgument, errors.Errorf("invalid workspace resource %q", resource))+ }+ workspaceResourceName, err := s.store.GetWorkspaceResourceName(ctx)+ if err != nil {+ return connect.NewError(connect.CodeInternal, errors.Wrap(err, "failed to get workspace resource name"))+ }+ if resource != workspaceResourceName {+ return connect.NewError(connect.CodeNotFound, errors.Errorf("workspace %q not found", workspaceID))+ }+ return nil+}+func (s *WorkspaceService) SetIamPolicy(ctx context.Context, req *connect.Request[v1pb.SetIamPolicyRequest]) (*connect.Response[v1pb.IamPolicy], error) {request := req.Msg+ if err := s.validateWorkspaceResource(ctx, request.Resource); err != nil {+ return nil, err+ }policyMessage, err := s.store.GetWorkspaceIamPolicy(ctx)if err != nil {return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to find workspace iam policy"))@@ -73,14 +95,10 @@ func (s *WorkspaceService) SetIamPolicy(ctx context.Context, req *connect.Requesif err != nil {return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to marshal iam policy"))}- workspaceResource, err := s.store.GetWorkspaceResourceName(ctx)- if err != nil {- return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to get workspace resource name"))- }payloadStr := string(payloadBytes)patch := &store.UpdatePolicyMessage{ResourceType: storepb.Policy_WORKSPACE,- Resource: workspaceResource,+ Resource: request.Resource,Type: storepb.Policy_IAM,Payload: &payloadStr,}diff --git a/backend/common/resource_name.go b/backend/common/resource_name.goindex cfab4029a2..c91b974aaa 100644--- a/backend/common/resource_name.go+++ b/backend/common/resource_name.go@@ -517,6 +517,14 @@ func GetNameParentTokens(name string, tokenPrefixes ...string) ([]string, error)return tokens, nil}+func GetWorkspaceID(name string) (string, error) {+ tokens, err := GetNameParentTokens(name, WorkspacePrefix)+ if err != nil {+ return "", err+ }+ return tokens[0], nil+}+func FormatWorkspace(id string) string {return fmt.Sprintf("%s%s", WorkspacePrefix, id)}diff --git a/backend/generated-go/v1/database_service.pb.go b/backend/generated-go/v1/database_service.pb.goindex eec2488390..eb6e1be043 100644--- a/backend/generated-go/v1/database_service.pb.go+++ b/backend/generated-go/v1/database_service.pb.go@@ -770,7 +770,7 @@ func (x *BatchGetDatabasesResponse) GetDatabases() []*Database {type ListDatabasesRequest struct {state protoimpl.MessageState `protogen:"open.v1"`// - projects/{project}: list databases in a project, require "bb.projects.get" permission.- // - workspaces/-: list databases in the workspace, require "bb.databases.list" permission.+ // - workspaces/{id}: list databases in the workspace, require "bb.databases.list" permission.// - instances/{instances}: list databases in a instance, require "bb.instances.get" permissionParent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`// The maximum number of databases to return. The service may return fewerdiff --git a/backend/generated-go/v1/service_account_service.pb.go b/backend/generated-go/v1/service_account_service.pb.goindex b3e60b3c1d..72a970c460 100644--- a/backend/generated-go/v1/service_account_service.pb.go+++ b/backend/generated-go/v1/service_account_service.pb.go@@ -124,7 +124,7 @@ func (x *ServiceAccount) GetCreateTime() *timestamppb.Timestamp {type CreateServiceAccountRequest struct {state protoimpl.MessageState `protogen:"open.v1"`// The parent resource where this service account will be created.- // Format: projects/{project} for project-level, workspaces/- for workspace-level.+ // Format: projects/{project} for project-level, workspaces/{id} for workspace-level.Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`// The ID to use for the service account, which will become the final component// of the service account's email in the format: {service_account_id}@service.bytebase.com@@ -238,7 +238,7 @@ func (x *GetServiceAccountRequest) GetName() string {type ListServiceAccountsRequest struct {state protoimpl.MessageState `protogen:"open.v1"`// The parent resource.- // Format: projects/{project} for project-level, workspaces/- for workspace-level.+ // Format: projects/{project} for project-level, workspaces/{id} for workspace-level.Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`// The maximum number of service accounts to return. The service may return fewer than// this value.diff --git a/backend/generated-go/v1/service_account_service_grpc.pb.go b/backend/generated-go/v1/service_account_service_grpc.pb.goindex b5b4cf0c29..6b4adf4eaa 100644--- a/backend/generated-go/v1/service_account_service_grpc.pb.go+++ b/backend/generated-go/v1/service_account_service_grpc.pb.go@@ -35,14 +35,14 @@ const (// ServiceAccountService manages service accounts for API integrations.type ServiceAccountServiceClient interface {// Creates a new service account.- // For workspace-level: parent is workspaces/-, permission bb.serviceAccounts.create on workspace.+ // For workspace-level: parent is workspaces/{id}, permission bb.serviceAccounts.create on workspace.// For project-level: parent is projects/{project}, permission bb.serviceAccounts.create on project.CreateServiceAccount(ctx context.Context, in *CreateServiceAccountRequest, opts ...grpc.CallOption) (*ServiceAccount, error)// Gets a service account by name.// Permissions required: bb.serviceAccounts.getGetServiceAccount(ctx context.Context, in *GetServiceAccountRequest, opts ...grpc.CallOption) (*ServiceAccount, error)// Lists service accounts.- // For workspace-level: parent is workspaces/-, permission bb.serviceAccounts.list on workspace.+ // For workspace-level: parent is workspaces/{id}, permission bb.serviceAccounts.list on workspace.// For project-level: parent is projects/{project}, permission bb.serviceAccounts.list on project.ListServiceAccounts(ctx context.Context, in *ListServiceAccountsRequest, opts ...grpc.CallOption) (*ListServiceAccountsResponse, error)// Updates a service account.@@ -131,14 +131,14 @@ func (c *serviceAccountServiceClient) UndeleteServiceAccount(ctx context.Context// ServiceAccountService manages service accounts for API integrations.type ServiceAccountServiceServer interface {// Creates a new service account.- // For workspace-level: parent is workspaces/-, permission bb.serviceAccounts.create on workspace.+ // For workspace-level: parent is workspaces/{id}, permission bb.serviceAccounts.create on workspace.// For project-level: parent is projects/{project}, permission bb.serviceAccounts.create on project.CreateServiceAccount(context.Context, *CreateServiceAccountRequest) (*ServiceAccount, error)// Gets a service account by name.// Permissions required: bb.serviceAccounts.getGetServiceAccount(context.Context, *GetServiceAccountRequest) (*ServiceAccount, error)// Lists service accounts.- // For workspace-level: parent is workspaces/-, permission bb.serviceAccounts.list on workspace.+ // For workspace-level: parent is workspaces/{id}, permission bb.serviceAccounts.list on workspace.// For project-level: parent is projects/{project}, permission bb.serviceAccounts.list on project.ListServiceAccounts(context.Context, *ListServiceAccountsRequest) (*ListServiceAccountsResponse, error)// Updates a service account.diff --git a/backend/generated-go/v1/v1connect/service_account_service.connect.go b/backend/generated-go/v1/v1connect/service_account_service.connect.goindex 6443520ee9..e79cad4c21 100644--- a/backend/generated-go/v1/v1connect/service_account_service.connect.go+++ b/backend/generated-go/v1/v1connect/service_account_service.connect.go@@ -57,14 +57,14 @@ const (// ServiceAccountServiceClient is a client for the bytebase.v1.ServiceAccountService service.type ServiceAccountServiceClient interface {// Creates a new service account.- // For workspace-level: parent is workspaces/-, permission bb.serviceAccounts.create on workspace.+ // For workspace-level: parent is workspaces/{id}, permission bb.serviceAccounts.create on workspace.// For project-level: parent is projects/{project}, permission bb.serviceAccounts.create on project.CreateServiceAccount(context.Context, *connect.Request[v1.CreateServiceAccountRequest]) (*connect.Response[v1.ServiceAccount], error)// Gets a service account by name.// Permissions required: bb.serviceAccounts.getGetServiceAccount(context.Context, *connect.Request[v1.GetServiceAccountRequest]) (*connect.Response[v1.ServiceAccount], error)// Lists service accounts.- // For workspace-level: parent is workspaces/-, permission bb.serviceAccounts.list on workspace.+ // For workspace-level: parent is workspaces/{id}, permission bb.serviceAccounts.list on workspace.// For project-level: parent is projects/{project}, permission bb.serviceAccounts.list on project.ListServiceAccounts(context.Context, *connect.Request[v1.ListServiceAccountsRequest]) (*connect.Response[v1.ListServiceAccountsResponse], error)// Updates a service account.@@ -172,14 +172,14 @@ func (c *serviceAccountServiceClient) UndeleteServiceAccount(ctx context.Context// service.type ServiceAccountServiceHandler interface {// Creates a new service account.- // For workspace-level: parent is workspaces/-, permission bb.serviceAccounts.create on workspace.+ // For workspace-level: parent is workspaces/{id}, permission bb.serviceAccounts.create on workspace.// For project-level: parent is projects/{project}, permission bb.serviceAccounts.create on project.CreateServiceAccount(context.Context, *connect.Request[v1.CreateServiceAccountRequest]) (*connect.Response[v1.ServiceAccount], error)// Gets a service account by name.// Permissions required: bb.serviceAccounts.getGetServiceAccount(context.Context, *connect.Request[v1.GetServiceAccountRequest]) (*connect.Response[v1.ServiceAccount], error)// Lists service accounts.- // For workspace-level: parent is workspaces/-, permission bb.serviceAccounts.list on workspace.+ // For workspace-level: parent is workspaces/{id}, permission bb.serviceAccounts.list on workspace.// For project-level: parent is projects/{project}, permission bb.serviceAccounts.list on project.ListServiceAccounts(context.Context, *connect.Request[v1.ListServiceAccountsRequest]) (*connect.Response[v1.ListServiceAccountsResponse], error)// Updates a service account.diff --git a/backend/generated-go/v1/v1connect/workload_identity_service.connect.go b/backend/generated-go/v1/v1connect/workload_identity_service.connect.goindex 4bebff7436..4a4557a4aa 100644--- a/backend/generated-go/v1/v1connect/workload_identity_service.connect.go+++ b/backend/generated-go/v1/v1connect/workload_identity_service.connect.go@@ -57,14 +57,14 @@ const (// WorkloadIdentityServiceClient is a client for the bytebase.v1.WorkloadIdentityService service.type WorkloadIdentityServiceClient interface {// Creates a new workload identity.- // For workspace-level: parent is workspaces/-, permission bb.workloadIdentities.create on workspace.+ // For workspace-level: parent is workspaces/{id}, permission bb.workloadIdentities.create on workspace.// For project-level: parent is projects/{project}, permission bb.workloadIdentities.create on project.CreateWorkloadIdentity(context.Context, *connect.Request[v1.CreateWorkloadIdentityRequest]) (*connect.Response[v1.WorkloadIdentity], error)// Gets a workload identity by name.// Permissions required: bb.workloadIdentities.getGetWorkloadIdentity(context.Context, *connect.Request[v1.GetWorkloadIdentityRequest]) (*connect.Response[v1.WorkloadIdentity], error)// Lists workload identities.- // For workspace-level: parent is workspaces/-, permission bb.workloadIdentities.list on workspace.+ // For workspace-level: parent is workspaces/{id}, permission bb.workloadIdentities.list on workspace.// For project-level: parent is projects/{project}, permission bb.workloadIdentities.list on project.ListWorkloadIdentities(context.Context, *connect.Request[v1.ListWorkloadIdentitiesRequest]) (*connect.Response[v1.ListWorkloadIdentitiesResponse], error)// Updates a workload identity.@@ -172,14 +172,14 @@ func (c *workloadIdentityServiceClient) UndeleteWorkloadIdentity(ctx context.Con// service.type WorkloadIdentityServiceHandler interface {// Creates a new workload identity.- // For workspace-level: parent is workspaces/-, permission bb.workloadIdentities.create on workspace.+ // For workspace-level: parent is workspaces/{id}, permission bb.workloadIdentities.create on workspace.// For project-level: parent is projects/{project}, permission bb.workloadIdentities.create on project.CreateWorkloadIdentity(context.Context, *connect.Request[v1.CreateWorkloadIdentityRequest]) (*connect.Response[v1.WorkloadIdentity], error)// Gets a workload identity by name.// Permissions required: bb.workloadIdentities.getGetWorkloadIdentity(context.Context, *connect.Request[v1.GetWorkloadIdentityRequest]) (*connect.Response[v1.WorkloadIdentity], error)// Lists workload identities.- // For workspace-level: parent is workspaces/-, permission bb.workloadIdentities.list on workspace.+ // For workspace-level: parent is workspaces/{id}, permission bb.workloadIdentities.list on workspace.// For project-level: parent is projects/{project}, permission bb.workloadIdentities.list on project.ListWorkloadIdentities(context.Context, *connect.Request[v1.ListWorkloadIdentitiesRequest]) (*connect.Response[v1.ListWorkloadIdentitiesResponse], error)// Updates a workload identity.diff --git a/backend/generated-go/v1/workload_identity_service.pb.go b/backend/generated-go/v1/workload_identity_service.pb.goindex c26da7db4a..5b40a84040 100644--- a/backend/generated-go/v1/workload_identity_service.pb.go+++ b/backend/generated-go/v1/workload_identity_service.pb.go@@ -247,7 +247,7 @@ func (x *WorkloadIdentityConfig) GetSubjectPattern() string {type CreateWorkloadIdentityRequest struct {state protoimpl.MessageState `protogen:"open.v1"`// The parent resource where this workload identity will be created.- // Format: projects/{project} for project-level, workspaces/- for workspace-level.+ // Format: projects/{project} for project-level, workspaces/{id} for workspace-level.Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`// The ID to use for the workload identity, which will become the final component// of the workload identity's email in the format: {workload_identity_id}@workload.bytebase.com@@ -361,7 +361,7 @@ func (x *GetWorkloadIdentityRequest) GetName() string {type ListWorkloadIdentitiesRequest struct {state protoimpl.MessageState `protogen:"open.v1"`// The parent resource.- // Format: projects/{project} for project-level, workspaces/- for workspace-level.+ // Format: projects/{project} for project-level, workspaces/{id} for workspace-level.Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`// The maximum number of workload identities to return. The service may return fewer than// this value.diff --git a/backend/generated-go/v1/workload_identity_service_grpc.pb.go b/backend/generated-go/v1/workload_identity_service_grpc.pb.goindex 0e99131a06..a4f70d1dd0 100644--- a/backend/generated-go/v1/workload_identity_service_grpc.pb.go+++ b/backend/generated-go/v1/workload_identity_service_grpc.pb.go@@ -35,14 +35,14 @@ const (// WorkloadIdentityService manages workload identities for external CI/CD integrations.type WorkloadIdentityServiceClient interface {// Creates a new workload identity.- // For workspace-level: parent is workspaces/-, permission bb.workloadIdentities.create on workspace.+ // For workspace-level: parent is workspaces/{id}, permission bb.workloadIdentities.create on workspace.// For project-level: parent is projects/{project}, permission bb.workloadIdentities.create on project.CreateWorkloadIdentity(ctx context.Context, in *CreateWorkloadIdentityRequest, opts ...grpc.CallOption) (*WorkloadIdentity, error)// Gets a workload identity by name.// Permissions required: bb.workloadIdentities.getGetWorkloadIdentity(ctx context.Context, in *GetWorkloadIdentityRequest, opts ...grpc.CallOption) (*WorkloadIdentity, error)// Lists workload identities.- // For workspace-level: parent is workspaces/-, permission bb.workloadIdentities.list on workspace.+ // For workspace-level: parent is workspaces/{id}, permission bb.workloadIdentities.list on workspace.// For project-level: parent is projects/{project}, permission bb.workloadIdentities.list on project.ListWorkloadIdentities(ctx context.Context, in *ListWorkloadIdentitiesRequest, opts ...grpc.CallOption) (*ListWorkloadIdentitiesResponse, error)// Updates a workload identity.@@ -131,14 +131,14 @@ func (c *workloadIdentityServiceClient) UndeleteWorkloadIdentity(ctx context.Con// WorkloadIdentityService manages workload identities for external CI/CD integrations.type WorkloadIdentityServiceServer interface {// Creates a new workload identity.- // For workspace-level: parent is workspaces/-, permission bb.workloadIdentities.create on workspace.+ // For workspace-level: parent is workspaces/{id}, permission bb.workloadIdentities.create on workspace.// For project-level: parent is projects/{project}, permission bb.workloadIdentities.create on project.CreateWorkloadIdentity(context.Context, *CreateWorkloadIdentityRequest) (*WorkloadIdentity, error)// Gets a workload identity by name.// Permissions required: bb.workloadIdentities.getGetWorkloadIdentity(context.Context, *GetWorkloadIdentityRequest) (*WorkloadIdentity, error)// Lists workload identities.- // For workspace-level: parent is workspaces/-, permission bb.workloadIdentities.list on workspace.+ // For workspace-level: parent is workspaces/{id}, permission bb.workloadIdentities.list on workspace.// For project-level: parent is projects/{project}, permission bb.workloadIdentities.list on project.ListWorkloadIdentities(context.Context, *ListWorkloadIdentitiesRequest) (*ListWorkloadIdentitiesResponse, error)// Updates a workload identity.diff --git a/backend/tests/user_test.go b/backend/tests/user_test.goindex c077d14780..ba124f9a57 100644--- a/backend/tests/user_test.go+++ b/backend/tests/user_test.go@@ -47,8 +47,11 @@ func TestDeleteUser(t *testing.T) {a.Error(err)a.ErrorContains(err, expectErrorMsg)+ actuator, err := ctl.actuatorServiceClient.GetActuatorInfo(ctx, &connect.Request[v1pb.GetActuatorInfoRequest]{})+ a.NoError(err)+serviceAccountResp, err := ctl.serviceAccountServiceClient.CreateServiceAccount(ctx, connect.NewRequest(&v1pb.CreateServiceAccountRequest{- Parent: "workspaces/-",+ Parent: fmt.Sprintf("workspaces/%s", actuator.Msg.WorkspaceId),ServiceAccountId: "bot",ServiceAccount: &v1pb.ServiceAccount{Title: "bot",@@ -57,7 +60,9 @@ func TestDeleteUser(t *testing.T) {a.NoError(err)serviceAccount := serviceAccountResp.Msg- policyResp, err := ctl.workspaceServiceClient.GetIamPolicy(ctx, connect.NewRequest(&v1pb.GetIamPolicyRequest{}))+ policyResp, err := ctl.workspaceServiceClient.GetIamPolicy(ctx, connect.NewRequest(&v1pb.GetIamPolicyRequest{+ Resource: fmt.Sprintf("workspaces/%s", actuator.Msg.WorkspaceId),+ }))a.NoError(err)policy := policyResp.Msg@@ -69,8 +74,9 @@ func TestDeleteUser(t *testing.T) {}}updatedPolicyResp, err := ctl.workspaceServiceClient.SetIamPolicy(ctx, connect.NewRequest(&v1pb.SetIamPolicyRequest{- Etag: policy.Etag,- Policy: policy,+ Etag: policy.Etag,+ Policy: policy,+ Resource: fmt.Sprintf("workspaces/%s", actuator.Msg.WorkspaceId),}))a.NoError(err)updatedPolicy := updatedPolicyResp.Msg@@ -94,8 +100,9 @@ func TestDeleteUser(t *testing.T) {}}newPolicyResp, err := ctl.workspaceServiceClient.SetIamPolicy(ctx, connect.NewRequest(&v1pb.SetIamPolicyRequest{- Etag: updatedPolicy.Etag,- Policy: updatedPolicy,+ Etag: updatedPolicy.Etag,+ Policy: updatedPolicy,+ Resource: fmt.Sprintf("workspaces/%s", actuator.Msg.WorkspaceId),}))a.NoError(err)newPolicy := newPolicyResp.Msg@@ -121,8 +128,9 @@ func TestDeleteUser(t *testing.T) {}}_, err = ctl.workspaceServiceClient.SetIamPolicy(ctx, connect.NewRequest(&v1pb.SetIamPolicyRequest{- Etag: newPolicy.Etag,- Policy: newPolicy,+ Etag: newPolicy.Etag,+ Policy: newPolicy,+ Resource: fmt.Sprintf("workspaces/%s", actuator.Msg.WorkspaceId),}))a.NoError(err)diff --git a/frontend/src/components/EnvironmentForm/Form.vue b/frontend/src/components/EnvironmentForm/Form.vueindex 3d133ce012..959f486830 100644--- a/frontend/src/components/EnvironmentForm/Form.vue+++ b/frontend/src/components/EnvironmentForm/Form.vue@@ -161,6 +161,7 @@ import { useEmitteryEventListener } from "@/composables/useEmitteryEventListenerimport {hasFeature,pushNotification,+ useActuatorV1Store,useDatabaseV1Store,useEnvironmentV1Store,useInstanceV1Store,@@ -264,7 +265,7 @@ const fetchDatabases = async () => {try {const resp = await databaseStore.fetchDatabases({pageSize: 1,- parent: "workspaces/-",+ parent: useActuatorV1Store().workspaceResourceName,filter: {environment: environment.value.name,},diff --git a/frontend/src/components/SensitiveData/GlobalMaskingRulesView.vue b/frontend/src/components/SensitiveData/GlobalMaskingRulesView.vueindex fb7b024e34..4895c18fec 100644--- a/frontend/src/components/SensitiveData/GlobalMaskingRulesView.vue+++ b/frontend/src/components/SensitiveData/GlobalMaskingRulesView.vue@@ -392,7 +392,10 @@ const factorOptionsMap = computed((): Map<Factor, OptionConfig> => {options = getClassificationLevelOptions();break;case CEL_ATTRIBUTE_RESOURCE_DATABASE_NAME: {- map.set(factor, getDatabaseIdOptionConfig("workspaces/-"));+ map.set(+ factor,+ getDatabaseIdOptionConfig(actuatorStore.workspaceResourceName)+ );return map;}}diff --git a/frontend/src/components/User/Settings/CreateServiceAccountDrawer.vue b/frontend/src/components/User/Settings/CreateServiceAccountDrawer.vueindex 73edc5a587..07158668d9 100644--- a/frontend/src/components/User/Settings/CreateServiceAccountDrawer.vue+++ b/frontend/src/components/User/Settings/CreateServiceAccountDrawer.vue@@ -100,6 +100,7 @@ import {ensureServiceAccountFullName,getProjectName,pushNotification,+ useActuatorV1Store,useProjectIamPolicyStore,useProjectV1Store,useServiceAccountStore,@@ -152,7 +153,7 @@ const parent = computed(() => {if (props.project) {return props.project;}- return "workspaces/-";+ return useActuatorV1Store().workspaceResourceName;});const emailSuffix = computed(() =>diff --git a/frontend/src/components/User/Settings/CreateWorkloadIdentityDrawer.vue b/frontend/src/components/User/Settings/CreateWorkloadIdentityDrawer.vueindex bc2f2172ad..8feeab2378 100644--- a/frontend/src/components/User/Settings/CreateWorkloadIdentityDrawer.vue+++ b/frontend/src/components/User/Settings/CreateWorkloadIdentityDrawer.vue@@ -339,6 +339,7 @@ import {ensureWorkloadIdentityFullName,getProjectName,pushNotification,+ useActuatorV1Store,useProjectIamPolicyStore,useProjectV1Store,useWorkloadIdentityStore,@@ -425,7 +426,7 @@ const parent = computed(() => {if (props.project) {return props.project;}- return "workspaces/-";+ return useActuatorV1Store().workspaceResourceName;});const emailSuffix = computed(() =>diff --git a/frontend/src/components/User/Settings/ServiceAccountPanel.vue b/frontend/src/components/User/Settings/ServiceAccountPanel.vueindex b516f107fd..bb93cb2c61 100644--- a/frontend/src/components/User/Settings/ServiceAccountPanel.vue+++ b/frontend/src/components/User/Settings/ServiceAccountPanel.vue@@ -102,7 +102,7 @@ import PermissionGuardWrapper from "@/components/Permission/PermissionGuardWrappimport CreateServiceAccountDrawer from "@/components/User/Settings/CreateServiceAccountDrawer.vue";import UserDataTable from "@/components/User/Settings/UserDataTable/index.vue";import PagedTable from "@/components/v2/Model/PagedTable.vue";-import { useCurrentProjectV1 } from "@/store";+import { useActuatorV1Store, useCurrentProjectV1 } from "@/store";import {serviceAccountToUser,useServiceAccountStore,@@ -146,7 +146,9 @@ const deletedSessionKey = computed(`bb.paged-service-account-table${project.value ? `.${project.value.name}` : ""}.deleted`);-const parent = computed(() => project.value?.name ?? "workspaces/-");+const parent = computed(+ () => project.value?.name ?? useActuatorV1Store().workspaceResourceName+);const allowEdit = computed(() => {if (!project.value) {diff --git a/frontend/src/components/User/Settings/WorkloadIdentityPanel.vue b/frontend/src/components/User/Settings/WorkloadIdentityPanel.vueindex cbd336efa7..ee4ecd4615 100644--- a/frontend/src/components/User/Settings/WorkloadIdentityPanel.vue+++ b/frontend/src/components/User/Settings/WorkloadIdentityPanel.vue@@ -104,7 +104,7 @@ import PermissionGuardWrapper from "@/components/Permission/PermissionGuardWrappimport CreateWorkloadIdentityDrawer from "@/components/User/Settings/CreateWorkloadIdentityDrawer.vue";import UserDataTable from "@/components/User/Settings/UserDataTable/index.vue";import PagedTable from "@/components/v2/Model/PagedTable.vue";-import { useCurrentProjectV1 } from "@/store";+import { useActuatorV1Store, useCurrentProjectV1 } from "@/store";import {useWorkloadIdentityStore,workloadIdentityToUser,@@ -148,7 +148,9 @@ const deletedSessionKey = computed(`bb.paged-workload-identity-table${project.value ? `.${project.value.name}` : ""}.deleted`);-const parent = computed(() => project.value?.name ?? "workspaces/-");+const parent = computed(+ () => project.value?.name ?? useActuatorV1Store().workspaceResourceName+);const allowEdit = computed(() => {if (!project.value) {diff --git a/frontend/src/components/v2/Select/WorkloadIdentitySelect.vue b/frontend/src/components/v2/Select/WorkloadIdentitySelect.vueindex cc70436e56..80eabe363a 100644--- a/frontend/src/components/v2/Select/WorkloadIdentitySelect.vue+++ b/frontend/src/components/v2/Select/WorkloadIdentitySelect.vue@@ -43,7 +43,7 @@ const props = defineProps<{disabled?: boolean;size?: SelectSize;value?: string | string[] | undefined; // workloadIdentity fullname- parent?: string; // e.g. "projects/{project}" for project-scoped identities+ parent: string; // e.g. "projects/{project}" for project-scoped identitiesfilter?: (wi: WorkloadIdentity) => boolean;}>();diff --git a/frontend/src/store/modules/serviceAccount.ts b/frontend/src/store/modules/serviceAccount.tsindex f61f119366..b158899783 100644--- a/frontend/src/store/modules/serviceAccount.ts+++ b/frontend/src/store/modules/serviceAccount.ts@@ -50,14 +50,14 @@ export const useServiceAccountStore = defineStore("serviceAccount", () => {showDeleted,filter,}: {- parent?: string;+ parent: string;pageSize: number;pageToken: string | undefined;showDeleted: boolean;filter?: AccountFilter;}) => {const request = create(ListServiceAccountsRequestSchema, {- parent: parent ?? "workspaces/-",+ parent,pageSize,pageToken,showDeleted,@@ -102,10 +102,10 @@ export const useServiceAccountStore = defineStore("serviceAccount", () => {const createServiceAccount = async (serviceAccountId: string,serviceAccount: Partial<ServiceAccount>,- parent?: string+ parent: string) => {const request = create(CreateServiceAccountRequestSchema, {- parent: parent ?? "workspaces/-",+ parent,serviceAccountId,serviceAccount: create(ServiceAccountSchema,diff --git a/frontend/src/store/modules/v1/workspace.ts b/frontend/src/store/modules/v1/workspace.tsindex 1236ec2f87..1809831c1c 100644--- a/frontend/src/store/modules/v1/workspace.ts+++ b/frontend/src/store/modules/v1/workspace.ts@@ -13,6 +13,7 @@ import {SetIamPolicyRequestSchema,} from "@/types/proto-es/v1/iam_policy_pb";import { getUserListInBinding, isBindingPolicyExpired } from "@/utils";+import { useActuatorV1Store } from "./actuator";import { composePolicyBindings } from "./projectIamPolicy";export const useWorkspaceV1Store = defineStore("workspace_v1", () => {@@ -66,7 +67,7 @@ export const useWorkspaceV1Store = defineStore("workspace_v1", () => {const fetchIamPolicy = async () => {const request = create(GetIamPolicyRequestSchema, {- resource: "workspaces/-",+ resource: useActuatorV1Store().workspaceResourceName,});const policy = await workspaceServiceClientConnect.getIamPolicy(request);await composePolicyBindings(policy.bindings);@@ -131,7 +132,7 @@ export const useWorkspaceV1Store = defineStore("workspace_v1", () => {}const request = create(SetIamPolicyRequestSchema, {- resource: "workspaces/-",+ resource: useActuatorV1Store().workspaceResourceName,policy: workspacePolicy,etag: workspacePolicy.etag,});diff --git a/frontend/src/store/modules/workloadIdentity.ts b/frontend/src/store/modules/workloadIdentity.tsindex eb5ac18679..1211f9918d 100644--- a/frontend/src/store/modules/workloadIdentity.ts+++ b/frontend/src/store/modules/workloadIdentity.ts@@ -37,14 +37,14 @@ export const useWorkloadIdentityStore = defineStore("workloadIdentity", () => {showDeleted,filter,}: {- parent?: string;+ parent: string;pageSize: number;pageToken: string | undefined;showDeleted: boolean;filter?: AccountFilter;}) => {const request = create(ListWorkloadIdentitiesRequestSchema, {- parent: parent ?? "workspaces/-",+ parent,pageSize,pageToken,showDeleted,@@ -92,10 +92,10 @@ export const useWorkloadIdentityStore = defineStore("workloadIdentity", () => {const createWorkloadIdentity = async (workloadIdentityId: string,workloadIdentity: Partial<WorkloadIdentity>,- parent?: string+ parent: string) => {const request = create(CreateWorkloadIdentityRequestSchema, {- parent: parent ?? "workspaces/-",+ parent,workloadIdentityId,workloadIdentity: create(WorkloadIdentitySchema,diff --git a/frontend/src/types/proto-es/v1/database_service_pb.d.ts b/frontend/src/types/proto-es/v1/database_service_pb.d.tsindex 3af0bf6361..63942aa139 100644--- a/frontend/src/types/proto-es/v1/database_service_pb.d.ts+++ b/frontend/src/types/proto-es/v1/database_service_pb.d.ts@@ -84,7 +84,7 @@ export declare const BatchGetDatabasesResponseSchema: GenMessage<BatchGetDatabasexport declare type ListDatabasesRequest = Message<"bytebase.v1.ListDatabasesRequest"> & {/*** - projects/{project}: list databases in a project, require "bb.projects.get" permission.- * - workspaces/-: list databases in the workspace, require "bb.databases.list" permission.+ * - workspaces/{id}: list databases in the workspace, require "bb.databases.list" permission.* - instances/{instances}: list databases in a instance, require "bb.instances.get" permission** @generated from field: string parent = 1;diff --git a/frontend/src/types/proto-es/v1/service_account_service_pb.d.ts b/frontend/src/types/proto-es/v1/service_account_service_pb.d.tsindex d80ab2d6a1..519243bb71 100644--- a/frontend/src/types/proto-es/v1/service_account_service_pb.d.ts+++ b/frontend/src/types/proto-es/v1/service_account_service_pb.d.ts@@ -78,7 +78,7 @@ export declare const ServiceAccountSchema: GenMessage<ServiceAccount>;export declare type CreateServiceAccountRequest = Message<"bytebase.v1.CreateServiceAccountRequest"> & {/*** The parent resource where this service account will be created.- * Format: projects/{project} for project-level, workspaces/- for workspace-level.+ * Format: projects/{project} for project-level, workspaces/{id} for workspace-level.** @generated from field: string parent = 1;*/@@ -136,7 +136,7 @@ export declare const GetServiceAccountRequestSchema: GenMessage<GetServiceAccounexport declare type ListServiceAccountsRequest = Message<"bytebase.v1.ListServiceAccountsRequest"> & {/*** The parent resource.- * Format: projects/{project} for project-level, workspaces/- for workspace-level.+ * Format: projects/{project} for project-level, workspaces/{id} for workspace-level.** @generated from field: string parent = 1;*/@@ -306,7 +306,7 @@ export declare const UndeleteServiceAccountRequestSchema: GenMessage<UndeleteSerexport declare const ServiceAccountService: GenService<{/*** Creates a new service account.- * For workspace-level: parent is workspaces/-, permission bb.serviceAccounts.create on workspace.+ * For workspace-level: parent is workspaces/{id}, permission bb.serviceAccounts.create on workspace.* For project-level: parent is projects/{project}, permission bb.serviceAccounts.create on project.** @generated from rpc bytebase.v1.ServiceAccountService.CreateServiceAccount@@ -329,7 +329,7 @@ export declare const ServiceAccountService: GenService<{},/*** Lists service accounts.- * For workspace-level: parent is workspaces/-, permission bb.serviceAccounts.list on workspace.+ * For workspace-level: parent is workspaces/{id}, permission bb.serviceAccounts.list on workspace.* For project-level: parent is projects/{project}, permission bb.serviceAccounts.list on project.** @generated from rpc bytebase.v1.ServiceAccountService.ListServiceAccountsdiff --git a/frontend/src/types/proto-es/v1/workload_identity_service_pb.d.ts b/frontend/src/types/proto-es/v1/workload_identity_service_pb.d.tsindex ebc85300ea..46cdbda095 100644--- a/frontend/src/types/proto-es/v1/workload_identity_service_pb.d.ts+++ b/frontend/src/types/proto-es/v1/workload_identity_service_pb.d.ts@@ -146,7 +146,7 @@ export declare const WorkloadIdentityConfig_ProviderTypeSchema: GenEnum<Workloadexport declare type CreateWorkloadIdentityRequest = Message<"bytebase.v1.CreateWorkloadIdentityRequest"> & {/*** The parent resource where this workload identity will be created.- * Format: projects/{project} for project-level, workspaces/- for workspace-level.+ * Format: projects/{project} for project-level, workspaces/{id} for workspace-level.** @generated from field: string parent = 1;*/@@ -204,7 +204,7 @@ export declare const GetWorkloadIdentityRequestSchema: GenMessage<GetWorkloadIdeexport declare type ListWorkloadIdentitiesRequest = Message<"bytebase.v1.ListWorkloadIdentitiesRequest"> & {/*** The parent resource.- * Format: projects/{project} for project-level, workspaces/- for workspace-level.+ * Format: projects/{project} for project-level, workspaces/{id} for workspace-level.** @generated from field: string parent = 1;*/@@ -374,7 +374,7 @@ export declare const UndeleteWorkloadIdentityRequestSchema: GenMessage<UndeleteWexport declare const WorkloadIdentityService: GenService<{/*** Creates a new workload identity.- * For workspace-level: parent is workspaces/-, permission bb.workloadIdentities.create on workspace.+ * For workspace-level: parent is workspaces/{id}, permission bb.workloadIdentities.create on workspace.* For project-level: parent is projects/{project}, permission bb.workloadIdentities.create on project.** @generated from rpc bytebase.v1.WorkloadIdentityService.CreateWorkloadIdentity@@ -397,7 +397,7 @@ export declare const WorkloadIdentityService: GenService<{},/*** Lists workload identities.- * For workspace-level: parent is workspaces/-, permission bb.workloadIdentities.list on workspace.+ * For workspace-level: parent is workspaces/{id}, permission bb.workloadIdentities.list on workspace.* For project-level: parent is projects/{project}, permission bb.workloadIdentities.list on project.** @generated from rpc bytebase.v1.WorkloadIdentityService.ListWorkloadIdentitiesdiff --git a/frontend/src/views/DatabaseDashboard.vue b/frontend/src/views/DatabaseDashboard.vueindex f3a2369eb6..b21469ccbb 100644--- a/frontend/src/views/DatabaseDashboard.vue+++ b/frontend/src/views/DatabaseDashboard.vue@@ -40,7 +40,7 @@mode="ALL":bordered="false":filter="filter"- :parent="'workspaces/-'"+ :parent="actuatorStore.workspaceResourceName":footer-class="'mx-4'":custom-click="!!onClickDatabase"v-model:selected-database-names="state.selectedDatabaseNameList"@@ -71,7 +71,11 @@ import {DatabaseOperations,PagedDatabaseTable,} from "@/components/v2/Model/DatabaseV1Table";-import { useDatabaseV1Store, useUIStateStore } from "@/store";+import {+ useActuatorV1Store,+ useDatabaseV1Store,+ useUIStateStore,+} from "@/store";import {environmentNamePrefix,instanceNamePrefix,@@ -101,6 +105,7 @@ defineProps<{const uiStateStore = useUIStateStore();const databaseStore = useDatabaseV1Store();+const actuatorStore = useActuatorV1Store();const pagedDatabaseTableRef = ref<InstanceType<typeof PagedDatabaseTable>>();const defaultSearchParams = () => {diff --git a/proto/gen/grpc-doc/openapi.yaml b/proto/gen/grpc-doc/openapi.yamlindex f427532860..728d27e80a 100644--- a/proto/gen/grpc-doc/openapi.yaml+++ b/proto/gen/grpc-doc/openapi.yaml@@ -11091,7 +11091,7 @@ paths:summary: ListServiceAccountsdescription: |-Lists service accounts.- For workspace-level: parent is workspaces/-, permission bb.serviceAccounts.list on workspace.+ For workspace-level: parent is workspaces/{id}, permission bb.serviceAccounts.list on workspace.For project-level: parent is projects/{project}, permission bb.serviceAccounts.list on project.operationId: ServiceAccountService_ListServiceAccountsparameters:@@ -11189,7 +11189,7 @@ paths:summary: CreateServiceAccountdescription: |-Creates a new service account.- For workspace-level: parent is workspaces/-, permission bb.serviceAccounts.create on workspace.+ For workspace-level: parent is workspaces/{id}, permission bb.serviceAccounts.create on workspace.For project-level: parent is projects/{project}, permission bb.serviceAccounts.create on project.operationId: ServiceAccountService_CreateServiceAccountparameters:@@ -11638,7 +11638,7 @@ paths:summary: ListWorkloadIdentitiesdescription: |-Lists workload identities.- For workspace-level: parent is workspaces/-, permission bb.workloadIdentities.list on workspace.+ For workspace-level: parent is workspaces/{id}, permission bb.workloadIdentities.list on workspace.For project-level: parent is projects/{project}, permission bb.workloadIdentities.list on project.operationId: WorkloadIdentityService_ListWorkloadIdentitiesparameters:@@ -11736,7 +11736,7 @@ paths:summary: CreateWorkloadIdentitydescription: |-Creates a new workload identity.- For workspace-level: parent is workspaces/-, permission bb.workloadIdentities.create on workspace.+ For workspace-level: parent is workspaces/{id}, permission bb.workloadIdentities.create on workspace.For project-level: parent is projects/{project}, permission bb.workloadIdentities.create on project.operationId: WorkloadIdentityService_CreateWorkloadIdentityparameters:@@ -15489,7 +15489,7 @@ paths:summary: ListServiceAccountsdescription: |-Lists service accounts.- For workspace-level: parent is workspaces/-, permission bb.serviceAccounts.list on workspace.+ For workspace-level: parent is workspaces/{id}, permission bb.serviceAccounts.list on workspace.For project-level: parent is projects/{project}, permission bb.serviceAccounts.list on project.operationId: ServiceAccountService_ListServiceAccounts2parameters:@@ -15587,7 +15587,7 @@ paths:summary: CreateServiceAccountdescription: |-Creates a new service account.- For workspace-level: parent is workspaces/-, permission bb.serviceAccounts.create on workspace.+ For workspace-level: parent is workspaces/{id}, permission bb.serviceAccounts.create on workspace.For project-level: parent is projects/{project}, permission bb.serviceAccounts.create on project.operationId: ServiceAccountService_CreateServiceAccount2parameters:@@ -15633,7 +15633,7 @@ paths:summary: ListWorkloadIdentitiesdescription: |-Lists workload identities.- For workspace-level: parent is workspaces/-, permission bb.workloadIdentities.list on workspace.+ For workspace-level: parent is workspaces/{id}, permission bb.workloadIdentities.list on workspace.For project-level: parent is projects/{project}, permission bb.workloadIdentities.list on project.operationId: WorkloadIdentityService_ListWorkloadIdentities2parameters:@@ -15731,7 +15731,7 @@ paths:summary: CreateWorkloadIdentitydescription: |-Creates a new workload identity.- For workspace-level: parent is workspaces/-, permission bb.workloadIdentities.create on workspace.+ For workspace-level: parent is workspaces/{id}, permission bb.workloadIdentities.create on workspace.For project-level: parent is projects/{project}, permission bb.workloadIdentities.create on project.operationId: WorkloadIdentityService_CreateWorkloadIdentity2parameters:@@ -18077,7 +18077,7 @@ components:title: parentdescription: |-The parent resource where this service account will be created.- Format: projects/{project} for project-level, workspaces/- for workspace-level.+ Format: projects/{project} for project-level, workspaces/{id} for workspace-level.serviceAccountId:type: stringtitle: service_account_id@@ -18132,7 +18132,7 @@ components:title: parentdescription: |-The parent resource where this workload identity will be created.- Format: projects/{project} for project-level, workspaces/- for workspace-level.+ Format: projects/{project} for project-level, workspaces/{id} for workspace-level.workloadIdentityId:type: stringtitle: workload_identity_id@@ -21391,7 +21391,7 @@ components:title: parentdescription: |-- projects/{project}: list databases in a project, require "bb.projects.get" permission.- - workspaces/-: list databases in the workspace, require "bb.databases.list" permission.+ - workspaces/{id}: list databases in the workspace, require "bb.databases.list" permission.- instances/{instances}: list databases in a instance, require "bb.instances.get" permissionpageSize:type: integer@@ -22271,7 +22271,7 @@ components:title: parentdescription: |-The parent resource.- Format: projects/{project} for project-level, workspaces/- for workspace-level.+ Format: projects/{project} for project-level, workspaces/{id} for workspace-level.pageSize:type: integertitle: page_size@@ -22448,7 +22448,7 @@ components:title: parentdescription: |-The parent resource.- Format: projects/{project} for project-level, workspaces/- for workspace-level.+ Format: projects/{project} for project-level, workspaces/{id} for workspace-level.pageSize:type: integertitle: page_sizediff --git a/proto/gen/grpc-doc/v1/README.md b/proto/gen/grpc-doc/v1/README.mdindex 0c785a0f2b..0c0de73c90 100644--- a/proto/gen/grpc-doc/v1/README.md+++ b/proto/gen/grpc-doc/v1/README.md@@ -5404,7 +5404,7 @@ Example: status == "DONE" status == "FAILED" && type ==| Field | Type | Label | Description || ----- | ---- | ----- | ----------- |-| parent | [string](#string) | | - projects/{project}: list databases in a project, require "bb.projects.get" permission. - workspaces/-: list databases in the workspace, require "bb.databases.list" permission. - instances/{instances}: list databases in a instance, require "bb.instances.get" permission |+| parent | [string](#string) | | - projects/{project}: list databases in a project, require "bb.projects.get" permission. - workspaces/{id}: list databases in the workspace, require "bb.databases.list" permission. - instances/{instances}: list databases in a instance, require "bb.instances.get" permission || page_size | [int32](#int32) | | The maximum number of databases to return. The service may return fewer than this value. If unspecified, at most 10 databases will be returned. The maximum value is 1000; values above 1000 will be coerced to 1000. || page_token | [string](#string) | | A page token, received from a previous `ListDatabases` call. Provide this to retrieve the subsequent page.@@ -10346,7 +10346,7 @@ Request message for creating a service account.| Field | Type | Label | Description || ----- | ---- | ----- | ----------- |-| parent | [string](#string) | | The parent resource where this service account will be created. Format: projects/{project} for project-level, workspaces/- for workspace-level. |+| parent | [string](#string) | | The parent resource where this service account will be created. Format: projects/{project} for project-level, workspaces/{id} for workspace-level. || service_account_id | [string](#string) | | The ID to use for the service account, which will become the final component of the service account's email in the format: {service_account_id}@service.bytebase.com or {service_account_id}@{project-id}.service.bytebase.com || service_account | [ServiceAccount](#bytebase-v1-ServiceAccount) | | The service account to create. |@@ -10393,7 +10393,7 @@ Request message for listing service accounts.| Field | Type | Label | Description || ----- | ---- | ----- | ----------- |-| parent | [string](#string) | | The parent resource. Format: projects/{project} for project-level, workspaces/- for workspace-level. |+| parent | [string](#string) | | The parent resource. Format: projects/{project} for project-level, workspaces/{id} for workspace-level. || page_size | [int32](#int32) | | The maximum number of service accounts to return. The service may return fewer than this value. If unspecified, at most 10 service accounts will be returned. The maximum value is 1000; values above 1000 will be coerced to 1000. || page_token | [string](#string) | | A page token, received from a previous `ListServiceAccounts` call. Provide this to retrieve the subsequent page.@@ -10492,9 +10492,9 @@ ServiceAccountService manages service accounts for API integrations.| Method Name | Request Type | Response Type | Description || ----------- | ------------ | ------------- | ------------|-| CreateServiceAccount | [CreateServiceAccountRequest](#bytebase-v1-CreateServiceAccountRequest) | [ServiceAccount](#bytebase-v1-ServiceAccount) | Creates a new service account. For workspace-level: parent is workspaces/-, permission bb.serviceAccounts.create on workspace. For project-level: parent is projects/{project}, permission bb.serviceAccounts.create on project. |+| CreateServiceAccount | [CreateServiceAccountRequest](#bytebase-v1-CreateServiceAccountRequest) | [ServiceAccount](#bytebase-v1-ServiceAccount) | Creates a new service account. For workspace-level: parent is workspaces/{id}, permission bb.serviceAccounts.create on workspace. For project-level: parent is projects/{project}, permission bb.serviceAccounts.create on project. || GetServiceAccount | [GetServiceAccountRequest](#bytebase-v1-GetServiceAccountRequest) | [ServiceAccount](#bytebase-v1-ServiceAccount) | Gets a service account by name. Permissions required: bb.serviceAccounts.get |-| ListServiceAccounts | [ListServiceAccountsRequest](#bytebase-v1-ListServiceAccountsRequest) | [ListServiceAccountsResponse](#bytebase-v1-ListServiceAccountsResponse) | Lists service accounts. For workspace-level: parent is workspaces/-, permission bb.serviceAccounts.list on workspace. For project-level: parent is projects/{project}, permission bb.serviceAccounts.list on project. |+| ListServiceAccounts | [ListServiceAccountsRequest](#bytebase-v1-ListServiceAccountsRequest) | [ListServiceAccountsResponse](#bytebase-v1-ListServiceAccountsResponse) | Lists service accounts. For workspace-level: parent is workspaces/{id}, permission bb.serviceAccounts.list on workspace. For project-level: parent is projects/{project}, permission bb.serviceAccounts.list on project. || UpdateServiceAccount | [UpdateServiceAccountRequest](#bytebase-v1-UpdateServiceAccountRequest) | [ServiceAccount](#bytebase-v1-ServiceAccount) | Updates a service account. Permissions required: bb.serviceAccounts.update || DeleteServiceAccount | [DeleteServiceAccountRequest](#bytebase-v1-DeleteServiceAccountRequest) | [.google.protobuf.Empty](#google-protobuf-Empty) | Deletes a service account. Permissions required: bb.serviceAccounts.delete || UndeleteServiceAccount | [UndeleteServiceAccountRequest](#bytebase-v1-UndeleteServiceAccountRequest) | [ServiceAccount](#bytebase-v1-ServiceAccount) | Restores a deleted service account. Permissions required: bb.serviceAccounts.undelete |@@ -10831,7 +10831,7 @@ Request message for creating a workload identity.| Field | Type | Label | Description || ----- | ---- | ----- | ----------- |-| parent | [string](#string) | | The parent resource where this workload identity will be created. Format: projects/{project} for project-level, workspaces/- for workspace-level. |+| parent | [string](#string) | | The parent resource where this workload identity will be created. Format: projects/{project} for project-level, workspaces/{id} for workspace-level. || workload_identity_id | [string](#string) | | The ID to use for the workload identity, which will become the final component of the workload identity's email in the format: {workload_identity_id}@workload.bytebase.com or {workload_identity_id}@{project-id}.workload.bytebase.com || workload_identity | [WorkloadIdentity](#bytebase-v1-WorkloadIdentity) | | The workload identity to create. |@@ -10878,7 +10878,7 @@ Request message for listing workload identities.| Field | Type | Label | Description || ----- | ---- | ----- | ----------- |-| parent | [string](#string) | | The parent resource. Format: projects/{project} for project-level, workspaces/- for workspace-level. |+| parent | [string](#string) | | The parent resource. Format: projects/{project} for project-level, workspaces/{id} for workspace-level. || page_size | [int32](#int32) | | The maximum number of workload identities to return. The service may return fewer than this value. If unspecified, at most 10 workload identities will be returned. The maximum value is 1000; values above 1000 will be coerced to 1000. || page_token | [string](#string) | | A page token, received from a previous `ListWorkloadIdentities` call. Provide this to retrieve the subsequent page.@@ -11008,9 +11008,9 @@ WorkloadIdentityService manages workload identities for external CI/CD integrati| Method Name | Request Type | Response Type | Description || ----------- | ------------ | ------------- | ------------|-| CreateWorkloadIdentity | [CreateWorkloadIdentityRequest](#bytebase-v1-CreateWorkloadIdentityRequest) | [WorkloadIdentity](#bytebase-v1-WorkloadIdentity) | Creates a new workload identity. For workspace-level: parent is workspaces/-, permission bb.workloadIdentities.create on workspace. For project-level: parent is projects/{project}, permission bb.workloadIdentities.create on project. |+| CreateWorkloadIdentity | [CreateWorkloadIdentityRequest](#bytebase-v1-CreateWorkloadIdentityRequest) | [WorkloadIdentity](#bytebase-v1-WorkloadIdentity) | Creates a new workload identity. For workspace-level: parent is workspaces/{id}, permission bb.workloadIdentities.create on workspace. For project-level: parent is projects/{project}, permission bb.workloadIdentities.create on project. || GetWorkloadIdentity | [GetWorkloadIdentityRequest](#bytebase-v1-GetWorkloadIdentityRequest) | [WorkloadIdentity](#bytebase-v1-WorkloadIdentity) | Gets a workload identity by name. Permissions required: bb.workloadIdentities.get |-| ListWorkloadIdentities | [ListWorkloadIdentitiesRequest](#bytebase-v1-ListWorkloadIdentitiesRequest) | [ListWorkloadIdentitiesResponse](#bytebase-v1-ListWorkloadIdentitiesResponse) | Lists workload identities. For workspace-level: parent is workspaces/-, permission bb.workloadIdentities.list on workspace. For project-level: parent is projects/{project}, permission bb.workloadIdentities.list on project. |+| ListWorkloadIdentities | [ListWorkloadIdentitiesRequest](#bytebase-v1-ListWorkloadIdentitiesRequest) | [ListWorkloadIdentitiesResponse](#bytebase-v1-ListWorkloadIdentitiesResponse) | Lists workload identities. For workspace-level: parent is workspaces/{id}, permission bb.workloadIdentities.list on workspace. For project-level: parent is projects/{project}, permission bb.workloadIdentities.list on project. || UpdateWorkloadIdentity | [UpdateWorkloadIdentityRequest](#bytebase-v1-UpdateWorkloadIdentityRequest) | [WorkloadIdentity](#bytebase-v1-WorkloadIdentity) | Updates a workload identity. Permissions required: bb.workloadIdentities.update || DeleteWorkloadIdentity | [DeleteWorkloadIdentityRequest](#bytebase-v1-DeleteWorkloadIdentityRequest) | [.google.protobuf.Empty](#google-protobuf-Empty) | Deletes a workload identity. Permissions required: bb.workloadIdentities.delete || UndeleteWorkloadIdentity | [UndeleteWorkloadIdentityRequest](#bytebase-v1-UndeleteWorkloadIdentityRequest) | [WorkloadIdentity](#bytebase-v1-WorkloadIdentity) | Restores a deleted workload identity. Permissions required: bb.workloadIdentities.undelete |diff --git a/proto/gen/grpc-doc/v1/index.html b/proto/gen/grpc-doc/v1/index.htmlindex 85a3cd14f3..76488907a4 100644--- a/proto/gen/grpc-doc/v1/index.html+++ b/proto/gen/grpc-doc/v1/index.html@@ -15305,7 +15305,7 @@ If this field is omitted, there are no subsequent pages. </p></td><td><a href="#string">string</a></td><td></td><td><p>- projects/{project}: list databases in a project, require "bb.projects.get" permission.-- workspaces/-: list databases in the workspace, require "bb.databases.list" permission.+- workspaces/{id}: list databases in the workspace, require "bb.databases.list" permission.- instances/{instances}: list databases in a instance, require "bb.instances.get" permission </p></td></tr>@@ -29203,7 +29203,7 @@ Permissions required: bb.taskRuns.list</p></td><td><a href="#string">string</a></td><td></td><td><p>The parent resource where this service account will be created.-Format: projects/{project} for project-level, workspaces/- for workspace-level. </p></td>+Format: projects/{project} for project-level, workspaces/{id} for workspace-level. </p></td></tr><tr>@@ -29294,7 +29294,7 @@ Format: serviceAccounts/{email} </p></td><td><a href="#string">string</a></td><td></td><td><p>The parent resource.-Format: projects/{project} for project-level, workspaces/- for workspace-level. </p></td>+Format: projects/{project} for project-level, workspaces/{id} for workspace-level. </p></td></tr><tr>@@ -29525,7 +29525,7 @@ Supported fields: title, service_key (triggers key rotation) </p></td><td><a href="#bytebase.v1.CreateServiceAccountRequest">CreateServiceAccountRequest</a></td><td><a href="#bytebase.v1.ServiceAccount">ServiceAccount</a></td><td><p>Creates a new service account.-For workspace-level: parent is workspaces/-, permission bb.serviceAccounts.create on workspace.+For workspace-level: parent is workspaces/{id}, permission bb.serviceAccounts.create on workspace.For project-level: parent is projects/{project}, permission bb.serviceAccounts.create on project.</p></td></tr>@@ -29542,7 +29542,7 @@ Permissions required: bb.serviceAccounts.get</p></td><td><a href="#bytebase.v1.ListServiceAccountsRequest">ListServiceAccountsRequest</a></td><td><a href="#bytebase.v1.ListServiceAccountsResponse">ListServiceAccountsResponse</a></td><td><p>Lists service accounts.-For workspace-level: parent is workspaces/-, permission bb.serviceAccounts.list on workspace.+For workspace-level: parent is workspaces/{id}, permission bb.serviceAccounts.list on workspace.For project-level: parent is projects/{project}, permission bb.serviceAccounts.list on project.</p></td></tr>@@ -30697,7 +30697,7 @@ Permissions required: bb.settings.set</p></td><td><a href="#string">string</a></td><td></td><td><p>The parent resource where this workload identity will be created.-Format: projects/{project} for project-level, workspaces/- for workspace-level. </p></td>+Format: projects/{project} for project-level, workspaces/{id} for workspace-level. </p></td></tr><tr>@@ -30788,7 +30788,7 @@ Format: workloadIdentities/{email} </p></td><td><a href="#string">string</a></td><td></td><td><p>The parent resource.-Format: projects/{project} for project-level, workspaces/- for workspace-level. </p></td>+Format: projects/{project} for project-level, workspaces/{id} for workspace-level. </p></td></tr><tr>@@ -31093,7 +31093,7 @@ For project-level: {name}@{project-id}.workload.bytebase.com </p></td><td><a href="#bytebase.v1.CreateWorkloadIdentityRequest">CreateWorkloadIdentityRequest</a></td><td><a href="#bytebase.v1.WorkloadIdentity">WorkloadIdentity</a></td><td><p>Creates a new workload identity.-For workspace-level: parent is workspaces/-, permission bb.workloadIdentities.create on workspace.+For workspace-level: parent is workspaces/{id}, permission bb.workloadIdentities.create on workspace.For project-level: parent is projects/{project}, permission bb.workloadIdentities.create on project.</p></td></tr>@@ -31110,7 +31110,7 @@ Permissions required: bb.workloadIdentities.get</p></td><td><a href="#bytebase.v1.ListWorkloadIdentitiesRequest">ListWorkloadIdentitiesRequest</a></td><td><a href="#bytebase.v1.ListWorkloadIdentitiesResponse">ListWorkloadIdentitiesResponse</a></td><td><p>Lists workload identities.-For workspace-level: parent is workspaces/-, permission bb.workloadIdentities.list on workspace.+For workspace-level: parent is workspaces/{id}, permission bb.workloadIdentities.list on workspace.For project-level: parent is projects/{project}, permission bb.workloadIdentities.list on project.</p></td></tr>diff --git a/proto/v1/v1/database_service.proto b/proto/v1/v1/database_service.protoindex efc2936e0c..ee03f5600e 100644--- a/proto/v1/v1/database_service.proto+++ b/proto/v1/v1/database_service.proto@@ -200,7 +200,7 @@ message BatchGetDatabasesResponse {message ListDatabasesRequest {// - projects/{project}: list databases in a project, require "bb.projects.get" permission.- // - workspaces/-: list databases in the workspace, require "bb.databases.list" permission.+ // - workspaces/{id}: list databases in the workspace, require "bb.databases.list" permission.// - instances/{instances}: list databases in a instance, require "bb.instances.get" permissionstring parent = 1 [(google.api.field_behavior) = REQUIRED,diff --git a/proto/v1/v1/service_account_service.proto b/proto/v1/v1/service_account_service.protoindex 51dea1303b..ce6362006f 100644--- a/proto/v1/v1/service_account_service.proto+++ b/proto/v1/v1/service_account_service.proto@@ -18,7 +18,7 @@ option go_package = "github.com/bytebase/bytebase/backend/generated-go/v1";// ServiceAccountService manages service accounts for API integrations.service ServiceAccountService {// Creates a new service account.- // For workspace-level: parent is workspaces/-, permission bb.serviceAccounts.create on workspace.+ // For workspace-level: parent is workspaces/{id}, permission bb.serviceAccounts.create on workspace.// For project-level: parent is projects/{project}, permission bb.serviceAccounts.create on project.rpc CreateServiceAccount(CreateServiceAccountRequest) returns (ServiceAccount) {option (google.api.http) = {@@ -45,7 +45,7 @@ service ServiceAccountService {}// Lists service accounts.- // For workspace-level: parent is workspaces/-, permission bb.serviceAccounts.list on workspace.+ // For workspace-level: parent is workspaces/{id}, permission bb.serviceAccounts.list on workspace.// For project-level: parent is projects/{project}, permission bb.serviceAccounts.list on project.rpc ListServiceAccounts(ListServiceAccountsRequest) returns (ListServiceAccountsResponse) {option (google.api.http) = {@@ -125,7 +125,7 @@ message ServiceAccount {// Request message for creating a service account.message CreateServiceAccountRequest {// The parent resource where this service account will be created.- // Format: projects/{project} for project-level, workspaces/- for workspace-level.+ // Format: projects/{project} for project-level, workspaces/{id} for workspace-level.string parent = 1 [(google.api.resource_reference) = {type: "bytebase.com/Project"}];// The ID to use for the service account, which will become the final component@@ -150,7 +150,7 @@ message GetServiceAccountRequest {// Request message for listing service accounts.message ListServiceAccountsRequest {// The parent resource.- // Format: projects/{project} for project-level, workspaces/- for workspace-level.+ // Format: projects/{project} for project-level, workspaces/{id} for workspace-level.string parent = 1 [(google.api.resource_reference) = {type: "bytebase.com/Project"}];// The maximum number of service accounts to return. The service may return fewer thandiff --git a/proto/v1/v1/workload_identity_service.proto b/proto/v1/v1/workload_identity_service.protoindex 9963219a46..2b06d0ec6f 100644--- a/proto/v1/v1/workload_identity_service.proto+++ b/proto/v1/v1/workload_identity_service.proto@@ -18,7 +18,7 @@ option go_package = "github.com/bytebase/bytebase/backend/generated-go/v1";// WorkloadIdentityService manages workload identities for external CI/CD integrations.service WorkloadIdentityService {// Creates a new workload identity.- // For workspace-level: parent is workspaces/-, permission bb.workloadIdentities.create on workspace.+ // For workspace-level: parent is workspaces/{id}, permission bb.workloadIdentities.create on workspace.// For project-level: parent is projects/{project}, permission bb.workloadIdentities.create on project.rpc CreateWorkloadIdentity(CreateWorkloadIdentityRequest) returns (WorkloadIdentity) {option (google.api.http) = {@@ -45,7 +45,7 @@ service WorkloadIdentityService {}// Lists workload identities.- // For workspace-level: parent is workspaces/-, permission bb.workloadIdentities.list on workspace.+ // For workspace-level: parent is workspaces/{id}, permission bb.workloadIdentities.list on workspace.// For project-level: parent is projects/{project}, permission bb.workloadIdentities.list on project.rpc ListWorkloadIdentities(ListWorkloadIdentitiesRequest) returns (ListWorkloadIdentitiesResponse) {option (google.api.http) = {@@ -144,7 +144,7 @@ message WorkloadIdentityConfig {// Request message for creating a workload identity.message CreateWorkloadIdentityRequest {// The parent resource where this workload identity will be created.- // Format: projects/{project} for project-level, workspaces/- for workspace-level.+ // Format: projects/{project} for project-level, workspaces/{id} for workspace-level.string parent = 1 [(google.api.resource_reference) = {type: "bytebase.com/Project"}];// The ID to use for the workload identity, which will become the final component@@ -169,7 +169,7 @@ message GetWorkloadIdentityRequest {// Request message for listing workload identities.message ListWorkloadIdentitiesRequest {// The parent resource.- // Format: projects/{project} for project-level, workspaces/- for workspace-level.+ // Format: projects/{project} for project-level, workspaces/{id} for workspace-level.string parent = 1 [(google.api.resource_reference) = {type: "bytebase.com/Project"}];// The maximum number of workload identities to return. The service may return fewer than