replace hashicorp/errwrap with go1.13 native error wrapping #60
+4
−12
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The `errwrap.Wrapf()` function was deprecated in favor of native go 1.13 error wrapping in github.com/hashicorp/errwrap v1.1.0. This updates the `Prefix()` function to use native error wrapping, which removes the dependency on github.com/hashicorp/errwrap. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
|
|
|
@dnephin @mitchellh PTAL 🤗 (noticed this was deprecated when updating dependencies (moby/moby#43308), so thought I could as well try to get rid of that dependency altogether 😅) |
|
@mitchellh @mwhooker are there any plans to merge this PR? |
|
I found this issue while considering further adoption of this package vs the upstream support in Go 1.20 for wrapper errors. See |
dolmen
approved these changes
Mar 20, 2024
dolmen
suggested changes
Mar 20, 2024
| @@ -17,7 +13,7 @@ func Prefix(err error, prefix string) error { | |||
| return nil | |||
| } | |||
|
|
|||
| format := fmt.Sprintf("%s {{err}}", prefix) | |||
| format := prefix + " %w" | |||
There was a problem hiding this comment.
prefix might contain %. It must not be concatenated with formatting word.
| @@ -27,11 +23,11 @@ func Prefix(err error, prefix string) error { | |||
|
|
|||
| // Wrap each of the errors | |||
| for i, e := range err.Errors { | |||
| err.Errors[i] = errwrap.Wrapf(format, e) | |||
| err.Errors[i] = fmt.Errorf(format, e) | |||
There was a problem hiding this comment.
Suggested change
| err.Errors[i] = fmt.Errorf(format, e) | |
| err.Errors[i] = fmt.Errorf("%s %w", prefix, e) |
| } | ||
|
|
||
| return err | ||
| default: | ||
| return errwrap.Wrapf(format, err) | ||
| return fmt.Errorf(format, err) |
There was a problem hiding this comment.
Suggested change
| return fmt.Errorf(format, err) | |
| return fmt.Errorf("%s %w", prefix, err) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The
errwrap.Wrapf()function was deprecated in favor of native go 1.13 errorwrapping in github.com/hashicorp/errwrap v1.1.0 (hashicorp/errwrap#9).
This updates the
Prefix()function to use native error wrapping, which removes the dependency on github.com/hashicorp/errwrap.