Remove dependency on deprecated github.com/pkg/errors #1887

zchee · 2022-05-16T18:08:54Z

Summary

Remove dependency on deprecated github.com/pkg/errors.

Ticket Link

Update: #1880

Release Note

???

zchee · 2022-05-16T18:09:49Z

cc: @imjasonh I started cleanup pkg/errors dependency, but still draft.

cmd/cosign/cli/commands.go

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

zchee · 2022-05-16T18:30:26Z

This pull request is a huge change. Therefore, split the commit by the package one by one, as another contributor's PR may conflict with the main branch after merging this pull request.
I'll do squash last time if need squash in terms of commit messages.

zchee · 2022-05-16T18:40:23Z

@imjasonh Great, let's remove deprecated packages from the Go community world :P (I think it will be long-term lol

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

zchee · 2022-05-16T19:24:29Z

@imjasonh
I wrote this change by hand this time and it was very annoying lol
I'll write an analyzer that rewrites source code using "x/tools/go/analysis" and send a pull request to fulcio and rekor, with it. It would be useful in other projects as well.

Well, PTAL.

imjasonh · 2022-05-16T20:01:47Z

I'll write an analyzer that rewrites source code using "x/tools/go/analysis" and send a pull request to fulcio and rekor, with it. It would be useful in other projects as well.

Oh please oh please oh please. If you do this I will be forever in your debt. 🙏

imjasonh · 2022-05-16T20:03:20Z

https://github.com/sigstore/cosign/runs/6458613293?check_suite_focus=true#step:12:286 looks like a bad %w usage.

I've noticed when doing this in other repos that sometimes you'll have a errors.Wrapf("hello", someString) (without a %s), which nothing complains about. But then when you change it to fmt.Errorf things notice the missing placeholder and complain, or fail, or have bad output. It's good to find them, but it's one more annoying thing to have to look for.

zchee · 2022-05-16T20:05:47Z

@imjasonh Ah, mistake, will fix asap.

It's good to find them, but it's one more annoying thing to have to look for.

Yeah, it seems to pkg/errors bug(?), I'm surprised.

Oh please oh please oh please. If you do this I will be forever in your debt. 🙏

lol, will do.

zchee · 2022-05-16T20:10:31Z

pkg/cosign/kubernetes/webhook/validator.go

