mirror of
https://github.com/containers/podman.git
synced 2025-08-06 19:44:14 +08:00
0f7d54b026
Migrate the Podman code base over to `common/libimage` which replaces `libpod/image` and a lot of glue code entirely. Note that I tried to leave bread crumbs for changed tests. Miscellaneous changes: * Some errors yield different messages which required to alter some tests. * I fixed some pre-existing issues in the code. Others were marked as `//TODO`s to prevent the PR from exploding. * The `NamesHistory` of an image is returned as is from the storage. Previously, we did some filtering which I think is undesirable. Instead we should return the data as stored in the storage. * Touched handlers use the ABI interfaces where possible. * Local image resolution: previously Podman would match "foo" on "myfoo". This behaviour has been changed and Podman will now only match on repository boundaries such that "foo" would match "my/foo" but not "myfoo". I consider the old behaviour to be a bug, at the very least an exotic corner case. * Futhermore, "foo:none" does *not* resolve to a local image "foo" without tag anymore. It's a hill I am (almost) willing to die on. * `image prune` prints the IDs of pruned images. Previously, in some cases, the names were printed instead. The API clearly states ID, so we should stick to it. * Compat endpoint image removal with _force_ deletes the entire not only the specified tag. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
106 lines
2.6 KiB
Go
106 lines
2.6 KiB
Go
package errorhandling
|
|
|
|
import (
|
|
"os"
|
|
"strings"
|
|
|
|
"github.com/hashicorp/go-multierror"
|
|
"github.com/pkg/errors"
|
|
"github.com/sirupsen/logrus"
|
|
)
|
|
|
|
// JoinErrors converts the error slice into a single human-readable error.
|
|
func JoinErrors(errs []error) error {
|
|
if len(errs) == 0 {
|
|
return nil
|
|
}
|
|
|
|
// `multierror` appends new lines which we need to remove to prevent
|
|
// blank lines when printing the error.
|
|
var multiE *multierror.Error
|
|
multiE = multierror.Append(multiE, errs...)
|
|
|
|
finalErr := multiE.ErrorOrNil()
|
|
if finalErr == nil {
|
|
return finalErr
|
|
}
|
|
if len(multiE.WrappedErrors()) == 1 && logrus.IsLevelEnabled(logrus.TraceLevel) {
|
|
return multiE.WrappedErrors()[0]
|
|
}
|
|
return errors.New(strings.TrimSpace(finalErr.Error()))
|
|
}
|
|
|
|
// ErrorsToString converts the slice of errors into a slice of corresponding
|
|
// error messages.
|
|
func ErrorsToStrings(errs []error) []string {
|
|
if len(errs) == 0 {
|
|
return nil
|
|
}
|
|
strErrs := make([]string, len(errs))
|
|
for i := range errs {
|
|
strErrs[i] = errs[i].Error()
|
|
}
|
|
return strErrs
|
|
}
|
|
|
|
// StringsToErrors converts a slice of error messages into a slice of
|
|
// corresponding errors.
|
|
func StringsToErrors(strErrs []string) []error {
|
|
if len(strErrs) == 0 {
|
|
return nil
|
|
}
|
|
errs := make([]error, len(strErrs))
|
|
for i := range strErrs {
|
|
errs[i] = errors.New(strErrs[i])
|
|
}
|
|
return errs
|
|
}
|
|
|
|
// SyncQuiet syncs a file and logs any error. Should only be used within
|
|
// a defer.
|
|
func SyncQuiet(f *os.File) {
|
|
if err := f.Sync(); err != nil {
|
|
logrus.Errorf("unable to sync file %s: %q", f.Name(), err)
|
|
}
|
|
}
|
|
|
|
// CloseQuiet closes a file and logs any error. Should only be used within
|
|
// a defer.
|
|
func CloseQuiet(f *os.File) {
|
|
if err := f.Close(); err != nil {
|
|
logrus.Errorf("unable to close file %s: %q", f.Name(), err)
|
|
}
|
|
}
|
|
|
|
// Contains checks if err's message contains sub's message. Contains should be
|
|
// used iff either err or sub has lost type information (e.g., due to
|
|
// marshaling). For typed errors, please use `errors.Contains(...)` or `Is()`
|
|
// in recent version of Go.
|
|
func Contains(err error, sub error) bool {
|
|
return strings.Contains(err.Error(), sub.Error())
|
|
}
|
|
|
|
// ErrorModel is used in remote connections with podman
|
|
type ErrorModel struct {
|
|
// API root cause formatted for automated parsing
|
|
// example: API root cause
|
|
Because string `json:"cause"`
|
|
// human error message, formatted for a human to read
|
|
// example: human error message
|
|
Message string `json:"message"`
|
|
// http response code
|
|
ResponseCode int `json:"response"`
|
|
}
|
|
|
|
func (e ErrorModel) Error() string {
|
|
return e.Message
|
|
}
|
|
|
|
func (e ErrorModel) Cause() error {
|
|
return errors.New(e.Because)
|
|
}
|
|
|
|
func (e ErrorModel) Code() int {
|
|
return e.ResponseCode
|
|
}
|