Skip to content

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

feat: create and hide draft review issues (#20842)

p0nye864890e643d
diff --git a/backend/api/mcp/gen/openapi.yaml b/backend/api/mcp/gen/openapi.yaml
index fff6a2260a..4863e370a5 100644
--- a/backend/api/mcp/gen/openapi.yaml
+++ b/backend/api/mcp/gen/openapi.yaml
@@ -12732,6 +12732,10 @@ components:
description: |-
The access grant associated with this issue.
Format: projects/{project}/accessGrants/{access_grant}
+ draft:
+ type: boolean
+ title: draft
+ description: Whether this issue is a Draft Review Issue.
title: Issue
additionalProperties: false
bytebase.v1.Issue.Approver:
diff --git a/backend/api/v1/issue_service.go b/backend/api/v1/issue_service.go
index 98e54a9bce..d88642b859 100644
--- a/backend/api/v1/issue_service.go
+++ b/backend/api/v1/issue_service.go
@@ -257,6 +257,7 @@ func (s *IssueService) ListIssues(ctx context.Context, req *connect.Request[v1pb
return nil, err
}
issueFind.ProjectIDs = []string{projectID}
+ issueFind.ExcludeDraft = true
orderByKeys, err := store.GetIssueOrders(req.Msg.OrderBy)
if err != nil {
@@ -336,6 +337,7 @@ func (s *IssueService) SearchIssues(ctx context.Context, req *connect.Request[v1
}
}
issueFind.ProjectIDs = projectIDs
+ issueFind.ExcludeDraft = true
issues, err := s.store.ListIssues(ctx, issueFind)
if err != nil {
@@ -398,7 +400,7 @@ func (s *IssueService) CreateIssue(ctx context.Context, req *connect.Request[v1p
}
issueLabels := store.CanonicalizeIssueLabels(req.Msg.Issue.Labels)
- if project.Setting.ForceIssueLabels && len(issueLabels) == 0 {
+ if !req.Msg.Issue.GetDraft() && project.Setting.ForceIssueLabels && len(issueLabels) == 0 {
return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("require issue labels"))
}
@@ -415,14 +417,38 @@ func (s *IssueService) CreateIssue(ctx context.Context, req *connect.Request[v1p
if err != nil {
return nil, err
}
- issue, err = s.store.CreateIssue(ctx, issue)
+ created := false
+ issueToCreate := issue
+ existing, err := s.findLinkedIssueForCreate(ctx, issueToCreate)
if err != nil {
- return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to create issue"))
+ return nil, err
+ }
+ if existing != nil {
+ issue = existing
+ } else {
+ issue, err = s.store.CreateIssue(ctx, issueToCreate)
+ if err != nil {
+ if errors.Is(err, store.ErrPlanHasRollout) {
+ return nil, connect.NewError(connect.CodeFailedPrecondition, errors.New("cannot create a draft issue because the plan already has a rollout"))
+ }
+ existing, lookupErr := s.findLinkedIssueForCreate(ctx, issueToCreate)
+ if lookupErr != nil {
+ return nil, lookupErr
+ }
+ if existing == nil {
+ return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to create issue"))
+ }
+ issue = existing
+ } else {
+ created = true
+ }
}
- issue, err = postCreateIssue(ctx, s.store, s.webhookManager, s.licenseService, s.bus, project, user.Name, user.Email, issue)
- if err != nil {
- return nil, connect.NewError(connect.CodeInternal, err)
+ if created && !issue.Payload.GetDraft() {
+ issue, err = postCreateIssue(ctx, s.store, s.webhookManager, s.licenseService, s.bus, project, user.Name, user.Email, issue)
+ if err != nil {
+ return nil, connect.NewError(connect.CodeInternal, err)
+ }
}
converted, err := s.convertToIssue(issue)
@@ -433,11 +459,43 @@ func (s *IssueService) CreateIssue(ctx context.Context, req *connect.Request[v1p
return connect.NewResponse(converted), nil
}
+func (s *IssueService) findLinkedIssueForCreate(ctx context.Context, issue *store.IssueMessage) (*store.IssueMessage, error) {
+ if issue.Type != storepb.Issue_DATABASE_CHANGE || issue.PlanUID == nil {
+ return nil, nil
+ }
+
+ existing, err := s.store.GetIssue(ctx, &store.FindIssueMessage{
+ Workspace: common.GetWorkspaceIDFromContext(ctx),
+ ProjectIDs: []string{issue.ProjectID},
+ PlanUID: issue.PlanUID,
+ })
+ if err != nil {
+ return nil, connect.NewError(connect.CodeInternal, errors.Wrap(err, "failed to find issue by plan"))
+ }
+ if existing == nil {
+ return nil, nil
+ }
+ if !existing.Payload.GetDraft() {
+ return nil, connect.NewError(connect.CodeAlreadyExists, errors.Errorf("plan %d already has a non-draft issue", *issue.PlanUID))
+ }
+ if !issue.Payload.GetDraft() {
+ return nil, connect.NewError(connect.CodeFailedPrecondition, errors.Errorf("plan %d already has a draft issue; update or submit the existing draft instead of creating another issue", *issue.PlanUID))
+ }
+ if existing.CreatorEmail != issue.CreatorEmail {
+ return nil, connect.NewError(connect.CodeAlreadyExists, errors.Errorf("plan %d already has a draft issue", *issue.PlanUID))
+ }
+ return existing, nil
+}
+
func (s *IssueService) buildIssueMessage(ctx context.Context, project *store.ProjectMessage, userEmail string, request *v1pb.CreateIssueRequest, labels []string) (*store.IssueMessage, error) {
var planUID *int64
var roleGrant *storepb.RoleGrant
var title, description string
+ if request.Issue.GetDraft() && request.Issue.Type != v1pb.Issue_DATABASE_CHANGE {
+ return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("draft issues must be database change issues"))
+ }
+
// Type-specific validation and preparation
switch request.Issue.Type {
case v1pb.Issue_DATABASE_EXPORT:
@@ -529,6 +587,11 @@ func (s *IssueService) buildIssueMessage(ctx context.Context, project *store.Pro
if plan == nil {
return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("plan %d not found in project %s", planID, project.ResourceID))
}
+ if request.Issue.GetDraft() {
+ if err := validateDraftReviewPlan(plan); err != nil {
+ return nil, connect.NewError(connect.CodeInvalidArgument, err)
+ }
+ }
for _, spec := range plan.Config.GetSpecs() {
if spec.GetExportDataConfig() != nil {
return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("data export issue creation is no longer supported"))
@@ -572,15 +635,61 @@ func (s *IssueService) buildIssueMessage(ctx context.Context, project *store.Pro
Approvers: nil,
},
Labels: labels,
+ Draft: request.Issue.GetDraft(),
},
}
return issue, nil
}
+func validateDraftReviewPlan(plan *store.PlanMessage) error {
+ if plan.Deleted {
+ return errors.Errorf("draft issues require an active plan")
+ }
+ specs := plan.Config.GetSpecs()
+ if len(specs) == 0 {
+ return errors.Errorf("draft issues require a database plan")
+ }
+
+ var kind string
+ for _, spec := range specs {
+ var specKind string
+ switch config := spec.Config.(type) {
+ case *storepb.PlanConfig_Spec_CreateDatabaseConfig:
+ specKind = "create database"
+ case *storepb.PlanConfig_Spec_ChangeDatabaseConfig:
+ if config.ChangeDatabaseConfig.GetRelease() != "" {
+ return errors.Errorf("draft issues are not supported for GitOps plans")
+ }
+ specKind = "change database"
+ case *storepb.PlanConfig_Spec_ExportDataConfig:
+ return errors.Errorf("draft issues are not supported for export plans")
+ default:
+ return errors.Errorf("draft issues require a database plan")
+ }
+ if kind == "" {
+ kind = specKind
+ } else if kind != specKind {
+ return errors.Errorf("draft issues are not supported for mixed plans")
+ }
+ }
+ return nil
+}
+
+func (s *IssueService) getSubmittedIssueForApprovalAction(ctx context.Context, name string) (*store.IssueMessage, error) {
+ issue, err := s.getIssueMessage(ctx, name)
+ if err != nil {
+ return nil, err
+ }
+ if issue.Payload.GetDraft() {
+ return nil, connect.NewError(connect.CodeFailedPrecondition, errors.New("draft issue must be submitted before approval actions are allowed"))
+ }
+ return issue, nil
+}
+
// ApproveIssue approves the approval flow of the issue.
func (s *IssueService) ApproveIssue(ctx context.Context, req *connect.Request[v1pb.ApproveIssueRequest]) (*connect.Response[v1pb.Issue], error) {
- issue, err := s.getIssueMessage(ctx, req.Msg.Name)
+ issue, err := s.getSubmittedIssueForApprovalAction(ctx, req.Msg.Name)
if err != nil {
return nil, err
}
@@ -702,7 +811,7 @@ func (s *IssueService) ApproveIssue(ctx context.Context, req *connect.Request[v1
// RejectIssue rejects a issue.
func (s *IssueService) RejectIssue(ctx context.Context, req *connect.Request[v1pb.RejectIssueRequest]) (*connect.Response[v1pb.Issue], error) {
- issue, err := s.getIssueMessage(ctx, req.Msg.Name)
+ issue, err := s.getSubmittedIssueForApprovalAction(ctx, req.Msg.Name)
if err != nil {
return nil, err
}
@@ -816,7 +925,7 @@ func (s *IssueService) RejectIssue(ctx context.Context, req *connect.Request[v1p
// RequestIssue requests a issue.
func (s *IssueService) RequestIssue(ctx context.Context, req *connect.Request[v1pb.RequestIssueRequest]) (*connect.Response[v1pb.Issue], error) {
- issue, err := s.getIssueMessage(ctx, req.Msg.Name)
+ issue, err := s.getSubmittedIssueForApprovalAction(ctx, req.Msg.Name)
if err != nil {
return nil, err
}
@@ -961,7 +1070,7 @@ func (s *IssueService) updateIssueApprovalPayload(ctx context.Context, issue *st
// 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)
+ issue, err := s.getSubmittedIssueForApprovalAction(ctx, req.Msg.Name)
if err != nil {
return nil, err
}
@@ -1233,6 +1342,10 @@ func (s *IssueService) UpdateIssue(ctx context.Context, req *connect.Request[v1p
}
func (s *IssueService) shouldResetApprovalForIssueLabels(ctx context.Context, issue *store.IssueMessage) (bool, error) {
+ if issue.Payload.GetDraft() {
+ return false, nil
+ }
+
if issue.Type != storepb.Issue_DATABASE_CHANGE || issue.PlanUID == nil {
return false, nil
}
diff --git a/backend/api/v1/issue_service_converter.go b/backend/api/v1/issue_service_converter.go
index 9d7bc6d8b6..bac26dc3fc 100644
--- a/backend/api/v1/issue_service_converter.go
+++ b/backend/api/v1/issue_service_converter.go
@@ -95,6 +95,7 @@ func (*IssueService) convertToIssue(issue *store.IssueMessage) (*v1pb.Issue, err
UpdateTime: timestamppb.New(issue.UpdatedAt),
RoleGrant: convertedRoleGrant,
Labels: issuePayload.Labels,
+ Draft: issuePayload.GetDraft(),
}
if issuePayload.AccessGrantId != "" {
diff --git a/backend/api/v1/issue_service_test.go b/backend/api/v1/issue_service_test.go
index b5c53a80a9..5fa1a4f826 100644
--- a/backend/api/v1/issue_service_test.go
+++ b/backend/api/v1/issue_service_test.go
@@ -3,9 +3,11 @@ package v1
import (
"context"
"fmt"
+ "sync"
"testing"
"connectrpc.com/connect"
+ "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"google.golang.org/protobuf/types/known/fieldmaskpb"
@@ -108,6 +110,180 @@ func TestCreateRolloutAndPendingTasksAllowsUnapprovedIssueWhenApprovalNotRequire
require.Equal(t, storepb.Issue_DONE, gotIssue.Status)
}
+func TestCreateRolloutAndPendingTasksRejectsDraft(t *testing.T) {
+ ctx := issueServiceTestContext()
+ stores := setupIssueServiceTestStore(ctx, t)
+ plan, issue := createIssueServiceApprovalIssue(ctx, t, stores)
+
+ draft, err := stores.UpdateIssue(ctx, issue.ProjectID, issue.UID, &store.UpdateIssueMessage{
+ PayloadUpsert: &storepb.Issue{Draft: true},
+ })
+ require.NoError(t, err)
+ require.True(t, draft.Payload.GetDraft())
+ require.False(t, plan.Config.GetHasRollout())
+ require.Equal(t, storepb.Issue_OPEN, draft.Status)
+
+ err = CreateRolloutAndPendingTasks(ctx, stores, "[email protected]", plan, draft, &store.ProjectMessage{
+ ResourceID: "project-a",
+ Setting: &storepb.Project{RequireIssueApproval: false},
+ }, []*store.TaskMessage{})
+
+ gotPlan, getPlanErr := stores.GetPlan(ctx, &store.FindPlanMessage{
+ ProjectID: "project-a",
+ UID: &plan.UID,
+ })
+ require.NoError(t, getPlanErr)
+ require.NotNil(t, gotPlan)
+ gotIssue := getIssueForTest(ctx, t, stores, draft.UID)
+ assert.Error(t, err)
+ assert.False(t, gotPlan.Config.GetHasRollout())
+ assert.Equal(t, storepb.Issue_OPEN, gotIssue.Status)
+ assert.True(t, gotIssue.Payload.GetDraft())
+}
+
+func TestCreateRolloutAndPendingTasksRejectsPersistedDraftWithStaleIssueSnapshot(t *testing.T) {
+ ctx := issueServiceTestContext()
+ stores := setupIssueServiceTestStore(ctx, t)
+ plan, issue := createIssueServiceApprovalIssue(ctx, t, stores)
+
+ draft, err := stores.UpdateIssue(ctx, issue.ProjectID, issue.UID, &store.UpdateIssueMessage{
+ PayloadUpsert: &storepb.Issue{Draft: true},
+ })
+ require.NoError(t, err)
+
+ err = CreateRolloutAndPendingTasks(ctx, stores, "[email protected]", plan, nil, &store.ProjectMessage{
+ ResourceID: "project-a",
+ Setting: &storepb.Project{RequireIssueApproval: false},
+ }, []*store.TaskMessage{})
+
+ require.ErrorIs(t, err, errDraftIssueNotSubmitted)
+ gotPlan, getPlanErr := stores.GetPlan(ctx, &store.FindPlanMessage{
+ ProjectID: "project-a",
+ UID: &plan.UID,
+ })
+ require.NoError(t, getPlanErr)
+ require.False(t, gotPlan.Config.GetHasRollout())
+ gotIssue := getIssueForTest(ctx, t, stores, draft.UID)
+ require.Equal(t, storepb.Issue_OPEN, gotIssue.Status)
+ require.True(t, gotIssue.Payload.GetDraft())
+}
+
+func TestCreateDraftAndRolloutAreSerialized(t *testing.T) {
+ ctx := issueServiceTestContext()
+ stores := setupIssueServiceTestStore(ctx, t)
+ service := newIssueServiceForTest(t, stores)
+
+ for i := range 10 {
+ t.Run(fmt.Sprintf("attempt-%d", i), func(t *testing.T) {
+ plan, err := stores.CreatePlan(ctx, &store.PlanMessage{
+ ProjectID: "project-a",
+ Name: "draft rollout race",
+ Config: &storepb.PlanConfig{
+ Specs: []*storepb.PlanConfig_Spec{{
+ Config: &storepb.PlanConfig_Spec_ChangeDatabaseConfig{
+ ChangeDatabaseConfig: &storepb.PlanConfig_ChangeDatabaseConfig{
+ SheetSha256: "sheet",
+ },
+ },
+ }},
+ },
+ require.NoError(t, err)
+
+ start := make(chan struct{})
+ draftResult := make(chan error, 1)
+ rolloutResult := make(chan error, 1)
+ go func() {
+ <-start
+ _, err := service.CreateIssue(ctx, connect.NewRequest(&v1pb.CreateIssueRequest{
+ Parent: "projects/project-a",
+ Issue: &v1pb.Issue{
+ Type: v1pb.Issue_DATABASE_CHANGE,
+ Plan: common.FormatPlan("project-a", plan.UID),
+ Draft: true,
+ },
+ }))
+ draftResult <- err
+ }()
+ go func() {
+ <-start
+ rolloutResult <- CreateRolloutAndPendingTasks(ctx, stores, "[email protected]", plan, nil, &store.ProjectMessage{
+ ResourceID: "project-a",
+ Setting: &storepb.Project{RequireIssueApproval: false},
+ }, []*store.TaskMessage{})
+ }()
+ close(start)
+ draftErr := <-draftResult
+ rolloutErr := <-rolloutResult
+
+ require.NotEqual(t, draftErr == nil, rolloutErr == nil)
+ if draftErr == nil {
+ require.ErrorIs(t, rolloutErr, errDraftIssueNotSubmitted)
+ } else {
+ require.Equal(t, connect.CodeFailedPrecondition, connect.CodeOf(draftErr))
+ require.NoError(t, rolloutErr)
+ }
+
+ gotPlan, err := stores.GetPlan(ctx, &store.FindPlanMessage{
+ ProjectID: "project-a",
+ UID: &plan.UID,
+ })
+ require.NoError(t, err)
+ linkedIssue, err := stores.GetIssue(ctx, &store.FindIssueMessage{
+ ProjectIDs: []string{"project-a"},
+ PlanUID: &plan.UID,
+ })
+ require.NoError(t, err)
+ require.NotEqual(t, gotPlan.Config.GetHasRollout(), linkedIssue != nil)
+ if linkedIssue != nil {
+ require.True(t, linkedIssue.Payload.GetDraft())
+ require.Equal(t, storepb.Issue_OPEN, linkedIssue.Status)
+ }
+ })
+ }
+}
+
+func TestCreateDraftIssueRejectedAfterRollout(t *testing.T) {
+ ctx := issueServiceTestContext()
+ stores := setupIssueServiceTestStore(ctx, t)
+ service := newIssueServiceForTest(t, stores)
+ plan, err := stores.CreatePlan(ctx, &store.PlanMessage{
+ ProjectID: "project-a",
+ Name: "rolled out plan",
+ Config: &storepb.PlanConfig{
+ Specs: []*storepb.PlanConfig_Spec{{
+ Config: &storepb.PlanConfig_Spec_ChangeDatabaseConfig{
+ ChangeDatabaseConfig: &storepb.PlanConfig_ChangeDatabaseConfig{
+ SheetSha256: "sheet",
+ },
+ },
+ }},
+ },
+ require.NoError(t, err)
+ require.NoError(t, CreateRolloutAndPendingTasks(ctx, stores, "[email protected]", plan, nil, &store.ProjectMessage{
+ ResourceID: "project-a",
+ Setting: &storepb.Project{RequireIssueApproval: false},
+ }, []*store.TaskMessage{}))
+
+ _, err = service.CreateIssue(ctx, connect.NewRequest(&v1pb.CreateIssueRequest{
+ Parent: "projects/project-a",
+ Issue: &v1pb.Issue{
+ Type: v1pb.Issue_DATABASE_CHANGE,
+ Plan: common.FormatPlan("project-a", plan.UID),
+ Draft: true,
+ },
+ }))
+
+ require.Equal(t, connect.CodeFailedPrecondition, connect.CodeOf(err))
+ linkedIssue, getErr := stores.GetIssue(ctx, &store.FindIssueMessage{
+ ProjectIDs: []string{"project-a"},
+ PlanUID: &plan.UID,
+ })
+ require.NoError(t, getErr)
+ require.Nil(t, linkedIssue)
+}
+
func TestUpdateIssueLabelsNoopDoesNotResetApproval(t *testing.T) {
ctx := issueServiceTestContext()
stores := setupIssueServiceTestStore(ctx, t)
@@ -138,6 +314,688 @@ func TestUpdateIssueLabelsDoesNotResetCreateDatabaseApproval(t *testing.T) {
require.Len(t, service.bus.ApprovalCheckChan, 0)
}
+func TestUpdateIssueLabelsOnDraftPreservesApproval(t *testing.T) {
+ ctx := issueServiceTestContext()
+ stores := setupIssueServiceTestStore(ctx, t)
+ service := newIssueServiceForTest(t, stores)
+ _, issue := createIssueServiceApprovalIssue(ctx, t, stores)
+
+ draft, err := stores.UpdateIssue(ctx, issue.ProjectID, issue.UID, &store.UpdateIssueMessage{
+ PayloadUpsert: &storepb.Issue{Draft: true},
+ })
+ require.NoError(t, err)
+ require.True(t, draft.Payload.GetDraft())
+ expectedApproval := draft.Payload.GetApproval()
+
+ updateIssueLabels(ctx, t, service, draft, []string{"environment:staging"})
+
+ got := getIssueForTest(ctx, t, stores, draft.UID)
+ assert.True(t, got.Payload.GetDraft())
+ assert.Equal(t, []string{"environment:staging"}, got.Payload.GetLabels())
+ assert.Equal(t, expectedApproval, got.Payload.GetApproval())
+ assert.Empty(t, service.bus.ApprovalCheckChan)
+}
+
+func TestRetryIssueApprovalRejectsDraft(t *testing.T) {
+ ctx := issueServiceTestContext()
+ stores := setupIssueServiceTestStore(ctx, t)
+ service := newIssueServiceForTest(t, stores)
+ _, issue := createIssueServiceApprovalIssue(ctx, t, stores)
+
+ draft, err := stores.UpdateIssue(ctx, issue.ProjectID, issue.UID, &store.UpdateIssueMessage{
+ PayloadUpsert: &storepb.Issue{Draft: true},
+ })
+ require.NoError(t, err)
+ require.True(t, draft.Payload.GetDraft())
+
+ _, err = service.RetryIssueApproval(ctx, connect.NewRequest(&v1pb.RetryIssueApprovalRequest{
+ Name: common.FormatIssue(draft.ProjectID, draft.UID),
+ }))
+
+ got := getIssueForTest(ctx, t, stores, draft.UID)
+ assert.Equal(t, connect.CodeFailedPrecondition, connect.CodeOf(err))
+ assert.True(t, got.Payload.GetDraft())
+ assert.Equal(t, draft.Payload.GetApproval(), got.Payload.GetApproval())
+ assert.Empty(t, service.bus.ApprovalCheckChan)
+}
+
+func TestDraftIssueApprovalActionsRejectedBeforeApprovalValidation(t *testing.T) {
+ ctx := issueServiceTestContext()
+ stores := setupIssueServiceTestStore(ctx, t)
+
+ tests := []struct {
+ name string
+ call func(service *IssueService, issueName string) error
+ }{
+ {
+ name: "approve",
+ call: func(service *IssueService, issueName string) error {
+ _, err := service.ApproveIssue(ctx, connect.NewRequest(&v1pb.ApproveIssueRequest{Name: issueName}))
+ return err
+ },
+ },
+ {
+ name: "reject",
+ call: func(service *IssueService, issueName string) error {
+ _, err := service.RejectIssue(ctx, connect.NewRequest(&v1pb.RejectIssueRequest{Name: issueName}))
+ return err
+ },
+ },
+ {
+ name: "request",
+ call: func(service *IssueService, issueName string) error {
+ _, err := service.RequestIssue(ctx, connect.NewRequest(&v1pb.RequestIssueRequest{Name: issueName}))
+ return err
+ },
+ },
+ }
+
+ for _, test := range tests {
+ t.Run(test.name, func(t *testing.T) {
+ service := newIssueServiceForTest(t, stores)
+ plan, err := stores.CreatePlan(ctx, &store.PlanMessage{
+ ProjectID: "project-a",
+ Name: fmt.Sprintf("%s draft approval plan", test.name),
+ Config: &storepb.PlanConfig{},
+ require.NoError(t, err)
+ draft, err := stores.CreateIssue(ctx, &store.IssueMessage{
+ ProjectID: "project-a",
+ CreatorEmail: "[email protected]",
+ Title: fmt.Sprintf("%s draft", test.name),
+ Type: storepb.Issue_DATABASE_CHANGE,
+ Payload: &storepb.Issue{Draft: true},
+ PlanUID: &plan.UID,
+ })
+ require.NoError(t, err)
+ require.True(t, draft.Payload.GetDraft())
+ require.Nil(t, draft.Payload.GetApproval())
+
+ err = test.call(service, common.FormatIssue(draft.ProjectID, draft.UID))
+
+ got := getIssueForTest(ctx, t, stores, draft.UID)
+ assert.Equal(t, connect.CodeFailedPrecondition, connect.CodeOf(err))
+ assert.Equal(t, draft, got)
+ assert.Empty(t, service.bus.ApprovalCheckChan)
+ assert.Empty(t, service.bus.RolloutCreationChan)
+ })
+ }
+}
+
+func TestCreateDraftIssue(t *testing.T) {
+ ctx := issueServiceTestContext()
+ stores := setupIssueServiceTestStore(ctx, t)
+ service := newIssueServiceForTest(t, stores)
+
+ plan, err := stores.CreatePlan(ctx, &store.PlanMessage{
+ ProjectID: "project-a",
+ Name: "draft plan",
+ Description: "draft description",
+ Config: &storepb.PlanConfig{
+ Specs: []*storepb.PlanConfig_Spec{
+ {
+ Config: &storepb.PlanConfig_Spec_ChangeDatabaseConfig{
+ ChangeDatabaseConfig: &storepb.PlanConfig_ChangeDatabaseConfig{
+ SheetSha256: "sheet",
+ Targets: []string{"instances/prod/databases/app"},
+ },
+ },
+ },
+ },
+ },
+ require.NoError(t, err)
+
+ response, err := service.CreateIssue(ctx, connect.NewRequest(&v1pb.CreateIssueRequest{
+ Parent: "projects/project-a",
+ Issue: &v1pb.Issue{
+ Type: v1pb.Issue_DATABASE_CHANGE,
+ Plan: common.FormatPlan("project-a", plan.UID),
+ Draft: true,
+ },
+ }))
+ require.NoError(t, err)
+ require.Equal(t, common.FormatPlan("project-a", plan.UID), response.Msg.Plan)
+ require.Equal(t, "draft plan", response.Msg.Title)
+ require.Equal(t, "draft description", response.Msg.Description)
+ require.True(t, response.Msg.Draft)
+
+ stored, err := stores.GetIssue(ctx, &store.FindIssueMessage{
+ ProjectIDs: []string{"project-a"},
+ PlanUID: &plan.UID,
+ })
+ require.NoError(t, err)
+ require.True(t, stored.Payload.GetDraft())
+
+ var rawDraft string
+ err = stores.GetDB().QueryRowContext(
+ ctx,
+ "SELECT payload->>'draft' FROM issue WHERE project = $1 AND id = $2",
+ "project-a",
+ stored.UID,
+ ).Scan(&rawDraft)
+ require.NoError(t, err)
+ require.Equal(t, "true", rawDraft)
+
+ _, err = stores.GetDB().ExecContext(
+ ctx,
+ "UPDATE project SET setting = jsonb_set(setting, '{forceIssueLabels}', 'true') WHERE resource_id = $1",
+ "project-a",
+ )
+ require.NoError(t, err)
+
+ createDatabasePlan, err := stores.CreatePlan(ctx, &store.PlanMessage{
+ ProjectID: "project-a",
+ Name: "create database draft",
+ Config: &storepb.PlanConfig{
+ Specs: []*storepb.PlanConfig_Spec{
+ {
+ Config: &storepb.PlanConfig_Spec_CreateDatabaseConfig{
+ CreateDatabaseConfig: &storepb.PlanConfig_CreateDatabaseConfig{
+ Target: "instances/prod",
+ Database: "app",
+ },
+ },
+ },
+ },
+ },
+ require.NoError(t, err)
+ createDatabaseDraft, err := service.CreateIssue(ctx, connect.NewRequest(&v1pb.CreateIssueRequest{
+ Parent: "projects/project-a",
+ Issue: &v1pb.Issue{
+ Type: v1pb.Issue_DATABASE_CHANGE,
+ Plan: common.FormatPlan("project-a", createDatabasePlan.UID),
+ Draft: true,
+ },
+ }))
+ require.NoError(t, err)
+ require.True(t, createDatabaseDraft.Msg.GetDraft())
+}
+
+func TestCreateDraftIssueIsIdempotent(t *testing.T) {
+ ctx := issueServiceTestContext()
+ stores := setupIssueServiceTestStore(ctx, t)
+ b, err := bus.New()
+ require.NoError(t, err)
+ service := NewIssueService(stores, nil, b, nil, nil)
+
+ plan, err := stores.CreatePlan(ctx, &store.PlanMessage{
+ ProjectID: "project-a",
+ Name: "idempotent draft plan",
+ Config: &storepb.PlanConfig{
+ Specs: []*storepb.PlanConfig_Spec{
+ {
+ Config: &storepb.PlanConfig_Spec_ChangeDatabaseConfig{
+ ChangeDatabaseConfig: &storepb.PlanConfig_ChangeDatabaseConfig{
+ SheetSha256: "sheet",
+ },
+ },
+ },
+ },
+ },
+ require.NoError(t, err)
+
+ first, err := service.CreateIssue(ctx, connect.NewRequest(&v1pb.CreateIssueRequest{
+ Parent: "projects/project-a",
+ Issue: &v1pb.Issue{
+ Title: "original title",
+ Description: "original description",
+ Type: v1pb.Issue_DATABASE_CHANGE,
+ Plan: common.FormatPlan("project-a", plan.UID),
+ Labels: []string{"original"},
+ Draft: true,
+ },
+ }))
+ require.NoError(t, err)
+
+ second, err := service.CreateIssue(ctx, connect.NewRequest(&v1pb.CreateIssueRequest{
+ Parent: "projects/project-a",
+ Issue: &v1pb.Issue{
+ Title: "replacement title",
+ Description: "replacement description",
+ Type: v1pb.Issue_DATABASE_CHANGE,
+ Plan: common.FormatPlan("project-a", plan.UID),
+ Labels: []string{"replacement"},
+ Draft: true,
+ },
+ }))
+ require.NoError(t, err)
+ require.Equal(t, first.Msg, second.Msg)
+ require.Empty(t, b.ApprovalCheckChan)
+
+ issues, err := stores.ListIssues(ctx, &store.FindIssueMessage{
+ ProjectIDs: []string{"project-a"},
+ PlanUID: &plan.UID,
+ })
+ require.NoError(t, err)
+ require.Len(t, issues, 1)
+ require.Equal(t, "original title", issues[0].Title)
+ require.Equal(t, "original description", issues[0].Description)
+ require.Equal(t, []string{"original"}, issues[0].Payload.GetLabels())
+
+ concurrentPlan, err := stores.CreatePlan(ctx, &store.PlanMessage{
+ ProjectID: "project-a",
+ Name: "concurrent draft plan",
+ Config: &storepb.PlanConfig{
+ Specs: []*storepb.PlanConfig_Spec{
+ {
+ Config: &storepb.PlanConfig_Spec_ChangeDatabaseConfig{
+ ChangeDatabaseConfig: &storepb.PlanConfig_ChangeDatabaseConfig{
+ SheetSha256: "sheet",
+ },
+ },
+ },
+ },
+ },
+ require.NoError(t, err)
+
+ type createResult struct {
+ response *connect.Response[v1pb.Issue]
+ err error
+ }
+ start := make(chan struct{})
+ results := make(chan createResult, 2)
+ var waitGroup sync.WaitGroup
+ for _, title := range []string{"first concurrent title", "second concurrent title"} {
+ waitGroup.Add(1)
+ go func() {
+ defer waitGroup.Done()
+ <-start
+ response, err := service.CreateIssue(ctx, connect.NewRequest(&v1pb.CreateIssueRequest{
+ Parent: "projects/project-a",
+ Issue: &v1pb.Issue{
+ Title: title,
+ Type: v1pb.Issue_DATABASE_CHANGE,
+ Plan: common.FormatPlan("project-a", concurrentPlan.UID),
+ Draft: true,
+ },
+ }))
+ results <- createResult{response: response, err: err}
+ }()
+ }
+ close(start)
+ waitGroup.Wait()
+ close(results)
+
+ var concurrentIssueName string
+ for result := range results {
+ require.NoError(t, result.err)
+ require.NotNil(t, result.response)
+ if concurrentIssueName == "" {
+ concurrentIssueName = result.response.Msg.GetName()
+ } else {
+ require.Equal(t, concurrentIssueName, result.response.Msg.GetName())
+ }
+ }
+ concurrentIssues, err := stores.ListIssues(ctx, &store.FindIssueMessage{
+ ProjectIDs: []string{"project-a"},
+ PlanUID: &concurrentPlan.UID,
+ })
+ require.NoError(t, err)
+ require.Len(t, concurrentIssues, 1)
+}
+
+func TestCreateDraftIssueDoesNotExposeAnotherCreatorsDraft(t *testing.T) {
+ ctx := issueServiceTestContext()
+ stores := setupIssueServiceTestStore(ctx, t)
+ service := newIssueServiceForTest(t, stores)
+ plan, err := stores.CreatePlan(ctx, &store.PlanMessage{
+ ProjectID: "project-a",
+ Name: "private draft plan",
+ Config: &storepb.PlanConfig{
+ Specs: []*storepb.PlanConfig_Spec{{
+ Config: &storepb.PlanConfig_Spec_ChangeDatabaseConfig{
+ ChangeDatabaseConfig: &storepb.PlanConfig_ChangeDatabaseConfig{
+ SheetSha256: "sheet",
+ },
+ },
+ }},
+ },
+ require.NoError(t, err)
+ existing, err := stores.CreateIssue(ctx, &store.IssueMessage{
+ ProjectID: "project-a",
+ CreatorEmail: "[email protected]",
+ Title: "private draft",
+ Type: storepb.Issue_DATABASE_CHANGE,
+ Payload: &storepb.Issue{Draft: true},
+ PlanUID: &plan.UID,
+ })
+ require.NoError(t, err)
+
+ otherCtx := context.WithValue(ctx, common.UserContextKey, &store.UserMessage{
+ Email: "[email protected]",
+ Name: "other",
+ })
+ response, err := service.CreateIssue(otherCtx, connect.NewRequest(&v1pb.CreateIssueRequest{
+ Parent: "projects/project-a",
+ Issue: &v1pb.Issue{
+ Type: v1pb.Issue_DATABASE_CHANGE,
+ Plan: common.FormatPlan("project-a", plan.UID),
+ Draft: true,
+ },
+ }))
+
+ require.Nil(t, response)
+ require.Equal(t, connect.CodeAlreadyExists, connect.CodeOf(err))
+ stored, getErr := stores.GetIssue(ctx, &store.FindIssueMessage{
+ ProjectIDs: []string{"project-a"},
+ PlanUID: &plan.UID,
+ })
+ require.NoError(t, getErr)
+ require.Equal(t, existing, stored)
+}
+
+func TestCreateSubmittedIssueBlockedByExistingDraft(t *testing.T) {
+ ctx := issueServiceTestContext()
+ stores := setupIssueServiceTestStore(ctx, t)
+ service := newIssueServiceForTest(t, stores)
+
+ plan, err := stores.CreatePlan(ctx, &store.PlanMessage{
+ ProjectID: "project-a",
+ Name: "draft conflict plan",
+ Config: &storepb.PlanConfig{
+ Specs: []*storepb.PlanConfig_Spec{
+ {
+ Config: &storepb.PlanConfig_Spec_ChangeDatabaseConfig{
+ ChangeDatabaseConfig: &storepb.PlanConfig_ChangeDatabaseConfig{
+ SheetSha256: "sheet",
+ },
+ },
+ },
+ },
+ },
+ require.NoError(t, err)
+ draft, err := stores.CreateIssue(ctx, &store.IssueMessage{
+ ProjectID: "project-a",
+ CreatorEmail: "[email protected]",
+ Title: "original draft",
+ Description: "original description",
+ Type: storepb.Issue_DATABASE_CHANGE,
+ Payload: &storepb.Issue{
+ Labels: []string{"original"},
+ Draft: true,
+ },
+ PlanUID: &plan.UID,
+ })
+ require.NoError(t, err)
+ require.True(t, draft.Payload.GetDraft())
+
+ _, err = service.CreateIssue(ctx, connect.NewRequest(&v1pb.CreateIssueRequest{
+ Parent: "projects/project-a",
+ Issue: &v1pb.Issue{
+ Title: "submitted replacement",
+ Description: "replacement description",
+ Type: v1pb.Issue_DATABASE_CHANGE,
+ Plan: common.FormatPlan("project-a", plan.UID),
+ Labels: []string{"replacement"},
+ Draft: false,
+ },
+ }))
+
+ issues, listErr := stores.ListIssues(ctx, &store.FindIssueMessage{
+ ProjectIDs: []string{"project-a"},
+ PlanUID: &plan.UID,
+ })
+ require.NoError(t, listErr)
+ assert.Equal(t, connect.CodeFailedPrecondition, connect.CodeOf(err))
+ assert.Len(t, issues, 1)
+ if assert.NotEmpty(t, issues) {
+ assert.Equal(t, draft, issues[0])
+ }
+ assert.Empty(t, service.bus.ApprovalCheckChan)
+}
+
+func TestCreateDraftIssueBlockedByExistingNonDraftIssue(t *testing.T) {
+ ctx := issueServiceTestContext()
+ stores := setupIssueServiceTestStore(ctx, t)
+ service := newIssueServiceForTest(t, stores)
+
+ plan, err := stores.CreatePlan(ctx, &store.PlanMessage{
+ ProjectID: "project-a",
+ Name: "submitted plan",
+ Config: &storepb.PlanConfig{
+ Specs: []*storepb.PlanConfig_Spec{
+ {
+ Config: &storepb.PlanConfig_Spec_ChangeDatabaseConfig{
+ ChangeDatabaseConfig: &storepb.PlanConfig_ChangeDatabaseConfig{
+ SheetSha256: "sheet",
+ },
+ },
+ },
+ },
+ },
+ require.NoError(t, err)
+
+ existing, err := stores.CreateIssue(ctx, &store.IssueMessage{
+ ProjectID: "project-a",
+ CreatorEmail: "[email protected]",
+ Title: "submitted issue",
+ Type: storepb.Issue_DATABASE_CHANGE,
+ Payload: &storepb.Issue{Labels: []string{"original"}},
+ PlanUID: &plan.UID,
+ })
+ require.NoError(t, err)
+ require.False(t, existing.Payload.GetDraft())
+
+ var hasDraft bool
+ err = stores.GetDB().QueryRowContext(
+ ctx,
+ "SELECT payload ? 'draft' FROM issue WHERE project = $1 AND id = $2",
+ "project-a",
+ existing.UID,
+ ).Scan(&hasDraft)
+ require.NoError(t, err)
+ require.False(t, hasDraft)
+
+ _, err = service.CreateIssue(ctx, connect.NewRequest(&v1pb.CreateIssueRequest{
+ Parent: "projects/project-a",
+ Issue: &v1pb.Issue{
+ Title: "draft replacement",
+ Type: v1pb.Issue_DATABASE_CHANGE,
+ Plan: common.FormatPlan("project-a", plan.UID),
+ Draft: true,
+ },
+ }))
+ require.Equal(t, connect.CodeAlreadyExists, connect.CodeOf(err))
+
+ stored, err := stores.GetIssue(ctx, &store.FindIssueMessage{
+ ProjectIDs: []string{"project-a"},
+ PlanUID: &plan.UID,
+ })
+ require.NoError(t, err)
+ require.Equal(t, existing.UID, stored.UID)
+ require.Equal(t, "submitted issue", stored.Title)
+ require.Equal(t, []string{"original"}, stored.Payload.GetLabels())
+ require.False(t, stored.Payload.GetDraft())
+
+ direct, err := service.GetIssue(ctx, connect.NewRequest(&v1pb.GetIssueRequest{
+ Name: common.FormatIssue("project-a", existing.UID),
+ }))
+ require.NoError(t, err)
+ require.False(t, direct.Msg.GetDraft())
+}
+
+func TestCreateDraftIssueRejectsUnsupportedWorkflows(t *testing.T) {
+ ctx := issueServiceTestContext()
+ stores := setupIssueServiceTestStore(ctx, t)
+ service := newIssueServiceForTest(t, stores)
+
+ createPlan := func(name string, specs ...*storepb.PlanConfig_Spec) *store.PlanMessage {
+ t.Helper()
+ plan, err := stores.CreatePlan(ctx, &store.PlanMessage{
+ ProjectID: "project-a",
+ Name: name,
+ Config: &storepb.PlanConfig{Specs: specs},
+ require.NoError(t, err)
+ return plan
+ }
+ changeSpec := func(release string) *storepb.PlanConfig_Spec {
+ return &storepb.PlanConfig_Spec{
+ Config: &storepb.PlanConfig_Spec_ChangeDatabaseConfig{
+ ChangeDatabaseConfig: &storepb.PlanConfig_ChangeDatabaseConfig{
+ SheetSha256: "sheet",
+ Release: release,
+ },
+ },
+ }
+ }
+ createSpec := func() *storepb.PlanConfig_Spec {
+ return &storepb.PlanConfig_Spec{
+ Config: &storepb.PlanConfig_Spec_CreateDatabaseConfig{
+ CreateDatabaseConfig: &storepb.PlanConfig_CreateDatabaseConfig{
+ Target: "instances/prod",
+ Database: "app",
+ },
+ },
+ }
+ }
+ exportSpec := func() *storepb.PlanConfig_Spec {
+ return &storepb.PlanConfig_Spec{
+ Config: &storepb.PlanConfig_Spec_ExportDataConfig{
+ ExportDataConfig: &storepb.PlanConfig_ExportDataConfig{
+ SheetSha256: "sheet",
+ },
+ },
+ }
+ }
+
+ validPlan := createPlan("valid", changeSpec(""))
+ gitOpsPlan := createPlan("gitops", changeSpec("projects/project-a/releases/release"))
+ mixedPlan := createPlan("mixed", createSpec(), changeSpec(""))
+ exportPlan := createPlan("export", exportSpec())
+
+ tests := []struct {
+ name string
+ issue *v1pb.Issue
+ }{
+ {
+ name: "no plan",
+ issue: &v1pb.Issue{
+ Type: v1pb.Issue_DATABASE_CHANGE,
+ Draft: true,
+ },
+ },
+ {
+ name: "GitOps plan",
+ issue: &v1pb.Issue{
+ Type: v1pb.Issue_DATABASE_CHANGE,
+ Plan: common.FormatPlan("project-a", gitOpsPlan.UID),
+ Draft: true,
+ },
+ },
+ {
+ name: "mixed plan",
+ issue: &v1pb.Issue{
+ Type: v1pb.Issue_DATABASE_CHANGE,
+ Plan: common.FormatPlan("project-a", mixedPlan.UID),
+ Draft: true,
+ },
+ },
+ {
+ name: "export plan",
+ issue: &v1pb.Issue{
+ Type: v1pb.Issue_DATABASE_CHANGE,
+ Plan: common.FormatPlan("project-a", exportPlan.UID),
+ Draft: true,
+ },
+ },
+ {
+ name: "non-database issue",
+ issue: &v1pb.Issue{
+ Title: "role request",
+ Type: v1pb.Issue_ROLE_GRANT,
+ Plan: common.FormatPlan("project-a", validPlan.UID),
+ Draft: true,
+ },
+ },
+ }
+
+ for _, test := range tests {
+ t.Run(test.name, func(t *testing.T) {
+ _, err := service.CreateIssue(ctx, connect.NewRequest(&v1pb.CreateIssueRequest{
+ Parent: "projects/project-a",
+ Issue: test.issue,
+ }))
+ require.Equal(t, connect.CodeInvalidArgument, connect.CodeOf(err))
+ })
+ }
+}
+
+func TestIssueListsHideDraftIssues(t *testing.T) {
+ ctx := issueServiceTestContext()
+ stores := setupIssueServiceTestStore(ctx, t)
+ service := newIssueServiceForTest(t, stores)
+
+ submittedPlan, err := stores.CreatePlan(ctx, &store.PlanMessage{
+ ProjectID: "project-a",
+ Name: "submitted plan",
+ Config: &storepb.PlanConfig{},
+ require.NoError(t, err)
+ submitted, err := stores.CreateIssue(ctx, &store.IssueMessage{
+ ProjectID: "project-a",
+ CreatorEmail: "[email protected]",
+ Title: "submitted",
+ Type: storepb.Issue_DATABASE_CHANGE,
+ Payload: &storepb.Issue{},
+ PlanUID: &submittedPlan.UID,
+ })
+ require.NoError(t, err)
+
+ draftPlan, err := stores.CreatePlan(ctx, &store.PlanMessage{
+ ProjectID: "project-a",
+ Name: "draft plan",
+ Config: &storepb.PlanConfig{},
+ require.NoError(t, err)
+ draft, err := stores.CreateIssue(ctx, &store.IssueMessage{
+ ProjectID: "project-a",
+ CreatorEmail: "[email protected]",
+ Title: "draft",
+ Type: storepb.Issue_DATABASE_CHANGE,
+ Payload: &storepb.Issue{Draft: true},
+ PlanUID: &draftPlan.UID,
+ })
+ require.NoError(t, err)
+
+ list, err := service.ListIssues(ctx, connect.NewRequest(&v1pb.ListIssuesRequest{
+ Parent: "projects/project-a",
+ PageSize: 1,
+ }))
+ require.NoError(t, err)
+ require.Equal(t, []string{common.FormatIssue("project-a", submitted.UID)}, issueNames(list.Msg.Issues))
+ require.Empty(t, list.Msg.GetNextPageToken())
+
+ search, err := service.SearchIssues(ctx, connect.NewRequest(&v1pb.SearchIssuesRequest{
+ Parent: "projects/project-a",
+ PageSize: 1,
+ }))
+ require.NoError(t, err)
+ require.Equal(t, []string{common.FormatIssue("project-a", submitted.UID)}, issueNames(search.Msg.Issues))
+ require.Empty(t, search.Msg.GetNextPageToken())
+
+ direct, err := service.GetIssue(ctx, connect.NewRequest(&v1pb.GetIssueRequest{
+ Name: common.FormatIssue("project-a", draft.UID),
+ }))
+ require.NoError(t, err)
+ require.True(t, direct.Msg.GetDraft())
+}
+
+func issueNames(issues []*v1pb.Issue) []string {
+ names := make([]string, 0, len(issues))
+ for _, issue := range issues {
+ names = append(names, issue.GetName())
+ }
+ return names
+}
+
func setupIssueServiceTestStore(ctx context.Context, t *testing.T) *store.Store {
t.Helper()
diff --git a/backend/api/v1/plan_service.go b/backend/api/v1/plan_service.go
index 11bf7eb7d4..e89b09fc15 100644
--- a/backend/api/v1/plan_service.go
+++ b/backend/api/v1/plan_service.go
@@ -462,6 +462,10 @@ func (s *PlanService) GetPlanCheckRun(ctx context.Context, request *connect.Requ
}
func resetIssueApprovalFindingIfPlanApprovalInputVersion(ctx context.Context, stores *store.Store, issue *store.IssueMessage, approvalInputVersion int64) (*store.IssueMessage, bool, error) {
+ if issue.Payload.GetDraft() {
+ return nil, false, nil
+ }
+
payloadPatch := &storepb.Issue{
Approval: &storepb.IssuePayloadApproval{
ApprovalFindingDone: false,
diff --git a/backend/api/v1/plan_service_test.go b/backend/api/v1/plan_service_test.go
index 151e4bee4c..cfff2dc501 100644
--- a/backend/api/v1/plan_service_test.go
+++ b/backend/api/v1/plan_service_test.go
@@ -150,6 +150,48 @@ func TestUpdateIssueApprovalResetSkipsStalePlanApprovalInputVersion(t *testing.T
require.EqualValues(t, 2, updatedIssue.Payload.GetApproval().GetApprovalInputVersion())
}
+func TestResetIssueApprovalFindingSkipsDraftIssue(t *testing.T) {
+ ctx := context.Background()
+ s := setupPlanServiceTestStore(ctx, t)
+
+ plan, err := s.CreatePlan(ctx, &store.PlanMessage{
+ ProjectID: "project-a",
+ Name: "plan-a",
+ Description: "",
+ Config: &storepb.PlanConfig{ApprovalInputVersion: 2},
+ require.NoError(t, err)
+
+ issue, err := s.CreateIssue(ctx, &store.IssueMessage{
+ ProjectID: "project-a",
+ CreatorEmail: "[email protected]",
+ Title: "draft issue",
+ Type: storepb.Issue_DATABASE_CHANGE,
+ Description: "",
+ Payload: &storepb.Issue{
+ Draft: true,
+ Approval: &storepb.IssuePayloadApproval{
+ ApprovalFindingDone: true,
+ ApprovalInputVersion: 1,
+ },
+ },
+ PlanUID: &plan.UID,
+ })
+ require.NoError(t, err)
+
+ updatedIssue, updated, err := resetIssueApprovalFindingIfPlanApprovalInputVersion(ctx, s, issue, 2)
+ require.NoError(t, err)
+ require.False(t, updated)
+ require.Nil(t, updatedIssue)
+
+ got, err := s.GetIssue(ctx, &store.FindIssueMessage{ProjectIDs: []string{"project-a"}, UID: &issue.UID})
+ require.NoError(t, err)
+ require.NotNil(t, got)
+ require.True(t, got.Payload.GetDraft())
+ require.True(t, got.Payload.GetApproval().GetApprovalFindingDone())
+ require.EqualValues(t, 1, got.Payload.GetApproval().GetApprovalInputVersion())
+}
+
func TestPlanServiceListPlansKeepsIssueLessDraftsVisible(t *testing.T) {
ctx := context.Background()
stores := setupPlanServiceTestStore(ctx, t)
diff --git a/backend/api/v1/rollout_service.go b/backend/api/v1/rollout_service.go
index a7a744c323..3bd6520311 100644
--- a/backend/api/v1/rollout_service.go
+++ b/backend/api/v1/rollout_service.go
@@ -42,13 +42,21 @@ type RolloutService struct {
iamManager *iam.Manager
}
-var errStaleRolloutApproval = errors.New("cannot create rollout because issue approval is stale")
+var (
+ errStaleRolloutApproval = errors.New("cannot create rollout because issue approval is stale")
+ errDraftIssueNotSubmitted = errors.New("cannot create rollout for a draft issue; submit it first")
+)
// IsStaleRolloutApprovalError reports whether rollout creation lost the approval-version race.
func IsStaleRolloutApprovalError(err error) bool {
return errors.Is(err, errStaleRolloutApproval)
}
+// IsDraftIssueNotSubmittedError reports whether rollout creation was blocked by a draft issue.
+func IsDraftIssueNotSubmittedError(err error) bool {
+ return errors.Is(err, errDraftIssueNotSubmitted)
+}
+
// NewRolloutService returns a rollout service instance.
func NewRolloutService(store *store.Store, dbFactory *dbfactory.DBFactory, bus *bus.Bus, webhookManager *webhook.Manager, iamManager *iam.Manager) *RolloutService {
return &RolloutService{
@@ -272,6 +280,9 @@ func (s *RolloutService) CreateRollout(ctx context.Context, req *connect.Request
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to find issue"))
}
+ if issue != nil && issue.Payload.GetDraft() {
+ return nil, connect.NewError(connect.CodeFailedPrecondition, errDraftIssueNotSubmitted)
+ }
// Check permission: allow if user has bb.rollouts.create permission
hasPermission, err := s.iamManager.CheckPermission(ctx, permission.RolloutsCreate, user, common.GetWorkspaceIDFromContext(ctx), project.ResourceID)
@@ -308,7 +319,7 @@ func (s *RolloutService) CreateRollout(ctx context.Context, req *connect.Request
}
if err := CreateRolloutAndPendingTasks(ctx, s.store, user.Email, plan, issue, project, tasks); err != nil {
- if IsStaleRolloutApprovalError(err) {
+ if IsStaleRolloutApprovalError(err) || IsDraftIssueNotSubmittedError(err) {
return nil, connect.NewError(connect.CodeFailedPrecondition, err)
}
return nil, connect.NewError(connect.CodeInternal, err)
@@ -400,6 +411,10 @@ func CreateRolloutAndPendingTasks(
project *store.ProjectMessage,
tasks []*store.TaskMessage,
) error {
+ if issue != nil && issue.Payload.GetDraft() {
+ return errDraftIssueNotSubmitted
+ }
+
var err error
if tasks == nil {
tasks, err = GetPipelineCreate(ctx, s, plan.Config.GetSpecs(), project.ResourceID)
@@ -424,6 +439,9 @@ func CreateRolloutAndPendingTasks(
}
marked, createdTasks, err := s.CreateRolloutTasks(ctx, project.ResourceID, plan.UID, issueApprovalGuard, tasks)
if err != nil {
+ if errors.Is(err, store.ErrDraftIssueNotSubmitted) {
+ return errDraftIssueNotSubmitted
+ }
return errors.Wrap(err, "failed to create rollout tasks")
}
if !marked {
diff --git a/backend/generated-go/store/issue.pb.go b/backend/generated-go/store/issue.pb.go
index 75d90054d9..61c7d8240d 100644
--- a/backend/generated-go/store/issue.pb.go
+++ b/backend/generated-go/store/issue.pb.go
@@ -152,6 +152,9 @@ type Issue struct {
RiskLevel RiskLevel `protobuf:"varint,4,opt,name=risk_level,json=riskLevel,proto3,enum=bytebase.store.RiskLevel" json:"risk_level,omitempty"`
// The access grant id for ACCESS_GRANT type issue.
AccessGrantId string `protobuf:"bytes,5,opt,name=access_grant_id,json=accessGrantId,proto3" json:"access_grant_id,omitempty"`
+ // Whether this issue is a Draft Review Issue.
+ // Missing from persisted payloads means false.
+ Draft bool `protobuf:"varint,6,opt,name=draft,proto3" json:"draft,omitempty"`
unknownFields protoimpl.UnknownFields
sizeCache protoimpl.SizeCache
}
@@ -221,6 +224,13 @@ func (x *Issue) GetAccessGrantId() string {
return ""
}
+func (x *Issue) GetDraft() bool {
+ if x != nil {
+ return x.Draft
+ }
+ return false
+}
+
// RoleGrant contains details for requesting a project role.
type RoleGrant struct {
state protoimpl.MessageState `protogen:"open.v1"`
@@ -300,7 +310,7 @@ var File_store_issue_proto protoreflect.FileDescriptor
const file_store_issue_proto_rawDesc = "" +
"\n" +
- "\x11store/issue.proto\x12\x0ebytebase.store\x1a\x1egoogle/protobuf/duration.proto\x1a\x16google/type/expr.proto\x1a\x14store/approval.proto\x1a\x12store/common.proto\"\xb7\x03\n" +
+ "\x11store/issue.proto\x12\x0ebytebase.store\x1a\x1egoogle/protobuf/duration.proto\x1a\x16google/type/expr.proto\x1a\x14store/approval.proto\x1a\x12store/common.proto\"\xcd\x03\n" +
"\x05Issue\x12@\n" +
"\bapproval\x18\x01 \x01(\v2$.bytebase.store.IssuePayloadApprovalR\bapproval\x128\n" +
"\n" +
@@ -308,7 +318,8 @@ const file_store_issue_proto_rawDesc = "" +
"\x06labels\x18\x03 \x03(\tR\x06labels\x128\n" +
"\n" +
"risk_level\x18\x04 \x01(\x0e2\x19.bytebase.store.RiskLevelR\triskLevel\x12&\n" +
- "\x0faccess_grant_id\x18\x05 \x01(\tR\raccessGrantId\"n\n" +
+ "\x0faccess_grant_id\x18\x05 \x01(\tR\raccessGrantId\x12\x14\n" +
+ "\x05draft\x18\x06 \x01(\bR\x05draft\"n\n" +
"\x04Type\x12\x1a\n" +
"\x16ISSUE_TYPE_UNSPECIFIED\x10\x00\x12\x13\n" +
"\x0fDATABASE_CHANGE\x10\x01\x12\x0e\n" +
diff --git a/backend/generated-go/store/issue_equal.pb.go b/backend/generated-go/store/issue_equal.pb.go
index daedd6fc8a..1047071b4f 100644
--- a/backend/generated-go/store/issue_equal.pb.go
+++ b/backend/generated-go/store/issue_equal.pb.go
@@ -35,6 +35,9 @@ func (x *Issue) Equal(y *Issue) bool {
if x.AccessGrantId != y.AccessGrantId {
return false
}
+ if x.Draft != y.Draft {
+ return false
+ }
return true
}
diff --git a/backend/generated-go/v1/issue_service.pb.go b/backend/generated-go/v1/issue_service.pb.go
index 24623e9f85..27c2fcf325 100644
--- a/backend/generated-go/v1/issue_service.pb.go
+++ b/backend/generated-go/v1/issue_service.pb.go
@@ -1132,7 +1132,9 @@ type Issue struct {
ApprovalStatus ApprovalStatus `protobuf:"varint,18,opt,name=approval_status,json=approvalStatus,proto3,enum=bytebase.v1.ApprovalStatus" json:"approval_status,omitempty"`
// The access grant associated with this issue.
// Format: projects/{project}/accessGrants/{access_grant}
- AccessGrant string `protobuf:"bytes,19,opt,name=access_grant,json=accessGrant,proto3" json:"access_grant,omitempty"`
+ AccessGrant string `protobuf:"bytes,19,opt,name=access_grant,json=accessGrant,proto3" json:"access_grant,omitempty"`
+ // Whether this issue is a Draft Review Issue.
+ Draft bool `protobuf:"varint,20,opt,name=draft,proto3" json:"draft,omitempty"`
unknownFields protoimpl.UnknownFields
sizeCache protoimpl.SizeCache
}
@@ -1279,6 +1281,13 @@ func (x *Issue) GetAccessGrant() string {
return ""
}
+func (x *Issue) GetDraft() bool {
+ if x != nil {
+ return x.Draft
+ }
+ return false
+}
+
type RoleGrant struct {
state protoimpl.MessageState `protogen:"open.v1"`
// The requested role.
@@ -2190,7 +2199,7 @@ const file_v1_issue_service_proto_rawDesc = "" +
"\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\"\xf2\b\n" +
+ "\x12bytebase.com/IssueR\x04name\"\x8d\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" +
@@ -2213,7 +2222,8 @@ const file_v1_issue_service_proto_rawDesc = "" +
"\x06labels\x18\x11 \x03(\tR\x06labels\x12I\n" +
"\x0fapproval_status\x18\x12 \x01(\x0e2\x1b.bytebase.v1.ApprovalStatusB\x03\xe0A\x03R\x0eapprovalStatus\x12C\n" +
"\faccess_grant\x18\x13 \x01(\tB \xe0A\x03\xfaA\x1a\n" +
- "\x18bytebase.com/AccessGrantR\vaccessGrant\x1a\xaf\x01\n" +
+ "\x18bytebase.com/AccessGrantR\vaccessGrant\x12\x19\n" +
+ "\x05draft\x18\x14 \x01(\bB\x03\xe0A\x01R\x05draft\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" +
diff --git a/backend/generated-go/v1/issue_service_equal.pb.go b/backend/generated-go/v1/issue_service_equal.pb.go
index 6c540745a1..08e42905ae 100644
--- a/backend/generated-go/v1/issue_service_equal.pb.go
+++ b/backend/generated-go/v1/issue_service_equal.pb.go
@@ -341,6 +341,9 @@ func (x *Issue) Equal(y *Issue) bool {
if x.AccessGrant != y.AccessGrant {
return false
}
+ if x.Draft != y.Draft {
+ return false
+ }
return true
}
diff --git a/backend/runner/approval/runner.go b/backend/runner/approval/runner.go
index 88058f9897..78b2548d8a 100644
--- a/backend/runner/approval/runner.go
+++ b/backend/runner/approval/runner.go
@@ -68,6 +68,9 @@ func (r *Runner) Run(ctx context.Context, wg *sync.WaitGroup) {
// This is a utility function that can be called synchronously (from issue creation)
// or asynchronously (from the event handler).
func FindAndApplyApprovalTemplate(ctx context.Context, stores *store.Store, webhookManager *webhook.Manager, licenseService *enterprise.LicenseService, issue *store.IssueMessage) error {
+ if issue.Payload.GetDraft() {
+ return nil
+ }
project, err := stores.GetProjectByResourceID(ctx, issue.ProjectID)
if err != nil {
return errors.Wrap(err, "failed to get project")
@@ -100,6 +103,9 @@ func (r *Runner) processIssue(ctx context.Context, ref bus.IssueRef) {
if issue == nil {
return // Issue deleted, nothing to do
}
+ if issue.Payload.GetDraft() {
+ return
+ }
project, err := r.store.GetProjectByResourceID(ctx, ref.ProjectID)
if err != nil {
@@ -164,6 +170,9 @@ func (r *Runner) processIssue(ctx context.Context, ref bus.IssueRef) {
}
func findApprovalTemplateForIssue(ctx context.Context, stores *store.Store, webhookManager *webhook.Manager, licenseService *enterprise.LicenseService, issue *store.IssueMessage, approvalSetting *storepb.WorkspaceApprovalSetting) error {
+ if issue.Payload.GetDraft() {
+ return nil
+ }
payload := issue.Payload
project, err := stores.GetProjectByResourceID(ctx, issue.ProjectID)
diff --git a/backend/runner/approval/runner_test.go b/backend/runner/approval/runner_test.go
index 18ec71396d..73ddd382a9 100644
--- a/backend/runner/approval/runner_test.go
+++ b/backend/runner/approval/runner_test.go
@@ -10,6 +10,7 @@ import (
"github.com/bytebase/bytebase/backend/common"
"github.com/bytebase/bytebase/backend/common/testcontainer"
+ "github.com/bytebase/bytebase/backend/component/bus"
"github.com/bytebase/bytebase/backend/enterprise"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
v1pb "github.com/bytebase/bytebase/backend/generated-go/v1"
@@ -609,6 +610,66 @@ func TestFindApprovalTemplateForIssueCompletesAfterRolloutWhenApprovalNotRequire
require.Nil(t, got.Payload.GetApproval().GetApprovalTemplate())
}
+func TestProcessIssueSkipsDraft(t *testing.T) {
+ ctx := context.Background()
+ s := setupApprovalRunnerStore(ctx, t)
+
+ plan, err := s.CreatePlan(ctx, &store.PlanMessage{
+ ProjectID: "project-a",
+ Name: "draft plan",
+ Config: &storepb.PlanConfig{
+ Specs: []*storepb.PlanConfig_Spec{{
+ Config: &storepb.PlanConfig_Spec_CreateDatabaseConfig{
+ CreateDatabaseConfig: &storepb.PlanConfig_CreateDatabaseConfig{
+ Target: "instances/prod",
+ Database: "app",
+ Environment: "prod",
+ },
+ },
+ }},
+ },
+ require.NoError(t, err)
+
+ issue, err := s.CreateIssue(ctx, &store.IssueMessage{
+ ProjectID: "project-a",
+ CreatorEmail: "[email protected]",
+ Title: "draft issue",
+ Type: storepb.Issue_DATABASE_CHANGE,
+ Payload: &storepb.Issue{Draft: true},
+ PlanUID: &plan.UID,
+ })
+ require.NoError(t, err)
+
+ b, err := bus.New()
+ require.NoError(t, err)
+ licenseService, err := enterprise.NewLicenseService(common.ReleaseModeDev, s, false, "")
+ require.NoError(t, err)
+
+ NewRunner(s, b, nil, licenseService).processIssue(ctx, bus.IssueRef{
+ ProjectID: issue.ProjectID,
+ UID: issue.UID,
+ })
+
+ gotIssue, err := s.GetIssue(ctx, &store.FindIssueMessage{
+ ProjectIDs: []string{issue.ProjectID},
+ UID: &issue.UID,
+ })
+ require.NoError(t, err)
+ require.NotNil(t, gotIssue)
+ require.True(t, gotIssue.Payload.GetDraft())
+ require.Nil(t, gotIssue.Payload.GetApproval())
+
+ gotPlan, err := s.GetPlan(ctx, &store.FindPlanMessage{
+ ProjectID: issue.ProjectID,
+ UID: &plan.UID,
+ })
+ require.NoError(t, err)
+ require.NotNil(t, gotPlan)
+ require.False(t, gotPlan.Config.GetHasRollout())
+ require.Empty(t, b.RolloutCreationChan)
+}
+
func setupApprovalRunnerStore(ctx context.Context, t *testing.T) *store.Store {
t.Helper()
diff --git a/backend/runner/plancheck/scheduler.go b/backend/runner/plancheck/scheduler.go
index b774bbfa47..9ebc0d77a3 100644
--- a/backend/runner/plancheck/scheduler.go
+++ b/backend/runner/plancheck/scheduler.go
@@ -194,7 +194,7 @@ func (s *Scheduler) markPlanCheckRunDone(ctx context.Context, projectID string,
log.BBError(err))
return
}
- if issue != nil && issue.PlanUID != nil {
+ if issue != nil && issue.PlanUID != nil && !issue.Payload.GetDraft() {
// Trigger approval finding.
s.bus.ApprovalCheckChan <- bus.IssueRef{ProjectID: projectID, UID: issue.UID}
}
diff --git a/backend/runner/plancheck/scheduler_test.go b/backend/runner/plancheck/scheduler_test.go
new file mode 100644
index 0000000000..8c0ae430d4
--- /dev/null
+++ b/backend/runner/plancheck/scheduler_test.go
@@ -0,0 +1,53 @@
+package plancheck
+
+import (
+ "context"
+ "testing"
+
+ "github.com/stretchr/testify/require"
+
+ "github.com/bytebase/bytebase/backend/component/bus"
+ storepb "github.com/bytebase/bytebase/backend/generated-go/store"
+ "github.com/bytebase/bytebase/backend/store"
+)
+
+func TestMarkPlanCheckRunDoneSkipsDraftIssue(t *testing.T) {
+ ctx := context.Background()
+ stores := setupPlancheckStore(ctx, t)
+ b, err := bus.New()
+ require.NoError(t, err)
+
+ plan, err := stores.CreatePlan(ctx, &store.PlanMessage{
+ ProjectID: "project-a",
+ Name: "draft plan",
+ Config: &storepb.PlanConfig{ApprovalInputVersion: 1},
+ require.NoError(t, err)
+ _, err = stores.CreateIssue(ctx, &store.IssueMessage{
+ ProjectID: "project-a",
+ CreatorEmail: "[email protected]",
+ Title: "draft issue",
+ Type: storepb.Issue_DATABASE_CHANGE,
+ Payload: &storepb.Issue{Draft: true},
+ PlanUID: &plan.UID,
+ })
+ require.NoError(t, err)
+ created, err := stores.CreatePlanCheckRun(ctx, &store.PlanCheckRunMessage{
+ ProjectID: "project-a",
+ PlanUID: plan.UID,
+ Result: &storepb.PlanCheckRunResult{ApprovalInputVersion: 1},
+ })
+ require.NoError(t, err)
+ require.True(t, created)
+ claimed, err := stores.ClaimAvailablePlanCheckRuns(ctx)
+ require.NoError(t, err)
+ require.Len(t, claimed, 1)
+
+ scheduler := NewScheduler(stores, b, nil, nil)
+ scheduler.markPlanCheckRunDone(ctx, "project-a", claimed[0].UID, plan.UID, 1, nil)
+
+ run, err := stores.GetPlanCheckRun(ctx, "project-a", plan.UID)
+ require.NoError(t, err)
+ require.Equal(t, store.PlanCheckRunStatusDone, run.Status)
+ require.Empty(t, b.ApprovalCheckChan)
+}
diff --git a/backend/runner/taskrun/rollout_creator.go b/backend/runner/taskrun/rollout_creator.go
index ec9b254fac..7a53dd7f01 100644
--- a/backend/runner/taskrun/rollout_creator.go
+++ b/backend/runner/taskrun/rollout_creator.go
@@ -99,6 +99,12 @@ func (rc *RolloutCreator) tryCreateRollout(ctx context.Context, ref bus.PlanRef)
slog.Debug("issue not found for rollout creation", slog.String("project", ref.ProjectID), slog.Int("plan_id", int(planID)))
return
}
+ if issue.Payload.GetDraft() {
+ slog.Debug("issue is a draft, skipping rollout creation",
+ slog.String("project", ref.ProjectID),
+ slog.Int("plan_id", int(planID)))
+ return
+ }
// Skip canceled issues
if issue.Status == storepb.Issue_CANCELED {
@@ -176,6 +182,12 @@ func (rc *RolloutCreator) tryCreateRollout(ctx context.Context, ref bus.PlanRef)
// Create rollout and pending tasks
// Use issue creator's email since this is auto-rollout for their issue
if err := apiv1.CreateRolloutAndPendingTasks(ctx, rc.store, issue.CreatorEmail, plan, issue, project, nil); err != nil {
+ if apiv1.IsDraftIssueNotSubmittedError(err) {
+ slog.Info("skip auto-rollout because issue is still a draft",
+ slog.String("project", ref.ProjectID),
+ slog.Int("plan_id", int(planID)))
+ return
+ }
if apiv1.IsStaleRolloutApprovalError(err) {
slog.Info("skip auto-rollout because issue approval is stale",
slog.String("project", ref.ProjectID),
diff --git a/backend/runner/taskrun/rollout_creator_test.go b/backend/runner/taskrun/rollout_creator_test.go
index 0facc422e0..e88d9d138b 100644
--- a/backend/runner/taskrun/rollout_creator_test.go
+++ b/backend/runner/taskrun/rollout_creator_test.go
@@ -1,11 +1,16 @@
package taskrun
import (
+ "context"
+ "fmt"
"testing"
"github.com/stretchr/testify/require"
+ "github.com/bytebase/bytebase/backend/common/testcontainer"
+ "github.com/bytebase/bytebase/backend/component/bus"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
+ "github.com/bytebase/bytebase/backend/migrator"
"github.com/bytebase/bytebase/backend/store"
)
@@ -24,3 +29,123 @@ func TestPlanCheckRunBlocksRolloutIgnoresStaleVersion(t *testing.T) {
Result: &storepb.PlanCheckRunResult{ApprovalInputVersion: 2},
}))
}
+
+func TestTryCreateRolloutSkipsDraft(t *testing.T) {
+ ctx := context.Background()
+ s := setupRolloutCreatorStore(ctx, t)
+ require.NoError(t, s.UpdateProjects(ctx, &store.UpdateProjectMessage{
+ ResourceID: "project-a",
+ Workspace: "default",
+ Setting: &storepb.Project{RequireIssueApproval: false},
+ }))
+
+ environment := "prod"
+ _, err := s.CreateInstance(ctx, &store.InstanceMessage{
+ ResourceID: "prod",
+ Workspace: "default",
+ EnvironmentID: &environment,
+ Metadata: &storepb.Instance{
+ Engine: storepb.Engine_POSTGRES,
+ DataSources: []*storepb.DataSource{{Id: "admin", Type: storepb.DataSourceType_ADMIN}},
+ },
+ })
+ require.NoError(t, err)
+ _, err = s.UpsertDatabase(ctx, &store.DatabaseMessage{
+ ProjectID: "project-a",
+ InstanceID: "prod",
+ DatabaseName: "app",
+ Metadata: &storepb.DatabaseMetadata{Labels: map[string]string{}},
+ })
+ require.NoError(t, err)
+
+ plan, err := s.CreatePlan(ctx, &store.PlanMessage{
+ ProjectID: "project-a",
+ Name: "draft plan",
+ Config: &storepb.PlanConfig{
+ ApprovalInputVersion: 2,
+ Specs: []*storepb.PlanConfig_Spec{{
+ Id: "change",
+ Config: &storepb.PlanConfig_Spec_ChangeDatabaseConfig{
+ ChangeDatabaseConfig: &storepb.PlanConfig_ChangeDatabaseConfig{
+ Targets: []string{"instances/prod/databases/app"},
+ },
+ },
+ }},
+ },
+ require.NoError(t, err)
+
+ issue, err := s.CreateIssue(ctx, &store.IssueMessage{
+ ProjectID: "project-a",
+ CreatorEmail: "[email protected]",
+ Title: "draft issue",
+ Type: storepb.Issue_DATABASE_CHANGE,
+ Payload: &storepb.Issue{
+ Draft: true,
+ Approval: &storepb.IssuePayloadApproval{
+ ApprovalFindingDone: true,
+ ApprovalInputVersion: 2,
+ },
+ },
+ PlanUID: &plan.UID,
+ })
+ require.NoError(t, err)
+
+ b, err := bus.New()
+ require.NoError(t, err)
+ NewRolloutCreator(s, b, nil).tryCreateRollout(ctx, bus.PlanRef{
+ ProjectID: plan.ProjectID,
+ PlanID: plan.UID,
+ })
+
+ gotPlan, err := s.GetPlan(ctx, &store.FindPlanMessage{
+ ProjectID: plan.ProjectID,
+ UID: &plan.UID,
+ })
+ require.NoError(t, err)
+ require.NotNil(t, gotPlan)
+ require.False(t, gotPlan.Config.GetHasRollout())
+
+ tasks, err := s.ListTasks(ctx, &store.TaskFind{
+ ProjectID: plan.ProjectID,
+ PlanID: &plan.UID,
+ })
+ require.NoError(t, err)
+ require.Empty(t, tasks)
+
+ gotIssue, err := s.GetIssue(ctx, &store.FindIssueMessage{
+ ProjectIDs: []string{issue.ProjectID},
+ PlanUID: &plan.UID,
+ })
+ require.NoError(t, err)
+ require.NotNil(t, gotIssue)
+ require.True(t, gotIssue.Payload.GetDraft())
+ require.Equal(t, storepb.Issue_OPEN, gotIssue.Status)
+ require.Empty(t, b.TaskRunTickleChan)
+}
+
+func setupRolloutCreatorStore(ctx context.Context, t *testing.T) *store.Store {
+ t.Helper()
+
+ container := testcontainer.GetTestPgContainer(ctx, t)
+ t.Cleanup(func() { container.Close(ctx) })
+
+ db := container.GetDB()
+ require.NoError(t, migrator.MigrateSchema(ctx, db))
+
+ _, err := db.ExecContext(ctx, `
+ INSERT INTO workspace (resource_id) VALUES ('default');
+ INSERT INTO principal (name, email, password_hash) VALUES ('creator', '[email protected]', 'unused');
+ INSERT INTO project (resource_id, workspace, name) VALUES ('project-a', 'default', 'Project A');
+ `)
+ require.NoError(t, err)
+
+ pgURL := fmt.Sprintf(
+ "host=%s port=%s user=postgres password=root-password database=postgres",
+ container.GetHost(), container.GetPort(),
+ )
+ s, err := store.New(ctx, pgURL, false)
+ require.NoError(t, err)
+ t.Cleanup(func() { require.NoError(t, s.Close()) })
+ return s
+}
diff --git a/backend/store/advisory_lock.go b/backend/store/advisory_lock.go
index 7220a64196..c21169c8ba 100644
--- a/backend/store/advisory_lock.go
+++ b/backend/store/advisory_lock.go
@@ -3,6 +3,7 @@ package store
import (
"context"
"database/sql"
+ "strconv"
)
// AdvisoryLockKey defines lock identifiers for distributed coordination.
@@ -22,8 +23,16 @@ const (
// AdvisoryLockKeyVCSProviderUser is used as the namespace for active VCS
// provider user limit checks and upserts.
AdvisoryLockKeyVCSProviderUser AdvisoryLockKey = 1004
+ // AdvisoryLockKeyPlanIssueRollout serializes linked issue creation and
+ // rollout creation for the same plan.
+ AdvisoryLockKeyPlanIssueRollout AdvisoryLockKey = 1005
)
+func acquirePlanIssueRolloutAdvisoryLock(ctx context.Context, tx *sql.Tx, projectID string, planUID int64) error {
+ key := projectID + "/" + strconv.FormatInt(planUID, 10)
+ return AcquireAdvisoryXactLockWithStringKey(ctx, tx, AdvisoryLockKeyPlanIssueRollout, key)
+}
+
// AdvisoryLock holds a dedicated connection for a session-level advisory lock.
type AdvisoryLock struct {
conn *sql.Conn
diff --git a/backend/store/issue.go b/backend/store/issue.go
index 83bd08d8e2..18616265ee 100644
--- a/backend/store/issue.go
+++ b/backend/store/issue.go
@@ -122,7 +122,8 @@ type FindIssueMessage struct {
Limit *int
Offset *int
- Query *string
+ Query *string
+ ExcludeDraft bool
LabelList []string
RiskLevelList []storepb.RiskLevel
@@ -189,6 +190,25 @@ func (s *Store) CreateIssue(ctx context.Context, create *IssueMessage) (*IssueMe
}
defer tx.Rollback()
+ if create.PlanUID != nil {
+ if err := acquirePlanIssueRolloutAdvisoryLock(ctx, tx, create.ProjectID, *create.PlanUID); err != nil {
+ return nil, errors.Wrap(err, "failed to acquire plan issue-rollout lock")
+ }
+
+ var hasRollout bool
+ if err := tx.QueryRowContext(ctx, `
+ SELECT COALESCE((config->>'hasRollout')::boolean, false)
+ FROM plan
+ WHERE project = $1
+ AND id = $2`,
+ create.ProjectID, *create.PlanUID).Scan(&hasRollout); err != nil {
+ return nil, errors.Wrapf(err, "failed to get plan %d", *create.PlanUID)
+ }
+ if create.Payload.GetDraft() && hasRollout {
+ return nil, ErrPlanHasRollout
+ }
+ }
+
nextID, err := nextProjectID(ctx, tx, "issue", create.ProjectID)
if err != nil {
return nil, err
@@ -584,6 +604,9 @@ func (s *Store) ListIssues(ctx context.Context, find *FindIssueMessage) ([]*Issu
}
where.And("payload->>'riskLevel' = ANY(?)", riskLevelStrings)
}
+ if find.ExcludeDraft {
+ where.And("COALESCE(issue.payload->>'draft', 'false') = 'false'")
+ }
if len(find.OrderByKeys) > 0 && orderByClause == "ORDER BY issue.id DESC" {
parts := make([]string, 0, len(find.OrderByKeys)+1)
diff --git a/backend/store/task.go b/backend/store/task.go
index b28389932a..8c9b0e508a 100644
--- a/backend/store/task.go
+++ b/backend/store/task.go
@@ -78,6 +78,10 @@ type TaskStatusCount struct {
Count int32
}
+// ErrDraftIssueNotSubmitted indicates rollout creation was rejected because its
+// currently linked issue is still a draft.
+var ErrDraftIssueNotSubmitted = errors.New("draft issue must be submitted before rollout creation")
+
// IssueApprovalGuard carries the approval-input version used for rollout
// creation. When issue approval is required, it also carries the issue approval
// snapshot that the API layer has already accepted. The store uses it only as a
@@ -518,31 +522,47 @@ func (s *Store) CreateRolloutTasks(ctx context.Context, projectID string, planUI
}
defer tx.Rollback()
+ if err := acquirePlanIssueRolloutAdvisoryLock(ctx, tx, projectID, planUID); err != nil {
+ return false, nil, errors.Wrap(err, "failed to acquire plan issue-rollout lock")
+ }
+
var approvalInputVersion *int64
if issueApprovalGuard != nil {
approvalInputVersion = &issueApprovalGuard.ApprovalInputVersion
}
- if issueApprovalGuard != nil && issueApprovalGuard.Approval != nil {
- var payload []byte
- if err := tx.QueryRowContext(ctx, `
- SELECT payload
- FROM issue
- WHERE project = $1
- AND id = $2
- AND plan_id = $3
- FOR UPDATE`,
- projectID, issueApprovalGuard.IssueUID, planUID).Scan(&payload); err != nil {
- if errors.Is(err, sql.ErrNoRows) {
- return false, nil, nil
- }
- return false, nil, errors.Wrapf(err, "failed to lock issue approval")
+ var currentIssueUID int64
+ var payload []byte
+ issueFound := true
+ if err := tx.QueryRowContext(ctx, `
+ SELECT id, payload
+ FROM issue
+ WHERE project = $1
+ AND plan_id = $2
+ FOR UPDATE`,
+ projectID, planUID).Scan(&currentIssueUID, &payload); err != nil {
+ if errors.Is(err, sql.ErrNoRows) {
+ issueFound = false
+ } else {
+ return false, nil, errors.Wrap(err, "failed to lock linked issue")
}
- current, err := isIssueApprovalPayloadSameAsGuard(payload, issueApprovalGuard)
- if err != nil {
- return false, nil, err
+ }
+
+ currentIssuePayload := &storepb.Issue{}
+ if issueFound {
+ if err := common.ProtojsonUnmarshaler.Unmarshal(payload, currentIssuePayload); err != nil {
+ return false, nil, errors.Wrap(err, "failed to unmarshal issue payload")
+ }
+ if currentIssuePayload.GetDraft() {
+ return false, nil, ErrDraftIssueNotSubmitted
}
- if !current {
+ }
+
+ if issueApprovalGuard != nil && issueApprovalGuard.Approval != nil {
+ if !issueFound || currentIssueUID != issueApprovalGuard.IssueUID {
+ return false, nil, nil
+ }
+ if !isIssueApprovalPayloadSameAsGuard(currentIssuePayload, issueApprovalGuard) {
return false, nil, nil
}
}
@@ -584,22 +604,18 @@ func (s *Store) CreateRolloutTasks(ctx context.Context, projectID string, planUI
return true, tasks, nil
}
-func isIssueApprovalPayloadSameAsGuard(payload []byte, guard *IssueApprovalGuard) (bool, error) {
- if guard == nil || guard.Approval == nil {
- return false, nil
+func isIssueApprovalPayloadSameAsGuard(issuePayload *storepb.Issue, guard *IssueApprovalGuard) bool {
+ if issuePayload == nil || guard == nil || guard.Approval == nil {
+ return false
}
if guard.Approval.GetApprovalInputVersion() != guard.ApprovalInputVersion {
- return false, nil
- }
- issuePayload := &storepb.Issue{}
- if err := common.ProtojsonUnmarshaler.Unmarshal(payload, issuePayload); err != nil {
- return false, errors.Wrap(err, "failed to unmarshal issue payload")
+ return false
}
approval := issuePayload.GetApproval()
if approval == nil || !approval.GetApprovalFindingDone() {
- return false, nil
+ return false
}
- return approval.Equal(guard.Approval), nil
+ return approval.Equal(guard.Approval)
}
func (s *Store) createTasksTxDedup(ctx context.Context, tx *sql.Tx, projectID string, planUID int64, tasks []*TaskMessage) ([]*TaskMessage, error) {
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 d937463151..d5f6d37b47 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
@@ -573,6 +573,13 @@ export declare type Issue = Message<"bytebase.v1.Issue"> & {
* @generated from field: string access_grant = 19;
*/
accessGrant: string;
+
+ /**
+ * Whether this issue is a Draft Review Issue.
+ *
+ * @generated from field: bool draft = 20;
+ */
+ draft: boolean;
};
/**
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 0338177d02..2d072e04a9 100644
--- a/frontend/src/types/proto-es/v1/issue_service_pb.js
+++ b/frontend/src/types/proto-es/v1/issue_service_pb.js
@@ -18,7 +18,7 @@ import { file_v1_plan_service } from "./plan_service_pb";
* Describes the file v1/issue_service.proto.
*/
export const file_v1_issue_service = /*@__PURE__*/
- fileDesc("ChZ2MS9pc3N1ZV9zZXJ2aWNlLnByb3RvEgtieXRlYmFzZS52MSJKCg9HZXRJc3N1ZVJlcXVlc3QSKAoEbmFtZRgBIAEoCUIa4EEC+kEUChJieXRlYmFzZS5jb20vSXNzdWUSDQoFZm9yY2UYAiABKAgiagoSQ3JlYXRlSXNzdWVSZXF1ZXN0EiwKBnBhcmVudBgBIAEoCUIc4EEC+kEWChRieXRlYmFzZS5jb20vUHJvamVjdBImCgVpc3N1ZRgCIAEoCzISLmJ5dGViYXNlLnYxLklzc3VlQgPgQQIimQEKEUxpc3RJc3N1ZXNSZXF1ZXN0EiwKBnBhcmVudBgBIAEoCUIc4EEC+kEWChRieXRlYmFzZS5jb20vUHJvamVjdBIRCglwYWdlX3NpemUYAiABKAUSEgoKcGFnZV90b2tlbhgDIAEoCRIOCgZmaWx0ZXIYBCABKAkSDQoFcXVlcnkYBSABKAkSEAoIb3JkZXJfYnkYBiABKAkiUQoSTGlzdElzc3Vlc1Jlc3BvbnNlEiIKBmlzc3VlcxgBIAMoCzISLmJ5dGViYXNlLnYxLklzc3VlEhcKD25leHRfcGFnZV90b2tlbhgCIAEoCSKCAQoTU2VhcmNoSXNzdWVzUmVxdWVzdBITCgZwYXJlbnQYASABKAlCA+BBAhIRCglwYWdlX3NpemUYAiABKAUSEgoKcGFnZV90b2tlbhgDIAEoCRIOCgZmaWx0ZXIYBCABKAkSDQoFcXVlcnkYBSABKAkSEAoIb3JkZXJfYnkYBiABKAkiUwoUU2VhcmNoSXNzdWVzUmVzcG9uc2USIgoGaXNzdWVzGAEgAygLMhIuYnl0ZWJhc2UudjEuSXNzdWUSFwoPbmV4dF9wYWdlX3Rva2VuGAIgASgJIqABChJVcGRhdGVJc3N1ZVJlcXVlc3QSPQoFaXNzdWUYASABKAsyEi5ieXRlYmFzZS52MS5Jc3N1ZUIa4EEC+kEUChJieXRlYmFzZS5jb20vSXNzdWUSNAoLdXBkYXRlX21hc2sYAiABKAsyGi5nb29nbGUucHJvdG9idWYuRmllbGRNYXNrQgPgQQISFQoNYWxsb3dfbWlzc2luZxgDIAEoCCKYAQoeQmF0Y2hVcGRhdGVJc3N1ZXNTdGF0dXNSZXF1ZXN0EiwKBnBhcmVudBgBIAEoCUIc4EEC+kEWChRieXRlYmFzZS5jb20vUHJvamVjdBIOCgZpc3N1ZXMYAiADKAkSKAoGc3RhdHVzGAMgASgOMhguYnl0ZWJhc2UudjEuSXNzdWVTdGF0dXMSDgoGcmVhc29uGAQgASgJIiEKH0JhdGNoVXBkYXRlSXNzdWVzU3RhdHVzUmVzcG9uc2UiUAoTQXBwcm92ZUlzc3VlUmVxdWVzdBIoCgRuYW1lGAEgASgJQhrgQQL6QRQKEmJ5dGViYXNlLmNvbS9Jc3N1ZRIPCgdjb21tZW50GAIgASgJIk8KElJlamVjdElzc3VlUmVxdWVzdBIoCgRuYW1lGAEgASgJQhrgQQL6QRQKEmJ5dGViYXNlLmNvbS9Jc3N1ZRIPCgdjb21tZW50GAIgASgJIlAKE1JlcXVlc3RJc3N1ZVJlcXVlc3QSKAoEbmFtZRgBIAEoCUIa4EEC+kEUChJieXRlYmFzZS5jb20vSXNzdWUSDwoHY29tbWVudBgCIAEoCSJFChlSZXRyeUlzc3VlQXBwcm92YWxSZXF1ZXN0EigKBG5hbWUYASABKAlCGuBBAvpBFAoSYnl0ZWJhc2UuY29tL0lzc3VlIrgHCgVJc3N1ZRIMCgRuYW1lGAEgASgJEhcKBXRpdGxlGAIgASgJQgi6SAVyAxjIARIdCgtkZXNjcmlwdGlvbhgDIAEoCUIIukgFcgMYkE4SJQoEdHlwZRgEIAEoDjIXLmJ5dGViYXNlLnYxLklzc3VlLlR5cGUSKAoGc3RhdHVzGAUgASgOMhguYnl0ZWJhc2UudjEuSXNzdWVTdGF0dXMSLgoJYXBwcm92ZXJzGAYgAygLMhsuYnl0ZWJhc2UudjEuSXNzdWUuQXBwcm92ZXISOAoRYXBwcm92YWxfdGVtcGxhdGUYByABKAsyHS5ieXRlYmFzZS52MS5BcHByb3ZhbFRlbXBsYXRlEhQKB2NyZWF0b3IYCCABKAlCA+BBAxI0CgtjcmVhdGVfdGltZRgJIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBCA+BBAxI0Cgt1cGRhdGVfdGltZRgKIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBCA+BBAxIMCgRwbGFuGAsgASgJEioKCnJvbGVfZ3JhbnQYDSABKAsyFi5ieXRlYmFzZS52MS5Sb2xlR3JhbnQSKgoKcmlza19sZXZlbBgPIAEoDjIWLmJ5dGViYXNlLnYxLlJpc2tMZXZlbBIOCgZsYWJlbHMYESADKAkSOQoPYXBwcm92YWxfc3RhdHVzGBIgASgOMhsuYnl0ZWJhc2UudjEuQXBwcm92YWxTdGF0dXNCA+BBAxI2CgxhY2Nlc3NfZ3JhbnQYEyABKAlCIOBBA/pBGgoYYnl0ZWJhc2UuY29tL0FjY2Vzc0dyYW50GpwBCghBcHByb3ZlchIyCgZzdGF0dXMYASABKA4yIi5ieXRlYmFzZS52MS5Jc3N1ZS5BcHByb3Zlci5TdGF0dXMSEQoJcHJpbmNpcGFsGAIgASgJIkkKBlN0YXR1cxIWChJTVEFUVVNfVU5TUEVDSUZJRUQQABILCgdQRU5ESU5HEAESDAoIQVBQUk9WRUQQAhIMCghSRUpFQ1RFRBADImgKBFR5cGUSFAoQVFlQRV9VTlNQRUNJRklFRBAAEhMKD0RBVEFCQVNFX0NIQU5HRRABEg4KClJPTEVfR1JBTlQQAhITCg9EQVRBQkFTRV9FWFBPUlQQAxIQCgxBQ0NFU1NfR1JBTlQQBDo66kE3ChJieXRlYmFzZS5jb20vSXNzdWUSIXByb2plY3RzL3twcm9qZWN0fS9pc3N1ZXMve2lzc3VlfSJ8CglSb2xlR3JhbnQSDAoEcm9sZRgBIAEoCRIMCgR1c2VyGAIgASgJEiQKCWNvbmRpdGlvbhgDIAEoCzIRLmdvb2dsZS50eXBlLkV4cHISLQoKZXhwaXJhdGlvbhgEIAEoCzIZLmdvb2dsZS5wcm90b2J1Zi5EdXJhdGlvbiJfChBBcHByb3ZhbFRlbXBsYXRlEicKBGZsb3cYASABKAsyGS5ieXRlYmFzZS52MS5BcHByb3ZhbEZsb3cSDQoFdGl0bGUYAiABKAkSEwoLZGVzY3JpcHRpb24YAyABKAkiHQoMQXBwcm92YWxGbG93Eg0KBXJvbGVzGAEgAygJIm0KGExpc3RJc3N1ZUNvbW1lbnRzUmVxdWVzdBIqCgZwYXJlbnQYASABKAlCGuBBAvpBFAoSYnl0ZWJhc2UuY29tL0lzc3VlEhEKCXBhZ2Vfc2l6ZRgCIAEoBRISCgpwYWdlX3Rva2VuGAMgASgJImcKGUxpc3RJc3N1ZUNvbW1lbnRzUmVzcG9uc2USMQoOaXNzdWVfY29tbWVudHMYASADKAsyGS5ieXRlYmFzZS52MS5Jc3N1ZUNvbW1lbnQSFwoPbmV4dF9wYWdlX3Rva2VuGAIgASgJInkKGUNyZWF0ZUlzc3VlQ29tbWVudFJlcXVlc3QSKgoGcGFyZW50GAEgASgJQhrgQQL6QRQKEmJ5dGViYXNlLmNvbS9Jc3N1ZRIwCg1pc3N1ZV9jb21tZW50GAIgASgLMhkuYnl0ZWJhc2UudjEuSXNzdWVDb21tZW50IsYBChlVcGRhdGVJc3N1ZUNvbW1lbnRSZXF1ZXN0EioKBnBhcmVudBgBIAEoCUIa4EEC+kEUChJieXRlYmFzZS5jb20vSXNzdWUSMAoNaXNzdWVfY29tbWVudBgCIAEoCzIZLmJ5dGViYXNlLnYxLklzc3VlQ29tbWVudBI0Cgt1cGRhdGVfbWFzaxgDIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5GaWVsZE1hc2tCA+BBAhIVCg1hbGxvd19taXNzaW5nGAQgASgIIusHCgxJc3N1ZUNvbW1lbnQSDAoEbmFtZRgBIAEoCRIaCgdjb21tZW50GAIgASgJQgm6SAZyBBiAgAQSDwoHcGF5bG9hZBgDIAEoCRI0CgtjcmVhdGVfdGltZRgEIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBCA+BBAxI0Cgt1cGRhdGVfdGltZRgFIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBCA+BBAxIUCgdjcmVhdG9yGAYgASgJQgPgQQMSNgoIYXBwcm92YWwYByABKAsyIi5ieXRlYmFzZS52MS5Jc3N1ZUNvbW1lbnQuQXBwcm92YWxIABI9Cgxpc3N1ZV91cGRhdGUYCCABKAsyJS5ieXRlYmFzZS52MS5Jc3N1ZUNvbW1lbnQuSXNzdWVVcGRhdGVIABI7CgtwbGFuX3VwZGF0ZRgMIAEoCzIkLmJ5dGViYXNlLnYxLklzc3VlQ29tbWVudC5QbGFuVXBkYXRlSAAakAEKCEFwcHJvdmFsEjkKBnN0YXR1cxgBIAEoDjIpLmJ5dGViYXNlLnYxLklzc3VlQ29tbWVudC5BcHByb3ZhbC5TdGF0dXMiSQoGU3RhdHVzEhYKElNUQVRVU19VTlNQRUNJRklFRBAAEgsKB1BFTkRJTkcQARIMCghBUFBST1ZFRBACEgwKCFJFSkVDVEVEEAMa6QIKC0lzc3VlVXBkYXRlEhcKCmZyb21fdGl0bGUYASABKAlIAIgBARIVCgh0b190aXRsZRgCIAEoCUgBiAEBEh0KEGZyb21fZGVzY3JpcHRpb24YAyABKAlIAogBARIbCg50b19kZXNjcmlwdGlvbhgEIAEoCUgDiAEBEjIKC2Zyb21fc3RhdHVzGAUgASgOMhguYnl0ZWJhc2UudjEuSXNzdWVTdGF0dXNIBIgBARIwCgl0b19zdGF0dXMYBiABKA4yGC5ieXRlYmFzZS52MS5Jc3N1ZVN0YXR1c0gFiAEBEhMKC2Zyb21fbGFiZWxzGAcgAygJEhEKCXRvX2xhYmVscxgIIAMoCUINCgtfZnJvbV90aXRsZUILCglfdG9fdGl0bGVCEwoRX2Zyb21fZGVzY3JpcHRpb25CEQoPX3RvX2Rlc2NyaXB0aW9uQg4KDF9mcm9tX3N0YXR1c0IMCgpfdG9fc3RhdHVzGmIKClBsYW5VcGRhdGUSKgoKZnJvbV9zcGVjcxgBIAMoCzIWLmJ5dGViYXNlLnYxLlBsYW4uU3BlYxIoCgh0b19zcGVjcxgCIAMoCzIWLmJ5dGViYXNlLnYxLlBsYW4uU3BlY0IHCgVldmVudCpNCgtJc3N1ZVN0YXR1cxIcChhJU1NVRV9TVEFUVVNfVU5TUEVDSUZJRUQQABIICgRPUEVOEAESCAoERE9ORRACEgwKCENBTkNFTEVEEAMy7BAKDElzc3VlU2VydmljZRKAAQoIR2V0SXNzdWUSHC5ieXRlYmFzZS52MS5HZXRJc3N1ZVJlcXVlc3QaEi5ieXRlYmFzZS52MS5Jc3N1ZSJC2kEEbmFtZYrqMA1iYi5pc3N1ZXMuZ2V0kOowAYLT5JMCIBIeL3YxL3tuYW1lPXByb2plY3RzLyovaXNzdWVzLyp9EpwBCgtDcmVhdGVJc3N1ZRIfLmJ5dGViYXNlLnYxLkNyZWF0ZUlzc3VlUmVxdWVzdBoSLmJ5dGViYXNlLnYxLklzc3VlIljaQQxwYXJlbnQsaXNzdWWK6jAQYmIuaXNzdWVzLmNyZWF0ZZDqMAGY6jABgtPkkwInOgVpc3N1ZSIeL3YxL3twYXJlbnQ9cHJvamVjdHMvKn0vaXNzdWVzEpQBCgpMaXN0SXNzdWVzEh4uYnl0ZWJhc2UudjEuTGlzdElzc3Vlc1JlcXVlc3QaHy5ieXRlYmFzZS52MS5MaXN0SXNzdWVzUmVzcG9uc2UiRdpBBnBhcmVudIrqMA5iYi5pc3N1ZXMubGlzdJDqMAGC0+STAiASHi92MS97cGFyZW50PXByb2plY3RzLyp9L2lzc3VlcxKaAQoMU2VhcmNoSXNzdWVzEiAuYnl0ZWJhc2UudjEuU2VhcmNoSXNzdWVzUmVxdWVzdBohLmJ5dGViYXNlLnYxLlNlYXJjaElzc3Vlc1Jlc3BvbnNlIkWK6jANYmIuaXNzdWVzLmdldJDqMAKC0+STAio6ASoiJS92MS97cGFyZW50PXByb2plY3RzLyp9L2lzc3VlczpzZWFyY2gSpwEKC1VwZGF0ZUlzc3VlEh8uYnl0ZWJhc2UudjEuVXBkYXRlSXNzdWVSZXF1ZXN0GhIuYnl0ZWJhc2UudjEuSXNzdWUiY9pBEWlzc3VlLHVwZGF0ZV9tYXNriuowEGJiLmlzc3Vlcy51cGRhdGWQ6jABmOowAYLT5JMCLToFaXNzdWUyJC92MS97aXNzdWUubmFtZT1wcm9qZWN0cy8qL2lzc3Vlcy8qfRLAAQoRTGlzdElzc3VlQ29tbWVudHMSJS5ieXRlYmFzZS52MS5MaXN0SXNzdWVDb21tZW50c1JlcXVlc3QaJi5ieXRlYmFzZS52MS5MaXN0SXNzdWVDb21tZW50c1Jlc3BvbnNlIlzaQQZwYXJlbnSK6jAVYmIuaXNzdWVDb21tZW50cy5saXN0kOowAYLT5JMCMBIuL3YxL3twYXJlbnQ9cHJvamVjdHMvKi9pc3N1ZXMvKn0vaXNzdWVDb21tZW50cxLSAQoSQ3JlYXRlSXNzdWVDb21tZW50EiYuYnl0ZWJhc2UudjEuQ3JlYXRlSXNzdWVDb21tZW50UmVxdWVzdBoZLmJ5dGViYXNlLnYxLklzc3VlQ29tbWVudCJ52kEUcGFyZW50LGlzc3VlX2NvbW1lbnSK6jAXYmIuaXNzdWVDb21tZW50cy5jcmVhdGWQ6jABmOowAYLT5JMCOToNaXNzdWVfY29tbWVudCIoL3YxL3twYXJlbnQ9cHJvamVjdHMvKi9pc3N1ZXMvKn06Y29tbWVudBLfAQoSVXBkYXRlSXNzdWVDb21tZW50EiYuYnl0ZWJhc2UudjEuVXBkYXRlSXNzdWVDb21tZW50UmVxdWVzdBoZLmJ5dGViYXNlLnYxLklzc3VlQ29tbWVudCKFAdpBIHBhcmVudCxpc3N1ZV9jb21tZW50LHVwZGF0ZV9tYXNriuowF2JiLmlzc3VlQ29tbWVudHMudXBkYXRlkOowAZjqMAGC0+STAjk6DWlzc3VlX2NvbW1lbnQyKC92MS97cGFyZW50PXByb2plY3RzLyovaXNzdWVzLyp9OmNvbW1lbnQSzQEKF0JhdGNoVXBkYXRlSXNzdWVzU3RhdHVzEisuYnl0ZWJhc2UudjEuQmF0Y2hVcGRhdGVJc3N1ZXNTdGF0dXNSZXF1ZXN0GiwuYnl0ZWJhc2UudjEuQmF0Y2hVcGRhdGVJc3N1ZXNTdGF0dXNSZXNwb25zZSJXiuowEGJiLmlzc3Vlcy51cGRhdGWQ6jABmOowAYLT5JMCNToBKiIwL3YxL3twYXJlbnQ9cHJvamVjdHMvKn0vaXNzdWVzOmJhdGNoVXBkYXRlU3RhdHVzEn8KDEFwcHJvdmVJc3N1ZRIgLmJ5dGViYXNlLnYxLkFwcHJvdmVJc3N1ZVJlcXVlc3QaEi5ieXRlYmFzZS52MS5Jc3N1ZSI5kOowApjqMAGC0+STAis6ASoiJi92MS97bmFtZT1wcm9qZWN0cy8qL2lzc3Vlcy8qfTphcHByb3ZlEnwKC1JlamVjdElzc3VlEh8uYnl0ZWJhc2UudjEuUmVqZWN0SXNzdWVSZXF1ZXN0GhIuYnl0ZWJhc2UudjEuSXNzdWUiOJDqMAKY6jABgtPkkwIqOgEqIiUvdjEve25hbWU9cHJvamVjdHMvKi9pc3N1ZXMvKn06cmVqZWN0En8KDFJlcXVlc3RJc3N1ZRIgLmJ5dGViYXNlLnYxLlJlcXVlc3RJc3N1ZVJlcXVlc3QaEi5ieXRlYmFzZS52MS5Jc3N1ZSI5kOowApjqMAGC0+STAis6ASoiJi92MS97bmFtZT1wcm9qZWN0cy8qL2lzc3Vlcy8qfTpyZXF1ZXN0EpEBChJSZXRyeUlzc3VlQXBwcm92YWwSJi5ieXRlYmFzZS52MS5SZXRyeUlzc3VlQXBwcm92YWxSZXF1ZXN0GhIuYnl0ZWJhc2UudjEuSXNzdWUiP5DqMAKY6jABgtPkkwIxOgEqIiwvdjEve25hbWU9cHJvamVjdHMvKi9pc3N1ZXMvKn06cmV0cnlBcHByb3ZhbEKnAQoPY29tLmJ5dGViYXNlLnYxQhFJc3N1ZVNlcnZpY2VQcm90b1ABWjRnaXRodWIuY29tL2J5dGViYXNlL2J5dGViYXNlL2JhY2tlbmQvZ2VuZXJhdGVkLWdvL3YxogIDQlhYqgILQnl0ZWJhc2UuVjHKAgtCeXRlYmFzZVxWMeICF0J5dGViYXNlXFYxXEdQQk1ldGFkYXRh6gIMQnl0ZWJhc2U6OlYxYgZwcm90bzM", [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, file_v1_plan_service]);
+ fileDesc("ChZ2MS9pc3N1ZV9zZXJ2aWNlLnByb3RvEgtieXRlYmFzZS52MSJKCg9HZXRJc3N1ZVJlcXVlc3QSKAoEbmFtZRgBIAEoCUIa4EEC+kEUChJieXRlYmFzZS5jb20vSXNzdWUSDQoFZm9yY2UYAiABKAgiagoSQ3JlYXRlSXNzdWVSZXF1ZXN0EiwKBnBhcmVudBgBIAEoCUIc4EEC+kEWChRieXRlYmFzZS5jb20vUHJvamVjdBImCgVpc3N1ZRgCIAEoCzISLmJ5dGViYXNlLnYxLklzc3VlQgPgQQIimQEKEUxpc3RJc3N1ZXNSZXF1ZXN0EiwKBnBhcmVudBgBIAEoCUIc4EEC+kEWChRieXRlYmFzZS5jb20vUHJvamVjdBIRCglwYWdlX3NpemUYAiABKAUSEgoKcGFnZV90b2tlbhgDIAEoCRIOCgZmaWx0ZXIYBCABKAkSDQoFcXVlcnkYBSABKAkSEAoIb3JkZXJfYnkYBiABKAkiUQoSTGlzdElzc3Vlc1Jlc3BvbnNlEiIKBmlzc3VlcxgBIAMoCzISLmJ5dGViYXNlLnYxLklzc3VlEhcKD25leHRfcGFnZV90b2tlbhgCIAEoCSKCAQoTU2VhcmNoSXNzdWVzUmVxdWVzdBITCgZwYXJlbnQYASABKAlCA+BBAhIRCglwYWdlX3NpemUYAiABKAUSEgoKcGFnZV90b2tlbhgDIAEoCRIOCgZmaWx0ZXIYBCABKAkSDQoFcXVlcnkYBSABKAkSEAoIb3JkZXJfYnkYBiABKAkiUwoUU2VhcmNoSXNzdWVzUmVzcG9uc2USIgoGaXNzdWVzGAEgAygLMhIuYnl0ZWJhc2UudjEuSXNzdWUSFwoPbmV4dF9wYWdlX3Rva2VuGAIgASgJIqABChJVcGRhdGVJc3N1ZVJlcXVlc3QSPQoFaXNzdWUYASABKAsyEi5ieXRlYmFzZS52MS5Jc3N1ZUIa4EEC+kEUChJieXRlYmFzZS5jb20vSXNzdWUSNAoLdXBkYXRlX21hc2sYAiABKAsyGi5nb29nbGUucHJvdG9idWYuRmllbGRNYXNrQgPgQQISFQoNYWxsb3dfbWlzc2luZxgDIAEoCCKYAQoeQmF0Y2hVcGRhdGVJc3N1ZXNTdGF0dXNSZXF1ZXN0EiwKBnBhcmVudBgBIAEoCUIc4EEC+kEWChRieXRlYmFzZS5jb20vUHJvamVjdBIOCgZpc3N1ZXMYAiADKAkSKAoGc3RhdHVzGAMgASgOMhguYnl0ZWJhc2UudjEuSXNzdWVTdGF0dXMSDgoGcmVhc29uGAQgASgJIiEKH0JhdGNoVXBkYXRlSXNzdWVzU3RhdHVzUmVzcG9uc2UiUAoTQXBwcm92ZUlzc3VlUmVxdWVzdBIoCgRuYW1lGAEgASgJQhrgQQL6QRQKEmJ5dGViYXNlLmNvbS9Jc3N1ZRIPCgdjb21tZW50GAIgASgJIk8KElJlamVjdElzc3VlUmVxdWVzdBIoCgRuYW1lGAEgASgJQhrgQQL6QRQKEmJ5dGViYXNlLmNvbS9Jc3N1ZRIPCgdjb21tZW50GAIgASgJIlAKE1JlcXVlc3RJc3N1ZVJlcXVlc3QSKAoEbmFtZRgBIAEoCUIa4EEC+kEUChJieXRlYmFzZS5jb20vSXNzdWUSDwoHY29tbWVudBgCIAEoCSJFChlSZXRyeUlzc3VlQXBwcm92YWxSZXF1ZXN0EigKBG5hbWUYASABKAlCGuBBAvpBFAoSYnl0ZWJhc2UuY29tL0lzc3VlIswHCgVJc3N1ZRIMCgRuYW1lGAEgASgJEhcKBXRpdGxlGAIgASgJQgi6SAVyAxjIARIdCgtkZXNjcmlwdGlvbhgDIAEoCUIIukgFcgMYkE4SJQoEdHlwZRgEIAEoDjIXLmJ5dGViYXNlLnYxLklzc3VlLlR5cGUSKAoGc3RhdHVzGAUgASgOMhguYnl0ZWJhc2UudjEuSXNzdWVTdGF0dXMSLgoJYXBwcm92ZXJzGAYgAygLMhsuYnl0ZWJhc2UudjEuSXNzdWUuQXBwcm92ZXISOAoRYXBwcm92YWxfdGVtcGxhdGUYByABKAsyHS5ieXRlYmFzZS52MS5BcHByb3ZhbFRlbXBsYXRlEhQKB2NyZWF0b3IYCCABKAlCA+BBAxI0CgtjcmVhdGVfdGltZRgJIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBCA+BBAxI0Cgt1cGRhdGVfdGltZRgKIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBCA+BBAxIMCgRwbGFuGAsgASgJEioKCnJvbGVfZ3JhbnQYDSABKAsyFi5ieXRlYmFzZS52MS5Sb2xlR3JhbnQSKgoKcmlza19sZXZlbBgPIAEoDjIWLmJ5dGViYXNlLnYxLlJpc2tMZXZlbBIOCgZsYWJlbHMYESADKAkSOQoPYXBwcm92YWxfc3RhdHVzGBIgASgOMhsuYnl0ZWJhc2UudjEuQXBwcm92YWxTdGF0dXNCA+BBAxI2CgxhY2Nlc3NfZ3JhbnQYEyABKAlCIOBBA/pBGgoYYnl0ZWJhc2UuY29tL0FjY2Vzc0dyYW50EhIKBWRyYWZ0GBQgASgIQgPgQQEanAEKCEFwcHJvdmVyEjIKBnN0YXR1cxgBIAEoDjIiLmJ5dGViYXNlLnYxLklzc3VlLkFwcHJvdmVyLlN0YXR1cxIRCglwcmluY2lwYWwYAiABKAkiSQoGU3RhdHVzEhYKElNUQVRVU19VTlNQRUNJRklFRBAAEgsKB1BFTkRJTkcQARIMCghBUFBST1ZFRBACEgwKCFJFSkVDVEVEEAMiaAoEVHlwZRIUChBUWVBFX1VOU1BFQ0lGSUVEEAASEwoPREFUQUJBU0VfQ0hBTkdFEAESDgoKUk9MRV9HUkFOVBACEhMKD0RBVEFCQVNFX0VYUE9SVBADEhAKDEFDQ0VTU19HUkFOVBAEOjrqQTcKEmJ5dGViYXNlLmNvbS9Jc3N1ZRIhcHJvamVjdHMve3Byb2plY3R9L2lzc3Vlcy97aXNzdWV9InwKCVJvbGVHcmFudBIMCgRyb2xlGAEgASgJEgwKBHVzZXIYAiABKAkSJAoJY29uZGl0aW9uGAMgASgLMhEuZ29vZ2xlLnR5cGUuRXhwchItCgpleHBpcmF0aW9uGAQgASgLMhkuZ29vZ2xlLnByb3RvYnVmLkR1cmF0aW9uIl8KEEFwcHJvdmFsVGVtcGxhdGUSJwoEZmxvdxgBIAEoCzIZLmJ5dGViYXNlLnYxLkFwcHJvdmFsRmxvdxINCgV0aXRsZRgCIAEoCRITCgtkZXNjcmlwdGlvbhgDIAEoCSIdCgxBcHByb3ZhbEZsb3cSDQoFcm9sZXMYASADKAkibQoYTGlzdElzc3VlQ29tbWVudHNSZXF1ZXN0EioKBnBhcmVudBgBIAEoCUIa4EEC+kEUChJieXRlYmFzZS5jb20vSXNzdWUSEQoJcGFnZV9zaXplGAIgASgFEhIKCnBhZ2VfdG9rZW4YAyABKAkiZwoZTGlzdElzc3VlQ29tbWVudHNSZXNwb25zZRIxCg5pc3N1ZV9jb21tZW50cxgBIAMoCzIZLmJ5dGViYXNlLnYxLklzc3VlQ29tbWVudBIXCg9uZXh0X3BhZ2VfdG9rZW4YAiABKAkieQoZQ3JlYXRlSXNzdWVDb21tZW50UmVxdWVzdBIqCgZwYXJlbnQYASABKAlCGuBBAvpBFAoSYnl0ZWJhc2UuY29tL0lzc3VlEjAKDWlzc3VlX2NvbW1lbnQYAiABKAsyGS5ieXRlYmFzZS52MS5Jc3N1ZUNvbW1lbnQixgEKGVVwZGF0ZUlzc3VlQ29tbWVudFJlcXVlc3QSKgoGcGFyZW50GAEgASgJQhrgQQL6QRQKEmJ5dGViYXNlLmNvbS9Jc3N1ZRIwCg1pc3N1ZV9jb21tZW50GAIgASgLMhkuYnl0ZWJhc2UudjEuSXNzdWVDb21tZW50EjQKC3VwZGF0ZV9tYXNrGAMgASgLMhouZ29vZ2xlLnByb3RvYnVmLkZpZWxkTWFza0ID4EECEhUKDWFsbG93X21pc3NpbmcYBCABKAgi6wcKDElzc3VlQ29tbWVudBIMCgRuYW1lGAEgASgJEhoKB2NvbW1lbnQYAiABKAlCCbpIBnIEGICABBIPCgdwYXlsb2FkGAMgASgJEjQKC2NyZWF0ZV90aW1lGAQgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcEID4EEDEjQKC3VwZGF0ZV90aW1lGAUgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcEID4EEDEhQKB2NyZWF0b3IYBiABKAlCA+BBAxI2CghhcHByb3ZhbBgHIAEoCzIiLmJ5dGViYXNlLnYxLklzc3VlQ29tbWVudC5BcHByb3ZhbEgAEj0KDGlzc3VlX3VwZGF0ZRgIIAEoCzIlLmJ5dGViYXNlLnYxLklzc3VlQ29tbWVudC5Jc3N1ZVVwZGF0ZUgAEjsKC3BsYW5fdXBkYXRlGAwgASgLMiQuYnl0ZWJhc2UudjEuSXNzdWVDb21tZW50LlBsYW5VcGRhdGVIABqQAQoIQXBwcm92YWwSOQoGc3RhdHVzGAEgASgOMikuYnl0ZWJhc2UudjEuSXNzdWVDb21tZW50LkFwcHJvdmFsLlN0YXR1cyJJCgZTdGF0dXMSFgoSU1RBVFVTX1VOU1BFQ0lGSUVEEAASCwoHUEVORElORxABEgwKCEFQUFJPVkVEEAISDAoIUkVKRUNURUQQAxrpAgoLSXNzdWVVcGRhdGUSFwoKZnJvbV90aXRsZRgBIAEoCUgAiAEBEhUKCHRvX3RpdGxlGAIgASgJSAGIAQESHQoQZnJvbV9kZXNjcmlwdGlvbhgDIAEoCUgCiAEBEhsKDnRvX2Rlc2NyaXB0aW9uGAQgASgJSAOIAQESMgoLZnJvbV9zdGF0dXMYBSABKA4yGC5ieXRlYmFzZS52MS5Jc3N1ZVN0YXR1c0gEiAEBEjAKCXRvX3N0YXR1cxgGIAEoDjIYLmJ5dGViYXNlLnYxLklzc3VlU3RhdHVzSAWIAQESEwoLZnJvbV9sYWJlbHMYByADKAkSEQoJdG9fbGFiZWxzGAggAygJQg0KC19mcm9tX3RpdGxlQgsKCV90b190aXRsZUITChFfZnJvbV9kZXNjcmlwdGlvbkIRCg9fdG9fZGVzY3JpcHRpb25CDgoMX2Zyb21fc3RhdHVzQgwKCl90b19zdGF0dXMaYgoKUGxhblVwZGF0ZRIqCgpmcm9tX3NwZWNzGAEgAygLMhYuYnl0ZWJhc2UudjEuUGxhbi5TcGVjEigKCHRvX3NwZWNzGAIgAygLMhYuYnl0ZWJhc2UudjEuUGxhbi5TcGVjQgcKBWV2ZW50Kk0KC0lzc3VlU3RhdHVzEhwKGElTU1VFX1NUQVRVU19VTlNQRUNJRklFRBAAEggKBE9QRU4QARIICgRET05FEAISDAoIQ0FOQ0VMRUQQAzLsEAoMSXNzdWVTZXJ2aWNlEoABCghHZXRJc3N1ZRIcLmJ5dGViYXNlLnYxLkdldElzc3VlUmVxdWVzdBoSLmJ5dGViYXNlLnYxLklzc3VlIkLaQQRuYW1liuowDWJiLmlzc3Vlcy5nZXSQ6jABgtPkkwIgEh4vdjEve25hbWU9cHJvamVjdHMvKi9pc3N1ZXMvKn0SnAEKC0NyZWF0ZUlzc3VlEh8uYnl0ZWJhc2UudjEuQ3JlYXRlSXNzdWVSZXF1ZXN0GhIuYnl0ZWJhc2UudjEuSXNzdWUiWNpBDHBhcmVudCxpc3N1ZYrqMBBiYi5pc3N1ZXMuY3JlYXRlkOowAZjqMAGC0+STAic6BWlzc3VlIh4vdjEve3BhcmVudD1wcm9qZWN0cy8qfS9pc3N1ZXMSlAEKCkxpc3RJc3N1ZXMSHi5ieXRlYmFzZS52MS5MaXN0SXNzdWVzUmVxdWVzdBofLmJ5dGViYXNlLnYxLkxpc3RJc3N1ZXNSZXNwb25zZSJF2kEGcGFyZW50iuowDmJiLmlzc3Vlcy5saXN0kOowAYLT5JMCIBIeL3YxL3twYXJlbnQ9cHJvamVjdHMvKn0vaXNzdWVzEpoBCgxTZWFyY2hJc3N1ZXMSIC5ieXRlYmFzZS52MS5TZWFyY2hJc3N1ZXNSZXF1ZXN0GiEuYnl0ZWJhc2UudjEuU2VhcmNoSXNzdWVzUmVzcG9uc2UiRYrqMA1iYi5pc3N1ZXMuZ2V0kOowAoLT5JMCKjoBKiIlL3YxL3twYXJlbnQ9cHJvamVjdHMvKn0vaXNzdWVzOnNlYXJjaBKnAQoLVXBkYXRlSXNzdWUSHy5ieXRlYmFzZS52MS5VcGRhdGVJc3N1ZVJlcXVlc3QaEi5ieXRlYmFzZS52MS5Jc3N1ZSJj2kERaXNzdWUsdXBkYXRlX21hc2uK6jAQYmIuaXNzdWVzLnVwZGF0ZZDqMAGY6jABgtPkkwItOgVpc3N1ZTIkL3YxL3tpc3N1ZS5uYW1lPXByb2plY3RzLyovaXNzdWVzLyp9EsABChFMaXN0SXNzdWVDb21tZW50cxIlLmJ5dGViYXNlLnYxLkxpc3RJc3N1ZUNvbW1lbnRzUmVxdWVzdBomLmJ5dGViYXNlLnYxLkxpc3RJc3N1ZUNvbW1lbnRzUmVzcG9uc2UiXNpBBnBhcmVudIrqMBViYi5pc3N1ZUNvbW1lbnRzLmxpc3SQ6jABgtPkkwIwEi4vdjEve3BhcmVudD1wcm9qZWN0cy8qL2lzc3Vlcy8qfS9pc3N1ZUNvbW1lbnRzEtIBChJDcmVhdGVJc3N1ZUNvbW1lbnQSJi5ieXRlYmFzZS52MS5DcmVhdGVJc3N1ZUNvbW1lbnRSZXF1ZXN0GhkuYnl0ZWJhc2UudjEuSXNzdWVDb21tZW50InnaQRRwYXJlbnQsaXNzdWVfY29tbWVudIrqMBdiYi5pc3N1ZUNvbW1lbnRzLmNyZWF0ZZDqMAGY6jABgtPkkwI5Og1pc3N1ZV9jb21tZW50IigvdjEve3BhcmVudD1wcm9qZWN0cy8qL2lzc3Vlcy8qfTpjb21tZW50Et8BChJVcGRhdGVJc3N1ZUNvbW1lbnQSJi5ieXRlYmFzZS52MS5VcGRhdGVJc3N1ZUNvbW1lbnRSZXF1ZXN0GhkuYnl0ZWJhc2UudjEuSXNzdWVDb21tZW50IoUB2kEgcGFyZW50LGlzc3VlX2NvbW1lbnQsdXBkYXRlX21hc2uK6jAXYmIuaXNzdWVDb21tZW50cy51cGRhdGWQ6jABmOowAYLT5JMCOToNaXNzdWVfY29tbWVudDIoL3YxL3twYXJlbnQ9cHJvamVjdHMvKi9pc3N1ZXMvKn06Y29tbWVudBLNAQoXQmF0Y2hVcGRhdGVJc3N1ZXNTdGF0dXMSKy5ieXRlYmFzZS52MS5CYXRjaFVwZGF0ZUlzc3Vlc1N0YXR1c1JlcXVlc3QaLC5ieXRlYmFzZS52MS5CYXRjaFVwZGF0ZUlzc3Vlc1N0YXR1c1Jlc3BvbnNlIleK6jAQYmIuaXNzdWVzLnVwZGF0ZZDqMAGY6jABgtPkkwI1OgEqIjAvdjEve3BhcmVudD1wcm9qZWN0cy8qfS9pc3N1ZXM6YmF0Y2hVcGRhdGVTdGF0dXMSfwoMQXBwcm92ZUlzc3VlEiAuYnl0ZWJhc2UudjEuQXBwcm92ZUlzc3VlUmVxdWVzdBoSLmJ5dGViYXNlLnYxLklzc3VlIjmQ6jACmOowAYLT5JMCKzoBKiImL3YxL3tuYW1lPXByb2plY3RzLyovaXNzdWVzLyp9OmFwcHJvdmUSfAoLUmVqZWN0SXNzdWUSHy5ieXRlYmFzZS52MS5SZWplY3RJc3N1ZVJlcXVlc3QaEi5ieXRlYmFzZS52MS5Jc3N1ZSI4kOowApjqMAGC0+STAio6ASoiJS92MS97bmFtZT1wcm9qZWN0cy8qL2lzc3Vlcy8qfTpyZWplY3QSfwoMUmVxdWVzdElzc3VlEiAuYnl0ZWJhc2UudjEuUmVxdWVzdElzc3VlUmVxdWVzdBoSLmJ5dGViYXNlLnYxLklzc3VlIjmQ6jACmOowAYLT5JMCKzoBKiImL3YxL3tuYW1lPXByb2plY3RzLyovaXNzdWVzLyp9OnJlcXVlc3QSkQEKElJldHJ5SXNzdWVBcHByb3ZhbBImLmJ5dGViYXNlLnYxLlJldHJ5SXNzdWVBcHByb3ZhbFJlcXVlc3QaEi5ieXRlYmFzZS52MS5Jc3N1ZSI/kOowApjqMAGC0+STAjE6ASoiLC92MS97bmFtZT1wcm9qZWN0cy8qL2lzc3Vlcy8qfTpyZXRyeUFwcHJvdmFsQqcBCg9jb20uYnl0ZWJhc2UudjFCEUlzc3VlU2VydmljZVByb3RvUAFaNGdpdGh1Yi5jb20vYnl0ZWJhc2UvYnl0ZWJhc2UvYmFja2VuZC9nZW5lcmF0ZWQtZ28vdjGiAgNCWFiqAgtCeXRlYmFzZS5WMcoCC0J5dGViYXNlXFYx4gIXQnl0ZWJhc2VcVjFcR1BCTWV0YWRhdGHqAgxCeXRlYmFzZTo6VjFiBnByb3RvMw", [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, file_v1_plan_service]);
/**
* Describes the message bytebase.v1.GetIssueRequest.
diff --git a/proto/gen/grpc-doc/openapi.yaml b/proto/gen/grpc-doc/openapi.yaml
index 68d407c647..f67313e719 100644
--- a/proto/gen/grpc-doc/openapi.yaml
+++ b/proto/gen/grpc-doc/openapi.yaml
@@ -20841,6 +20841,10 @@ components:
The access grant associated with this issue.
Format: projects/{project}/accessGrants/{access_grant}
readOnly: true
+ draft:
+ type: boolean
+ title: draft
+ description: (OPTIONAL) Whether this issue is a Draft Review Issue.
title: Issue
additionalProperties: false
bytebase.v1.Issue.Approver:
diff --git a/proto/gen/grpc-doc/store/README.md b/proto/gen/grpc-doc/store/README.md
index 1c5da6a49a..a5d7f77747 100644
--- a/proto/gen/grpc-doc/store/README.md
+++ b/proto/gen/grpc-doc/store/README.md
@@ -2776,6 +2776,7 @@ Issue is the metadata for issues that track database operations and access reque
| labels | [string](#string) | repeated | Labels attached to categorize and filter the issue. |
| risk_level | [RiskLevel](#bytebase-store-RiskLevel) | | Risk level for the issue, calculated from statement types. |
| access_grant_id | [string](#string) | | The access grant id for ACCESS_GRANT type issue. |
+| draft | [bool](#bool) | | Whether this issue is a Draft Review Issue. Missing from persisted payloads means false. |
diff --git a/proto/gen/grpc-doc/store/index.html b/proto/gen/grpc-doc/store/index.html
index f40355ec72..e3bbbd451b 100644
--- a/proto/gen/grpc-doc/store/index.html
+++ b/proto/gen/grpc-doc/store/index.html
@@ -3405,6 +3405,26 @@ This field is populated when syncing from the database. When empty (e.g., when p
from SQL files), the system cannot automatically drop the constraint. </p></td>
</tr>
+ <tr>
+ <td>srid</td>
+ <td><a href="#uint32">uint32</a></td>
+ <td>optional</td>
+ <td><p>The spatial reference system identifier of a spatial column, MySQL 8.0 only.
+Unset means the column declares no SRID; presence carries the explicit SRID,
+including the valid SRID 0. SRS_IDs are unsigned 32-bit (custom SRSs may exceed
+int32). Captured from information_schema.COLUMNS.SRS_ID and rendered as the
+`/*!80003 SRID n */` column attribute. </p></td>
+ </tr>
+
+ <tr>
+ <td>is_invisible</td>
+ <td><a href="#bool">bool</a></td>
+ <td></td>
+ <td><p>Whether the column is invisible (hidden from SELECT *), MySQL 8.0.23&#43; only.
+Captured from information_schema.COLUMNS.EXTRA containing INVISIBLE and
+rendered as the `/*!80023 INVISIBLE */` column attribute. </p></td>
+ </tr>
+
</tbody>
</table>
@@ -8380,6 +8400,14 @@ holds the token value.</p></td>
<td><p>The access grant id for ACCESS_GRANT type issue. </p></td>
</tr>
+ <tr>
+ <td>draft</td>
+ <td><a href="#bool">bool</a></td>
+ <td></td>
+ <td><p>Whether this issue is a Draft Review Issue.
+Missing from persisted payloads means false. </p></td>
+ </tr>
+
</tbody>
</table>
@@ -15226,3 +15254,4 @@ For example, if the folders is [A, B, C], means the worksheet is in the A/B/C su
</table>
</body>
</html>
+
diff --git a/proto/gen/grpc-doc/v1/README.md b/proto/gen/grpc-doc/v1/README.md
index 8dd4f45e38..72728838f7 100644
--- a/proto/gen/grpc-doc/v1/README.md
+++ b/proto/gen/grpc-doc/v1/README.md
@@ -5581,6 +5581,7 @@ PlanService manages deployment plans for database changes.
| labels | [string](#string) | repeated | Labels attached to the issue for categorization and filtering. |
| approval_status | [ApprovalStatus](#bytebase-v1-ApprovalStatus) | | The overall approval status for the issue. |
| access_grant | [string](#string) | | The access grant associated with this issue. Format: projects/{project}/accessGrants/{access_grant} |
+| draft | [bool](#bool) | | Whether this issue is a Draft Review Issue. |
diff --git a/proto/gen/grpc-doc/v1/index.html b/proto/gen/grpc-doc/v1/index.html
index 56c996f1c4..041906b1ad 100644
--- a/proto/gen/grpc-doc/v1/index.html
+++ b/proto/gen/grpc-doc/v1/index.html
@@ -9696,6 +9696,23 @@ This field is populated when syncing from the database. When empty (e.g., when p
from SQL files), the system cannot automatically drop the constraint. </p></td>
</tr>
+ <tr>
+ <td>srid</td>
+ <td><a href="#uint32">uint32</a></td>
+ <td>optional</td>
+ <td><p>The spatial reference system identifier of a spatial column, MySQL 8.0 only.
+Unset means the column declares no SRID; presence carries the explicit SRID,
+including the valid SRID 0. SRS_IDs are unsigned 32-bit (custom SRSs may exceed
+int32). </p></td>
+ </tr>
+
+ <tr>
+ <td>is_invisible</td>
+ <td><a href="#bool">bool</a></td>
+ <td></td>
+ <td><p>Whether the column is invisible (hidden from SELECT *), MySQL 8.0.23&#43; only. </p></td>
+ </tr>
+
</tbody>
</table>
@@ -16620,6 +16637,13 @@ Format: projects/{project}/plans/{plan} </p></td>
Format: projects/{project}/accessGrants/{access_grant} </p></td>
</tr>
+ <tr>
+ <td>draft</td>
+ <td><a href="#bool">bool</a></td>
+ <td></td>
+ <td><p>Whether this issue is a Draft Review Issue. </p></td>
+ </tr>
+
</tbody>
</table>
@@ -34817,3 +34841,4 @@ Permissions required: bb.workspaces.setIamPolicy</p></td>
</table>
</body>
</html>
+
diff --git a/proto/store/store/issue.proto b/proto/store/store/issue.proto
index 65461a5818..479def3c6d 100644
--- a/proto/store/store/issue.proto
+++ b/proto/store/store/issue.proto
@@ -46,6 +46,9 @@ message Issue {
// The access grant id for ACCESS_GRANT type issue.
string access_grant_id = 5;
+ // Whether this issue is a Draft Review Issue.
+ // Missing from persisted payloads means false.
+ bool draft = 6;
}
// RoleGrant contains details for requesting a project role.
diff --git a/proto/v1/v1/issue_service.proto b/proto/v1/v1/issue_service.proto
index c79f1e086e..d1a4006b18 100644
--- a/proto/v1/v1/issue_service.proto
+++ b/proto/v1/v1/issue_service.proto
@@ -480,6 +480,9 @@ message Issue {
(google.api.field_behavior) = OUTPUT_ONLY,
(google.api.resource_reference) = {type: "bytebase.com/AccessGrant"}
];
+
+ // Whether this issue is a Draft Review Issue.
+ bool draft = 20 [(google.api.field_behavior) = OPTIONAL];
}
message RoleGrant {