From d9464c4a227b97eee84ad95224db905282a54d00 Mon Sep 17 00:00:00 2001 From: Chris Cummer Date: Sun, 1 Dec 2019 20:46:52 -0800 Subject: [PATCH] Use errwrap to improve fmt.Errorf() handling (#771) Errwrap: https://github.com/fatih/errwrap Signed-off-by: Chris Cummer --- go.sum | 2 -- modules/pocket/client.go | 4 ++-- modules/pocket/widget.go | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/go.sum b/go.sum index 675228c8..180e4ad3 100644 --- a/go.sum +++ b/go.sum @@ -25,8 +25,6 @@ github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d h1:G0m3OIz70MZUW github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg= github.com/VictorAvelar/devto-api-go v1.0.0 h1:oXmzye3xYvlgBX18vX4+v6LVbjoihgIokpeOpzeJzqU= github.com/VictorAvelar/devto-api-go v1.0.0/go.mod h1:gX13cqzMdpo49qP8VtBR2uCnzW7d76LFrAVSX2eLifY= -github.com/adlio/trello v1.4.0 h1:Wpo6fPFgf28N3PbFyZkBJx2nDKkuLAoPkJ8Eh7jE3Bg= -github.com/adlio/trello v1.4.0/go.mod h1:l2068AhUuUuQ9Vsb95ECMueHThYyAj4e85lWPmr2/LE= github.com/adlio/trello v1.6.0 h1:ajkfwcQiBv83Vd/HHkUNOIrK3NJtEEHwUMnZJHbCwAo= github.com/adlio/trello v1.6.0/go.mod h1:l2068AhUuUuQ9Vsb95ECMueHThYyAj4e85lWPmr2/LE= github.com/akavel/rsrc v0.8.0/go.mod h1:uLoCtb9J+EyAqh+26kdrTgmzRBFPGOolLWKpdxkKq+c= diff --git a/modules/pocket/client.go b/modules/pocket/client.go index 377dafa5..eb67a796 100644 --- a/modules/pocket/client.go +++ b/modules/pocket/client.go @@ -100,8 +100,8 @@ func (client *Client) request(req request, result interface{}) error { } if err := json.Unmarshal(responseBody, &result); err != nil { - return fmt.Errorf(`Could not unmarshal url [%s] - response [%s] request[%s] error:%v`, req.url, responseBody, jsonValues, err) + return fmt.Errorf("Could not unmarshal url [%s] \n\t\tresponse [%s] request[%s] error:%w", + req.url, responseBody, jsonValues, err) } return nil diff --git a/modules/pocket/widget.go b/modules/pocket/widget.go index 19927816..58352313 100644 --- a/modules/pocket/widget.go +++ b/modules/pocket/widget.go @@ -84,7 +84,7 @@ func writeMetaDataToDisk(metaData pocketMetaData) error { fileData, err := yaml.Marshal(metaData) if err != nil { - return fmt.Errorf("Could not write token to disk %v", err) + return fmt.Errorf("Could not write token to disk %w", err) } wtfConfigDir, err := cfg.WtfConfigDir()