Skip to content

Commit

Permalink
Modify error messages on failures to close
Browse files Browse the repository at this point in the history
- Use a wrapping wording similar to c/image; it's slightly
  awkward at the start of the error message, but those should
  hopefully be rare.
- Notably, distinguish the three failure paths in (skopeo layers).

Signed-off-by: Miloslav Trmač <[email protected]>
  • Loading branch information
mtrmac committed Jun 30, 2022
1 parent f7df4a0 commit 7abcca9
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion cmd/skopeo/copy.go
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ func (opts *copyOptions) run(args []string, stdout io.Writer) (retErr error) {
}
defer func() {
if err := policyContext.Destroy(); err != nil {
retErr = noteCloseFailure(retErr, "error tearing down policy context", err)
retErr = noteCloseFailure(retErr, "tearing down policy context", err)
}
}()

Expand Down
2 changes: 1 addition & 1 deletion cmd/skopeo/inspect.go
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ func (opts *inspectOptions) run(args []string, stdout io.Writer) (retErr error)

defer func() {
if err := src.Close(); err != nil {
retErr = noteCloseFailure(retErr, "could not close image", err)
retErr = noteCloseFailure(retErr, "closing image", err)
}
}()

Expand Down
6 changes: 3 additions & 3 deletions cmd/skopeo/layers.go
Original file line number Diff line number Diff line change
Expand Up @@ -79,14 +79,14 @@ func (opts *layersOptions) run(args []string, stdout io.Writer) (retErr error) {
return err
}, opts.retryOpts); err != nil {
if closeErr := rawSource.Close(); closeErr != nil {
return errors.Wrapf(err, " (close error: %v)", closeErr)
return errors.Wrapf(err, " (closing image source: %v)", closeErr)
}

return err
}
defer func() {
if err := src.Close(); err != nil {
retErr = noteCloseFailure(retErr, "close error", err)
retErr = noteCloseFailure(retErr, "closing image", err)
}
}()

Expand Down Expand Up @@ -136,7 +136,7 @@ func (opts *layersOptions) run(args []string, stdout io.Writer) (retErr error) {

defer func() {
if err := dest.Close(); err != nil {
retErr = noteCloseFailure(retErr, "close error", err)
retErr = noteCloseFailure(retErr, "closing destination", err)
}
}()

Expand Down
2 changes: 1 addition & 1 deletion cmd/skopeo/sync.go
Original file line number Diff line number Diff line change
Expand Up @@ -514,7 +514,7 @@ func (opts *syncOptions) run(args []string, stdout io.Writer) (retErr error) {
}
defer func() {
if err := policyContext.Destroy(); err != nil {
retErr = noteCloseFailure(retErr, "error tearing down policy context", err)
retErr = noteCloseFailure(retErr, "tearing down policy context", err)
}
}()

Expand Down

0 comments on commit 7abcca9

Please sign in to comment.