rohit/probo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace ErrCampaignNotDraft with operation-specific errors

Browse Source 
Use ErrCampaignCannotStart and ErrCampaignCannotUpdate with clear
actionable messages instead of a generic draft-status sentinel
wrapped in noisy fmt.Errorf chains.

Signed-off-by: Cursor Agent <cursoragent@cursor.com>

Co-authored-by: Bryan FRIMIN <bryan@frimin.fr>
This commit is contained in:
Cursor Agent
2026-07-20 16:01:49 +00:00
parent eabd0fb659
commit 3d606dd0e8
3 changed files with 8 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
pkg/accessreview/campaign_service.go
View File

@@ -159,12 +159,7 @@ func (s *Service) UpdateCampaign(
} }
if campaign.Status != coredata.AccessReviewCampaignStatusDraft { if campaign.Status != coredata.AccessReviewCampaignStatusDraft {
return fmt.Errorf( return ErrCampaignCannotUpdate
"cannot update campaign: status is %s, expected %s: %w",
campaign.Status,
coredata.AccessReviewCampaignStatusDraft,
ErrCampaignNotDraft,
)
} }
if req.Name != nil && *req.Name != nil { if req.Name != nil && *req.Name != nil {
@@ -247,12 +242,7 @@ func (s *Service) AddCampaignSource(
} }
if campaign.Status != coredata.AccessReviewCampaignStatusDraft { if campaign.Status != coredata.AccessReviewCampaignStatusDraft {
return fmt.Errorf( return ErrCampaignCannotUpdate
"cannot add scope source: campaign status is %s, expected %s: %w",
campaign.Status,
coredata.AccessReviewCampaignStatusDraft,
ErrCampaignNotDraft,
)
} }
source := &coredata.AccessReviewSource{} source := &coredata.AccessReviewSource{}
@@ -301,12 +291,7 @@ func (s *Service) RemoveCampaignSource(
} }
if campaign.Status != coredata.AccessReviewCampaignStatusDraft { if campaign.Status != coredata.AccessReviewCampaignStatusDraft {
return fmt.Errorf( return ErrCampaignCannotUpdate
"cannot remove scope source: campaign status is %s, expected %s: %w",
campaign.Status,
coredata.AccessReviewCampaignStatusDraft,
ErrCampaignNotDraft,
)
} }
campaignSource := &coredata.AccessReviewCampaignSource{} campaignSource := &coredata.AccessReviewCampaignSource{}
@@ -415,12 +400,7 @@ func (s *Service) StartCampaign(
} }
if campaign.Status != coredata.AccessReviewCampaignStatusDraft { if campaign.Status != coredata.AccessReviewCampaignStatusDraft {
return fmt.Errorf( return ErrCampaignCannotStart
"cannot start campaign: status is %s, expected %s: %w",
campaign.Status,
coredata.AccessReviewCampaignStatusDraft,
ErrCampaignNotDraft,
)
} }
var campaignSources coredata.AccessReviewCampaignSources var campaignSources coredata.AccessReviewCampaignSources

3
pkg/accessreview/errors.go
View File

@@ -24,5 +24,6 @@ import "errors"
var ( var (
ErrCampaignMissingSources = errors.New("cannot start campaign: no scope sources configured") ErrCampaignMissingSources = errors.New("cannot start campaign: no scope sources configured")
ErrCampaignNotDraft = errors.New("campaign must be in draft status") ErrCampaignCannotStart = errors.New("cannot start campaign: only draft campaigns can be started")
ErrCampaignCannotUpdate = errors.New("cannot update campaign: only draft campaigns can be updated")
) )

4
pkg/server/api/console/v1/access_review_campaign_resolvers.go
View File

@@ -760,7 +760,7 @@ func (r *mutationResolver) UpdateAccessReviewCampaign(ctx context.Context, input
return nil, gqlutils.NotFound(ctx, err) return nil, gqlutils.NotFound(ctx, err)
} }
if errors.Is(err, accessreview.ErrCampaignNotDraft) { if errors.Is(err, accessreview.ErrCampaignCannotUpdate) {
return nil, gqlutils.Invalid(ctx, err) return nil, gqlutils.Invalid(ctx, err)
} }
@@ -806,7 +806,7 @@ func (r *mutationResolver) StartAccessReviewCampaign(ctx context.Context, input
campaign, err := r.accessReview.StartCampaign(ctx, scope, input.AccessReviewCampaignID) campaign, err := r.accessReview.StartCampaign(ctx, scope, input.AccessReviewCampaignID)
if err != nil { if err != nil {
if errors.Is(err, accessreview.ErrCampaignMissingSources) || if errors.Is(err, accessreview.ErrCampaignMissingSources) ||
errors.Is(err, accessreview.ErrCampaignNotDraft) { errors.Is(err, accessreview.ErrCampaignCannotStart) {
return nil, gqlutils.Invalid(ctx, err) return nil, gqlutils.Invalid(ctx, err)
} }