Go 1.15 bump and other updates

Signed-off-by: Dave Henderson <dhenderson@gmail.com>

4 files changed, 19 insertions, 10 deletions

diff --git a/data/data.go b/data/data.go
index beda7f03..b449b375 100644
--- a/data/data.go
+++ b/data/data.go
@@ -189,11 +189,11 @@ func csvParseArgs(args ...string) (in, delim string, hdr []string) {
 
 // autoIndex - calculates a default string column name given a numeric value
 func autoIndex(i int) string {
-	s := ""
+	s := &strings.Builder{}
 	for n := 0; n <= i/26; n++ {
-		s += string('A' + i%26)
+		s.WriteRune('A' + rune(i%26))
 	}
-	return s
+	return s.String()
 }
 
 // CSV - Unmarshal CSV
diff --git a/data/datasource.go b/data/datasource.go
index 2e50258e..2e52c9e8 100644
--- a/data/datasource.go
+++ b/data/datasource.go
@@ -1,6 +1,7 @@
 package data
 
 import (
+	"context"
 	"fmt"
 	"io"
 	"mime"
@@ -80,6 +81,8 @@ func (d *Data) lookupReader(scheme string) (func(*Source, ...string) ([]byte, er
 
 // Data -
 type Data struct {
+	ctx context.Context
+
 	Sources map[string]*Source
 
 	sourceReaders map[string]func(*Source, ...string) ([]byte, error)
@@ -105,12 +108,12 @@ func NewData(datasourceArgs, headerArgs []string) (*Data, error) {
 	if err != nil {
 		return nil, err
 	}
-	data := FromConfig(cfg)
+	data := FromConfig(context.Background(), cfg)
 	return data, nil
 }
 
 // FromConfig - internal use only!
-func FromConfig(cfg *config.Config) *Data {
+func FromConfig(ctx context.Context, cfg *config.Config) *Data {
 	sources := map[string]*Source{}
 	for alias, d := range cfg.DataSources {
 		sources[alias] = &Source{
@@ -127,6 +130,7 @@ func FromConfig(cfg *config.Config) *Data {
 		}
 	}
 	return &Data{
+		ctx:          ctx,
 		Sources:      sources,
 		extraHeaders: cfg.ExtraHeaders,
 	}
diff --git a/data/datasource_git_test.go b/data/datasource_git_test.go
index b6078473..b985ab7d 100644
--- a/data/datasource_git_test.go
+++ b/data/datasource_git_test.go
@@ -310,7 +310,7 @@ func overrideFSLoader(fs billy.Filesystem) {
 }
 
 func TestOpenFileRepo(t *testing.T) {
-	ctx := context.TODO()
+	ctx := context.Background()
 	repoFS := setupGitRepo(t)
 	g := gitsource{}
 
@@ -349,7 +349,7 @@ func TestOpenFileRepo(t *testing.T) {
 }
 
 func TestOpenBareFileRepo(t *testing.T) {
-	ctx := context.TODO()
+	ctx := context.Background()
 	repoFS := setupGitRepo(t)
 	g := gitsource{}
 
diff --git a/data/datasource_test.go b/data/datasource_test.go
index 737a2539..3a71de14 100644
--- a/data/datasource_test.go
+++ b/data/datasource_test.go
@@ -1,6 +1,7 @@
 package data
 
 import (
+	"context"
 	"fmt"
 	"net/http"
 	"net/url"
@@ -329,11 +330,13 @@ func TestMimeTypeWithArg(t *testing.T) {
 }
 
 func TestFromConfig(t *testing.T) {
+	ctx := context.Background()
 	cfg := &config.Config{}
 	expected := &Data{
+		ctx:     ctx,
 		Sources: map[string]*Source{},
 	}
-	assert.EqualValues(t, expected, FromConfig(cfg))
+	assert.EqualValues(t, expected, FromConfig(ctx, cfg))
 
 	cfg = &config.Config{
 		DataSources: map[string]config.DataSource{
@@ -343,6 +346,7 @@ func TestFromConfig(t *testing.T) {
 		},
 	}
 	expected = &Data{
+		ctx: ctx,
 		Sources: map[string]*Source{
 			"foo": {
 				Alias: "foo",
@@ -350,7 +354,7 @@ func TestFromConfig(t *testing.T) {
 			},
 		},
 	}
-	assert.EqualValues(t, expected, FromConfig(cfg))
+	assert.EqualValues(t, expected, FromConfig(ctx, cfg))
 
 	cfg = &config.Config{
 		DataSources: map[string]config.DataSource{
@@ -373,6 +377,7 @@ func TestFromConfig(t *testing.T) {
 		},
 	}
 	expected = &Data{
+		ctx: ctx,
 		Sources: map[string]*Source{
 			"foo": {
 				Alias: "foo",
@@ -392,5 +397,5 @@ func TestFromConfig(t *testing.T) {
 			},
 		},
 	}
-	assert.EqualValues(t, expected, FromConfig(cfg))
+	assert.EqualValues(t, expected, FromConfig(ctx, cfg))
 }