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

8
pkg/accessreview/errors.go
View File

@@ -34,6 +34,14 @@ 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:

34
pkg/errorx/anyof.go Normal file
View File

@@ -0,0 +1,34 @@
// Copyright (c) 2026 Probo Inc <hello@probo.com>.
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in
// all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
// SOFTWARE.
package errorx
import "errors"
// AnyOf reports whether err matches any of targets via errors.Is.
func AnyOf(err error, targets ...error) bool {
for _, target := range targets {
if errors.Is(err, target) {
return true
}
}
return false
}

84
pkg/errorx/anyof_test.go Normal file
View File

@@ -0,0 +1,84 @@
// Copyright (c) 2026 Probo Inc <hello@probo.com>.
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in
// all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
// SOFTWARE.
package errorx_test
import (
"errors"
"fmt"
"testing"
"github.com/stretchr/testify/assert"
"go.probo.inc/probo/pkg/errorx"
)
func TestAnyOf(t *testing.T) {
t.Parallel()
sentinelA := errors.New("a")
sentinelB := errors.New("b")
sentinelC := errors.New("c")
tests := []struct {
name string
err error
targets []error
want bool
}{
{
name: "nil error",
err: nil,
targets: []error{sentinelA},
want: false,
},
{
name: "no targets",
err: sentinelA,
targets: nil,
want: false,
},
{
name: "direct match",
err: sentinelA,
targets: []error{sentinelA},
want: true,
},
{
name: "wrapped match",
err: fmt.Errorf("outer: %w", sentinelB),
targets: []error{sentinelA, sentinelB},
want: true,
},
{
name: "no match",
err: fmt.Errorf("outer: %w", sentinelC),
targets: []error{sentinelA, sentinelB},
want: false,
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
t.Parallel()
assert.Equal(t, tt.want, errorx.AnyOf(tt.err, tt.targets...))
})
}
}

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)
}