diff options
author | Anthony Fok <foka@debian.org> | 2019-01-28 16:27:43 -0700 |
---|---|---|
committer | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2019-02-01 08:52:29 +0100 |
commit | 6a2bfcbec8df14b1741dbe9b5ead08158bf7adb9 (patch) | |
tree | ec66e5e5d60e2fdc01c239fcbade6bee16629161 /tpl | |
parent | 59d87044a4146f578b92b3d67b46660212940912 (diff) |
tpl/data: Prevent getJSON and getCSV fetch failure from aborting build
Fixes #5643
Diffstat (limited to 'tpl')
-rw-r--r-- | tpl/data/data.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tpl/data/data.go b/tpl/data/data.go index 33eee7b27..81fde9d70 100644 --- a/tpl/data/data.go +++ b/tpl/data/data.go @@ -83,7 +83,8 @@ func (ns *Namespace) GetCSV(sep string, urlParts ...string) (d [][]string, err e err = ns.getResource(cache, unmarshal, req) if err != nil { - return nil, _errors.Wrapf(err, "failed to read CSV resource %q", url) + ns.deps.Log.ERROR.Printf("Failed to get CSV resource %q: %s", url, err) + return nil, nil } return @@ -113,19 +114,18 @@ func (ns *Namespace) GetJSON(urlParts ...string) (interface{}, error) { req.Header.Add("Accept", "application/json") err = ns.getResource(cache, unmarshal, req) - if err != nil { - return nil, _errors.Wrapf(err, "failed to get getJSON resource %q", url) + ns.deps.Log.ERROR.Printf("Failed to get JSON resource %q: %s", url, err) + return nil, nil } return v, nil - } // parseCSV parses bytes of CSV data into a slice slice string or an error func parseCSV(c []byte, sep string) ([][]string, error) { if len(sep) != 1 { - return nil, errors.New("Incorrect length of csv separator: " + sep) + return nil, errors.New("Incorrect length of CSV separator: " + sep) } b := bytes.NewReader(c) r := csv.NewReader(b) |