Database governance built for humans and agents — controlling changes and access across every major database.
Go cicddata-governancedata-maskingdata-securitydatabase-accessdatabase-governancedevopsdevsecopsflywaygitopsliquibasemongodbmysqloraclepostgresqlschema-migrationssecuritysql-clientsqlservertidb
refactor: replace approval_finding_done with approval_status enum (#17644)
Danny Xu26f5d8a815f3
diff --git a/backend/api/v1/issue_service.go b/backend/api/v1/issue_service.goindex 6312dcf253..08f26cc84f 100644--- a/backend/api/v1/issue_service.go+++ b/backend/api/v1/issue_service.go@@ -1120,9 +1120,9 @@ func (s *IssueService) UpdateIssue(ctx context.Context, req *connect.Request[v1pfor _, path := range req.Msg.UpdateMask.Paths {updateMasks[path] = trueswitch path {- case "approval_finding_done":- if req.Msg.Issue.ApprovalFindingDone {- return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("cannot set approval_finding_done to true"))+ case "approval_status":+ if req.Msg.Issue.ApprovalStatus != v1pb.Issue_CHECKING {+ return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("can only set approval_status to CHECKING to trigger re-finding approval templates"))}payload := issue.Payloadif payload.Approval == nil {diff --git a/backend/api/v1/issue_service_convert.go b/backend/api/v1/issue_service_convert.goindex b302e0f48e..43b33ab1d1 100644--- a/backend/api/v1/issue_service_convert.go+++ b/backend/api/v1/issue_service_convert.go@@ -39,25 +39,25 @@ func (s *IssueService) convertToIssue(ctx context.Context, issue *store.IssueMes}issueV1 := &v1pb.Issue{- Name: common.FormatIssue(issue.Project.ResourceID, issue.UID),- Title: issue.Title,- Description: issue.Description,- Type: convertToIssueType(issue.Type),- Status: convertToIssueStatus(issue.Status),- Approvers: nil,- ApprovalTemplates: nil,- ApprovalFindingDone: false,- ApprovalFindingError: "",- Creator: common.FormatUserEmail(issue.Creator.Email),- CreateTime: timestamppb.New(issue.CreatedAt),- UpdateTime: timestamppb.New(issue.UpdatedAt),- Plan: "",- Rollout: "",- GrantRequest: convertedGrantRequest,- Releasers: releasers,- RiskLevel: v1pb.Issue_RISK_LEVEL_UNSPECIFIED,- TaskStatusCount: issue.TaskStatusCount,- Labels: issuePayload.Labels,+ Name: common.FormatIssue(issue.Project.ResourceID, issue.UID),+ Title: issue.Title,+ Description: issue.Description,+ Type: convertToIssueType(issue.Type),+ Status: convertToIssueStatus(issue.Status),+ Approvers: nil,+ ApprovalTemplates: nil,+ Creator: common.FormatUserEmail(issue.Creator.Email),+ CreateTime: timestamppb.New(issue.CreatedAt),+ UpdateTime: timestamppb.New(issue.UpdatedAt),+ Plan: "",+ Rollout: "",+ GrantRequest: convertedGrantRequest,+ Releasers: releasers,+ RiskLevel: v1pb.Issue_RISK_LEVEL_UNSPECIFIED,+ TaskStatusCount: issue.TaskStatusCount,+ Labels: issuePayload.Labels,+ ApprovalStatus: v1pb.Issue_APPROVAL_STATUS_UNSPECIFIED,+ ApprovalStatusError: "",}if issue.PlanUID != nil {@@ -68,8 +68,6 @@ func (s *IssueService) convertToIssue(ctx context.Context, issue *store.IssueMes}if issuePayload.Approval != nil {- issueV1.ApprovalFindingDone = issuePayload.Approval.ApprovalFindingDone- issueV1.ApprovalFindingError = issuePayload.Approval.ApprovalFindingErrorissueV1.RiskLevel = convertToIssueRiskLevel(issuePayload.Approval.RiskLevel)for _, template := range issuePayload.Approval.ApprovalTemplates {issueV1.ApprovalTemplates = append(issueV1.ApprovalTemplates, convertToApprovalTemplate(template))@@ -83,11 +81,70 @@ func (s *IssueService) convertToIssue(ctx context.Context, issue *store.IssueMesconvertedApprover.Principal = fmt.Sprintf("users/%s", user.Email)issueV1.Approvers = append(issueV1.Approvers, convertedApprover)}+ issueV1.ApprovalStatus, issueV1.ApprovalStatusError = computeApprovalStatus(issuePayload.Approval)}return issueV1, nil}+func computeApprovalStatus(approval *storepb.IssuePayloadApproval) (v1pb.Issue_ApprovalStatus, string) {+ // If approval finding is not done, status is checking+ if !approval.ApprovalFindingDone {+ return v1pb.Issue_CHECKING, ""+ }++ // If there's an error finding approval, status is error+ if approval.ApprovalFindingError != "" {+ return v1pb.Issue_ERROR, approval.ApprovalFindingError+ }++ // If no approval templates, approval is skipped (not required)+ if len(approval.ApprovalTemplates) == 0 {+ return v1pb.Issue_SKIPPED, ""+ }++ // If no approvers are assigned yet, it's pending+ if len(approval.Approvers) == 0 {+ return v1pb.Issue_PENDING, ""+ }++ // Check approver statuses+ hasRejected := false+ hasPending := false+ allApproved := true++ for _, approver := range approval.Approvers {+ switch approver.Status {+ case storepb.IssuePayloadApproval_Approver_REJECTED:+ hasRejected = true+ case storepb.IssuePayloadApproval_Approver_PENDING:+ hasPending = true+ allApproved = false+ case storepb.IssuePayloadApproval_Approver_APPROVED:+ // Continue checking+ default:+ allApproved = false+ }+ }++ // If any approver rejected, overall status is rejected+ if hasRejected {+ return v1pb.Issue_REJECTED, ""+ }++ // If all approvers approved, overall status is approved+ if allApproved {+ return v1pb.Issue_APPROVED, ""+ }++ // If there are pending approvers, overall status is pending+ if hasPending {+ return v1pb.Issue_PENDING, ""+ }++ return v1pb.Issue_APPROVAL_STATUS_UNSPECIFIED, ""+}+func (s *IssueService) convertToIssueReleasers(ctx context.Context, issue *store.IssueMessage) ([]string, error) {if issue.Type != storepb.Issue_DATABASE_CHANGE {return nil, nildiff --git a/backend/generated-go/v1/issue_service.pb.go b/backend/generated-go/v1/issue_service.pb.goindex ba9a657dcf..8fbd9e2980 100644--- a/backend/generated-go/v1/issue_service.pb.go+++ b/backend/generated-go/v1/issue_service.pb.go@@ -182,6 +182,67 @@ func (Issue_RiskLevel) EnumDescriptor() ([]byte, []int) {return file_v1_issue_service_proto_rawDescGZIP(), []int{12, 1}}+type Issue_ApprovalStatus int32++const (+ Issue_APPROVAL_STATUS_UNSPECIFIED Issue_ApprovalStatus = 0+ Issue_CHECKING Issue_ApprovalStatus = 1+ Issue_PENDING Issue_ApprovalStatus = 2+ Issue_APPROVED Issue_ApprovalStatus = 3+ Issue_REJECTED Issue_ApprovalStatus = 4+ Issue_SKIPPED Issue_ApprovalStatus = 5+ Issue_ERROR Issue_ApprovalStatus = 6+)++// Enum value maps for Issue_ApprovalStatus.+var (+ Issue_ApprovalStatus_name = map[int32]string{+ 0: "APPROVAL_STATUS_UNSPECIFIED",+ 1: "CHECKING",+ 2: "PENDING",+ 3: "APPROVED",+ 4: "REJECTED",+ 5: "SKIPPED",+ 6: "ERROR",+ }+ Issue_ApprovalStatus_value = map[string]int32{+ "APPROVAL_STATUS_UNSPECIFIED": 0,+ "CHECKING": 1,+ "PENDING": 2,+ "APPROVED": 3,+ "REJECTED": 4,+ "SKIPPED": 5,+ "ERROR": 6,+ }+)++func (x Issue_ApprovalStatus) Enum() *Issue_ApprovalStatus {+ p := new(Issue_ApprovalStatus)+ *p = x+ return p+}++func (x Issue_ApprovalStatus) String() string {+ return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))+}++func (Issue_ApprovalStatus) Descriptor() protoreflect.EnumDescriptor {+ return file_v1_issue_service_proto_enumTypes[3].Descriptor()+}++func (Issue_ApprovalStatus) Type() protoreflect.EnumType {+ return &file_v1_issue_service_proto_enumTypes[3]+}++func (x Issue_ApprovalStatus) Number() protoreflect.EnumNumber {+ return protoreflect.EnumNumber(x)+}++// Deprecated: Use Issue_ApprovalStatus.Descriptor instead.+func (Issue_ApprovalStatus) EnumDescriptor() ([]byte, []int) {+ return file_v1_issue_service_proto_rawDescGZIP(), []int{12, 2}+}+type Issue_Approver_Status int32const (@@ -218,11 +279,11 @@ func (x Issue_Approver_Status) String() string {}func (Issue_Approver_Status) Descriptor() protoreflect.EnumDescriptor {- return file_v1_issue_service_proto_enumTypes[3].Descriptor()+ return file_v1_issue_service_proto_enumTypes[4].Descriptor()}func (Issue_Approver_Status) Type() protoreflect.EnumType {- return &file_v1_issue_service_proto_enumTypes[3]+ return &file_v1_issue_service_proto_enumTypes[4]}func (x Issue_Approver_Status) Number() protoreflect.EnumNumber {@@ -270,11 +331,11 @@ func (x ApprovalStep_Type) String() string {}func (ApprovalStep_Type) Descriptor() protoreflect.EnumDescriptor {- return file_v1_issue_service_proto_enumTypes[4].Descriptor()+ return file_v1_issue_service_proto_enumTypes[5].Descriptor()}func (ApprovalStep_Type) Type() protoreflect.EnumType {- return &file_v1_issue_service_proto_enumTypes[4]+ return &file_v1_issue_service_proto_enumTypes[5]}func (x ApprovalStep_Type) Number() protoreflect.EnumNumber {@@ -320,11 +381,11 @@ func (x ApprovalNode_Type) String() string {}func (ApprovalNode_Type) Descriptor() protoreflect.EnumDescriptor {- return file_v1_issue_service_proto_enumTypes[5].Descriptor()+ return file_v1_issue_service_proto_enumTypes[6].Descriptor()}func (ApprovalNode_Type) Type() protoreflect.EnumType {- return &file_v1_issue_service_proto_enumTypes[5]+ return &file_v1_issue_service_proto_enumTypes[6]}func (x ApprovalNode_Type) Number() protoreflect.EnumNumber {@@ -372,11 +433,11 @@ func (x IssueComment_Approval_Status) String() string {}func (IssueComment_Approval_Status) Descriptor() protoreflect.EnumDescriptor {- return file_v1_issue_service_proto_enumTypes[6].Descriptor()+ return file_v1_issue_service_proto_enumTypes[7].Descriptor()}func (IssueComment_Approval_Status) Type() protoreflect.EnumType {- return &file_v1_issue_service_proto_enumTypes[6]+ return &file_v1_issue_service_proto_enumTypes[7]}func (x IssueComment_Approval_Status) Number() protoreflect.EnumNumber {@@ -433,11 +494,11 @@ func (x IssueComment_TaskUpdate_Status) String() string {}func (IssueComment_TaskUpdate_Status) Descriptor() protoreflect.EnumDescriptor {- return file_v1_issue_service_proto_enumTypes[7].Descriptor()+ return file_v1_issue_service_proto_enumTypes[8].Descriptor()}func (IssueComment_TaskUpdate_Status) Type() protoreflect.EnumType {- return &file_v1_issue_service_proto_enumTypes[7]+ return &file_v1_issue_service_proto_enumTypes[8]}func (x IssueComment_TaskUpdate_Status) Number() protoreflect.EnumNumber {@@ -1218,10 +1279,6 @@ type Issue struct {Status IssueStatus `protobuf:"varint,6,opt,name=status,proto3,enum=bytebase.v1.IssueStatus" json:"status,omitempty"`Approvers []*Issue_Approver `protobuf:"bytes,9,rep,name=approvers,proto3" json:"approvers,omitempty"`ApprovalTemplates []*ApprovalTemplate `protobuf:"bytes,10,rep,name=approval_templates,json=approvalTemplates,proto3" json:"approval_templates,omitempty"`- // If the value is `false`, it means that the backend is still finding matching approval templates.- // If `true`, approval_templates & approvers & approval_finding_error are available.- ApprovalFindingDone bool `protobuf:"varint,11,opt,name=approval_finding_done,json=approvalFindingDone,proto3" json:"approval_finding_done,omitempty"`- ApprovalFindingError string `protobuf:"bytes,12,opt,name=approval_finding_error,json=approvalFindingError,proto3" json:"approval_finding_error,omitempty"`// Format: users/[email protected]Creator string `protobuf:"bytes,14,opt,name=creator,proto3" json:"creator,omitempty"`CreateTime *timestamppb.Timestamp `protobuf:"bytes,15,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`@@ -1255,10 +1312,13 @@ type Issue struct {// - DONE// - FAILED// - CANCELED- TaskStatusCount map[string]int32 `protobuf:"bytes,22,rep,name=task_status_count,json=taskStatusCount,proto3" json:"task_status_count,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`- Labels []string `protobuf:"bytes,23,rep,name=labels,proto3" json:"labels,omitempty"`- unknownFields protoimpl.UnknownFields- sizeCache protoimpl.SizeCache+ TaskStatusCount map[string]int32 `protobuf:"bytes,22,rep,name=task_status_count,json=taskStatusCount,proto3" json:"task_status_count,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`+ Labels []string `protobuf:"bytes,23,rep,name=labels,proto3" json:"labels,omitempty"`+ ApprovalStatus Issue_ApprovalStatus `protobuf:"varint,24,opt,name=approval_status,json=approvalStatus,proto3,enum=bytebase.v1.Issue_ApprovalStatus" json:"approval_status,omitempty"`+ // Only populated when approval_status == ERROR+ ApprovalStatusError string `protobuf:"bytes,25,opt,name=approval_status_error,json=approvalStatusError,proto3" json:"approval_status_error,omitempty"`+ unknownFields protoimpl.UnknownFields+ sizeCache protoimpl.SizeCache}func (x *Issue) Reset() {@@ -1340,20 +1400,6 @@ func (x *Issue) GetApprovalTemplates() []*ApprovalTemplate {return nil}-func (x *Issue) GetApprovalFindingDone() bool {- if x != nil {- return x.ApprovalFindingDone- }- return false-}--func (x *Issue) GetApprovalFindingError() string {- if x != nil {- return x.ApprovalFindingError- }- return ""-}-func (x *Issue) GetCreator() string {if x != nil {return x.Creator@@ -1424,6 +1470,20 @@ func (x *Issue) GetLabels() []string {return nil}+func (x *Issue) GetApprovalStatus() Issue_ApprovalStatus {+ if x != nil {+ return x.ApprovalStatus+ }+ return Issue_APPROVAL_STATUS_UNSPECIFIED+}++func (x *Issue) GetApprovalStatusError() string {+ if x != nil {+ return x.ApprovalStatusError+ }+ return ""+}+type GrantRequest struct {state protoimpl.MessageState `protogen:"open.v1"`// The requested role.@@ -2635,8 +2695,7 @@ 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\"\xe7\n" +- "\n" ++ "\acomment\x18\x02 \x01(\tR\acomment\"\x96\f\n" +"\x05Issue\x12\x12\n" +"\x04name\x18\x01 \x01(\tR\x04name\x12\x14\n" +"\x05title\x18\x03 \x01(\tR\x05title\x12 \n" +@@ -2645,9 +2704,7 @@ const file_v1_issue_service_proto_rawDesc = "" +"\x06status\x18\x06 \x01(\x0e2\x18.bytebase.v1.IssueStatusR\x06status\x129\n" +"\tapprovers\x18\t \x03(\v2\x1b.bytebase.v1.Issue.ApproverR\tapprovers\x12L\n" +"\x12approval_templates\x18\n" +- " \x03(\v2\x1d.bytebase.v1.ApprovalTemplateR\x11approvalTemplates\x122\n" +- "\x15approval_finding_done\x18\v \x01(\bR\x13approvalFindingDone\x124\n" +- "\x16approval_finding_error\x18\f \x01(\tR\x14approvalFindingError\x12\x1d\n" ++ " \x03(\v2\x1d.bytebase.v1.ApprovalTemplateR\x11approvalTemplates\x12\x1d\n" +"\acreator\x18\x0e \x01(\tB\x03\xe0A\x03R\acreator\x12@\n" +"\vcreate_time\x18\x0f \x01(\v2\x1a.google.protobuf.TimestampB\x03\xe0A\x03R\n" +"createTime\x12@\n" +@@ -2660,7 +2717,9 @@ const file_v1_issue_service_proto_rawDesc = "" +"\n" +"risk_level\x18\x15 \x01(\x0e2\x1c.bytebase.v1.Issue.RiskLevelR\triskLevel\x12S\n" +"\x11task_status_count\x18\x16 \x03(\v2'.bytebase.v1.Issue.TaskStatusCountEntryR\x0ftaskStatusCount\x12\x16\n" +- "\x06labels\x18\x17 \x03(\tR\x06labels\x1a\xaf\x01\n" ++ "\x06labels\x18\x17 \x03(\tR\x06labels\x12O\n" ++ "\x0fapproval_status\x18\x18 \x01(\x0e2!.bytebase.v1.Issue.ApprovalStatusB\x03\xe0A\x03R\x0eapprovalStatus\x127\n" ++ "\x15approval_status_error\x18\x19 \x01(\tB\x03\xe0A\x03R\x13approvalStatusError\x1a\xaf\x01\n" +"\bApprover\x12:\n" +"\x06status\x18\x01 \x01(\x0e2\".bytebase.v1.Issue.Approver.StatusR\x06status\x12\x1c\n" +"\tprincipal\x18\x02 \x01(\tR\tprincipal\"I\n" +@@ -2681,8 +2740,16 @@ const file_v1_issue_service_proto_rawDesc = "" +"\x16RISK_LEVEL_UNSPECIFIED\x10\x00\x12\a\n" +"\x03LOW\x10\x01\x12\f\n" +"\bMODERATE\x10\x02\x12\b\n" +- "\x04HIGH\x10\x03::\xeaA7\n" +- "\x12bytebase.com/Issue\x12!projects/{project}/issues/{issue}J\x04\b\x02\x10\x03J\x04\b\a\x10\bJ\x04\b\b\x10\t\"\xa2\x01\n" ++ "\x04HIGH\x10\x03\"\x80\x01\n" ++ "\x0eApprovalStatus\x12\x1f\n" ++ "\x1bAPPROVAL_STATUS_UNSPECIFIED\x10\x00\x12\f\n" ++ "\bCHECKING\x10\x01\x12\v\n" ++ "\aPENDING\x10\x02\x12\f\n" ++ "\bAPPROVED\x10\x03\x12\f\n" ++ "\bREJECTED\x10\x04\x12\v\n" ++ "\aSKIPPED\x10\x05\x12\t\n" ++ "\x05ERROR\x10\x06::\xeaA7\n" ++ "\x12bytebase.com/Issue\x12!projects/{project}/issues/{issue}J\x04\b\x02\x10\x03J\x04\b\a\x10\bJ\x04\b\b\x10\tJ\x04\b\v\x10\fJ\x04\b\f\x10\r\"\xa2\x01\n" +"\fGrantRequest\x12\x12\n" +"\x04role\x18\x01 \x01(\tR\x04role\x12\x12\n" +"\x04user\x18\x02 \x01(\tR\x04user\x12/\n" +@@ -2837,122 +2904,124 @@ func file_v1_issue_service_proto_rawDescGZIP() []byte {return file_v1_issue_service_proto_rawDescData}-var file_v1_issue_service_proto_enumTypes = make([]protoimpl.EnumInfo, 8)+var file_v1_issue_service_proto_enumTypes = make([]protoimpl.EnumInfo, 9)var file_v1_issue_service_proto_msgTypes = make([]protoimpl.MessageInfo, 31)var file_v1_issue_service_proto_goTypes = []any{(IssueStatus)(0), // 0: bytebase.v1.IssueStatus(Issue_Type)(0), // 1: bytebase.v1.Issue.Type(Issue_RiskLevel)(0), // 2: bytebase.v1.Issue.RiskLevel- (Issue_Approver_Status)(0), // 3: bytebase.v1.Issue.Approver.Status- (ApprovalStep_Type)(0), // 4: bytebase.v1.ApprovalStep.Type- (ApprovalNode_Type)(0), // 5: bytebase.v1.ApprovalNode.Type- (IssueComment_Approval_Status)(0), // 6: bytebase.v1.IssueComment.Approval.Status- (IssueComment_TaskUpdate_Status)(0), // 7: bytebase.v1.IssueComment.TaskUpdate.Status- (*GetIssueRequest)(nil), // 8: bytebase.v1.GetIssueRequest- (*CreateIssueRequest)(nil), // 9: bytebase.v1.CreateIssueRequest- (*ListIssuesRequest)(nil), // 10: bytebase.v1.ListIssuesRequest- (*ListIssuesResponse)(nil), // 11: bytebase.v1.ListIssuesResponse- (*SearchIssuesRequest)(nil), // 12: bytebase.v1.SearchIssuesRequest- (*SearchIssuesResponse)(nil), // 13: bytebase.v1.SearchIssuesResponse- (*UpdateIssueRequest)(nil), // 14: bytebase.v1.UpdateIssueRequest- (*BatchUpdateIssuesStatusRequest)(nil), // 15: bytebase.v1.BatchUpdateIssuesStatusRequest- (*BatchUpdateIssuesStatusResponse)(nil), // 16: bytebase.v1.BatchUpdateIssuesStatusResponse- (*ApproveIssueRequest)(nil), // 17: bytebase.v1.ApproveIssueRequest- (*RejectIssueRequest)(nil), // 18: bytebase.v1.RejectIssueRequest- (*RequestIssueRequest)(nil), // 19: bytebase.v1.RequestIssueRequest- (*Issue)(nil), // 20: bytebase.v1.Issue- (*GrantRequest)(nil), // 21: bytebase.v1.GrantRequest- (*ApprovalTemplate)(nil), // 22: bytebase.v1.ApprovalTemplate- (*ApprovalFlow)(nil), // 23: bytebase.v1.ApprovalFlow- (*ApprovalStep)(nil), // 24: bytebase.v1.ApprovalStep- (*ApprovalNode)(nil), // 25: bytebase.v1.ApprovalNode- (*ListIssueCommentsRequest)(nil), // 26: bytebase.v1.ListIssueCommentsRequest- (*ListIssueCommentsResponse)(nil), // 27: bytebase.v1.ListIssueCommentsResponse- (*CreateIssueCommentRequest)(nil), // 28: bytebase.v1.CreateIssueCommentRequest- (*UpdateIssueCommentRequest)(nil), // 29: bytebase.v1.UpdateIssueCommentRequest- (*IssueComment)(nil), // 30: bytebase.v1.IssueComment- (*Issue_Approver)(nil), // 31: bytebase.v1.Issue.Approver- nil, // 32: bytebase.v1.Issue.TaskStatusCountEntry- (*IssueComment_Approval)(nil), // 33: bytebase.v1.IssueComment.Approval- (*IssueComment_IssueUpdate)(nil), // 34: bytebase.v1.IssueComment.IssueUpdate- (*IssueComment_StageEnd)(nil), // 35: bytebase.v1.IssueComment.StageEnd- (*IssueComment_TaskUpdate)(nil), // 36: bytebase.v1.IssueComment.TaskUpdate- (*IssueComment_TaskPriorBackup)(nil), // 37: bytebase.v1.IssueComment.TaskPriorBackup- (*IssueComment_TaskPriorBackup_Table)(nil), // 38: bytebase.v1.IssueComment.TaskPriorBackup.Table- (*fieldmaskpb.FieldMask)(nil), // 39: google.protobuf.FieldMask- (*timestamppb.Timestamp)(nil), // 40: google.protobuf.Timestamp- (*expr.Expr)(nil), // 41: google.type.Expr- (*durationpb.Duration)(nil), // 42: google.protobuf.Duration+ (Issue_ApprovalStatus)(0), // 3: bytebase.v1.Issue.ApprovalStatus+ (Issue_Approver_Status)(0), // 4: bytebase.v1.Issue.Approver.Status+ (ApprovalStep_Type)(0), // 5: bytebase.v1.ApprovalStep.Type+ (ApprovalNode_Type)(0), // 6: bytebase.v1.ApprovalNode.Type+ (IssueComment_Approval_Status)(0), // 7: bytebase.v1.IssueComment.Approval.Status+ (IssueComment_TaskUpdate_Status)(0), // 8: bytebase.v1.IssueComment.TaskUpdate.Status+ (*GetIssueRequest)(nil), // 9: bytebase.v1.GetIssueRequest+ (*CreateIssueRequest)(nil), // 10: bytebase.v1.CreateIssueRequest+ (*ListIssuesRequest)(nil), // 11: bytebase.v1.ListIssuesRequest+ (*ListIssuesResponse)(nil), // 12: bytebase.v1.ListIssuesResponse+ (*SearchIssuesRequest)(nil), // 13: bytebase.v1.SearchIssuesRequest+ (*SearchIssuesResponse)(nil), // 14: bytebase.v1.SearchIssuesResponse+ (*UpdateIssueRequest)(nil), // 15: bytebase.v1.UpdateIssueRequest+ (*BatchUpdateIssuesStatusRequest)(nil), // 16: bytebase.v1.BatchUpdateIssuesStatusRequest+ (*BatchUpdateIssuesStatusResponse)(nil), // 17: bytebase.v1.BatchUpdateIssuesStatusResponse+ (*ApproveIssueRequest)(nil), // 18: bytebase.v1.ApproveIssueRequest+ (*RejectIssueRequest)(nil), // 19: bytebase.v1.RejectIssueRequest+ (*RequestIssueRequest)(nil), // 20: bytebase.v1.RequestIssueRequest+ (*Issue)(nil), // 21: bytebase.v1.Issue+ (*GrantRequest)(nil), // 22: bytebase.v1.GrantRequest+ (*ApprovalTemplate)(nil), // 23: bytebase.v1.ApprovalTemplate+ (*ApprovalFlow)(nil), // 24: bytebase.v1.ApprovalFlow+ (*ApprovalStep)(nil), // 25: bytebase.v1.ApprovalStep+ (*ApprovalNode)(nil), // 26: bytebase.v1.ApprovalNode+ (*ListIssueCommentsRequest)(nil), // 27: bytebase.v1.ListIssueCommentsRequest+ (*ListIssueCommentsResponse)(nil), // 28: bytebase.v1.ListIssueCommentsResponse+ (*CreateIssueCommentRequest)(nil), // 29: bytebase.v1.CreateIssueCommentRequest+ (*UpdateIssueCommentRequest)(nil), // 30: bytebase.v1.UpdateIssueCommentRequest+ (*IssueComment)(nil), // 31: bytebase.v1.IssueComment+ (*Issue_Approver)(nil), // 32: bytebase.v1.Issue.Approver+ nil, // 33: bytebase.v1.Issue.TaskStatusCountEntry+ (*IssueComment_Approval)(nil), // 34: bytebase.v1.IssueComment.Approval+ (*IssueComment_IssueUpdate)(nil), // 35: bytebase.v1.IssueComment.IssueUpdate+ (*IssueComment_StageEnd)(nil), // 36: bytebase.v1.IssueComment.StageEnd+ (*IssueComment_TaskUpdate)(nil), // 37: bytebase.v1.IssueComment.TaskUpdate+ (*IssueComment_TaskPriorBackup)(nil), // 38: bytebase.v1.IssueComment.TaskPriorBackup+ (*IssueComment_TaskPriorBackup_Table)(nil), // 39: bytebase.v1.IssueComment.TaskPriorBackup.Table+ (*fieldmaskpb.FieldMask)(nil), // 40: google.protobuf.FieldMask+ (*timestamppb.Timestamp)(nil), // 41: google.protobuf.Timestamp+ (*expr.Expr)(nil), // 42: google.type.Expr+ (*durationpb.Duration)(nil), // 43: google.protobuf.Duration}var file_v1_issue_service_proto_depIdxs = []int32{- 20, // 0: bytebase.v1.CreateIssueRequest.issue:type_name -> bytebase.v1.Issue- 20, // 1: bytebase.v1.ListIssuesResponse.issues:type_name -> bytebase.v1.Issue- 20, // 2: bytebase.v1.SearchIssuesResponse.issues:type_name -> bytebase.v1.Issue- 20, // 3: bytebase.v1.UpdateIssueRequest.issue:type_name -> bytebase.v1.Issue- 39, // 4: bytebase.v1.UpdateIssueRequest.update_mask:type_name -> google.protobuf.FieldMask+ 21, // 0: bytebase.v1.CreateIssueRequest.issue:type_name -> bytebase.v1.Issue+ 21, // 1: bytebase.v1.ListIssuesResponse.issues:type_name -> bytebase.v1.Issue+ 21, // 2: bytebase.v1.SearchIssuesResponse.issues:type_name -> bytebase.v1.Issue+ 21, // 3: bytebase.v1.UpdateIssueRequest.issue:type_name -> bytebase.v1.Issue+ 40, // 4: bytebase.v1.UpdateIssueRequest.update_mask:type_name -> google.protobuf.FieldMask0, // 5: bytebase.v1.BatchUpdateIssuesStatusRequest.status:type_name -> bytebase.v1.IssueStatus1, // 6: bytebase.v1.Issue.type:type_name -> bytebase.v1.Issue.Type0, // 7: bytebase.v1.Issue.status:type_name -> bytebase.v1.IssueStatus- 31, // 8: bytebase.v1.Issue.approvers:type_name -> bytebase.v1.Issue.Approver- 22, // 9: bytebase.v1.Issue.approval_templates:type_name -> bytebase.v1.ApprovalTemplate- 40, // 10: bytebase.v1.Issue.create_time:type_name -> google.protobuf.Timestamp- 40, // 11: bytebase.v1.Issue.update_time:type_name -> google.protobuf.Timestamp- 21, // 12: bytebase.v1.Issue.grant_request:type_name -> bytebase.v1.GrantRequest+ 32, // 8: bytebase.v1.Issue.approvers:type_name -> bytebase.v1.Issue.Approver+ 23, // 9: bytebase.v1.Issue.approval_templates:type_name -> bytebase.v1.ApprovalTemplate+ 41, // 10: bytebase.v1.Issue.create_time:type_name -> google.protobuf.Timestamp+ 41, // 11: bytebase.v1.Issue.update_time:type_name -> google.protobuf.Timestamp+ 22, // 12: bytebase.v1.Issue.grant_request:type_name -> bytebase.v1.GrantRequest2, // 13: bytebase.v1.Issue.risk_level:type_name -> bytebase.v1.Issue.RiskLevel- 32, // 14: bytebase.v1.Issue.task_status_count:type_name -> bytebase.v1.Issue.TaskStatusCountEntry- 41, // 15: bytebase.v1.GrantRequest.condition:type_name -> google.type.Expr- 42, // 16: bytebase.v1.GrantRequest.expiration:type_name -> google.protobuf.Duration- 23, // 17: bytebase.v1.ApprovalTemplate.flow:type_name -> bytebase.v1.ApprovalFlow- 24, // 18: bytebase.v1.ApprovalFlow.steps:type_name -> bytebase.v1.ApprovalStep- 4, // 19: bytebase.v1.ApprovalStep.type:type_name -> bytebase.v1.ApprovalStep.Type- 25, // 20: bytebase.v1.ApprovalStep.nodes:type_name -> bytebase.v1.ApprovalNode- 5, // 21: bytebase.v1.ApprovalNode.type:type_name -> bytebase.v1.ApprovalNode.Type- 30, // 22: bytebase.v1.ListIssueCommentsResponse.issue_comments:type_name -> bytebase.v1.IssueComment- 30, // 23: bytebase.v1.CreateIssueCommentRequest.issue_comment:type_name -> bytebase.v1.IssueComment- 30, // 24: bytebase.v1.UpdateIssueCommentRequest.issue_comment:type_name -> bytebase.v1.IssueComment- 39, // 25: bytebase.v1.UpdateIssueCommentRequest.update_mask:type_name -> google.protobuf.FieldMask- 40, // 26: bytebase.v1.IssueComment.create_time:type_name -> google.protobuf.Timestamp- 40, // 27: bytebase.v1.IssueComment.update_time:type_name -> google.protobuf.Timestamp- 33, // 28: bytebase.v1.IssueComment.approval:type_name -> bytebase.v1.IssueComment.Approval- 34, // 29: bytebase.v1.IssueComment.issue_update:type_name -> bytebase.v1.IssueComment.IssueUpdate- 35, // 30: bytebase.v1.IssueComment.stage_end:type_name -> bytebase.v1.IssueComment.StageEnd- 36, // 31: bytebase.v1.IssueComment.task_update:type_name -> bytebase.v1.IssueComment.TaskUpdate- 37, // 32: bytebase.v1.IssueComment.task_prior_backup:type_name -> bytebase.v1.IssueComment.TaskPriorBackup- 3, // 33: bytebase.v1.Issue.Approver.status:type_name -> bytebase.v1.Issue.Approver.Status- 6, // 34: bytebase.v1.IssueComment.Approval.status:type_name -> bytebase.v1.IssueComment.Approval.Status- 0, // 35: bytebase.v1.IssueComment.IssueUpdate.from_status:type_name -> bytebase.v1.IssueStatus- 0, // 36: bytebase.v1.IssueComment.IssueUpdate.to_status:type_name -> bytebase.v1.IssueStatus- 7, // 37: bytebase.v1.IssueComment.TaskUpdate.to_status:type_name -> bytebase.v1.IssueComment.TaskUpdate.Status- 38, // 38: bytebase.v1.IssueComment.TaskPriorBackup.tables:type_name -> bytebase.v1.IssueComment.TaskPriorBackup.Table- 8, // 39: bytebase.v1.IssueService.GetIssue:input_type -> bytebase.v1.GetIssueRequest- 9, // 40: bytebase.v1.IssueService.CreateIssue:input_type -> bytebase.v1.CreateIssueRequest- 10, // 41: bytebase.v1.IssueService.ListIssues:input_type -> bytebase.v1.ListIssuesRequest- 12, // 42: bytebase.v1.IssueService.SearchIssues:input_type -> bytebase.v1.SearchIssuesRequest- 14, // 43: bytebase.v1.IssueService.UpdateIssue:input_type -> bytebase.v1.UpdateIssueRequest- 26, // 44: bytebase.v1.IssueService.ListIssueComments:input_type -> bytebase.v1.ListIssueCommentsRequest- 28, // 45: bytebase.v1.IssueService.CreateIssueComment:input_type -> bytebase.v1.CreateIssueCommentRequest- 29, // 46: bytebase.v1.IssueService.UpdateIssueComment:input_type -> bytebase.v1.UpdateIssueCommentRequest- 15, // 47: bytebase.v1.IssueService.BatchUpdateIssuesStatus:input_type -> bytebase.v1.BatchUpdateIssuesStatusRequest- 17, // 48: bytebase.v1.IssueService.ApproveIssue:input_type -> bytebase.v1.ApproveIssueRequest- 18, // 49: bytebase.v1.IssueService.RejectIssue:input_type -> bytebase.v1.RejectIssueRequest- 19, // 50: bytebase.v1.IssueService.RequestIssue:input_type -> bytebase.v1.RequestIssueRequest- 20, // 51: bytebase.v1.IssueService.GetIssue:output_type -> bytebase.v1.Issue- 20, // 52: bytebase.v1.IssueService.CreateIssue:output_type -> bytebase.v1.Issue- 11, // 53: bytebase.v1.IssueService.ListIssues:output_type -> bytebase.v1.ListIssuesResponse- 13, // 54: bytebase.v1.IssueService.SearchIssues:output_type -> bytebase.v1.SearchIssuesResponse- 20, // 55: bytebase.v1.IssueService.UpdateIssue:output_type -> bytebase.v1.Issue- 27, // 56: bytebase.v1.IssueService.ListIssueComments:output_type -> bytebase.v1.ListIssueCommentsResponse- 30, // 57: bytebase.v1.IssueService.CreateIssueComment:output_type -> bytebase.v1.IssueComment- 30, // 58: bytebase.v1.IssueService.UpdateIssueComment:output_type -> bytebase.v1.IssueComment- 16, // 59: bytebase.v1.IssueService.BatchUpdateIssuesStatus:output_type -> bytebase.v1.BatchUpdateIssuesStatusResponse- 20, // 60: bytebase.v1.IssueService.ApproveIssue:output_type -> bytebase.v1.Issue- 20, // 61: bytebase.v1.IssueService.RejectIssue:output_type -> bytebase.v1.Issue- 20, // 62: bytebase.v1.IssueService.RequestIssue:output_type -> bytebase.v1.Issue- 51, // [51:63] is the sub-list for method output_type- 39, // [39:51] is the sub-list for method input_type- 39, // [39:39] is the sub-list for extension type_name- 39, // [39:39] is the sub-list for extension extendee- 0, // [0:39] is the sub-list for field type_name+ 33, // 14: bytebase.v1.Issue.task_status_count:type_name -> bytebase.v1.Issue.TaskStatusCountEntry+ 3, // 15: bytebase.v1.Issue.approval_status:type_name -> bytebase.v1.Issue.ApprovalStatus+ 42, // 16: bytebase.v1.GrantRequest.condition:type_name -> google.type.Expr+ 43, // 17: bytebase.v1.GrantRequest.expiration:type_name -> google.protobuf.Duration+ 24, // 18: bytebase.v1.ApprovalTemplate.flow:type_name -> bytebase.v1.ApprovalFlow+ 25, // 19: bytebase.v1.ApprovalFlow.steps:type_name -> bytebase.v1.ApprovalStep+ 5, // 20: bytebase.v1.ApprovalStep.type:type_name -> bytebase.v1.ApprovalStep.Type+ 26, // 21: bytebase.v1.ApprovalStep.nodes:type_name -> bytebase.v1.ApprovalNode+ 6, // 22: bytebase.v1.ApprovalNode.type:type_name -> bytebase.v1.ApprovalNode.Type+ 31, // 23: bytebase.v1.ListIssueCommentsResponse.issue_comments:type_name -> bytebase.v1.IssueComment+ 31, // 24: bytebase.v1.CreateIssueCommentRequest.issue_comment:type_name -> bytebase.v1.IssueComment+ 31, // 25: bytebase.v1.UpdateIssueCommentRequest.issue_comment:type_name -> bytebase.v1.IssueComment+ 40, // 26: bytebase.v1.UpdateIssueCommentRequest.update_mask:type_name -> google.protobuf.FieldMask+ 41, // 27: bytebase.v1.IssueComment.create_time:type_name -> google.protobuf.Timestamp+ 41, // 28: bytebase.v1.IssueComment.update_time:type_name -> google.protobuf.Timestamp+ 34, // 29: bytebase.v1.IssueComment.approval:type_name -> bytebase.v1.IssueComment.Approval+ 35, // 30: bytebase.v1.IssueComment.issue_update:type_name -> bytebase.v1.IssueComment.IssueUpdate+ 36, // 31: bytebase.v1.IssueComment.stage_end:type_name -> bytebase.v1.IssueComment.StageEnd+ 37, // 32: bytebase.v1.IssueComment.task_update:type_name -> bytebase.v1.IssueComment.TaskUpdate+ 38, // 33: bytebase.v1.IssueComment.task_prior_backup:type_name -> bytebase.v1.IssueComment.TaskPriorBackup+ 4, // 34: bytebase.v1.Issue.Approver.status:type_name -> bytebase.v1.Issue.Approver.Status+ 7, // 35: bytebase.v1.IssueComment.Approval.status:type_name -> bytebase.v1.IssueComment.Approval.Status+ 0, // 36: bytebase.v1.IssueComment.IssueUpdate.from_status:type_name -> bytebase.v1.IssueStatus+ 0, // 37: bytebase.v1.IssueComment.IssueUpdate.to_status:type_name -> bytebase.v1.IssueStatus+ 8, // 38: bytebase.v1.IssueComment.TaskUpdate.to_status:type_name -> bytebase.v1.IssueComment.TaskUpdate.Status+ 39, // 39: bytebase.v1.IssueComment.TaskPriorBackup.tables:type_name -> bytebase.v1.IssueComment.TaskPriorBackup.Table+ 9, // 40: bytebase.v1.IssueService.GetIssue:input_type -> bytebase.v1.GetIssueRequest+ 10, // 41: bytebase.v1.IssueService.CreateIssue:input_type -> bytebase.v1.CreateIssueRequest+ 11, // 42: bytebase.v1.IssueService.ListIssues:input_type -> bytebase.v1.ListIssuesRequest+ 13, // 43: bytebase.v1.IssueService.SearchIssues:input_type -> bytebase.v1.SearchIssuesRequest+ 15, // 44: bytebase.v1.IssueService.UpdateIssue:input_type -> bytebase.v1.UpdateIssueRequest+ 27, // 45: bytebase.v1.IssueService.ListIssueComments:input_type -> bytebase.v1.ListIssueCommentsRequest+ 29, // 46: bytebase.v1.IssueService.CreateIssueComment:input_type -> bytebase.v1.CreateIssueCommentRequest+ 30, // 47: bytebase.v1.IssueService.UpdateIssueComment:input_type -> bytebase.v1.UpdateIssueCommentRequest+ 16, // 48: bytebase.v1.IssueService.BatchUpdateIssuesStatus:input_type -> bytebase.v1.BatchUpdateIssuesStatusRequest+ 18, // 49: bytebase.v1.IssueService.ApproveIssue:input_type -> bytebase.v1.ApproveIssueRequest+ 19, // 50: bytebase.v1.IssueService.RejectIssue:input_type -> bytebase.v1.RejectIssueRequest+ 20, // 51: bytebase.v1.IssueService.RequestIssue:input_type -> bytebase.v1.RequestIssueRequest+ 21, // 52: bytebase.v1.IssueService.GetIssue:output_type -> bytebase.v1.Issue+ 21, // 53: bytebase.v1.IssueService.CreateIssue:output_type -> bytebase.v1.Issue+ 12, // 54: bytebase.v1.IssueService.ListIssues:output_type -> bytebase.v1.ListIssuesResponse+ 14, // 55: bytebase.v1.IssueService.SearchIssues:output_type -> bytebase.v1.SearchIssuesResponse+ 21, // 56: bytebase.v1.IssueService.UpdateIssue:output_type -> bytebase.v1.Issue+ 28, // 57: bytebase.v1.IssueService.ListIssueComments:output_type -> bytebase.v1.ListIssueCommentsResponse+ 31, // 58: bytebase.v1.IssueService.CreateIssueComment:output_type -> bytebase.v1.IssueComment+ 31, // 59: bytebase.v1.IssueService.UpdateIssueComment:output_type -> bytebase.v1.IssueComment+ 17, // 60: bytebase.v1.IssueService.BatchUpdateIssuesStatus:output_type -> bytebase.v1.BatchUpdateIssuesStatusResponse+ 21, // 61: bytebase.v1.IssueService.ApproveIssue:output_type -> bytebase.v1.Issue+ 21, // 62: bytebase.v1.IssueService.RejectIssue:output_type -> bytebase.v1.Issue+ 21, // 63: bytebase.v1.IssueService.RequestIssue:output_type -> bytebase.v1.Issue+ 52, // [52:64] is the sub-list for method output_type+ 40, // [40:52] is the sub-list for method input_type+ 40, // [40:40] is the sub-list for extension type_name+ 40, // [40:40] is the sub-list for extension extendee+ 0, // [0:40] is the sub-list for field type_name}func init() { file_v1_issue_service_proto_init() }@@ -2976,7 +3045,7 @@ func file_v1_issue_service_proto_init() {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: 8,+ NumEnums: 9,NumMessages: 31,NumExtensions: 0,NumServices: 1,diff --git a/backend/generated-go/v1/issue_service_equal.pb.go b/backend/generated-go/v1/issue_service_equal.pb.goindex 8f6ff4aba8..4abc639503 100644--- a/backend/generated-go/v1/issue_service_equal.pb.go+++ b/backend/generated-go/v1/issue_service_equal.pb.go@@ -295,12 +295,6 @@ func (x *Issue) Equal(y *Issue) bool {return false}}- if x.ApprovalFindingDone != y.ApprovalFindingDone {- return false- }- if x.ApprovalFindingError != y.ApprovalFindingError {- return false- }if x.Creator != y.Creator {return false}@@ -350,6 +344,12 @@ func (x *Issue) Equal(y *Issue) bool {return false}}+ if x.ApprovalStatus != y.ApprovalStatus {+ return false+ }+ if x.ApprovalStatusError != y.ApprovalStatusError {+ return false+ }return true}diff --git a/backend/tests/risk_calculation_test.go b/backend/tests/risk_calculation_test.goindex d8139135ff..20d9f79b24 100644--- a/backend/tests/risk_calculation_test.go+++ b/backend/tests/risk_calculation_test.go@@ -121,19 +121,19 @@ func TestRiskLevelCalculation(t *testing.T) {issue = issueGetResp.Msg// Log the current state for debugging- t.Logf("Check %d: ApprovalFindingDone=%v, RiskLevel=%v, ApprovalFindingError='%s'",- i+1, issue.ApprovalFindingDone, issue.RiskLevel, issue.ApprovalFindingError)+ t.Logf("Check %d: ApprovalStatus=%v, RiskLevel=%v, ApprovalStatusError='%s'",+ i+1, issue.ApprovalStatus, issue.RiskLevel, issue.ApprovalStatusError)// Check if approval finding is complete- if issue.ApprovalFindingDone {+ if issue.ApprovalStatus != v1pb.Issue_CHECKING {break}}// Verify that the approval finding process completed successfullya.NotNil(issue, "Issue should be retrievable")- a.True(issue.ApprovalFindingDone, "Approval finding should complete even without summary reports")- a.Empty(issue.ApprovalFindingError, "Approval finding should not have errors despite missing summary reports")+ a.NotEqual(v1pb.Issue_CHECKING, issue.ApprovalStatus, "Approval finding should complete even without summary reports")+ a.NotEqual(v1pb.Issue_ERROR, issue.ApprovalStatus, "Approval finding should not have errors despite missing summary reports")a.Equal(v1pb.Issue_HIGH, issue.RiskLevel, "Issue risk level should be HIGH")}@@ -246,19 +246,19 @@ func TestRiskLevelCalculationWithInvalidSQL(t *testing.T) {issue = issueGetResp.Msg// Log the current state for debugging- t.Logf("Check %d: ApprovalFindingDone=%v, RiskLevel=%v, ApprovalFindingError='%s'",- i+1, issue.ApprovalFindingDone, issue.RiskLevel, issue.ApprovalFindingError)+ t.Logf("Check %d: ApprovalStatus=%v, RiskLevel=%v, ApprovalStatusError='%s'",+ i+1, issue.ApprovalStatus, issue.RiskLevel, issue.ApprovalStatusError)// Check if approval finding is complete- if issue.ApprovalFindingDone {+ if issue.ApprovalStatus != v1pb.Issue_CHECKING {break}}// Verify that the approval finding process completed successfully despite invalid SQLa.NotNil(issue, "Issue should be retrievable even with invalid SQL")- a.True(issue.ApprovalFindingDone, "Approval finding should complete even with invalid SQL")- a.Empty(issue.ApprovalFindingError, "Approval finding should not have errors despite invalid SQL")+ a.NotEqual(v1pb.Issue_CHECKING, issue.ApprovalStatus, "Approval finding should complete even with invalid SQL")+ a.NotEqual(v1pb.Issue_ERROR, issue.ApprovalStatus, "Approval finding should not have errors despite invalid SQL")a.Equal(v1pb.Issue_HIGH, issue.RiskLevel, "Issue risk level should be HIGH")}diff --git a/backend/tests/rollout.go b/backend/tests/rollout.goindex e0f2647065..088ede40e5 100644--- a/backend/tests/rollout.go+++ b/backend/tests/rollout.go@@ -75,10 +75,10 @@ func (ctl *controller) waitRollout(ctx context.Context, issueName, rolloutName sreturn err}issue := issueResp.Msg- if issue.ApprovalFindingError != "" {- return errors.Errorf("approval finding error: %v", issue.ApprovalFindingError)+ if issue.ApprovalStatus == v1pb.Issue_ERROR {+ return errors.Errorf("approval finding error: %v", issue.ApprovalStatusError)}- if issue.ApprovalFindingDone {+ if issue.ApprovalStatus != v1pb.Issue_CHECKING {break}}diff --git a/frontend/src/components/IssueV1/logic/review.ts b/frontend/src/components/IssueV1/logic/review.tsindex 5f18d47982..5494bbcde5 100644--- a/frontend/src/components/IssueV1/logic/review.ts+++ b/frontend/src/components/IssueV1/logic/review.ts@@ -20,6 +20,7 @@ import type {import {ApprovalNode_Type,Issue_Approver_Status,+ Issue_ApprovalStatus,} from "@/types/proto-es/v1/issue_service_pb";import { displayRoleTitle } from "@/utils";import { isUserIncludedInList } from "@/utils";@@ -27,7 +28,11 @@ import type { ReviewContext } from "./context";export const extractReviewContext = (issue: MaybeRef<Issue>): ReviewContext => {const ready = computed(() => {- return unref(issue).approvalFindingDone ?? false;+ const approvalStatus = unref(issue).approvalStatus;+ return (+ approvalStatus !== Issue_ApprovalStatus.CHECKING &&+ approvalStatus !== Issue_ApprovalStatus.APPROVAL_STATUS_UNSPECIFIED+ );});const flow = computed((): ReviewFlow => {if (!ready.value) return emptyFlow();@@ -50,7 +55,7 @@ export const extractReviewContext = (issue: MaybeRef<Issue>): ReviewContext => {if (!ready.value) {return Issue_Approver_Status.PENDING;}- if (unref(issue).approvalFindingError) {+ if (unref(issue).approvalStatusError) {return Issue_Approver_Status.PENDING;}@@ -83,7 +88,7 @@ export const extractReviewContext = (issue: MaybeRef<Issue>): ReviewContext => {return status.value === Issue_Approver_Status.APPROVED;});const error = computed(() => {- return unref(issue).approvalFindingError;+ return unref(issue).approvalStatusError;});return {diff --git a/frontend/src/components/Plan/components/HeaderSection/Actions/Actions.vue b/frontend/src/components/Plan/components/HeaderSection/Actions/Actions.vueindex dbeeae7d67..22286504a8 100644--- a/frontend/src/components/Plan/components/HeaderSection/Actions/Actions.vue+++ b/frontend/src/components/Plan/components/HeaderSection/Actions/Actions.vue@@ -72,6 +72,7 @@ import {IssueSchema,IssueStatus,Issue_Approver_Status,+ Issue_ApprovalStatus,Issue_Type,} from "@/types/proto-es/v1/issue_service_pb";import type { Plan, Plan_Spec } from "@/types/proto-es/v1/plan_service_pb";@@ -231,7 +232,10 @@ const availableActions = computed(() => {}// Check for review actions- if (issueValue.approvalFindingDone && !reviewContext.done.value) {+ if (+ issueValue.approvalStatus !== Issue_ApprovalStatus.CHECKING &&+ !reviewContext.done.value+ ) {const issueCreator = extractUserId(issueValue.creator);const { approvers, approvalTemplates } = issueValue;@@ -294,7 +298,10 @@ const availableActions = computed(() => {}// Check for rollout actions when rollout exists and has database creation tasks- if (rollout.value && issueValue.approvalFindingDone) {+ if (+ rollout.value &&+ issueValue.approvalStatus !== Issue_ApprovalStatus.CHECKING+ ) {// Different permission checks based on issue type// For export data issues: only the creator can run tasks// For other issues: need bb.taskRuns.create permissiondiff --git a/frontend/src/components/Plan/components/IssueReviewView/Sidebar/ApprovalFlowSection/ApprovalFlowSection.vue b/frontend/src/components/Plan/components/IssueReviewView/Sidebar/ApprovalFlowSection/ApprovalFlowSection.vueindex ef695710d5..5f6f1aaf16 100644--- a/frontend/src/components/Plan/components/IssueReviewView/Sidebar/ApprovalFlowSection/ApprovalFlowSection.vue+++ b/frontend/src/components/Plan/components/IssueReviewView/Sidebar/ApprovalFlowSection/ApprovalFlowSection.vue@@ -8,7 +8,7 @@<div class="mt-2"><div- v-if="!issue.approvalFindingDone"+ v-if="issue.approvalStatus === Issue_ApprovalStatus.CHECKING"class="flex items-center gap-x-2 text-sm text-control-placeholder"><BBSpin :size="16" />@@ -17,10 +17,10 @@</span></div><div- v-else-if="issue.approvalFindingError"+ v-else-if="issue.approvalStatus === Issue_ApprovalStatus.ERROR"class="flex items-center gap-x-2">- <span class="text-error text-sm">{{ issue.approvalFindingError }}</span>+ <span class="text-error text-sm">{{ issue.approvalStatusError }}</span><NButtonsize="tiny":loading="retrying"@@ -60,6 +60,7 @@ import { BBSpin } from "@/bbkit";import FeatureBadge from "@/components/FeatureGuard/FeatureBadge.vue";import { useIssueV1Store } from "@/store";import type { Issue } from "@/types/proto-es/v1/issue_service_pb";+import { Issue_ApprovalStatus } from "@/types/proto-es/v1/issue_service_pb";import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";import ApprovalStepItem from "./ApprovalStepItem.vue";import RiskLevelIcon from "./RiskLevelIcon.vue";diff --git a/frontend/src/components/Plan/components/IssueReviewView/Sidebar/IssueStatusSection.vue b/frontend/src/components/Plan/components/IssueReviewView/Sidebar/IssueStatusSection.vueindex 85fa2ec0f4..de26c5c3b1 100644--- a/frontend/src/components/Plan/components/IssueReviewView/Sidebar/IssueStatusSection.vue+++ b/frontend/src/components/Plan/components/IssueReviewView/Sidebar/IssueStatusSection.vue@@ -16,6 +16,7 @@ import { useI18n } from "vue-i18n";import {IssueStatus,Issue_Approver_Status,+ Issue_ApprovalStatus,} from "@/types/proto-es/v1/issue_service_pb";import type { Issue } from "@/types/proto-es/v1/issue_service_pb";import { useIssueReviewContext } from "../../../logic/";@@ -31,7 +32,7 @@ const issueStatusText = computed(() => {const issueValue = props.issue;// Show review status instead of just "Open"- if (!issueValue.approvalFindingDone) {+ if (issueValue.approvalStatus === Issue_ApprovalStatus.CHECKING) {return t("issue.table.open");}@@ -59,7 +60,7 @@ const issueStatusTagType = computed(() => {switch (issueValue.status) {case IssueStatus.OPEN:// Show different colors based on review status- if (!issueValue.approvalFindingDone) {+ if (issueValue.approvalStatus === Issue_ApprovalStatus.CHECKING) {return "info";}diff --git a/frontend/src/components/Plan/logic/issue-review.ts b/frontend/src/components/Plan/logic/issue-review.tsindex 4fd83fa374..b6070b5865 100644--- a/frontend/src/components/Plan/logic/issue-review.ts+++ b/frontend/src/components/Plan/logic/issue-review.ts@@ -3,6 +3,7 @@ import type { ComputedRef, InjectionKey } from "vue";import { computed, inject, provide, unref } from "vue";import {Issue_Approver_Status,+ Issue_ApprovalStatus,type Issue,} from "@/types/proto-es/v1/issue_service_pb";@@ -22,10 +23,10 @@ export const provideIssueReviewContext = (if (!tempIssue) {return Issue_Approver_Status.PENDING;}- if (!tempIssue?.approvalFindingDone) {+ if (tempIssue?.approvalStatus === Issue_ApprovalStatus.CHECKING) {return Issue_Approver_Status.PENDING;}- if (tempIssue?.approvalFindingError) {+ if (tempIssue?.approvalStatus === Issue_ApprovalStatus.ERROR) {return Issue_Approver_Status.PENDING;}@@ -56,7 +57,7 @@ export const provideIssueReviewContext = (});const error = computed(() => {- return unref(issue)?.approvalFindingError;+ return unref(issue)?.approvalStatusError;});const context = {diff --git a/frontend/src/store/modules/v1/issue.ts b/frontend/src/store/modules/v1/issue.tsindex 9bb00ebec1..e70b11404d 100644--- a/frontend/src/store/modules/v1/issue.ts+++ b/frontend/src/store/modules/v1/issue.ts@@ -19,6 +19,7 @@ import type { ApprovalStep, Issue } from "@/types/proto-es/v1/issue_service_pb";import {IssueStatus,ApprovalNode_Type,+ Issue_ApprovalStatus,} from "@/types/proto-es/v1/issue_service_pb";import {extractProjectResourceName,@@ -85,9 +86,9 @@ export const useIssueV1Store = defineStore("issue_v1", () => {const request = create(UpdateIssueRequestSchema, {issue: create(IssueSchema, {name,- approvalFindingDone: false,+ approvalStatus: Issue_ApprovalStatus.CHECKING,}),- updateMask: { paths: ["approval_finding_done"] },+ updateMask: { paths: ["approval_status"] },});await issueServiceClientConnect.updateIssue(request);};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.tsindex c97a2870db..43627d9302 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@@ -446,19 +446,6 @@ export declare type Issue = Message<"bytebase.v1.Issue"> & {*/approvalTemplates: ApprovalTemplate[];- /**- * If the value is `false`, it means that the backend is still finding matching approval templates.- * If `true`, approval_templates & approvers & approval_finding_error are available.- *- * @generated from field: bool approval_finding_done = 11;- */- approvalFindingDone: boolean;-- /**- * @generated from field: string approval_finding_error = 12;- */- approvalFindingError: string;-/*** Format: users/[email protected]*@@ -539,6 +526,18 @@ export declare type Issue = Message<"bytebase.v1.Issue"> & {* @generated from field: repeated string labels = 23;*/labels: string[];++ /**+ * @generated from field: bytebase.v1.Issue.ApprovalStatus approval_status = 24;+ */+ approvalStatus: Issue_ApprovalStatus;++ /**+ * Only populated when approval_status == ERROR+ *+ * @generated from field: string approval_status_error = 25;+ */+ approvalStatusError: string;};/**@@ -662,6 +661,51 @@ export enum Issue_RiskLevel {*/export declare const Issue_RiskLevelSchema: GenEnum<Issue_RiskLevel>;+/**+ * @generated from enum bytebase.v1.Issue.ApprovalStatus+ */+export enum Issue_ApprovalStatus {+ /**+ * @generated from enum value: APPROVAL_STATUS_UNSPECIFIED = 0;+ */+ APPROVAL_STATUS_UNSPECIFIED = 0,++ /**+ * @generated from enum value: CHECKING = 1;+ */+ CHECKING = 1,++ /**+ * @generated from enum value: PENDING = 2;+ */+ PENDING = 2,++ /**+ * @generated from enum value: APPROVED = 3;+ */+ APPROVED = 3,++ /**+ * @generated from enum value: REJECTED = 4;+ */+ REJECTED = 4,++ /**+ * @generated from enum value: SKIPPED = 5;+ */+ SKIPPED = 5,++ /**+ * @generated from enum value: ERROR = 6;+ */+ ERROR = 6,+}++/**+ * Describes the enum bytebase.v1.Issue.ApprovalStatus.+ */+export declare const Issue_ApprovalStatusSchema: GenEnum<Issue_ApprovalStatus>;+/*** @generated from message bytebase.v1.GrantRequest*/diff --git a/frontend/src/types/proto-es/v1/issue_service_pb.js b/frontend/src/types/proto-es/v1/issue_service_pb.jsindex 120398948c..9cc85cf0a4 100644--- a/frontend/src/types/proto-es/v1/issue_service_pb.js+++ b/frontend/src/types/proto-es/v1/issue_service_pb.js@@ -15,7 +15,7 @@ import { file_v1_annotation } from "./annotation_pb";* Describes the file v1/issue_service.proto.*/export const file_v1_issue_service = /*@__PURE__*/- fileDesc("ChZ2MS9pc3N1ZV9zZXJ2aWNlLnByb3RvEgtieXRlYmFzZS52MSJKCg9HZXRJc3N1ZVJlcXVlc3QSKAoEbmFtZRgBIAEoCUIa4EEC+kEUChJieXRlYmFzZS5jb20vSXNzdWUSDQoFZm9yY2UYAiABKAgiagoSQ3JlYXRlSXNzdWVSZXF1ZXN0EiwKBnBhcmVudBgBIAEoCUIc4EEC+kEWChRieXRlYmFzZS5jb20vUHJvamVjdBImCgVpc3N1ZRgCIAEoCzISLmJ5dGViYXNlLnYxLklzc3VlQgPgQQIihwEKEUxpc3RJc3N1ZXNSZXF1ZXN0EiwKBnBhcmVudBgBIAEoCUIc4EEC+kEWChRieXRlYmFzZS5jb20vUHJvamVjdBIRCglwYWdlX3NpemUYAiABKAUSEgoKcGFnZV90b2tlbhgDIAEoCRIOCgZmaWx0ZXIYBCABKAkSDQoFcXVlcnkYBSABKAkiUQoSTGlzdElzc3Vlc1Jlc3BvbnNlEiIKBmlzc3VlcxgBIAMoCzISLmJ5dGViYXNlLnYxLklzc3VlEhcKD25leHRfcGFnZV90b2tlbhgCIAEoCSJwChNTZWFyY2hJc3N1ZXNSZXF1ZXN0EhMKBnBhcmVudBgBIAEoCUID4EECEhEKCXBhZ2Vfc2l6ZRgCIAEoBRISCgpwYWdlX3Rva2VuGAMgASgJEg4KBmZpbHRlchgEIAEoCRINCgVxdWVyeRgFIAEoCSJTChRTZWFyY2hJc3N1ZXNSZXNwb25zZRIiCgZpc3N1ZXMYASADKAsyEi5ieXRlYmFzZS52MS5Jc3N1ZRIXCg9uZXh0X3BhZ2VfdG9rZW4YAiABKAkioAEKElVwZGF0ZUlzc3VlUmVxdWVzdBI9CgVpc3N1ZRgBIAEoCzISLmJ5dGViYXNlLnYxLklzc3VlQhrgQQL6QRQKEmJ5dGViYXNlLmNvbS9Jc3N1ZRI0Cgt1cGRhdGVfbWFzaxgCIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5GaWVsZE1hc2tCA+BBAhIVCg1hbGxvd19taXNzaW5nGAMgASgIIpgBCh5CYXRjaFVwZGF0ZUlzc3Vlc1N0YXR1c1JlcXVlc3QSLAoGcGFyZW50GAEgASgJQhzgQQL6QRYKFGJ5dGViYXNlLmNvbS9Qcm9qZWN0Eg4KBmlzc3VlcxgCIAMoCRIoCgZzdGF0dXMYAyABKA4yGC5ieXRlYmFzZS52MS5Jc3N1ZVN0YXR1cxIOCgZyZWFzb24YBCABKAkiIQofQmF0Y2hVcGRhdGVJc3N1ZXNTdGF0dXNSZXNwb25zZSJQChNBcHByb3ZlSXNzdWVSZXF1ZXN0EigKBG5hbWUYASABKAlCGuBBAvpBFAoSYnl0ZWJhc2UuY29tL0lzc3VlEg8KB2NvbW1lbnQYAiABKAkiTwoSUmVqZWN0SXNzdWVSZXF1ZXN0EigKBG5hbWUYASABKAlCGuBBAvpBFAoSYnl0ZWJhc2UuY29tL0lzc3VlEg8KB2NvbW1lbnQYAiABKAkiUAoTUmVxdWVzdElzc3VlUmVxdWVzdBIoCgRuYW1lGAEgASgJQhrgQQL6QRQKEmJ5dGViYXNlLmNvbS9Jc3N1ZRIPCgdjb21tZW50GAIgASgJIuoICgVJc3N1ZRIMCgRuYW1lGAEgASgJEg0KBXRpdGxlGAMgASgJEhMKC2Rlc2NyaXB0aW9uGAQgASgJEiUKBHR5cGUYBSABKA4yFy5ieXRlYmFzZS52MS5Jc3N1ZS5UeXBlEigKBnN0YXR1cxgGIAEoDjIYLmJ5dGViYXNlLnYxLklzc3VlU3RhdHVzEi4KCWFwcHJvdmVycxgJIAMoCzIbLmJ5dGViYXNlLnYxLklzc3VlLkFwcHJvdmVyEjkKEmFwcHJvdmFsX3RlbXBsYXRlcxgKIAMoCzIdLmJ5dGViYXNlLnYxLkFwcHJvdmFsVGVtcGxhdGUSHQoVYXBwcm92YWxfZmluZGluZ19kb25lGAsgASgIEh4KFmFwcHJvdmFsX2ZpbmRpbmdfZXJyb3IYDCABKAkSFAoHY3JlYXRvchgOIAEoCUID4EEDEjQKC2NyZWF0ZV90aW1lGA8gASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcEID4EEDEjQKC3VwZGF0ZV90aW1lGBAgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcEID4EEDEgwKBHBsYW4YESABKAkSDwoHcm9sbG91dBgSIAEoCRIwCg1ncmFudF9yZXF1ZXN0GBMgASgLMhkuYnl0ZWJhc2UudjEuR3JhbnRSZXF1ZXN0EhEKCXJlbGVhc2VycxgUIAMoCRIwCgpyaXNrX2xldmVsGBUgASgOMhwuYnl0ZWJhc2UudjEuSXNzdWUuUmlza0xldmVsEkIKEXRhc2tfc3RhdHVzX2NvdW50GBYgAygLMicuYnl0ZWJhc2UudjEuSXNzdWUuVGFza1N0YXR1c0NvdW50RW50cnkSDgoGbGFiZWxzGBcgAygJGpwBCghBcHByb3ZlchIyCgZzdGF0dXMYASABKA4yIi5ieXRlYmFzZS52MS5Jc3N1ZS5BcHByb3Zlci5TdGF0dXMSEQoJcHJpbmNpcGFsGAIgASgJIkkKBlN0YXR1cxIWChJTVEFUVVNfVU5TUEVDSUZJRUQQABILCgdQRU5ESU5HEAESDAoIQVBQUk9WRUQQAhIMCghSRUpFQ1RFRBADGjYKFFRhc2tTdGF0dXNDb3VudEVudHJ5EgsKA2tleRgBIAEoCRINCgV2YWx1ZRgCIAEoBToCOAEiWQoEVHlwZRIUChBUWVBFX1VOU1BFQ0lGSUVEEAASEwoPREFUQUJBU0VfQ0hBTkdFEAESEQoNR1JBTlRfUkVRVUVTVBACEhMKD0RBVEFCQVNFX0VYUE9SVBADIkgKCVJpc2tMZXZlbBIaChZSSVNLX0xFVkVMX1VOU1BFQ0lGSUVEEAASBwoDTE9XEAESDAoITU9ERVJBVEUQAhIICgRISUdIEAM6OupBNwoSYnl0ZWJhc2UuY29tL0lzc3VlEiFwcm9qZWN0cy97cHJvamVjdH0vaXNzdWVzL3tpc3N1ZX1KBAgCEANKBAgHEAhKBAgIEAkifwoMR3JhbnRSZXF1ZXN0EgwKBHJvbGUYASABKAkSDAoEdXNlchgCIAEoCRIkCgljb25kaXRpb24YAyABKAsyES5nb29nbGUudHlwZS5FeHByEi0KCmV4cGlyYXRpb24YBCABKAsyGS5nb29nbGUucHJvdG9idWYuRHVyYXRpb24iXwoQQXBwcm92YWxUZW1wbGF0ZRInCgRmbG93GAEgASgLMhkuYnl0ZWJhc2UudjEuQXBwcm92YWxGbG93Eg0KBXRpdGxlGAIgASgJEhMKC2Rlc2NyaXB0aW9uGAMgASgJIjgKDEFwcHJvdmFsRmxvdxIoCgVzdGVwcxgBIAMoCzIZLmJ5dGViYXNlLnYxLkFwcHJvdmFsU3RlcCKWAQoMQXBwcm92YWxTdGVwEiwKBHR5cGUYASABKA4yHi5ieXRlYmFzZS52MS5BcHByb3ZhbFN0ZXAuVHlwZRIoCgVub2RlcxgCIAMoCzIZLmJ5dGViYXNlLnYxLkFwcHJvdmFsTm9kZSIuCgRUeXBlEhQKEFRZUEVfVU5TUEVDSUZJRUQQABIHCgNBTEwQARIHCgNBTlkQAiJ6CgxBcHByb3ZhbE5vZGUSLAoEdHlwZRgBIAEoDjIeLmJ5dGViYXNlLnYxLkFwcHJvdmFsTm9kZS5UeXBlEgwKBHJvbGUYAiABKAkiLgoEVHlwZRIUChBUWVBFX1VOU1BFQ0lGSUVEEAASEAoMQU5ZX0lOX0dST1VQEAEibQoYTGlzdElzc3VlQ29tbWVudHNSZXF1ZXN0EioKBnBhcmVudBgBIAEoCUIa4EEC+kEUChJieXRlYmFzZS5jb20vSXNzdWUSEQoJcGFnZV9zaXplGAIgASgFEhIKCnBhZ2VfdG9rZW4YAyABKAkiZwoZTGlzdElzc3VlQ29tbWVudHNSZXNwb25zZRIxCg5pc3N1ZV9jb21tZW50cxgBIAMoCzIZLmJ5dGViYXNlLnYxLklzc3VlQ29tbWVudBIXCg9uZXh0X3BhZ2VfdG9rZW4YAiABKAkieQoZQ3JlYXRlSXNzdWVDb21tZW50UmVxdWVzdBIqCgZwYXJlbnQYASABKAlCGuBBAvpBFAoSYnl0ZWJhc2UuY29tL0lzc3VlEjAKDWlzc3VlX2NvbW1lbnQYAiABKAsyGS5ieXRlYmFzZS52MS5Jc3N1ZUNvbW1lbnQixgEKGVVwZGF0ZUlzc3VlQ29tbWVudFJlcXVlc3QSKgoGcGFyZW50GAEgASgJQhrgQQL6QRQKEmJ5dGViYXNlLmNvbS9Jc3N1ZRIwCg1pc3N1ZV9jb21tZW50GAIgASgLMhkuYnl0ZWJhc2UudjEuSXNzdWVDb21tZW50EjQKC3VwZGF0ZV9tYXNrGAMgASgLMhouZ29vZ2xlLnByb3RvYnVmLkZpZWxkTWFza0ID4EECEhUKDWFsbG93X21pc3NpbmcYBCABKAgirgwKDElzc3VlQ29tbWVudBIMCgRuYW1lGAEgASgJEg8KB2NvbW1lbnQYAiABKAkSDwoHcGF5bG9hZBgDIAEoCRI0CgtjcmVhdGVfdGltZRgEIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBCA+BBAxI0Cgt1cGRhdGVfdGltZRgFIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBCA+BBAxIUCgdjcmVhdG9yGAcgASgJQgPgQQMSNgoIYXBwcm92YWwYCCABKAsyIi5ieXRlYmFzZS52MS5Jc3N1ZUNvbW1lbnQuQXBwcm92YWxIABI9Cgxpc3N1ZV91cGRhdGUYCSABKAsyJS5ieXRlYmFzZS52MS5Jc3N1ZUNvbW1lbnQuSXNzdWVVcGRhdGVIABI3CglzdGFnZV9lbmQYCiABKAsyIi5ieXRlYmFzZS52MS5Jc3N1ZUNvbW1lbnQuU3RhZ2VFbmRIABI7Cgt0YXNrX3VwZGF0ZRgLIAEoCzIkLmJ5dGViYXNlLnYxLklzc3VlQ29tbWVudC5UYXNrVXBkYXRlSAASRgoRdGFza19wcmlvcl9iYWNrdXAYDCABKAsyKS5ieXRlYmFzZS52MS5Jc3N1ZUNvbW1lbnQuVGFza1ByaW9yQmFja3VwSAAakAEKCEFwcHJvdmFsEjkKBnN0YXR1cxgBIAEoDjIpLmJ5dGViYXNlLnYxLklzc3VlQ29tbWVudC5BcHByb3ZhbC5TdGF0dXMiSQoGU3RhdHVzEhYKElNUQVRVU19VTlNQRUNJRklFRBAAEgsKB1BFTkRJTkcQARIMCghBUFBST1ZFRBACEgwKCFJFSkVDVEVEEAMa9QIKC0lzc3VlVXBkYXRlEhcKCmZyb21fdGl0bGUYASABKAlIAIgBARIVCgh0b190aXRsZRgCIAEoCUgBiAEBEh0KEGZyb21fZGVzY3JpcHRpb24YAyABKAlIAogBARIbCg50b19kZXNjcmlwdGlvbhgEIAEoCUgDiAEBEjIKC2Zyb21fc3RhdHVzGAUgASgOMhguYnl0ZWJhc2UudjEuSXNzdWVTdGF0dXNIBIgBARIwCgl0b19zdGF0dXMYBiABKA4yGC5ieXRlYmFzZS52MS5Jc3N1ZVN0YXR1c0gFiAEBEhMKC2Zyb21fbGFiZWxzGAkgAygJEhEKCXRvX2xhYmVscxgKIAMoCUINCgtfZnJvbV90aXRsZUILCglfdG9fdGl0bGVCEwoRX2Zyb21fZGVzY3JpcHRpb25CEQoPX3RvX2Rlc2NyaXB0aW9uQg4KDF9mcm9tX3N0YXR1c0IMCgpfdG9fc3RhdHVzSgQIBxAISgQICBAJGhkKCFN0YWdlRW5kEg0KBXN0YWdlGAEgASgJGqcCCgpUYXNrVXBkYXRlEg0KBXRhc2tzGAEgAygJEhcKCmZyb21fc2hlZXQYAiABKAlIAIgBARIVCgh0b19zaGVldBgDIAEoCUgBiAEBEkMKCXRvX3N0YXR1cxgGIAEoDjIrLmJ5dGViYXNlLnYxLklzc3VlQ29tbWVudC5UYXNrVXBkYXRlLlN0YXR1c0gCiAEBImsKBlN0YXR1cxIWChJTVEFUVVNfVU5TUEVDSUZJRUQQABILCgdQRU5ESU5HEAESCwoHUlVOTklORxACEggKBERPTkUQAxIKCgZGQUlMRUQQBBILCgdTS0lQUEVEEAUSDAoIQ0FOQ0VMRUQQBkINCgtfZnJvbV9zaGVldEILCglfdG9fc2hlZXRCDAoKX3RvX3N0YXR1cxrXAQoPVGFza1ByaW9yQmFja3VwEgwKBHRhc2sYASABKAkSPwoGdGFibGVzGAIgAygLMi8uYnl0ZWJhc2UudjEuSXNzdWVDb21tZW50LlRhc2tQcmlvckJhY2t1cC5UYWJsZRIaCg1vcmlnaW5hbF9saW5lGAMgASgFSACIAQESEAoIZGF0YWJhc2UYBCABKAkSDQoFZXJyb3IYBSABKAkaJgoFVGFibGUSDgoGc2NoZW1hGAEgASgJEg0KBXRhYmxlGAIgASgJQhAKDl9vcmlnaW5hbF9saW5lQgcKBWV2ZW50SgQIBhAHKk0KC0lzc3VlU3RhdHVzEhwKGElTU1VFX1NUQVRVU19VTlNQRUNJRklFRBAAEggKBE9QRU4QARIICgRET05FEAISDAoIQ0FOQ0VMRUQQAzLYDwoMSXNzdWVTZXJ2aWNlEoABCghHZXRJc3N1ZRIcLmJ5dGViYXNlLnYxLkdldElzc3VlUmVxdWVzdBoSLmJ5dGViYXNlLnYxLklzc3VlIkLaQQRuYW1liuowDWJiLmlzc3Vlcy5nZXSQ6jABgtPkkwIgEh4vdjEve25hbWU9cHJvamVjdHMvKi9pc3N1ZXMvKn0SnAEKC0NyZWF0ZUlzc3VlEh8uYnl0ZWJhc2UudjEuQ3JlYXRlSXNzdWVSZXF1ZXN0GhIuYnl0ZWJhc2UudjEuSXNzdWUiWNpBDHBhcmVudCxpc3N1ZYrqMBBiYi5pc3N1ZXMuY3JlYXRlkOowAZjqMAGC0+STAic6BWlzc3VlIh4vdjEve3BhcmVudD1wcm9qZWN0cy8qfS9pc3N1ZXMSlAEKCkxpc3RJc3N1ZXMSHi5ieXRlYmFzZS52MS5MaXN0SXNzdWVzUmVxdWVzdBofLmJ5dGViYXNlLnYxLkxpc3RJc3N1ZXNSZXNwb25zZSJF2kEGcGFyZW50iuowDmJiLmlzc3Vlcy5saXN0kOowAYLT5JMCIBIeL3YxL3twYXJlbnQ9cHJvamVjdHMvKn0vaXNzdWVzEpoBCgxTZWFyY2hJc3N1ZXMSIC5ieXRlYmFzZS52MS5TZWFyY2hJc3N1ZXNSZXF1ZXN0GiEuYnl0ZWJhc2UudjEuU2VhcmNoSXNzdWVzUmVzcG9uc2UiRYrqMA1iYi5pc3N1ZXMuZ2V0kOowAoLT5JMCKjoBKiIlL3YxL3twYXJlbnQ9cHJvamVjdHMvKn0vaXNzdWVzOnNlYXJjaBKnAQoLVXBkYXRlSXNzdWUSHy5ieXRlYmFzZS52MS5VcGRhdGVJc3N1ZVJlcXVlc3QaEi5ieXRlYmFzZS52MS5Jc3N1ZSJj2kERaXNzdWUsdXBkYXRlX21hc2uK6jAQYmIuaXNzdWVzLnVwZGF0ZZDqMAGY6jABgtPkkwItOgVpc3N1ZTIkL3YxL3tpc3N1ZS5uYW1lPXByb2plY3RzLyovaXNzdWVzLyp9EsABChFMaXN0SXNzdWVDb21tZW50cxIlLmJ5dGViYXNlLnYxLkxpc3RJc3N1ZUNvbW1lbnRzUmVxdWVzdBomLmJ5dGViYXNlLnYxLkxpc3RJc3N1ZUNvbW1lbnRzUmVzcG9uc2UiXNpBBnBhcmVudIrqMBViYi5pc3N1ZUNvbW1lbnRzLmxpc3SQ6jABgtPkkwIwEi4vdjEve3BhcmVudD1wcm9qZWN0cy8qL2lzc3Vlcy8qfS9pc3N1ZUNvbW1lbnRzEtIBChJDcmVhdGVJc3N1ZUNvbW1lbnQSJi5ieXRlYmFzZS52MS5DcmVhdGVJc3N1ZUNvbW1lbnRSZXF1ZXN0GhkuYnl0ZWJhc2UudjEuSXNzdWVDb21tZW50InnaQRRwYXJlbnQsaXNzdWVfY29tbWVudIrqMBdiYi5pc3N1ZUNvbW1lbnRzLmNyZWF0ZZDqMAGY6jABgtPkkwI5Og1pc3N1ZV9jb21tZW50IigvdjEve3BhcmVudD1wcm9qZWN0cy8qL2lzc3Vlcy8qfTpjb21tZW50Et8BChJVcGRhdGVJc3N1ZUNvbW1lbnQSJi5ieXRlYmFzZS52MS5VcGRhdGVJc3N1ZUNvbW1lbnRSZXF1ZXN0GhkuYnl0ZWJhc2UudjEuSXNzdWVDb21tZW50IoUB2kEgcGFyZW50LGlzc3VlX2NvbW1lbnQsdXBkYXRlX21hc2uK6jAXYmIuaXNzdWVDb21tZW50cy51cGRhdGWQ6jABmOowAYLT5JMCOToNaXNzdWVfY29tbWVudDIoL3YxL3twYXJlbnQ9cHJvamVjdHMvKi9pc3N1ZXMvKn06Y29tbWVudBLNAQoXQmF0Y2hVcGRhdGVJc3N1ZXNTdGF0dXMSKy5ieXRlYmFzZS52MS5CYXRjaFVwZGF0ZUlzc3Vlc1N0YXR1c1JlcXVlc3QaLC5ieXRlYmFzZS52MS5CYXRjaFVwZGF0ZUlzc3Vlc1N0YXR1c1Jlc3BvbnNlIleK6jAQYmIuaXNzdWVzLnVwZGF0ZZDqMAGY6jABgtPkkwI1OgEqIjAvdjEve3BhcmVudD1wcm9qZWN0cy8qfS9pc3N1ZXM6YmF0Y2hVcGRhdGVTdGF0dXMSfwoMQXBwcm92ZUlzc3VlEiAuYnl0ZWJhc2UudjEuQXBwcm92ZUlzc3VlUmVxdWVzdBoSLmJ5dGViYXNlLnYxLklzc3VlIjmQ6jACmOowAYLT5JMCKzoBKiImL3YxL3tuYW1lPXByb2plY3RzLyovaXNzdWVzLyp9OmFwcHJvdmUSfAoLUmVqZWN0SXNzdWUSHy5ieXRlYmFzZS52MS5SZWplY3RJc3N1ZVJlcXVlc3QaEi5ieXRlYmFzZS52MS5Jc3N1ZSI4kOowApjqMAGC0+STAio6ASoiJS92MS97bmFtZT1wcm9qZWN0cy8qL2lzc3Vlcy8qfTpyZWplY3QSfwoMUmVxdWVzdElzc3VlEiAuYnl0ZWJhc2UudjEuUmVxdWVzdElzc3VlUmVxdWVzdBoSLmJ5dGViYXNlLnYxLklzc3VlIjmQ6jACmOowAYLT5JMCKzoBKiImL3YxL3tuYW1lPXByb2plY3RzLyovaXNzdWVzLyp9OnJlcXVlc3RCNlo0Z2l0aHViLmNvbS9ieXRlYmFzZS9ieXRlYmFzZS9iYWNrZW5kL2dlbmVyYXRlZC1nby92MWIGcHJvdG8z", [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]);+ fileDesc("ChZ2MS9pc3N1ZV9zZXJ2aWNlLnByb3RvEgtieXRlYmFzZS52MSJKCg9HZXRJc3N1ZVJlcXVlc3QSKAoEbmFtZRgBIAEoCUIa4EEC+kEUChJieXRlYmFzZS5jb20vSXNzdWUSDQoFZm9yY2UYAiABKAgiagoSQ3JlYXRlSXNzdWVSZXF1ZXN0EiwKBnBhcmVudBgBIAEoCUIc4EEC+kEWChRieXRlYmFzZS5jb20vUHJvamVjdBImCgVpc3N1ZRgCIAEoCzISLmJ5dGViYXNlLnYxLklzc3VlQgPgQQIihwEKEUxpc3RJc3N1ZXNSZXF1ZXN0EiwKBnBhcmVudBgBIAEoCUIc4EEC+kEWChRieXRlYmFzZS5jb20vUHJvamVjdBIRCglwYWdlX3NpemUYAiABKAUSEgoKcGFnZV90b2tlbhgDIAEoCRIOCgZmaWx0ZXIYBCABKAkSDQoFcXVlcnkYBSABKAkiUQoSTGlzdElzc3Vlc1Jlc3BvbnNlEiIKBmlzc3VlcxgBIAMoCzISLmJ5dGViYXNlLnYxLklzc3VlEhcKD25leHRfcGFnZV90b2tlbhgCIAEoCSJwChNTZWFyY2hJc3N1ZXNSZXF1ZXN0EhMKBnBhcmVudBgBIAEoCUID4EECEhEKCXBhZ2Vfc2l6ZRgCIAEoBRISCgpwYWdlX3Rva2VuGAMgASgJEg4KBmZpbHRlchgEIAEoCRINCgVxdWVyeRgFIAEoCSJTChRTZWFyY2hJc3N1ZXNSZXNwb25zZRIiCgZpc3N1ZXMYASADKAsyEi5ieXRlYmFzZS52MS5Jc3N1ZRIXCg9uZXh0X3BhZ2VfdG9rZW4YAiABKAkioAEKElVwZGF0ZUlzc3VlUmVxdWVzdBI9CgVpc3N1ZRgBIAEoCzISLmJ5dGViYXNlLnYxLklzc3VlQhrgQQL6QRQKEmJ5dGViYXNlLmNvbS9Jc3N1ZRI0Cgt1cGRhdGVfbWFzaxgCIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5GaWVsZE1hc2tCA+BBAhIVCg1hbGxvd19taXNzaW5nGAMgASgIIpgBCh5CYXRjaFVwZGF0ZUlzc3Vlc1N0YXR1c1JlcXVlc3QSLAoGcGFyZW50GAEgASgJQhzgQQL6QRYKFGJ5dGViYXNlLmNvbS9Qcm9qZWN0Eg4KBmlzc3VlcxgCIAMoCRIoCgZzdGF0dXMYAyABKA4yGC5ieXRlYmFzZS52MS5Jc3N1ZVN0YXR1cxIOCgZyZWFzb24YBCABKAkiIQofQmF0Y2hVcGRhdGVJc3N1ZXNTdGF0dXNSZXNwb25zZSJQChNBcHByb3ZlSXNzdWVSZXF1ZXN0EigKBG5hbWUYASABKAlCGuBBAvpBFAoSYnl0ZWJhc2UuY29tL0lzc3VlEg8KB2NvbW1lbnQYAiABKAkiTwoSUmVqZWN0SXNzdWVSZXF1ZXN0EigKBG5hbWUYASABKAlCGuBBAvpBFAoSYnl0ZWJhc2UuY29tL0lzc3VlEg8KB2NvbW1lbnQYAiABKAkiUAoTUmVxdWVzdElzc3VlUmVxdWVzdBIoCgRuYW1lGAEgASgJQhrgQQL6QRQKEmJ5dGViYXNlLmNvbS9Jc3N1ZRIPCgdjb21tZW50GAIgASgJIp8KCgVJc3N1ZRIMCgRuYW1lGAEgASgJEg0KBXRpdGxlGAMgASgJEhMKC2Rlc2NyaXB0aW9uGAQgASgJEiUKBHR5cGUYBSABKA4yFy5ieXRlYmFzZS52MS5Jc3N1ZS5UeXBlEigKBnN0YXR1cxgGIAEoDjIYLmJ5dGViYXNlLnYxLklzc3VlU3RhdHVzEi4KCWFwcHJvdmVycxgJIAMoCzIbLmJ5dGViYXNlLnYxLklzc3VlLkFwcHJvdmVyEjkKEmFwcHJvdmFsX3RlbXBsYXRlcxgKIAMoCzIdLmJ5dGViYXNlLnYxLkFwcHJvdmFsVGVtcGxhdGUSFAoHY3JlYXRvchgOIAEoCUID4EEDEjQKC2NyZWF0ZV90aW1lGA8gASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcEID4EEDEjQKC3VwZGF0ZV90aW1lGBAgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcEID4EEDEgwKBHBsYW4YESABKAkSDwoHcm9sbG91dBgSIAEoCRIwCg1ncmFudF9yZXF1ZXN0GBMgASgLMhkuYnl0ZWJhc2UudjEuR3JhbnRSZXF1ZXN0EhEKCXJlbGVhc2VycxgUIAMoCRIwCgpyaXNrX2xldmVsGBUgASgOMhwuYnl0ZWJhc2UudjEuSXNzdWUuUmlza0xldmVsEkIKEXRhc2tfc3RhdHVzX2NvdW50GBYgAygLMicuYnl0ZWJhc2UudjEuSXNzdWUuVGFza1N0YXR1c0NvdW50RW50cnkSDgoGbGFiZWxzGBcgAygJEj8KD2FwcHJvdmFsX3N0YXR1cxgYIAEoDjIhLmJ5dGViYXNlLnYxLklzc3VlLkFwcHJvdmFsU3RhdHVzQgPgQQMSIgoVYXBwcm92YWxfc3RhdHVzX2Vycm9yGBkgASgJQgPgQQManAEKCEFwcHJvdmVyEjIKBnN0YXR1cxgBIAEoDjIiLmJ5dGViYXNlLnYxLklzc3VlLkFwcHJvdmVyLlN0YXR1cxIRCglwcmluY2lwYWwYAiABKAkiSQoGU3RhdHVzEhYKElNUQVRVU19VTlNQRUNJRklFRBAAEgsKB1BFTkRJTkcQARIMCghBUFBST1ZFRBACEgwKCFJFSkVDVEVEEAMaNgoUVGFza1N0YXR1c0NvdW50RW50cnkSCwoDa2V5GAEgASgJEg0KBXZhbHVlGAIgASgFOgI4ASJZCgRUeXBlEhQKEFRZUEVfVU5TUEVDSUZJRUQQABITCg9EQVRBQkFTRV9DSEFOR0UQARIRCg1HUkFOVF9SRVFVRVNUEAISEwoPREFUQUJBU0VfRVhQT1JUEAMiSAoJUmlza0xldmVsEhoKFlJJU0tfTEVWRUxfVU5TUEVDSUZJRUQQABIHCgNMT1cQARIMCghNT0RFUkFURRACEggKBEhJR0gQAyKAAQoOQXBwcm92YWxTdGF0dXMSHwobQVBQUk9WQUxfU1RBVFVTX1VOU1BFQ0lGSUVEEAASDAoIQ0hFQ0tJTkcQARILCgdQRU5ESU5HEAISDAoIQVBQUk9WRUQQAxIMCghSRUpFQ1RFRBAEEgsKB1NLSVBQRUQQBRIJCgVFUlJPUhAGOjrqQTcKEmJ5dGViYXNlLmNvbS9Jc3N1ZRIhcHJvamVjdHMve3Byb2plY3R9L2lzc3Vlcy97aXNzdWV9SgQIAhADSgQIBxAISgQICBAJSgQICxAMSgQIDBANIn8KDEdyYW50UmVxdWVzdBIMCgRyb2xlGAEgASgJEgwKBHVzZXIYAiABKAkSJAoJY29uZGl0aW9uGAMgASgLMhEuZ29vZ2xlLnR5cGUuRXhwchItCgpleHBpcmF0aW9uGAQgASgLMhkuZ29vZ2xlLnByb3RvYnVmLkR1cmF0aW9uIl8KEEFwcHJvdmFsVGVtcGxhdGUSJwoEZmxvdxgBIAEoCzIZLmJ5dGViYXNlLnYxLkFwcHJvdmFsRmxvdxINCgV0aXRsZRgCIAEoCRITCgtkZXNjcmlwdGlvbhgDIAEoCSI4CgxBcHByb3ZhbEZsb3cSKAoFc3RlcHMYASADKAsyGS5ieXRlYmFzZS52MS5BcHByb3ZhbFN0ZXAilgEKDEFwcHJvdmFsU3RlcBIsCgR0eXBlGAEgASgOMh4uYnl0ZWJhc2UudjEuQXBwcm92YWxTdGVwLlR5cGUSKAoFbm9kZXMYAiADKAsyGS5ieXRlYmFzZS52MS5BcHByb3ZhbE5vZGUiLgoEVHlwZRIUChBUWVBFX1VOU1BFQ0lGSUVEEAASBwoDQUxMEAESBwoDQU5ZEAIiegoMQXBwcm92YWxOb2RlEiwKBHR5cGUYASABKA4yHi5ieXRlYmFzZS52MS5BcHByb3ZhbE5vZGUuVHlwZRIMCgRyb2xlGAIgASgJIi4KBFR5cGUSFAoQVFlQRV9VTlNQRUNJRklFRBAAEhAKDEFOWV9JTl9HUk9VUBABIm0KGExpc3RJc3N1ZUNvbW1lbnRzUmVxdWVzdBIqCgZwYXJlbnQYASABKAlCGuBBAvpBFAoSYnl0ZWJhc2UuY29tL0lzc3VlEhEKCXBhZ2Vfc2l6ZRgCIAEoBRISCgpwYWdlX3Rva2VuGAMgASgJImcKGUxpc3RJc3N1ZUNvbW1lbnRzUmVzcG9uc2USMQoOaXNzdWVfY29tbWVudHMYASADKAsyGS5ieXRlYmFzZS52MS5Jc3N1ZUNvbW1lbnQSFwoPbmV4dF9wYWdlX3Rva2VuGAIgASgJInkKGUNyZWF0ZUlzc3VlQ29tbWVudFJlcXVlc3QSKgoGcGFyZW50GAEgASgJQhrgQQL6QRQKEmJ5dGViYXNlLmNvbS9Jc3N1ZRIwCg1pc3N1ZV9jb21tZW50GAIgASgLMhkuYnl0ZWJhc2UudjEuSXNzdWVDb21tZW50IsYBChlVcGRhdGVJc3N1ZUNvbW1lbnRSZXF1ZXN0EioKBnBhcmVudBgBIAEoCUIa4EEC+kEUChJieXRlYmFzZS5jb20vSXNzdWUSMAoNaXNzdWVfY29tbWVudBgCIAEoCzIZLmJ5dGViYXNlLnYxLklzc3VlQ29tbWVudBI0Cgt1cGRhdGVfbWFzaxgDIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5GaWVsZE1hc2tCA+BBAhIVCg1hbGxvd19taXNzaW5nGAQgASgIIq4MCgxJc3N1ZUNvbW1lbnQSDAoEbmFtZRgBIAEoCRIPCgdjb21tZW50GAIgASgJEg8KB3BheWxvYWQYAyABKAkSNAoLY3JlYXRlX3RpbWUYBCABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wQgPgQQMSNAoLdXBkYXRlX3RpbWUYBSABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wQgPgQQMSFAoHY3JlYXRvchgHIAEoCUID4EEDEjYKCGFwcHJvdmFsGAggASgLMiIuYnl0ZWJhc2UudjEuSXNzdWVDb21tZW50LkFwcHJvdmFsSAASPQoMaXNzdWVfdXBkYXRlGAkgASgLMiUuYnl0ZWJhc2UudjEuSXNzdWVDb21tZW50Lklzc3VlVXBkYXRlSAASNwoJc3RhZ2VfZW5kGAogASgLMiIuYnl0ZWJhc2UudjEuSXNzdWVDb21tZW50LlN0YWdlRW5kSAASOwoLdGFza191cGRhdGUYCyABKAsyJC5ieXRlYmFzZS52MS5Jc3N1ZUNvbW1lbnQuVGFza1VwZGF0ZUgAEkYKEXRhc2tfcHJpb3JfYmFja3VwGAwgASgLMikuYnl0ZWJhc2UudjEuSXNzdWVDb21tZW50LlRhc2tQcmlvckJhY2t1cEgAGpABCghBcHByb3ZhbBI5CgZzdGF0dXMYASABKA4yKS5ieXRlYmFzZS52MS5Jc3N1ZUNvbW1lbnQuQXBwcm92YWwuU3RhdHVzIkkKBlN0YXR1cxIWChJTVEFUVVNfVU5TUEVDSUZJRUQQABILCgdQRU5ESU5HEAESDAoIQVBQUk9WRUQQAhIMCghSRUpFQ1RFRBADGvUCCgtJc3N1ZVVwZGF0ZRIXCgpmcm9tX3RpdGxlGAEgASgJSACIAQESFQoIdG9fdGl0bGUYAiABKAlIAYgBARIdChBmcm9tX2Rlc2NyaXB0aW9uGAMgASgJSAKIAQESGwoOdG9fZGVzY3JpcHRpb24YBCABKAlIA4gBARIyCgtmcm9tX3N0YXR1cxgFIAEoDjIYLmJ5dGViYXNlLnYxLklzc3VlU3RhdHVzSASIAQESMAoJdG9fc3RhdHVzGAYgASgOMhguYnl0ZWJhc2UudjEuSXNzdWVTdGF0dXNIBYgBARITCgtmcm9tX2xhYmVscxgJIAMoCRIRCgl0b19sYWJlbHMYCiADKAlCDQoLX2Zyb21fdGl0bGVCCwoJX3RvX3RpdGxlQhMKEV9mcm9tX2Rlc2NyaXB0aW9uQhEKD190b19kZXNjcmlwdGlvbkIOCgxfZnJvbV9zdGF0dXNCDAoKX3RvX3N0YXR1c0oECAcQCEoECAgQCRoZCghTdGFnZUVuZBINCgVzdGFnZRgBIAEoCRqnAgoKVGFza1VwZGF0ZRINCgV0YXNrcxgBIAMoCRIXCgpmcm9tX3NoZWV0GAIgASgJSACIAQESFQoIdG9fc2hlZXQYAyABKAlIAYgBARJDCgl0b19zdGF0dXMYBiABKA4yKy5ieXRlYmFzZS52MS5Jc3N1ZUNvbW1lbnQuVGFza1VwZGF0ZS5TdGF0dXNIAogBASJrCgZTdGF0dXMSFgoSU1RBVFVTX1VOU1BFQ0lGSUVEEAASCwoHUEVORElORxABEgsKB1JVTk5JTkcQAhIICgRET05FEAMSCgoGRkFJTEVEEAQSCwoHU0tJUFBFRBAFEgwKCENBTkNFTEVEEAZCDQoLX2Zyb21fc2hlZXRCCwoJX3RvX3NoZWV0QgwKCl90b19zdGF0dXMa1wEKD1Rhc2tQcmlvckJhY2t1cBIMCgR0YXNrGAEgASgJEj8KBnRhYmxlcxgCIAMoCzIvLmJ5dGViYXNlLnYxLklzc3VlQ29tbWVudC5UYXNrUHJpb3JCYWNrdXAuVGFibGUSGgoNb3JpZ2luYWxfbGluZRgDIAEoBUgAiAEBEhAKCGRhdGFiYXNlGAQgASgJEg0KBWVycm9yGAUgASgJGiYKBVRhYmxlEg4KBnNjaGVtYRgBIAEoCRINCgV0YWJsZRgCIAEoCUIQCg5fb3JpZ2luYWxfbGluZUIHCgVldmVudEoECAYQBypNCgtJc3N1ZVN0YXR1cxIcChhJU1NVRV9TVEFUVVNfVU5TUEVDSUZJRUQQABIICgRPUEVOEAESCAoERE9ORRACEgwKCENBTkNFTEVEEAMy2A8KDElzc3VlU2VydmljZRKAAQoIR2V0SXNzdWUSHC5ieXRlYmFzZS52MS5HZXRJc3N1ZVJlcXVlc3QaEi5ieXRlYmFzZS52MS5Jc3N1ZSJC2kEEbmFtZYrqMA1iYi5pc3N1ZXMuZ2V0kOowAYLT5JMCIBIeL3YxL3tuYW1lPXByb2plY3RzLyovaXNzdWVzLyp9EpwBCgtDcmVhdGVJc3N1ZRIfLmJ5dGViYXNlLnYxLkNyZWF0ZUlzc3VlUmVxdWVzdBoSLmJ5dGViYXNlLnYxLklzc3VlIljaQQxwYXJlbnQsaXNzdWWK6jAQYmIuaXNzdWVzLmNyZWF0ZZDqMAGY6jABgtPkkwInOgVpc3N1ZSIeL3YxL3twYXJlbnQ9cHJvamVjdHMvKn0vaXNzdWVzEpQBCgpMaXN0SXNzdWVzEh4uYnl0ZWJhc2UudjEuTGlzdElzc3Vlc1JlcXVlc3QaHy5ieXRlYmFzZS52MS5MaXN0SXNzdWVzUmVzcG9uc2UiRdpBBnBhcmVudIrqMA5iYi5pc3N1ZXMubGlzdJDqMAGC0+STAiASHi92MS97cGFyZW50PXByb2plY3RzLyp9L2lzc3VlcxKaAQoMU2VhcmNoSXNzdWVzEiAuYnl0ZWJhc2UudjEuU2VhcmNoSXNzdWVzUmVxdWVzdBohLmJ5dGViYXNlLnYxLlNlYXJjaElzc3Vlc1Jlc3BvbnNlIkWK6jANYmIuaXNzdWVzLmdldJDqMAKC0+STAio6ASoiJS92MS97cGFyZW50PXByb2plY3RzLyp9L2lzc3VlczpzZWFyY2gSpwEKC1VwZGF0ZUlzc3VlEh8uYnl0ZWJhc2UudjEuVXBkYXRlSXNzdWVSZXF1ZXN0GhIuYnl0ZWJhc2UudjEuSXNzdWUiY9pBEWlzc3VlLHVwZGF0ZV9tYXNriuowEGJiLmlzc3Vlcy51cGRhdGWQ6jABmOowAYLT5JMCLToFaXNzdWUyJC92MS97aXNzdWUubmFtZT1wcm9qZWN0cy8qL2lzc3Vlcy8qfRLAAQoRTGlzdElzc3VlQ29tbWVudHMSJS5ieXRlYmFzZS52MS5MaXN0SXNzdWVDb21tZW50c1JlcXVlc3QaJi5ieXRlYmFzZS52MS5MaXN0SXNzdWVDb21tZW50c1Jlc3BvbnNlIlzaQQZwYXJlbnSK6jAVYmIuaXNzdWVDb21tZW50cy5saXN0kOowAYLT5JMCMBIuL3YxL3twYXJlbnQ9cHJvamVjdHMvKi9pc3N1ZXMvKn0vaXNzdWVDb21tZW50cxLSAQoSQ3JlYXRlSXNzdWVDb21tZW50EiYuYnl0ZWJhc2UudjEuQ3JlYXRlSXNzdWVDb21tZW50UmVxdWVzdBoZLmJ5dGViYXNlLnYxLklzc3VlQ29tbWVudCJ52kEUcGFyZW50LGlzc3VlX2NvbW1lbnSK6jAXYmIuaXNzdWVDb21tZW50cy5jcmVhdGWQ6jABmOowAYLT5JMCOToNaXNzdWVfY29tbWVudCIoL3YxL3twYXJlbnQ9cHJvamVjdHMvKi9pc3N1ZXMvKn06Y29tbWVudBLfAQoSVXBkYXRlSXNzdWVDb21tZW50EiYuYnl0ZWJhc2UudjEuVXBkYXRlSXNzdWVDb21tZW50UmVxdWVzdBoZLmJ5dGViYXNlLnYxLklzc3VlQ29tbWVudCKFAdpBIHBhcmVudCxpc3N1ZV9jb21tZW50LHVwZGF0ZV9tYXNriuowF2JiLmlzc3VlQ29tbWVudHMudXBkYXRlkOowAZjqMAGC0+STAjk6DWlzc3VlX2NvbW1lbnQyKC92MS97cGFyZW50PXByb2plY3RzLyovaXNzdWVzLyp9OmNvbW1lbnQSzQEKF0JhdGNoVXBkYXRlSXNzdWVzU3RhdHVzEisuYnl0ZWJhc2UudjEuQmF0Y2hVcGRhdGVJc3N1ZXNTdGF0dXNSZXF1ZXN0GiwuYnl0ZWJhc2UudjEuQmF0Y2hVcGRhdGVJc3N1ZXNTdGF0dXNSZXNwb25zZSJXiuowEGJiLmlzc3Vlcy51cGRhdGWQ6jABmOowAYLT5JMCNToBKiIwL3YxL3twYXJlbnQ9cHJvamVjdHMvKn0vaXNzdWVzOmJhdGNoVXBkYXRlU3RhdHVzEn8KDEFwcHJvdmVJc3N1ZRIgLmJ5dGViYXNlLnYxLkFwcHJvdmVJc3N1ZVJlcXVlc3QaEi5ieXRlYmFzZS52MS5Jc3N1ZSI5kOowApjqMAGC0+STAis6ASoiJi92MS97bmFtZT1wcm9qZWN0cy8qL2lzc3Vlcy8qfTphcHByb3ZlEnwKC1JlamVjdElzc3VlEh8uYnl0ZWJhc2UudjEuUmVqZWN0SXNzdWVSZXF1ZXN0GhIuYnl0ZWJhc2UudjEuSXNzdWUiOJDqMAKY6jABgtPkkwIqOgEqIiUvdjEve25hbWU9cHJvamVjdHMvKi9pc3N1ZXMvKn06cmVqZWN0En8KDFJlcXVlc3RJc3N1ZRIgLmJ5dGViYXNlLnYxLlJlcXVlc3RJc3N1ZVJlcXVlc3QaEi5ieXRlYmFzZS52MS5Jc3N1ZSI5kOowApjqMAGC0+STAis6ASoiJi92MS97bmFtZT1wcm9qZWN0cy8qL2lzc3Vlcy8qfTpyZXF1ZXN0QjZaNGdpdGh1Yi5jb20vYnl0ZWJhc2UvYnl0ZWJhc2UvYmFja2VuZC9nZW5lcmF0ZWQtZ28vdjFiBnByb3RvMw", [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]);/*** Describes the message bytebase.v1.GetIssueRequest.@@ -151,6 +151,18 @@ export const Issue_RiskLevelSchema = /*@__PURE__*/export const Issue_RiskLevel = /*@__PURE__*/tsEnum(Issue_RiskLevelSchema);+/**+ * Describes the enum bytebase.v1.Issue.ApprovalStatus.+ */+export const Issue_ApprovalStatusSchema = /*@__PURE__*/+ enumDesc(file_v1_issue_service, 12, 2);++/**+ * @generated from enum bytebase.v1.Issue.ApprovalStatus+ */+export const Issue_ApprovalStatus = /*@__PURE__*/+ tsEnum(Issue_ApprovalStatusSchema);+/*** Describes the message bytebase.v1.GrantRequest.* Use `create(GrantRequestSchema)` to create a new message.diff --git a/proto/gen/grpc-doc/v1/README.md b/proto/gen/grpc-doc/v1/README.mdindex a26b2f66d5..04512ba21a 100644--- a/proto/gen/grpc-doc/v1/README.md+++ b/proto/gen/grpc-doc/v1/README.md@@ -204,6 +204,7 @@- [ApprovalNode.Type](#bytebase-v1-ApprovalNode-Type)- [ApprovalStep.Type](#bytebase-v1-ApprovalStep-Type)+ - [Issue.ApprovalStatus](#bytebase-v1-Issue-ApprovalStatus)- [Issue.Approver.Status](#bytebase-v1-Issue-Approver-Status)- [Issue.RiskLevel](#bytebase-v1-Issue-RiskLevel)- [Issue.Type](#bytebase-v1-Issue-Type)@@ -3571,8 +3572,6 @@ LIST, HASH (https://www.postgresql.org/docs/current/ddl-partitioning.html)| status | [IssueStatus](#bytebase-v1-IssueStatus) | | || approvers | [Issue.Approver](#bytebase-v1-Issue-Approver) | repeated | || approval_templates | [ApprovalTemplate](#bytebase-v1-ApprovalTemplate) | repeated | |-| approval_finding_done | [bool](#bool) | | If the value is `false`, it means that the backend is still finding matching approval templates. If `true`, approval_templates & approvers & approval_finding_error are available. |-| approval_finding_error | [string](#string) | | || creator | [string](#string) | | Format: users/[email protected] || create_time | [google.protobuf.Timestamp](#google-protobuf-Timestamp) | | || update_time | [google.protobuf.Timestamp](#google-protobuf-Timestamp) | | |@@ -3583,6 +3582,8 @@ LIST, HASH (https://www.postgresql.org/docs/current/ddl-partitioning.html)| risk_level | [Issue.RiskLevel](#bytebase-v1-Issue-RiskLevel) | | || task_status_count | [Issue.TaskStatusCountEntry](#bytebase-v1-Issue-TaskStatusCountEntry) | repeated | The status count of the issue. Keys are the following: - NOT_STARTED - SKIPPED - PENDING - RUNNING - DONE - FAILED - CANCELED || labels | [string](#string) | repeated | |+| approval_status | [Issue.ApprovalStatus](#bytebase-v1-Issue-ApprovalStatus) | | |+| approval_status_error | [string](#string) | | Only populated when approval_status == ERROR |@@ -3965,6 +3966,23 @@ ANY means approving any node will proceed.+<a name="bytebase-v1-Issue-ApprovalStatus"></a>++### Issue.ApprovalStatus+++| Name | Number | Description |+| ---- | ------ | ----------- |+| APPROVAL_STATUS_UNSPECIFIED | 0 | |+| CHECKING | 1 | |+| PENDING | 2 | |+| APPROVED | 3 | |+| REJECTED | 4 | |+| SKIPPED | 5 | |+| ERROR | 6 | |+++<a name="bytebase-v1-Issue-Approver-Status"></a>### Issue.Approver.Statusdiff --git a/proto/gen/grpc-doc/v1/index.html b/proto/gen/grpc-doc/v1/index.htmlindex b5aa99539b..55ab757a56 100644--- a/proto/gen/grpc-doc/v1/index.html+++ b/proto/gen/grpc-doc/v1/index.html@@ -957,6 +957,10 @@<a href="#bytebase.v1.ApprovalStep.Type"><span class="badge">E</span>ApprovalStep.Type</a></li>+ <li>+ <a href="#bytebase.v1.Issue.ApprovalStatus"><span class="badge">E</span>Issue.ApprovalStatus</a>+ </li>+<li><a href="#bytebase.v1.Issue.Approver.Status"><span class="badge">E</span>Issue.Approver.Status</a></li>@@ -10813,21 +10817,6 @@ Format: projects/{project}/issues/{issue} </p></td><td><p> </p></td></tr>- <tr>- <td>approval_finding_done</td>- <td><a href="#bool">bool</a></td>- <td></td>- <td><p>If the value is `false`, it means that the backend is still finding matching approval templates.-If `true`, approval_templates & approvers & approval_finding_error are available. </p></td>- </tr>-- <tr>- <td>approval_finding_error</td>- <td><a href="#string">string</a></td>- <td></td>- <td><p> </p></td>- </tr>-<tr><td>creator</td><td><a href="#string">string</a></td>@@ -10917,6 +10906,20 @@ Keys are the following:<td><p> </p></td></tr>+ <tr>+ <td>approval_status</td>+ <td><a href="#bytebase.v1.Issue.ApprovalStatus">Issue.ApprovalStatus</a></td>+ <td></td>+ <td><p> </p></td>+ </tr>++ <tr>+ <td>approval_status_error</td>+ <td><a href="#string">string</a></td>+ <td></td>+ <td><p>Only populated when approval_status == ERROR </p></td>+ </tr>+</tbody></table>@@ -11818,6 +11821,59 @@ In this situation, `update_mask` is ignored. </p></td></tbody></table>+ <h3 id="bytebase.v1.Issue.ApprovalStatus">Issue.ApprovalStatus</h3>+ <p></p>+ <table class="enum-table">+ <thead>+ <tr><td>Name</td><td>Number</td><td>Description</td></tr>+ </thead>+ <tbody>++ <tr>+ <td>APPROVAL_STATUS_UNSPECIFIED</td>+ <td>0</td>+ <td><p></p></td>+ </tr>++ <tr>+ <td>CHECKING</td>+ <td>1</td>+ <td><p></p></td>+ </tr>++ <tr>+ <td>PENDING</td>+ <td>2</td>+ <td><p></p></td>+ </tr>++ <tr>+ <td>APPROVED</td>+ <td>3</td>+ <td><p></p></td>+ </tr>++ <tr>+ <td>REJECTED</td>+ <td>4</td>+ <td><p></p></td>+ </tr>++ <tr>+ <td>SKIPPED</td>+ <td>5</td>+ <td><p></p></td>+ </tr>++ <tr>+ <td>ERROR</td>+ <td>6</td>+ <td><p></p></td>+ </tr>++ </tbody>+ </table>+<h3 id="bytebase.v1.Issue.Approver.Status">Issue.Approver.Status</h3><p></p><table class="enum-table">diff --git a/proto/v1/v1/issue_service.proto b/proto/v1/v1/issue_service.protoindex d6ad7f4f5f..c9576e0122 100644--- a/proto/v1/v1/issue_service.proto+++ b/proto/v1/v1/issue_service.proto@@ -375,10 +375,7 @@ message Issue {repeated ApprovalTemplate approval_templates = 10;- // If the value is `false`, it means that the backend is still finding matching approval templates.- // If `true`, approval_templates & approvers & approval_finding_error are available.- bool approval_finding_done = 11;- string approval_finding_error = 12;+ reserved 11, 12;// Format: users/[email protected]string creator = 14 [(google.api.field_behavior) = OUTPUT_ONLY];@@ -430,6 +427,19 @@ message Issue {map<string, int32> task_status_count = 22;repeated string labels = 23;++ enum ApprovalStatus {+ APPROVAL_STATUS_UNSPECIFIED = 0;+ CHECKING = 1;+ PENDING = 2;+ APPROVED = 3;+ REJECTED = 4;+ SKIPPED = 5;+ ERROR = 6;+ }+ ApprovalStatus approval_status = 24 [(google.api.field_behavior) = OUTPUT_ONLY];+ // Only populated when approval_status == ERROR+ string approval_status_error = 25 [(google.api.field_behavior) = OUTPUT_ONLY];}message GrantRequest {