Database governance built for humans and agents — controlling changes and access across every major database.
Go cicddata-governancedata-maskingdata-securitydatabase-accessdatabase-governancedevopsdevsecopsflywaygitopsliquibasemongodbmysqloraclepostgresqlschema-migrationssecuritysql-clientsqlservertidb
feat: ACCESS_GRANT issue (#19329)
ecmadao6d13d973c1cf
diff --git a/backend/api/mcp/gen/openapi.yaml b/backend/api/mcp/gen/openapi.yamlindex f57eae5494..a12bb6d755 100644--- a/backend/api/mcp/gen/openapi.yaml+++ b/backend/api/mcp/gen/openapi.yaml@@ -7013,6 +7013,9 @@ components:updateTime:title: update_time$ref: '#/components/schemas/google.protobuf.Timestamp'+ reason:+ type: string+ title: reason- oneOf:- properties:expireTime:@@ -14003,6 +14006,7 @@ components:- FEATURE_DISALLOW_PASSWORD_SIGNIN- FEATURE_CUSTOM_ROLES- FEATURE_REQUEST_ROLE_WORKFLOW+ - FEATURE_JIT- FEATURE_DATA_MASKING- FEATURE_DATA_CLASSIFICATION- FEATURE_SCIMdiff --git a/backend/api/v1/access_grant_service.go b/backend/api/v1/access_grant_service.goindex 42bf6d279c..c1a7d5d90a 100644--- a/backend/api/v1/access_grant_service.go+++ b/backend/api/v1/access_grant_service.go@@ -2,6 +2,7 @@ package v1import ("context"+ "fmt""time""connectrpc.com/connect"@@ -9,6 +10,9 @@ import ("google.golang.org/protobuf/types/known/timestamppb""github.com/bytebase/bytebase/backend/common"+ "github.com/bytebase/bytebase/backend/component/bus"+ "github.com/bytebase/bytebase/backend/component/webhook"+ "github.com/bytebase/bytebase/backend/enterprise"storepb "github.com/bytebase/bytebase/backend/generated-go/store"v1pb "github.com/bytebase/bytebase/backend/generated-go/v1""github.com/bytebase/bytebase/backend/generated-go/v1/v1connect"@@ -18,13 +22,19 @@ import (// AccessGrantService implements the access grant service.type AccessGrantService struct {v1connect.UnimplementedAccessGrantServiceHandler- store *store.Store+ store *store.Store+ licenseService *enterprise.LicenseService+ webhookManager *webhook.Manager+ bus *bus.Bus}// NewAccessGrantService returns a new access grant service instance.-func NewAccessGrantService(store *store.Store) *AccessGrantService {+func NewAccessGrantService(store *store.Store, licenseService *enterprise.LicenseService, webhookManager *webhook.Manager, bus *bus.Bus) *AccessGrantService {return &AccessGrantService{- store: store,+ store: store,+ licenseService: licenseService,+ webhookManager: webhookManager,+ bus: bus,}}@@ -105,6 +115,9 @@ func (s *AccessGrantService) ListAccessGrants(ctx context.Context, request *conn// CreateAccessGrant creates an access grant.func (s *AccessGrantService) CreateAccessGrant(ctx context.Context, request *connect.Request[v1pb.CreateAccessGrantRequest]) (*connect.Response[v1pb.AccessGrant], error) {+ if err := s.licenseService.IsFeatureEnabled(v1pb.PlanFeature_FEATURE_JIT); err != nil {+ return nil, connect.NewError(connect.CodePermissionDenied, err)+ }req := request.MsgprojectID, err := common.GetProjectID(req.Parent)if err != nil {@@ -143,7 +156,8 @@ func (s *AccessGrantService) CreateAccessGrant(ctx context.Context, request *conreturn nil, connect.NewError(connect.CodeInvalidArgument, errors.New("expiration (expire_time or ttl) is required"))}- create := &store.AccessGrantMessage{+ // Step 1: Create the access grant.+ grant, err := s.store.CreateAccessGrant(ctx, &store.AccessGrantMessage{ProjectID: projectID,Creator: creatorEmail,Status: storepb.AccessGrant_PENDING,@@ -152,12 +166,48 @@ func (s *AccessGrantService) CreateAccessGrant(ctx context.Context, request *conTargets: ag.Targets,Query: ag.Query,Unmask: ag.Unmask,+ Reason: ag.Reason,},+ })+ if err != nil {+ return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to create access grant"))}- grant, err := s.store.CreateAccessGrant(ctx, create)+ // Step 2: Create the associated issue.+ issue, err := s.store.CreateIssue(ctx, &store.IssueMessage{+ ProjectID: projectID,+ CreatorEmail: creatorEmail,+ Title: fmt.Sprintf("JIT access request by %s", creatorEmail),+ Type: storepb.Issue_ACCESS_GRANT,+ Description: ag.Reason,+ Payload: &storepb.Issue{+ Approval: &storepb.IssuePayloadApproval{+ ApprovalFindingDone: false,+ },+ },+ })if err != nil {- return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to create access grant"))+ return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to create issue"))+ }++ // Step 3: Update access grant payload with the issue ID.+ grant.Payload.IssueId = int64(issue.UID)+ grant, err = s.store.UpdateAccessGrant(ctx, grant.ID, &store.UpdateAccessGrantMessage{+ Payload: grant.Payload,+ })+ if err != nil {+ return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to update access grant payload"))+ }++ // Step 4: Post-create: webhook, approval finding, auto-approve.+ project, err := s.store.GetProject(ctx, &store.FindProjectMessage{ResourceID: &projectID})+ if err != nil {+ return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to get project"))+ }+ if project != nil {+ if _, err := postCreateIssue(ctx, s.store, s.webhookManager, s.licenseService, s.bus, project, creatorEmail, creatorEmail, issue); err != nil {+ return nil, connect.NewError(connect.CodeInternal, err)+ }}return connect.NewResponse(convertToAccessGrant(grant)), nil@@ -165,6 +215,9 @@ func (s *AccessGrantService) CreateAccessGrant(ctx context.Context, request *con// ActivateAccessGrant activates a pending access grant.func (s *AccessGrantService) ActivateAccessGrant(ctx context.Context, request *connect.Request[v1pb.ActivateAccessGrantRequest]) (*connect.Response[v1pb.AccessGrant], error) {+ if err := s.licenseService.IsFeatureEnabled(v1pb.PlanFeature_FEATURE_JIT); err != nil {+ return nil, connect.NewError(connect.CodePermissionDenied, err)+ }req := request.MsgprojectID, accessGrantID, err := common.GetProjectIDAccessGrantID(req.Name)if err != nil {@@ -198,6 +251,9 @@ func (s *AccessGrantService) ActivateAccessGrant(ctx context.Context, request *c// RevokeAccessGrant revokes an active access grant.func (s *AccessGrantService) RevokeAccessGrant(ctx context.Context, request *connect.Request[v1pb.RevokeAccessGrantRequest]) (*connect.Response[v1pb.AccessGrant], error) {+ if err := s.licenseService.IsFeatureEnabled(v1pb.PlanFeature_FEATURE_JIT); err != nil {+ return nil, connect.NewError(connect.CodePermissionDenied, err)+ }req := request.MsgprojectID, accessGrantID, err := common.GetProjectIDAccessGrantID(req.Name)if err != nil {diff --git a/backend/api/v1/issue_hook.go b/backend/api/v1/issue_hook.gonew file mode 100644index 0000000000..0bb8c604f8--- /dev/null+++ b/backend/api/v1/issue_hook.go@@ -0,0 +1,137 @@+package v1++import (+ "context"+ "log/slog"++ "github.com/pkg/errors"++ "github.com/bytebase/bytebase/backend/common/log"+ "github.com/bytebase/bytebase/backend/component/bus"+ "github.com/bytebase/bytebase/backend/component/webhook"+ "github.com/bytebase/bytebase/backend/enterprise"+ storepb "github.com/bytebase/bytebase/backend/generated-go/store"+ "github.com/bytebase/bytebase/backend/runner/approval"+ "github.com/bytebase/bytebase/backend/store"+ "github.com/bytebase/bytebase/backend/utils"+)++// postCreateIssue runs post-creation logic for an issue: webhook, approval finding, and auto-approve.+func postCreateIssue(+ ctx context.Context,+ stores *store.Store,+ webhookManager *webhook.Manager,+ licenseService *enterprise.LicenseService,+ b *bus.Bus,+ project *store.ProjectMessage,+ creatorName string,+ creatorEmail string,+ issue *store.IssueMessage,+) (*store.IssueMessage, error) {+ // Trigger ISSUE_CREATED webhook.+ webhookManager.CreateEvent(ctx, &webhook.Event{+ Type: storepb.Activity_ISSUE_CREATED,+ Project: webhook.NewProject(project),+ IssueCreated: &webhook.EventIssueCreated{+ Creator: &webhook.User{+ Name: creatorName,+ Email: creatorEmail,+ },+ Issue: webhook.NewIssue(issue),+ },+ })++ // Trigger approval finding based on issue type.+ switch issue.Type {+ case+ storepb.Issue_ACCESS_GRANT,+ storepb.Issue_GRANT_REQUEST,+ storepb.Issue_DATABASE_EXPORT:++ if issue.Type != storepb.Issue_ACCESS_GRANT {+ // TODO: approval flow for the ACCESS_GRANT issue+ if err := approval.FindAndApplyApprovalTemplate(ctx, stores, webhookManager, licenseService, issue); err != nil {+ slog.Error("failed to find approval template",+ slog.Int("issue_uid", issue.UID),+ slog.String("issue_title", issue.Title),+ log.BBError(err))+ }+ }++ // Refresh issue to get updated approval payload.+ uid := issue.UID+ var err error+ issue, err = stores.GetIssue(ctx, &store.FindIssueMessage{UID: &uid})+ if err != nil {+ return nil, errors.Wrapf(err, "failed to refresh issue")+ }++ if issue.Type == storepb.Issue_DATABASE_EXPORT {+ return issue, nil+ }++ // For ACCESS_GRANT/GRANT_REQUEST that is auto-approved (no approval template), complete it.+ approved, err := utils.CheckApprovalApproved(issue.Payload.Approval)+ if err != nil {+ return nil, errors.Wrapf(err, "failed to check if approval is approved")+ }+ if !approved {+ return issue, nil+ }+ issue, err = completeAccessRequestIssue(ctx, stores, creatorEmail, issue)+ if err != nil {+ return nil, errors.Wrapf(err, "failed to complete grant request")+ }+ case storepb.Issue_DATABASE_CHANGE:+ b.ApprovalCheckChan <- int64(issue.UID)+ default:+ }++ return issue, nil+}++// completeAccessRequestIssue completes the ACCESS_GRANT/GRANT_REQUEST issue.+// For GRANT_REQUEST issue: grant the privilege and updating the status.+// For ACCESS_GRANT issue: mark the status as ACTIVE.+func completeAccessRequestIssue(ctx context.Context, stores *store.Store, userEmail string, issue *store.IssueMessage) (*store.IssueMessage, error) {+ switch issue.Type {+ case storepb.Issue_ACCESS_GRANT:+ if issue.Payload.AccessGrantId == "" {+ return nil, errors.Errorf("invalid access grant id for issue %d", issue.UID)+ }+ status := storepb.AccessGrant_ACTIVE+ if _, err := stores.UpdateAccessGrant(ctx, issue.Payload.AccessGrantId, &store.UpdateAccessGrantMessage{+ Status: &status,+ }); err != nil {+ return nil, errors.Wrapf(err, "failed to update access grant status")+ }+ case storepb.Issue_GRANT_REQUEST:+ if err := utils.UpdateProjectPolicyFromGrantIssue(ctx, stores, issue, issue.Payload.GrantRequest); err != nil {+ return nil, err+ }+ default:+ return issue, nil+ }++ newStatus := storepb.Issue_DONE+ updatedIssue, err := stores.UpdateIssue(ctx, issue.UID, &store.UpdateIssueMessage{Status: &newStatus})+ if err != nil {+ return nil, errors.Wrapf(err, "failed to update issue %q's status", issue.Title)+ }++ if _, err := stores.CreateIssueComments(ctx, userEmail, &store.IssueCommentMessage{+ IssueUID: issue.UID,+ Payload: &storepb.IssueCommentPayload{+ Event: &storepb.IssueCommentPayload_IssueUpdate_{+ IssueUpdate: &storepb.IssueCommentPayload_IssueUpdate{+ FromStatus: &issue.Status,+ ToStatus: &updatedIssue.Status,+ },+ },+ },+ }); err != nil {+ slog.Warn("failed to create issue comment after changing the issue status", log.BBError(err))+ }++ return updatedIssue, nil+}diff --git a/backend/api/v1/issue_service.go b/backend/api/v1/issue_service.goindex ae4c63a27c..0a66c31881 100644--- a/backend/api/v1/issue_service.go+++ b/backend/api/v1/issue_service.go@@ -363,6 +363,10 @@ func (s *IssueService) CreateIssue(ctx context.Context, req *connect.Request[v1preturn nil, connect.NewError(connect.CodeNotFound, errors.Errorf("project not found for id: %v", projectID))}+ if project.Setting.ForceIssueLabels && len(req.Msg.Issue.Labels) == 0 {+ return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("require issue labels"))+ }+user, ok := GetUserFromContext(ctx)if !ok {return nil, connect.NewError(connect.CodeInternal, errors.Errorf("user not found"))@@ -377,65 +381,9 @@ func (s *IssueService) CreateIssue(ctx context.Context, req *connect.Request[v1preturn nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to create issue"))}- if project.Setting.ForceIssueLabels && len(req.Msg.Issue.Labels) == 0 {- return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("require issue labels"))- }-- // Trigger ISSUE_CREATED webhook- s.webhookManager.CreateEvent(ctx, &webhook.Event{- Type: storepb.Activity_ISSUE_CREATED,- Project: webhook.NewProject(project),- IssueCreated: &webhook.EventIssueCreated{- Creator: &webhook.User{- Name: user.Name,- Email: user.Email,- },- Issue: webhook.NewIssue(issue),- },- })-- // Trigger approval finding based on issue type- switch issue.Type {- case storepb.Issue_GRANT_REQUEST, storepb.Issue_DATABASE_EXPORT:- // GRANT_REQUEST and DATABASE_EXPORT can determine approval immediately:- // - GRANT_REQUEST only looks at issue message- // - DATABASE_EXPORT only looks at the plan (already available)- // Call synchronously to get approval status in the create response- if err := approval.FindAndApplyApprovalTemplate(ctx, s.store, s.webhookManager, s.licenseService, issue); err != nil {- slog.Error("failed to find approval template",- slog.Int("issue_uid", issue.UID),- slog.String("issue_title", issue.Title),- log.BBError(err))- // Continue anyway - non-fatal error- }-- // Refresh issue to get updated approval payload- uid := issue.UID- issue, err = s.store.GetIssue(ctx, &store.FindIssueMessage{UID: &uid})- if err != nil {- return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to refresh issue"))- }-- // For GRANT_REQUEST that is auto-approved (no approval template), complete it- if issue.Type == storepb.Issue_GRANT_REQUEST {- approved, err := utils.CheckApprovalApproved(issue.Payload.Approval)- if err != nil {- return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to check if approval is approved"))- }- if approved {- issue, err = s.completeGrantRequestIssue(ctx, user.Email, issue, issue.Payload.GrantRequest)- if err != nil {- return nil, connect.NewError(connect.CodeInternal,- errors.Wrapf(err, "failed to complete grant request"))- }- }- }- case storepb.Issue_DATABASE_CHANGE:- // DATABASE_CHANGE needs to wait for plan check to complete- // Trigger async approval finding via event channel- s.bus.ApprovalCheckChan <- int64(issue.UID)- default:- // For other issue types, no approval finding needed+ issue, err = postCreateIssue(ctx, s.store, s.webhookManager, s.licenseService, s.bus, project, user.Name, user.Email, issue)+ if err != nil {+ return nil, connect.NewError(connect.CodeInternal, err)}converted, err := s.convertToIssue(issue)@@ -652,8 +600,8 @@ func (s *IssueService) ApproveIssue(ctx context.Context, req *connect.Request[v1approval.NotifyApprovalRequested(ctx, s.store, s.webhookManager, issue, project)// If the issue is a grant request and approved, complete it- if issue.Type == storepb.Issue_GRANT_REQUEST && approved {- issue, err = s.completeGrantRequestIssue(ctx, user.Email, issue, payload.GrantRequest)+ if approved {+ issue, err = completeAccessRequestIssue(ctx, s.store, user.Email, issue)if err != nil {slog.Debug("failed to complete grant request issue", log.BBError(err))}@@ -1244,44 +1192,6 @@ func (s *IssueService) getIssueMessage(ctx context.Context, name string) (*storereturn issue, nil}-// completeGrantRequestIssue grants privilege and closes a grant request issue.-// Called when:-// 1. Issue created without approval template (auto-approved)-// 2. Issue approval flow completes-//-// Returns the updated issue with DONE status.-func (s *IssueService) completeGrantRequestIssue(ctx context.Context, userEmail string, issue *store.IssueMessage, grantRequest *storepb.GrantRequest) (*store.IssueMessage, error) {- // Grant the privilege- if err := utils.UpdateProjectPolicyFromGrantIssue(ctx, s.store, issue, grantRequest); err != nil {- return nil, err- }-- // Update issue status to DONE- newStatus := storepb.Issue_DONE- updatedIssue, err := s.store.UpdateIssue(ctx, issue.UID, &store.UpdateIssueMessage{Status: &newStatus})- if err != nil {- return nil, errors.Wrapf(err, "failed to update issue %q's status", issue.Title)- }-- // Create issue comment documenting the status change- if _, err := s.store.CreateIssueComments(ctx, userEmail, &store.IssueCommentMessage{- IssueUID: issue.UID,- Payload: &storepb.IssueCommentPayload{- Event: &storepb.IssueCommentPayload_IssueUpdate_{- IssueUpdate: &storepb.IssueCommentPayload_IssueUpdate{- FromStatus: &issue.Status,- ToStatus: &updatedIssue.Status,- },- },- },- }); err != nil {- // Non-fatal: log warning but continue- slog.Warn("failed to create issue comment after changing the issue status", log.BBError(err))- }-- return updatedIssue, nil-}-func (s *IssueService) isUserReviewer(ctx context.Context, issue *store.IssueMessage, role string, user *store.UserMessage) bool {roles := s.getUserRoleMap(ctx, issue.ProjectID, user)return roles[role]diff --git a/backend/enterprise/plan.yaml b/backend/enterprise/plan.yamlindex 1eca57b1be..6f014addf1 100644--- a/backend/enterprise/plan.yaml+++ b/backend/enterprise/plan.yaml@@ -146,6 +146,7 @@ plans:- FEATURE_PASSWORD_RESTRICTIONS- FEATURE_CUSTOM_ROLES- FEATURE_REQUEST_ROLE_WORKFLOW+ - FEATURE_JIT- FEATURE_DATA_MASKING- FEATURE_DATA_CLASSIFICATION- FEATURE_SCIMdiff --git a/backend/generated-go/store/access_grant.pb.go b/backend/generated-go/store/access_grant.pb.goindex 6be42d300f..83fec0fb85 100644--- a/backend/generated-go/store/access_grant.pb.go+++ b/backend/generated-go/store/access_grant.pb.go@@ -119,7 +119,8 @@ type AccessGrantPayload struct {// The query permission granted.Query string `protobuf:"bytes,3,opt,name=query,proto3" json:"query,omitempty"`// Whether the grant allows unmasking sensitive data.- Unmask bool `protobuf:"varint,4,opt,name=unmask,proto3" json:"unmask,omitempty"`+ Unmask bool `protobuf:"varint,4,opt,name=unmask,proto3" json:"unmask,omitempty"`+ Reason string `protobuf:"bytes,5,opt,name=reason,proto3" json:"reason,omitempty"`unknownFields protoimpl.UnknownFieldssizeCache protoimpl.SizeCache}@@ -182,6 +183,13 @@ func (x *AccessGrantPayload) GetUnmask() bool {return false}+func (x *AccessGrantPayload) GetReason() string {+ if x != nil {+ return x.Reason+ }+ return ""+}+var File_store_access_grant_proto protoreflect.FileDescriptorconst file_store_access_grant_proto_rawDesc = "" +@@ -193,12 +201,13 @@ const file_store_access_grant_proto_rawDesc = "" +"\aPENDING\x10\x01\x12\n" +"\n" +"\x06ACTIVE\x10\x02\x12\v\n" +- "\aREVOKED\x10\x03\"w\n" ++ "\aREVOKED\x10\x03\"\x8f\x01\n" +"\x12AccessGrantPayload\x12\x19\n" +"\bissue_id\x18\x01 \x01(\x03R\aissueId\x12\x18\n" +"\atargets\x18\x02 \x03(\tR\atargets\x12\x14\n" +"\x05query\x18\x03 \x01(\tR\x05query\x12\x16\n" +- "\x06unmask\x18\x04 \x01(\bR\x06unmaskB\x93\x01\n" ++ "\x06unmask\x18\x04 \x01(\bR\x06unmask\x12\x16\n" ++ "\x06reason\x18\x05 \x01(\tR\x06reasonB\x93\x01\n" +"\x12com.bytebase.storeB\x10AccessGrantProtoP\x01Z\x12generated-go/store\xa2\x02\x03BSX\xaa\x02\x0eBytebase.Store\xca\x02\x0eBytebase\\Store\xe2\x02\x1aBytebase\\Store\\GPBMetadata\xea\x02\x0fBytebase::Storeb\x06proto3"var (diff --git a/backend/generated-go/store/access_grant_equal.pb.go b/backend/generated-go/store/access_grant_equal.pb.goindex 76f2cb8ffa..870521a9b3 100644--- a/backend/generated-go/store/access_grant_equal.pb.go+++ b/backend/generated-go/store/access_grant_equal.pb.go@@ -37,5 +37,8 @@ func (x *AccessGrantPayload) Equal(y *AccessGrantPayload) bool {if x.Unmask != y.Unmask {return false}+ if x.Reason != y.Reason {+ return false+ }return true}diff --git a/backend/generated-go/store/issue.pb.go b/backend/generated-go/store/issue.pb.goindex a2d527311c..6904be9efd 100644--- a/backend/generated-go/store/issue.pb.go+++ b/backend/generated-go/store/issue.pb.go@@ -34,6 +34,8 @@ const (Issue_GRANT_REQUEST Issue_Type = 2// Issue for exporting data from databases.Issue_DATABASE_EXPORT Issue_Type = 3+ // Temporary access grant request.+ Issue_ACCESS_GRANT Issue_Type = 4)// Enum value maps for Issue_Type.@@ -43,12 +45,14 @@ var (1: "DATABASE_CHANGE",2: "GRANT_REQUEST",3: "DATABASE_EXPORT",+ 4: "ACCESS_GRANT",}Issue_Type_value = map[string]int32{"ISSUE_TYPE_UNSPECIFIED": 0,"DATABASE_CHANGE": 1,"GRANT_REQUEST": 2,"DATABASE_EXPORT": 3,+ "ACCESS_GRANT": 4,})@@ -145,7 +149,9 @@ type Issue struct {// Labels attached to categorize and filter the issue.Labels []string `protobuf:"bytes,3,rep,name=labels,proto3" json:"labels,omitempty"`// Risk level for the issue, calculated from statement types.- RiskLevel RiskLevel `protobuf:"varint,4,opt,name=risk_level,json=riskLevel,proto3,enum=bytebase.store.RiskLevel" json:"risk_level,omitempty"`+ RiskLevel RiskLevel `protobuf:"varint,4,opt,name=risk_level,json=riskLevel,proto3,enum=bytebase.store.RiskLevel" json:"risk_level,omitempty"`+ // The access grant id for ACCESS_GRANT type issue.+ AccessGrantId string `protobuf:"bytes,5,opt,name=access_grant_id,json=accessGrantId,proto3" json:"access_grant_id,omitempty"`unknownFields protoimpl.UnknownFieldssizeCache protoimpl.SizeCache}@@ -208,6 +214,13 @@ func (x *Issue) GetRiskLevel() RiskLevel {return RiskLevel_RISK_LEVEL_UNSPECIFIED}+func (x *Issue) GetAccessGrantId() string {+ if x != nil {+ return x.AccessGrantId+ }+ return ""+}+// GrantRequest contains details for requesting database access permissions.type GrantRequest struct {state protoimpl.MessageState `protogen:"open.v1"`@@ -287,18 +300,20 @@ var File_store_issue_proto protoreflect.FileDescriptorconst file_store_issue_proto_rawDesc = "" +"\n" +- "\x11store/issue.proto\x12\x0ebytebase.store\x1a\x1egoogle/protobuf/duration.proto\x1a\x16google/type/expr.proto\x1a\x14store/approval.proto\x1a\x12store/common.proto\"\x89\x03\n" ++ "\x11store/issue.proto\x12\x0ebytebase.store\x1a\x1egoogle/protobuf/duration.proto\x1a\x16google/type/expr.proto\x1a\x14store/approval.proto\x1a\x12store/common.proto\"\xc3\x03\n" +"\x05Issue\x12@\n" +"\bapproval\x18\x01 \x01(\v2$.bytebase.store.IssuePayloadApprovalR\bapproval\x12A\n" +"\rgrant_request\x18\x02 \x01(\v2\x1c.bytebase.store.GrantRequestR\fgrantRequest\x12\x16\n" +"\x06labels\x18\x03 \x03(\tR\x06labels\x128\n" +"\n" +- "risk_level\x18\x04 \x01(\x0e2\x19.bytebase.store.RiskLevelR\triskLevel\"_\n" ++ "risk_level\x18\x04 \x01(\x0e2\x19.bytebase.store.RiskLevelR\triskLevel\x12&\n" ++ "\x0faccess_grant_id\x18\x05 \x01(\tR\raccessGrantId\"q\n" +"\x04Type\x12\x1a\n" +"\x16ISSUE_TYPE_UNSPECIFIED\x10\x00\x12\x13\n" +"\x0fDATABASE_CHANGE\x10\x01\x12\x11\n" +"\rGRANT_REQUEST\x10\x02\x12\x13\n" +- "\x0fDATABASE_EXPORT\x10\x03\"H\n" ++ "\x0fDATABASE_EXPORT\x10\x03\x12\x10\n" ++ "\fACCESS_GRANT\x10\x04\"H\n" +"\x06Status\x12\x1c\n" +"\x18ISSUE_STATUS_UNSPECIFIED\x10\x00\x12\b\n" +"\x04OPEN\x10\x01\x12\b\n" +diff --git a/backend/generated-go/store/issue_equal.pb.go b/backend/generated-go/store/issue_equal.pb.goindex ae52a19e8e..f9ee30e873 100644--- a/backend/generated-go/store/issue_equal.pb.go+++ b/backend/generated-go/store/issue_equal.pb.go@@ -32,6 +32,9 @@ func (x *Issue) Equal(y *Issue) bool {if x.RiskLevel != y.RiskLevel {return false}+ if x.AccessGrantId != y.AccessGrantId {+ return false+ }return true}diff --git a/backend/generated-go/v1/access_grant_service.pb.go b/backend/generated-go/v1/access_grant_service.pb.goindex 5703312c92..0019624bad 100644--- a/backend/generated-go/v1/access_grant_service.pb.go+++ b/backend/generated-go/v1/access_grant_service.pb.go@@ -117,6 +117,7 @@ type AccessGrant struct {Unmask bool `protobuf:"varint,8,opt,name=unmask,proto3" json:"unmask,omitempty"`CreateTime *timestamppb.Timestamp `protobuf:"bytes,9,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`UpdateTime *timestamppb.Timestamp `protobuf:"bytes,10,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`+ Reason string `protobuf:"bytes,12,opt,name=reason,proto3" json:"reason,omitempty"`unknownFields protoimpl.UnknownFieldssizeCache protoimpl.SizeCache}@@ -239,6 +240,13 @@ func (x *AccessGrant) GetUpdateTime() *timestamppb.Timestamp {return nil}+func (x *AccessGrant) GetReason() string {+ if x != nil {+ return x.Reason+ }+ return ""+}+type isAccessGrant_Expiration interface {isAccessGrant_Expiration()}@@ -732,7 +740,7 @@ var File_v1_access_grant_service_proto protoreflect.FileDescriptorconst file_v1_access_grant_service_proto_rawDesc = "" +"\n" +- "\x1dv1/access_grant_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\x1egoogle/protobuf/duration.proto\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x13v1/annotation.proto\"\x82\x05\n" ++ "\x1dv1/access_grant_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\x1egoogle/protobuf/duration.proto\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x13v1/annotation.proto\"\x9a\x05\n" +"\vAccessGrant\x12\x12\n" +"\x04name\x18\x01 \x01(\tR\x04name\x12\x1d\n" +"\acreator\x18\x02 \x01(\tB\x03\xe0A\x02R\acreator\x12<\n" +@@ -748,7 +756,8 @@ const file_v1_access_grant_service_proto_rawDesc = "" +"createTime\x12@\n" +"\vupdate_time\x18\n" +" \x01(\v2\x1a.google.protobuf.TimestampB\x03\xe0A\x03R\n" +- "updateTime\"F\n" ++ "updateTime\x12\x16\n" ++ "\x06reason\x18\f \x01(\tR\x06reason\"F\n" +"\x06Status\x12\x16\n" +"\x12STATUS_UNSPECIFIED\x10\x00\x12\v\n" +"\aPENDING\x10\x01\x12\n" +diff --git a/backend/generated-go/v1/access_grant_service_equal.pb.go b/backend/generated-go/v1/access_grant_service_equal.pb.goindex eb5caa1a3c..eb15c162db 100644--- a/backend/generated-go/v1/access_grant_service_equal.pb.go+++ b/backend/generated-go/v1/access_grant_service_equal.pb.go@@ -48,6 +48,9 @@ func (x *AccessGrant) Equal(y *AccessGrant) bool {if p, q := x.UpdateTime, y.UpdateTime; (p == nil && q != nil) || (p != nil && (q == nil || p.Seconds != q.Seconds || p.Nanos != q.Nanos)) {return false}+ if x.Reason != y.Reason {+ return false+ }return true}diff --git a/backend/generated-go/v1/subscription_service.pb.go b/backend/generated-go/v1/subscription_service.pb.goindex 9aff0667e6..a7d7cf3d48 100644--- a/backend/generated-go/v1/subscription_service.pb.go+++ b/backend/generated-go/v1/subscription_service.pb.go@@ -135,29 +135,30 @@ const (PlanFeature_FEATURE_DISALLOW_PASSWORD_SIGNIN PlanFeature = 46PlanFeature_FEATURE_CUSTOM_ROLES PlanFeature = 47PlanFeature_FEATURE_REQUEST_ROLE_WORKFLOW PlanFeature = 48- PlanFeature_FEATURE_DATA_MASKING PlanFeature = 49- PlanFeature_FEATURE_DATA_CLASSIFICATION PlanFeature = 50- PlanFeature_FEATURE_SCIM PlanFeature = 51- PlanFeature_FEATURE_DIRECTORY_SYNC PlanFeature = 52- PlanFeature_FEATURE_TOKEN_DURATION_CONTROL PlanFeature = 53- PlanFeature_FEATURE_EXTERNAL_SECRET_MANAGER PlanFeature = 54- PlanFeature_FEATURE_USER_EMAIL_DOMAIN_RESTRICTION PlanFeature = 55+ PlanFeature_FEATURE_JIT PlanFeature = 49+ PlanFeature_FEATURE_DATA_MASKING PlanFeature = 50+ PlanFeature_FEATURE_DATA_CLASSIFICATION PlanFeature = 51+ PlanFeature_FEATURE_SCIM PlanFeature = 52+ PlanFeature_FEATURE_DIRECTORY_SYNC PlanFeature = 53+ PlanFeature_FEATURE_TOKEN_DURATION_CONTROL PlanFeature = 54+ PlanFeature_FEATURE_EXTERNAL_SECRET_MANAGER PlanFeature = 55+ PlanFeature_FEATURE_USER_EMAIL_DOMAIN_RESTRICTION PlanFeature = 56// Administration & Support- PlanFeature_FEATURE_PROJECT_MANAGEMENT PlanFeature = 56- PlanFeature_FEATURE_ENVIRONMENT_MANAGEMENT PlanFeature = 57- PlanFeature_FEATURE_IM_NOTIFICATIONS PlanFeature = 58- PlanFeature_FEATURE_TERRAFORM_PROVIDER PlanFeature = 59- PlanFeature_FEATURE_DATABASE_GROUPS PlanFeature = 60- PlanFeature_FEATURE_ENVIRONMENT_TIERS PlanFeature = 61- PlanFeature_FEATURE_DASHBOARD_ANNOUNCEMENT PlanFeature = 62- PlanFeature_FEATURE_API_INTEGRATION_GUIDANCE PlanFeature = 63- PlanFeature_FEATURE_CUSTOM_LOGO PlanFeature = 64- PlanFeature_FEATURE_WATERMARK PlanFeature = 65- PlanFeature_FEATURE_ROADMAP_PRIORITIZATION PlanFeature = 66- PlanFeature_FEATURE_CUSTOM_MSA PlanFeature = 67- PlanFeature_FEATURE_COMMUNITY_SUPPORT PlanFeature = 68- PlanFeature_FEATURE_EMAIL_SUPPORT PlanFeature = 69- PlanFeature_FEATURE_DEDICATED_SUPPORT_WITH_SLA PlanFeature = 70+ PlanFeature_FEATURE_PROJECT_MANAGEMENT PlanFeature = 57+ PlanFeature_FEATURE_ENVIRONMENT_MANAGEMENT PlanFeature = 58+ PlanFeature_FEATURE_IM_NOTIFICATIONS PlanFeature = 59+ PlanFeature_FEATURE_TERRAFORM_PROVIDER PlanFeature = 60+ PlanFeature_FEATURE_DATABASE_GROUPS PlanFeature = 61+ PlanFeature_FEATURE_ENVIRONMENT_TIERS PlanFeature = 62+ PlanFeature_FEATURE_DASHBOARD_ANNOUNCEMENT PlanFeature = 63+ PlanFeature_FEATURE_API_INTEGRATION_GUIDANCE PlanFeature = 64+ PlanFeature_FEATURE_CUSTOM_LOGO PlanFeature = 65+ PlanFeature_FEATURE_WATERMARK PlanFeature = 66+ PlanFeature_FEATURE_ROADMAP_PRIORITIZATION PlanFeature = 67+ PlanFeature_FEATURE_CUSTOM_MSA PlanFeature = 68+ PlanFeature_FEATURE_COMMUNITY_SUPPORT PlanFeature = 69+ PlanFeature_FEATURE_EMAIL_SUPPORT PlanFeature = 70+ PlanFeature_FEATURE_DEDICATED_SUPPORT_WITH_SLA PlanFeature = 71)// Enum value maps for PlanFeature.@@ -212,28 +213,29 @@ var (46: "FEATURE_DISALLOW_PASSWORD_SIGNIN",47: "FEATURE_CUSTOM_ROLES",48: "FEATURE_REQUEST_ROLE_WORKFLOW",- 49: "FEATURE_DATA_MASKING",- 50: "FEATURE_DATA_CLASSIFICATION",- 51: "FEATURE_SCIM",- 52: "FEATURE_DIRECTORY_SYNC",- 53: "FEATURE_TOKEN_DURATION_CONTROL",- 54: "FEATURE_EXTERNAL_SECRET_MANAGER",- 55: "FEATURE_USER_EMAIL_DOMAIN_RESTRICTION",- 56: "FEATURE_PROJECT_MANAGEMENT",- 57: "FEATURE_ENVIRONMENT_MANAGEMENT",- 58: "FEATURE_IM_NOTIFICATIONS",- 59: "FEATURE_TERRAFORM_PROVIDER",- 60: "FEATURE_DATABASE_GROUPS",- 61: "FEATURE_ENVIRONMENT_TIERS",- 62: "FEATURE_DASHBOARD_ANNOUNCEMENT",- 63: "FEATURE_API_INTEGRATION_GUIDANCE",- 64: "FEATURE_CUSTOM_LOGO",- 65: "FEATURE_WATERMARK",- 66: "FEATURE_ROADMAP_PRIORITIZATION",- 67: "FEATURE_CUSTOM_MSA",- 68: "FEATURE_COMMUNITY_SUPPORT",- 69: "FEATURE_EMAIL_SUPPORT",- 70: "FEATURE_DEDICATED_SUPPORT_WITH_SLA",+ 49: "FEATURE_JIT",+ 50: "FEATURE_DATA_MASKING",+ 51: "FEATURE_DATA_CLASSIFICATION",+ 52: "FEATURE_SCIM",+ 53: "FEATURE_DIRECTORY_SYNC",+ 54: "FEATURE_TOKEN_DURATION_CONTROL",+ 55: "FEATURE_EXTERNAL_SECRET_MANAGER",+ 56: "FEATURE_USER_EMAIL_DOMAIN_RESTRICTION",+ 57: "FEATURE_PROJECT_MANAGEMENT",+ 58: "FEATURE_ENVIRONMENT_MANAGEMENT",+ 59: "FEATURE_IM_NOTIFICATIONS",+ 60: "FEATURE_TERRAFORM_PROVIDER",+ 61: "FEATURE_DATABASE_GROUPS",+ 62: "FEATURE_ENVIRONMENT_TIERS",+ 63: "FEATURE_DASHBOARD_ANNOUNCEMENT",+ 64: "FEATURE_API_INTEGRATION_GUIDANCE",+ 65: "FEATURE_CUSTOM_LOGO",+ 66: "FEATURE_WATERMARK",+ 67: "FEATURE_ROADMAP_PRIORITIZATION",+ 68: "FEATURE_CUSTOM_MSA",+ 69: "FEATURE_COMMUNITY_SUPPORT",+ 70: "FEATURE_EMAIL_SUPPORT",+ 71: "FEATURE_DEDICATED_SUPPORT_WITH_SLA",}PlanFeature_value = map[string]int32{"FEATURE_UNSPECIFIED": 0,@@ -285,28 +287,29 @@ var ("FEATURE_DISALLOW_PASSWORD_SIGNIN": 46,"FEATURE_CUSTOM_ROLES": 47,"FEATURE_REQUEST_ROLE_WORKFLOW": 48,- "FEATURE_DATA_MASKING": 49,- "FEATURE_DATA_CLASSIFICATION": 50,- "FEATURE_SCIM": 51,- "FEATURE_DIRECTORY_SYNC": 52,- "FEATURE_TOKEN_DURATION_CONTROL": 53,- "FEATURE_EXTERNAL_SECRET_MANAGER": 54,- "FEATURE_USER_EMAIL_DOMAIN_RESTRICTION": 55,- "FEATURE_PROJECT_MANAGEMENT": 56,- "FEATURE_ENVIRONMENT_MANAGEMENT": 57,- "FEATURE_IM_NOTIFICATIONS": 58,- "FEATURE_TERRAFORM_PROVIDER": 59,- "FEATURE_DATABASE_GROUPS": 60,- "FEATURE_ENVIRONMENT_TIERS": 61,- "FEATURE_DASHBOARD_ANNOUNCEMENT": 62,- "FEATURE_API_INTEGRATION_GUIDANCE": 63,- "FEATURE_CUSTOM_LOGO": 64,- "FEATURE_WATERMARK": 65,- "FEATURE_ROADMAP_PRIORITIZATION": 66,- "FEATURE_CUSTOM_MSA": 67,- "FEATURE_COMMUNITY_SUPPORT": 68,- "FEATURE_EMAIL_SUPPORT": 69,- "FEATURE_DEDICATED_SUPPORT_WITH_SLA": 70,+ "FEATURE_JIT": 49,+ "FEATURE_DATA_MASKING": 50,+ "FEATURE_DATA_CLASSIFICATION": 51,+ "FEATURE_SCIM": 52,+ "FEATURE_DIRECTORY_SYNC": 53,+ "FEATURE_TOKEN_DURATION_CONTROL": 54,+ "FEATURE_EXTERNAL_SECRET_MANAGER": 55,+ "FEATURE_USER_EMAIL_DOMAIN_RESTRICTION": 56,+ "FEATURE_PROJECT_MANAGEMENT": 57,+ "FEATURE_ENVIRONMENT_MANAGEMENT": 58,+ "FEATURE_IM_NOTIFICATIONS": 59,+ "FEATURE_TERRAFORM_PROVIDER": 60,+ "FEATURE_DATABASE_GROUPS": 61,+ "FEATURE_ENVIRONMENT_TIERS": 62,+ "FEATURE_DASHBOARD_ANNOUNCEMENT": 63,+ "FEATURE_API_INTEGRATION_GUIDANCE": 64,+ "FEATURE_CUSTOM_LOGO": 65,+ "FEATURE_WATERMARK": 66,+ "FEATURE_ROADMAP_PRIORITIZATION": 67,+ "FEATURE_CUSTOM_MSA": 68,+ "FEATURE_COMMUNITY_SUPPORT": 69,+ "FEATURE_EMAIL_SUPPORT": 70,+ "FEATURE_DEDICATED_SUPPORT_WITH_SLA": 71,})@@ -682,7 +685,7 @@ const file_v1_subscription_service_proto_rawDesc = "" +"\x04FREE\x10\x01\x12\b\n" +"\x04TEAM\x10\x02\x12\x0e\n" +"\n" +- "ENTERPRISE\x10\x03*\xd0\x12\n" ++ "ENTERPRISE\x10\x03*\xe1\x12\n" +"\vPlanFeature\x12\x17\n" +"\x13FEATURE_UNSPECIFIED\x10\x00\x12\x1b\n" +"\x17FEATURE_DATABASE_CHANGE\x10\x01\x12,\n" +@@ -733,29 +736,30 @@ const file_v1_subscription_service_proto_rawDesc = "" +"\x1dFEATURE_PASSWORD_RESTRICTIONS\x10-\x12$\n" +" FEATURE_DISALLOW_PASSWORD_SIGNIN\x10.\x12\x18\n" +"\x14FEATURE_CUSTOM_ROLES\x10/\x12!\n" +- "\x1dFEATURE_REQUEST_ROLE_WORKFLOW\x100\x12\x18\n" +- "\x14FEATURE_DATA_MASKING\x101\x12\x1f\n" +- "\x1bFEATURE_DATA_CLASSIFICATION\x102\x12\x10\n" +- "\fFEATURE_SCIM\x103\x12\x1a\n" +- "\x16FEATURE_DIRECTORY_SYNC\x104\x12\"\n" +- "\x1eFEATURE_TOKEN_DURATION_CONTROL\x105\x12#\n" +- "\x1fFEATURE_EXTERNAL_SECRET_MANAGER\x106\x12)\n" +- "%FEATURE_USER_EMAIL_DOMAIN_RESTRICTION\x107\x12\x1e\n" +- "\x1aFEATURE_PROJECT_MANAGEMENT\x108\x12\"\n" +- "\x1eFEATURE_ENVIRONMENT_MANAGEMENT\x109\x12\x1c\n" +- "\x18FEATURE_IM_NOTIFICATIONS\x10:\x12\x1e\n" +- "\x1aFEATURE_TERRAFORM_PROVIDER\x10;\x12\x1b\n" +- "\x17FEATURE_DATABASE_GROUPS\x10<\x12\x1d\n" +- "\x19FEATURE_ENVIRONMENT_TIERS\x10=\x12\"\n" +- "\x1eFEATURE_DASHBOARD_ANNOUNCEMENT\x10>\x12$\n" +- " FEATURE_API_INTEGRATION_GUIDANCE\x10?\x12\x17\n" +- "\x13FEATURE_CUSTOM_LOGO\x10@\x12\x15\n" +- "\x11FEATURE_WATERMARK\x10A\x12\"\n" +- "\x1eFEATURE_ROADMAP_PRIORITIZATION\x10B\x12\x16\n" +- "\x12FEATURE_CUSTOM_MSA\x10C\x12\x1d\n" +- "\x19FEATURE_COMMUNITY_SUPPORT\x10D\x12\x19\n" +- "\x15FEATURE_EMAIL_SUPPORT\x10E\x12&\n" +- "\"FEATURE_DEDICATED_SUPPORT_WITH_SLA\x10F2\xa5\x02\n" ++ "\x1dFEATURE_REQUEST_ROLE_WORKFLOW\x100\x12\x0f\n" ++ "\vFEATURE_JIT\x101\x12\x18\n" ++ "\x14FEATURE_DATA_MASKING\x102\x12\x1f\n" ++ "\x1bFEATURE_DATA_CLASSIFICATION\x103\x12\x10\n" ++ "\fFEATURE_SCIM\x104\x12\x1a\n" ++ "\x16FEATURE_DIRECTORY_SYNC\x105\x12\"\n" ++ "\x1eFEATURE_TOKEN_DURATION_CONTROL\x106\x12#\n" ++ "\x1fFEATURE_EXTERNAL_SECRET_MANAGER\x107\x12)\n" ++ "%FEATURE_USER_EMAIL_DOMAIN_RESTRICTION\x108\x12\x1e\n" ++ "\x1aFEATURE_PROJECT_MANAGEMENT\x109\x12\"\n" ++ "\x1eFEATURE_ENVIRONMENT_MANAGEMENT\x10:\x12\x1c\n" ++ "\x18FEATURE_IM_NOTIFICATIONS\x10;\x12\x1e\n" ++ "\x1aFEATURE_TERRAFORM_PROVIDER\x10<\x12\x1b\n" ++ "\x17FEATURE_DATABASE_GROUPS\x10=\x12\x1d\n" ++ "\x19FEATURE_ENVIRONMENT_TIERS\x10>\x12\"\n" ++ "\x1eFEATURE_DASHBOARD_ANNOUNCEMENT\x10?\x12$\n" ++ " FEATURE_API_INTEGRATION_GUIDANCE\x10@\x12\x17\n" ++ "\x13FEATURE_CUSTOM_LOGO\x10A\x12\x15\n" ++ "\x11FEATURE_WATERMARK\x10B\x12\"\n" ++ "\x1eFEATURE_ROADMAP_PRIORITIZATION\x10C\x12\x16\n" ++ "\x12FEATURE_CUSTOM_MSA\x10D\x12\x1d\n" ++ "\x19FEATURE_COMMUNITY_SUPPORT\x10E\x12\x19\n" ++ "\x15FEATURE_EMAIL_SUPPORT\x10F\x12&\n" ++ "\"FEATURE_DEDICATED_SUPPORT_WITH_SLA\x10G2\xa5\x02\n" +"\x13SubscriptionService\x12r\n" +"\x0fGetSubscription\x12#.bytebase.v1.GetSubscriptionRequest\x1a\x19.bytebase.v1.Subscription\"\x1f\xdaA\x00\x80\xea0\x01\x82\xd3\xe4\x93\x02\x12\x12\x10/v1/subscription\x12\x99\x01\n" +"\x12UpdateSubscription\x12&.bytebase.v1.UpdateSubscriptionRequest\x1a\x19.bytebase.v1.Subscription\"@\xdaA\x05patch\x8a\xea0\x0fbb.settings.set\x90\xea0\x01\x82\xd3\xe4\x93\x02\x1b:\alicense2\x10/v1/subscriptionB\xae\x01\n" +diff --git a/backend/runner/approval/runner.go b/backend/runner/approval/runner.goindex 5ea16254d5..98e2768cbc 100644--- a/backend/runner/approval/runner.go+++ b/backend/runner/approval/runner.go@@ -369,6 +369,7 @@ func buildFallbackCELVars(celVarsList []map[string]any) []map[string]any {// Returns a list of CEL variable maps (one per task/component), done flag, and error.// done=false means the caller should retry later (e.g., waiting for plan check runs).func buildCELVariablesForIssue(ctx context.Context, stores *store.Store, issue *store.IssueMessage) ([]map[string]any, bool, error) {+ // TODO: do we need different approval flow for the ACCESS_GRANT issue?switch issue.Type {case storepb.Issue_GRANT_REQUEST:return buildCELVariablesForGrantRequest(ctx, stores, issue)diff --git a/backend/server/grpc_routes.go b/backend/server/grpc_routes.goindex a670fb7dda..470b2dd4c8 100644--- a/backend/server/grpc_routes.go+++ b/backend/server/grpc_routes.go@@ -87,7 +87,7 @@ func configureGrpcRouters(grpcruntime.DefaultHTTPErrorHandler(ctx, sm, m, w, r, err)}),)- accessGrantService := apiv1.NewAccessGrantService(stores)+ accessGrantService := apiv1.NewAccessGrantService(stores, licenseService, webhookManager, bus)actuatorService := apiv1.NewActuatorService(stores, profile, schemaSyncer, licenseService, sampleInstanceManager)auditLogService := apiv1.NewAuditLogService(stores, licenseService)authService := apiv1.NewAuthService(stores, secret, licenseService, profile, iamManager)diff --git a/backend/store/access_grant.go b/backend/store/access_grant.goindex 5a408a5368..b10aefeada 100644--- a/backend/store/access_grant.go+++ b/backend/store/access_grant.go@@ -25,8 +25,11 @@ type AccessGrantMessage struct {Status storepb.AccessGrant_StatusExpireTime time.TimePayload *storepb.AccessGrantPayload+ // Reason is used as the issue description during creation.+ Reason string// Output only.ID string+ IssueUID intCreatedAt time.TimeUpdatedAt time.Time}@@ -44,7 +47,8 @@ type FindAccessGrantMessage struct {// UpdateAccessGrantMessage is the message for updating an access grant.type UpdateAccessGrantMessage struct {- Status *storepb.AccessGrant_Status+ Status *storepb.AccessGrant_Status+ Payload *storepb.AccessGrantPayload}// CreateAccessGrant creates a new access grant.@@ -55,7 +59,6 @@ func (s *Store) CreateAccessGrant(ctx context.Context, create *AccessGrantMessag}create.ID = uuid.NewString()-q := qb.Q().Space(`INSERT INTO access_grant (id,@@ -73,7 +76,6 @@ func (s *Store) CreateAccessGrant(ctx context.Context, create *AccessGrantMessagif err != nil {return nil, errors.Wrapf(err, "failed to build sql")}-if err := s.GetDB().QueryRowContext(ctx, query, args...).Scan(&create.CreatedAt, &create.UpdatedAt); err != nil {return nil, errors.Wrapf(err, "failed to insert access grant")}@@ -187,6 +189,13 @@ func (s *Store) UpdateAccessGrant(ctx context.Context, id string, update *Updateif v := update.Status; v != nil {set.Comma("status = ?", v.String())}+ if v := update.Payload; v != nil {+ p, err := protojson.Marshal(v)+ if err != nil {+ return nil, errors.Wrapf(err, "failed to marshal payload")+ }+ set.Comma("payload = ?", p)+ }if set.Len() == 0 {return nil, errors.New("no update field provided")}diff --git a/frontend/src/types/iam/permission-generated.ts b/frontend/src/types/iam/permission-generated.tsindex e0d0fe805d..af527198ef 100644--- a/frontend/src/types/iam/permission-generated.ts+++ b/frontend/src/types/iam/permission-generated.ts@@ -2,6 +2,11 @@// Run 'pnpm run generate:permissions' or 'sh scripts/copy_config_files.sh' to regenerate.export type Permission =+ | "bb.accessGrants.activate"+ | "bb.accessGrants.create"+ | "bb.accessGrants.get"+ | "bb.accessGrants.list"+ | "bb.accessGrants.revoke"| "bb.auditLogs.export"| "bb.auditLogs.search"| "bb.changelogs.get"diff --git a/frontend/src/types/proto-es/v1/access_grant_service_pb.d.ts b/frontend/src/types/proto-es/v1/access_grant_service_pb.d.tsindex 75e22090c8..18ec30b4f4 100644--- a/frontend/src/types/proto-es/v1/access_grant_service_pb.d.ts+++ b/frontend/src/types/proto-es/v1/access_grant_service_pb.d.ts@@ -108,6 +108,11 @@ export declare type AccessGrant = Message<"bytebase.v1.AccessGrant"> & {* @generated from field: google.protobuf.Timestamp update_time = 10;*/updateTime?: Timestamp;++ /**+ * @generated from field: string reason = 12;+ */+ reason: string;};/**diff --git a/frontend/src/types/proto-es/v1/access_grant_service_pb.js b/frontend/src/types/proto-es/v1/access_grant_service_pb.jsindex 4b4f2b134f..3936505d93 100644--- a/frontend/src/types/proto-es/v1/access_grant_service_pb.js+++ b/frontend/src/types/proto-es/v1/access_grant_service_pb.js@@ -14,7 +14,7 @@ import { file_v1_annotation } from "./annotation_pb";* Describes the file v1/access_grant_service.proto.*/export const file_v1_access_grant_service = /*@__PURE__*/- fileDesc("Ch12MS9hY2Nlc3NfZ3JhbnRfc2VydmljZS5wcm90bxILYnl0ZWJhc2UudjEiowQKC0FjY2Vzc0dyYW50EgwKBG5hbWUYASABKAkSFAoHY3JlYXRvchgCIAEoCUID4EECEjQKBnN0YXR1cxgDIAEoDjIfLmJ5dGViYXNlLnYxLkFjY2Vzc0dyYW50LlN0YXR1c0ID4EEDEjEKC2V4cGlyZV90aW1lGAQgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcEgAEi0KA3R0bBgLIAEoCzIZLmdvb2dsZS5wcm90b2J1Zi5EdXJhdGlvbkID4EEESAASEgoFaXNzdWUYBSABKAlCA+BBAxIUCgd0YXJnZXRzGAYgAygJQgPgQQISDQoFcXVlcnkYByABKAkSDgoGdW5tYXNrGAggASgIEjQKC2NyZWF0ZV90aW1lGAkgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcEID4EEDEjQKC3VwZGF0ZV90aW1lGAogASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcEID4EEDIkYKBlN0YXR1cxIWChJTVEFUVVNfVU5TUEVDSUZJRUQQABILCgdQRU5ESU5HEAESCgoGQUNUSVZFEAISCwoHUkVWT0tFRBADOk3qQUoKGGJ5dGViYXNlLmNvbS9BY2Nlc3NHcmFudBIucHJvamVjdHMve3Byb2plY3R9L2FjY2Vzc0dyYW50cy97YWNjZXNzX2dyYW50fUIMCgpleHBpcmF0aW9uIkcKFUdldEFjY2Vzc0dyYW50UmVxdWVzdBIuCgRuYW1lGAEgASgJQiDgQQL6QRoKGGJ5dGViYXNlLmNvbS9BY2Nlc3NHcmFudCJ+ChdMaXN0QWNjZXNzR3JhbnRzUmVxdWVzdBIsCgZwYXJlbnQYASABKAlCHOBBAvpBFgoUYnl0ZWJhc2UuY29tL1Byb2plY3QSEQoJcGFnZV9zaXplGAIgASgFEhIKCnBhZ2VfdG9rZW4YAyABKAkSDgoGZmlsdGVyGAQgASgJImQKGExpc3RBY2Nlc3NHcmFudHNSZXNwb25zZRIvCg1hY2Nlc3NfZ3JhbnRzGAEgAygLMhguYnl0ZWJhc2UudjEuQWNjZXNzR3JhbnQSFwoPbmV4dF9wYWdlX3Rva2VuGAIgASgJIn0KGENyZWF0ZUFjY2Vzc0dyYW50UmVxdWVzdBIsCgZwYXJlbnQYASABKAlCHOBBAvpBFgoUYnl0ZWJhc2UuY29tL1Byb2plY3QSMwoMYWNjZXNzX2dyYW50GAIgASgLMhguYnl0ZWJhc2UudjEuQWNjZXNzR3JhbnRCA+BBAiJMChpBY3RpdmF0ZUFjY2Vzc0dyYW50UmVxdWVzdBIuCgRuYW1lGAEgASgJQiDgQQL6QRoKGGJ5dGViYXNlLmNvbS9BY2Nlc3NHcmFudCJKChhSZXZva2VBY2Nlc3NHcmFudFJlcXVlc3QSLgoEbmFtZRgBIAEoCUIg4EEC+kEaChhieXRlYmFzZS5jb20vQWNjZXNzR3JhbnQiggEKG1NlYXJjaE15QWNjZXNzR3JhbnRzUmVxdWVzdBIsCgZwYXJlbnQYASABKAlCHOBBAvpBFgoUYnl0ZWJhc2UuY29tL1Byb2plY3QSEQoJcGFnZV9zaXplGAIgASgFEhIKCnBhZ2VfdG9rZW4YAyABKAkSDgoGZmlsdGVyGAQgASgJImgKHFNlYXJjaE15QWNjZXNzR3JhbnRzUmVzcG9uc2USLwoNYWNjZXNzX2dyYW50cxgBIAMoCzIYLmJ5dGViYXNlLnYxLkFjY2Vzc0dyYW50EhcKD25leHRfcGFnZV90b2tlbhgCIAEoCTLwCAoSQWNjZXNzR3JhbnRTZXJ2aWNlEp4BCg5HZXRBY2Nlc3NHcmFudBIiLmJ5dGViYXNlLnYxLkdldEFjY2Vzc0dyYW50UmVxdWVzdBoYLmJ5dGViYXNlLnYxLkFjY2Vzc0dyYW50Ik7aQQRuYW1liuowE2JiLmFjY2Vzc0dyYW50cy5nZXSQ6jABgtPkkwImEiQvdjEve25hbWU9cHJvamVjdHMvKi9hY2Nlc3NHcmFudHMvKn0SsgEKEExpc3RBY2Nlc3NHcmFudHMSJC5ieXRlYmFzZS52MS5MaXN0QWNjZXNzR3JhbnRzUmVxdWVzdBolLmJ5dGViYXNlLnYxLkxpc3RBY2Nlc3NHcmFudHNSZXNwb25zZSJR2kEGcGFyZW50iuowFGJiLmFjY2Vzc0dyYW50cy5saXN0kOowAYLT5JMCJhIkL3YxL3twYXJlbnQ9cHJvamVjdHMvKn0vYWNjZXNzR3JhbnRzEsgBChFDcmVhdGVBY2Nlc3NHcmFudBIlLmJ5dGViYXNlLnYxLkNyZWF0ZUFjY2Vzc0dyYW50UmVxdWVzdBoYLmJ5dGViYXNlLnYxLkFjY2Vzc0dyYW50InLaQRNwYXJlbnQsYWNjZXNzX2dyYW50iuowFmJiLmFjY2Vzc0dyYW50cy5jcmVhdGWQ6jABmOowAYLT5JMCNDoMYWNjZXNzX2dyYW50IiQvdjEve3BhcmVudD1wcm9qZWN0cy8qfS9hY2Nlc3NHcmFudHMSvQEKE0FjdGl2YXRlQWNjZXNzR3JhbnQSJy5ieXRlYmFzZS52MS5BY3RpdmF0ZUFjY2Vzc0dyYW50UmVxdWVzdBoYLmJ5dGViYXNlLnYxLkFjY2Vzc0dyYW50ImPaQQRuYW1liuowGGJiLmFjY2Vzc0dyYW50cy5hY3RpdmF0ZZDqMAGY6jABgtPkkwIyOgEqIi0vdjEve25hbWU9cHJvamVjdHMvKi9hY2Nlc3NHcmFudHMvKn06YWN0aXZhdGUStQEKEVJldm9rZUFjY2Vzc0dyYW50EiUuYnl0ZWJhc2UudjEuUmV2b2tlQWNjZXNzR3JhbnRSZXF1ZXN0GhguYnl0ZWJhc2UudjEuQWNjZXNzR3JhbnQiX9pBBG5hbWWK6jAWYmIuYWNjZXNzR3JhbnRzLnJldm9rZZDqMAGY6jABgtPkkwIwOgEqIisvdjEve25hbWU9cHJvamVjdHMvKi9hY2Nlc3NHcmFudHMvKn06cmV2b2tlEsABChRTZWFyY2hNeUFjY2Vzc0dyYW50cxIoLmJ5dGViYXNlLnYxLlNlYXJjaE15QWNjZXNzR3JhbnRzUmVxdWVzdBopLmJ5dGViYXNlLnYxLlNlYXJjaE15QWNjZXNzR3JhbnRzUmVzcG9uc2UiU4rqMBNiYi5hY2Nlc3NHcmFudHMuZ2V0kOowAoLT5JMCMjoBKiItL3YxL3twYXJlbnQ9cHJvamVjdHMvKn0vYWNjZXNzR3JhbnRzOnNlYXJjaE15Qq0BCg9jb20uYnl0ZWJhc2UudjFCF0FjY2Vzc0dyYW50U2VydmljZVByb3RvUAFaNGdpdGh1Yi5jb20vYnl0ZWJhc2UvYnl0ZWJhc2UvYmFja2VuZC9nZW5lcmF0ZWQtZ28vdjGiAgNCWFiqAgtCeXRlYmFzZS5WMcoCC0J5dGViYXNlXFYx4gIXQnl0ZWJhc2VcVjFcR1BCTWV0YWRhdGHqAgxCeXRlYmFzZTo6VjFiBnByb3RvMw", [file_google_api_annotations, file_google_api_client, file_google_api_field_behavior, file_google_api_resource, file_google_protobuf_duration, file_google_protobuf_timestamp, file_v1_annotation]);+ fileDesc("Ch12MS9hY2Nlc3NfZ3JhbnRfc2VydmljZS5wcm90bxILYnl0ZWJhc2UudjEiswQKC0FjY2Vzc0dyYW50EgwKBG5hbWUYASABKAkSFAoHY3JlYXRvchgCIAEoCUID4EECEjQKBnN0YXR1cxgDIAEoDjIfLmJ5dGViYXNlLnYxLkFjY2Vzc0dyYW50LlN0YXR1c0ID4EEDEjEKC2V4cGlyZV90aW1lGAQgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcEgAEi0KA3R0bBgLIAEoCzIZLmdvb2dsZS5wcm90b2J1Zi5EdXJhdGlvbkID4EEESAASEgoFaXNzdWUYBSABKAlCA+BBAxIUCgd0YXJnZXRzGAYgAygJQgPgQQISDQoFcXVlcnkYByABKAkSDgoGdW5tYXNrGAggASgIEjQKC2NyZWF0ZV90aW1lGAkgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcEID4EEDEjQKC3VwZGF0ZV90aW1lGAogASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcEID4EEDEg4KBnJlYXNvbhgMIAEoCSJGCgZTdGF0dXMSFgoSU1RBVFVTX1VOU1BFQ0lGSUVEEAASCwoHUEVORElORxABEgoKBkFDVElWRRACEgsKB1JFVk9LRUQQAzpN6kFKChhieXRlYmFzZS5jb20vQWNjZXNzR3JhbnQSLnByb2plY3RzL3twcm9qZWN0fS9hY2Nlc3NHcmFudHMve2FjY2Vzc19ncmFudH1CDAoKZXhwaXJhdGlvbiJHChVHZXRBY2Nlc3NHcmFudFJlcXVlc3QSLgoEbmFtZRgBIAEoCUIg4EEC+kEaChhieXRlYmFzZS5jb20vQWNjZXNzR3JhbnQifgoXTGlzdEFjY2Vzc0dyYW50c1JlcXVlc3QSLAoGcGFyZW50GAEgASgJQhzgQQL6QRYKFGJ5dGViYXNlLmNvbS9Qcm9qZWN0EhEKCXBhZ2Vfc2l6ZRgCIAEoBRISCgpwYWdlX3Rva2VuGAMgASgJEg4KBmZpbHRlchgEIAEoCSJkChhMaXN0QWNjZXNzR3JhbnRzUmVzcG9uc2USLwoNYWNjZXNzX2dyYW50cxgBIAMoCzIYLmJ5dGViYXNlLnYxLkFjY2Vzc0dyYW50EhcKD25leHRfcGFnZV90b2tlbhgCIAEoCSJ9ChhDcmVhdGVBY2Nlc3NHcmFudFJlcXVlc3QSLAoGcGFyZW50GAEgASgJQhzgQQL6QRYKFGJ5dGViYXNlLmNvbS9Qcm9qZWN0EjMKDGFjY2Vzc19ncmFudBgCIAEoCzIYLmJ5dGViYXNlLnYxLkFjY2Vzc0dyYW50QgPgQQIiTAoaQWN0aXZhdGVBY2Nlc3NHcmFudFJlcXVlc3QSLgoEbmFtZRgBIAEoCUIg4EEC+kEaChhieXRlYmFzZS5jb20vQWNjZXNzR3JhbnQiSgoYUmV2b2tlQWNjZXNzR3JhbnRSZXF1ZXN0Ei4KBG5hbWUYASABKAlCIOBBAvpBGgoYYnl0ZWJhc2UuY29tL0FjY2Vzc0dyYW50IoIBChtTZWFyY2hNeUFjY2Vzc0dyYW50c1JlcXVlc3QSLAoGcGFyZW50GAEgASgJQhzgQQL6QRYKFGJ5dGViYXNlLmNvbS9Qcm9qZWN0EhEKCXBhZ2Vfc2l6ZRgCIAEoBRISCgpwYWdlX3Rva2VuGAMgASgJEg4KBmZpbHRlchgEIAEoCSJoChxTZWFyY2hNeUFjY2Vzc0dyYW50c1Jlc3BvbnNlEi8KDWFjY2Vzc19ncmFudHMYASADKAsyGC5ieXRlYmFzZS52MS5BY2Nlc3NHcmFudBIXCg9uZXh0X3BhZ2VfdG9rZW4YAiABKAky8AgKEkFjY2Vzc0dyYW50U2VydmljZRKeAQoOR2V0QWNjZXNzR3JhbnQSIi5ieXRlYmFzZS52MS5HZXRBY2Nlc3NHcmFudFJlcXVlc3QaGC5ieXRlYmFzZS52MS5BY2Nlc3NHcmFudCJO2kEEbmFtZYrqMBNiYi5hY2Nlc3NHcmFudHMuZ2V0kOowAYLT5JMCJhIkL3YxL3tuYW1lPXByb2plY3RzLyovYWNjZXNzR3JhbnRzLyp9ErIBChBMaXN0QWNjZXNzR3JhbnRzEiQuYnl0ZWJhc2UudjEuTGlzdEFjY2Vzc0dyYW50c1JlcXVlc3QaJS5ieXRlYmFzZS52MS5MaXN0QWNjZXNzR3JhbnRzUmVzcG9uc2UiUdpBBnBhcmVudIrqMBRiYi5hY2Nlc3NHcmFudHMubGlzdJDqMAGC0+STAiYSJC92MS97cGFyZW50PXByb2plY3RzLyp9L2FjY2Vzc0dyYW50cxLIAQoRQ3JlYXRlQWNjZXNzR3JhbnQSJS5ieXRlYmFzZS52MS5DcmVhdGVBY2Nlc3NHcmFudFJlcXVlc3QaGC5ieXRlYmFzZS52MS5BY2Nlc3NHcmFudCJy2kETcGFyZW50LGFjY2Vzc19ncmFudIrqMBZiYi5hY2Nlc3NHcmFudHMuY3JlYXRlkOowAZjqMAGC0+STAjQ6DGFjY2Vzc19ncmFudCIkL3YxL3twYXJlbnQ9cHJvamVjdHMvKn0vYWNjZXNzR3JhbnRzEr0BChNBY3RpdmF0ZUFjY2Vzc0dyYW50EicuYnl0ZWJhc2UudjEuQWN0aXZhdGVBY2Nlc3NHcmFudFJlcXVlc3QaGC5ieXRlYmFzZS52MS5BY2Nlc3NHcmFudCJj2kEEbmFtZYrqMBhiYi5hY2Nlc3NHcmFudHMuYWN0aXZhdGWQ6jABmOowAYLT5JMCMjoBKiItL3YxL3tuYW1lPXByb2plY3RzLyovYWNjZXNzR3JhbnRzLyp9OmFjdGl2YXRlErUBChFSZXZva2VBY2Nlc3NHcmFudBIlLmJ5dGViYXNlLnYxLlJldm9rZUFjY2Vzc0dyYW50UmVxdWVzdBoYLmJ5dGViYXNlLnYxLkFjY2Vzc0dyYW50Il/aQQRuYW1liuowFmJiLmFjY2Vzc0dyYW50cy5yZXZva2WQ6jABmOowAYLT5JMCMDoBKiIrL3YxL3tuYW1lPXByb2plY3RzLyovYWNjZXNzR3JhbnRzLyp9OnJldm9rZRLAAQoUU2VhcmNoTXlBY2Nlc3NHcmFudHMSKC5ieXRlYmFzZS52MS5TZWFyY2hNeUFjY2Vzc0dyYW50c1JlcXVlc3QaKS5ieXRlYmFzZS52MS5TZWFyY2hNeUFjY2Vzc0dyYW50c1Jlc3BvbnNlIlOK6jATYmIuYWNjZXNzR3JhbnRzLmdldJDqMAKC0+STAjI6ASoiLS92MS97cGFyZW50PXByb2plY3RzLyp9L2FjY2Vzc0dyYW50czpzZWFyY2hNeUKtAQoPY29tLmJ5dGViYXNlLnYxQhdBY2Nlc3NHcmFudFNlcnZpY2VQcm90b1ABWjRnaXRodWIuY29tL2J5dGViYXNlL2J5dGViYXNlL2JhY2tlbmQvZ2VuZXJhdGVkLWdvL3YxogIDQlhYqgILQnl0ZWJhc2UuVjHKAgtCeXRlYmFzZVxWMeICF0J5dGViYXNlXFYxXEdQQk1ldGFkYXRh6gIMQnl0ZWJhc2U6OlYxYgZwcm90bzM", [file_google_api_annotations, file_google_api_client, file_google_api_field_behavior, file_google_api_resource, file_google_protobuf_duration, file_google_protobuf_timestamp, file_v1_annotation]);/*** Describes the message bytebase.v1.AccessGrant.diff --git a/frontend/src/types/proto-es/v1/subscription_service_pb.d.ts b/frontend/src/types/proto-es/v1/subscription_service_pb.d.tsindex 71eed039e5..44c2cfca16 100644--- a/frontend/src/types/proto-es/v1/subscription_service_pb.d.ts+++ b/frontend/src/types/proto-es/v1/subscription_service_pb.d.ts@@ -452,116 +452,121 @@ export enum PlanFeature {FEATURE_REQUEST_ROLE_WORKFLOW = 48,/**- * @generated from enum value: FEATURE_DATA_MASKING = 49;+ * @generated from enum value: FEATURE_JIT = 49;*/- FEATURE_DATA_MASKING = 49,+ FEATURE_JIT = 49,/**- * @generated from enum value: FEATURE_DATA_CLASSIFICATION = 50;+ * @generated from enum value: FEATURE_DATA_MASKING = 50;*/- FEATURE_DATA_CLASSIFICATION = 50,+ FEATURE_DATA_MASKING = 50,/**- * @generated from enum value: FEATURE_SCIM = 51;+ * @generated from enum value: FEATURE_DATA_CLASSIFICATION = 51;*/- FEATURE_SCIM = 51,+ FEATURE_DATA_CLASSIFICATION = 51,/**- * @generated from enum value: FEATURE_DIRECTORY_SYNC = 52;+ * @generated from enum value: FEATURE_SCIM = 52;*/- FEATURE_DIRECTORY_SYNC = 52,+ FEATURE_SCIM = 52,/**- * @generated from enum value: FEATURE_TOKEN_DURATION_CONTROL = 53;+ * @generated from enum value: FEATURE_DIRECTORY_SYNC = 53;*/- FEATURE_TOKEN_DURATION_CONTROL = 53,+ FEATURE_DIRECTORY_SYNC = 53,/**- * @generated from enum value: FEATURE_EXTERNAL_SECRET_MANAGER = 54;+ * @generated from enum value: FEATURE_TOKEN_DURATION_CONTROL = 54;*/- FEATURE_EXTERNAL_SECRET_MANAGER = 54,+ FEATURE_TOKEN_DURATION_CONTROL = 54,/**- * @generated from enum value: FEATURE_USER_EMAIL_DOMAIN_RESTRICTION = 55;+ * @generated from enum value: FEATURE_EXTERNAL_SECRET_MANAGER = 55;*/- FEATURE_USER_EMAIL_DOMAIN_RESTRICTION = 55,+ FEATURE_EXTERNAL_SECRET_MANAGER = 55,++ /**+ * @generated from enum value: FEATURE_USER_EMAIL_DOMAIN_RESTRICTION = 56;+ */+ FEATURE_USER_EMAIL_DOMAIN_RESTRICTION = 56,/*** Administration & Support*- * @generated from enum value: FEATURE_PROJECT_MANAGEMENT = 56;+ * @generated from enum value: FEATURE_PROJECT_MANAGEMENT = 57;*/- FEATURE_PROJECT_MANAGEMENT = 56,+ FEATURE_PROJECT_MANAGEMENT = 57,/**- * @generated from enum value: FEATURE_ENVIRONMENT_MANAGEMENT = 57;+ * @generated from enum value: FEATURE_ENVIRONMENT_MANAGEMENT = 58;*/- FEATURE_ENVIRONMENT_MANAGEMENT = 57,+ FEATURE_ENVIRONMENT_MANAGEMENT = 58,/**- * @generated from enum value: FEATURE_IM_NOTIFICATIONS = 58;+ * @generated from enum value: FEATURE_IM_NOTIFICATIONS = 59;*/- FEATURE_IM_NOTIFICATIONS = 58,+ FEATURE_IM_NOTIFICATIONS = 59,/**- * @generated from enum value: FEATURE_TERRAFORM_PROVIDER = 59;+ * @generated from enum value: FEATURE_TERRAFORM_PROVIDER = 60;*/- FEATURE_TERRAFORM_PROVIDER = 59,+ FEATURE_TERRAFORM_PROVIDER = 60,/**- * @generated from enum value: FEATURE_DATABASE_GROUPS = 60;+ * @generated from enum value: FEATURE_DATABASE_GROUPS = 61;*/- FEATURE_DATABASE_GROUPS = 60,+ FEATURE_DATABASE_GROUPS = 61,/**- * @generated from enum value: FEATURE_ENVIRONMENT_TIERS = 61;+ * @generated from enum value: FEATURE_ENVIRONMENT_TIERS = 62;*/- FEATURE_ENVIRONMENT_TIERS = 61,+ FEATURE_ENVIRONMENT_TIERS = 62,/**- * @generated from enum value: FEATURE_DASHBOARD_ANNOUNCEMENT = 62;+ * @generated from enum value: FEATURE_DASHBOARD_ANNOUNCEMENT = 63;*/- FEATURE_DASHBOARD_ANNOUNCEMENT = 62,+ FEATURE_DASHBOARD_ANNOUNCEMENT = 63,/**- * @generated from enum value: FEATURE_API_INTEGRATION_GUIDANCE = 63;+ * @generated from enum value: FEATURE_API_INTEGRATION_GUIDANCE = 64;*/- FEATURE_API_INTEGRATION_GUIDANCE = 63,+ FEATURE_API_INTEGRATION_GUIDANCE = 64,/**- * @generated from enum value: FEATURE_CUSTOM_LOGO = 64;+ * @generated from enum value: FEATURE_CUSTOM_LOGO = 65;*/- FEATURE_CUSTOM_LOGO = 64,+ FEATURE_CUSTOM_LOGO = 65,/**- * @generated from enum value: FEATURE_WATERMARK = 65;+ * @generated from enum value: FEATURE_WATERMARK = 66;*/- FEATURE_WATERMARK = 65,+ FEATURE_WATERMARK = 66,/**- * @generated from enum value: FEATURE_ROADMAP_PRIORITIZATION = 66;+ * @generated from enum value: FEATURE_ROADMAP_PRIORITIZATION = 67;*/- FEATURE_ROADMAP_PRIORITIZATION = 66,+ FEATURE_ROADMAP_PRIORITIZATION = 67,/**- * @generated from enum value: FEATURE_CUSTOM_MSA = 67;+ * @generated from enum value: FEATURE_CUSTOM_MSA = 68;*/- FEATURE_CUSTOM_MSA = 67,+ FEATURE_CUSTOM_MSA = 68,/**- * @generated from enum value: FEATURE_COMMUNITY_SUPPORT = 68;+ * @generated from enum value: FEATURE_COMMUNITY_SUPPORT = 69;*/- FEATURE_COMMUNITY_SUPPORT = 68,+ FEATURE_COMMUNITY_SUPPORT = 69,/**- * @generated from enum value: FEATURE_EMAIL_SUPPORT = 69;+ * @generated from enum value: FEATURE_EMAIL_SUPPORT = 70;*/- FEATURE_EMAIL_SUPPORT = 69,+ FEATURE_EMAIL_SUPPORT = 70,/**- * @generated from enum value: FEATURE_DEDICATED_SUPPORT_WITH_SLA = 70;+ * @generated from enum value: FEATURE_DEDICATED_SUPPORT_WITH_SLA = 71;*/- FEATURE_DEDICATED_SUPPORT_WITH_SLA = 70,+ FEATURE_DEDICATED_SUPPORT_WITH_SLA = 71,}/**diff --git a/frontend/src/types/proto-es/v1/subscription_service_pb.js b/frontend/src/types/proto-es/v1/subscription_service_pb.jsindex 6c9cc3f191..a638a4f3b2 100644--- a/frontend/src/types/proto-es/v1/subscription_service_pb.js+++ b/frontend/src/types/proto-es/v1/subscription_service_pb.js@@ -13,7 +13,7 @@ import { file_v1_annotation } from "./annotation_pb";* Describes the file v1/subscription_service.proto.*/export const file_v1_subscription_service = /*@__PURE__*/- fileDesc("Ch12MS9zdWJzY3JpcHRpb25fc2VydmljZS5wcm90bxILYnl0ZWJhc2UudjEiGAoWR2V0U3Vic2NyaXB0aW9uUmVxdWVzdCJDChlVcGRhdGVTdWJzY3JpcHRpb25SZXF1ZXN0Eg8KB2xpY2Vuc2UYASABKAkSFQoNYWxsb3dfbWlzc2luZxgCIAEoCCL5AQoMU3Vic2NyaXB0aW9uEigKBHBsYW4YASABKA4yFS5ieXRlYmFzZS52MS5QbGFuVHlwZUID4EEDEhIKBXNlYXRzGAIgASgFQgPgQQMSFgoJaW5zdGFuY2VzGAMgASgFQgPgQQMSHQoQYWN0aXZlX2luc3RhbmNlcxgEIAEoBUID4EEDEjUKDGV4cGlyZXNfdGltZRgFIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBCA+BBAxIVCgh0cmlhbGluZxgGIAEoCEID4EEDEhUKCG9yZ19uYW1lGAcgASgJQgPgQQMSDwoCaGEYCCABKAhCA+BBAyJuCgpQbGFuQ29uZmlnEisKBXBsYW5zGAEgAygLMhwuYnl0ZWJhc2UudjEuUGxhbkxpbWl0Q29uZmlnEjMKEWluc3RhbmNlX2ZlYXR1cmVzGAIgAygOMhguYnl0ZWJhc2UudjEuUGxhbkZlYXR1cmUingEKD1BsYW5MaW1pdENvbmZpZxIjCgR0eXBlGAEgASgOMhUuYnl0ZWJhc2UudjEuUGxhblR5cGUSHgoWbWF4aW11bV9pbnN0YW5jZV9jb3VudBgCIAEoBRIaChJtYXhpbXVtX3NlYXRfY291bnQYAyABKAUSKgoIZmVhdHVyZXMYBCADKA4yGC5ieXRlYmFzZS52MS5QbGFuRmVhdHVyZSpJCghQbGFuVHlwZRIZChVQTEFOX1RZUEVfVU5TUEVDSUZJRUQQABIICgRGUkVFEAESCAoEVEVBTRACEg4KCkVOVEVSUFJJU0UQAyrQEgoLUGxhbkZlYXR1cmUSFwoTRkVBVFVSRV9VTlNQRUNJRklFRBAAEhsKF0ZFQVRVUkVfREFUQUJBU0VfQ0hBTkdFEAESLAooRkVBVFVSRV9HSVRfQkFTRURfU0NIRU1BX1ZFUlNJT05fQ09OVFJPTBACEigKJEZFQVRVUkVfREVDTEFSQVRJVkVfU0NIRU1BX01JR1JBVElPThADEiMKH0ZFQVRVUkVfQ09NUEFSRV9BTkRfU1lOQ19TQ0hFTUEQBBIgChxGRUFUVVJFX09OTElORV9TQ0hFTUFfQ0hBTkdFEAUSJQohRkVBVFVSRV9QUkVfREVQTE9ZTUVOVF9TUUxfUkVWSUVXEAYSMAosRkVBVFVSRV9BVVRPTUFUSUNfQkFDS1VQX0JFRk9SRV9EQVRBX0NIQU5HRVMQBxIjCh9GRUFUVVJFX09ORV9DTElDS19EQVRBX1JPTExCQUNLEAgSKAokRkVBVFVSRV9NVUxUSV9EQVRBQkFTRV9CQVRDSF9DSEFOR0VTEAkSLgoqRkVBVFVSRV9QUk9HUkVTU0lWRV9FTlZJUk9OTUVOVF9ERVBMT1lNRU5UEAoSIgoeRkVBVFVSRV9TQ0hFRFVMRURfUk9MTE9VVF9USU1FEAsSHgoaRkVBVFVSRV9EQVRBQkFTRV9DSEFOR0VMT0cQDBIiCh5GRUFUVVJFX1NDSEVNQV9EUklGVF9ERVRFQ1RJT04QDRIaChZGRUFUVVJFX1JPTExPVVRfUE9MSUNZEA4SIAocRkVBVFVSRV9XRUJfQkFTRURfU1FMX0VESVRPUhAPEiEKHUZFQVRVUkVfU1FMX0VESVRPUl9BRE1JTl9NT0RFEBASIwofRkVBVFVSRV9OQVRVUkFMX0xBTkdVQUdFX1RPX1NRTBAREiAKHEZFQVRVUkVfQUlfUVVFUllfRVhQTEFOQVRJT04QEhIgChxGRUFUVVJFX0FJX1FVRVJZX1NVR0dFU1RJT05TEBMSGQoVRkVBVFVSRV9BVVRPX0NPTVBMRVRFEBQSGgoWRkVBVFVSRV9TQ0hFTUFfRElBR1JBTRAVEhkKFUZFQVRVUkVfU0NIRU1BX0VESVRPUhAWEhcKE0ZFQVRVUkVfREFUQV9FWFBPUlQQFxIfChtGRUFUVVJFX0RBVEFfT0ZGTElORV9FWFBPUlQQGBIZChVGRUFUVVJFX1FVRVJZX0hJU1RPUlkQGRIoCiRGRUFUVVJFX1NBVkVEX0FORF9TSEFSRURfU1FMX1NDUklQVFMQGhIXChNGRUFUVVJFX0JBVENIX1FVRVJZEBsSKQolRkVBVFVSRV9JTlNUQU5DRV9SRUFEX09OTFlfQ09OTkVDVElPThAcEhgKFEZFQVRVUkVfUVVFUllfUE9MSUNZEB0SIQodRkVBVFVSRV9SRVNUUklDVF9DT1BZSU5HX0RBVEEQHhIPCgtGRUFUVVJFX0lBTRAfEiMKH0ZFQVRVUkVfSU5TVEFOQ0VfU1NMX0NPTk5FQ1RJT04QIBIvCitGRUFUVVJFX0lOU1RBTkNFX0NPTk5FQ1RJT05fT1ZFUl9TU0hfVFVOTkVMECESMgouRkVBVFVSRV9JTlNUQU5DRV9DT05ORUNUSU9OX0lBTV9BVVRIRU5USUNBVElPThAiEiEKHUZFQVRVUkVfR09PR0xFX0FORF9HSVRIVUJfU1NPECMSFwoTRkVBVFVSRV9VU0VSX0dST1VQUxAkEigKJEZFQVRVUkVfRElTQUxMT1dfU0VMRl9TRVJWSUNFX1NJR05VUBAlEiUKIUZFQVRVUkVfQ1VTVE9NX0lOU1RBTkNFX1NZTkNfVElNRRAmEiwKKEZFQVRVUkVfQ1VTVE9NX0lOU1RBTkNFX0NPTk5FQ1RJT05fTElNSVQQJxIbChdGRUFUVVJFX1JJU0tfQVNTRVNTTUVOVBAoEh0KGUZFQVRVUkVfQVBQUk9WQUxfV09SS0ZMT1cQKRIVChFGRUFUVVJFX0FVRElUX0xPRxAqEhoKFkZFQVRVUkVfRU5URVJQUklTRV9TU08QKxISCg5GRUFUVVJFX1RXT19GQRAsEiEKHUZFQVRVUkVfUEFTU1dPUkRfUkVTVFJJQ1RJT05TEC0SJAogRkVBVFVSRV9ESVNBTExPV19QQVNTV09SRF9TSUdOSU4QLhIYChRGRUFUVVJFX0NVU1RPTV9ST0xFUxAvEiEKHUZFQVRVUkVfUkVRVUVTVF9ST0xFX1dPUktGTE9XEDASGAoURkVBVFVSRV9EQVRBX01BU0tJTkcQMRIfChtGRUFUVVJFX0RBVEFfQ0xBU1NJRklDQVRJT04QMhIQCgxGRUFUVVJFX1NDSU0QMxIaChZGRUFUVVJFX0RJUkVDVE9SWV9TWU5DEDQSIgoeRkVBVFVSRV9UT0tFTl9EVVJBVElPTl9DT05UUk9MEDUSIwofRkVBVFVSRV9FWFRFUk5BTF9TRUNSRVRfTUFOQUdFUhA2EikKJUZFQVRVUkVfVVNFUl9FTUFJTF9ET01BSU5fUkVTVFJJQ1RJT04QNxIeChpGRUFUVVJFX1BST0pFQ1RfTUFOQUdFTUVOVBA4EiIKHkZFQVRVUkVfRU5WSVJPTk1FTlRfTUFOQUdFTUVOVBA5EhwKGEZFQVRVUkVfSU1fTk9USUZJQ0FUSU9OUxA6Eh4KGkZFQVRVUkVfVEVSUkFGT1JNX1BST1ZJREVSEDsSGwoXRkVBVFVSRV9EQVRBQkFTRV9HUk9VUFMQPBIdChlGRUFUVVJFX0VOVklST05NRU5UX1RJRVJTED0SIgoeRkVBVFVSRV9EQVNIQk9BUkRfQU5OT1VOQ0VNRU5UED4SJAogRkVBVFVSRV9BUElfSU5URUdSQVRJT05fR1VJREFOQ0UQPxIXChNGRUFUVVJFX0NVU1RPTV9MT0dPEEASFQoRRkVBVFVSRV9XQVRFUk1BUksQQRIiCh5GRUFUVVJFX1JPQURNQVBfUFJJT1JJVElaQVRJT04QQhIWChJGRUFUVVJFX0NVU1RPTV9NU0EQQxIdChlGRUFUVVJFX0NPTU1VTklUWV9TVVBQT1JUEEQSGQoVRkVBVFVSRV9FTUFJTF9TVVBQT1JUEEUSJgoiRkVBVFVSRV9ERURJQ0FURURfU1VQUE9SVF9XSVRIX1NMQRBGMqUCChNTdWJzY3JpcHRpb25TZXJ2aWNlEnIKD0dldFN1YnNjcmlwdGlvbhIjLmJ5dGViYXNlLnYxLkdldFN1YnNjcmlwdGlvblJlcXVlc3QaGS5ieXRlYmFzZS52MS5TdWJzY3JpcHRpb24iH9pBAIDqMAGC0+STAhISEC92MS9zdWJzY3JpcHRpb24SmQEKElVwZGF0ZVN1YnNjcmlwdGlvbhImLmJ5dGViYXNlLnYxLlVwZGF0ZVN1YnNjcmlwdGlvblJlcXVlc3QaGS5ieXRlYmFzZS52MS5TdWJzY3JpcHRpb24iQNpBBXBhdGNoiuowD2JiLnNldHRpbmdzLnNldJDqMAGC0+STAhs6B2xpY2Vuc2UyEC92MS9zdWJzY3JpcHRpb25CrgEKD2NvbS5ieXRlYmFzZS52MUIYU3Vic2NyaXB0aW9uU2VydmljZVByb3RvUAFaNGdpdGh1Yi5jb20vYnl0ZWJhc2UvYnl0ZWJhc2UvYmFja2VuZC9nZW5lcmF0ZWQtZ28vdjGiAgNCWFiqAgtCeXRlYmFzZS5WMcoCC0J5dGViYXNlXFYx4gIXQnl0ZWJhc2VcVjFcR1BCTWV0YWRhdGHqAgxCeXRlYmFzZTo6VjFiBnByb3RvMw", [file_google_api_annotations, file_google_api_client, file_google_api_field_behavior, file_google_protobuf_timestamp, file_v1_annotation]);+ fileDesc("Ch12MS9zdWJzY3JpcHRpb25fc2VydmljZS5wcm90bxILYnl0ZWJhc2UudjEiGAoWR2V0U3Vic2NyaXB0aW9uUmVxdWVzdCJDChlVcGRhdGVTdWJzY3JpcHRpb25SZXF1ZXN0Eg8KB2xpY2Vuc2UYASABKAkSFQoNYWxsb3dfbWlzc2luZxgCIAEoCCL5AQoMU3Vic2NyaXB0aW9uEigKBHBsYW4YASABKA4yFS5ieXRlYmFzZS52MS5QbGFuVHlwZUID4EEDEhIKBXNlYXRzGAIgASgFQgPgQQMSFgoJaW5zdGFuY2VzGAMgASgFQgPgQQMSHQoQYWN0aXZlX2luc3RhbmNlcxgEIAEoBUID4EEDEjUKDGV4cGlyZXNfdGltZRgFIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBCA+BBAxIVCgh0cmlhbGluZxgGIAEoCEID4EEDEhUKCG9yZ19uYW1lGAcgASgJQgPgQQMSDwoCaGEYCCABKAhCA+BBAyJuCgpQbGFuQ29uZmlnEisKBXBsYW5zGAEgAygLMhwuYnl0ZWJhc2UudjEuUGxhbkxpbWl0Q29uZmlnEjMKEWluc3RhbmNlX2ZlYXR1cmVzGAIgAygOMhguYnl0ZWJhc2UudjEuUGxhbkZlYXR1cmUingEKD1BsYW5MaW1pdENvbmZpZxIjCgR0eXBlGAEgASgOMhUuYnl0ZWJhc2UudjEuUGxhblR5cGUSHgoWbWF4aW11bV9pbnN0YW5jZV9jb3VudBgCIAEoBRIaChJtYXhpbXVtX3NlYXRfY291bnQYAyABKAUSKgoIZmVhdHVyZXMYBCADKA4yGC5ieXRlYmFzZS52MS5QbGFuRmVhdHVyZSpJCghQbGFuVHlwZRIZChVQTEFOX1RZUEVfVU5TUEVDSUZJRUQQABIICgRGUkVFEAESCAoEVEVBTRACEg4KCkVOVEVSUFJJU0UQAyrhEgoLUGxhbkZlYXR1cmUSFwoTRkVBVFVSRV9VTlNQRUNJRklFRBAAEhsKF0ZFQVRVUkVfREFUQUJBU0VfQ0hBTkdFEAESLAooRkVBVFVSRV9HSVRfQkFTRURfU0NIRU1BX1ZFUlNJT05fQ09OVFJPTBACEigKJEZFQVRVUkVfREVDTEFSQVRJVkVfU0NIRU1BX01JR1JBVElPThADEiMKH0ZFQVRVUkVfQ09NUEFSRV9BTkRfU1lOQ19TQ0hFTUEQBBIgChxGRUFUVVJFX09OTElORV9TQ0hFTUFfQ0hBTkdFEAUSJQohRkVBVFVSRV9QUkVfREVQTE9ZTUVOVF9TUUxfUkVWSUVXEAYSMAosRkVBVFVSRV9BVVRPTUFUSUNfQkFDS1VQX0JFRk9SRV9EQVRBX0NIQU5HRVMQBxIjCh9GRUFUVVJFX09ORV9DTElDS19EQVRBX1JPTExCQUNLEAgSKAokRkVBVFVSRV9NVUxUSV9EQVRBQkFTRV9CQVRDSF9DSEFOR0VTEAkSLgoqRkVBVFVSRV9QUk9HUkVTU0lWRV9FTlZJUk9OTUVOVF9ERVBMT1lNRU5UEAoSIgoeRkVBVFVSRV9TQ0hFRFVMRURfUk9MTE9VVF9USU1FEAsSHgoaRkVBVFVSRV9EQVRBQkFTRV9DSEFOR0VMT0cQDBIiCh5GRUFUVVJFX1NDSEVNQV9EUklGVF9ERVRFQ1RJT04QDRIaChZGRUFUVVJFX1JPTExPVVRfUE9MSUNZEA4SIAocRkVBVFVSRV9XRUJfQkFTRURfU1FMX0VESVRPUhAPEiEKHUZFQVRVUkVfU1FMX0VESVRPUl9BRE1JTl9NT0RFEBASIwofRkVBVFVSRV9OQVRVUkFMX0xBTkdVQUdFX1RPX1NRTBAREiAKHEZFQVRVUkVfQUlfUVVFUllfRVhQTEFOQVRJT04QEhIgChxGRUFUVVJFX0FJX1FVRVJZX1NVR0dFU1RJT05TEBMSGQoVRkVBVFVSRV9BVVRPX0NPTVBMRVRFEBQSGgoWRkVBVFVSRV9TQ0hFTUFfRElBR1JBTRAVEhkKFUZFQVRVUkVfU0NIRU1BX0VESVRPUhAWEhcKE0ZFQVRVUkVfREFUQV9FWFBPUlQQFxIfChtGRUFUVVJFX0RBVEFfT0ZGTElORV9FWFBPUlQQGBIZChVGRUFUVVJFX1FVRVJZX0hJU1RPUlkQGRIoCiRGRUFUVVJFX1NBVkVEX0FORF9TSEFSRURfU1FMX1NDUklQVFMQGhIXChNGRUFUVVJFX0JBVENIX1FVRVJZEBsSKQolRkVBVFVSRV9JTlNUQU5DRV9SRUFEX09OTFlfQ09OTkVDVElPThAcEhgKFEZFQVRVUkVfUVVFUllfUE9MSUNZEB0SIQodRkVBVFVSRV9SRVNUUklDVF9DT1BZSU5HX0RBVEEQHhIPCgtGRUFUVVJFX0lBTRAfEiMKH0ZFQVRVUkVfSU5TVEFOQ0VfU1NMX0NPTk5FQ1RJT04QIBIvCitGRUFUVVJFX0lOU1RBTkNFX0NPTk5FQ1RJT05fT1ZFUl9TU0hfVFVOTkVMECESMgouRkVBVFVSRV9JTlNUQU5DRV9DT05ORUNUSU9OX0lBTV9BVVRIRU5USUNBVElPThAiEiEKHUZFQVRVUkVfR09PR0xFX0FORF9HSVRIVUJfU1NPECMSFwoTRkVBVFVSRV9VU0VSX0dST1VQUxAkEigKJEZFQVRVUkVfRElTQUxMT1dfU0VMRl9TRVJWSUNFX1NJR05VUBAlEiUKIUZFQVRVUkVfQ1VTVE9NX0lOU1RBTkNFX1NZTkNfVElNRRAmEiwKKEZFQVRVUkVfQ1VTVE9NX0lOU1RBTkNFX0NPTk5FQ1RJT05fTElNSVQQJxIbChdGRUFUVVJFX1JJU0tfQVNTRVNTTUVOVBAoEh0KGUZFQVRVUkVfQVBQUk9WQUxfV09SS0ZMT1cQKRIVChFGRUFUVVJFX0FVRElUX0xPRxAqEhoKFkZFQVRVUkVfRU5URVJQUklTRV9TU08QKxISCg5GRUFUVVJFX1RXT19GQRAsEiEKHUZFQVRVUkVfUEFTU1dPUkRfUkVTVFJJQ1RJT05TEC0SJAogRkVBVFVSRV9ESVNBTExPV19QQVNTV09SRF9TSUdOSU4QLhIYChRGRUFUVVJFX0NVU1RPTV9ST0xFUxAvEiEKHUZFQVRVUkVfUkVRVUVTVF9ST0xFX1dPUktGTE9XEDASDwoLRkVBVFVSRV9KSVQQMRIYChRGRUFUVVJFX0RBVEFfTUFTS0lORxAyEh8KG0ZFQVRVUkVfREFUQV9DTEFTU0lGSUNBVElPThAzEhAKDEZFQVRVUkVfU0NJTRA0EhoKFkZFQVRVUkVfRElSRUNUT1JZX1NZTkMQNRIiCh5GRUFUVVJFX1RPS0VOX0RVUkFUSU9OX0NPTlRST0wQNhIjCh9GRUFUVVJFX0VYVEVSTkFMX1NFQ1JFVF9NQU5BR0VSEDcSKQolRkVBVFVSRV9VU0VSX0VNQUlMX0RPTUFJTl9SRVNUUklDVElPThA4Eh4KGkZFQVRVUkVfUFJPSkVDVF9NQU5BR0VNRU5UEDkSIgoeRkVBVFVSRV9FTlZJUk9OTUVOVF9NQU5BR0VNRU5UEDoSHAoYRkVBVFVSRV9JTV9OT1RJRklDQVRJT05TEDsSHgoaRkVBVFVSRV9URVJSQUZPUk1fUFJPVklERVIQPBIbChdGRUFUVVJFX0RBVEFCQVNFX0dST1VQUxA9Eh0KGUZFQVRVUkVfRU5WSVJPTk1FTlRfVElFUlMQPhIiCh5GRUFUVVJFX0RBU0hCT0FSRF9BTk5PVU5DRU1FTlQQPxIkCiBGRUFUVVJFX0FQSV9JTlRFR1JBVElPTl9HVUlEQU5DRRBAEhcKE0ZFQVRVUkVfQ1VTVE9NX0xPR08QQRIVChFGRUFUVVJFX1dBVEVSTUFSSxBCEiIKHkZFQVRVUkVfUk9BRE1BUF9QUklPUklUSVpBVElPThBDEhYKEkZFQVRVUkVfQ1VTVE9NX01TQRBEEh0KGUZFQVRVUkVfQ09NTVVOSVRZX1NVUFBPUlQQRRIZChVGRUFUVVJFX0VNQUlMX1NVUFBPUlQQRhImCiJGRUFUVVJFX0RFRElDQVRFRF9TVVBQT1JUX1dJVEhfU0xBEEcypQIKE1N1YnNjcmlwdGlvblNlcnZpY2UScgoPR2V0U3Vic2NyaXB0aW9uEiMuYnl0ZWJhc2UudjEuR2V0U3Vic2NyaXB0aW9uUmVxdWVzdBoZLmJ5dGViYXNlLnYxLlN1YnNjcmlwdGlvbiIf2kEAgOowAYLT5JMCEhIQL3YxL3N1YnNjcmlwdGlvbhKZAQoSVXBkYXRlU3Vic2NyaXB0aW9uEiYuYnl0ZWJhc2UudjEuVXBkYXRlU3Vic2NyaXB0aW9uUmVxdWVzdBoZLmJ5dGViYXNlLnYxLlN1YnNjcmlwdGlvbiJA2kEFcGF0Y2iK6jAPYmIuc2V0dGluZ3Muc2V0kOowAYLT5JMCGzoHbGljZW5zZTIQL3YxL3N1YnNjcmlwdGlvbkKuAQoPY29tLmJ5dGViYXNlLnYxQhhTdWJzY3JpcHRpb25TZXJ2aWNlUHJvdG9QAVo0Z2l0aHViLmNvbS9ieXRlYmFzZS9ieXRlYmFzZS9iYWNrZW5kL2dlbmVyYXRlZC1nby92MaICA0JYWKoCC0J5dGViYXNlLlYxygILQnl0ZWJhc2VcVjHiAhdCeXRlYmFzZVxWMVxHUEJNZXRhZGF0YeoCDEJ5dGViYXNlOjpWMWIGcHJvdG8z", [file_google_api_annotations, file_google_api_client, file_google_api_field_behavior, file_google_protobuf_timestamp, file_v1_annotation]);/*** Describes the message bytebase.v1.GetSubscriptionRequest.diff --git a/proto/gen/grpc-doc/openapi.yaml b/proto/gen/grpc-doc/openapi.yamlindex e9eb25535b..88ce38edf2 100644--- a/proto/gen/grpc-doc/openapi.yaml+++ b/proto/gen/grpc-doc/openapi.yaml@@ -15930,6 +15930,9 @@ components:title: update_timereadOnly: true$ref: '#/components/schemas/google.protobuf.Timestamp'+ reason:+ type: string+ title: reason- oneOf:- properties:expireTime:@@ -23258,6 +23261,7 @@ components:- FEATURE_DISALLOW_PASSWORD_SIGNIN- FEATURE_CUSTOM_ROLES- FEATURE_REQUEST_ROLE_WORKFLOW+ - FEATURE_JIT- FEATURE_DATA_MASKING- FEATURE_DATA_CLASSIFICATION- FEATURE_SCIMdiff --git a/proto/gen/grpc-doc/store/README.md b/proto/gen/grpc-doc/store/README.mdindex 55b7159543..4dbf1126c6 100644--- a/proto/gen/grpc-doc/store/README.md+++ b/proto/gen/grpc-doc/store/README.md@@ -361,6 +361,7 @@| targets | [string](#string) | repeated | The target databases for this access grant. Format: instances/{instance}/databases/{database} || query | [string](#string) | | The query permission granted. || unmask | [bool](#bool) | | Whether the grant allows unmasking sensitive data. |+| reason | [string](#string) | | |@@ -2688,6 +2689,7 @@ Issue is the metadata for issues that track database operations and access reque| grant_request | [GrantRequest](#bytebase-store-GrantRequest) | | Access grant request details if this is a grant request issue. || labels | [string](#string) | repeated | Labels attached to categorize and filter the issue. || risk_level | [RiskLevel](#bytebase-store-RiskLevel) | | Risk level for the issue, calculated from statement types. |+| access_grant_id | [string](#string) | | The access grant id for ACCESS_GRANT type issue. |@@ -2721,6 +2723,7 @@ Type represents the category of issue.| DATABASE_CHANGE | 1 | Issue for database schema or data changes. || GRANT_REQUEST | 2 | Issue requesting database access permissions. || DATABASE_EXPORT | 3 | Issue for exporting data from databases. |+| ACCESS_GRANT | 4 | Temporary access grant request. |diff --git a/proto/gen/grpc-doc/store/index.html b/proto/gen/grpc-doc/store/index.htmlindex b51e415e5d..51428ec039 100644--- a/proto/gen/grpc-doc/store/index.html+++ b/proto/gen/grpc-doc/store/index.html@@ -1544,6 +1544,13 @@ Format: instances/{instance}/databases/{database} </p></td><td><p>Whether the grant allows unmasking sensitive data. </p></td></tr>+ <tr>+ <td>reason</td>+ <td><a href="#string">string</a></td>+ <td></td>+ <td><p> </p></td>+ </tr>+</tbody></table>@@ -8075,6 +8082,13 @@ Format: users/{email}. </p></td><td><p>Risk level for the issue, calculated from statement types. </p></td></tr>+ <tr>+ <td>access_grant_id</td>+ <td><a href="#string">string</a></td>+ <td></td>+ <td><p>The access grant id for ACCESS_GRANT type issue. </p></td>+ </tr>+</tbody></table>@@ -8151,6 +8165,12 @@ Format: users/{email}. </p></td><td><p>Issue for exporting data from databases.</p></td></tr>+ <tr>+ <td>ACCESS_GRANT</td>+ <td>4</td>+ <td><p>Temporary access grant request.</p></td>+ </tr>+</tbody></table>diff --git a/proto/gen/grpc-doc/v1/README.md b/proto/gen/grpc-doc/v1/README.mdindex 6a8c367ebd..5cbaad5db8 100644--- a/proto/gen/grpc-doc/v1/README.md+++ b/proto/gen/grpc-doc/v1/README.md@@ -773,6 +773,7 @@ Authorization method for RPC calls.| unmask | [bool](#bool) | | Whether the grant allows unmasking sensitive data. || create_time | [google.protobuf.Timestamp](#google-protobuf-Timestamp) | | || update_time | [google.protobuf.Timestamp](#google-protobuf-Timestamp) | | |+| reason | [string](#string) | | |@@ -10817,28 +10818,29 @@ PlanFeature represents the available features in Bytebase| FEATURE_DISALLOW_PASSWORD_SIGNIN | 46 | || FEATURE_CUSTOM_ROLES | 47 | || FEATURE_REQUEST_ROLE_WORKFLOW | 48 | |-| FEATURE_DATA_MASKING | 49 | |-| FEATURE_DATA_CLASSIFICATION | 50 | |-| FEATURE_SCIM | 51 | |-| FEATURE_DIRECTORY_SYNC | 52 | |-| FEATURE_TOKEN_DURATION_CONTROL | 53 | |-| FEATURE_EXTERNAL_SECRET_MANAGER | 54 | |-| FEATURE_USER_EMAIL_DOMAIN_RESTRICTION | 55 | |-| FEATURE_PROJECT_MANAGEMENT | 56 | Administration & Support |-| FEATURE_ENVIRONMENT_MANAGEMENT | 57 | |-| FEATURE_IM_NOTIFICATIONS | 58 | |-| FEATURE_TERRAFORM_PROVIDER | 59 | |-| FEATURE_DATABASE_GROUPS | 60 | |-| FEATURE_ENVIRONMENT_TIERS | 61 | |-| FEATURE_DASHBOARD_ANNOUNCEMENT | 62 | |-| FEATURE_API_INTEGRATION_GUIDANCE | 63 | |-| FEATURE_CUSTOM_LOGO | 64 | |-| FEATURE_WATERMARK | 65 | |-| FEATURE_ROADMAP_PRIORITIZATION | 66 | |-| FEATURE_CUSTOM_MSA | 67 | |-| FEATURE_COMMUNITY_SUPPORT | 68 | |-| FEATURE_EMAIL_SUPPORT | 69 | |-| FEATURE_DEDICATED_SUPPORT_WITH_SLA | 70 | |+| FEATURE_JIT | 49 | |+| FEATURE_DATA_MASKING | 50 | |+| FEATURE_DATA_CLASSIFICATION | 51 | |+| FEATURE_SCIM | 52 | |+| FEATURE_DIRECTORY_SYNC | 53 | |+| FEATURE_TOKEN_DURATION_CONTROL | 54 | |+| FEATURE_EXTERNAL_SECRET_MANAGER | 55 | |+| FEATURE_USER_EMAIL_DOMAIN_RESTRICTION | 56 | |+| FEATURE_PROJECT_MANAGEMENT | 57 | Administration & Support |+| FEATURE_ENVIRONMENT_MANAGEMENT | 58 | |+| FEATURE_IM_NOTIFICATIONS | 59 | |+| FEATURE_TERRAFORM_PROVIDER | 60 | |+| FEATURE_DATABASE_GROUPS | 61 | |+| FEATURE_ENVIRONMENT_TIERS | 62 | |+| FEATURE_DASHBOARD_ANNOUNCEMENT | 63 | |+| FEATURE_API_INTEGRATION_GUIDANCE | 64 | |+| FEATURE_CUSTOM_LOGO | 65 | |+| FEATURE_WATERMARK | 66 | |+| FEATURE_ROADMAP_PRIORITIZATION | 67 | |+| FEATURE_CUSTOM_MSA | 68 | |+| FEATURE_COMMUNITY_SUPPORT | 69 | |+| FEATURE_EMAIL_SUPPORT | 70 | |+| FEATURE_DEDICATED_SUPPORT_WITH_SLA | 71 | |diff --git a/proto/gen/grpc-doc/v1/index.html b/proto/gen/grpc-doc/v1/index.htmlindex 8834693dd8..7c0bfd7a3c 100644--- a/proto/gen/grpc-doc/v1/index.html+++ b/proto/gen/grpc-doc/v1/index.html@@ -3050,6 +3050,13 @@ Format: instances/{instance}/databases/{database} </p></td><td><p> </p></td></tr>+ <tr>+ <td>reason</td>+ <td><a href="#string">string</a></td>+ <td></td>+ <td><p> </p></td>+ </tr>+</tbody></table>@@ -30529,134 +30536,140 @@ In this situation, `update_mask` is ignored. </p></td></tr><tr>- <td>FEATURE_DATA_MASKING</td>+ <td>FEATURE_JIT</td><td>49</td><td><p></p></td></tr><tr>- <td>FEATURE_DATA_CLASSIFICATION</td>+ <td>FEATURE_DATA_MASKING</td><td>50</td><td><p></p></td></tr><tr>- <td>FEATURE_SCIM</td>+ <td>FEATURE_DATA_CLASSIFICATION</td><td>51</td><td><p></p></td></tr><tr>- <td>FEATURE_DIRECTORY_SYNC</td>+ <td>FEATURE_SCIM</td><td>52</td><td><p></p></td></tr><tr>- <td>FEATURE_TOKEN_DURATION_CONTROL</td>+ <td>FEATURE_DIRECTORY_SYNC</td><td>53</td><td><p></p></td></tr><tr>- <td>FEATURE_EXTERNAL_SECRET_MANAGER</td>+ <td>FEATURE_TOKEN_DURATION_CONTROL</td><td>54</td><td><p></p></td></tr><tr>- <td>FEATURE_USER_EMAIL_DOMAIN_RESTRICTION</td>+ <td>FEATURE_EXTERNAL_SECRET_MANAGER</td><td>55</td><td><p></p></td></tr><tr>- <td>FEATURE_PROJECT_MANAGEMENT</td>+ <td>FEATURE_USER_EMAIL_DOMAIN_RESTRICTION</td><td>56</td>+ <td><p></p></td>+ </tr>++ <tr>+ <td>FEATURE_PROJECT_MANAGEMENT</td>+ <td>57</td><td><p>Administration & Support</p></td></tr><tr><td>FEATURE_ENVIRONMENT_MANAGEMENT</td>- <td>57</td>+ <td>58</td><td><p></p></td></tr><tr><td>FEATURE_IM_NOTIFICATIONS</td>- <td>58</td>+ <td>59</td><td><p></p></td></tr><tr><td>FEATURE_TERRAFORM_PROVIDER</td>- <td>59</td>+ <td>60</td><td><p></p></td></tr><tr><td>FEATURE_DATABASE_GROUPS</td>- <td>60</td>+ <td>61</td><td><p></p></td></tr><tr><td>FEATURE_ENVIRONMENT_TIERS</td>- <td>61</td>+ <td>62</td><td><p></p></td></tr><tr><td>FEATURE_DASHBOARD_ANNOUNCEMENT</td>- <td>62</td>+ <td>63</td><td><p></p></td></tr><tr><td>FEATURE_API_INTEGRATION_GUIDANCE</td>- <td>63</td>+ <td>64</td><td><p></p></td></tr><tr><td>FEATURE_CUSTOM_LOGO</td>- <td>64</td>+ <td>65</td><td><p></p></td></tr><tr><td>FEATURE_WATERMARK</td>- <td>65</td>+ <td>66</td><td><p></p></td></tr><tr><td>FEATURE_ROADMAP_PRIORITIZATION</td>- <td>66</td>+ <td>67</td><td><p></p></td></tr><tr><td>FEATURE_CUSTOM_MSA</td>- <td>67</td>+ <td>68</td><td><p></p></td></tr><tr><td>FEATURE_COMMUNITY_SUPPORT</td>- <td>68</td>+ <td>69</td><td><p></p></td></tr><tr><td>FEATURE_EMAIL_SUPPORT</td>- <td>69</td>+ <td>70</td><td><p></p></td></tr><tr><td>FEATURE_DEDICATED_SUPPORT_WITH_SLA</td>- <td>70</td>+ <td>71</td><td><p></p></td></tr>diff --git a/proto/store/store/access_grant.proto b/proto/store/store/access_grant.protoindex 6629176608..8e885f167b 100644--- a/proto/store/store/access_grant.proto+++ b/proto/store/store/access_grant.proto@@ -26,4 +26,6 @@ message AccessGrantPayload {// Whether the grant allows unmasking sensitive data.bool unmask = 4;++ string reason = 5;}diff --git a/proto/store/store/issue.proto b/proto/store/store/issue.protoindex 0f3e002ab9..8c2351a934 100644--- a/proto/store/store/issue.proto+++ b/proto/store/store/issue.proto@@ -20,6 +20,8 @@ message Issue {GRANT_REQUEST = 2;// Issue for exporting data from databases.DATABASE_EXPORT = 3;+ // Temporary access grant request.+ ACCESS_GRANT = 4;}// Status represents the current state of the issue.@@ -41,6 +43,9 @@ message Issue {repeated string labels = 3;// Risk level for the issue, calculated from statement types.RiskLevel risk_level = 4;++ // The access grant id for ACCESS_GRANT type issue.+ string access_grant_id = 5;}// GrantRequest contains details for requesting database access permissions.diff --git a/proto/v1/v1/access_grant_service.proto b/proto/v1/v1/access_grant_service.protoindex 5bf789b3cb..ffbcd20210 100644--- a/proto/v1/v1/access_grant_service.proto+++ b/proto/v1/v1/access_grant_service.proto@@ -140,6 +140,8 @@ message AccessGrant {// The access grant has been revoked.REVOKED = 3;}++ string reason = 12;}message GetAccessGrantRequest {diff --git a/proto/v1/v1/subscription_service.proto b/proto/v1/v1/subscription_service.protoindex 3a7eb2721b..dc1237230a 100644--- a/proto/v1/v1/subscription_service.proto+++ b/proto/v1/v1/subscription_service.proto@@ -135,30 +135,31 @@ enum PlanFeature {FEATURE_DISALLOW_PASSWORD_SIGNIN = 46;FEATURE_CUSTOM_ROLES = 47;FEATURE_REQUEST_ROLE_WORKFLOW = 48;- FEATURE_DATA_MASKING = 49;- FEATURE_DATA_CLASSIFICATION = 50;- FEATURE_SCIM = 51;- FEATURE_DIRECTORY_SYNC = 52;- FEATURE_TOKEN_DURATION_CONTROL = 53;- FEATURE_EXTERNAL_SECRET_MANAGER = 54;- FEATURE_USER_EMAIL_DOMAIN_RESTRICTION = 55;+ FEATURE_JIT = 49;+ FEATURE_DATA_MASKING = 50;+ FEATURE_DATA_CLASSIFICATION = 51;+ FEATURE_SCIM = 52;+ FEATURE_DIRECTORY_SYNC = 53;+ FEATURE_TOKEN_DURATION_CONTROL = 54;+ FEATURE_EXTERNAL_SECRET_MANAGER = 55;+ FEATURE_USER_EMAIL_DOMAIN_RESTRICTION = 56;// Administration & Support- FEATURE_PROJECT_MANAGEMENT = 56;- FEATURE_ENVIRONMENT_MANAGEMENT = 57;- FEATURE_IM_NOTIFICATIONS = 58;- FEATURE_TERRAFORM_PROVIDER = 59;- FEATURE_DATABASE_GROUPS = 60;- FEATURE_ENVIRONMENT_TIERS = 61;- FEATURE_DASHBOARD_ANNOUNCEMENT = 62;- FEATURE_API_INTEGRATION_GUIDANCE = 63;- FEATURE_CUSTOM_LOGO = 64;- FEATURE_WATERMARK = 65;- FEATURE_ROADMAP_PRIORITIZATION = 66;- FEATURE_CUSTOM_MSA = 67;- FEATURE_COMMUNITY_SUPPORT = 68;- FEATURE_EMAIL_SUPPORT = 69;- FEATURE_DEDICATED_SUPPORT_WITH_SLA = 70;+ FEATURE_PROJECT_MANAGEMENT = 57;+ FEATURE_ENVIRONMENT_MANAGEMENT = 58;+ FEATURE_IM_NOTIFICATIONS = 59;+ FEATURE_TERRAFORM_PROVIDER = 60;+ FEATURE_DATABASE_GROUPS = 61;+ FEATURE_ENVIRONMENT_TIERS = 62;+ FEATURE_DASHBOARD_ANNOUNCEMENT = 63;+ FEATURE_API_INTEGRATION_GUIDANCE = 64;+ FEATURE_CUSTOM_LOGO = 65;+ FEATURE_WATERMARK = 66;+ FEATURE_ROADMAP_PRIORITIZATION = 67;+ FEATURE_CUSTOM_MSA = 68;+ FEATURE_COMMUNITY_SUPPORT = 69;+ FEATURE_EMAIL_SUPPORT = 70;+ FEATURE_DEDICATED_SUPPORT_WITH_SLA = 71;}// PlanConfig represents the configuration for all plans loaded from plan.yaml