Skip to content

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

chore: support retry issue approval (#20226)

ecmadao8bcee93ae1b7
diff --git a/backend/api/mcp/gen/openapi.yaml b/backend/api/mcp/gen/openapi.yaml
index d187012005..d6216a239c 100644
--- a/backend/api/mcp/gen/openapi.yaml
+++ b/backend/api/mcp/gen/openapi.yaml
@@ -3003,6 +3003,51 @@ paths:
application/json:
schema:
$ref: '#/components/schemas/bytebase.v1.Issue'
+ /bytebase.v1.IssueService/RetryIssueApproval:
+ post:
+ tags:
+ - bytebase.v1.IssueService
+ summary: RetryIssueApproval
+ description: |-
+ Re-runs approval-template finding for an issue stuck in CHECKING.
+ Useful when the synchronous post-create finding errored (e.g. against
+ a malformed workspace approval rule) and the operator has since
+ corrected it — without this, the issue would remain in CHECKING
+ indefinitely because there is no other retry path for non-DATABASE_CHANGE
+ issue types. Idempotent: returns the existing issue unchanged when
+ approval-finding has already completed.
+ Permissions required: None (caller must be the issue creator;
+ mirrors RequestIssue's authorization model).
+ operationId: bytebase.v1.IssueService.RetryIssueApproval
+ 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.RetryIssueApprovalRequest'
+ 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.Issue'
/bytebase.v1.IssueService/SearchIssues:
post:
tags:
@@ -16125,6 +16170,17 @@ components:
True when the workspace (or deployment) has an email setting configured.
title: Restriction
additionalProperties: false
+ bytebase.v1.RetryIssueApprovalRequest:
+ type: object
+ properties:
+ name:
+ type: string
+ title: name
+ description: |-
+ The name of the issue whose approval-finding should be retried.
+ Format: projects/{project}/issues/{issue}
+ title: RetryIssueApprovalRequest
+ additionalProperties: false
bytebase.v1.ReviewConfig:
type: object
properties:
diff --git a/backend/api/v1/issue_service.go b/backend/api/v1/issue_service.go
index 566f2b039c..09f0cb0026 100644
--- a/backend/api/v1/issue_service.go
+++ b/backend/api/v1/issue_service.go
@@ -847,6 +847,98 @@ func (s *IssueService) RequestIssue(ctx context.Context, req *connect.Request[v1
return connect.NewResponse(issueV1), nil
}
+// RetryIssueApproval re-runs approval-template finding for an issue stuck
+// in CHECKING. The synchronous post-create path in `postCreateIssue`
+// swallows errors (e.g. CEL evaluation failure against a malformed
+// workspace approval rule), and there is no event-driven retry for
+// non-DATABASE_CHANGE issue types — once stuck, only this RPC (or a
+// direct DB edit) gets the issue back into a resolved state.
+//
+// Authorization mirrors `RequestIssue`: only the issue creator may
+// retry. The action is a self-service for "my issue is stuck"; an
+// operator who needs to unstick someone else's issue should fix the
+// underlying workspace approval rule and (if necessary) ask the issue
+// creator to click Retry.
+//
+// Idempotent: returns the existing issue unchanged when approval-finding
+// has already completed.
+func (s *IssueService) RetryIssueApproval(ctx context.Context, req *connect.Request[v1pb.RetryIssueApprovalRequest]) (*connect.Response[v1pb.Issue], error) {
+ issue, err := s.getIssueMessage(ctx, req.Msg.Name)
+ if err != nil {
+ return nil, err
+ }
+
+ user, ok := GetUserFromContext(ctx)
+ if !ok {
+ return nil, connect.NewError(connect.CodeInternal, errors.New("user not found"))
+ }
+ if !canRequestIssue(issue.CreatorEmail, user) {
+ return nil, connect.NewError(connect.CodePermissionDenied, errors.New("only the issue creator can retry approval finding"))
+ }
+
+ // No-op fast path: nothing to retry if the previous attempt completed.
+ if issue.Payload.GetApproval().GetApprovalFindingDone() {
+ issueV1, err := s.convertToIssue(issue)
+ if err != nil {
+ return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to convert to issue"))
+ }
+ return connect.NewResponse(issueV1), nil
+ }
+
+ if err := approval.FindAndApplyApprovalTemplate(ctx, s.store, s.webhookManager, s.licenseService, issue); err != nil {
+ // Surface the underlying cause (e.g. CEL error in the workspace
+ // approval rule) so the operator can fix it.
+ return nil, connect.NewError(connect.CodeFailedPrecondition, errors.Wrap(err, "approval finding still failing"))
+ }
+
+ uid := issue.UID
+ refreshed, err := s.store.GetIssue(ctx, &store.FindIssueMessage{
+ Workspace: common.GetWorkspaceIDFromContext(ctx),
+ ProjectIDs: []string{issue.ProjectID},
+ UID: &uid,
+ })
+ if err != nil {
+ return nil, connect.NewError(connect.CodeInternal, errors.Wrap(err, "failed to refresh issue"))
+ }
+ if refreshed == nil {
+ return nil, connect.NewError(connect.CodeNotFound, errors.New("issue not found after retry"))
+ }
+
+ // Mirror the post-approval side effects that `postCreateIssue` and the
+ // approval runner perform when finding completes — without these, an
+ // auto-approved (template-less / SKIPPED) retry result would leave the
+ // issue out of CHECKING but skip the actual work:
+ // * ACCESS_GRANT / ROLE_GRANT → activate the grant via
+ // `completeAccessRequestIssue`.
+ // * DATABASE_CHANGE with a plan → enqueue rollout creation.
+ approved, err := utils.CheckIssueApproved(refreshed)
+ if err != nil {
+ return nil, connect.NewError(connect.CodeInternal, errors.Wrap(err, "failed to check approval state"))
+ }
+ if approved {
+ switch refreshed.Type {
+ case storepb.Issue_ACCESS_GRANT, storepb.Issue_ROLE_GRANT:
+ if completed, completeErr := completeAccessRequestIssue(ctx, s.store, user.Email, refreshed); completeErr != nil {
+ slog.Warn("failed to complete access request issue after retry", log.BBError(completeErr))
+ } else {
+ refreshed = completed
+ }
+ case storepb.Issue_DATABASE_CHANGE:
+ if refreshed.PlanUID != nil {
+ s.bus.RolloutCreationChan <- bus.PlanRef{ProjectID: refreshed.ProjectID, PlanID: *refreshed.PlanUID}
+ }
+ default:
+ // DATABASE_EXPORT auto-approve has no follow-up step.
+ }
+ }
+
+ issueV1, err := s.convertToIssue(refreshed)
+ if err != nil {
+ return nil, connect.NewError(connect.CodeInternal, errors.Wrap(err, "failed to convert to issue"))
+ }
+ return connect.NewResponse(issueV1), nil
+}
+
// UpdateIssue updates the issue.
func (s *IssueService) UpdateIssue(ctx context.Context, req *connect.Request[v1pb.UpdateIssueRequest]) (*connect.Response[v1pb.Issue], error) {
user, ok := GetUserFromContext(ctx)
diff --git a/backend/generated-go/v1/issue_service.pb.go b/backend/generated-go/v1/issue_service.pb.go
index 8fbb7d1d9d..a502918e73 100644
--- a/backend/generated-go/v1/issue_service.pb.go
+++ b/backend/generated-go/v1/issue_service.pb.go
@@ -142,7 +142,7 @@ func (x Issue_Type) Number() protoreflect.EnumNumber {
// Deprecated: Use Issue_Type.Descriptor instead.
func (Issue_Type) EnumDescriptor() ([]byte, []int) {
- return file_v1_issue_service_proto_rawDescGZIP(), []int{12, 0}
+ return file_v1_issue_service_proto_rawDescGZIP(), []int{13, 0}
}
// The overall approval status for the issue.
@@ -207,7 +207,7 @@ func (x Issue_ApprovalStatus) Number() protoreflect.EnumNumber {
// Deprecated: Use Issue_ApprovalStatus.Descriptor instead.
func (Issue_ApprovalStatus) EnumDescriptor() ([]byte, []int) {
- return file_v1_issue_service_proto_rawDescGZIP(), []int{12, 1}
+ return file_v1_issue_service_proto_rawDescGZIP(), []int{13, 1}
}
// The approval status of an approver.
@@ -264,7 +264,7 @@ func (x Issue_Approver_Status) Number() protoreflect.EnumNumber {
// Deprecated: Use Issue_Approver_Status.Descriptor instead.
func (Issue_Approver_Status) EnumDescriptor() ([]byte, []int) {
- return file_v1_issue_service_proto_rawDescGZIP(), []int{12, 0, 0}
+ return file_v1_issue_service_proto_rawDescGZIP(), []int{13, 0, 0}
}
// Approval status values.
@@ -321,7 +321,7 @@ func (x IssueComment_Approval_Status) Number() protoreflect.EnumNumber {
// Deprecated: Use IssueComment_Approval_Status.Descriptor instead.
func (IssueComment_Approval_Status) EnumDescriptor() ([]byte, []int) {
- return file_v1_issue_service_proto_rawDescGZIP(), []int{20, 0, 0}
+ return file_v1_issue_service_proto_rawDescGZIP(), []int{21, 0, 0}
}
type GetIssueRequest struct {
@@ -1118,6 +1118,52 @@ func (x *RequestIssueRequest) GetComment() string {
return ""
}
+type RetryIssueApprovalRequest struct {
+ state protoimpl.MessageState `protogen:"open.v1"`
+ // The name of the issue whose approval-finding should be retried.
+ // Format: projects/{project}/issues/{issue}
+ Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+ unknownFields protoimpl.UnknownFields
+ sizeCache protoimpl.SizeCache
+}
+
+func (x *RetryIssueApprovalRequest) Reset() {
+ *x = RetryIssueApprovalRequest{}
+ mi := &file_v1_issue_service_proto_msgTypes[12]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+}
+
+func (x *RetryIssueApprovalRequest) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*RetryIssueApprovalRequest) ProtoMessage() {}
+
+func (x *RetryIssueApprovalRequest) ProtoReflect() protoreflect.Message {
+ mi := &file_v1_issue_service_proto_msgTypes[12]
+ 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 RetryIssueApprovalRequest.ProtoReflect.Descriptor instead.
+func (*RetryIssueApprovalRequest) Descriptor() ([]byte, []int) {
+ return file_v1_issue_service_proto_rawDescGZIP(), []int{12}
+}
+
+func (x *RetryIssueApprovalRequest) GetName() string {
+ if x != nil {
+ return x.Name
+ }
+ return ""
+}
+
type Issue struct {
state protoimpl.MessageState `protogen:"open.v1"`
// The name of the issue.
@@ -1157,7 +1203,7 @@ type Issue struct {
func (x *Issue) Reset() {
*x = Issue{}
- mi := &file_v1_issue_service_proto_msgTypes[12]
+ mi := &file_v1_issue_service_proto_msgTypes[13]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -1169,7 +1215,7 @@ func (x *Issue) String() string {
func (*Issue) ProtoMessage() {}
func (x *Issue) ProtoReflect() protoreflect.Message {
- mi := &file_v1_issue_service_proto_msgTypes[12]
+ mi := &file_v1_issue_service_proto_msgTypes[13]
if x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -1182,7 +1228,7 @@ func (x *Issue) ProtoReflect() protoreflect.Message {
// Deprecated: Use Issue.ProtoReflect.Descriptor instead.
func (*Issue) Descriptor() ([]byte, []int) {
- return file_v1_issue_service_proto_rawDescGZIP(), []int{12}
+ return file_v1_issue_service_proto_rawDescGZIP(), []int{13}
}
func (x *Issue) GetName() string {
@@ -1315,7 +1361,7 @@ type RoleGrant struct {
func (x *RoleGrant) Reset() {
*x = RoleGrant{}
- mi := &file_v1_issue_service_proto_msgTypes[13]
+ mi := &file_v1_issue_service_proto_msgTypes[14]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -1327,7 +1373,7 @@ func (x *RoleGrant) String() string {
func (*RoleGrant) ProtoMessage() {}
func (x *RoleGrant) ProtoReflect() protoreflect.Message {
- mi := &file_v1_issue_service_proto_msgTypes[13]
+ mi := &file_v1_issue_service_proto_msgTypes[14]
if x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -1340,7 +1386,7 @@ func (x *RoleGrant) ProtoReflect() protoreflect.Message {
// Deprecated: Use RoleGrant.ProtoReflect.Descriptor instead.
func (*RoleGrant) Descriptor() ([]byte, []int) {
- return file_v1_issue_service_proto_rawDescGZIP(), []int{13}
+ return file_v1_issue_service_proto_rawDescGZIP(), []int{14}
}
func (x *RoleGrant) GetRole() string {
@@ -1385,7 +1431,7 @@ type ApprovalTemplate struct {
func (x *ApprovalTemplate) Reset() {
*x = ApprovalTemplate{}
- mi := &file_v1_issue_service_proto_msgTypes[14]
+ mi := &file_v1_issue_service_proto_msgTypes[15]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -1397,7 +1443,7 @@ func (x *ApprovalTemplate) String() string {
func (*ApprovalTemplate) ProtoMessage() {}
func (x *ApprovalTemplate) ProtoReflect() protoreflect.Message {
- mi := &file_v1_issue_service_proto_msgTypes[14]
+ mi := &file_v1_issue_service_proto_msgTypes[15]
if x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -1410,7 +1456,7 @@ func (x *ApprovalTemplate) ProtoReflect() protoreflect.Message {
// Deprecated: Use ApprovalTemplate.ProtoReflect.Descriptor instead.
func (*ApprovalTemplate) Descriptor() ([]byte, []int) {
- return file_v1_issue_service_proto_rawDescGZIP(), []int{14}
+ return file_v1_issue_service_proto_rawDescGZIP(), []int{15}
}
func (x *ApprovalTemplate) GetFlow() *ApprovalFlow {
@@ -1444,7 +1490,7 @@ type ApprovalFlow struct {
func (x *ApprovalFlow) Reset() {
*x = ApprovalFlow{}
- mi := &file_v1_issue_service_proto_msgTypes[15]
+ mi := &file_v1_issue_service_proto_msgTypes[16]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -1456,7 +1502,7 @@ func (x *ApprovalFlow) String() string {
func (*ApprovalFlow) ProtoMessage() {}
func (x *ApprovalFlow) ProtoReflect() protoreflect.Message {
- mi := &file_v1_issue_service_proto_msgTypes[15]
+ mi := &file_v1_issue_service_proto_msgTypes[16]
if x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -1469,7 +1515,7 @@ func (x *ApprovalFlow) ProtoReflect() protoreflect.Message {
// Deprecated: Use ApprovalFlow.ProtoReflect.Descriptor instead.
func (*ApprovalFlow) Descriptor() ([]byte, []int) {
- return file_v1_issue_service_proto_rawDescGZIP(), []int{15}
+ return file_v1_issue_service_proto_rawDescGZIP(), []int{16}
}
func (x *ApprovalFlow) GetRoles() []string {
@@ -1500,7 +1546,7 @@ type ListIssueCommentsRequest struct {
func (x *ListIssueCommentsRequest) Reset() {
*x = ListIssueCommentsRequest{}
- mi := &file_v1_issue_service_proto_msgTypes[16]
+ mi := &file_v1_issue_service_proto_msgTypes[17]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -1512,7 +1558,7 @@ func (x *ListIssueCommentsRequest) String() string {
func (*ListIssueCommentsRequest) ProtoMessage() {}
func (x *ListIssueCommentsRequest) ProtoReflect() protoreflect.Message {
- mi := &file_v1_issue_service_proto_msgTypes[16]
+ mi := &file_v1_issue_service_proto_msgTypes[17]
if x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -1525,7 +1571,7 @@ func (x *ListIssueCommentsRequest) ProtoReflect() protoreflect.Message {
// Deprecated: Use ListIssueCommentsRequest.ProtoReflect.Descriptor instead.
func (*ListIssueCommentsRequest) Descriptor() ([]byte, []int) {
- return file_v1_issue_service_proto_rawDescGZIP(), []int{16}
+ return file_v1_issue_service_proto_rawDescGZIP(), []int{17}
}
func (x *ListIssueCommentsRequest) GetParent() string {
@@ -1562,7 +1608,7 @@ type ListIssueCommentsResponse struct {
func (x *ListIssueCommentsResponse) Reset() {
*x = ListIssueCommentsResponse{}
- mi := &file_v1_issue_service_proto_msgTypes[17]
+ mi := &file_v1_issue_service_proto_msgTypes[18]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -1574,7 +1620,7 @@ func (x *ListIssueCommentsResponse) String() string {
func (*ListIssueCommentsResponse) ProtoMessage() {}
func (x *ListIssueCommentsResponse) ProtoReflect() protoreflect.Message {
- mi := &file_v1_issue_service_proto_msgTypes[17]
+ mi := &file_v1_issue_service_proto_msgTypes[18]
if x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -1587,7 +1633,7 @@ func (x *ListIssueCommentsResponse) ProtoReflect() protoreflect.Message {
// Deprecated: Use ListIssueCommentsResponse.ProtoReflect.Descriptor instead.
func (*ListIssueCommentsResponse) Descriptor() ([]byte, []int) {
- return file_v1_issue_service_proto_rawDescGZIP(), []int{17}
+ return file_v1_issue_service_proto_rawDescGZIP(), []int{18}
}
func (x *ListIssueCommentsResponse) GetIssueComments() []*IssueComment {
@@ -1617,7 +1663,7 @@ type CreateIssueCommentRequest struct {
func (x *CreateIssueCommentRequest) Reset() {
*x = CreateIssueCommentRequest{}
- mi := &file_v1_issue_service_proto_msgTypes[18]
+ mi := &file_v1_issue_service_proto_msgTypes[19]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -1629,7 +1675,7 @@ func (x *CreateIssueCommentRequest) String() string {
func (*CreateIssueCommentRequest) ProtoMessage() {}
func (x *CreateIssueCommentRequest) ProtoReflect() protoreflect.Message {
- mi := &file_v1_issue_service_proto_msgTypes[18]
+ mi := &file_v1_issue_service_proto_msgTypes[19]
if x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -1642,7 +1688,7 @@ func (x *CreateIssueCommentRequest) ProtoReflect() protoreflect.Message {
// Deprecated: Use CreateIssueCommentRequest.ProtoReflect.Descriptor instead.
func (*CreateIssueCommentRequest) Descriptor() ([]byte, []int) {
- return file_v1_issue_service_proto_rawDescGZIP(), []int{18}
+ return file_v1_issue_service_proto_rawDescGZIP(), []int{19}
}
func (x *CreateIssueCommentRequest) GetParent() string {
@@ -1677,7 +1723,7 @@ type UpdateIssueCommentRequest struct {
func (x *UpdateIssueCommentRequest) Reset() {
*x = UpdateIssueCommentRequest{}
- mi := &file_v1_issue_service_proto_msgTypes[19]
+ mi := &file_v1_issue_service_proto_msgTypes[20]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -1689,7 +1735,7 @@ func (x *UpdateIssueCommentRequest) String() string {
func (*UpdateIssueCommentRequest) ProtoMessage() {}
func (x *UpdateIssueCommentRequest) ProtoReflect() protoreflect.Message {
- mi := &file_v1_issue_service_proto_msgTypes[19]
+ mi := &file_v1_issue_service_proto_msgTypes[20]
if x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -1702,7 +1748,7 @@ func (x *UpdateIssueCommentRequest) ProtoReflect() protoreflect.Message {
// Deprecated: Use UpdateIssueCommentRequest.ProtoReflect.Descriptor instead.
func (*UpdateIssueCommentRequest) Descriptor() ([]byte, []int) {
- return file_v1_issue_service_proto_rawDescGZIP(), []int{19}
+ return file_v1_issue_service_proto_rawDescGZIP(), []int{20}
}
func (x *UpdateIssueCommentRequest) GetParent() string {
@@ -1760,7 +1806,7 @@ type IssueComment struct {
func (x *IssueComment) Reset() {
*x = IssueComment{}
- mi := &file_v1_issue_service_proto_msgTypes[20]
+ mi := &file_v1_issue_service_proto_msgTypes[21]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -1772,7 +1818,7 @@ func (x *IssueComment) String() string {
func (*IssueComment) ProtoMessage() {}
func (x *IssueComment) ProtoReflect() protoreflect.Message {
- mi := &file_v1_issue_service_proto_msgTypes[20]
+ mi := &file_v1_issue_service_proto_msgTypes[21]
if x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -1785,7 +1831,7 @@ func (x *IssueComment) ProtoReflect() protoreflect.Message {
// Deprecated: Use IssueComment.ProtoReflect.Descriptor instead.
func (*IssueComment) Descriptor() ([]byte, []int) {
- return file_v1_issue_service_proto_rawDescGZIP(), []int{20}
+ return file_v1_issue_service_proto_rawDescGZIP(), []int{21}
}
func (x *IssueComment) GetName() string {
@@ -1902,7 +1948,7 @@ type Issue_Approver struct {
func (x *Issue_Approver) Reset() {
*x = Issue_Approver{}
- mi := &file_v1_issue_service_proto_msgTypes[21]
+ mi := &file_v1_issue_service_proto_msgTypes[22]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -1914,7 +1960,7 @@ func (x *Issue_Approver) String() string {
func (*Issue_Approver) ProtoMessage() {}
func (x *Issue_Approver) ProtoReflect() protoreflect.Message {
- mi := &file_v1_issue_service_proto_msgTypes[21]
+ mi := &file_v1_issue_service_proto_msgTypes[22]
if x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -1927,7 +1973,7 @@ func (x *Issue_Approver) ProtoReflect() protoreflect.Message {
// Deprecated: Use Issue_Approver.ProtoReflect.Descriptor instead.
func (*Issue_Approver) Descriptor() ([]byte, []int) {
- return file_v1_issue_service_proto_rawDescGZIP(), []int{12, 0}
+ return file_v1_issue_service_proto_rawDescGZIP(), []int{13, 0}
}
func (x *Issue_Approver) GetStatus() Issue_Approver_Status {
@@ -1955,7 +2001,7 @@ type IssueComment_Approval struct {
func (x *IssueComment_Approval) Reset() {
*x = IssueComment_Approval{}
- mi := &file_v1_issue_service_proto_msgTypes[22]
+ mi := &file_v1_issue_service_proto_msgTypes[23]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -1967,7 +2013,7 @@ func (x *IssueComment_Approval) String() string {
func (*IssueComment_Approval) ProtoMessage() {}
func (x *IssueComment_Approval) ProtoReflect() protoreflect.Message {
- mi := &file_v1_issue_service_proto_msgTypes[22]
+ mi := &file_v1_issue_service_proto_msgTypes[23]
if x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -1980,7 +2026,7 @@ func (x *IssueComment_Approval) ProtoReflect() protoreflect.Message {
// Deprecated: Use IssueComment_Approval.ProtoReflect.Descriptor instead.
func (*IssueComment_Approval) Descriptor() ([]byte, []int) {
- return file_v1_issue_service_proto_rawDescGZIP(), []int{20, 0}
+ return file_v1_issue_service_proto_rawDescGZIP(), []int{21, 0}
}
func (x *IssueComment_Approval) GetStatus() IssueComment_Approval_Status {
@@ -2007,7 +2053,7 @@ type IssueComment_IssueUpdate struct {
func (x *IssueComment_IssueUpdate) Reset() {
*x = IssueComment_IssueUpdate{}
- mi := &file_v1_issue_service_proto_msgTypes[23]
+ mi := &file_v1_issue_service_proto_msgTypes[24]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -2019,7 +2065,7 @@ func (x *IssueComment_IssueUpdate) String() string {
func (*IssueComment_IssueUpdate) ProtoMessage() {}
func (x *IssueComment_IssueUpdate) ProtoReflect() protoreflect.Message {
- mi := &file_v1_issue_service_proto_msgTypes[23]
+ mi := &file_v1_issue_service_proto_msgTypes[24]
if x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -2032,7 +2078,7 @@ func (x *IssueComment_IssueUpdate) ProtoReflect() protoreflect.Message {
// Deprecated: Use IssueComment_IssueUpdate.ProtoReflect.Descriptor instead.
func (*IssueComment_IssueUpdate) Descriptor() ([]byte, []int) {
- return file_v1_issue_service_proto_rawDescGZIP(), []int{20, 1}
+ return file_v1_issue_service_proto_rawDescGZIP(), []int{21, 1}
}
func (x *IssueComment_IssueUpdate) GetFromTitle() string {
@@ -2109,7 +2155,7 @@ type IssueComment_PlanSpecUpdate struct {
func (x *IssueComment_PlanSpecUpdate) Reset() {
*x = IssueComment_PlanSpecUpdate{}
- mi := &file_v1_issue_service_proto_msgTypes[24]
+ mi := &file_v1_issue_service_proto_msgTypes[25]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -2121,7 +2167,7 @@ func (x *IssueComment_PlanSpecUpdate) String() string {
func (*IssueComment_PlanSpecUpdate) ProtoMessage() {}
func (x *IssueComment_PlanSpecUpdate) ProtoReflect() protoreflect.Message {
- mi := &file_v1_issue_service_proto_msgTypes[24]
+ mi := &file_v1_issue_service_proto_msgTypes[25]
if x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -2134,7 +2180,7 @@ func (x *IssueComment_PlanSpecUpdate) ProtoReflect() protoreflect.Message {
// Deprecated: Use IssueComment_PlanSpecUpdate.ProtoReflect.Descriptor instead.
func (*IssueComment_PlanSpecUpdate) Descriptor() ([]byte, []int) {
- return file_v1_issue_service_proto_rawDescGZIP(), []int{20, 2}
+ return file_v1_issue_service_proto_rawDescGZIP(), []int{21, 2}
}
func (x *IssueComment_PlanSpecUpdate) GetSpec() string {
@@ -2218,7 +2264,10 @@ const file_v1_issue_service_proto_rawDesc = "" +
"\x13RequestIssueRequest\x12.\n" +
"\x04name\x18\x01 \x01(\tB\x1a\xe0A\x02\xfaA\x14\n" +
"\x12bytebase.com/IssueR\x04name\x12\x18\n" +
- "\acomment\x18\x02 \x01(\tR\acomment\"\xef\t\n" +
+ "\acomment\x18\x02 \x01(\tR\acomment\"K\n" +
+ "\x19RetryIssueApprovalRequest\x12.\n" +
+ "\x04name\x18\x01 \x01(\tB\x1a\xe0A\x02\xfaA\x14\n" +
+ "\x12bytebase.com/IssueR\x04name\"\xef\t\n" +
"\x05Issue\x12\x12\n" +
"\x04name\x18\x01 \x01(\tR\x04name\x12\x1e\n" +
"\x05title\x18\x02 \x01(\tB\b\xbaH\x05r\x03\x18\xc8\x01R\x05title\x12*\n" +
@@ -2348,7 +2397,7 @@ const file_v1_issue_service_proto_rawDesc = "" +
"\x18ISSUE_STATUS_UNSPECIFIED\x10\x00\x12\b\n" +
"\x04OPEN\x10\x01\x12\b\n" +
"\x04DONE\x10\x02\x12\f\n" +
- "\bCANCELED\x10\x032\xd8\x0f\n" +
+ "\bCANCELED\x10\x032\xec\x10\n" +
"\fIssueService\x12\x80\x01\n" +
"\bGetIssue\x12\x1c.bytebase.v1.GetIssueRequest\x1a\x12.bytebase.v1.Issue\"B\xdaA\x04name\x8a\xea0\rbb.issues.get\x90\xea0\x01\x82\xd3\xe4\x93\x02 \x12\x1e/v1/{name=projects/*/issues/*}\x12\x9c\x01\n" +
"\vCreateIssue\x12\x1f.bytebase.v1.CreateIssueRequest\x1a\x12.bytebase.v1.Issue\"X\xdaA\fparent,issue\x8a\xea0\x10bb.issues.create\x90\xea0\x01\x98\xea0\x01\x82\xd3\xe4\x93\x02':\x05issue\"\x1e/v1/{parent=projects/*}/issues\x12\x94\x01\n" +
@@ -2362,7 +2411,8 @@ const file_v1_issue_service_proto_rawDesc = "" +
"\x17BatchUpdateIssuesStatus\x12+.bytebase.v1.BatchUpdateIssuesStatusRequest\x1a,.bytebase.v1.BatchUpdateIssuesStatusResponse\"W\x8a\xea0\x10bb.issues.update\x90\xea0\x01\x98\xea0\x01\x82\xd3\xe4\x93\x025:\x01*\"0/v1/{parent=projects/*}/issues:batchUpdateStatus\x12\x7f\n" +
"\fApproveIssue\x12 .bytebase.v1.ApproveIssueRequest\x1a\x12.bytebase.v1.Issue\"9\x90\xea0\x02\x98\xea0\x01\x82\xd3\xe4\x93\x02+:\x01*\"&/v1/{name=projects/*/issues/*}:approve\x12|\n" +
"\vRejectIssue\x12\x1f.bytebase.v1.RejectIssueRequest\x1a\x12.bytebase.v1.Issue\"8\x90\xea0\x02\x98\xea0\x01\x82\xd3\xe4\x93\x02*:\x01*\"%/v1/{name=projects/*/issues/*}:reject\x12\x7f\n" +
- "\fRequestIssue\x12 .bytebase.v1.RequestIssueRequest\x1a\x12.bytebase.v1.Issue\"9\x90\xea0\x02\x98\xea0\x01\x82\xd3\xe4\x93\x02+:\x01*\"&/v1/{name=projects/*/issues/*}:requestB\xa7\x01\n" +
+ "\fRequestIssue\x12 .bytebase.v1.RequestIssueRequest\x1a\x12.bytebase.v1.Issue\"9\x90\xea0\x02\x98\xea0\x01\x82\xd3\xe4\x93\x02+:\x01*\"&/v1/{name=projects/*/issues/*}:request\x12\x91\x01\n" +
+ "\x12RetryIssueApproval\x12&.bytebase.v1.RetryIssueApprovalRequest\x1a\x12.bytebase.v1.Issue\"?\x90\xea0\x02\x98\xea0\x01\x82\xd3\xe4\x93\x021:\x01*\",/v1/{name=projects/*/issues/*}:retryApprovalB\xa7\x01\n" +
"\x0fcom.bytebase.v1B\x11IssueServiceProtoP\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"
var (
@@ -2378,7 +2428,7 @@ func file_v1_issue_service_proto_rawDescGZIP() []byte {
}
var file_v1_issue_service_proto_enumTypes = make([]protoimpl.EnumInfo, 5)
-var file_v1_issue_service_proto_msgTypes = make([]protoimpl.MessageInfo, 25)
+var file_v1_issue_service_proto_msgTypes = make([]protoimpl.MessageInfo, 26)
var file_v1_issue_service_proto_goTypes = []any{
(IssueStatus)(0), // 0: bytebase.v1.IssueStatus
(Issue_Type)(0), // 1: bytebase.v1.Issue.Type
@@ -2397,53 +2447,54 @@ var file_v1_issue_service_proto_goTypes = []any{
(*ApproveIssueRequest)(nil), // 14: bytebase.v1.ApproveIssueRequest
(*RejectIssueRequest)(nil), // 15: bytebase.v1.RejectIssueRequest
(*RequestIssueRequest)(nil), // 16: bytebase.v1.RequestIssueRequest
- (*Issue)(nil), // 17: bytebase.v1.Issue
- (*RoleGrant)(nil), // 18: bytebase.v1.RoleGrant
- (*ApprovalTemplate)(nil), // 19: bytebase.v1.ApprovalTemplate
- (*ApprovalFlow)(nil), // 20: bytebase.v1.ApprovalFlow
- (*ListIssueCommentsRequest)(nil), // 21: bytebase.v1.ListIssueCommentsRequest
- (*ListIssueCommentsResponse)(nil), // 22: bytebase.v1.ListIssueCommentsResponse
- (*CreateIssueCommentRequest)(nil), // 23: bytebase.v1.CreateIssueCommentRequest
- (*UpdateIssueCommentRequest)(nil), // 24: bytebase.v1.UpdateIssueCommentRequest
- (*IssueComment)(nil), // 25: bytebase.v1.IssueComment
- (*Issue_Approver)(nil), // 26: bytebase.v1.Issue.Approver
- (*IssueComment_Approval)(nil), // 27: bytebase.v1.IssueComment.Approval
- (*IssueComment_IssueUpdate)(nil), // 28: bytebase.v1.IssueComment.IssueUpdate
- (*IssueComment_PlanSpecUpdate)(nil), // 29: bytebase.v1.IssueComment.PlanSpecUpdate
- (*fieldmaskpb.FieldMask)(nil), // 30: google.protobuf.FieldMask
- (*timestamppb.Timestamp)(nil), // 31: google.protobuf.Timestamp
- (RiskLevel)(0), // 32: bytebase.v1.RiskLevel
- (*expr.Expr)(nil), // 33: google.type.Expr
- (*durationpb.Duration)(nil), // 34: google.protobuf.Duration
+ (*RetryIssueApprovalRequest)(nil), // 17: bytebase.v1.RetryIssueApprovalRequest
+ (*Issue)(nil), // 18: bytebase.v1.Issue
+ (*RoleGrant)(nil), // 19: bytebase.v1.RoleGrant
+ (*ApprovalTemplate)(nil), // 20: bytebase.v1.ApprovalTemplate
+ (*ApprovalFlow)(nil), // 21: bytebase.v1.ApprovalFlow
+ (*ListIssueCommentsRequest)(nil), // 22: bytebase.v1.ListIssueCommentsRequest
+ (*ListIssueCommentsResponse)(nil), // 23: bytebase.v1.ListIssueCommentsResponse
+ (*CreateIssueCommentRequest)(nil), // 24: bytebase.v1.CreateIssueCommentRequest
+ (*UpdateIssueCommentRequest)(nil), // 25: bytebase.v1.UpdateIssueCommentRequest
+ (*IssueComment)(nil), // 26: bytebase.v1.IssueComment
+ (*Issue_Approver)(nil), // 27: bytebase.v1.Issue.Approver
+ (*IssueComment_Approval)(nil), // 28: bytebase.v1.IssueComment.Approval
+ (*IssueComment_IssueUpdate)(nil), // 29: bytebase.v1.IssueComment.IssueUpdate
+ (*IssueComment_PlanSpecUpdate)(nil), // 30: bytebase.v1.IssueComment.PlanSpecUpdate
+ (*fieldmaskpb.FieldMask)(nil), // 31: google.protobuf.FieldMask
+ (*timestamppb.Timestamp)(nil), // 32: google.protobuf.Timestamp
+ (RiskLevel)(0), // 33: bytebase.v1.RiskLevel
+ (*expr.Expr)(nil), // 34: google.type.Expr
+ (*durationpb.Duration)(nil), // 35: google.protobuf.Duration
}
var file_v1_issue_service_proto_depIdxs = []int32{
- 17, // 0: bytebase.v1.CreateIssueRequest.issue:type_name -> bytebase.v1.Issue
- 17, // 1: bytebase.v1.ListIssuesResponse.issues:type_name -> bytebase.v1.Issue
- 17, // 2: bytebase.v1.SearchIssuesResponse.issues:type_name -> bytebase.v1.Issue
- 17, // 3: bytebase.v1.UpdateIssueRequest.issue:type_name -> bytebase.v1.Issue
- 30, // 4: bytebase.v1.UpdateIssueRequest.update_mask:type_name -> google.protobuf.FieldMask
+ 18, // 0: bytebase.v1.CreateIssueRequest.issue:type_name -> bytebase.v1.Issue
+ 18, // 1: bytebase.v1.ListIssuesResponse.issues:type_name -> bytebase.v1.Issue
+ 18, // 2: bytebase.v1.SearchIssuesResponse.issues:type_name -> bytebase.v1.Issue
+ 18, // 3: bytebase.v1.UpdateIssueRequest.issue:type_name -> bytebase.v1.Issue
+ 31, // 4: bytebase.v1.UpdateIssueRequest.update_mask:type_name -> google.protobuf.FieldMask
0, // 5: bytebase.v1.BatchUpdateIssuesStatusRequest.status:type_name -> bytebase.v1.IssueStatus
1, // 6: bytebase.v1.Issue.type:type_name -> bytebase.v1.Issue.Type
0, // 7: bytebase.v1.Issue.status:type_name -> bytebase.v1.IssueStatus
- 26, // 8: bytebase.v1.Issue.approvers:type_name -> bytebase.v1.Issue.Approver
- 19, // 9: bytebase.v1.Issue.approval_template:type_name -> bytebase.v1.ApprovalTemplate
- 31, // 10: bytebase.v1.Issue.create_time:type_name -> google.protobuf.Timestamp
- 31, // 11: bytebase.v1.Issue.update_time:type_name -> google.protobuf.Timestamp
- 18, // 12: bytebase.v1.Issue.role_grant:type_name -> bytebase.v1.RoleGrant
- 32, // 13: bytebase.v1.Issue.risk_level:type_name -> bytebase.v1.RiskLevel
+ 27, // 8: bytebase.v1.Issue.approvers:type_name -> bytebase.v1.Issue.Approver
+ 20, // 9: bytebase.v1.Issue.approval_template:type_name -> bytebase.v1.ApprovalTemplate
+ 32, // 10: bytebase.v1.Issue.create_time:type_name -> google.protobuf.Timestamp
+ 32, // 11: bytebase.v1.Issue.update_time:type_name -> google.protobuf.Timestamp
+ 19, // 12: bytebase.v1.Issue.role_grant:type_name -> bytebase.v1.RoleGrant
+ 33, // 13: bytebase.v1.Issue.risk_level:type_name -> bytebase.v1.RiskLevel
2, // 14: bytebase.v1.Issue.approval_status:type_name -> bytebase.v1.Issue.ApprovalStatus
- 33, // 15: bytebase.v1.RoleGrant.condition:type_name -> google.type.Expr
- 34, // 16: bytebase.v1.RoleGrant.expiration:type_name -> google.protobuf.Duration
- 20, // 17: bytebase.v1.ApprovalTemplate.flow:type_name -> bytebase.v1.ApprovalFlow
- 25, // 18: bytebase.v1.ListIssueCommentsResponse.issue_comments:type_name -> bytebase.v1.IssueComment
- 25, // 19: bytebase.v1.CreateIssueCommentRequest.issue_comment:type_name -> bytebase.v1.IssueComment
- 25, // 20: bytebase.v1.UpdateIssueCommentRequest.issue_comment:type_name -> bytebase.v1.IssueComment
- 30, // 21: bytebase.v1.UpdateIssueCommentRequest.update_mask:type_name -> google.protobuf.FieldMask
- 31, // 22: bytebase.v1.IssueComment.create_time:type_name -> google.protobuf.Timestamp
- 31, // 23: bytebase.v1.IssueComment.update_time:type_name -> google.protobuf.Timestamp
- 27, // 24: bytebase.v1.IssueComment.approval:type_name -> bytebase.v1.IssueComment.Approval
- 28, // 25: bytebase.v1.IssueComment.issue_update:type_name -> bytebase.v1.IssueComment.IssueUpdate
- 29, // 26: bytebase.v1.IssueComment.plan_spec_update:type_name -> bytebase.v1.IssueComment.PlanSpecUpdate
+ 34, // 15: bytebase.v1.RoleGrant.condition:type_name -> google.type.Expr
+ 35, // 16: bytebase.v1.RoleGrant.expiration:type_name -> google.protobuf.Duration
+ 21, // 17: bytebase.v1.ApprovalTemplate.flow:type_name -> bytebase.v1.ApprovalFlow
+ 26, // 18: bytebase.v1.ListIssueCommentsResponse.issue_comments:type_name -> bytebase.v1.IssueComment
+ 26, // 19: bytebase.v1.CreateIssueCommentRequest.issue_comment:type_name -> bytebase.v1.IssueComment
+ 26, // 20: bytebase.v1.UpdateIssueCommentRequest.issue_comment:type_name -> bytebase.v1.IssueComment
+ 31, // 21: bytebase.v1.UpdateIssueCommentRequest.update_mask:type_name -> google.protobuf.FieldMask
+ 32, // 22: bytebase.v1.IssueComment.create_time:type_name -> google.protobuf.Timestamp
+ 32, // 23: bytebase.v1.IssueComment.update_time:type_name -> google.protobuf.Timestamp
+ 28, // 24: bytebase.v1.IssueComment.approval:type_name -> bytebase.v1.IssueComment.Approval
+ 29, // 25: bytebase.v1.IssueComment.issue_update:type_name -> bytebase.v1.IssueComment.IssueUpdate
+ 30, // 26: bytebase.v1.IssueComment.plan_spec_update:type_name -> bytebase.v1.IssueComment.PlanSpecUpdate
3, // 27: bytebase.v1.Issue.Approver.status:type_name -> bytebase.v1.Issue.Approver.Status
4, // 28: bytebase.v1.IssueComment.Approval.status:type_name -> bytebase.v1.IssueComment.Approval.Status
0, // 29: bytebase.v1.IssueComment.IssueUpdate.from_status:type_name -> bytebase.v1.IssueStatus
@@ -2453,27 +2504,29 @@ var file_v1_issue_service_proto_depIdxs = []int32{
7, // 33: bytebase.v1.IssueService.ListIssues:input_type -> bytebase.v1.ListIssuesRequest
9, // 34: bytebase.v1.IssueService.SearchIssues:input_type -> bytebase.v1.SearchIssuesRequest
11, // 35: bytebase.v1.IssueService.UpdateIssue:input_type -> bytebase.v1.UpdateIssueRequest
- 21, // 36: bytebase.v1.IssueService.ListIssueComments:input_type -> bytebase.v1.ListIssueCommentsRequest
- 23, // 37: bytebase.v1.IssueService.CreateIssueComment:input_type -> bytebase.v1.CreateIssueCommentRequest
- 24, // 38: bytebase.v1.IssueService.UpdateIssueComment:input_type -> bytebase.v1.UpdateIssueCommentRequest
+ 22, // 36: bytebase.v1.IssueService.ListIssueComments:input_type -> bytebase.v1.ListIssueCommentsRequest
+ 24, // 37: bytebase.v1.IssueService.CreateIssueComment:input_type -> bytebase.v1.CreateIssueCommentRequest
+ 25, // 38: bytebase.v1.IssueService.UpdateIssueComment:input_type -> bytebase.v1.UpdateIssueCommentRequest
12, // 39: bytebase.v1.IssueService.BatchUpdateIssuesStatus:input_type -> bytebase.v1.BatchUpdateIssuesStatusRequest
14, // 40: bytebase.v1.IssueService.ApproveIssue:input_type -> bytebase.v1.ApproveIssueRequest
15, // 41: bytebase.v1.IssueService.RejectIssue:input_type -> bytebase.v1.RejectIssueRequest
16, // 42: bytebase.v1.IssueService.RequestIssue:input_type -> bytebase.v1.RequestIssueRequest
- 17, // 43: bytebase.v1.IssueService.GetIssue:output_type -> bytebase.v1.Issue
- 17, // 44: bytebase.v1.IssueService.CreateIssue:output_type -> bytebase.v1.Issue
- 8, // 45: bytebase.v1.IssueService.ListIssues:output_type -> bytebase.v1.ListIssuesResponse
- 10, // 46: bytebase.v1.IssueService.SearchIssues:output_type -> bytebase.v1.SearchIssuesResponse
- 17, // 47: bytebase.v1.IssueService.UpdateIssue:output_type -> bytebase.v1.Issue
- 22, // 48: bytebase.v1.IssueService.ListIssueComments:output_type -> bytebase.v1.ListIssueCommentsResponse
- 25, // 49: bytebase.v1.IssueService.CreateIssueComment:output_type -> bytebase.v1.IssueComment
- 25, // 50: bytebase.v1.IssueService.UpdateIssueComment:output_type -> bytebase.v1.IssueComment
- 13, // 51: bytebase.v1.IssueService.BatchUpdateIssuesStatus:output_type -> bytebase.v1.BatchUpdateIssuesStatusResponse
- 17, // 52: bytebase.v1.IssueService.ApproveIssue:output_type -> bytebase.v1.Issue
- 17, // 53: bytebase.v1.IssueService.RejectIssue:output_type -> bytebase.v1.Issue
- 17, // 54: bytebase.v1.IssueService.RequestIssue:output_type -> bytebase.v1.Issue
- 43, // [43:55] is the sub-list for method output_type
- 31, // [31:43] is the sub-list for method input_type
+ 17, // 43: bytebase.v1.IssueService.RetryIssueApproval:input_type -> bytebase.v1.RetryIssueApprovalRequest
+ 18, // 44: bytebase.v1.IssueService.GetIssue:output_type -> bytebase.v1.Issue
+ 18, // 45: bytebase.v1.IssueService.CreateIssue:output_type -> bytebase.v1.Issue
+ 8, // 46: bytebase.v1.IssueService.ListIssues:output_type -> bytebase.v1.ListIssuesResponse
+ 10, // 47: bytebase.v1.IssueService.SearchIssues:output_type -> bytebase.v1.SearchIssuesResponse
+ 18, // 48: bytebase.v1.IssueService.UpdateIssue:output_type -> bytebase.v1.Issue
+ 23, // 49: bytebase.v1.IssueService.ListIssueComments:output_type -> bytebase.v1.ListIssueCommentsResponse
+ 26, // 50: bytebase.v1.IssueService.CreateIssueComment:output_type -> bytebase.v1.IssueComment
+ 26, // 51: bytebase.v1.IssueService.UpdateIssueComment:output_type -> bytebase.v1.IssueComment
+ 13, // 52: bytebase.v1.IssueService.BatchUpdateIssuesStatus:output_type -> bytebase.v1.BatchUpdateIssuesStatusResponse
+ 18, // 53: bytebase.v1.IssueService.ApproveIssue:output_type -> bytebase.v1.Issue
+ 18, // 54: bytebase.v1.IssueService.RejectIssue:output_type -> bytebase.v1.Issue
+ 18, // 55: bytebase.v1.IssueService.RequestIssue:output_type -> bytebase.v1.Issue
+ 18, // 56: bytebase.v1.IssueService.RetryIssueApproval:output_type -> bytebase.v1.Issue
+ 44, // [44:57] is the sub-list for method output_type
+ 31, // [31:44] is the sub-list for method input_type
31, // [31:31] is the sub-list for extension type_name
31, // [31:31] is the sub-list for extension extendee
0, // [0:31] is the sub-list for field type_name
@@ -2486,20 +2539,20 @@ func file_v1_issue_service_proto_init() {
}
file_v1_annotation_proto_init()
file_v1_common_proto_init()
- file_v1_issue_service_proto_msgTypes[20].OneofWrappers = []any{
+ file_v1_issue_service_proto_msgTypes[21].OneofWrappers = []any{
(*IssueComment_Approval_)(nil),
(*IssueComment_IssueUpdate_)(nil),
(*IssueComment_PlanSpecUpdate_)(nil),
}
- file_v1_issue_service_proto_msgTypes[23].OneofWrappers = []any{}
file_v1_issue_service_proto_msgTypes[24].OneofWrappers = []any{}
+ file_v1_issue_service_proto_msgTypes[25].OneofWrappers = []any{}
type x struct{}
out := protoimpl.TypeBuilder{
File: protoimpl.DescBuilder{
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: unsafe.Slice(unsafe.StringData(file_v1_issue_service_proto_rawDesc), len(file_v1_issue_service_proto_rawDesc)),
NumEnums: 5,
- NumMessages: 25,
+ NumMessages: 26,
NumExtensions: 0,
NumServices: 1,
},
diff --git a/backend/generated-go/v1/issue_service.pb.gw.go b/backend/generated-go/v1/issue_service.pb.gw.go
index 74ce0654b2..3c3a921d05 100644
--- a/backend/generated-go/v1/issue_service.pb.gw.go
+++ b/backend/generated-go/v1/issue_service.pb.gw.go
@@ -671,6 +671,51 @@ func local_request_IssueService_RequestIssue_0(ctx context.Context, marshaler ru
return msg, metadata, err
}
+func request_IssueService_RetryIssueApproval_0(ctx context.Context, marshaler runtime.Marshaler, client IssueServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
+ var (
+ protoReq RetryIssueApprovalRequest
+ metadata runtime.ServerMetadata
+ err error
+ )
+ if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) {
+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+ }
+ 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.RetryIssueApproval(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
+ return msg, metadata, err
+}
+
+func local_request_IssueService_RetryIssueApproval_0(ctx context.Context, marshaler runtime.Marshaler, server IssueServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
+ var (
+ protoReq RetryIssueApprovalRequest
+ metadata runtime.ServerMetadata
+ err error
+ )
+ if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) {
+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+ }
+ 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.RetryIssueApproval(ctx, &protoReq)
+ return msg, metadata, err
+}
+
// RegisterIssueServiceHandlerServer registers the http handlers for service IssueService to "mux".
// UnaryRPC :call IssueServiceServer directly.
// StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906.
@@ -917,6 +962,26 @@ func RegisterIssueServiceHandlerServer(ctx context.Context, mux *runtime.ServeMu
}
forward_IssueService_RequestIssue_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
})
+ mux.Handle(http.MethodPost, pattern_IssueService_RetryIssueApproval_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.IssueService/RetryIssueApproval", runtime.WithHTTPPathPattern("/v1/{name=projects/*/issues/*}:retryApproval"))
+ if err != nil {
+ runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
+ return
+ }
+ resp, md, err := local_request_IssueService_RetryIssueApproval_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_IssueService_RetryIssueApproval_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+ })
return nil
}
@@ -1161,6 +1226,23 @@ func RegisterIssueServiceHandlerClient(ctx context.Context, mux *runtime.ServeMu
}
forward_IssueService_RequestIssue_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
})
+ mux.Handle(http.MethodPost, pattern_IssueService_RetryIssueApproval_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.IssueService/RetryIssueApproval", runtime.WithHTTPPathPattern("/v1/{name=projects/*/issues/*}:retryApproval"))
+ if err != nil {
+ runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
+ return
+ }
+ resp, md, err := request_IssueService_RetryIssueApproval_0(annotatedContext, inboundMarshaler, client, req, pathParams)
+ annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)
+ if err != nil {
+ runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
+ return
+ }
+ forward_IssueService_RetryIssueApproval_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+ })
return nil
}
@@ -1177,6 +1259,7 @@ var (
pattern_IssueService_ApproveIssue_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 2, 2, 1, 0, 4, 4, 5, 3}, []string{"v1", "projects", "issues", "name"}, "approve"))
pattern_IssueService_RejectIssue_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 2, 2, 1, 0, 4, 4, 5, 3}, []string{"v1", "projects", "issues", "name"}, "reject"))
pattern_IssueService_RequestIssue_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 2, 2, 1, 0, 4, 4, 5, 3}, []string{"v1", "projects", "issues", "name"}, "request"))
+ pattern_IssueService_RetryIssueApproval_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 2, 2, 1, 0, 4, 4, 5, 3}, []string{"v1", "projects", "issues", "name"}, "retryApproval"))
)
var (
@@ -1192,4 +1275,5 @@ var (
forward_IssueService_ApproveIssue_0 = runtime.ForwardResponseMessage
forward_IssueService_RejectIssue_0 = runtime.ForwardResponseMessage
forward_IssueService_RequestIssue_0 = runtime.ForwardResponseMessage
+ forward_IssueService_RetryIssueApproval_0 = runtime.ForwardResponseMessage
)
diff --git a/backend/generated-go/v1/issue_service_equal.pb.go b/backend/generated-go/v1/issue_service_equal.pb.go
index 4e3fa4f039..87903399fb 100644
--- a/backend/generated-go/v1/issue_service_equal.pb.go
+++ b/backend/generated-go/v1/issue_service_equal.pb.go
@@ -247,6 +247,19 @@ func (x *RequestIssueRequest) Equal(y *RequestIssueRequest) bool {
return true
}
+func (x *RetryIssueApprovalRequest) Equal(y *RetryIssueApprovalRequest) 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 *Issue_Approver) Equal(y *Issue_Approver) bool {
if x == y {
return true
diff --git a/backend/generated-go/v1/issue_service_grpc.pb.go b/backend/generated-go/v1/issue_service_grpc.pb.go
index 8df8c9e734..5fc6e850c3 100644
--- a/backend/generated-go/v1/issue_service_grpc.pb.go
+++ b/backend/generated-go/v1/issue_service_grpc.pb.go
@@ -31,6 +31,7 @@ const (
IssueService_ApproveIssue_FullMethodName = "/bytebase.v1.IssueService/ApproveIssue"
IssueService_RejectIssue_FullMethodName = "/bytebase.v1.IssueService/RejectIssue"
IssueService_RequestIssue_FullMethodName = "/bytebase.v1.IssueService/RequestIssue"
+ IssueService_RetryIssueApproval_FullMethodName = "/bytebase.v1.IssueService/RetryIssueApproval"
)
// IssueServiceClient is the client API for IssueService service.
@@ -75,6 +76,16 @@ type IssueServiceClient interface {
// Requests changes on an issue. Access determined by approval flow configuration - caller must be a designated approver for the current approval step.
// Permissions required: None (determined by approval flow)
RequestIssue(ctx context.Context, in *RequestIssueRequest, opts ...grpc.CallOption) (*Issue, error)
+ // Re-runs approval-template finding for an issue stuck in CHECKING.
+ // Useful when the synchronous post-create finding errored (e.g. against
+ // a malformed workspace approval rule) and the operator has since
+ // corrected it — without this, the issue would remain in CHECKING
+ // indefinitely because there is no other retry path for non-DATABASE_CHANGE
+ // issue types. Idempotent: returns the existing issue unchanged when
+ // approval-finding has already completed.
+ // Permissions required: None (caller must be the issue creator;
+ // mirrors RequestIssue's authorization model).
+ RetryIssueApproval(ctx context.Context, in *RetryIssueApprovalRequest, opts ...grpc.CallOption) (*Issue, error)
}
type issueServiceClient struct {
@@ -205,6 +216,16 @@ func (c *issueServiceClient) RequestIssue(ctx context.Context, in *RequestIssueR
return out, nil
}
+func (c *issueServiceClient) RetryIssueApproval(ctx context.Context, in *RetryIssueApprovalRequest, opts ...grpc.CallOption) (*Issue, error) {
+ cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
+ out := new(Issue)
+ err := c.cc.Invoke(ctx, IssueService_RetryIssueApproval_FullMethodName, in, out, cOpts...)
+ if err != nil {
+ return nil, err
+ }
+ return out, nil
+}
+
// IssueServiceServer is the server API for IssueService service.
// All implementations must embed UnimplementedIssueServiceServer
// for forward compatibility.
@@ -247,6 +268,16 @@ type IssueServiceServer interface {
// Requests changes on an issue. Access determined by approval flow configuration - caller must be a designated approver for the current approval step.
// Permissions required: None (determined by approval flow)
RequestIssue(context.Context, *RequestIssueRequest) (*Issue, error)
+ // Re-runs approval-template finding for an issue stuck in CHECKING.
+ // Useful when the synchronous post-create finding errored (e.g. against
+ // a malformed workspace approval rule) and the operator has since
+ // corrected it — without this, the issue would remain in CHECKING
+ // indefinitely because there is no other retry path for non-DATABASE_CHANGE
+ // issue types. Idempotent: returns the existing issue unchanged when
+ // approval-finding has already completed.
+ // Permissions required: None (caller must be the issue creator;
+ // mirrors RequestIssue's authorization model).
+ RetryIssueApproval(context.Context, *RetryIssueApprovalRequest) (*Issue, error)
mustEmbedUnimplementedIssueServiceServer()
}
@@ -293,6 +324,9 @@ func (UnimplementedIssueServiceServer) RejectIssue(context.Context, *RejectIssue
func (UnimplementedIssueServiceServer) RequestIssue(context.Context, *RequestIssueRequest) (*Issue, error) {
return nil, status.Error(codes.Unimplemented, "method RequestIssue not implemented")
}
+func (UnimplementedIssueServiceServer) RetryIssueApproval(context.Context, *RetryIssueApprovalRequest) (*Issue, error) {
+ return nil, status.Error(codes.Unimplemented, "method RetryIssueApproval not implemented")
+}
func (UnimplementedIssueServiceServer) mustEmbedUnimplementedIssueServiceServer() {}
func (UnimplementedIssueServiceServer) testEmbeddedByValue() {}
@@ -530,6 +564,24 @@ func _IssueService_RequestIssue_Handler(srv interface{}, ctx context.Context, de
return interceptor(ctx, in, info, handler)
}
+func _IssueService_RetryIssueApproval_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+ in := new(RetryIssueApprovalRequest)
+ if err := dec(in); err != nil {
+ return nil, err
+ }
+ if interceptor == nil {
+ return srv.(IssueServiceServer).RetryIssueApproval(ctx, in)
+ }
+ info := &grpc.UnaryServerInfo{
+ Server: srv,
+ FullMethod: IssueService_RetryIssueApproval_FullMethodName,
+ }
+ handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+ return srv.(IssueServiceServer).RetryIssueApproval(ctx, req.(*RetryIssueApprovalRequest))
+ }
+ return interceptor(ctx, in, info, handler)
+}
+
// IssueService_ServiceDesc is the grpc.ServiceDesc for IssueService service.
// It's only intended for direct use with grpc.RegisterService,
// and not to be introspected or modified (even as a copy)
@@ -585,6 +637,10 @@ var IssueService_ServiceDesc = grpc.ServiceDesc{
MethodName: "RequestIssue",
Handler: _IssueService_RequestIssue_Handler,
},
+ {
+ MethodName: "RetryIssueApproval",
+ Handler: _IssueService_RetryIssueApproval_Handler,
+ },
},
Streams: []grpc.StreamDesc{},
Metadata: "v1/issue_service.proto",
diff --git a/backend/generated-go/v1/v1connect/issue_service.connect.go b/backend/generated-go/v1/v1connect/issue_service.connect.go
index d3b8db5f13..d5636b1f06 100644
--- a/backend/generated-go/v1/v1connect/issue_service.connect.go
+++ b/backend/generated-go/v1/v1connect/issue_service.connect.go
@@ -67,6 +67,9 @@ const (
// IssueServiceRequestIssueProcedure is the fully-qualified name of the IssueService's RequestIssue
// RPC.
IssueServiceRequestIssueProcedure = "/bytebase.v1.IssueService/RequestIssue"
+ // IssueServiceRetryIssueApprovalProcedure is the fully-qualified name of the IssueService's
+ // RetryIssueApproval RPC.
+ IssueServiceRetryIssueApprovalProcedure = "/bytebase.v1.IssueService/RetryIssueApproval"
)
// IssueServiceClient is a client for the bytebase.v1.IssueService service.
@@ -107,6 +110,16 @@ type IssueServiceClient interface {
// Requests changes on an issue. Access determined by approval flow configuration - caller must be a designated approver for the current approval step.
// Permissions required: None (determined by approval flow)
RequestIssue(context.Context, *connect.Request[v1.RequestIssueRequest]) (*connect.Response[v1.Issue], error)
+ // Re-runs approval-template finding for an issue stuck in CHECKING.
+ // Useful when the synchronous post-create finding errored (e.g. against
+ // a malformed workspace approval rule) and the operator has since
+ // corrected it — without this, the issue would remain in CHECKING
+ // indefinitely because there is no other retry path for non-DATABASE_CHANGE
+ // issue types. Idempotent: returns the existing issue unchanged when
+ // approval-finding has already completed.
+ // Permissions required: None (caller must be the issue creator;
+ // mirrors RequestIssue's authorization model).
+ RetryIssueApproval(context.Context, *connect.Request[v1.RetryIssueApprovalRequest]) (*connect.Response[v1.Issue], error)
}
// NewIssueServiceClient constructs a client for the bytebase.v1.IssueService service. By default,
@@ -192,6 +205,12 @@ func NewIssueServiceClient(httpClient connect.HTTPClient, baseURL string, opts .
connect.WithSchema(issueServiceMethods.ByName("RequestIssue")),
connect.WithClientOptions(opts...),
),
+ retryIssueApproval: connect.NewClient[v1.RetryIssueApprovalRequest, v1.Issue](
+ httpClient,
+ baseURL+IssueServiceRetryIssueApprovalProcedure,
+ connect.WithSchema(issueServiceMethods.ByName("RetryIssueApproval")),
+ connect.WithClientOptions(opts...),
+ ),
}
}
@@ -209,6 +228,7 @@ type issueServiceClient struct {
approveIssue *connect.Client[v1.ApproveIssueRequest, v1.Issue]
rejectIssue *connect.Client[v1.RejectIssueRequest, v1.Issue]
requestIssue *connect.Client[v1.RequestIssueRequest, v1.Issue]
+ retryIssueApproval *connect.Client[v1.RetryIssueApprovalRequest, v1.Issue]
}
// GetIssue calls bytebase.v1.IssueService.GetIssue.
@@ -271,6 +291,11 @@ func (c *issueServiceClient) RequestIssue(ctx context.Context, req *connect.Requ
return c.requestIssue.CallUnary(ctx, req)
}
+// RetryIssueApproval calls bytebase.v1.IssueService.RetryIssueApproval.
+func (c *issueServiceClient) RetryIssueApproval(ctx context.Context, req *connect.Request[v1.RetryIssueApprovalRequest]) (*connect.Response[v1.Issue], error) {
+ return c.retryIssueApproval.CallUnary(ctx, req)
+}
+
// IssueServiceHandler is an implementation of the bytebase.v1.IssueService service.
type IssueServiceHandler interface {
// Retrieves an issue by name.
@@ -309,6 +334,16 @@ type IssueServiceHandler interface {
// Requests changes on an issue. Access determined by approval flow configuration - caller must be a designated approver for the current approval step.
// Permissions required: None (determined by approval flow)
RequestIssue(context.Context, *connect.Request[v1.RequestIssueRequest]) (*connect.Response[v1.Issue], error)
+ // Re-runs approval-template finding for an issue stuck in CHECKING.
+ // Useful when the synchronous post-create finding errored (e.g. against
+ // a malformed workspace approval rule) and the operator has since
+ // corrected it — without this, the issue would remain in CHECKING
+ // indefinitely because there is no other retry path for non-DATABASE_CHANGE
+ // issue types. Idempotent: returns the existing issue unchanged when
+ // approval-finding has already completed.
+ // Permissions required: None (caller must be the issue creator;
+ // mirrors RequestIssue's authorization model).
+ RetryIssueApproval(context.Context, *connect.Request[v1.RetryIssueApprovalRequest]) (*connect.Response[v1.Issue], error)
}
// NewIssueServiceHandler builds an HTTP handler from the service implementation. It returns the
@@ -390,6 +425,12 @@ func NewIssueServiceHandler(svc IssueServiceHandler, opts ...connect.HandlerOpti
connect.WithSchema(issueServiceMethods.ByName("RequestIssue")),
connect.WithHandlerOptions(opts...),
)
+ issueServiceRetryIssueApprovalHandler := connect.NewUnaryHandler(
+ IssueServiceRetryIssueApprovalProcedure,
+ svc.RetryIssueApproval,
+ connect.WithSchema(issueServiceMethods.ByName("RetryIssueApproval")),
+ connect.WithHandlerOptions(opts...),
+ )
return "/bytebase.v1.IssueService/", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
switch r.URL.Path {
case IssueServiceGetIssueProcedure:
@@ -416,6 +457,8 @@ func NewIssueServiceHandler(svc IssueServiceHandler, opts ...connect.HandlerOpti
issueServiceRejectIssueHandler.ServeHTTP(w, r)
case IssueServiceRequestIssueProcedure:
issueServiceRequestIssueHandler.ServeHTTP(w, r)
+ case IssueServiceRetryIssueApprovalProcedure:
+ issueServiceRetryIssueApprovalHandler.ServeHTTP(w, r)
default:
http.NotFound(w, r)
}
@@ -472,3 +515,7 @@ func (UnimplementedIssueServiceHandler) RejectIssue(context.Context, *connect.Re
func (UnimplementedIssueServiceHandler) RequestIssue(context.Context, *connect.Request[v1.RequestIssueRequest]) (*connect.Response[v1.Issue], error) {
return nil, connect.NewError(connect.CodeUnimplemented, errors.New("bytebase.v1.IssueService.RequestIssue is not implemented"))
}
+
+func (UnimplementedIssueServiceHandler) RetryIssueApproval(context.Context, *connect.Request[v1.RetryIssueApprovalRequest]) (*connect.Response[v1.Issue], error) {
+ return nil, connect.NewError(connect.CodeUnimplemented, errors.New("bytebase.v1.IssueService.RetryIssueApproval is not implemented"))
+}
diff --git a/backend/store/issue.go b/backend/store/issue.go
index af98afb195..f9093cb16b 100644
--- a/backend/store/issue.go
+++ b/backend/store/issue.go
@@ -253,6 +253,12 @@ func (s *Store) ListIssues(ctx context.Context, find *FindIssueMessage) ([]*Issu
from := qb.Q().Space("issue")
where := qb.Q()
+ // `ProjectIDs` is required: empty slice intentionally returns zero
+ // rows, which `SearchIssues` relies on as its IAM-derived "this user
+ // has access to no projects" guard. Skipping the filter on empty
+ // would leak cross-project issues. Cross-project runner scans must
+ // pre-collect the project ID set (e.g. via `ListProjects`) and pass
+ // the explicit list here.
if len(find.ProjectIDs) == 1 {
where.And("issue.project = ?", find.ProjectIDs[0])
} else {
diff --git a/frontend/src/react/components/ExprEditor.tsx b/frontend/src/react/components/ExprEditor.tsx
index 1e93a41d7d..9a1fc3d64f 100644
--- a/frontend/src/react/components/ExprEditor.tsx
+++ b/frontend/src/react/components/ExprEditor.tsx
@@ -1016,6 +1016,16 @@ function ValueInput({
}
const isNumberValue = isNumberFactor(factor);
+ const isBooleanValue = isBooleanFactor(factor);
+
+ const getBooleanValue = (): boolean =>
+ typeof expr.args[1] === "boolean" ? (expr.args[1] as boolean) : true;
+ const setBooleanValue = (v: boolean) => {
+ doUpdate((group) => {
+ const cond = group.args[operandIndex] as ConditionExpr;
+ (cond.args as unknown[])[1] = v;
+ });
+ };
// Reset value when factor or operator changes
const prevRef = useRef({ factor, operator });
@@ -1093,6 +1103,29 @@ function ValueInput({
/>
);
}
+ if (isBooleanValue) {
+ // BooleanFactors (e.g. `request.unmask`) need a boolean value;
+ // the default text input would store a string and trip
+ // `validateSimpleExpr`'s `typeof value === "boolean"` check,
+ // leaving the parent form's submit button permanently disabled.
+ return (
+ <Select
+ value={String(getBooleanValue())}
+ disabled={readonly}
+ onValueChange={(val) => {
+ if (val != null) setBooleanValue(val === "true");
+ }}
+ >
+ <SelectTrigger className="min-w-24">
+ <SelectValue />
+ </SelectTrigger>
+ <SelectContent>
+ <SelectItem value="true">true</SelectItem>
+ <SelectItem value="false">false</SelectItem>
+ </SelectContent>
+ </Select>
+ );
+ }
return (
<Input
size="sm"
@@ -1117,12 +1150,19 @@ function ValueInput({
/>
);
}
+ // BooleanFactors (e.g. `request.unmask`) ship a [true,false] options
+ // list with string-typed values. The Select stores whatever the user
+ // picks via `setStringValue`, but `validateSimpleExpr` requires
+ // `typeof value === "boolean"` for the equality arm — so without
+ // this conversion the parent form's submit button stays disabled.
return (
<Select
- value={getStringValue()}
+ value={isBooleanValue ? String(getBooleanValue()) : getStringValue()}
disabled={readonly}
onValueChange={(val) => {
- if (val != null) setStringValue(val);
+ if (val == null) return;
+ if (isBooleanValue) setBooleanValue(val === "true");
+ else setStringValue(val);
}}
>
<SelectTrigger className="min-w-28">
diff --git a/frontend/src/react/components/SchemaEditorLite/TabsContainer.tsx b/frontend/src/react/components/SchemaEditorLite/TabsContainer.tsx
index dea0a4c4b1..ab7ef79bbb 100644
--- a/frontend/src/react/components/SchemaEditorLite/TabsContainer.tsx
+++ b/frontend/src/react/components/SchemaEditorLite/TabsContainer.tsx
@@ -9,6 +9,7 @@ import {
import { useEffect, useRef } from "react";
import { EllipsisText } from "@/react/components/ui/ellipsis-text";
import { cn } from "@/react/lib/utils";
+import { extractDatabaseResourceName } from "@/utils";
import { useSchemaEditorContext } from "./context";
import type { EditStatus, TabContext } from "./types";
@@ -89,7 +90,7 @@ function TabIcon({ type }: { type: TabContext["type"] }) {
function getTabName(tab: TabContext): string {
const meta = tab.metadata as Record<string, { name: string }>;
if (tab.type === "database") {
- return meta.database.name;
+ return extractDatabaseResourceName(meta.database.name).databaseName;
}
const schema = meta.schema?.name;
const objectName =
diff --git a/frontend/src/react/locales/en-US.json b/frontend/src/react/locales/en-US.json
index 546a862096..e589089f34 100644
--- a/frontend/src/react/locales/en-US.json
+++ b/frontend/src/react/locales/en-US.json
@@ -607,6 +607,7 @@
"custom-approval.issue-review.approved-issue": "approved issue",
"custom-approval.issue-review.re-requested-review": "re-requested issue review",
"custom-approval.issue-review.rejected-issue": "rejected issue",
+ "custom-approval.issue-review.retry-approval-finding": "Retry",
"data-source": {
"additional-node-addresses": "Additional Node Addresses",
"automatic-query-data-source": "Automatic",
diff --git a/frontend/src/react/locales/es-ES.json b/frontend/src/react/locales/es-ES.json
index 3b18520b37..b4e54be541 100644
--- a/frontend/src/react/locales/es-ES.json
+++ b/frontend/src/react/locales/es-ES.json
@@ -600,6 +600,7 @@
"custom-approval.issue-review.approved-issue": "approved issue",
"custom-approval.issue-review.re-requested-review": "re-requested issue review",
"custom-approval.issue-review.rejected-issue": "rejected issue",
+ "custom-approval.issue-review.retry-approval-finding": "Reintentar",
"data-source": {
"additional-node-addresses": "Direcciones de nodos adicionales",
"automatic-query-data-source": "Automática",
diff --git a/frontend/src/react/locales/ja-JP.json b/frontend/src/react/locales/ja-JP.json
index eca136f5c6..0cb5a20533 100644
--- a/frontend/src/react/locales/ja-JP.json
+++ b/frontend/src/react/locales/ja-JP.json
@@ -600,6 +600,7 @@
"custom-approval.issue-review.approved-issue": "approved issue",
"custom-approval.issue-review.re-requested-review": "re-requested issue review",
"custom-approval.issue-review.rejected-issue": "rejected issue",
+ "custom-approval.issue-review.retry-approval-finding": "リトライ",
"data-source": {
"additional-node-addresses": "追加のノードアドレス",
"automatic-query-data-source": "自動",
diff --git a/frontend/src/react/locales/vi-VN.json b/frontend/src/react/locales/vi-VN.json
index c8b2decfde..20cd529fb9 100644
--- a/frontend/src/react/locales/vi-VN.json
+++ b/frontend/src/react/locales/vi-VN.json
@@ -600,6 +600,7 @@
"custom-approval.issue-review.approved-issue": "approved issue",
"custom-approval.issue-review.re-requested-review": "re-requested issue review",
"custom-approval.issue-review.rejected-issue": "rejected issue",
+ "custom-approval.issue-review.retry-approval-finding": "Thử lại",
"data-source": {
"additional-node-addresses": "Địa chỉ nút bổ sung",
"automatic-query-data-source": "Tự động",
diff --git a/frontend/src/react/locales/zh-CN.json b/frontend/src/react/locales/zh-CN.json
index 1a1e4c62f2..d39b4c9499 100644
--- a/frontend/src/react/locales/zh-CN.json
+++ b/frontend/src/react/locales/zh-CN.json
@@ -600,6 +600,7 @@
"custom-approval.issue-review.approved-issue": "approved issue",
"custom-approval.issue-review.re-requested-review": "re-requested issue review",
"custom-approval.issue-review.rejected-issue": "rejected issue",
+ "custom-approval.issue-review.retry-approval-finding": "重试",
"data-source": {
"additional-node-addresses": "附加节点地址",
"automatic-query-data-source": "自动",
diff --git a/frontend/src/react/pages/project/issue-detail/components/IssueDetailApprovalFlow.tsx b/frontend/src/react/pages/project/issue-detail/components/IssueDetailApprovalFlow.tsx
index d029d80519..963b1590dd 100644
--- a/frontend/src/react/pages/project/issue-detail/components/IssueDetailApprovalFlow.tsx
+++ b/frontend/src/react/pages/project/issue-detail/components/IssueDetailApprovalFlow.tsx
@@ -31,6 +31,7 @@ import {
Issue_ApprovalStatus,
Issue_Approver_Status,
RequestIssueRequestSchema,
+ RetryIssueApprovalRequestSchema,
} from "@/types/proto-es/v1/issue_service_pb";
import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";
import type { User as UserMessage } from "@/types/proto-es/v1/user_service_pb";
@@ -98,12 +99,7 @@ export function IssueDetailApprovalFlow() {
<div className="mt-2">
{issue.approvalStatus === Issue_ApprovalStatus.CHECKING ? (
- <div className="flex items-center gap-x-2 text-sm text-control-placeholder">
- <div className="h-4 w-4 animate-spin rounded-full border-2 border-control-border border-t-accent" />
- <span>
- {t("custom-approval.issue-review.generating-approval-flow")}
- </span>
- </div>
+ <CheckingState issue={issue} />
) : approvalSteps.length > 0 ? (
<div className="mt-1 flex flex-col gap-y-4 pl-1">
{approvalSteps.map((step, index) => (
@@ -128,6 +124,60 @@ export function IssueDetailApprovalFlow() {
);
}
+/**
+ * "Generating approval flow…" placeholder shown while the backend is
+ * still computing an approval template. Includes a Retry button that
+ * calls the backend's `RetryIssueApproval` RPC — the synchronous
+ * post-create finding path swallows errors (e.g. CEL evaluation against
+ * a malformed workspace approval rule) and there is no event-driven
+ * retry for non-DATABASE_CHANGE issue types, so without this button a
+ * stuck issue would stay in CHECKING indefinitely.
+ */
+function CheckingState({ issue }: { issue: Issue }) {
+ const { t } = useTranslation();
+ const page = useIssueDetailContext();
+ const [retrying, setRetrying] = useState(false);
+
+ const handleRetry = async () => {
+ if (retrying) return;
+ setRetrying(true);
+ try {
+ const response = await issueServiceClientConnect.retryIssueApproval(
+ create(RetryIssueApprovalRequestSchema, { name: issue.name })
+ );
+ page.patchState({ issue: response });
+ } catch (error) {
+ pushNotification({
+ module: "bytebase",
+ style: "CRITICAL",
+ title: t("common.failed"),
+ description: error instanceof Error ? error.message : String(error),
+ });
+ } finally {
+ setRetrying(false);
+ }
+ };
+
+ return (
+ <div className="flex items-center gap-x-2 text-sm text-control-placeholder">
+ <div className="h-4 w-4 animate-spin rounded-full border-2 border-control-border border-t-accent" />
+ <span>{t("custom-approval.issue-review.generating-approval-flow")}</span>
+ <Button
+ className="gap-x-1.5"
+ disabled={retrying}
+ onClick={() => {
+ void handleRetry();
+ }}
+ size="xs"
+ variant="outline"
+ >
+ <RotateCcw className="h-3 w-3" />
+ {t("custom-approval.issue-review.retry-approval-finding")}
+ </Button>
+ </div>
+ );
+}
+
function ApprovalStepItem({
issue,
readonly,
diff --git a/frontend/src/types/proto-es/v1/issue_service_pb.d.ts b/frontend/src/types/proto-es/v1/issue_service_pb.d.ts
index fff7f65299..d02f3146e6 100644
--- a/frontend/src/types/proto-es/v1/issue_service_pb.d.ts
+++ b/frontend/src/types/proto-es/v1/issue_service_pb.d.ts
@@ -442,6 +442,25 @@ export declare type RequestIssueRequest = Message<"bytebase.v1.RequestIssueReque
*/
export declare const RequestIssueRequestSchema: GenMessage<RequestIssueRequest>;
+/**
+ * @generated from message bytebase.v1.RetryIssueApprovalRequest
+ */
+export declare type RetryIssueApprovalRequest = Message<"bytebase.v1.RetryIssueApprovalRequest"> & {
+ /**
+ * The name of the issue whose approval-finding should be retried.
+ * Format: projects/{project}/issues/{issue}
+ *
+ * @generated from field: string name = 1;
+ */
+ name: string;
+};
+
+/**
+ * Describes the message bytebase.v1.RetryIssueApprovalRequest.
+ * Use `create(RetryIssueApprovalRequestSchema)` to create a new message.
+ */
+export declare const RetryIssueApprovalRequestSchema: GenMessage<RetryIssueApprovalRequest>;
+
/**
* @generated from message bytebase.v1.Issue
*/
@@ -1360,5 +1379,23 @@ export declare const IssueService: GenService<{
input: typeof RequestIssueRequestSchema;
output: typeof IssueSchema;
},
+ /**
+ * Re-runs approval-template finding for an issue stuck in CHECKING.
+ * Useful when the synchronous post-create finding errored (e.g. against
+ * a malformed workspace approval rule) and the operator has since
+ * corrected it — without this, the issue would remain in CHECKING
+ * indefinitely because there is no other retry path for non-DATABASE_CHANGE
+ * issue types. Idempotent: returns the existing issue unchanged when
+ * approval-finding has already completed.
+ * Permissions required: None (caller must be the issue creator;
+ * mirrors RequestIssue's authorization model).
+ *
+ * @generated from rpc bytebase.v1.IssueService.RetryIssueApproval
+ */
+ retryIssueApproval: {
+ methodKind: "unary";
+ input: typeof RetryIssueApprovalRequestSchema;
+ output: typeof IssueSchema;
+ },
}>;
diff --git a/frontend/src/types/proto-es/v1/issue_service_pb.js b/frontend/src/types/proto-es/v1/issue_service_pb.js
index f3f61764e0..180e0f49fa 100644
--- a/frontend/src/types/proto-es/v1/issue_service_pb.js
+++ b/frontend/src/types/proto-es/v1/issue_service_pb.js
@@ -17,7 +17,7 @@ import { file_v1_common } from "./common_pb";
* Describes the file v1/issue_service.proto.
*/
export const file_v1_issue_service = /*@__PURE__*/
- fileDesc("ChZ2MS9pc3N1ZV9zZXJ2aWNlLnByb3RvEgtieXRlYmFzZS52MSJKCg9HZXRJc3N1ZVJlcXVlc3QSKAoEbmFtZRgBIAEoCUIa4EEC+kEUChJieXRlYmFzZS5jb20vSXNzdWUSDQoFZm9yY2UYAiABKAgiagoSQ3JlYXRlSXNzdWVSZXF1ZXN0EiwKBnBhcmVudBgBIAEoCUIc4EEC+kEWChRieXRlYmFzZS5jb20vUHJvamVjdBImCgVpc3N1ZRgCIAEoCzISLmJ5dGViYXNlLnYxLklzc3VlQgPgQQIimQEKEUxpc3RJc3N1ZXNSZXF1ZXN0EiwKBnBhcmVudBgBIAEoCUIc4EEC+kEWChRieXRlYmFzZS5jb20vUHJvamVjdBIRCglwYWdlX3NpemUYAiABKAUSEgoKcGFnZV90b2tlbhgDIAEoCRIOCgZmaWx0ZXIYBCABKAkSDQoFcXVlcnkYBSABKAkSEAoIb3JkZXJfYnkYBiABKAkiUQoSTGlzdElzc3Vlc1Jlc3BvbnNlEiIKBmlzc3VlcxgBIAMoCzISLmJ5dGViYXNlLnYxLklzc3VlEhcKD25leHRfcGFnZV90b2tlbhgCIAEoCSKCAQoTU2VhcmNoSXNzdWVzUmVxdWVzdBITCgZwYXJlbnQYASABKAlCA+BBAhIRCglwYWdlX3NpemUYAiABKAUSEgoKcGFnZV90b2tlbhgDIAEoCRIOCgZmaWx0ZXIYBCABKAkSDQoFcXVlcnkYBSABKAkSEAoIb3JkZXJfYnkYBiABKAkiUwoUU2VhcmNoSXNzdWVzUmVzcG9uc2USIgoGaXNzdWVzGAEgAygLMhIuYnl0ZWJhc2UudjEuSXNzdWUSFwoPbmV4dF9wYWdlX3Rva2VuGAIgASgJIqABChJVcGRhdGVJc3N1ZVJlcXVlc3QSPQoFaXNzdWUYASABKAsyEi5ieXRlYmFzZS52MS5Jc3N1ZUIa4EEC+kEUChJieXRlYmFzZS5jb20vSXNzdWUSNAoLdXBkYXRlX21hc2sYAiABKAsyGi5nb29nbGUucHJvdG9idWYuRmllbGRNYXNrQgPgQQISFQoNYWxsb3dfbWlzc2luZxgDIAEoCCKYAQoeQmF0Y2hVcGRhdGVJc3N1ZXNTdGF0dXNSZXF1ZXN0EiwKBnBhcmVudBgBIAEoCUIc4EEC+kEWChRieXRlYmFzZS5jb20vUHJvamVjdBIOCgZpc3N1ZXMYAiADKAkSKAoGc3RhdHVzGAMgASgOMhguYnl0ZWJhc2UudjEuSXNzdWVTdGF0dXMSDgoGcmVhc29uGAQgASgJIiEKH0JhdGNoVXBkYXRlSXNzdWVzU3RhdHVzUmVzcG9uc2UiUAoTQXBwcm92ZUlzc3VlUmVxdWVzdBIoCgRuYW1lGAEgASgJQhrgQQL6QRQKEmJ5dGViYXNlLmNvbS9Jc3N1ZRIPCgdjb21tZW50GAIgASgJIk8KElJlamVjdElzc3VlUmVxdWVzdBIoCgRuYW1lGAEgASgJQhrgQQL6QRQKEmJ5dGViYXNlLmNvbS9Jc3N1ZRIPCgdjb21tZW50GAIgASgJIlAKE1JlcXVlc3RJc3N1ZVJlcXVlc3QSKAoEbmFtZRgBIAEoCUIa4EEC+kEUChJieXRlYmFzZS5jb20vSXNzdWUSDwoHY29tbWVudBgCIAEoCSK1CAoFSXNzdWUSDAoEbmFtZRgBIAEoCRIXCgV0aXRsZRgCIAEoCUIIukgFcgMYyAESHQoLZGVzY3JpcHRpb24YAyABKAlCCLpIBXIDGJBOEiUKBHR5cGUYBCABKA4yFy5ieXRlYmFzZS52MS5Jc3N1ZS5UeXBlEigKBnN0YXR1cxgFIAEoDjIYLmJ5dGViYXNlLnYxLklzc3VlU3RhdHVzEi4KCWFwcHJvdmVycxgGIAMoCzIbLmJ5dGViYXNlLnYxLklzc3VlLkFwcHJvdmVyEjgKEWFwcHJvdmFsX3RlbXBsYXRlGAcgASgLMh0uYnl0ZWJhc2UudjEuQXBwcm92YWxUZW1wbGF0ZRIUCgdjcmVhdG9yGAggASgJQgPgQQMSNAoLY3JlYXRlX3RpbWUYCSABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wQgPgQQMSNAoLdXBkYXRlX3RpbWUYCiABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wQgPgQQMSDAoEcGxhbhgLIAEoCRIqCgpyb2xlX2dyYW50GA0gASgLMhYuYnl0ZWJhc2UudjEuUm9sZUdyYW50EioKCnJpc2tfbGV2ZWwYDyABKA4yFi5ieXRlYmFzZS52MS5SaXNrTGV2ZWwSDgoGbGFiZWxzGBEgAygJEj8KD2FwcHJvdmFsX3N0YXR1cxgSIAEoDjIhLmJ5dGViYXNlLnYxLklzc3VlLkFwcHJvdmFsU3RhdHVzQgPgQQMSNgoMYWNjZXNzX2dyYW50GBMgASgJQiDgQQP6QRoKGGJ5dGViYXNlLmNvbS9BY2Nlc3NHcmFudBqcAQoIQXBwcm92ZXISMgoGc3RhdHVzGAEgASgOMiIuYnl0ZWJhc2UudjEuSXNzdWUuQXBwcm92ZXIuU3RhdHVzEhEKCXByaW5jaXBhbBgCIAEoCSJJCgZTdGF0dXMSFgoSU1RBVFVTX1VOU1BFQ0lGSUVEEAASCwoHUEVORElORxABEgwKCEFQUFJPVkVEEAISDAoIUkVKRUNURUQQAyJoCgRUeXBlEhQKEFRZUEVfVU5TUEVDSUZJRUQQABITCg9EQVRBQkFTRV9DSEFOR0UQARIOCgpST0xFX0dSQU5UEAISEwoPREFUQUJBU0VfRVhQT1JUEAMSEAoMQUNDRVNTX0dSQU5UEAQidQoOQXBwcm92YWxTdGF0dXMSHwobQVBQUk9WQUxfU1RBVFVTX1VOU1BFQ0lGSUVEEAASDAoIQ0hFQ0tJTkcQARILCgdQRU5ESU5HEAISDAoIQVBQUk9WRUQQAxIMCghSRUpFQ1RFRBAEEgsKB1NLSVBQRUQQBTo66kE3ChJieXRlYmFzZS5jb20vSXNzdWUSIXByb2plY3RzL3twcm9qZWN0fS9pc3N1ZXMve2lzc3VlfSJ8CglSb2xlR3JhbnQSDAoEcm9sZRgBIAEoCRIMCgR1c2VyGAIgASgJEiQKCWNvbmRpdGlvbhgDIAEoCzIRLmdvb2dsZS50eXBlLkV4cHISLQoKZXhwaXJhdGlvbhgEIAEoCzIZLmdvb2dsZS5wcm90b2J1Zi5EdXJhdGlvbiJfChBBcHByb3ZhbFRlbXBsYXRlEicKBGZsb3cYASABKAsyGS5ieXRlYmFzZS52MS5BcHByb3ZhbEZsb3cSDQoFdGl0bGUYAiABKAkSEwoLZGVzY3JpcHRpb24YAyABKAkiHQoMQXBwcm92YWxGbG93Eg0KBXJvbGVzGAEgAygJIm0KGExpc3RJc3N1ZUNvbW1lbnRzUmVxdWVzdBIqCgZwYXJlbnQYASABKAlCGuBBAvpBFAoSYnl0ZWJhc2UuY29tL0lzc3VlEhEKCXBhZ2Vfc2l6ZRgCIAEoBRISCgpwYWdlX3Rva2VuGAMgASgJImcKGUxpc3RJc3N1ZUNvbW1lbnRzUmVzcG9uc2USMQoOaXNzdWVfY29tbWVudHMYASADKAsyGS5ieXRlYmFzZS52MS5Jc3N1ZUNvbW1lbnQSFwoPbmV4dF9wYWdlX3Rva2VuGAIgASgJInkKGUNyZWF0ZUlzc3VlQ29tbWVudFJlcXVlc3QSKgoGcGFyZW50GAEgASgJQhrgQQL6QRQKEmJ5dGViYXNlLmNvbS9Jc3N1ZRIwCg1pc3N1ZV9jb21tZW50GAIgASgLMhkuYnl0ZWJhc2UudjEuSXNzdWVDb21tZW50IsYBChlVcGRhdGVJc3N1ZUNvbW1lbnRSZXF1ZXN0EioKBnBhcmVudBgBIAEoCUIa4EEC+kEUChJieXRlYmFzZS5jb20vSXNzdWUSMAoNaXNzdWVfY29tbWVudBgCIAEoCzIZLmJ5dGViYXNlLnYxLklzc3VlQ29tbWVudBI0Cgt1cGRhdGVfbWFzaxgDIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5GaWVsZE1hc2tCA+BBAhIVCg1hbGxvd19taXNzaW5nGAQgASgIIvwHCgxJc3N1ZUNvbW1lbnQSDAoEbmFtZRgBIAEoCRIaCgdjb21tZW50GAIgASgJQgm6SAZyBBiAgAQSDwoHcGF5bG9hZBgDIAEoCRI0CgtjcmVhdGVfdGltZRgEIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBCA+BBAxI0Cgt1cGRhdGVfdGltZRgFIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBCA+BBAxIUCgdjcmVhdG9yGAYgASgJQgPgQQMSNgoIYXBwcm92YWwYByABKAsyIi5ieXRlYmFzZS52MS5Jc3N1ZUNvbW1lbnQuQXBwcm92YWxIABI9Cgxpc3N1ZV91cGRhdGUYCCABKAsyJS5ieXRlYmFzZS52MS5Jc3N1ZUNvbW1lbnQuSXNzdWVVcGRhdGVIABJEChBwbGFuX3NwZWNfdXBkYXRlGAwgASgLMiguYnl0ZWJhc2UudjEuSXNzdWVDb21tZW50LlBsYW5TcGVjVXBkYXRlSAAakAEKCEFwcHJvdmFsEjkKBnN0YXR1cxgBIAEoDjIpLmJ5dGViYXNlLnYxLklzc3VlQ29tbWVudC5BcHByb3ZhbC5TdGF0dXMiSQoGU3RhdHVzEhYKElNUQVRVU19VTlNQRUNJRklFRBAAEgsKB1BFTkRJTkcQARIMCghBUFBST1ZFRBACEgwKCFJFSkVDVEVEEAMa6QIKC0lzc3VlVXBkYXRlEhcKCmZyb21fdGl0bGUYASABKAlIAIgBARIVCgh0b190aXRsZRgCIAEoCUgBiAEBEh0KEGZyb21fZGVzY3JpcHRpb24YAyABKAlIAogBARIbCg50b19kZXNjcmlwdGlvbhgEIAEoCUgDiAEBEjIKC2Zyb21fc3RhdHVzGAUgASgOMhguYnl0ZWJhc2UudjEuSXNzdWVTdGF0dXNIBIgBARIwCgl0b19zdGF0dXMYBiABKA4yGC5ieXRlYmFzZS52MS5Jc3N1ZVN0YXR1c0gFiAEBEhMKC2Zyb21fbGFiZWxzGAcgAygJEhEKCXRvX2xhYmVscxgIIAMoCUINCgtfZnJvbV90aXRsZUILCglfdG9fdGl0bGVCEwoRX2Zyb21fZGVzY3JpcHRpb25CEQoPX3RvX2Rlc2NyaXB0aW9uQg4KDF9mcm9tX3N0YXR1c0IMCgpfdG9fc3RhdHVzGmoKDlBsYW5TcGVjVXBkYXRlEgwKBHNwZWMYASABKAkSFwoKZnJvbV9zaGVldBgCIAEoCUgAiAEBEhUKCHRvX3NoZWV0GAMgASgJSAGIAQFCDQoLX2Zyb21fc2hlZXRCCwoJX3RvX3NoZWV0QgcKBWV2ZW50Kk0KC0lzc3VlU3RhdHVzEhwKGElTU1VFX1NUQVRVU19VTlNQRUNJRklFRBAAEggKBE9QRU4QARIICgRET05FEAISDAoIQ0FOQ0VMRUQQAzLYDwoMSXNzdWVTZXJ2aWNlEoABCghHZXRJc3N1ZRIcLmJ5dGViYXNlLnYxLkdldElzc3VlUmVxdWVzdBoSLmJ5dGViYXNlLnYxLklzc3VlIkLaQQRuYW1liuowDWJiLmlzc3Vlcy5nZXSQ6jABgtPkkwIgEh4vdjEve25hbWU9cHJvamVjdHMvKi9pc3N1ZXMvKn0SnAEKC0NyZWF0ZUlzc3VlEh8uYnl0ZWJhc2UudjEuQ3JlYXRlSXNzdWVSZXF1ZXN0GhIuYnl0ZWJhc2UudjEuSXNzdWUiWNpBDHBhcmVudCxpc3N1ZYrqMBBiYi5pc3N1ZXMuY3JlYXRlkOowAZjqMAGC0+STAic6BWlzc3VlIh4vdjEve3BhcmVudD1wcm9qZWN0cy8qfS9pc3N1ZXMSlAEKCkxpc3RJc3N1ZXMSHi5ieXRlYmFzZS52MS5MaXN0SXNzdWVzUmVxdWVzdBofLmJ5dGViYXNlLnYxLkxpc3RJc3N1ZXNSZXNwb25zZSJF2kEGcGFyZW50iuowDmJiLmlzc3Vlcy5saXN0kOowAYLT5JMCIBIeL3YxL3twYXJlbnQ9cHJvamVjdHMvKn0vaXNzdWVzEpoBCgxTZWFyY2hJc3N1ZXMSIC5ieXRlYmFzZS52MS5TZWFyY2hJc3N1ZXNSZXF1ZXN0GiEuYnl0ZWJhc2UudjEuU2VhcmNoSXNzdWVzUmVzcG9uc2UiRYrqMA1iYi5pc3N1ZXMuZ2V0kOowAoLT5JMCKjoBKiIlL3YxL3twYXJlbnQ9cHJvamVjdHMvKn0vaXNzdWVzOnNlYXJjaBKnAQoLVXBkYXRlSXNzdWUSHy5ieXRlYmFzZS52MS5VcGRhdGVJc3N1ZVJlcXVlc3QaEi5ieXRlYmFzZS52MS5Jc3N1ZSJj2kERaXNzdWUsdXBkYXRlX21hc2uK6jAQYmIuaXNzdWVzLnVwZGF0ZZDqMAGY6jABgtPkkwItOgVpc3N1ZTIkL3YxL3tpc3N1ZS5uYW1lPXByb2plY3RzLyovaXNzdWVzLyp9EsABChFMaXN0SXNzdWVDb21tZW50cxIlLmJ5dGViYXNlLnYxLkxpc3RJc3N1ZUNvbW1lbnRzUmVxdWVzdBomLmJ5dGViYXNlLnYxLkxpc3RJc3N1ZUNvbW1lbnRzUmVzcG9uc2UiXNpBBnBhcmVudIrqMBViYi5pc3N1ZUNvbW1lbnRzLmxpc3SQ6jABgtPkkwIwEi4vdjEve3BhcmVudD1wcm9qZWN0cy8qL2lzc3Vlcy8qfS9pc3N1ZUNvbW1lbnRzEtIBChJDcmVhdGVJc3N1ZUNvbW1lbnQSJi5ieXRlYmFzZS52MS5DcmVhdGVJc3N1ZUNvbW1lbnRSZXF1ZXN0GhkuYnl0ZWJhc2UudjEuSXNzdWVDb21tZW50InnaQRRwYXJlbnQsaXNzdWVfY29tbWVudIrqMBdiYi5pc3N1ZUNvbW1lbnRzLmNyZWF0ZZDqMAGY6jABgtPkkwI5Og1pc3N1ZV9jb21tZW50IigvdjEve3BhcmVudD1wcm9qZWN0cy8qL2lzc3Vlcy8qfTpjb21tZW50Et8BChJVcGRhdGVJc3N1ZUNvbW1lbnQSJi5ieXRlYmFzZS52MS5VcGRhdGVJc3N1ZUNvbW1lbnRSZXF1ZXN0GhkuYnl0ZWJhc2UudjEuSXNzdWVDb21tZW50IoUB2kEgcGFyZW50LGlzc3VlX2NvbW1lbnQsdXBkYXRlX21hc2uK6jAXYmIuaXNzdWVDb21tZW50cy51cGRhdGWQ6jABmOowAYLT5JMCOToNaXNzdWVfY29tbWVudDIoL3YxL3twYXJlbnQ9cHJvamVjdHMvKi9pc3N1ZXMvKn06Y29tbWVudBLNAQoXQmF0Y2hVcGRhdGVJc3N1ZXNTdGF0dXMSKy5ieXRlYmFzZS52MS5CYXRjaFVwZGF0ZUlzc3Vlc1N0YXR1c1JlcXVlc3QaLC5ieXRlYmFzZS52MS5CYXRjaFVwZGF0ZUlzc3Vlc1N0YXR1c1Jlc3BvbnNlIleK6jAQYmIuaXNzdWVzLnVwZGF0ZZDqMAGY6jABgtPkkwI1OgEqIjAvdjEve3BhcmVudD1wcm9qZWN0cy8qfS9pc3N1ZXM6YmF0Y2hVcGRhdGVTdGF0dXMSfwoMQXBwcm92ZUlzc3VlEiAuYnl0ZWJhc2UudjEuQXBwcm92ZUlzc3VlUmVxdWVzdBoSLmJ5dGViYXNlLnYxLklzc3VlIjmQ6jACmOowAYLT5JMCKzoBKiImL3YxL3tuYW1lPXByb2plY3RzLyovaXNzdWVzLyp9OmFwcHJvdmUSfAoLUmVqZWN0SXNzdWUSHy5ieXRlYmFzZS52MS5SZWplY3RJc3N1ZVJlcXVlc3QaEi5ieXRlYmFzZS52MS5Jc3N1ZSI4kOowApjqMAGC0+STAio6ASoiJS92MS97bmFtZT1wcm9qZWN0cy8qL2lzc3Vlcy8qfTpyZWplY3QSfwoMUmVxdWVzdElzc3VlEiAuYnl0ZWJhc2UudjEuUmVxdWVzdElzc3VlUmVxdWVzdBoSLmJ5dGViYXNlLnYxLklzc3VlIjmQ6jACmOowAYLT5JMCKzoBKiImL3YxL3tuYW1lPXByb2plY3RzLyovaXNzdWVzLyp9OnJlcXVlc3RCpwEKD2NvbS5ieXRlYmFzZS52MUIRSXNzdWVTZXJ2aWNlUHJvdG9QAVo0Z2l0aHViLmNvbS9ieXRlYmFzZS9ieXRlYmFzZS9iYWNrZW5kL2dlbmVyYXRlZC1nby92MaICA0JYWKoCC0J5dGViYXNlLlYxygILQnl0ZWJhc2VcVjHiAhdCeXRlYmFzZVxWMVxHUEJNZXRhZGF0YeoCDEJ5dGViYXNlOjpWMWIGcHJvdG8z", [file_buf_validate_validate, file_google_api_annotations, file_google_api_client, file_google_api_field_behavior, file_google_api_resource, file_google_protobuf_duration, file_google_protobuf_field_mask, file_google_protobuf_timestamp, file_google_type_expr, file_v1_annotation, file_v1_common]);
+ fileDesc("ChZ2MS9pc3N1ZV9zZXJ2aWNlLnByb3RvEgtieXRlYmFzZS52MSJKCg9HZXRJc3N1ZVJlcXVlc3QSKAoEbmFtZRgBIAEoCUIa4EEC+kEUChJieXRlYmFzZS5jb20vSXNzdWUSDQoFZm9yY2UYAiABKAgiagoSQ3JlYXRlSXNzdWVSZXF1ZXN0EiwKBnBhcmVudBgBIAEoCUIc4EEC+kEWChRieXRlYmFzZS5jb20vUHJvamVjdBImCgVpc3N1ZRgCIAEoCzISLmJ5dGViYXNlLnYxLklzc3VlQgPgQQIimQEKEUxpc3RJc3N1ZXNSZXF1ZXN0EiwKBnBhcmVudBgBIAEoCUIc4EEC+kEWChRieXRlYmFzZS5jb20vUHJvamVjdBIRCglwYWdlX3NpemUYAiABKAUSEgoKcGFnZV90b2tlbhgDIAEoCRIOCgZmaWx0ZXIYBCABKAkSDQoFcXVlcnkYBSABKAkSEAoIb3JkZXJfYnkYBiABKAkiUQoSTGlzdElzc3Vlc1Jlc3BvbnNlEiIKBmlzc3VlcxgBIAMoCzISLmJ5dGViYXNlLnYxLklzc3VlEhcKD25leHRfcGFnZV90b2tlbhgCIAEoCSKCAQoTU2VhcmNoSXNzdWVzUmVxdWVzdBITCgZwYXJlbnQYASABKAlCA+BBAhIRCglwYWdlX3NpemUYAiABKAUSEgoKcGFnZV90b2tlbhgDIAEoCRIOCgZmaWx0ZXIYBCABKAkSDQoFcXVlcnkYBSABKAkSEAoIb3JkZXJfYnkYBiABKAkiUwoUU2VhcmNoSXNzdWVzUmVzcG9uc2USIgoGaXNzdWVzGAEgAygLMhIuYnl0ZWJhc2UudjEuSXNzdWUSFwoPbmV4dF9wYWdlX3Rva2VuGAIgASgJIqABChJVcGRhdGVJc3N1ZVJlcXVlc3QSPQoFaXNzdWUYASABKAsyEi5ieXRlYmFzZS52MS5Jc3N1ZUIa4EEC+kEUChJieXRlYmFzZS5jb20vSXNzdWUSNAoLdXBkYXRlX21hc2sYAiABKAsyGi5nb29nbGUucHJvdG9idWYuRmllbGRNYXNrQgPgQQISFQoNYWxsb3dfbWlzc2luZxgDIAEoCCKYAQoeQmF0Y2hVcGRhdGVJc3N1ZXNTdGF0dXNSZXF1ZXN0EiwKBnBhcmVudBgBIAEoCUIc4EEC+kEWChRieXRlYmFzZS5jb20vUHJvamVjdBIOCgZpc3N1ZXMYAiADKAkSKAoGc3RhdHVzGAMgASgOMhguYnl0ZWJhc2UudjEuSXNzdWVTdGF0dXMSDgoGcmVhc29uGAQgASgJIiEKH0JhdGNoVXBkYXRlSXNzdWVzU3RhdHVzUmVzcG9uc2UiUAoTQXBwcm92ZUlzc3VlUmVxdWVzdBIoCgRuYW1lGAEgASgJQhrgQQL6QRQKEmJ5dGViYXNlLmNvbS9Jc3N1ZRIPCgdjb21tZW50GAIgASgJIk8KElJlamVjdElzc3VlUmVxdWVzdBIoCgRuYW1lGAEgASgJQhrgQQL6QRQKEmJ5dGViYXNlLmNvbS9Jc3N1ZRIPCgdjb21tZW50GAIgASgJIlAKE1JlcXVlc3RJc3N1ZVJlcXVlc3QSKAoEbmFtZRgBIAEoCUIa4EEC+kEUChJieXRlYmFzZS5jb20vSXNzdWUSDwoHY29tbWVudBgCIAEoCSJFChlSZXRyeUlzc3VlQXBwcm92YWxSZXF1ZXN0EigKBG5hbWUYASABKAlCGuBBAvpBFAoSYnl0ZWJhc2UuY29tL0lzc3VlIrUICgVJc3N1ZRIMCgRuYW1lGAEgASgJEhcKBXRpdGxlGAIgASgJQgi6SAVyAxjIARIdCgtkZXNjcmlwdGlvbhgDIAEoCUIIukgFcgMYkE4SJQoEdHlwZRgEIAEoDjIXLmJ5dGViYXNlLnYxLklzc3VlLlR5cGUSKAoGc3RhdHVzGAUgASgOMhguYnl0ZWJhc2UudjEuSXNzdWVTdGF0dXMSLgoJYXBwcm92ZXJzGAYgAygLMhsuYnl0ZWJhc2UudjEuSXNzdWUuQXBwcm92ZXISOAoRYXBwcm92YWxfdGVtcGxhdGUYByABKAsyHS5ieXRlYmFzZS52MS5BcHByb3ZhbFRlbXBsYXRlEhQKB2NyZWF0b3IYCCABKAlCA+BBAxI0CgtjcmVhdGVfdGltZRgJIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBCA+BBAxI0Cgt1cGRhdGVfdGltZRgKIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBCA+BBAxIMCgRwbGFuGAsgASgJEioKCnJvbGVfZ3JhbnQYDSABKAsyFi5ieXRlYmFzZS52MS5Sb2xlR3JhbnQSKgoKcmlza19sZXZlbBgPIAEoDjIWLmJ5dGViYXNlLnYxLlJpc2tMZXZlbBIOCgZsYWJlbHMYESADKAkSPwoPYXBwcm92YWxfc3RhdHVzGBIgASgOMiEuYnl0ZWJhc2UudjEuSXNzdWUuQXBwcm92YWxTdGF0dXNCA+BBAxI2CgxhY2Nlc3NfZ3JhbnQYEyABKAlCIOBBA/pBGgoYYnl0ZWJhc2UuY29tL0FjY2Vzc0dyYW50GpwBCghBcHByb3ZlchIyCgZzdGF0dXMYASABKA4yIi5ieXRlYmFzZS52MS5Jc3N1ZS5BcHByb3Zlci5TdGF0dXMSEQoJcHJpbmNpcGFsGAIgASgJIkkKBlN0YXR1cxIWChJTVEFUVVNfVU5TUEVDSUZJRUQQABILCgdQRU5ESU5HEAESDAoIQVBQUk9WRUQQAhIMCghSRUpFQ1RFRBADImgKBFR5cGUSFAoQVFlQRV9VTlNQRUNJRklFRBAAEhMKD0RBVEFCQVNFX0NIQU5HRRABEg4KClJPTEVfR1JBTlQQAhITCg9EQVRBQkFTRV9FWFBPUlQQAxIQCgxBQ0NFU1NfR1JBTlQQBCJ1Cg5BcHByb3ZhbFN0YXR1cxIfChtBUFBST1ZBTF9TVEFUVVNfVU5TUEVDSUZJRUQQABIMCghDSEVDS0lORxABEgsKB1BFTkRJTkcQAhIMCghBUFBST1ZFRBADEgwKCFJFSkVDVEVEEAQSCwoHU0tJUFBFRBAFOjrqQTcKEmJ5dGViYXNlLmNvbS9Jc3N1ZRIhcHJvamVjdHMve3Byb2plY3R9L2lzc3Vlcy97aXNzdWV9InwKCVJvbGVHcmFudBIMCgRyb2xlGAEgASgJEgwKBHVzZXIYAiABKAkSJAoJY29uZGl0aW9uGAMgASgLMhEuZ29vZ2xlLnR5cGUuRXhwchItCgpleHBpcmF0aW9uGAQgASgLMhkuZ29vZ2xlLnByb3RvYnVmLkR1cmF0aW9uIl8KEEFwcHJvdmFsVGVtcGxhdGUSJwoEZmxvdxgBIAEoCzIZLmJ5dGViYXNlLnYxLkFwcHJvdmFsRmxvdxINCgV0aXRsZRgCIAEoCRITCgtkZXNjcmlwdGlvbhgDIAEoCSIdCgxBcHByb3ZhbEZsb3cSDQoFcm9sZXMYASADKAkibQoYTGlzdElzc3VlQ29tbWVudHNSZXF1ZXN0EioKBnBhcmVudBgBIAEoCUIa4EEC+kEUChJieXRlYmFzZS5jb20vSXNzdWUSEQoJcGFnZV9zaXplGAIgASgFEhIKCnBhZ2VfdG9rZW4YAyABKAkiZwoZTGlzdElzc3VlQ29tbWVudHNSZXNwb25zZRIxCg5pc3N1ZV9jb21tZW50cxgBIAMoCzIZLmJ5dGViYXNlLnYxLklzc3VlQ29tbWVudBIXCg9uZXh0X3BhZ2VfdG9rZW4YAiABKAkieQoZQ3JlYXRlSXNzdWVDb21tZW50UmVxdWVzdBIqCgZwYXJlbnQYASABKAlCGuBBAvpBFAoSYnl0ZWJhc2UuY29tL0lzc3VlEjAKDWlzc3VlX2NvbW1lbnQYAiABKAsyGS5ieXRlYmFzZS52MS5Jc3N1ZUNvbW1lbnQixgEKGVVwZGF0ZUlzc3VlQ29tbWVudFJlcXVlc3QSKgoGcGFyZW50GAEgASgJQhrgQQL6QRQKEmJ5dGViYXNlLmNvbS9Jc3N1ZRIwCg1pc3N1ZV9jb21tZW50GAIgASgLMhkuYnl0ZWJhc2UudjEuSXNzdWVDb21tZW50EjQKC3VwZGF0ZV9tYXNrGAMgASgLMhouZ29vZ2xlLnByb3RvYnVmLkZpZWxkTWFza0ID4EECEhUKDWFsbG93X21pc3NpbmcYBCABKAgi/AcKDElzc3VlQ29tbWVudBIMCgRuYW1lGAEgASgJEhoKB2NvbW1lbnQYAiABKAlCCbpIBnIEGICABBIPCgdwYXlsb2FkGAMgASgJEjQKC2NyZWF0ZV90aW1lGAQgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcEID4EEDEjQKC3VwZGF0ZV90aW1lGAUgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcEID4EEDEhQKB2NyZWF0b3IYBiABKAlCA+BBAxI2CghhcHByb3ZhbBgHIAEoCzIiLmJ5dGViYXNlLnYxLklzc3VlQ29tbWVudC5BcHByb3ZhbEgAEj0KDGlzc3VlX3VwZGF0ZRgIIAEoCzIlLmJ5dGViYXNlLnYxLklzc3VlQ29tbWVudC5Jc3N1ZVVwZGF0ZUgAEkQKEHBsYW5fc3BlY191cGRhdGUYDCABKAsyKC5ieXRlYmFzZS52MS5Jc3N1ZUNvbW1lbnQuUGxhblNwZWNVcGRhdGVIABqQAQoIQXBwcm92YWwSOQoGc3RhdHVzGAEgASgOMikuYnl0ZWJhc2UudjEuSXNzdWVDb21tZW50LkFwcHJvdmFsLlN0YXR1cyJJCgZTdGF0dXMSFgoSU1RBVFVTX1VOU1BFQ0lGSUVEEAASCwoHUEVORElORxABEgwKCEFQUFJPVkVEEAISDAoIUkVKRUNURUQQAxrpAgoLSXNzdWVVcGRhdGUSFwoKZnJvbV90aXRsZRgBIAEoCUgAiAEBEhUKCHRvX3RpdGxlGAIgASgJSAGIAQESHQoQZnJvbV9kZXNjcmlwdGlvbhgDIAEoCUgCiAEBEhsKDnRvX2Rlc2NyaXB0aW9uGAQgASgJSAOIAQESMgoLZnJvbV9zdGF0dXMYBSABKA4yGC5ieXRlYmFzZS52MS5Jc3N1ZVN0YXR1c0gEiAEBEjAKCXRvX3N0YXR1cxgGIAEoDjIYLmJ5dGViYXNlLnYxLklzc3VlU3RhdHVzSAWIAQESEwoLZnJvbV9sYWJlbHMYByADKAkSEQoJdG9fbGFiZWxzGAggAygJQg0KC19mcm9tX3RpdGxlQgsKCV90b190aXRsZUITChFfZnJvbV9kZXNjcmlwdGlvbkIRCg9fdG9fZGVzY3JpcHRpb25CDgoMX2Zyb21fc3RhdHVzQgwKCl90b19zdGF0dXMaagoOUGxhblNwZWNVcGRhdGUSDAoEc3BlYxgBIAEoCRIXCgpmcm9tX3NoZWV0GAIgASgJSACIAQESFQoIdG9fc2hlZXQYAyABKAlIAYgBAUINCgtfZnJvbV9zaGVldEILCglfdG9fc2hlZXRCBwoFZXZlbnQqTQoLSXNzdWVTdGF0dXMSHAoYSVNTVUVfU1RBVFVTX1VOU1BFQ0lGSUVEEAASCAoET1BFThABEggKBERPTkUQAhIMCghDQU5DRUxFRBADMuwQCgxJc3N1ZVNlcnZpY2USgAEKCEdldElzc3VlEhwuYnl0ZWJhc2UudjEuR2V0SXNzdWVSZXF1ZXN0GhIuYnl0ZWJhc2UudjEuSXNzdWUiQtpBBG5hbWWK6jANYmIuaXNzdWVzLmdldJDqMAGC0+STAiASHi92MS97bmFtZT1wcm9qZWN0cy8qL2lzc3Vlcy8qfRKcAQoLQ3JlYXRlSXNzdWUSHy5ieXRlYmFzZS52MS5DcmVhdGVJc3N1ZVJlcXVlc3QaEi5ieXRlYmFzZS52MS5Jc3N1ZSJY2kEMcGFyZW50LGlzc3VliuowEGJiLmlzc3Vlcy5jcmVhdGWQ6jABmOowAYLT5JMCJzoFaXNzdWUiHi92MS97cGFyZW50PXByb2plY3RzLyp9L2lzc3VlcxKUAQoKTGlzdElzc3VlcxIeLmJ5dGViYXNlLnYxLkxpc3RJc3N1ZXNSZXF1ZXN0Gh8uYnl0ZWJhc2UudjEuTGlzdElzc3Vlc1Jlc3BvbnNlIkXaQQZwYXJlbnSK6jAOYmIuaXNzdWVzLmxpc3SQ6jABgtPkkwIgEh4vdjEve3BhcmVudD1wcm9qZWN0cy8qfS9pc3N1ZXMSmgEKDFNlYXJjaElzc3VlcxIgLmJ5dGViYXNlLnYxLlNlYXJjaElzc3Vlc1JlcXVlc3QaIS5ieXRlYmFzZS52MS5TZWFyY2hJc3N1ZXNSZXNwb25zZSJFiuowDWJiLmlzc3Vlcy5nZXSQ6jACgtPkkwIqOgEqIiUvdjEve3BhcmVudD1wcm9qZWN0cy8qfS9pc3N1ZXM6c2VhcmNoEqcBCgtVcGRhdGVJc3N1ZRIfLmJ5dGViYXNlLnYxLlVwZGF0ZUlzc3VlUmVxdWVzdBoSLmJ5dGViYXNlLnYxLklzc3VlImPaQRFpc3N1ZSx1cGRhdGVfbWFza4rqMBBiYi5pc3N1ZXMudXBkYXRlkOowAZjqMAGC0+STAi06BWlzc3VlMiQvdjEve2lzc3VlLm5hbWU9cHJvamVjdHMvKi9pc3N1ZXMvKn0SwAEKEUxpc3RJc3N1ZUNvbW1lbnRzEiUuYnl0ZWJhc2UudjEuTGlzdElzc3VlQ29tbWVudHNSZXF1ZXN0GiYuYnl0ZWJhc2UudjEuTGlzdElzc3VlQ29tbWVudHNSZXNwb25zZSJc2kEGcGFyZW50iuowFWJiLmlzc3VlQ29tbWVudHMubGlzdJDqMAGC0+STAjASLi92MS97cGFyZW50PXByb2plY3RzLyovaXNzdWVzLyp9L2lzc3VlQ29tbWVudHMS0gEKEkNyZWF0ZUlzc3VlQ29tbWVudBImLmJ5dGViYXNlLnYxLkNyZWF0ZUlzc3VlQ29tbWVudFJlcXVlc3QaGS5ieXRlYmFzZS52MS5Jc3N1ZUNvbW1lbnQiedpBFHBhcmVudCxpc3N1ZV9jb21tZW50iuowF2JiLmlzc3VlQ29tbWVudHMuY3JlYXRlkOowAZjqMAGC0+STAjk6DWlzc3VlX2NvbW1lbnQiKC92MS97cGFyZW50PXByb2plY3RzLyovaXNzdWVzLyp9OmNvbW1lbnQS3wEKElVwZGF0ZUlzc3VlQ29tbWVudBImLmJ5dGViYXNlLnYxLlVwZGF0ZUlzc3VlQ29tbWVudFJlcXVlc3QaGS5ieXRlYmFzZS52MS5Jc3N1ZUNvbW1lbnQihQHaQSBwYXJlbnQsaXNzdWVfY29tbWVudCx1cGRhdGVfbWFza4rqMBdiYi5pc3N1ZUNvbW1lbnRzLnVwZGF0ZZDqMAGY6jABgtPkkwI5Og1pc3N1ZV9jb21tZW50MigvdjEve3BhcmVudD1wcm9qZWN0cy8qL2lzc3Vlcy8qfTpjb21tZW50Es0BChdCYXRjaFVwZGF0ZUlzc3Vlc1N0YXR1cxIrLmJ5dGViYXNlLnYxLkJhdGNoVXBkYXRlSXNzdWVzU3RhdHVzUmVxdWVzdBosLmJ5dGViYXNlLnYxLkJhdGNoVXBkYXRlSXNzdWVzU3RhdHVzUmVzcG9uc2UiV4rqMBBiYi5pc3N1ZXMudXBkYXRlkOowAZjqMAGC0+STAjU6ASoiMC92MS97cGFyZW50PXByb2plY3RzLyp9L2lzc3VlczpiYXRjaFVwZGF0ZVN0YXR1cxJ/CgxBcHByb3ZlSXNzdWUSIC5ieXRlYmFzZS52MS5BcHByb3ZlSXNzdWVSZXF1ZXN0GhIuYnl0ZWJhc2UudjEuSXNzdWUiOZDqMAKY6jABgtPkkwIrOgEqIiYvdjEve25hbWU9cHJvamVjdHMvKi9pc3N1ZXMvKn06YXBwcm92ZRJ8CgtSZWplY3RJc3N1ZRIfLmJ5dGViYXNlLnYxLlJlamVjdElzc3VlUmVxdWVzdBoSLmJ5dGViYXNlLnYxLklzc3VlIjiQ6jACmOowAYLT5JMCKjoBKiIlL3YxL3tuYW1lPXByb2plY3RzLyovaXNzdWVzLyp9OnJlamVjdBJ/CgxSZXF1ZXN0SXNzdWUSIC5ieXRlYmFzZS52MS5SZXF1ZXN0SXNzdWVSZXF1ZXN0GhIuYnl0ZWJhc2UudjEuSXNzdWUiOZDqMAKY6jABgtPkkwIrOgEqIiYvdjEve25hbWU9cHJvamVjdHMvKi9pc3N1ZXMvKn06cmVxdWVzdBKRAQoSUmV0cnlJc3N1ZUFwcHJvdmFsEiYuYnl0ZWJhc2UudjEuUmV0cnlJc3N1ZUFwcHJvdmFsUmVxdWVzdBoSLmJ5dGViYXNlLnYxLklzc3VlIj+Q6jACmOowAYLT5JMCMToBKiIsL3YxL3tuYW1lPXByb2plY3RzLyovaXNzdWVzLyp9OnJldHJ5QXBwcm92YWxCpwEKD2NvbS5ieXRlYmFzZS52MUIRSXNzdWVTZXJ2aWNlUHJvdG9QAVo0Z2l0aHViLmNvbS9ieXRlYmFzZS9ieXRlYmFzZS9iYWNrZW5kL2dlbmVyYXRlZC1nby92MaICA0JYWKoCC0J5dGViYXNlLlYxygILQnl0ZWJhc2VcVjHiAhdCeXRlYmFzZVxWMVxHUEJNZXRhZGF0YeoCDEJ5dGViYXNlOjpWMWIGcHJvdG8z", [file_buf_validate_validate, file_google_api_annotations, file_google_api_client, file_google_api_field_behavior, file_google_api_resource, file_google_protobuf_duration, file_google_protobuf_field_mask, file_google_protobuf_timestamp, file_google_type_expr, file_v1_annotation, file_v1_common]);
/**
* Describes the message bytebase.v1.GetIssueRequest.
@@ -103,25 +103,32 @@ export const RejectIssueRequestSchema = /*@__PURE__*/
export const RequestIssueRequestSchema = /*@__PURE__*/
messageDesc(file_v1_issue_service, 11);
+/**
+ * Describes the message bytebase.v1.RetryIssueApprovalRequest.
+ * Use `create(RetryIssueApprovalRequestSchema)` to create a new message.
+ */
+export const RetryIssueApprovalRequestSchema = /*@__PURE__*/
+ messageDesc(file_v1_issue_service, 12);
+
/**
* Describes the message bytebase.v1.Issue.
* Use `create(IssueSchema)` to create a new message.
*/
export const IssueSchema = /*@__PURE__*/
- messageDesc(file_v1_issue_service, 12);
+ messageDesc(file_v1_issue_service, 13);
/**
* Describes the message bytebase.v1.Issue.Approver.
* Use `create(Issue_ApproverSchema)` to create a new message.
*/
export const Issue_ApproverSchema = /*@__PURE__*/
- messageDesc(file_v1_issue_service, 12, 0);
+ messageDesc(file_v1_issue_service, 13, 0);
/**
* Describes the enum bytebase.v1.Issue.Approver.Status.
*/
export const Issue_Approver_StatusSchema = /*@__PURE__*/
- enumDesc(file_v1_issue_service, 12, 0, 0);
+ enumDesc(file_v1_issue_service, 13, 0, 0);
/**
* The approval status of an approver.
@@ -135,7 +142,7 @@ export const Issue_Approver_Status = /*@__PURE__*/
* Describes the enum bytebase.v1.Issue.Type.
*/
export const Issue_TypeSchema = /*@__PURE__*/
- enumDesc(file_v1_issue_service, 12, 0);
+ enumDesc(file_v1_issue_service, 13, 0);
/**
* The type of issue.
@@ -149,7 +156,7 @@ export const Issue_Type = /*@__PURE__*/
* Describes the enum bytebase.v1.Issue.ApprovalStatus.
*/
export const Issue_ApprovalStatusSchema = /*@__PURE__*/
- enumDesc(file_v1_issue_service, 12, 1);
+ enumDesc(file_v1_issue_service, 13, 1);
/**
* The overall approval status for the issue.
@@ -164,69 +171,69 @@ export const Issue_ApprovalStatus = /*@__PURE__*/
* Use `create(RoleGrantSchema)` to create a new message.
*/
export const RoleGrantSchema = /*@__PURE__*/
- messageDesc(file_v1_issue_service, 13);
+ messageDesc(file_v1_issue_service, 14);
/**
* Describes the message bytebase.v1.ApprovalTemplate.
* Use `create(ApprovalTemplateSchema)` to create a new message.
*/
export const ApprovalTemplateSchema = /*@__PURE__*/
- messageDesc(file_v1_issue_service, 14);
+ messageDesc(file_v1_issue_service, 15);
/**
* Describes the message bytebase.v1.ApprovalFlow.
* Use `create(ApprovalFlowSchema)` to create a new message.
*/
export const ApprovalFlowSchema = /*@__PURE__*/
- messageDesc(file_v1_issue_service, 15);
+ messageDesc(file_v1_issue_service, 16);
/**
* Describes the message bytebase.v1.ListIssueCommentsRequest.
* Use `create(ListIssueCommentsRequestSchema)` to create a new message.
*/
export const ListIssueCommentsRequestSchema = /*@__PURE__*/
- messageDesc(file_v1_issue_service, 16);
+ messageDesc(file_v1_issue_service, 17);
/**
* Describes the message bytebase.v1.ListIssueCommentsResponse.
* Use `create(ListIssueCommentsResponseSchema)` to create a new message.
*/
export const ListIssueCommentsResponseSchema = /*@__PURE__*/
- messageDesc(file_v1_issue_service, 17);
+ messageDesc(file_v1_issue_service, 18);
/**
* Describes the message bytebase.v1.CreateIssueCommentRequest.
* Use `create(CreateIssueCommentRequestSchema)` to create a new message.
*/
export const CreateIssueCommentRequestSchema = /*@__PURE__*/
- messageDesc(file_v1_issue_service, 18);
+ messageDesc(file_v1_issue_service, 19);
/**
* Describes the message bytebase.v1.UpdateIssueCommentRequest.
* Use `create(UpdateIssueCommentRequestSchema)` to create a new message.
*/
export const UpdateIssueCommentRequestSchema = /*@__PURE__*/
- messageDesc(file_v1_issue_service, 19);
+ messageDesc(file_v1_issue_service, 20);
/**
* Describes the message bytebase.v1.IssueComment.
* Use `create(IssueCommentSchema)` to create a new message.
*/
export const IssueCommentSchema = /*@__PURE__*/
- messageDesc(file_v1_issue_service, 20);
+ messageDesc(file_v1_issue_service, 21);
/**
* Describes the message bytebase.v1.IssueComment.Approval.
* Use `create(IssueComment_ApprovalSchema)` to create a new message.
*/
export const IssueComment_ApprovalSchema = /*@__PURE__*/
- messageDesc(file_v1_issue_service, 20, 0);
+ messageDesc(file_v1_issue_service, 21, 0);
/**
* Describes the enum bytebase.v1.IssueComment.Approval.Status.
*/
export const IssueComment_Approval_StatusSchema = /*@__PURE__*/
- enumDesc(file_v1_issue_service, 20, 0, 0);
+ enumDesc(file_v1_issue_service, 21, 0, 0);
/**
* Approval status values.
@@ -241,14 +248,14 @@ export const IssueComment_Approval_Status = /*@__PURE__*/
* Use `create(IssueComment_IssueUpdateSchema)` to create a new message.
*/
export const IssueComment_IssueUpdateSchema = /*@__PURE__*/
- messageDesc(file_v1_issue_service, 20, 1);
+ messageDesc(file_v1_issue_service, 21, 1);
/**
* Describes the message bytebase.v1.IssueComment.PlanSpecUpdate.
* Use `create(IssueComment_PlanSpecUpdateSchema)` to create a new message.
*/
export const IssueComment_PlanSpecUpdateSchema = /*@__PURE__*/
- messageDesc(file_v1_issue_service, 20, 2);
+ messageDesc(file_v1_issue_service, 21, 2);
/**
* Describes the enum bytebase.v1.IssueStatus.
diff --git a/proto/gen/grpc-doc/openapi.yaml b/proto/gen/grpc-doc/openapi.yaml
index 5c46a69cac..934e17d666 100644
--- a/proto/gen/grpc-doc/openapi.yaml
+++ b/proto/gen/grpc-doc/openapi.yaml
@@ -8913,6 +8913,42 @@ paths:
application/json:
schema:
$ref: '#/components/schemas/bytebase.v1.Issue'
+ /v1/projects/{project}/issues/{issue}:retryApproval:
+ post:
+ tags:
+ - IssueService
+ summary: RetryIssueApproval
+ description: |-
+ Re-runs approval-template finding for an issue stuck in CHECKING.
+ Useful when the synchronous post-create finding errored (e.g. against
+ a malformed workspace approval rule) and the operator has since
+ corrected it — without this, the issue would remain in CHECKING
+ indefinitely because there is no other retry path for non-DATABASE_CHANGE
+ issue types. Idempotent: returns the existing issue unchanged when
+ approval-finding has already completed.
+ Permissions required: None (caller must be the issue creator;
+ mirrors RequestIssue's authorization model).
+ operationId: IssueService_RetryIssueApproval
+ parameters:
+ - name: project
+ in: path
+ description: The project id.
+ required: true
+ schema:
+ type: string
+ - name: issue
+ in: path
+ description: The issue id.
+ required: true
+ schema:
+ type: string
+ responses:
+ "200":
+ description: Success
+ content:
+ application/json:
+ schema:
+ $ref: '#/components/schemas/bytebase.v1.Issue'
/v1/projects/{project}/issues:batchUpdateStatus:
post:
tags:
@@ -25465,6 +25501,19 @@ components:
readOnly: true
title: Restriction
additionalProperties: false
+ bytebase.v1.RetryIssueApprovalRequest:
+ type: object
+ properties:
+ name:
+ type: string
+ title: name
+ description: |-
+ The name of the issue whose approval-finding should be retried.
+ Format: projects/{project}/issues/{issue}
+ title: RetryIssueApprovalRequest
+ required:
+ - name
+ additionalProperties: false
bytebase.v1.ReviewConfig:
type: object
properties:
diff --git a/proto/gen/grpc-doc/v1/README.md b/proto/gen/grpc-doc/v1/README.md
index 969e9619bf..bb977582d4 100644
--- a/proto/gen/grpc-doc/v1/README.md
+++ b/proto/gen/grpc-doc/v1/README.md
@@ -60,6 +60,7 @@
- [ListIssuesResponse](#bytebase-v1-ListIssuesResponse)
- [RejectIssueRequest](#bytebase-v1-RejectIssueRequest)
- [RequestIssueRequest](#bytebase-v1-RequestIssueRequest)
+ - [RetryIssueApprovalRequest](#bytebase-v1-RetryIssueApprovalRequest)
- [RoleGrant](#bytebase-v1-RoleGrant)
- [SearchIssuesRequest](#bytebase-v1-SearchIssuesRequest)
- [SearchIssuesResponse](#bytebase-v1-SearchIssuesResponse)
@@ -1604,6 +1605,21 @@ For example: creator == &#34;users/[email protected]&#34; &amp;&amp; status in [&#
+<a name="bytebase-v1-RetryIssueApprovalRequest"></a>
+
+### RetryIssueApprovalRequest
+
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| name | [string](#string) | | The name of the issue whose approval-finding should be retried. Format: projects/{project}/issues/{issue} |
+
+
+
+
+
+
<a name="bytebase-v1-RoleGrant"></a>
### RoleGrant
@@ -1795,6 +1811,7 @@ IssueService manages issues for tracking database changes and tasks.
| ApproveIssue | [ApproveIssueRequest](#bytebase-v1-ApproveIssueRequest) | [Issue](#bytebase-v1-Issue) | Approves an issue. Access determined by approval flow configuration - caller must be a designated approver for the current approval step. Permissions required: None (determined by approval flow) |
| RejectIssue | [RejectIssueRequest](#bytebase-v1-RejectIssueRequest) | [Issue](#bytebase-v1-Issue) | Rejects an issue. Access determined by approval flow configuration - caller must be a designated approver for the current approval step. Permissions required: None (determined by approval flow) |
| RequestIssue | [RequestIssueRequest](#bytebase-v1-RequestIssueRequest) | [Issue](#bytebase-v1-Issue) | Requests changes on an issue. Access determined by approval flow configuration - caller must be a designated approver for the current approval step. Permissions required: None (determined by approval flow) |
+| RetryIssueApproval | [RetryIssueApprovalRequest](#bytebase-v1-RetryIssueApprovalRequest) | [Issue](#bytebase-v1-Issue) | Re-runs approval-template finding for an issue stuck in CHECKING. Useful when the synchronous post-create finding errored (e.g. against a malformed workspace approval rule) and the operator has since corrected it — without this, the issue would remain in CHECKING indefinitely because there is no other retry path for non-DATABASE_CHANGE issue types. Idempotent: returns the existing issue unchanged when approval-finding has already completed. Permissions required: None (caller must be the issue creator; mirrors RequestIssue&#39;s authorization model). |
diff --git a/proto/gen/grpc-doc/v1/index.html b/proto/gen/grpc-doc/v1/index.html
index a2ee758e5d..78626d2065 100644
--- a/proto/gen/grpc-doc/v1/index.html
+++ b/proto/gen/grpc-doc/v1/index.html
@@ -395,6 +395,10 @@
<a href="#bytebase.v1.RequestIssueRequest"><span class="badge">M</span>RequestIssueRequest</a>
</li>
+ <li>
+ <a href="#bytebase.v1.RetryIssueApprovalRequest"><span class="badge">M</span>RetryIssueApprovalRequest</a>
+ </li>
+
<li>
<a href="#bytebase.v1.RoleGrant"><span class="badge">M</span>RoleGrant</a>
</li>
@@ -5369,6 +5373,31 @@ Format: projects/{project}/issues/{issue} </p></td>
+ <h3 id="bytebase.v1.RetryIssueApprovalRequest">RetryIssueApprovalRequest</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 issue whose approval-finding should be retried.
+Format: projects/{project}/issues/{issue} </p></td>
+ </tr>
+
+ </tbody>
+ </table>
+
+
+
+
+
<h3 id="bytebase.v1.RoleGrant">RoleGrant</h3>
<p></p>
@@ -5916,6 +5945,21 @@ Permissions required: None (determined by approval flow)</p></td>
Permissions required: None (determined by approval flow)</p></td>
</tr>
+ <tr>
+ <td>RetryIssueApproval</td>
+ <td><a href="#bytebase.v1.RetryIssueApprovalRequest">RetryIssueApprovalRequest</a></td>
+ <td><a href="#bytebase.v1.Issue">Issue</a></td>
+ <td><p>Re-runs approval-template finding for an issue stuck in CHECKING.
+Useful when the synchronous post-create finding errored (e.g. against
+a malformed workspace approval rule) and the operator has since
+corrected it — without this, the issue would remain in CHECKING
+indefinitely because there is no other retry path for non-DATABASE_CHANGE
+issue types. Idempotent: returns the existing issue unchanged when
+approval-finding has already completed.
+Permissions required: None (caller must be the issue creator;
+mirrors RequestIssue&#39;s authorization model).</p></td>
+ </tr>
+
</tbody>
</table>
@@ -6054,6 +6098,16 @@ Permissions required: None (determined by approval flow)</p></td>
</tr>
+
+
+ <tr>
+ <td>RetryIssueApproval</td>
+ <td>POST</td>
+ <td>/v1/{name=projects/*/issues/*}:retryApproval</td>
+ <td>*</td>
+ </tr>
+
+
</tbody>
</table>
diff --git a/proto/v1/v1/issue_service.proto b/proto/v1/v1/issue_service.proto
index 0cce035ac3..0d4a884296 100644
--- a/proto/v1/v1/issue_service.proto
+++ b/proto/v1/v1/issue_service.proto
@@ -153,6 +153,24 @@ service IssueService {
option (bytebase.v1.auth_method) = CUSTOM;
option (bytebase.v1.audit) = true;
}
+
+ // Re-runs approval-template finding for an issue stuck in CHECKING.
+ // Useful when the synchronous post-create finding errored (e.g. against
+ // a malformed workspace approval rule) and the operator has since
+ // corrected it — without this, the issue would remain in CHECKING
+ // indefinitely because there is no other retry path for non-DATABASE_CHANGE
+ // issue types. Idempotent: returns the existing issue unchanged when
+ // approval-finding has already completed.
+ // Permissions required: None (caller must be the issue creator;
+ // mirrors RequestIssue's authorization model).
+ rpc RetryIssueApproval(RetryIssueApprovalRequest) returns (Issue) {
+ option (google.api.http) = {
+ post: "/v1/{name=projects/*/issues/*}:retryApproval"
+ body: "*"
+ };
+ option (bytebase.v1.auth_method) = CUSTOM;
+ option (bytebase.v1.audit) = true;
+ }
}
message GetIssueRequest {
@@ -364,6 +382,15 @@ message RequestIssueRequest {
string comment = 2;
}
+message RetryIssueApprovalRequest {
+ // The name of the issue whose approval-finding should be retried.
+ // Format: projects/{project}/issues/{issue}
+ string name = 1 [
+ (google.api.field_behavior) = REQUIRED,
+ (google.api.resource_reference) = {type: "bytebase.com/Issue"}
+ ];
+}
+
message Issue {
option (google.api.resource) = {
type: "bytebase.com/Issue"