Skip to content

replace pkg/errors#33

Merged
AkihiroSuda merged 1 commit intocontainerd:mainfrom
zouyee:replaceerror
Sep 23, 2021
Merged

replace pkg/errors#33
AkihiroSuda merged 1 commit intocontainerd:mainfrom
zouyee:replaceerror

Conversation

@zouyee
Copy link

@zouyee zouyee commented Sep 21, 2021

replace pkg/errors

Signed-off-by: Zou Nengren [email protected]

@zouyee
Copy link
Author

zouyee commented Sep 21, 2021

/cc @mikebrow @AkihiroSuda

Copy link
Member

@mikebrow mikebrow left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

couple comments.. nothing to do with your changes more the structure of the prior defined errors

snapshotter, err := aufs.New(root)
if err != nil {
return nil, errors.Wrap(plugin.ErrSkipPlugin, err.Error())
return nil, fmt.Errorf("%s: %w", err.Error(), plugin.ErrSkipPlugin)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

accurate port... but it feels it feels like the wrap is backwards maybe it should read:
fmt.Errorf("%s: %w", plugin.ErrSkipPlugin.Error(), err)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Apologies, I was wrong you had it right the first time with fmt.Errorf("%s: %w", err.Error(), plugin.ErrSkipPlugin

@zouyee zouyee force-pushed the replaceerror branch 2 times, most recently from 4eb5dd8 to bd81a32 Compare September 22, 2021 03:14
@codecov-commenter
Copy link

Codecov Report

Merging #33 (bd81a32) into main (6959b76) will not change coverage.
The diff coverage is 18.75%.

Impacted file tree graph

@@           Coverage Diff           @@
##             main      #33   +/-   ##
=======================================
  Coverage   56.46%   56.46%           
=======================================
  Files           1        1           
  Lines         232      232           
=======================================
  Hits          131      131           
  Misses         68       68           
  Partials       33       33           
Impacted Files Coverage Δ
aufs.go 56.46% <18.75%> (ø)

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 6959b76...bd81a32. Read the comment docs.

@zouyee zouyee requested a review from mikebrow September 22, 2021 03:33
Signed-off-by: Zou Nengren <[email protected]>
Copy link
Member

@estesp estesp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@AkihiroSuda AkihiroSuda merged commit 7b5b4a9 into containerd:main Sep 23, 2021
@zouyee zouyee deleted the replaceerror branch September 24, 2021 02:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants