Merge pull request #925 from hairyhenderson/go-1.15-bump

Go 1.15 bump and other updates

Dockerfile

@@ -1,7 +1,7 @@
-# syntax=docker/dockerfile:1.1.5-experimental
+# syntax=docker/dockerfile:1.1.7-experimental
 FROM --platform=linux/amd64 hairyhenderson/upx:3.94 AS upx
 
-FROM --platform=linux/amd64 golang:1.14.4-alpine3.12 AS build
+FROM --platform=linux/amd64 golang:1.15.0-alpine3.12 AS build
 
 ARG TARGETOS
 ARG TARGETARCH

Dockerfile.integration

@@ -1,8 +1,8 @@
-FROM vault:1.4.3 AS vault
+FROM vault:1.5.0 AS vault
 
-FROM consul:1.8.0 AS consul
+FROM consul:1.8.3 AS consul
 
-FROM golang:1.14.6-alpine3.12
+FROM golang:1.15.0-alpine3.12
 
 COPY --from=vault /bin/vault /bin/vault
 COPY --from=consul /bin/consul /bin/consul

Makefile

@@ -169,10 +169,10 @@ build: $(PREFIX)/bin/$(PKG_NAME)_$(GOOS)-$(GOARCH)$(TARGETVARIANT)$(call extensi
 
 ifeq ($(OS),Windows_NT)
 test:
-	$(GO) test -v -coverprofile=c.out ./...
+	$(GO) test -coverprofile=c.out ./...
 else
 test:
-	$(GO) test -v -race -coverprofile=c.out ./...
+	$(GO) test -race -coverprofile=c.out ./...
 endif
 
 integration: build

cmd/gomplate/config_test.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"context"
+	"fmt"
 	"os"
 	"testing"
 	"time"
@@ -183,76 +184,69 @@ func TestPickConfigFile(t *testing.T) {
 	assert.Equal(t, "config.file", cf)
 }
 
-func TestApplyEnvVars_PluginTimeout(t *testing.T) {
-	os.Setenv("GOMPLATE_PLUGIN_TIMEOUT", "bogus")
-
-	ctx := context.TODO()
-	cfg := &config.Config{}
-	_, err := applyEnvVars(ctx, cfg)
-	assert.Error(t, err)
-
-	cfg = &config.Config{
-		PluginTimeout: 2 * time.Second,
-	}
-	expected := &config.Config{
-		PluginTimeout: 2 * time.Second,
-	}
-	actual, err := applyEnvVars(ctx, cfg)
-	assert.NoError(t, err)
-	assert.EqualValues(t, expected, actual)
-
-	os.Setenv("GOMPLATE_PLUGIN_TIMEOUT", "2s")
-	defer os.Unsetenv("GOMPLATE_PLUGIN_TIMEOUT")
-
-	cfg = &config.Config{}
-	actual, err = applyEnvVars(ctx, cfg)
-	assert.NoError(t, err)
-	assert.EqualValues(t, expected, actual)
-
-	cfg = &config.Config{
-		PluginTimeout: 100 * time.Millisecond,
-	}
-	expected = &config.Config{
-		PluginTimeout: 100 * time.Millisecond,
-	}
-	actual, err = applyEnvVars(ctx, cfg)
-	assert.NoError(t, err)
-	assert.EqualValues(t, expected, actual)
-
-}
-
-func TestApplyEnvVars_SuppressEmpty(t *testing.T) {
-	os.Setenv("GOMPLATE_SUPPRESS_EMPTY", "bogus")
-	defer os.Unsetenv("GOMPLATE_SUPPRESS_EMPTY")
-
-	ctx := context.TODO()
-	cfg := &config.Config{}
-	expected := &config.Config{
-		SuppressEmpty: false,
-	}
-	actual, err := applyEnvVars(ctx, cfg)
-	assert.NoError(t, err)
-	assert.EqualValues(t, expected, actual)
-
-	os.Setenv("GOMPLATE_SUPPRESS_EMPTY", "true")
-
-	cfg = &config.Config{}
-	expected = &config.Config{
-		SuppressEmpty: true,
+func TestApplyEnvVars(t *testing.T) {
+	data := []struct {
+		env             string
+		value           string
+		shouldErr       bool
+		input, expected *config.Config
+	}{
+		{
+			"GOMPLATE_PLUGIN_TIMEOUT", "bogus",
+			true,
+			&config.Config{}, nil,
+		},
+		{
+			"GOMPLATE_PLUGIN_TIMEOUT", "bogus",
+			false,
+			&config.Config{PluginTimeout: 2 * time.Second},
+			&config.Config{PluginTimeout: 2 * time.Second},
+		},
+		{
+			"GOMPLATE_PLUGIN_TIMEOUT", "2s",
+			false,
+			&config.Config{},
+			&config.Config{PluginTimeout: 2 * time.Second},
+		},
+		{
+			"GOMPLATE_PLUGIN_TIMEOUT", "2s",
+			false,
+			&config.Config{PluginTimeout: 100 * time.Millisecond},
+			&config.Config{PluginTimeout: 100 * time.Millisecond},
+		},
+
+		{
+			"GOMPLATE_SUPPRESS_EMPTY", "bogus",
+			false,
+			&config.Config{},
+			&config.Config{SuppressEmpty: false},
+		},
+		{
+			"GOMPLATE_SUPPRESS_EMPTY", "true",
+			false,
+			&config.Config{},
+			&config.Config{SuppressEmpty: true},
+		},
+		{
+			"GOMPLATE_SUPPRESS_EMPTY", "false",
+			false,
+			&config.Config{SuppressEmpty: true},
+			&config.Config{SuppressEmpty: true},
+		},
 	}
-	actual, err = applyEnvVars(ctx, cfg)
-	assert.NoError(t, err)
-	assert.EqualValues(t, expected, actual)
 
-	os.Setenv("GOMPLATE_SUPPRESS_EMPTY", "false")
-
-	cfg = &config.Config{
-		SuppressEmpty: true,
-	}
-	expected = &config.Config{
-		SuppressEmpty: true,
+	for i, d := range data {
+		t.Run(fmt.Sprintf("applyEnvVars_%s_%s/%d", d.env, d.value, i), func(t *testing.T) {
+			os.Setenv(d.env, d.value)
+
+			actual, err := applyEnvVars(context.Background(), d.input)
+			os.Unsetenv(d.env)
+			if d.shouldErr {
+				assert.Error(t, err)
+			} else {
+				assert.NoError(t, err)
+				assert.EqualValues(t, d.expected, actual)
+			}
+		})
 	}
-	actual, err = applyEnvVars(ctx, cfg)
-	assert.NoError(t, err)
-	assert.EqualValues(t, expected, actual)
 }

context_test.go

@@ -26,7 +26,7 @@ func TestEnvGetsUpdatedEnvironment(t *testing.T) {
 }
 
 func TestCreateContext(t *testing.T) {
-	ctx := context.TODO()
+	ctx := context.Background()
 	c, err := createTmplContext(ctx, nil, nil)
 	assert.NoError(t, err)
 	assert.Empty(t, c)

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

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,
 	}

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{}
 

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,14 +346,15 @@ func TestFromConfig(t *testing.T) {
 		},
 	}
 	expected = &Data{
+		ctx: ctx,
 		Sources: map[string]*Source{
 			"foo": {
 				Alias: "foo",
 				URL:   mustParseURL("http://example.com"),
 			},
 		},
 	}
-	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))
 }