@@ -433,7 +433,7 @@ func ValidatePolicySignaturesForAuthority(ctx context.Context, ref name.Referenc
 		// https://github.com/sigstore/cosign/issues/1652
 		sps, err := valid(ctx, ref, rekorClient, authority.Key.PublicKeys, remoteOpts...)
 		if err != nil {
-			return nil, errors.Wrap(err, fmt.Sprintf("failed to validate public keys with authority %s for %s", name, ref.Name()))
+			return nil, fmt.Errorf(fmt.Sprintf("failed to validate public keys with authority %s for %s: %w", name, ref.Name()), err)


will fix too.

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

zchee · 2022-05-16T20:57:01Z

@imjasonh

sigstore/cosign/runs/6458613293?check_suite_focus=true#step:12:286 looks like a bad %w usage.

I've noticed when doing this in other repos that sometimes you'll have a errors.Wrapf("hello", someString) (without a %s), which nothing complains about. But then when you change it to fmt.Errorf things notice the missing placeholder and complain, or fail, or have bad output. It's good to find them, but it's one more annoying thing to have to look for.

I found the root cause that GetEnvTargetRepository did not handle error until now. Fixed on 80ab7ef (#1887). PTALA.

codecov-commenter · 2022-05-16T20:57:33Z

Codecov Report

Merging #1887 (80ab7ef) into main (8b7017d) will increase coverage by 0.01%.
The diff coverage is 11.11%.

@@            Coverage Diff             @@
##             main    #1887      +/-   ##
==========================================
+ Coverage   33.35%   33.36%   +0.01%     
==========================================
  Files         146      146              
  Lines        9370     9372       +2     
==========================================
+ Hits         3125     3127       +2     
  Misses       5874     5874              
  Partials      371      371

Impacted Files	Coverage Δ
cmd/cosign/cli/attest.go	`0.00% <0.00%> (ø)`
cmd/cosign/cli/commands.go	`0.00% <0.00%> (ø)`
cmd/cosign/cli/dockerfile/verify.go	`41.66% <ø> (ø)`
cmd/cosign/cli/fulcio/fulcio.go	`21.42% <0.00%> (ø)`
cmd/cosign/cli/fulcio/fulcioroots/fulcioroots.go	`36.36% <0.00%> (ø)`
cmd/cosign/cli/generate/generate_key_pair.go	`9.21% <0.00%> (ø)`
cmd/cosign/cli/load.go	`0.00% <0.00%> (ø)`
cmd/cosign/cli/manifest/verify.go	`47.69% <0.00%> (ø)`
cmd/cosign/cli/options/oidc.go	`0.00% <0.00%> (ø)`
cmd/cosign/cli/policy_init.go	`1.40% <0.00%> (ø)`
... and 32 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 8b7017d...80ab7ef. Read the comment docs.

zchee · 2022-05-17T12:51:28Z

@imjasonh @dlorenc @cpanato thanks! I'll fix rekor and fulcio too.

zchee force-pushed the deps/remove-pkg-errors branch from db5ccc0 to ea6d648 Compare May 16, 2022 18:12

zchee commented May 16, 2022

View reviewed changes

cmd/cosign/cli/commands.go Show resolved Hide resolved

cmd/cosign/cli: remove dependency on deprecated github.com/pkg/errors

7025f69

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

zchee force-pushed the deps/remove-pkg-errors branch from ea6d648 to 7025f69 Compare May 16, 2022 18:18

zchee added 2 commits May 17, 2022 03:19

cmd/sget/cli: remove dependency on deprecated github.com/pkg/errors

bdb5b54

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

internal/pkg/cosign/ephemeral: remove dependency on pkg/errors

45b4f88

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

imjasonh previously approved these changes May 16, 2022

View reviewed changes

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

24b1428

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

zchee dismissed imjasonh’s stale review via 24b1428 May 16, 2022 19:09

zchee added 5 commits May 17, 2022 04:13

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

87f6c90

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

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

5088ff0

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

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

27b11b5

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

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

39ffcaf

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

go.mod: go mod tidy

706b081

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

zchee marked this pull request as ready for review May 16, 2022 19:24

zchee commented May 16, 2022

View reviewed changes

zchee added 2 commits May 17, 2022 05:52

pkg/cosign/kubernetes/webhook: remove unnecessary fmt.Sprintf

3284ba9

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

pkg/oci/remote: should handle error on name.NewRepository

80ab7ef

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

dlorenc approved these changes May 17, 2022

View reviewed changes

cpanato approved these changes May 17, 2022

View reviewed changes

dlorenc merged commit 03e66aa into sigstore:main May 17, 2022

github-actions bot added this to the v1.9.0 milestone May 17, 2022

zchee deleted the deps/remove-pkg-errors branch May 17, 2022 12:50

imjasonh mentioned this pull request May 17, 2022

Consider dropping dependency on github.com/pkg/errors docker/cli#3618

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Remove dependency on deprecated github.com/pkg/errors #1887

Remove dependency on deprecated github.com/pkg/errors #1887

zchee commented May 16, 2022 •

edited

Loading

zchee commented May 16, 2022

zchee commented May 16, 2022 •

edited

Loading

zchee commented May 16, 2022 •

edited

Loading

zchee commented May 16, 2022 •

edited

Loading

imjasonh commented May 16, 2022

imjasonh commented May 16, 2022

zchee commented May 16, 2022 •

edited

Loading

zchee May 16, 2022

zchee commented May 16, 2022 •

edited

Loading

codecov-commenter commented May 16, 2022 •

edited

Loading

zchee commented May 17, 2022

Remove dependency on deprecated github.com/pkg/errors #1887

Remove dependency on deprecated github.com/pkg/errors #1887

Conversation

zchee commented May 16, 2022 • edited Loading

Summary

Ticket Link

Release Note

zchee commented May 16, 2022

zchee commented May 16, 2022 • edited Loading

zchee commented May 16, 2022 • edited Loading

zchee commented May 16, 2022 • edited Loading

imjasonh commented May 16, 2022

imjasonh commented May 16, 2022

zchee commented May 16, 2022 • edited Loading

zchee May 16, 2022

Choose a reason for hiding this comment

zchee commented May 16, 2022 • edited Loading

codecov-commenter commented May 16, 2022 • edited Loading

Codecov Report

zchee commented May 17, 2022

zchee commented May 16, 2022 •

edited

Loading

zchee commented May 16, 2022 •

edited

Loading

zchee commented May 16, 2022 •

edited

Loading

zchee commented May 16, 2022 •

edited

Loading

zchee commented May 16, 2022 •

edited

Loading

zchee commented May 16, 2022 •

edited

Loading

codecov-commenter commented May 16, 2022 •

edited

Loading