Moving lint config to config file, fixing some issues

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

4 files changed, 5 insertions, 0 deletions

diff --git a/internal/cmd/config_test.go b/internal/cmd/config_test.go
index 0b59662c..951ddfc1 100644
--- a/internal/cmd/config_test.go
+++ b/internal/cmd/config_test.go
@@ -255,6 +255,7 @@ func TestApplyEnvVars(t *testing.T) {
 	}
 
 	for i, d := range data {
+		d := d
 		t.Run(fmt.Sprintf("applyEnvVars_%s_%s/%d", d.env, d.value, i), func(t *testing.T) {
 			os.Setenv(d.env, d.value)
 
diff --git a/internal/conv/conv_test.go b/internal/conv/conv_test.go
index c83c8dd0..40aebaeb 100644
--- a/internal/conv/conv_test.go
+++ b/internal/conv/conv_test.go
@@ -40,6 +40,7 @@ func BenchmarkInterfaceSlice(b *testing.B) {
 	}
 
 	for _, d := range data {
+		d := d
 		b.Run(fmt.Sprintf("%T(%v)", d, d), func(b *testing.B) {
 			for i := 0; i < b.N; i++ {
 				InterfaceSlice(d)
diff --git a/internal/iohelpers/writers_test.go b/internal/iohelpers/writers_test.go
index d226a03e..ff4ef932 100644
--- a/internal/iohelpers/writers_test.go
+++ b/internal/iohelpers/writers_test.go
@@ -92,6 +92,7 @@ func TestSameSkipper(t *testing.T) {
 	}
 
 	for _, d := range testdata {
+		d := d
 		t.Run(fmt.Sprintf("in:%q/out:%q/same:%v", d.in, d.out, d.same), func(t *testing.T) {
 			r := bytes.NewBuffer(d.out)
 			w := newBufferCloser(&bytes.Buffer{})
diff --git a/internal/tests/integration/integration_test.go b/internal/tests/integration/integration_test.go
index 46ca5ebf..5ebea100 100644
--- a/internal/tests/integration/integration_test.go
+++ b/internal/tests/integration/integration_test.go
@@ -1,3 +1,5 @@
+//+build integration
+
 package integration
 
 import (