diff --git a/pkg/accessreview/errors.go b/pkg/accessreview/errors.go index b50f9f87d..d6259a090 100644 --- a/pkg/accessreview/errors.go +++ b/pkg/accessreview/errors.go @@ -34,14 +34,6 @@ var ( ErrCampaignCancelled = errors.New("campaign is cancelled") ) -// CampaignStatusErrors are client-facing invalid-state errors for non-draft campaigns. -var CampaignStatusErrors = []error{ - ErrCampaignInProgress, - ErrCampaignPendingActions, - ErrCampaignCompleted, - ErrCampaignCancelled, -} - func CampaignStatusError(status coredata.AccessReviewCampaignStatus) error { switch status { case coredata.AccessReviewCampaignStatusInProgress: diff --git a/pkg/server/api/console/v1/access_review_campaign_resolvers.go b/pkg/server/api/console/v1/access_review_campaign_resolvers.go index b594bdab5..4d8df89b7 100644 --- a/pkg/server/api/console/v1/access_review_campaign_resolvers.go +++ b/pkg/server/api/console/v1/access_review_campaign_resolvers.go @@ -761,7 +761,13 @@ func (r *mutationResolver) UpdateAccessReviewCampaign(ctx context.Context, input return nil, gqlutils.NotFound(ctx, err) } - if errorx.AnyOf(err, accessreview.CampaignStatusErrors...) { + if errorx.AnyOf( + err, + accessreview.ErrCampaignInProgress, + accessreview.ErrCampaignPendingActions, + accessreview.ErrCampaignCompleted, + accessreview.ErrCampaignCancelled, + ) { return nil, gqlutils.Invalid(ctx, err) } @@ -806,8 +812,14 @@ func (r *mutationResolver) StartAccessReviewCampaign(ctx context.Context, input campaign, err := r.accessReview.StartCampaign(ctx, scope, input.AccessReviewCampaignID) if err != nil { - if errorx.AnyOf(err, accessreview.ErrCampaignMissingSources) || - errorx.AnyOf(err, accessreview.CampaignStatusErrors...) { + if errorx.AnyOf( + err, + accessreview.ErrCampaignMissingSources, + accessreview.ErrCampaignInProgress, + accessreview.ErrCampaignPendingActions, + accessreview.ErrCampaignCompleted, + accessreview.ErrCampaignCancelled, + ) { return nil, gqlutils.Invalid(ctx, err) } @@ -879,7 +891,13 @@ func (r *mutationResolver) AddAccessReviewCampaignSource(ctx context.Context, in return nil, gqlutils.NotFound(ctx, err) } - if errorx.AnyOf(err, accessreview.CampaignStatusErrors...) { + if errorx.AnyOf( + err, + accessreview.ErrCampaignInProgress, + accessreview.ErrCampaignPendingActions, + accessreview.ErrCampaignCompleted, + accessreview.ErrCampaignCancelled, + ) { return nil, gqlutils.Invalid(ctx, err) }