From f3cc159f1f57246bd553ea117b88675e70d320a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89mile=20R=C3=A9?= Date: Wed, 20 May 2026 09:53:09 +0400 Subject: [PATCH] Remove useless error checks MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Émile Ré --- pkg/iam/organization_service.go | 2 +- pkg/mailman/service.go | 12 ------------ 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/pkg/iam/organization_service.go b/pkg/iam/organization_service.go index 77231d84c..d04bf5df3 100644 --- a/pkg/iam/organization_service.go +++ b/pkg/iam/organization_service.go @@ -1624,7 +1624,7 @@ func (s OrganizationService) DeleteSCIMConfiguration( connector := &coredata.Connector{ID: *bridge.ConnectorID} err = connector.Delete(ctx, tx, scope) - if err != nil && err != coredata.ErrResourceNotFound { + if err != nil { return fmt.Errorf("cannot delete connector: %w", err) } } diff --git a/pkg/mailman/service.go b/pkg/mailman/service.go index 25fdf7098..7a0391727 100644 --- a/pkg/mailman/service.go +++ b/pkg/mailman/service.go @@ -269,10 +269,6 @@ func (s *Service) UnsubscribeByEmail( wasConfirmed := subscriber.Status == coredata.MailingListSubscriberStatusConfirmed if err := subscriber.Delete(ctx, tx, scope); err != nil { - if errors.Is(err, coredata.ErrResourceNotFound) { - return ErrSubscriberNotFound - } - return fmt.Errorf("cannot delete mailing list subscriber: %w", err) } @@ -348,10 +344,6 @@ func (s *Service) DeleteSubscriber( wasConfirmed := subscriber.Status == coredata.MailingListSubscriberStatusConfirmed if err := subscriber.Delete(ctx, tx, scope); err != nil { - if errors.Is(err, coredata.ErrResourceNotFound) { - return ErrSubscriberNotFound - } - return fmt.Errorf("cannot delete mailing list subscriber: %w", err) } @@ -606,10 +598,6 @@ func (s *Service) DeleteMailingListUpdate( func(ctx context.Context, tx pg.Tx) error { mlu := coredata.MailingListUpdate{ID: id} if err := mlu.Delete(ctx, tx, scope); err != nil { - if errors.Is(err, coredata.ErrResourceNotFound) { - return ErrMailingListUpdateNotFound - } - return fmt.Errorf("cannot delete mailing list update: %w", err) }