From 5f07c992dad309e9e3ff263c056eea785f8d26b0 Mon Sep 17 00:00:00 2001 From: "A.Unger" Date: Wed, 19 Aug 2020 11:29:53 +0200 Subject: [PATCH] go-micro errors on bundles (OCIS-363) --- pkg/store/filesystem/bundles.go | 2 +- pkg/store/filesystem/io.go | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkg/store/filesystem/bundles.go b/pkg/store/filesystem/bundles.go index 898aaeb0ba..e257d78af2 100644 --- a/pkg/store/filesystem/bundles.go +++ b/pkg/store/filesystem/bundles.go @@ -23,7 +23,7 @@ func (s Store) ListBundles(bundleType proto.Bundle_Type) ([]*proto.Bundle, error bundlesFolder := s.buildFolderPathForBundles(false) bundleFiles, err := ioutil.ReadDir(bundlesFolder) if err != nil { - return []*proto.Bundle{}, nil + return []*proto.Bundle{}, merrors.FromError(err) } records := make([]*proto.Bundle, 0, len(bundleFiles)) diff --git a/pkg/store/filesystem/io.go b/pkg/store/filesystem/io.go index 6b76a16c5d..6d0429c42c 100644 --- a/pkg/store/filesystem/io.go +++ b/pkg/store/filesystem/io.go @@ -5,6 +5,7 @@ import ( "github.com/golang/protobuf/jsonpb" "github.com/golang/protobuf/proto" + merrors "github.com/micro/go-micro/v2/errors" ) // Unmarshal file into record @@ -12,7 +13,7 @@ func (s Store) parseRecordFromFile(record proto.Message, filePath string) error file, err := os.Open(filePath) if err != nil { s.Logger.Err(err).Msgf("error reading file %v: file not found", filePath) - return err + return merrors.FromError(err) } defer file.Close() @@ -29,14 +30,14 @@ func (s Store) writeRecordToFile(record proto.Message, filePath string) error { file, err := os.Create(filePath) if err != nil { s.Logger.Err(err).Msgf("error writing file %v: opening failed", filePath) - return err + return merrors.FromError(err) } defer file.Close() encoder := jsonpb.Marshaler{} if err = encoder.Marshal(file, record); err != nil { s.Logger.Err(err).Msgf("error writing file %v: marshalling failed", filePath) - return err + return merrors.FromError(err) } return nil