go.mod

@@ -1,36 +1,36 @@
 module github.com/hairyhenderson/gomplate/v3
 
-go 1.14
+go 1.15
 
 require (
 	github.com/Masterminds/goutils v1.1.0
 	github.com/Shopify/ejson v1.2.2
-	github.com/aws/aws-sdk-go v1.33.9
+	github.com/aws/aws-sdk-go v1.34.7
 	github.com/boltdb/bolt v1.3.1
 	github.com/docker/libkv v0.2.1
 	github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa
 	github.com/google/uuid v1.1.1
 	github.com/gosimple/slug v1.9.0
 	github.com/hairyhenderson/toml v0.3.1-0.20191004034452-2a4f3b6160f2
-	github.com/hashicorp/consul/api v1.4.0
+	github.com/hashicorp/consul/api v1.6.0
 	github.com/hashicorp/go-sockaddr v1.0.2
 	github.com/hashicorp/vault/api v1.0.4
-	github.com/johannesboyne/gofakes3 v0.0.0-20200605082314-e89baa38acc1
+	github.com/johannesboyne/gofakes3 v0.0.0-20200716060623-6b2b4cb092cc
 	github.com/joho/godotenv v1.3.0
 	github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
 	github.com/pkg/errors v0.9.1
 	github.com/rs/zerolog v1.19.0
-	github.com/spf13/afero v1.3.2
+	github.com/spf13/afero v1.3.4
 	github.com/spf13/cobra v1.0.0
 	github.com/stretchr/testify v1.6.1
 	github.com/ugorji/go/codec v1.1.7
 	github.com/zealic/xignore v0.3.3
 	gocloud.dev v0.20.0
-	golang.org/x/crypto v0.0.0-20200604202706-70a84ac30bf9
+	golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de
 	gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f
 	gopkg.in/src-d/go-billy.v4 v4.3.2
 	gopkg.in/src-d/go-git.v4 v4.13.1
-	gopkg.in/yaml.v3 v3.0.0-20200605160147-a5ece683394c
+	gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776
 	gotest.tools/v3 v3.0.2
 	k8s.io/client-go v11.0.0+incompatible
 )