Merge pull request #1023 from hairyhenderson/golangci-lint-config-file

Moving lint config to config file, fixing some issues

5 files changed, 13 insertions, 9 deletions

diff --git a/data/datasource_blob.go b/data/datasource_blob.go
index d76f0a35..b40ae198 100644
--- a/data/datasource_blob.go
+++ b/data/datasource_blob.go
@@ -22,7 +22,7 @@ import (
 
 func readBlob(source *Source, args ...string) (output []byte, err error) {
 	if len(args) >= 2 {
-		return nil, errors.New("Maximum two arguments to blob datasource: alias, extraPath")
+		return nil, errors.New("maximum two arguments to blob datasource: alias, extraPath")
 	}
 
 	ctx := context.TODO()
diff --git a/data/datasource_git.go b/data/datasource_git.go
index f4b6670d..d3e79d57 100644
--- a/data/datasource_git.go
+++ b/data/datasource_git.go
@@ -118,9 +118,9 @@ func (g gitsource) parseGitPath(u *url.URL, args ...string) (out *url.URL, p str
 	}
 
 	if len(args) > 0 {
-		argURL, err := g.parseArgURL(args[0])
-		if err != nil {
-			return nil, "", err
+		argURL, uerr := g.parseArgURL(args[0])
+		if uerr != nil {
+			return nil, "", uerr
 		}
 		repo, argpath := g.parseArgPath(u, argURL.Path)
 		out.Path = path.Join(out.Path, repo)
@@ -203,8 +203,8 @@ func (g gitsource) read(fs billy.Filesystem, path string) (string, []byte, error
 		return "", nil, fmt.Errorf("can't stat %s: %w", path, err)
 	}
 	if fi.IsDir() || strings.HasSuffix(path, string(filepath.Separator)) {
-		out, err := g.readDir(fs, path)
-		return jsonArrayMimetype, out, err
+		out, rerr := g.readDir(fs, path)
+		return jsonArrayMimetype, out, rerr
 	}
 
 	f, err := fs.OpenFile(path, os.O_RDONLY, 0)
diff --git a/data/datasource_git_test.go b/data/datasource_git_test.go
index b985ab7d..e26046cd 100644
--- a/data/datasource_git_test.go
+++ b/data/datasource_git_test.go
@@ -75,6 +75,7 @@ func TestParseArgPath(t *testing.T) {
 	}
 
 	for i, d := range data {
+		d := d
 		t.Run(fmt.Sprintf("%d:(%q,%q)==(%q,%q)", i, d.url, d.arg, d.repo, d.path), func(t *testing.T) {
 			t.Parallel()
 			u, _ := url.Parse(d.url)
@@ -175,6 +176,7 @@ func TestParseGitPath(t *testing.T) {
 	}
 
 	for i, d := range data {
+		d := d
 		t.Run(fmt.Sprintf("%d:(%q,%q)==(%q,%q)", i, d.url, d.args, d.repo, d.path), func(t *testing.T) {
 			t.Parallel()
 			u, _ := url.Parse(d.url)
diff --git a/data/datasource_merge.go b/data/datasource_merge.go
index fa69c81f..044302a2 100644
--- a/data/datasource_merge.go
+++ b/data/datasource_merge.go
@@ -31,9 +31,9 @@ func (d *Data) readMerge(source *Source, args ...string) ([]byte, error) {
 		subSource, err := d.lookupSource(part)
 		if err != nil {
 			// maybe it's a relative filename?
-			u, err := config.ParseSourceURL(part)
-			if err != nil {
-				return nil, err
+			u, uerr := config.ParseSourceURL(part)
+			if uerr != nil {
+				return nil, uerr
 			}
 			subSource = &Source{
 				Alias: part,
diff --git a/data/datasource_test.go b/data/datasource_test.go
index 003d7731..4cffc763 100644
--- a/data/datasource_test.go
+++ b/data/datasource_test.go
@@ -276,6 +276,7 @@ func TestMimeType(t *testing.T) {
 	}
 
 	for i, d := range data {
+		d := d
 		t.Run(fmt.Sprintf("%d:%q,%q==%q", i, d.url, d.mediaType, d.expected), func(t *testing.T) {
 			s := &Source{URL: mustParseURL(d.url), mediaType: d.mediaType}
 			mt, err := s.mimeType("")
@@ -331,6 +332,7 @@ func TestMimeTypeWithArg(t *testing.T) {
 	}
 
 	for i, d := range data {
+		d := d
 		t.Run(fmt.Sprintf("%d:%q,%q,%q==%q", i, d.url, d.mediaType, d.arg, d.expected), func(t *testing.T) {
 			s := &Source{URL: mustParseURL(d.url), mediaType: d.mediaType}
 			mt, err := s.mimeType(d.arg)