Use status-specific errors for non-draft campaigns
Replace ErrCampaignCannotStart and ErrCampaignCannotUpdate with sentinels per campaign status, mapped through CampaignStatusError and wrapped with operation-specific fmt.Errorf prefixes. Signed-off-by: Cursor Agent <cursoragent@cursor.com> Co-authored-by: Bryan FRIMIN <bryan@frimin.fr>
This commit is contained in:
@@ -159,7 +159,7 @@ func (s *Service) UpdateCampaign(
|
|||||||
}
|
}
|
||||||
|
|
||||||
if campaign.Status != coredata.AccessReviewCampaignStatusDraft {
|
if campaign.Status != coredata.AccessReviewCampaignStatusDraft {
|
||||||
return ErrCampaignCannotUpdate
|
return fmt.Errorf("cannot update campaign: %w", CampaignStatusError(campaign.Status))
|
||||||
}
|
}
|
||||||
|
|
||||||
if req.Name != nil && *req.Name != nil {
|
if req.Name != nil && *req.Name != nil {
|
||||||
@@ -242,10 +242,8 @@ func (s *Service) AddCampaignSource(
|
|||||||
}
|
}
|
||||||
|
|
||||||
if campaign.Status != coredata.AccessReviewCampaignStatusDraft {
|
if campaign.Status != coredata.AccessReviewCampaignStatusDraft {
|
||||||
return ErrCampaignCannotUpdate
|
return fmt.Errorf("cannot add scope source: %w", CampaignStatusError(campaign.Status))
|
||||||
}
|
}
|
||||||
|
|
||||||
source := &coredata.AccessReviewSource{}
|
|
||||||
if err := source.LoadByID(ctx, conn, scope, req.AccessReviewSourceID); err != nil {
|
if err := source.LoadByID(ctx, conn, scope, req.AccessReviewSourceID); err != nil {
|
||||||
if errors.Is(err, coredata.ErrResourceNotFound) {
|
if errors.Is(err, coredata.ErrResourceNotFound) {
|
||||||
return coredata.ErrResourceNotFound
|
return coredata.ErrResourceNotFound
|
||||||
@@ -291,10 +289,8 @@ func (s *Service) RemoveCampaignSource(
|
|||||||
}
|
}
|
||||||
|
|
||||||
if campaign.Status != coredata.AccessReviewCampaignStatusDraft {
|
if campaign.Status != coredata.AccessReviewCampaignStatusDraft {
|
||||||
return ErrCampaignCannotUpdate
|
return fmt.Errorf("cannot remove scope source: %w", CampaignStatusError(campaign.Status))
|
||||||
}
|
}
|
||||||
|
|
||||||
campaignSource := &coredata.AccessReviewCampaignSource{}
|
|
||||||
if err := campaignSource.DeleteByCampaignIDAndAccessReviewSourceID(ctx, conn, scope, campaign.ID, req.AccessReviewSourceID); err != nil {
|
if err := campaignSource.DeleteByCampaignIDAndAccessReviewSourceID(ctx, conn, scope, campaign.ID, req.AccessReviewSourceID); err != nil {
|
||||||
return fmt.Errorf("cannot delete campaign source: %w", err)
|
return fmt.Errorf("cannot delete campaign source: %w", err)
|
||||||
}
|
}
|
||||||
@@ -400,7 +396,7 @@ func (s *Service) StartCampaign(
|
|||||||
}
|
}
|
||||||
|
|
||||||
if campaign.Status != coredata.AccessReviewCampaignStatusDraft {
|
if campaign.Status != coredata.AccessReviewCampaignStatusDraft {
|
||||||
return ErrCampaignCannotStart
|
return fmt.Errorf("cannot start campaign: %w", CampaignStatusError(campaign.Status))
|
||||||
}
|
}
|
||||||
|
|
||||||
var campaignSources coredata.AccessReviewCampaignSources
|
var campaignSources coredata.AccessReviewCampaignSources
|
||||||
|
|||||||
@@ -20,10 +20,31 @@
|
|||||||
|
|
||||||
package accessreview
|
package accessreview
|
||||||
|
|
||||||
import "errors"
|
import (
|
||||||
|
"errors"
|
||||||
|
|
||||||
|
"go.probo.inc/probo/pkg/coredata"
|
||||||
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
ErrCampaignMissingSources = errors.New("cannot start campaign: no scope sources configured")
|
ErrCampaignMissingSources = errors.New("cannot start campaign: no scope sources configured")
|
||||||
ErrCampaignCannotStart = errors.New("cannot start campaign: only draft campaigns can be started")
|
ErrCampaignInProgress = errors.New("campaign is in progress")
|
||||||
ErrCampaignCannotUpdate = errors.New("cannot update campaign: only draft campaigns can be updated")
|
ErrCampaignPendingActions = errors.New("campaign is pending actions")
|
||||||
|
ErrCampaignCompleted = errors.New("campaign is completed")
|
||||||
|
ErrCampaignCancelled = errors.New("campaign is cancelled")
|
||||||
)
|
)
|
||||||
|
|
||||||
|
func CampaignStatusError(status coredata.AccessReviewCampaignStatus) error {
|
||||||
|
switch status {
|
||||||
|
case coredata.AccessReviewCampaignStatusInProgress:
|
||||||
|
return ErrCampaignInProgress
|
||||||
|
case coredata.AccessReviewCampaignStatusPendingActions:
|
||||||
|
return ErrCampaignPendingActions
|
||||||
|
case coredata.AccessReviewCampaignStatusCompleted:
|
||||||
|
return ErrCampaignCompleted
|
||||||
|
case coredata.AccessReviewCampaignStatusCancelled:
|
||||||
|
return ErrCampaignCancelled
|
||||||
|
default:
|
||||||
|
return ErrCampaignInProgress
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
53
pkg/accessreview/errors_test.go
Normal file
53
pkg/accessreview/errors_test.go
Normal file
@@ -0,0 +1,53 @@
|
|||||||
|
// 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 accessreview
|
||||||
|
|
||||||
|
import (
|
||||||
|
"errors"
|
||||||
|
"fmt"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"github.com/stretchr/testify/assert"
|
||||||
|
"go.probo.inc/probo/pkg/coredata"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestCampaignStatusError(t *testing.T) {
|
||||||
|
t.Parallel()
|
||||||
|
|
||||||
|
tests := []struct {
|
||||||
|
status coredata.AccessReviewCampaignStatus
|
||||||
|
want error
|
||||||
|
}{
|
||||||
|
{status: coredata.AccessReviewCampaignStatusInProgress, want: ErrCampaignInProgress},
|
||||||
|
{status: coredata.AccessReviewCampaignStatusPendingActions, want: ErrCampaignPendingActions},
|
||||||
|
{status: coredata.AccessReviewCampaignStatusCompleted, want: ErrCampaignCompleted},
|
||||||
|
{status: coredata.AccessReviewCampaignStatusCancelled, want: ErrCampaignCancelled},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, tt := range tests {
|
||||||
|
t.Run(string(tt.status), func(t *testing.T) {
|
||||||
|
t.Parallel()
|
||||||
|
|
||||||
|
err := fmt.Errorf("cannot start campaign: %w", CampaignStatusError(tt.status))
|
||||||
|
assert.ErrorIs(t, err, tt.want)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -760,7 +760,10 @@ 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.ErrCampaignCannotUpdate) {
|
if errors.Is(err, accessreview.ErrCampaignInProgress) ||
|
||||||
|
errors.Is(err, accessreview.ErrCampaignPendingActions) ||
|
||||||
|
errors.Is(err, accessreview.ErrCampaignCompleted) ||
|
||||||
|
errors.Is(err, accessreview.ErrCampaignCancelled) {
|
||||||
return nil, gqlutils.Invalid(ctx, err)
|
return nil, gqlutils.Invalid(ctx, err)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -806,7 +809,10 @@ 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.ErrCampaignCannotStart) {
|
errors.Is(err, accessreview.ErrCampaignInProgress) ||
|
||||||
|
errors.Is(err, accessreview.ErrCampaignPendingActions) ||
|
||||||
|
errors.Is(err, accessreview.ErrCampaignCompleted) ||
|
||||||
|
errors.Is(err, accessreview.ErrCampaignCancelled) {
|
||||||
return nil, gqlutils.Invalid(ctx, err)
|
return nil, gqlutils.Invalid(ctx, err)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -878,6 +884,13 @@ func (r *mutationResolver) AddAccessReviewCampaignSource(ctx context.Context, in
|
|||||||
return nil, gqlutils.NotFound(ctx, err)
|
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) {
|
||||||
|
return nil, gqlutils.Invalid(ctx, err)
|
||||||
|
}
|
||||||
|
|
||||||
r.logger.ErrorCtx(ctx, "cannot add scope source to access review campaign", log.Error(err))
|
r.logger.ErrorCtx(ctx, "cannot add scope source to access review campaign", log.Error(err))
|
||||||
|
|
||||||
return nil, gqlutils.Internal(ctx)
|
return nil, gqlutils.Internal(ctx)
|
||||||
|
|||||||
Reference in New Issue
Block a user