From 4878dff3e2c89382699c29c10dc5036367275575 Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Mon, 5 Oct 2020 12:33:53 -0700 Subject: Remove excessive error wrapping In case os.Open[File], os.Mkdir[All], ioutil.ReadFile and the like fails, the error message already contains the file name and the operation that fails, so there is no need to wrap the error with something like "open %s failed". While at it - replace a few places with os.Open, ioutil.ReadAll with ioutil.ReadFile. - replace errors.Wrapf with errors.Wrap for cases where there are no %-style arguments. Signed-off-by: Kir Kolyshkin --- pkg/domain/infra/abi/trust.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkg/domain/infra/abi/trust.go') diff --git a/pkg/domain/infra/abi/trust.go b/pkg/domain/infra/abi/trust.go index c697722ee..4a12297f9 100644 --- a/pkg/domain/infra/abi/trust.go +++ b/pkg/domain/infra/abi/trust.go @@ -24,7 +24,7 @@ func (ir *ImageEngine) ShowTrust(ctx context.Context, args []string, options ent } report.Raw, err = ioutil.ReadFile(policyPath) if err != nil { - return nil, errors.Wrapf(err, "unable to read %s", policyPath) + return nil, err } if options.Raw { return &report, nil @@ -67,7 +67,7 @@ func (ir *ImageEngine) SetTrust(ctx context.Context, args []string, options enti if !os.IsNotExist(err) { policyContent, err := ioutil.ReadFile(policyPath) if err != nil { - return errors.Wrapf(err, "unable to read %s", policyPath) + return err } if err := json.Unmarshal(policyContent, &policyContentStruct); err != nil { return errors.Errorf("could not read trust policies") -- cgit v1.2.3-54-g00ecf