Skip to content

Commit 1af2d22

Browse files
committed
Refactor to use %w for wrapping errors in collector and factory
Signed-off-by: Oleksandr Redko <oleksandr.red+github@gmail.com>
1 parent 47238f4 commit 1af2d22

2 files changed

Lines changed: 3 additions & 6 deletions

File tree

internal/collector/collector.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,7 @@ func (c *Collector) Collect(ctx context.Context, u *url.URL, jobID string) ([]si
105105
case errors.Is(err, projectrepo.ErrNoRepoFound):
106106
fallthrough
107107
case errors.Is(err, projectrepo.ErrRepoInaccessible):
108-
// TODO: replace %v with %w after upgrading Go from 1.19 to 1.21
109-
return nil, fmt.Errorf("%w (%s): %v", ErrUncollectableRepo, u, err)
108+
return nil, fmt.Errorf("%w (%s): %w", ErrUncollectableRepo, u, err)
110109
default:
111110
return nil, fmt.Errorf("resolving project: %w", err)
112111
}

internal/collector/github/factory.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,9 @@ func (f *factory) New(ctx context.Context, u *url.URL) (projectrepo.Repo, error)
4646
}
4747
if err := r.init(ctx); err != nil {
4848
if errors.Is(err, githubapi.ErrGraphQLNotFound) {
49-
// TODO: replace %v with %w after upgrading Go from 1.19 to 1.21
50-
return nil, fmt.Errorf("%w (%s): %v", projectrepo.ErrNoRepoFound, u, err)
49+
return nil, fmt.Errorf("%w (%s): %w", projectrepo.ErrNoRepoFound, u, err)
5150
} else if errors.Is(err, githubapi.ErrGraphQLForbidden) {
52-
// TODO: replace %v with %w after upgrading Go from 1.19 to 1.21
53-
return nil, fmt.Errorf("%w (%s): %v", projectrepo.ErrRepoInaccessible, u, err)
51+
return nil, fmt.Errorf("%w (%s): %w", projectrepo.ErrRepoInaccessible, u, err)
5452
} else {
5553
return nil, err
5654
}

0 commit comments

Comments
 (0)