all: remove dependency on deprecated github.com/pkg/errors by zchee · Pull Request #834 · sigstore/rekor

zchee · 2022-05-19T20:00:16Z

Summary

all: remove dependency on deprecated github.com/pkg/errors

$ go install github.com/zchee/go-analyzer/pkgerrors/cmd/pkgerrors@main
$ pkgerrors -fix ./...
$ goimports -w .

Ticket Link

Update: sigstore/cosign#1880

$ pkgerrors -fix ./... $ goimports -w . Signed-off-by: Koichi Shiraishi <zchee.io@gmail.com>

zchee · 2022-05-19T20:00:26Z

cc: @imjasonh

zchee · 2022-05-19T20:04:05Z

ah, still there are pkg/errors.

imjasonh · 2022-05-19T20:04:24Z

It looks like github.com/pkg/errors stays around in imports sometimes because goimports thinks errors.New should use pkg/errors' method instead of the stdlib errors package.

I think if you delete all those pkg/errors imports and goimports -w again it should pick the right one. If it doesn't, you could always replace them yourself using sed. Maybe the x/go/tools/analysis analyzer can do this for us too, I'm not sure.

zchee · 2022-05-19T20:09:36Z

@imjasonh done

Signed-off-by: Koichi Shiraishi <zchee.io@gmail.com>

zchee · 2022-05-19T20:13:20Z

Maybe the x/go/tools/analysis analyzer can do this for us too, I'm not sure.

Yes can, but implements next time :D

zchee · 2022-05-19T20:21:08Z

😇

https://github.com/sigstore/rekor/runs/6514419608?check_suite_focus=true

imjasonh · 2022-05-19T20:22:51Z

We should also be able to go mod tidy to remove the pkg/errors dependency, or at least make it indirect instead of direct.

Signed-off-by: Koichi Shiraishi <zchee.io@gmail.com>

cpanato · 2022-05-19T23:05:15Z

