Skip to content

fix: wrap lifecycle service errors with meaningful messages #487

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
poyrazK wants to merge 1 commit into
base: main
Choose a base branch
from
+9 −6
Open

fix: wrap lifecycle service errors with meaningful messages #487

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions internal/core/services/lifecycle_svc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ func (s *LifecycleService) CreateRule(ctx context.Context, bucket string, prefix
// 1. Verify bucket exists
b, err := s.storageRepo.GetBucket(ctx, bucket)
if err != nil {
return nil, err
return nil, errors.Wrap(errors.Internal, "failed to verify bucket", err)
}

// 2. Verify ownership (Implicitly handled by Authorize if we want to support shared buckets,
Expand All @@ -65,7 +65,7 @@ func (s *LifecycleService) CreateRule(ctx context.Context, bucket string, prefix
}

if err := s.repo.Create(ctx, rule); err != nil {
return nil, err
return nil, errors.Wrap(errors.Internal, "failed to create lifecycle rule", err)
}

return rule, nil
Expand All @@ -82,7 +82,7 @@ func (s *LifecycleService) ListRules(ctx context.Context, bucket string) ([]*dom
// Verify bucket existence/ownership first
b, err := s.storageRepo.GetBucket(ctx, bucket)
if err != nil {
return nil, err
return nil, errors.Wrap(errors.Internal, "failed to verify bucket", err)
}

if userID != b.UserID {
Expand All @@ -108,7 +108,7 @@ func (s *LifecycleService) DeleteRule(ctx context.Context, bucket string, ruleID
// Verify bucket existence/ownership
b, err := s.storageRepo.GetBucket(ctx, bucket)
if err != nil {
return err
return errors.Wrap(errors.Internal, "failed to verify bucket", err)
}
if userID != b.UserID {
return errors.New(errors.Forbidden, "you don't own this bucket")
Expand All @@ -117,11 +117,14 @@ func (s *LifecycleService) DeleteRule(ctx context.Context, bucket string, ruleID
// Verify rule belongs to bucket
rule, err := s.repo.Get(ctx, id)
if err != nil {
return err
return errors.Wrap(errors.Internal, "failed to get lifecycle rule", err)
}
if rule.BucketName != bucket {
return errors.New(errors.InvalidInput, "rule does not belong to the specified bucket")
}

return s.repo.Delete(ctx, id)
if err := s.repo.Delete(ctx, id); err != nil {
return errors.Wrap(errors.Internal, "failed to delete lifecycle rule", err)
}
return nil
}
Loading