Skip to content

Database governance built for humans and agents — controlling changes and access across every major database.

refactor: remove unused context and cleanup InstanceRoleService (#18654)

Danny Xud7ff99312f73
diff --git a/backend/api/mcp/gen/openapi.yaml b/backend/api/mcp/gen/openapi.yaml
index fef854cbe6..6eb229701c 100644
--- a/backend/api/mcp/gen/openapi.yaml
+++ b/backend/api/mcp/gen/openapi.yaml
@@ -1753,44 +1753,6 @@ paths:
application/json:
schema:
$ref: '#/components/schemas/bytebase.v1.IdentityProvider'
- /bytebase.v1.InstanceRoleService/GetInstanceRole:
- post:
- tags:
- - bytebase.v1.InstanceRoleService
- summary: 'Gets a database role from an instance. Permissions required: bb.instanceRoles.get'
- description: |-
- Gets a database role from an instance.
- Permissions required: bb.instanceRoles.get
- operationId: bytebase.v1.InstanceRoleService.GetInstanceRole
- parameters:
- - name: Connect-Protocol-Version
- in: header
- required: true
- schema:
- $ref: '#/components/schemas/connect-protocol-version'
- - name: Connect-Timeout-Ms
- in: header
- schema:
- $ref: '#/components/schemas/connect-timeout-header'
- requestBody:
- content:
- application/json:
- schema:
- $ref: '#/components/schemas/bytebase.v1.GetInstanceRoleRequest'
- required: true
- responses:
- default:
- description: Error
- content:
- application/json:
- schema:
- $ref: '#/components/schemas/connect.error'
- "200":
- description: Success
- content:
- application/json:
- schema:
- $ref: '#/components/schemas/bytebase.v1.InstanceRole'
/bytebase.v1.InstanceRoleService/ListInstanceRoles:
post:
tags:
@@ -10025,18 +9987,6 @@ components:
Format: instances/{instance}
title: GetInstanceRequest
additionalProperties: false
- bytebase.v1.GetInstanceRoleRequest:
- type: object
- properties:
- name:
- type: string
- title: name
- description: |-
- The name of the role to retrieve.
- Format: instances/{instance}/roles/{role name}
- The role name is the unique name for the role.
- title: GetInstanceRoleRequest
- additionalProperties: false
bytebase.v1.GetIssueRequest:
type: object
properties:
diff --git a/backend/api/v1/audit_log_service.go b/backend/api/v1/audit_log_service.go
index c64f6a6478..e22f5cca36 100644
--- a/backend/api/v1/audit_log_service.go
+++ b/backend/api/v1/audit_log_service.go
@@ -89,7 +89,7 @@ func (s *AuditLogService) SearchAuditLogs(ctx context.Context, request *connect.
}
}
- v1AuditLogs := convertToAuditLogs(ctx, s.store, auditLogs)
+ v1AuditLogs := convertToAuditLogs(auditLogs)
return connect.NewResponse(&v1pb.SearchAuditLogsResponse{
AuditLogs: v1AuditLogs,
NextPageToken: nextPageToken,
@@ -156,7 +156,7 @@ func (s *AuditLogService) ExportAuditLogs(ctx context.Context, request *connect.
return connect.NewResponse(&v1pb.ExportAuditLogsResponse{Content: content, NextPageToken: searchAuditLogsResult.Msg.NextPageToken}), nil
}
-func convertToAuditLogs(_ context.Context, _ *store.Store, auditLogs []*store.AuditLog) []*v1pb.AuditLog {
+func convertToAuditLogs(auditLogs []*store.AuditLog) []*v1pb.AuditLog {
var ls []*v1pb.AuditLog
for _, log := range auditLogs {
ls = append(ls, convertToAuditLog(log))
diff --git a/backend/api/v1/database_service.go b/backend/api/v1/database_service.go
index 6b4d6113e0..17c5b0ebe6 100644
--- a/backend/api/v1/database_service.go
+++ b/backend/api/v1/database_service.go
@@ -675,9 +675,9 @@ func (s *DatabaseService) GetDatabaseSDLSchema(ctx context.Context, req *connect
switch format {
case v1pb.GetDatabaseSDLSchemaRequest_SINGLE_FILE:
- return s.getSingleFileSDL(ctx, database.Engine, metadata)
+ return s.getSingleFileSDL(database.Engine, metadata)
case v1pb.GetDatabaseSDLSchemaRequest_MULTI_FILE:
- return s.getMultiFileSDL(ctx, database.Engine, metadata, databaseName)
+ return s.getMultiFileSDL(database.Engine, metadata)
default:
return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("unsupported SDL format: %v", format))
}
@@ -1126,7 +1126,7 @@ func (s *DatabaseService) GetSchemaString(ctx context.Context, req *connect.Requ
}
}
-func (*DatabaseService) getSingleFileSDL(_ context.Context, engine storepb.Engine, metadata *storepb.DatabaseSchemaMetadata) (*connect.Response[v1pb.DatabaseSDLSchema], error) {
+func (*DatabaseService) getSingleFileSDL(engine storepb.Engine, metadata *storepb.DatabaseSchemaMetadata) (*connect.Response[v1pb.DatabaseSDLSchema], error) {
sdlText, err := schema.GetDatabaseDefinition(engine, schema.GetDefinitionContext{
SkipBackupSchema: true,
SDLFormat: true,
@@ -1141,7 +1141,7 @@ func (*DatabaseService) getSingleFileSDL(_ context.Context, engine storepb.Engin
}), nil
}
-func (*DatabaseService) getMultiFileSDL(_ context.Context, engine storepb.Engine, metadata *storepb.DatabaseSchemaMetadata, _ string) (*connect.Response[v1pb.DatabaseSDLSchema], error) {
+func (*DatabaseService) getMultiFileSDL(engine storepb.Engine, metadata *storepb.DatabaseSchemaMetadata) (*connect.Response[v1pb.DatabaseSDLSchema], error) {
// Get multi-file schema from schema package
result, err := schema.GetMultiFileDatabaseDefinition(engine, schema.GetDefinitionContext{
SkipBackupSchema: true,
diff --git a/backend/api/v1/instance_role_service.go b/backend/api/v1/instance_role_service.go
index 89f7d0ee89..3128cdee9c 100644
--- a/backend/api/v1/instance_role_service.go
+++ b/backend/api/v1/instance_role_service.go
@@ -6,7 +6,6 @@ import (
"connectrpc.com/connect"
"github.com/pkg/errors"
- "github.com/bytebase/bytebase/backend/component/dbfactory"
v1pb "github.com/bytebase/bytebase/backend/generated-go/v1"
"github.com/bytebase/bytebase/backend/generated-go/v1/v1connect"
"github.com/bytebase/bytebase/backend/store"
@@ -15,23 +14,16 @@ import (
// InstanceRoleService implements the database role service.
type InstanceRoleService struct {
v1connect.UnimplementedInstanceRoleServiceHandler
- store *store.Store
- dbFactory *dbfactory.DBFactory
+ store *store.Store
}
// NewInstanceRoleService creates a new InstanceRoleService.
-func NewInstanceRoleService(store *store.Store, dbFactory *dbfactory.DBFactory) *InstanceRoleService {
+func NewInstanceRoleService(store *store.Store) *InstanceRoleService {
return &InstanceRoleService{
- store: store,
- dbFactory: dbFactory,
+ store: store,
}
}
-// GetInstanceRole gets an role.
-func (*InstanceRoleService) GetInstanceRole(_ context.Context, _ *connect.Request[v1pb.GetInstanceRoleRequest]) (*connect.Response[v1pb.InstanceRole], error) {
- return connect.NewResponse(&v1pb.InstanceRole{}), nil
-}
-
// ListInstanceRoles retrieves the list of roles for a given instance.
// Note: Pagination is not implemented in this method as it is not required at the moment.
func (s *InstanceRoleService) ListInstanceRoles(ctx context.Context, req *connect.Request[v1pb.ListInstanceRolesRequest]) (*connect.Response[v1pb.ListInstanceRolesResponse], error) {
diff --git a/backend/api/v1/org_policy_service.go b/backend/api/v1/org_policy_service.go
index 94cb9b9a58..01fea7597d 100644
--- a/backend/api/v1/org_policy_service.go
+++ b/backend/api/v1/org_policy_service.go
@@ -55,7 +55,7 @@ func (s *OrgPolicyService) GetPolicy(ctx context.Context, req *connect.Request[v
if connectErr == connect.CodeNotFound {
policyType, extractErr := extractPolicyTypeFromName(req.Msg.Name)
if extractErr == nil && policyType == storepb.Policy_ROLLOUT {
- defaultPolicy, defaultErr := s.getDefaultRolloutPolicy(ctx, parent, req.Msg.Name)
+ defaultPolicy, defaultErr := s.getDefaultRolloutPolicy(parent, req.Msg.Name)
if defaultErr != nil {
return nil, defaultErr
}
@@ -65,7 +65,7 @@ func (s *OrgPolicyService) GetPolicy(ctx context.Context, req *connect.Request[v
return nil, err
}
- response, err := s.convertToPolicy(ctx, policy)
+ response, err := convertToPolicy(policy)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, err)
}
@@ -101,7 +101,7 @@ func (s *OrgPolicyService) ListPolicies(ctx context.Context, req *connect.Reques
response := &v1pb.ListPoliciesResponse{}
for _, policy := range policies {
- p, err := s.convertToPolicy(ctx, policy)
+ p, err := convertToPolicy(policy)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, err)
}
@@ -184,7 +184,7 @@ func (s *OrgPolicyService) UpdatePolicy(ctx context.Context, req *connect.Reques
if err := validatePolicyPayload(policy.Type, req.Msg.Policy); err != nil {
return nil, connect.NewError(connect.CodeInvalidArgument, errors.Wrap(err, "invalid policy"))
}
- payloadStr, err := s.convertPolicyPayloadToString(ctx, req.Msg.Policy)
+ payloadStr, err := s.convertPolicyPayloadToString(req.Msg.Policy)
if err != nil {
return nil, err
}
@@ -201,7 +201,7 @@ func (s *OrgPolicyService) UpdatePolicy(ctx context.Context, req *connect.Reques
return nil, connect.NewError(connect.CodeInternal, err)
}
- response, err := s.convertToPolicy(ctx, p)
+ response, err := convertToPolicy(p)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, err)
}
@@ -259,7 +259,7 @@ func extractPolicyTypeFromName(policyName string) (storepb.Policy_Type, error) {
// getDefaultRolloutPolicy returns the default rollout policy when no custom policy exists.
// Uses the shared store.GetDefaultRolloutPolicy to ensure consistency across API and store layers.
-func (*OrgPolicyService) getDefaultRolloutPolicy(_ context.Context, parent string, policyName string) (*v1pb.Policy, error) {
+func (*OrgPolicyService) getDefaultRolloutPolicy(parent string, policyName string) (*v1pb.Policy, error) {
resourceType, _, err := common.GetPolicyResourceTypeAndResource(parent)
if err != nil {
return nil, connect.NewError(connect.CodeInvalidArgument, err)
@@ -356,7 +356,7 @@ func (s *OrgPolicyService) createPolicyMessage(ctx context.Context, parent strin
return nil, connect.NewError(connect.CodeInvalidArgument, errors.Wrap(err, "invalid policy"))
}
- payloadStr, err := s.convertPolicyPayloadToString(ctx, policy)
+ payloadStr, err := s.convertPolicyPayloadToString(policy)
if err != nil {
return nil, err
}
@@ -376,7 +376,7 @@ func (s *OrgPolicyService) createPolicyMessage(ctx context.Context, parent strin
return nil, connect.NewError(connect.CodeInternal, err)
}
- response, err := s.convertToPolicy(ctx, p)
+ response, err := convertToPolicy(p)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, err)
}
@@ -447,7 +447,7 @@ func validatePolicyPayload(policyType storepb.Policy_Type, policy *v1pb.Policy)
return nil
}
-func (s *OrgPolicyService) convertPolicyPayloadToString(ctx context.Context, policy *v1pb.Policy) (string, error) {
+func (s *OrgPolicyService) convertPolicyPayloadToString(policy *v1pb.Policy) (string, error) {
switch policy.Type {
case v1pb.PolicyType_ROLLOUT_POLICY:
rolloutPolicy := convertToStorePBRolloutPolicy(policy.GetRolloutPolicy())
@@ -495,7 +495,7 @@ func (s *OrgPolicyService) convertPolicyPayloadToString(ctx context.Context, pol
if err := s.licenseService.IsFeatureEnabled(v1pb.PlanFeature_FEATURE_DATA_MASKING); err != nil {
return "", connect.NewError(connect.CodePermissionDenied, err)
}
- payload, err := s.convertToStorePBMaskingExemptionPolicyPayload(ctx, policy.GetMaskingExemptionPolicy())
+ payload, err := convertToStorePBMaskingExemptionPolicyPayload(policy.GetMaskingExemptionPolicy())
if err != nil {
return "", connect.NewError(connect.CodeInvalidArgument, err)
}
@@ -517,7 +517,7 @@ func (s *OrgPolicyService) convertPolicyPayloadToString(ctx context.Context, pol
return "", connect.NewError(connect.CodeInvalidArgument, errors.Errorf("invalid policy %v", policy.Type))
}
-func (s *OrgPolicyService) convertToPolicy(ctx context.Context, policyMessage *store.PolicyMessage) (*v1pb.Policy, error) {
+func convertToPolicy(policyMessage *store.PolicyMessage) (*v1pb.Policy, error) {
resourceType := v1pb.PolicyResourceType_RESOURCE_TYPE_UNSPECIFIED
switch policyMessage.ResourceType {
case storepb.Policy_WORKSPACE:
@@ -570,7 +570,7 @@ func (s *OrgPolicyService) convertToPolicy(ctx context.Context, policyMessage *s
if err := common.ProtojsonUnmarshaler.Unmarshal([]byte(policyMessage.Payload), maskingExemptionPolicy); err != nil {
return nil, errors.Wrap(err, "failed to unmarshal masking exemption policy")
}
- payload := s.convertToV1PBMaskingExemptionPolicyPayload(ctx, maskingExemptionPolicy)
+ payload := convertToV1PBMaskingExemptionPolicyPayload(maskingExemptionPolicy)
policy.Policy = &v1pb.Policy_MaskingExemptionPolicy{
MaskingExemptionPolicy: payload,
}
diff --git a/backend/api/v1/org_policy_service_converter.go b/backend/api/v1/org_policy_service_converter.go
index 6b51dd6b50..ad4a05a7a9 100644
--- a/backend/api/v1/org_policy_service_converter.go
+++ b/backend/api/v1/org_policy_service_converter.go
@@ -1,8 +1,6 @@
package v1
import (
- "context"
-
"github.com/pkg/errors"
"google.golang.org/genproto/googleapis/type/expr"
@@ -236,12 +234,12 @@ func convertToV1PBMaskingRulePolicy(policy *storepb.MaskingRulePolicy) *v1pb.Mas
}
}
-func (s *OrgPolicyService) convertToStorePBMaskingExemptionPolicyPayload(ctx context.Context, policy *v1pb.MaskingExemptionPolicy) (*storepb.MaskingExemptionPolicy, error) {
+func convertToStorePBMaskingExemptionPolicyPayload(policy *v1pb.MaskingExemptionPolicy) (*storepb.MaskingExemptionPolicy, error) {
var exemptions []*storepb.MaskingExemptionPolicy_Exemption
for _, exemption := range policy.Exemptions {
var members []string
for _, v1Member := range exemption.Members {
- member, err := convertToStoreIamPolicyMember(ctx, s.store, v1Member)
+ member, err := convertToStoreIamPolicyMember(v1Member)
if err != nil {
return nil, err
}
@@ -263,12 +261,12 @@ func (s *OrgPolicyService) convertToStorePBMaskingExemptionPolicyPayload(ctx con
}, nil
}
-func (s *OrgPolicyService) convertToV1PBMaskingExemptionPolicyPayload(ctx context.Context, policy *storepb.MaskingExemptionPolicy) *v1pb.MaskingExemptionPolicy {
+func convertToV1PBMaskingExemptionPolicyPayload(policy *storepb.MaskingExemptionPolicy) *v1pb.MaskingExemptionPolicy {
var exemptions []*v1pb.MaskingExemptionPolicy_Exemption
for _, exemption := range policy.Exemptions {
var members []string
for _, storeMember := range exemption.Members {
- memberInBinding := convertToV1MemberInBinding(ctx, s.store, storeMember)
+ memberInBinding := convertToV1MemberInBinding(storeMember)
if memberInBinding == "" {
continue
}
diff --git a/backend/api/v1/plan_service.go b/backend/api/v1/plan_service.go
index 60c697e03b..63e1d4fbef 100644
--- a/backend/api/v1/plan_service.go
+++ b/backend/api/v1/plan_service.go
@@ -156,7 +156,7 @@ func (s *PlanService) SearchPlans(ctx context.Context, request *connect.Request[
if projectID != "-" {
find.ProjectID = &projectID
}
- filterQ, err := s.store.GetListPlanFilter(ctx, req.Filter)
+ filterQ, err := store.GetListPlanFilter(req.Filter)
if err != nil {
return nil, connect.NewError(connect.CodeInvalidArgument, err)
}
diff --git a/backend/api/v1/project_service.go b/backend/api/v1/project_service.go
index f8a06fcbf6..bd2487f8e8 100644
--- a/backend/api/v1/project_service.go
+++ b/backend/api/v1/project_service.go
@@ -575,7 +575,7 @@ func (s *ProjectService) GetIamPolicy(ctx context.Context, req *connect.Request[
return nil, connect.NewError(connect.CodeInternal, err)
}
- iamPolicy, err := convertToV1IamPolicy(ctx, s.store, policy)
+ iamPolicy, err := convertToV1IamPolicy(policy)
if err != nil {
return nil, err
}
@@ -618,7 +618,7 @@ func (s *ProjectService) SetIamPolicy(ctx context.Context, req *connect.Request[
return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("IAM Policy must have at least one binding with %s", common.ProjectOwner))
}
- policy, err := convertToStoreIamPolicy(ctx, s.store, req.Msg.Policy)
+ policy, err := convertToStoreIamPolicy(req.Msg.Policy)
if err != nil {
return nil, err
}
@@ -653,7 +653,7 @@ func (s *ProjectService) SetIamPolicy(ctx context.Context, req *connect.Request[
setServiceData(p)
}
- iamPolicy, err := convertToV1IamPolicy(ctx, s.store, iamPolicyMessage)
+ iamPolicy, err := convertToV1IamPolicy(iamPolicyMessage)
if err != nil {
return nil, err
}
diff --git a/backend/api/v1/project_service_converter.go b/backend/api/v1/project_service_converter.go
index 5d88770928..70a5da6399 100644
--- a/backend/api/v1/project_service_converter.go
+++ b/backend/api/v1/project_service_converter.go
@@ -1,9 +1,7 @@
package v1
import (
- "context"
"fmt"
- "log/slog"
"strings"
"connectrpc.com/connect"
@@ -13,7 +11,6 @@ import (
"google.golang.org/protobuf/types/known/anypb"
"github.com/bytebase/bytebase/backend/common"
- "github.com/bytebase/bytebase/backend/common/log"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
v1pb "github.com/bytebase/bytebase/backend/generated-go/v1"
"github.com/bytebase/bytebase/backend/store"
@@ -159,33 +156,23 @@ func convertToV1WebhookType(tp storepb.WebhookType) v1pb.WebhookType {
}
}
-func convertToV1MemberInBinding(_ context.Context, _ *store.Store, member string) string {
+func convertToV1MemberInBinding(member string) string {
if strings.HasPrefix(member, common.UserNamePrefix) {
- email, err := common.GetUserEmail(member)
- if err != nil {
- slog.Error("failed to get user email from member", slog.String("member", member), log.BBError(err))
- return ""
- }
- return fmt.Sprintf("%s%s", common.UserBindingPrefix, email)
+ return common.UserBindingPrefix + strings.TrimPrefix(member, common.UserNamePrefix)
} else if strings.HasPrefix(member, common.GroupPrefix) {
- email, err := common.GetGroupEmail(member)
- if err != nil {
- slog.Error("failed to parse group email from member", slog.String("member", member), log.BBError(err))
- return ""
- }
- return fmt.Sprintf("%s%s", common.GroupBindingPrefix, email)
+ return common.GroupBindingPrefix + strings.TrimPrefix(member, common.GroupPrefix)
}
// handle allUsers.
return member
}
-func convertToV1IamPolicy(ctx context.Context, stores *store.Store, iamPolicy *store.IamPolicyMessage) (*v1pb.IamPolicy, error) {
+func convertToV1IamPolicy(iamPolicy *store.IamPolicyMessage) (*v1pb.IamPolicy, error) {
var bindings []*v1pb.Binding
for _, binding := range iamPolicy.Policy.Bindings {
var members []string
for _, member := range binding.Members {
- memberInBinding := convertToV1MemberInBinding(ctx, stores, member)
+ memberInBinding := convertToV1MemberInBinding(member)
if memberInBinding == "" {
continue
}
@@ -226,13 +213,13 @@ func convertToV1IamPolicy(ctx context.Context, stores *store.Store, iamPolicy *s
}, nil
}
-func convertToStoreIamPolicy(ctx context.Context, stores *store.Store, iamPolicy *v1pb.IamPolicy) (*storepb.IamPolicy, error) {
+func convertToStoreIamPolicy(iamPolicy *v1pb.IamPolicy) (*storepb.IamPolicy, error) {
var bindings []*storepb.Binding
for _, binding := range iamPolicy.Bindings {
var members []string
for _, member := range utils.Uniq(binding.Members) {
- storeMember, err := convertToStoreIamPolicyMember(ctx, stores, member)
+ storeMember, err := convertToStoreIamPolicyMember(member)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to convert iam member with error"))
}
@@ -262,17 +249,10 @@ func convertToStoreIamPolicy(ctx context.Context, stores *store.Store, iamPolicy
}, nil
}
-func convertToStoreIamPolicyMember(ctx context.Context, stores *store.Store, member string) (string, error) {
+func convertToStoreIamPolicyMember(member string) (string, error) {
if strings.HasPrefix(member, common.UserBindingPrefix) {
email := strings.TrimPrefix(member, common.UserBindingPrefix)
- user, err := stores.GetUserByEmail(ctx, email)
- if err != nil {
- return "", connect.NewError(connect.CodeInternal, err)
- }
- if user == nil {
- return "", connect.NewError(connect.CodeNotFound, errors.Errorf("user %q not found", member))
- }
- return common.FormatUserEmail(user.Email), nil
+ return common.FormatUserEmail(email), nil
} else if strings.HasPrefix(member, common.GroupBindingPrefix) {
email := strings.TrimPrefix(member, common.GroupBindingPrefix)
return common.FormatGroupEmail(email), nil
diff --git a/backend/api/v1/rollout_service.go b/backend/api/v1/rollout_service.go
index 699d82c3b0..37a688f500 100644
--- a/backend/api/v1/rollout_service.go
+++ b/backend/api/v1/rollout_service.go
@@ -148,7 +148,7 @@ func (s *RolloutService) ListRollouts(ctx context.Context, req *connect.Request[
Offset: &offset.offset,
HasRollout: &hasRollout,
}
- if err := s.buildRolloutFindWithFilter(ctx, findPlan, request.Filter); err != nil {
+ if err := buildRolloutFindWithFilter(findPlan, request.Filter); err != nil {
return nil, err
}
plans, err := s.store.ListPlans(ctx, findPlan)
@@ -185,12 +185,12 @@ func (s *RolloutService) ListRollouts(ctx context.Context, req *connect.Request[
}
// buildRolloutFindWithFilter builds the filter for rollout find.
-func (s *RolloutService) buildRolloutFindWithFilter(ctx context.Context, planFind *store.FindPlanMessage, filter string) error {
+func buildRolloutFindWithFilter(planFind *store.FindPlanMessage, filter string) error {
if filter == "" {
return nil
}
- filterQ, err := s.store.GetListRolloutFilter(ctx, filter)
+ filterQ, err := store.GetListRolloutFilter(filter)
if err != nil {
return connect.NewError(connect.CodeInvalidArgument, err)
}
diff --git a/backend/api/v1/workspace_service.go b/backend/api/v1/workspace_service.go
index 7fcd28a725..16ac40d083 100644
--- a/backend/api/v1/workspace_service.go
+++ b/backend/api/v1/workspace_service.go
@@ -38,7 +38,7 @@ func (s *WorkspaceService) GetIamPolicy(ctx context.Context, _ *connect.Request[
return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to find iam policy"))
}
- v1Policy, err := convertToV1IamPolicy(ctx, s.store, policy)
+ v1Policy, err := convertToV1IamPolicy(policy)
if err != nil {
return nil, err
}
@@ -60,7 +60,7 @@ func (s *WorkspaceService) SetIamPolicy(ctx context.Context, req *connect.Reques
return nil, err
}
- iamPolicy, err := convertToStoreIamPolicy(ctx, s.store, request.Policy)
+ iamPolicy, err := convertToStoreIamPolicy(request.Policy)
if err != nil {
return nil, err
}
@@ -102,7 +102,7 @@ func (s *WorkspaceService) SetIamPolicy(ctx context.Context, req *connect.Reques
setServiceData(p)
}
- v1Policy, err := convertToV1IamPolicy(ctx, s.store, policy)
+ v1Policy, err := convertToV1IamPolicy(policy)
if err != nil {
return nil, err
}
diff --git a/backend/generated-go/v1/instance_role_service.pb.go b/backend/generated-go/v1/instance_role_service.pb.go
index 899927bd69..45f7c161c4 100644
--- a/backend/generated-go/v1/instance_role_service.pb.go
+++ b/backend/generated-go/v1/instance_role_service.pb.go
@@ -22,53 +22,6 @@ const (
_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
)
-type GetInstanceRoleRequest struct {
- state protoimpl.MessageState `protogen:"open.v1"`
- // The name of the role to retrieve.
- // Format: instances/{instance}/roles/{role name}
- // The role name is the unique name for the role.
- Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
- unknownFields protoimpl.UnknownFields
- sizeCache protoimpl.SizeCache
-}
-
-func (x *GetInstanceRoleRequest) Reset() {
- *x = GetInstanceRoleRequest{}
- mi := &file_v1_instance_role_service_proto_msgTypes[0]
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- ms.StoreMessageInfo(mi)
-}
-
-func (x *GetInstanceRoleRequest) String() string {
- return protoimpl.X.MessageStringOf(x)
-}
-
-func (*GetInstanceRoleRequest) ProtoMessage() {}
-
-func (x *GetInstanceRoleRequest) ProtoReflect() protoreflect.Message {
- mi := &file_v1_instance_role_service_proto_msgTypes[0]
- if x != nil {
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- if ms.LoadMessageInfo() == nil {
- ms.StoreMessageInfo(mi)
- }
- return ms
- }
- return mi.MessageOf(x)
-}
-
-// Deprecated: Use GetInstanceRoleRequest.ProtoReflect.Descriptor instead.
-func (*GetInstanceRoleRequest) Descriptor() ([]byte, []int) {
- return file_v1_instance_role_service_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *GetInstanceRoleRequest) GetName() string {
- if x != nil {
- return x.Name
- }
- return ""
-}
-
type ListInstanceRolesRequest struct {
state protoimpl.MessageState `protogen:"open.v1"`
// The parent, which owns this collection of roles.
@@ -95,7 +48,7 @@ type ListInstanceRolesRequest struct {
func (x *ListInstanceRolesRequest) Reset() {
*x = ListInstanceRolesRequest{}
- mi := &file_v1_instance_role_service_proto_msgTypes[1]
+ mi := &file_v1_instance_role_service_proto_msgTypes[0]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -107,7 +60,7 @@ func (x *ListInstanceRolesRequest) String() string {
func (*ListInstanceRolesRequest) ProtoMessage() {}
func (x *ListInstanceRolesRequest) ProtoReflect() protoreflect.Message {
- mi := &file_v1_instance_role_service_proto_msgTypes[1]
+ mi := &file_v1_instance_role_service_proto_msgTypes[0]
if x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -120,7 +73,7 @@ func (x *ListInstanceRolesRequest) ProtoReflect() protoreflect.Message {
// Deprecated: Use ListInstanceRolesRequest.ProtoReflect.Descriptor instead.
func (*ListInstanceRolesRequest) Descriptor() ([]byte, []int) {
- return file_v1_instance_role_service_proto_rawDescGZIP(), []int{1}
+ return file_v1_instance_role_service_proto_rawDescGZIP(), []int{0}
}
func (x *ListInstanceRolesRequest) GetParent() string {
@@ -164,7 +117,7 @@ type ListInstanceRolesResponse struct {
func (x *ListInstanceRolesResponse) Reset() {
*x = ListInstanceRolesResponse{}
- mi := &file_v1_instance_role_service_proto_msgTypes[2]
+ mi := &file_v1_instance_role_service_proto_msgTypes[1]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -176,7 +129,7 @@ func (x *ListInstanceRolesResponse) String() string {
func (*ListInstanceRolesResponse) ProtoMessage() {}
func (x *ListInstanceRolesResponse) ProtoReflect() protoreflect.Message {
- mi := &file_v1_instance_role_service_proto_msgTypes[2]
+ mi := &file_v1_instance_role_service_proto_msgTypes[1]
if x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -189,7 +142,7 @@ func (x *ListInstanceRolesResponse) ProtoReflect() protoreflect.Message {
// Deprecated: Use ListInstanceRolesResponse.ProtoReflect.Descriptor instead.
func (*ListInstanceRolesResponse) Descriptor() ([]byte, []int) {
- return file_v1_instance_role_service_proto_rawDescGZIP(), []int{2}
+ return file_v1_instance_role_service_proto_rawDescGZIP(), []int{1}
}
func (x *ListInstanceRolesResponse) GetRoles() []*InstanceRole {
@@ -231,7 +184,7 @@ type InstanceRole struct {
func (x *InstanceRole) Reset() {
*x = InstanceRole{}
- mi := &file_v1_instance_role_service_proto_msgTypes[3]
+ mi := &file_v1_instance_role_service_proto_msgTypes[2]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -243,7 +196,7 @@ func (x *InstanceRole) String() string {
func (*InstanceRole) ProtoMessage() {}
func (x *InstanceRole) ProtoReflect() protoreflect.Message {
- mi := &file_v1_instance_role_service_proto_msgTypes[3]
+ mi := &file_v1_instance_role_service_proto_msgTypes[2]
if x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -256,7 +209,7 @@ func (x *InstanceRole) ProtoReflect() protoreflect.Message {
// Deprecated: Use InstanceRole.ProtoReflect.Descriptor instead.
func (*InstanceRole) Descriptor() ([]byte, []int) {
- return file_v1_instance_role_service_proto_rawDescGZIP(), []int{3}
+ return file_v1_instance_role_service_proto_rawDescGZIP(), []int{2}
}
func (x *InstanceRole) GetName() string {
@@ -305,10 +258,7 @@ var File_v1_instance_role_service_proto protoreflect.FileDescriptor
const file_v1_instance_role_service_proto_rawDesc = "" +
"\n" +
- "\x1ev1/instance_role_service.proto\x12\vbytebase.v1\x1a\x1cgoogle/api/annotations.proto\x1a\x17google/api/client.proto\x1a\x1fgoogle/api/field_behavior.proto\x1a\x19google/api/resource.proto\x1a\x13v1/annotation.proto\"O\n" +
- "\x16GetInstanceRoleRequest\x125\n" +
- "\x04name\x18\x01 \x01(\tB!\xe0A\x02\xfaA\x1b\n" +
- "\x19bytebase.com/InstanceRoleR\x04name\"\xa7\x01\n" +
+ "\x1ev1/instance_role_service.proto\x12\vbytebase.v1\x1a\x1cgoogle/api/annotations.proto\x1a\x17google/api/client.proto\x1a\x1fgoogle/api/field_behavior.proto\x1a\x19google/api/resource.proto\x1a\x13v1/annotation.proto\"\xa7\x01\n" +
"\x18ListInstanceRolesRequest\x125\n" +
"\x06parent\x18\x01 \x01(\tB\x1d\xe0A\x02\xfaA\x17\n" +
"\x15bytebase.com/InstanceR\x06parent\x12\x1b\n" +
@@ -332,9 +282,8 @@ const file_v1_instance_role_service_proto_rawDesc = "" +
"\x11_connection_limitB\x0e\n" +
"\f_valid_untilB\f\n" +
"\n" +
- "_attribute2\xe7\x02\n" +
- "\x13InstanceRoleService\x12\x9c\x01\n" +
- "\x0fGetInstanceRole\x12#.bytebase.v1.GetInstanceRoleRequest\x1a\x19.bytebase.v1.InstanceRole\"I\xdaA\x04name\x8a\xea0\x14bb.instanceRoles.get\x90\xea0\x01\x82\xd3\xe4\x93\x02 \x12\x1e/v1/{name=instances/*/roles/*}\x12\xb0\x01\n" +
+ "_attribute2\xc8\x01\n" +
+ "\x13InstanceRoleService\x12\xb0\x01\n" +
"\x11ListInstanceRoles\x12%.bytebase.v1.ListInstanceRolesRequest\x1a&.bytebase.v1.ListInstanceRolesResponse\"L\xdaA\x06parent\x8a\xea0\x15bb.instanceRoles.list\x90\xea0\x01\x82\xd3\xe4\x93\x02 \x12\x1e/v1/{parent=instances/*}/rolesB\xae\x01\n" +
"\x0fcom.bytebase.v1B\x18InstanceRoleServiceProtoP\x01Z4github.com/bytebase/bytebase/backend/generated-go/v1\xa2\x02\x03BXX\xaa\x02\vBytebase.V1\xca\x02\vBytebase\\V1\xe2\x02\x17Bytebase\\V1\\GPBMetadata\xea\x02\fBytebase::V1b\x06proto3"
@@ -350,21 +299,18 @@ func file_v1_instance_role_service_proto_rawDescGZIP() []byte {
return file_v1_instance_role_service_proto_rawDescData
}
-var file_v1_instance_role_service_proto_msgTypes = make([]protoimpl.MessageInfo, 4)
+var file_v1_instance_role_service_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
var file_v1_instance_role_service_proto_goTypes = []any{
- (*GetInstanceRoleRequest)(nil), // 0: bytebase.v1.GetInstanceRoleRequest
- (*ListInstanceRolesRequest)(nil), // 1: bytebase.v1.ListInstanceRolesRequest
- (*ListInstanceRolesResponse)(nil), // 2: bytebase.v1.ListInstanceRolesResponse
- (*InstanceRole)(nil), // 3: bytebase.v1.InstanceRole
+ (*ListInstanceRolesRequest)(nil), // 0: bytebase.v1.ListInstanceRolesRequest
+ (*ListInstanceRolesResponse)(nil), // 1: bytebase.v1.ListInstanceRolesResponse
+ (*InstanceRole)(nil), // 2: bytebase.v1.InstanceRole
}
var file_v1_instance_role_service_proto_depIdxs = []int32{
- 3, // 0: bytebase.v1.ListInstanceRolesResponse.roles:type_name -> bytebase.v1.InstanceRole
- 0, // 1: bytebase.v1.InstanceRoleService.GetInstanceRole:input_type -> bytebase.v1.GetInstanceRoleRequest
- 1, // 2: bytebase.v1.InstanceRoleService.ListInstanceRoles:input_type -> bytebase.v1.ListInstanceRolesRequest
- 3, // 3: bytebase.v1.InstanceRoleService.GetInstanceRole:output_type -> bytebase.v1.InstanceRole
- 2, // 4: bytebase.v1.InstanceRoleService.ListInstanceRoles:output_type -> bytebase.v1.ListInstanceRolesResponse
- 3, // [3:5] is the sub-list for method output_type
- 1, // [1:3] is the sub-list for method input_type
+ 2, // 0: bytebase.v1.ListInstanceRolesResponse.roles:type_name -> bytebase.v1.InstanceRole
+ 0, // 1: bytebase.v1.InstanceRoleService.ListInstanceRoles:input_type -> bytebase.v1.ListInstanceRolesRequest
+ 1, // 2: bytebase.v1.InstanceRoleService.ListInstanceRoles:output_type -> bytebase.v1.ListInstanceRolesResponse
+ 2, // [2:3] is the sub-list for method output_type
+ 1, // [1:2] is the sub-list for method input_type
1, // [1:1] is the sub-list for extension type_name
1, // [1:1] is the sub-list for extension extendee
0, // [0:1] is the sub-list for field type_name
@@ -376,14 +322,14 @@ func file_v1_instance_role_service_proto_init() {
return
}
file_v1_annotation_proto_init()
- file_v1_instance_role_service_proto_msgTypes[3].OneofWrappers = []any{}
+ file_v1_instance_role_service_proto_msgTypes[2].OneofWrappers = []any{}
type x struct{}
out := protoimpl.TypeBuilder{
File: protoimpl.DescBuilder{
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: unsafe.Slice(unsafe.StringData(file_v1_instance_role_service_proto_rawDesc), len(file_v1_instance_role_service_proto_rawDesc)),
NumEnums: 0,
- NumMessages: 4,
+ NumMessages: 3,
NumExtensions: 0,
NumServices: 1,
},
diff --git a/backend/generated-go/v1/instance_role_service.pb.gw.go b/backend/generated-go/v1/instance_role_service.pb.gw.go
index 811bfe6023..df39108d6c 100644
--- a/backend/generated-go/v1/instance_role_service.pb.gw.go
+++ b/backend/generated-go/v1/instance_role_service.pb.gw.go
@@ -35,45 +35,6 @@ var (
_ = metadata.Join
)
-func request_InstanceRoleService_GetInstanceRole_0(ctx context.Context, marshaler runtime.Marshaler, client InstanceRoleServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
- var (
- protoReq GetInstanceRoleRequest
- metadata runtime.ServerMetadata
- err error
- )
- if req.Body != nil {
- _, _ = io.Copy(io.Discard, req.Body)
- }
- val, ok := pathParams["name"]
- if !ok {
- return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name")
- }
- protoReq.Name, err = runtime.String(val)
- if err != nil {
- return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)
- }
- msg, err := client.GetInstanceRole(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
- return msg, metadata, err
-}
-
-func local_request_InstanceRoleService_GetInstanceRole_0(ctx context.Context, marshaler runtime.Marshaler, server InstanceRoleServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
- var (
- protoReq GetInstanceRoleRequest
- metadata runtime.ServerMetadata
- err error
- )
- val, ok := pathParams["name"]
- if !ok {
- return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name")
- }
- protoReq.Name, err = runtime.String(val)
- if err != nil {
- return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)
- }
- msg, err := server.GetInstanceRole(ctx, &protoReq)
- return msg, metadata, err
-}
-
var filter_InstanceRoleService_ListInstanceRoles_0 = &utilities.DoubleArray{Encoding: map[string]int{"parent": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}}
func request_InstanceRoleService_ListInstanceRoles_0(ctx context.Context, marshaler runtime.Marshaler, client InstanceRoleServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -133,26 +94,6 @@ func local_request_InstanceRoleService_ListInstanceRoles_0(ctx context.Context,
// Note that using this registration option will cause many gRPC library features to stop working. Consider using RegisterInstanceRoleServiceHandlerFromEndpoint instead.
// GRPC interceptors will not work for this type of registration. To use interceptors, you must use the "runtime.WithMiddlewares" option in the "runtime.NewServeMux" call.
func RegisterInstanceRoleServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux, server InstanceRoleServiceServer) error {
- mux.Handle(http.MethodGet, pattern_InstanceRoleService_GetInstanceRole_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
- ctx, cancel := context.WithCancel(req.Context())
- defer cancel()
- var stream runtime.ServerTransportStream
- ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
- inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
- annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.InstanceRoleService/GetInstanceRole", runtime.WithHTTPPathPattern("/v1/{name=instances/*/roles/*}"))
- if err != nil {
- runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
- return
- }
- resp, md, err := local_request_InstanceRoleService_GetInstanceRole_0(annotatedContext, inboundMarshaler, server, req, pathParams)
- md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())
- annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)
- if err != nil {
- runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
- return
- }
- forward_InstanceRoleService_GetInstanceRole_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
- })
mux.Handle(http.MethodGet, pattern_InstanceRoleService_ListInstanceRoles_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
ctx, cancel := context.WithCancel(req.Context())
defer cancel()
@@ -213,23 +154,6 @@ func RegisterInstanceRoleServiceHandler(ctx context.Context, mux *runtime.ServeM
// doesn't go through the normal gRPC flow (creating a gRPC client etc.) then it will be up to the passed in
// "InstanceRoleServiceClient" to call the correct interceptors. This client ignores the HTTP middlewares.
func RegisterInstanceRoleServiceHandlerClient(ctx context.Context, mux *runtime.ServeMux, client InstanceRoleServiceClient) error {
- mux.Handle(http.MethodGet, pattern_InstanceRoleService_GetInstanceRole_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
- ctx, cancel := context.WithCancel(req.Context())
- defer cancel()
- inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
- annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/bytebase.v1.InstanceRoleService/GetInstanceRole", runtime.WithHTTPPathPattern("/v1/{name=instances/*/roles/*}"))
- if err != nil {
- runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
- return
- }
- resp, md, err := request_InstanceRoleService_GetInstanceRole_0(annotatedContext, inboundMarshaler, client, req, pathParams)
- annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)
- if err != nil {
- runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
- return
- }
- forward_InstanceRoleService_GetInstanceRole_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
- })
mux.Handle(http.MethodGet, pattern_InstanceRoleService_ListInstanceRoles_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
ctx, cancel := context.WithCancel(req.Context())
defer cancel()
@@ -251,11 +175,9 @@ func RegisterInstanceRoleServiceHandlerClient(ctx context.Context, mux *runtime.
}
var (
- pattern_InstanceRoleService_GetInstanceRole_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 2, 2, 1, 0, 4, 4, 5, 3}, []string{"v1", "instances", "roles", "name"}, ""))
pattern_InstanceRoleService_ListInstanceRoles_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 2, 5, 2, 2, 3}, []string{"v1", "instances", "parent", "roles"}, ""))
)
var (
- forward_InstanceRoleService_GetInstanceRole_0 = runtime.ForwardResponseMessage
forward_InstanceRoleService_ListInstanceRoles_0 = runtime.ForwardResponseMessage
)
diff --git a/backend/generated-go/v1/instance_role_service_equal.pb.go b/backend/generated-go/v1/instance_role_service_equal.pb.go
index c9798e536d..ea9f8bfdb9 100644
--- a/backend/generated-go/v1/instance_role_service_equal.pb.go
+++ b/backend/generated-go/v1/instance_role_service_equal.pb.go
@@ -3,19 +3,6 @@
package v1
-func (x *GetInstanceRoleRequest) Equal(y *GetInstanceRoleRequest) bool {
- if x == y {
- return true
- }
- if x == nil || y == nil {
- return x == nil && y == nil
- }
- if x.Name != y.Name {
- return false
- }
- return true
-}
-
func (x *ListInstanceRolesRequest) Equal(y *ListInstanceRolesRequest) bool {
if x == y {
return true
diff --git a/backend/generated-go/v1/instance_role_service_grpc.pb.go b/backend/generated-go/v1/instance_role_service_grpc.pb.go
index 54f42be7ea..b8954a22d4 100644
--- a/backend/generated-go/v1/instance_role_service_grpc.pb.go
+++ b/backend/generated-go/v1/instance_role_service_grpc.pb.go
@@ -19,7 +19,6 @@ import (
const _ = grpc.SupportPackageIsVersion9
const (
- InstanceRoleService_GetInstanceRole_FullMethodName = "/bytebase.v1.InstanceRoleService/GetInstanceRole"
InstanceRoleService_ListInstanceRoles_FullMethodName = "/bytebase.v1.InstanceRoleService/ListInstanceRoles"
)
@@ -29,9 +28,6 @@ const (
//
// InstanceRoleService manages database roles within instances.
type InstanceRoleServiceClient interface {
- // Gets a database role from an instance.
- // Permissions required: bb.instanceRoles.get
- GetInstanceRole(ctx context.Context, in *GetInstanceRoleRequest, opts ...grpc.CallOption) (*InstanceRole, error)
// Lists all database roles in an instance.
// Permissions required: bb.instanceRoles.list
ListInstanceRoles(ctx context.Context, in *ListInstanceRolesRequest, opts ...grpc.CallOption) (*ListInstanceRolesResponse, error)
@@ -45,16 +41,6 @@ func NewInstanceRoleServiceClient(cc grpc.ClientConnInterface) InstanceRoleServi
return &instanceRoleServiceClient{cc}
}
-func (c *instanceRoleServiceClient) GetInstanceRole(ctx context.Context, in *GetInstanceRoleRequest, opts ...grpc.CallOption) (*InstanceRole, error) {
- cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
- out := new(InstanceRole)
- err := c.cc.Invoke(ctx, InstanceRoleService_GetInstanceRole_FullMethodName, in, out, cOpts...)
- if err != nil {
- return nil, err
- }
- return out, nil
-}
-
func (c *instanceRoleServiceClient) ListInstanceRoles(ctx context.Context, in *ListInstanceRolesRequest, opts ...grpc.CallOption) (*ListInstanceRolesResponse, error) {
cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
out := new(ListInstanceRolesResponse)
@@ -71,9 +57,6 @@ func (c *instanceRoleServiceClient) ListInstanceRoles(ctx context.Context, in *L
//
// InstanceRoleService manages database roles within instances.
type InstanceRoleServiceServer interface {
- // Gets a database role from an instance.
- // Permissions required: bb.instanceRoles.get
- GetInstanceRole(context.Context, *GetInstanceRoleRequest) (*InstanceRole, error)
// Lists all database roles in an instance.
// Permissions required: bb.instanceRoles.list
ListInstanceRoles(context.Context, *ListInstanceRolesRequest) (*ListInstanceRolesResponse, error)
@@ -87,9 +70,6 @@ type InstanceRoleServiceServer interface {
// pointer dereference when methods are called.
type UnimplementedInstanceRoleServiceServer struct{}
-func (UnimplementedInstanceRoleServiceServer) GetInstanceRole(context.Context, *GetInstanceRoleRequest) (*InstanceRole, error) {
- return nil, status.Error(codes.Unimplemented, "method GetInstanceRole not implemented")
-}
func (UnimplementedInstanceRoleServiceServer) ListInstanceRoles(context.Context, *ListInstanceRolesRequest) (*ListInstanceRolesResponse, error) {
return nil, status.Error(codes.Unimplemented, "method ListInstanceRoles not implemented")
}
@@ -114,24 +94,6 @@ func RegisterInstanceRoleServiceServer(s grpc.ServiceRegistrar, srv InstanceRole
s.RegisterService(&InstanceRoleService_ServiceDesc, srv)
}
-func _InstanceRoleService_GetInstanceRole_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
- in := new(GetInstanceRoleRequest)
- if err := dec(in); err != nil {
- return nil, err
- }
- if interceptor == nil {
- return srv.(InstanceRoleServiceServer).GetInstanceRole(ctx, in)
- }
- info := &grpc.UnaryServerInfo{
- Server: srv,
- FullMethod: InstanceRoleService_GetInstanceRole_FullMethodName,
- }
- handler := func(ctx context.Context, req interface{}) (interface{}, error) {
- return srv.(InstanceRoleServiceServer).GetInstanceRole(ctx, req.(*GetInstanceRoleRequest))
- }
- return interceptor(ctx, in, info, handler)
-}
-
func _InstanceRoleService_ListInstanceRoles_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
in := new(ListInstanceRolesRequest)
if err := dec(in); err != nil {
@@ -157,10 +119,6 @@ var InstanceRoleService_ServiceDesc = grpc.ServiceDesc{
ServiceName: "bytebase.v1.InstanceRoleService",
HandlerType: (*InstanceRoleServiceServer)(nil),
Methods: []grpc.MethodDesc{
- {
- MethodName: "GetInstanceRole",
- Handler: _InstanceRoleService_GetInstanceRole_Handler,
- },
{
MethodName: "ListInstanceRoles",
Handler: _InstanceRoleService_ListInstanceRoles_Handler,
diff --git a/backend/generated-go/v1/v1connect/instance_role_service.connect.go b/backend/generated-go/v1/v1connect/instance_role_service.connect.go
index d9f3c8e8b5..dd8c631b42 100644
--- a/backend/generated-go/v1/v1connect/instance_role_service.connect.go
+++ b/backend/generated-go/v1/v1connect/instance_role_service.connect.go
@@ -33,9 +33,6 @@ const (
// reflection-formatted method names, remove the leading slash and convert the remaining slash to a
// period.
const (
- // InstanceRoleServiceGetInstanceRoleProcedure is the fully-qualified name of the
- // InstanceRoleService's GetInstanceRole RPC.
- InstanceRoleServiceGetInstanceRoleProcedure = "/bytebase.v1.InstanceRoleService/GetInstanceRole"
// InstanceRoleServiceListInstanceRolesProcedure is the fully-qualified name of the
// InstanceRoleService's ListInstanceRoles RPC.
InstanceRoleServiceListInstanceRolesProcedure = "/bytebase.v1.InstanceRoleService/ListInstanceRoles"
@@ -43,9 +40,6 @@ const (
// InstanceRoleServiceClient is a client for the bytebase.v1.InstanceRoleService service.
type InstanceRoleServiceClient interface {
- // Gets a database role from an instance.
- // Permissions required: bb.instanceRoles.get
- GetInstanceRole(context.Context, *connect.Request[v1.GetInstanceRoleRequest]) (*connect.Response[v1.InstanceRole], error)
// Lists all database roles in an instance.
// Permissions required: bb.instanceRoles.list
ListInstanceRoles(context.Context, *connect.Request[v1.ListInstanceRolesRequest]) (*connect.Response[v1.ListInstanceRolesResponse], error)
@@ -62,12 +56,6 @@ func NewInstanceRoleServiceClient(httpClient connect.HTTPClient, baseURL string,
baseURL = strings.TrimRight(baseURL, "/")
instanceRoleServiceMethods := v1.File_v1_instance_role_service_proto.Services().ByName("InstanceRoleService").Methods()
return &instanceRoleServiceClient{
- getInstanceRole: connect.NewClient[v1.GetInstanceRoleRequest, v1.InstanceRole](
- httpClient,
- baseURL+InstanceRoleServiceGetInstanceRoleProcedure,
- connect.WithSchema(instanceRoleServiceMethods.ByName("GetInstanceRole")),
- connect.WithClientOptions(opts...),
- ),
listInstanceRoles: connect.NewClient[v1.ListInstanceRolesRequest, v1.ListInstanceRolesResponse](
httpClient,
baseURL+InstanceRoleServiceListInstanceRolesProcedure,
@@ -79,15 +67,9 @@ func NewInstanceRoleServiceClient(httpClient connect.HTTPClient, baseURL string,
// instanceRoleServiceClient implements InstanceRoleServiceClient.
type instanceRoleServiceClient struct {
- getInstanceRole *connect.Client[v1.GetInstanceRoleRequest, v1.InstanceRole]
listInstanceRoles *connect.Client[v1.ListInstanceRolesRequest, v1.ListInstanceRolesResponse]
}
-// GetInstanceRole calls bytebase.v1.InstanceRoleService.GetInstanceRole.
-func (c *instanceRoleServiceClient) GetInstanceRole(ctx context.Context, req *connect.Request[v1.GetInstanceRoleRequest]) (*connect.Response[v1.InstanceRole], error) {
- return c.getInstanceRole.CallUnary(ctx, req)
-}
-
// ListInstanceRoles calls bytebase.v1.InstanceRoleService.ListInstanceRoles.
func (c *instanceRoleServiceClient) ListInstanceRoles(ctx context.Context, req *connect.Request[v1.ListInstanceRolesRequest]) (*connect.Response[v1.ListInstanceRolesResponse], error) {
return c.listInstanceRoles.CallUnary(ctx, req)
@@ -95,9 +77,6 @@ func (c *instanceRoleServiceClient) ListInstanceRoles(ctx context.Context, req *
// InstanceRoleServiceHandler is an implementation of the bytebase.v1.InstanceRoleService service.
type InstanceRoleServiceHandler interface {
- // Gets a database role from an instance.
- // Permissions required: bb.instanceRoles.get
- GetInstanceRole(context.Context, *connect.Request[v1.GetInstanceRoleRequest]) (*connect.Response[v1.InstanceRole], error)
// Lists all database roles in an instance.
// Permissions required: bb.instanceRoles.list
ListInstanceRoles(context.Context, *connect.Request[v1.ListInstanceRolesRequest]) (*connect.Response[v1.ListInstanceRolesResponse], error)
@@ -110,12 +89,6 @@ type InstanceRoleServiceHandler interface {
// and JSON codecs. They also support gzip compression.
func NewInstanceRoleServiceHandler(svc InstanceRoleServiceHandler, opts ...connect.HandlerOption) (string, http.Handler) {
instanceRoleServiceMethods := v1.File_v1_instance_role_service_proto.Services().ByName("InstanceRoleService").Methods()
- instanceRoleServiceGetInstanceRoleHandler := connect.NewUnaryHandler(
- InstanceRoleServiceGetInstanceRoleProcedure,
- svc.GetInstanceRole,
- connect.WithSchema(instanceRoleServiceMethods.ByName("GetInstanceRole")),
- connect.WithHandlerOptions(opts...),
- )
instanceRoleServiceListInstanceRolesHandler := connect.NewUnaryHandler(
InstanceRoleServiceListInstanceRolesProcedure,
svc.ListInstanceRoles,
@@ -124,8 +97,6 @@ func NewInstanceRoleServiceHandler(svc InstanceRoleServiceHandler, opts ...conne
)
return "/bytebase.v1.InstanceRoleService/", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
switch r.URL.Path {
- case InstanceRoleServiceGetInstanceRoleProcedure:
- instanceRoleServiceGetInstanceRoleHandler.ServeHTTP(w, r)
case InstanceRoleServiceListInstanceRolesProcedure:
instanceRoleServiceListInstanceRolesHandler.ServeHTTP(w, r)
default:
@@ -137,10 +108,6 @@ func NewInstanceRoleServiceHandler(svc InstanceRoleServiceHandler, opts ...conne
// UnimplementedInstanceRoleServiceHandler returns CodeUnimplemented from all methods.
type UnimplementedInstanceRoleServiceHandler struct{}
-func (UnimplementedInstanceRoleServiceHandler) GetInstanceRole(context.Context, *connect.Request[v1.GetInstanceRoleRequest]) (*connect.Response[v1.InstanceRole], error) {
- return nil, connect.NewError(connect.CodeUnimplemented, errors.New("bytebase.v1.InstanceRoleService.GetInstanceRole is not implemented"))
-}
-
func (UnimplementedInstanceRoleServiceHandler) ListInstanceRoles(context.Context, *connect.Request[v1.ListInstanceRolesRequest]) (*connect.Response[v1.ListInstanceRolesResponse], error) {
return nil, connect.NewError(connect.CodeUnimplemented, errors.New("bytebase.v1.InstanceRoleService.ListInstanceRoles is not implemented"))
}
diff --git a/backend/runner/taskrun/rollout_creator.go b/backend/runner/taskrun/rollout_creator.go
index 4e2cefa4c3..246cc87c0a 100644
--- a/backend/runner/taskrun/rollout_creator.go
+++ b/backend/runner/taskrun/rollout_creator.go
@@ -4,7 +4,6 @@ import (
"context"
"log/slog"
"sync"
- "time"
"google.golang.org/protobuf/proto"
@@ -48,12 +47,8 @@ func (rc *RolloutCreator) Run(ctx context.Context, wg *sync.WaitGroup, rolloutCr
}
// tryCreateRollout attempts to create a rollout for the given plan.
-func (rc *RolloutCreator) tryCreateRollout(_ context.Context, planID int64) {
- // Use background context with timeout to avoid being affected by request cancellation
- rolloutCtx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
- defer cancel()
-
- plan, err := rc.store.GetPlan(rolloutCtx, &store.FindPlanMessage{UID: &planID})
+func (rc *RolloutCreator) tryCreateRollout(ctx context.Context, planID int64) {
+ plan, err := rc.store.GetPlan(ctx, &store.FindPlanMessage{UID: &planID})
if err != nil {
slog.Error("failed to get plan for rollout creation",
slog.Int("plan_id", int(planID)),
@@ -72,7 +67,7 @@ func (rc *RolloutCreator) tryCreateRollout(_ context.Context, planID int64) {
return
}
- issue, err := rc.store.GetIssue(rolloutCtx, &store.FindIssueMessage{PlanUID: &planID})
+ issue, err := rc.store.GetIssue(ctx, &store.FindIssueMessage{PlanUID: &planID})
if err != nil {
slog.Error("failed to get issue for rollout creation",
slog.Int("plan_id", int(planID)),
@@ -84,7 +79,7 @@ func (rc *RolloutCreator) tryCreateRollout(_ context.Context, planID int64) {
return
}
- project, err := rc.store.GetProject(rolloutCtx, &store.FindProjectMessage{ResourceID: &plan.ProjectID})
+ project, err := rc.store.GetProject(ctx, &store.FindProjectMessage{ResourceID: &plan.ProjectID})
if err != nil {
slog.Error("failed to get project for rollout creation",
slog.String("project_id", plan.ProjectID),
@@ -111,7 +106,7 @@ func (rc *RolloutCreator) tryCreateRollout(_ context.Context, planID int64) {
}
// Check plan check status (must have no errors)
- planCheckRun, err := rc.store.GetPlanCheckRun(rolloutCtx, planID)
+ planCheckRun, err := rc.store.GetPlanCheckRun(ctx, planID)
if err != nil {
slog.Error("failed to get plan check run for rollout creation",
slog.Int("plan_id", int(planID)),
@@ -145,7 +140,7 @@ func (rc *RolloutCreator) tryCreateRollout(_ context.Context, planID int64) {
slog.Info("auto-creating rollout", slog.Int("plan_id", int(planID)))
// Get pipeline create (tasks to create)
- pipelineCreate, err := apiv1.GetPipelineCreate(rolloutCtx, rc.store, plan.Config.GetSpecs(), project.ResourceID)
+ pipelineCreate, err := apiv1.GetPipelineCreate(ctx, rc.store, plan.Config.GetSpecs(), project.ResourceID)
if err != nil {
slog.Error("failed to get pipeline create for rollout creation",
slog.Int("plan_id", int(planID)),
@@ -154,7 +149,7 @@ func (rc *RolloutCreator) tryCreateRollout(_ context.Context, planID int64) {
}
// Create rollout tasks
- _, err = rc.store.CreateRolloutTasks(rolloutCtx, planID, pipelineCreate)
+ _, err = rc.store.CreateRolloutTasks(ctx, planID, pipelineCreate)
if err != nil {
slog.Error("failed to create rollout tasks",
slog.Int("plan_id", int(planID)),
@@ -165,7 +160,7 @@ func (rc *RolloutCreator) tryCreateRollout(_ context.Context, planID int64) {
// Update plan to set hasRollout to true
config := proto.CloneOf(plan.Config)
config.HasRollout = true
- _, err = rc.store.UpdatePlan(rolloutCtx, &store.UpdatePlanMessage{
+ _, err = rc.store.UpdatePlan(ctx, &store.UpdatePlanMessage{
UID: planID,
Config: config,
})
diff --git a/backend/server/grpc_routes.go b/backend/server/grpc_routes.go
index 7de5fa3a90..1b0f4955ad 100644
--- a/backend/server/grpc_routes.go
+++ b/backend/server/grpc_routes.go
@@ -96,7 +96,7 @@ func configureGrpcRouters(
databaseService := apiv1.NewDatabaseService(stores, schemaSyncer, licenseService, profile, iamManager)
groupService := apiv1.NewGroupService(stores, iamManager, licenseService)
identityProviderService := apiv1.NewIdentityProviderService(stores, licenseService, profile)
- instanceRoleService := apiv1.NewInstanceRoleService(stores, dbFactory)
+ instanceRoleService := apiv1.NewInstanceRoleService(stores)
instanceService := apiv1.NewInstanceService(stores, profile, licenseService, stateCfg, dbFactory, schemaSyncer, iamManager, sampleInstanceManager)
issueService := apiv1.NewIssueService(stores, webhookManager, stateCfg, licenseService, profile, iamManager)
orgPolicyService := apiv1.NewOrgPolicyService(stores, licenseService)
diff --git a/backend/store/pipeline.go b/backend/store/pipeline.go
index 06c8357f38..b24b31ce92 100644
--- a/backend/store/pipeline.go
+++ b/backend/store/pipeline.go
@@ -214,7 +214,7 @@ func (s *Store) ListPipelines(ctx context.Context, find *PipelineFind) ([]*Pipel
}
// GetListRolloutFilter parses a CEL filter expression into a query builder query for listing rollouts.
-func (s *Store) GetListRolloutFilter(_ context.Context, filter string) (*qb.Query, error) { // nolint:revive
+func GetListRolloutFilter(filter string) (*qb.Query, error) {
if filter == "" {
return nil, nil
}
diff --git a/backend/store/pipeline_filter_test.go b/backend/store/pipeline_filter_test.go
index a88aa3d476..dc59a64ee1 100644
--- a/backend/store/pipeline_filter_test.go
+++ b/backend/store/pipeline_filter_test.go
@@ -1,7 +1,6 @@
package store
import (
- "context"
"testing"
"time"
@@ -9,9 +8,6 @@ import (
)
func TestGetListRolloutFilter(t *testing.T) {
- s := &Store{}
- ctx := context.Background()
-
// The subquery used for update_time filtering
updatedAtSubquery := `COALESCE((SELECT MAX(task_run.updated_at) FROM task JOIN task_run ON task_run.task_id = task.id WHERE task.plan_id = plan.id), plan.created_at)`
@@ -143,7 +139,7 @@ func TestGetListRolloutFilter(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
- q, err := s.GetListRolloutFilter(ctx, tt.filter)
+ q, err := GetListRolloutFilter(tt.filter)
if tt.wantErr {
require.Error(t, err)
diff --git a/backend/store/plan.go b/backend/store/plan.go
index 99617ecaab..3782105a87 100644
--- a/backend/store/plan.go
+++ b/backend/store/plan.go
@@ -290,7 +290,7 @@ func (s *Store) UpdatePlan(ctx context.Context, patch *UpdatePlanMessage) (*Plan
}
// GetListPlanFilter parses a CEL filter expression into a query builder query for listing plans.
-func (s *Store) GetListPlanFilter(_ context.Context, filter string) (*qb.Query, error) { // nolint:revive
+func GetListPlanFilter(filter string) (*qb.Query, error) {
if filter == "" {
return nil, nil
}
diff --git a/backend/store/plan_filter_test.go b/backend/store/plan_filter_test.go
index 860c7989e2..147260158b 100644
--- a/backend/store/plan_filter_test.go
+++ b/backend/store/plan_filter_test.go
@@ -1,7 +1,6 @@
package store
import (
- "context"
"testing"
"time"
@@ -9,11 +8,6 @@ import (
)
func TestGetListPlanFilter(t *testing.T) {
- // Create a minimal store instance for testing
- // Note: Some tests will be limited without a full database connection
- s := &Store{}
- ctx := context.Background()
-
tests := []struct {
name string
filter string
@@ -204,7 +198,7 @@ func TestGetListPlanFilter(t *testing.T) {
t.Skip("Test requires database connection")
}
- q, err := s.GetListPlanFilter(ctx, tt.filter)
+ q, err := GetListPlanFilter(tt.filter)
if tt.wantErr {
require.Error(t, err)
diff --git a/frontend/src/types/proto-es/v1/instance_role_service_pb.d.ts b/frontend/src/types/proto-es/v1/instance_role_service_pb.d.ts
index ffdf8e68c6..8589634b86 100644
--- a/frontend/src/types/proto-es/v1/instance_role_service_pb.d.ts
+++ b/frontend/src/types/proto-es/v1/instance_role_service_pb.d.ts
@@ -10,26 +10,6 @@ import type { Message } from "@bufbuild/protobuf";
*/
export declare const file_v1_instance_role_service: GenFile;
-/**
- * @generated from message bytebase.v1.GetInstanceRoleRequest
- */
-export declare type GetInstanceRoleRequest = Message<"bytebase.v1.GetInstanceRoleRequest"> & {
- /**
- * The name of the role to retrieve.
- * Format: instances/{instance}/roles/{role name}
- * The role name is the unique name for the role.
- *
- * @generated from field: string name = 1;
- */
- name: string;
-};
-
-/**
- * Describes the message bytebase.v1.GetInstanceRoleRequest.
- * Use `create(GetInstanceRoleRequestSchema)` to create a new message.
- */
-export declare const GetInstanceRoleRequestSchema: GenMessage<GetInstanceRoleRequest>;
-
/**
* @generated from message bytebase.v1.ListInstanceRolesRequest
*/
@@ -170,17 +150,6 @@ export declare const InstanceRoleSchema: GenMessage<InstanceRole>;
* @generated from service bytebase.v1.InstanceRoleService
*/
export declare const InstanceRoleService: GenService<{
- /**
- * Gets a database role from an instance.
- * Permissions required: bb.instanceRoles.get
- *
- * @generated from rpc bytebase.v1.InstanceRoleService.GetInstanceRole
- */
- getInstanceRole: {
- methodKind: "unary";
- input: typeof GetInstanceRoleRequestSchema;
- output: typeof InstanceRoleSchema;
- },
/**
* Lists all database roles in an instance.
* Permissions required: bb.instanceRoles.list
diff --git a/frontend/src/types/proto-es/v1/instance_role_service_pb.js b/frontend/src/types/proto-es/v1/instance_role_service_pb.js
index 586de2e5e0..657eb54fba 100644
--- a/frontend/src/types/proto-es/v1/instance_role_service_pb.js
+++ b/frontend/src/types/proto-es/v1/instance_role_service_pb.js
@@ -13,35 +13,28 @@ import { file_v1_annotation } from "./annotation_pb";
* Describes the file v1/instance_role_service.proto.
*/
export const file_v1_instance_role_service = /*@__PURE__*/
- fileDesc("Ch52MS9pbnN0YW5jZV9yb2xlX3NlcnZpY2UucHJvdG8SC2J5dGViYXNlLnYxIkkKFkdldEluc3RhbmNlUm9sZVJlcXVlc3QSLwoEbmFtZRgBIAEoCUIh4EEC+kEbChlieXRlYmFzZS5jb20vSW5zdGFuY2VSb2xlIoEBChhMaXN0SW5zdGFuY2VSb2xlc1JlcXVlc3QSLQoGcGFyZW50GAEgASgJQh3gQQL6QRcKFWJ5dGViYXNlLmNvbS9JbnN0YW5jZRIRCglwYWdlX3NpemUYAiABKAUSEgoKcGFnZV90b2tlbhgDIAEoCRIPCgdyZWZyZXNoGAQgASgIIl4KGUxpc3RJbnN0YW5jZVJvbGVzUmVzcG9uc2USKAoFcm9sZXMYASADKAsyGS5ieXRlYmFzZS52MS5JbnN0YW5jZVJvbGUSFwoPbmV4dF9wYWdlX3Rva2VuGAIgASgJIp8CCgxJbnN0YW5jZVJvbGUSDAoEbmFtZRgBIAEoCRIRCglyb2xlX25hbWUYAiABKAkSGgoIcGFzc3dvcmQYAyABKAlCA+BBBEgAiAEBEh0KEGNvbm5lY3Rpb25fbGltaXQYBCABKAVIAYgBARIYCgt2YWxpZF91bnRpbBgFIAEoCUgCiAEBEhYKCWF0dHJpYnV0ZRgGIAEoCUgDiAEBOkHqQT4KGWJ5dGViYXNlLmNvbS9JbnN0YW5jZVJvbGUSIWluc3RhbmNlcy97aW5zdGFuY2V9L3JvbGVzL3tyb2xlfUILCglfcGFzc3dvcmRCEwoRX2Nvbm5lY3Rpb25fbGltaXRCDgoMX3ZhbGlkX3VudGlsQgwKCl9hdHRyaWJ1dGUy5wIKE0luc3RhbmNlUm9sZVNlcnZpY2USnAEKD0dldEluc3RhbmNlUm9sZRIjLmJ5dGViYXNlLnYxLkdldEluc3RhbmNlUm9sZVJlcXVlc3QaGS5ieXRlYmFzZS52MS5JbnN0YW5jZVJvbGUiSdpBBG5hbWWK6jAUYmIuaW5zdGFuY2VSb2xlcy5nZXSQ6jABgtPkkwIgEh4vdjEve25hbWU9aW5zdGFuY2VzLyovcm9sZXMvKn0SsAEKEUxpc3RJbnN0YW5jZVJvbGVzEiUuYnl0ZWJhc2UudjEuTGlzdEluc3RhbmNlUm9sZXNSZXF1ZXN0GiYuYnl0ZWJhc2UudjEuTGlzdEluc3RhbmNlUm9sZXNSZXNwb25zZSJM2kEGcGFyZW50iuowFWJiLmluc3RhbmNlUm9sZXMubGlzdJDqMAGC0+STAiASHi92MS97cGFyZW50PWluc3RhbmNlcy8qfS9yb2xlc0KuAQoPY29tLmJ5dGViYXNlLnYxQhhJbnN0YW5jZVJvbGVTZXJ2aWNlUHJvdG9QAVo0Z2l0aHViLmNvbS9ieXRlYmFzZS9ieXRlYmFzZS9iYWNrZW5kL2dlbmVyYXRlZC1nby92MaICA0JYWKoCC0J5dGViYXNlLlYxygILQnl0ZWJhc2VcVjHiAhdCeXRlYmFzZVxWMVxHUEJNZXRhZGF0YeoCDEJ5dGViYXNlOjpWMWIGcHJvdG8z", [file_google_api_annotations, file_google_api_client, file_google_api_field_behavior, file_google_api_resource, file_v1_annotation]);
-
-/**
- * Describes the message bytebase.v1.GetInstanceRoleRequest.
- * Use `create(GetInstanceRoleRequestSchema)` to create a new message.
- */
-export const GetInstanceRoleRequestSchema = /*@__PURE__*/
- messageDesc(file_v1_instance_role_service, 0);
+ fileDesc("Ch52MS9pbnN0YW5jZV9yb2xlX3NlcnZpY2UucHJvdG8SC2J5dGViYXNlLnYxIoEBChhMaXN0SW5zdGFuY2VSb2xlc1JlcXVlc3QSLQoGcGFyZW50GAEgASgJQh3gQQL6QRcKFWJ5dGViYXNlLmNvbS9JbnN0YW5jZRIRCglwYWdlX3NpemUYAiABKAUSEgoKcGFnZV90b2tlbhgDIAEoCRIPCgdyZWZyZXNoGAQgASgIIl4KGUxpc3RJbnN0YW5jZVJvbGVzUmVzcG9uc2USKAoFcm9sZXMYASADKAsyGS5ieXRlYmFzZS52MS5JbnN0YW5jZVJvbGUSFwoPbmV4dF9wYWdlX3Rva2VuGAIgASgJIp8CCgxJbnN0YW5jZVJvbGUSDAoEbmFtZRgBIAEoCRIRCglyb2xlX25hbWUYAiABKAkSGgoIcGFzc3dvcmQYAyABKAlCA+BBBEgAiAEBEh0KEGNvbm5lY3Rpb25fbGltaXQYBCABKAVIAYgBARIYCgt2YWxpZF91bnRpbBgFIAEoCUgCiAEBEhYKCWF0dHJpYnV0ZRgGIAEoCUgDiAEBOkHqQT4KGWJ5dGViYXNlLmNvbS9JbnN0YW5jZVJvbGUSIWluc3RhbmNlcy97aW5zdGFuY2V9L3JvbGVzL3tyb2xlfUILCglfcGFzc3dvcmRCEwoRX2Nvbm5lY3Rpb25fbGltaXRCDgoMX3ZhbGlkX3VudGlsQgwKCl9hdHRyaWJ1dGUyyAEKE0luc3RhbmNlUm9sZVNlcnZpY2USsAEKEUxpc3RJbnN0YW5jZVJvbGVzEiUuYnl0ZWJhc2UudjEuTGlzdEluc3RhbmNlUm9sZXNSZXF1ZXN0GiYuYnl0ZWJhc2UudjEuTGlzdEluc3RhbmNlUm9sZXNSZXNwb25zZSJM2kEGcGFyZW50iuowFWJiLmluc3RhbmNlUm9sZXMubGlzdJDqMAGC0+STAiASHi92MS97cGFyZW50PWluc3RhbmNlcy8qfS9yb2xlc0KuAQoPY29tLmJ5dGViYXNlLnYxQhhJbnN0YW5jZVJvbGVTZXJ2aWNlUHJvdG9QAVo0Z2l0aHViLmNvbS9ieXRlYmFzZS9ieXRlYmFzZS9iYWNrZW5kL2dlbmVyYXRlZC1nby92MaICA0JYWKoCC0J5dGViYXNlLlYxygILQnl0ZWJhc2VcVjHiAhdCeXRlYmFzZVxWMVxHUEJNZXRhZGF0YeoCDEJ5dGViYXNlOjpWMWIGcHJvdG8z", [file_google_api_annotations, file_google_api_client, file_google_api_field_behavior, file_google_api_resource, file_v1_annotation]);
/**
* Describes the message bytebase.v1.ListInstanceRolesRequest.
* Use `create(ListInstanceRolesRequestSchema)` to create a new message.
*/
export const ListInstanceRolesRequestSchema = /*@__PURE__*/
- messageDesc(file_v1_instance_role_service, 1);
+ messageDesc(file_v1_instance_role_service, 0);
/**
* Describes the message bytebase.v1.ListInstanceRolesResponse.
* Use `create(ListInstanceRolesResponseSchema)` to create a new message.
*/
export const ListInstanceRolesResponseSchema = /*@__PURE__*/
- messageDesc(file_v1_instance_role_service, 2);
+ messageDesc(file_v1_instance_role_service, 1);
/**
* Describes the message bytebase.v1.InstanceRole.
* Use `create(InstanceRoleSchema)` to create a new message.
*/
export const InstanceRoleSchema = /*@__PURE__*/
- messageDesc(file_v1_instance_role_service, 3);
+ messageDesc(file_v1_instance_role_service, 2);
/**
* InstanceRoleService manages database roles within instances.
diff --git a/proto/gen/grpc-doc/openapi.yaml b/proto/gen/grpc-doc/openapi.yaml
index 0a924b060e..931c9457e7 100644
--- a/proto/gen/grpc-doc/openapi.yaml
+++ b/proto/gen/grpc-doc/openapi.yaml
@@ -2805,40 +2805,6 @@ paths:
application/json:
schema:
$ref: '#/components/schemas/Status'
- /v1/instances/{instance}/roles/{role}:
- get:
- tags:
- - InstanceRoleService
- description: |-
- Gets a database role from an instance.
- Permissions required: bb.instanceRoles.get
- operationId: InstanceRoleService_GetInstanceRole
- parameters:
- - name: instance
- in: path
- description: The instance id.
- required: true
- schema:
- type: string
- - name: role
- in: path
- description: The role id.
- required: true
- schema:
- type: string
- responses:
- "200":
- description: OK
- content:
- application/json:
- schema:
- $ref: '#/components/schemas/InstanceRole'
- default:
- description: Default error response
- content:
- application/json:
- schema:
- $ref: '#/components/schemas/Status'
/v1/instances/{instance}:addDataSource:
post:
tags:
diff --git a/proto/gen/grpc-doc/v1/README.md b/proto/gen/grpc-doc/v1/README.md
index 73f451072b..01e8dbab5d 100644
--- a/proto/gen/grpc-doc/v1/README.md
+++ b/proto/gen/grpc-doc/v1/README.md
@@ -216,7 +216,6 @@
- [DatabaseGroupService](#bytebase-v1-DatabaseGroupService)
- [v1/instance_role_service.proto](#v1_instance_role_service-proto)
- - [GetInstanceRoleRequest](#bytebase-v1-GetInstanceRoleRequest)
- [InstanceRole](#bytebase-v1-InstanceRole)
- [ListInstanceRolesRequest](#bytebase-v1-ListInstanceRolesRequest)
- [ListInstanceRolesResponse](#bytebase-v1-ListInstanceRolesResponse)
@@ -3667,21 +3666,6 @@ DatabaseGroupService manages database groups for organizing databases by criteri
-<a name="bytebase-v1-GetInstanceRoleRequest"></a>
-
-### GetInstanceRoleRequest
-
-
-
-| Field | Type | Label | Description |
-| ----- | ---- | ----- | ----------- |
-| name | [string](#string) | | The name of the role to retrieve. Format: instances/{instance}/roles/{role name} The role name is the unique name for the role. |
-
-
-
-
-
-
<a name="bytebase-v1-InstanceRole"></a>
### InstanceRole
@@ -3751,7 +3735,6 @@ InstanceRoleService manages database roles within instances.
| Method Name | Request Type | Response Type | Description |
| ----------- | ------------ | ------------- | ------------|
-| GetInstanceRole | [GetInstanceRoleRequest](#bytebase-v1-GetInstanceRoleRequest) | [InstanceRole](#bytebase-v1-InstanceRole) | Gets a database role from an instance. Permissions required: bb.instanceRoles.get |
| ListInstanceRoles | [ListInstanceRolesRequest](#bytebase-v1-ListInstanceRolesRequest) | [ListInstanceRolesResponse](#bytebase-v1-ListInstanceRolesResponse) | Lists all database roles in an instance. Permissions required: bb.instanceRoles.list |
diff --git a/proto/gen/grpc-doc/v1/index.html b/proto/gen/grpc-doc/v1/index.html
index a51308202f..5d7169d2db 100644
--- a/proto/gen/grpc-doc/v1/index.html
+++ b/proto/gen/grpc-doc/v1/index.html
@@ -990,10 +990,6 @@
<a href="#v1%2finstance_role_service.proto">v1/instance_role_service.proto</a>
<ul>
- <li>
- <a href="#bytebase.v1.GetInstanceRoleRequest"><span class="badge">M</span>GetInstanceRoleRequest</a>
- </li>
-
<li>
<a href="#bytebase.v1.InstanceRole"><span class="badge">M</span>InstanceRole</a>
</li>
@@ -10329,32 +10325,6 @@ Permissions required: bb.databaseGroups.delete</p></td>
<p></p>
- <h3 id="bytebase.v1.GetInstanceRoleRequest">GetInstanceRoleRequest</h3>
- <p></p>
-
-
- <table class="field-table">
- <thead>
- <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
- </thead>
- <tbody>
-
- <tr>
- <td>name</td>
- <td><a href="#string">string</a></td>
- <td></td>
- <td><p>The name of the role to retrieve.
-Format: instances/{instance}/roles/{role name}
-The role name is the unique name for the role. </p></td>
- </tr>
-
- </tbody>
- </table>
-
-
-
-
-
<h3 id="bytebase.v1.InstanceRole">InstanceRole</h3>
<p>InstanceRole is the API message for instance role.</p>
@@ -10519,14 +10489,6 @@ If this field is omitted, there are no subsequent pages. </p></td>
</thead>
<tbody>
- <tr>
- <td>GetInstanceRole</td>
- <td><a href="#bytebase.v1.GetInstanceRoleRequest">GetInstanceRoleRequest</a></td>
- <td><a href="#bytebase.v1.InstanceRole">InstanceRole</a></td>
- <td><p>Gets a database role from an instance.
-Permissions required: bb.instanceRoles.get</p></td>
- </tr>
-
<tr>
<td>ListInstanceRoles</td>
<td><a href="#bytebase.v1.ListInstanceRolesRequest">ListInstanceRolesRequest</a></td>
@@ -10555,16 +10517,6 @@ Permissions required: bb.instanceRoles.list</p></td>
- <tr>
- <td>GetInstanceRole</td>
- <td>GET</td>
- <td>/v1/{name=instances/*/roles/*}</td>
- <td></td>
- </tr>
-
-
-
-
<tr>
<td>ListInstanceRoles</td>
<td>GET</td>
diff --git a/proto/v1/v1/instance_role_service.proto b/proto/v1/v1/instance_role_service.proto
index 333c5590da..1460d6e86d 100644
--- a/proto/v1/v1/instance_role_service.proto
+++ b/proto/v1/v1/instance_role_service.proto
@@ -12,15 +12,6 @@ option go_package = "github.com/bytebase/bytebase/backend/generated-go/v1";
// InstanceRoleService manages database roles within instances.
service InstanceRoleService {
- // Gets a database role from an instance.
- // Permissions required: bb.instanceRoles.get
- rpc GetInstanceRole(GetInstanceRoleRequest) returns (InstanceRole) {
- option (google.api.http) = {get: "/v1/{name=instances/*/roles/*}"};
- option (google.api.method_signature) = "name";
- option (bytebase.v1.permission) = "bb.instanceRoles.get";
- option (bytebase.v1.auth_method) = IAM;
- }
-
// Lists all database roles in an instance.
// Permissions required: bb.instanceRoles.list
rpc ListInstanceRoles(ListInstanceRolesRequest) returns (ListInstanceRolesResponse) {
@@ -31,16 +22,6 @@ service InstanceRoleService {
}
}
-message GetInstanceRoleRequest {
- // The name of the role to retrieve.
- // Format: instances/{instance}/roles/{role name}
- // The role name is the unique name for the role.
- string name = 1 [
- (google.api.field_behavior) = REQUIRED,
- (google.api.resource_reference) = {type: "bytebase.com/InstanceRole"}
- ];
-}
-
message ListInstanceRolesRequest {
// The parent, which owns this collection of roles.
// Format: instances/{instance}