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

Add errorx.AnyOf for sentinel error checks

Browse Source 
Centralize errors.Is OR chains in access review campaign resolvers
and expose CampaignStatusErrors for the four non-draft status
sentinels.

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-27 12:48:12 +00:00
parent b3e60da4d5
commit f8dcb6c014
4 changed files with 131 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,6 +14,7 @@ import (
"go.gearno.de/kit/log"
"go.probo.inc/probo/pkg/accessreview"
"go.probo.inc/probo/pkg/coredata"
"go.probo.inc/probo/pkg/errorx"
"go.probo.inc/probo/pkg/page"
"go.probo.inc/probo/pkg/probo"
"go.probo.inc/probo/pkg/server/api/authn"
@@ -760,10 +761,7 @@ func (r *mutationResolver) UpdateAccessReviewCampaign(ctx context.Context, input
return nil, gqlutils.NotFound(ctx, err)
}
if errors.Is(err, accessreview.ErrCampaignInProgress) ||
errors.Is(err, accessreview.ErrCampaignPendingActions) ||
errors.Is(err, accessreview.ErrCampaignCompleted) ||
errors.Is(err, accessreview.ErrCampaignCancelled) {
if errorx.AnyOf(err, accessreview.CampaignStatusErrors...) {
return nil, gqlutils.Invalid(ctx, err)
}
@@ -808,11 +806,8 @@ func (r *mutationResolver) StartAccessReviewCampaign(ctx context.Context, input
campaign, err := r.accessReview.StartCampaign(ctx, scope, input.AccessReviewCampaignID)
if err != nil {
if errors.Is(err, accessreview.ErrCampaignMissingSources) ||
errors.Is(err, accessreview.ErrCampaignInProgress) ||
errors.Is(err, accessreview.ErrCampaignPendingActions) ||
errors.Is(err, accessreview.ErrCampaignCompleted) ||
errors.Is(err, accessreview.ErrCampaignCancelled) {
if errorx.AnyOf(err, accessreview.ErrCampaignMissingSources) ||
errorx.AnyOf(err, accessreview.CampaignStatusErrors...) {
return nil, gqlutils.Invalid(ctx, err)
}
@@ -884,10 +879,7 @@ func (r *mutationResolver) AddAccessReviewCampaignSource(ctx context.Context, in
return nil, gqlutils.NotFound(ctx, err)
}
if errors.Is(err, accessreview.ErrCampaignInProgress) ||
errors.Is(err, accessreview.ErrCampaignPendingActions) ||
errors.Is(err, accessreview.ErrCampaignCompleted) ||
errors.Is(err, accessreview.ErrCampaignCancelled) {
if errorx.AnyOf(err, accessreview.CampaignStatusErrors...) {
return nil, gqlutils.Invalid(ctx, err)
}