summaryrefslogtreecommitdiffstats
path: root/tpl/data/resources.go
diff options
context:
space:
mode:
authorBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2019-03-24 10:11:16 +0100
committerBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2019-03-24 16:14:51 +0100
commitb5f39d23b86f9cb83c51da9fe4abb4c19c01c3b7 (patch)
treecf23180dc07698391cf47c2fe525755417729020 /tpl/data/resources.go
parent3011f36c27ecde309325e6c75ca377f4f87fa97a (diff)
all: Apply staticcheck recommendations
Diffstat (limited to 'tpl/data/resources.go')
-rw-r--r--tpl/data/resources.go10
1 files changed, 5 insertions, 5 deletions
diff --git a/tpl/data/resources.go b/tpl/data/resources.go
index 8b246a662..7de440ca6 100644
--- a/tpl/data/resources.go
+++ b/tpl/data/resources.go
@@ -34,7 +34,7 @@ var (
)
// getRemote loads the content of a remote file. This method is thread safe.
-func (ns *Namespace) getRemote(cache *filecache.Cache, unmarshal func([]byte) (error, bool), req *http.Request) error {
+func (ns *Namespace) getRemote(cache *filecache.Cache, unmarshal func([]byte) (bool, error), req *http.Request) error {
url := req.URL.String()
id := helpers.MD5String(url)
var handled bool
@@ -63,7 +63,7 @@ func (ns *Namespace) getRemote(cache *filecache.Cache, unmarshal func([]byte) (e
}
res.Body.Close()
- err, retry = unmarshal(b)
+ retry, err = unmarshal(b)
if err == nil {
// Return it so it can be cached.
@@ -85,7 +85,7 @@ func (ns *Namespace) getRemote(cache *filecache.Cache, unmarshal func([]byte) (e
if !handled {
// This is cached content and should be correct.
- err, _ = unmarshal(b)
+ _, err = unmarshal(b)
}
return err
@@ -104,14 +104,14 @@ func getLocal(url string, fs afero.Fs, cfg config.Provider) ([]byte, error) {
// getResource loads the content of a local or remote file and returns its content and the
// cache ID used, if relevant.
-func (ns *Namespace) getResource(cache *filecache.Cache, unmarshal func(b []byte) (error, bool), req *http.Request) error {
+func (ns *Namespace) getResource(cache *filecache.Cache, unmarshal func(b []byte) (bool, error), req *http.Request) error {
switch req.URL.Scheme {
case "":
b, err := getLocal(req.URL.String(), ns.deps.Fs.Source, ns.deps.Cfg)
if err != nil {
return err
}
- err, _ = unmarshal(b)
+ _, err = unmarshal(b)
return err
default:
return ns.getRemote(cache, unmarshal, req)