Allow deleting access review campaigns in any status

Drop the backend status gate on campaign delete and show delete in
the console whenever the user has delete permission, regardless of
whether the campaign is draft, in progress, or completed.

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

Co-authored-by: Bryan FRIMIN <bryan@frimin.fr>

pkg/accessreview/campaign_service.go

@@ -205,12 +205,6 @@ func (s *Service) DeleteCampaign(
 				return fmt.Errorf("cannot load campaign: %w", err)
 			}
 
-			if campaign.Status != coredata.AccessReviewCampaignStatusDraft &&
-				campaign.Status != coredata.AccessReviewCampaignStatusCancelled &&
-				campaign.Status != coredata.AccessReviewCampaignStatusCompleted {
-				return NewCampaignNotDeletableError(campaign.ID)
-			}
-
 			if err := campaign.Delete(ctx, conn, scope); err != nil {
 				return fmt.Errorf("cannot delete campaign: %w", err)
 			}

pkg/accessreview/errors.go

@@ -30,7 +30,6 @@ import (
 var (
 	ErrCampaignMissingSources    = errors.New("access review campaign missing scope sources")
 	ErrCampaignNotDraft          = errors.New("access review campaign not draft")
-	ErrCampaignNotDeletable      = errors.New("access review campaign not deletable")
 	ErrCampaignNotPendingActions = errors.New("access review campaign not pending actions")
 	ErrCampaignCompleted         = errors.New("access review campaign completed")
 	ErrCampaignCancelled         = errors.New("access review campaign cancelled")
@@ -45,10 +44,6 @@ type (
 		CampaignID gid.GID
 	}
 
-	CampaignNotDeletableError struct {
-		CampaignID gid.GID
-	}
-
 	CampaignNotPendingActionsError struct {
 		CampaignID gid.GID
 	}
@@ -89,21 +84,6 @@ func (e *CampaignNotDraftError) Is(target error) bool {
 	return target == ErrCampaignNotDraft
 }
 
-func NewCampaignNotDeletableError(campaignID gid.GID) error {
-	return &CampaignNotDeletableError{CampaignID: campaignID}
-}
-
-func (e *CampaignNotDeletableError) Error() string {
-	return fmt.Sprintf(
-		"access review campaign %q cannot be deleted unless it is draft, cancelled, or completed",
-		e.CampaignID,
-	)
-}
-
-func (e *CampaignNotDeletableError) Is(target error) bool {
-	return target == ErrCampaignNotDeletable
-}
-
 func NewCampaignNotPendingActionsError(campaignID gid.GID) error {
 	return &CampaignNotPendingActionsError{CampaignID: campaignID}
 }

pkg/accessreview/errors_test.go

@@ -57,15 +57,6 @@ func TestCampaignClientErrors(t *testing.T) {
 			wantText: fmt.Sprintf("access review campaign %q is not in draft", campaignID),
 			sentinel: accessreview.ErrCampaignNotDraft,
 		},
-		{
-			name: "not deletable",
-			err:  accessreview.NewCampaignNotDeletableError(campaignID),
-			wantText: fmt.Sprintf(
-				"access review campaign %q cannot be deleted unless it is draft, cancelled, or completed",
-				campaignID,
-			),
-			sentinel: accessreview.ErrCampaignNotDeletable,
-		},
 		{
 			name: "not pending actions",
 			err:  accessreview.NewCampaignNotPendingActionsError(campaignID),

pkg/server/api/console/v1/access_review_campaign_resolvers.go

@@ -787,10 +787,6 @@ func (r *mutationResolver) DeleteAccessReviewCampaign(ctx context.Context, input
 			return nil, gqlutils.NotFound(ctx, err)
 		}
 
-		if errors.Is(err, accessreview.ErrCampaignNotDeletable) {
-			return nil, gqlutils.Invalid(ctx, err)
-		}
-
 		r.logger.ErrorCtx(ctx, "cannot delete access review campaign", log.Error(err))
 
 		return nil, gqlutils.Internal(ctx)