pkg/types/hashedrekord/hashedrekord.go

 	rekord, ok := pe.(*models.Hashedrekord)
 	if !ok {
-		return nil, errors.New(fmt.Sprintf("%s, %s", "cannot unmarshal non-hashed Rekord types", pe.Kind()))
+		return nil, fmt.Errorf("%s, %s", "cannot unmarshal non-hashed Rekord types", pe.Kind())


why not

Suggested change

return nil, fmt.Errorf("%s, %s", "cannot unmarshal non-hashed Rekord types", pe.Kind())

return nil, fmt.Errorf("cannot unmarshal non-hashed Rekord types: %s", pe.Kind())

?

ah, my linter still develop phase(I wrote it for sigstore), will fix by hand.

Signed-off-by: Koichi Shiraishi <zchee.io@gmail.com>

zchee · 2022-05-19T23:32:25Z

@cpanato PTAL

cpanato

thanks!
LGTM

codecov-commenter · 2022-05-20T09:03:43Z

Codecov Report

Merging #834 (8e76861) into main (ed585a3) will decrease coverage by 0.03%.
The diff coverage is 7.50%.

@@            Coverage Diff             @@
##             main     #834      +/-   ##
==========================================
- Coverage   46.66%   46.62%   -0.04%     
==========================================
  Files          60       60              
  Lines        5094     5094              
==========================================
- Hits         2377     2375       -2     
- Misses       2443     2445       +2     
  Partials      274      274

Impacted Files	Coverage Δ
cmd/rekor-cli/app/log_info.go	`2.09% <0.00%> (ø)`
cmd/rekor-cli/app/pflags.go	`84.50% <0.00%> (ø)`
cmd/rekor-cli/app/upload.go	`2.54% <0.00%> (ø)`
pkg/sharding/ranges.go	`47.27% <0.00%> (ø)`
pkg/types/alpine/alpine.go	`37.03% <0.00%> (ø)`
pkg/types/alpine/apk.go	`59.57% <0.00%> (ø)`
pkg/types/hashedrekord/hashedrekord.go	`37.03% <0.00%> (ø)`
pkg/types/helm/helm.go	`37.03% <0.00%> (ø)`
pkg/types/helm/provenance.go	`41.30% <0.00%> (ø)`
pkg/types/helm/v0.0.1/entry.go	`48.49% <ø> (ø)`
... and 13 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update ed585a3...8e76861. Read the comment docs.

cpanato · 2022-05-20T10:28:14Z

@bobcallaway can approve/merge when having some free cycles? thanks

bobcallaway · 2022-05-20T10:38:47Z

@cpanato can't you see im busy lounging? 🤣

bobcallaway

lgtm

all: remove dependency on deprecated github.com/pkg/errors

0aa7731

$ pkgerrors -fix ./... $ goimports -w . Signed-off-by: Koichi Shiraishi <zchee.io@gmail.com>

zchee requested review from a team and bobcallaway as code owners May 19, 2022 20:00

zchee marked this pull request as draft May 19, 2022 20:05

zchee force-pushed the pkg-errors branch 2 times, most recently from de0f2c1 to c22b929 Compare May 19, 2022 20:10

all: fix missing convert

44a56b6

Signed-off-by: Koichi Shiraishi <zchee.io@gmail.com>

zchee force-pushed the pkg-errors branch from c22b929 to 44a56b6 Compare May 19, 2022 20:11

zchee marked this pull request as ready for review May 19, 2022 20:11

imjasonh previously approved these changes May 19, 2022

View reviewed changes

zchee added 2 commits May 20, 2022 05:26

pkg/types/hashedrekord: fix lint sugggestion

a6e279b

Signed-off-by: Koichi Shiraishi <zchee.io@gmail.com>

go.mod: go mod tidy

6015efc

Signed-off-by: Koichi Shiraishi <zchee.io@gmail.com>

zchee dismissed imjasonh’s stale review via 6015efc May 19, 2022 20:27

zchee requested a review from asraa as a code owner May 19, 2022 20:27

dlorenc previously approved these changes May 19, 2022

View reviewed changes

cpanato reviewed May 19, 2022

View reviewed changes

pkg/types/hashedrekord: fix unconverted by pkgerrors

8e76861

Signed-off-by: Koichi Shiraishi <zchee.io@gmail.com>

zchee dismissed dlorenc’s stale review via 8e76861 May 19, 2022 23:32

cpanato reviewed May 20, 2022

View reviewed changes

cpanato requested a review from dlorenc May 20, 2022 09:00

bobcallaway approved these changes May 20, 2022

View reviewed changes

bobcallaway merged commit 547eb3c into sigstore:main May 20, 2022

github-actions bot added this to the v1.0.0 milestone May 20, 2022

zchee deleted the pkg-errors branch May 20, 2022 15:01

mtrmac mentioned this pull request Jun 30, 2022

Replace github.com/pkg/errors dependency with native error wrapping containers/podman#14784

Closed

6 tasks

	return nil, fmt.Errorf("%s, %s", "cannot unmarshal non-hashed Rekord types", pe.Kind())
	return nil, fmt.Errorf("cannot unmarshal non-hashed Rekord types: %s", pe.Kind())

Conversation

zchee commented May 19, 2022

Summary

Ticket Link

Uh oh!

zchee commented May 19, 2022

Uh oh!

zchee commented May 19, 2022

Uh oh!

imjasonh commented May 19, 2022

Uh oh!

zchee commented May 19, 2022

Uh oh!

zchee commented May 19, 2022

Uh oh!

zchee commented May 19, 2022

Uh oh!

imjasonh commented May 19, 2022

Uh oh!

cpanato May 19, 2022

Choose a reason for hiding this comment

Uh oh!

zchee May 19, 2022

Choose a reason for hiding this comment

Uh oh!

zchee commented May 19, 2022

Uh oh!

cpanato left a comment

Choose a reason for hiding this comment

Uh oh!

codecov-commenter commented May 20, 2022

Codecov Report

Uh oh!

cpanato commented May 20, 2022

Uh oh!

bobcallaway commented May 20, 2022

Uh oh!

bobcallaway left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants