meta: more linter fixup

Author: adamdecaf

internal/dbtest/sql.go

@@ -20,7 +20,6 @@
 package dbtest
 
 import (
-	"context"
 	"database/sql"
 	"fmt"
 	"testing"
@@ -83,7 +82,7 @@ func CreateTestDatabase(t *testing.T, config database.DatabaseConfig) database.D
 
 func LoadDatabase(t *testing.T, config database.DatabaseConfig) *sql.DB {
 	l := log.NewTestLogger()
-	db, err := database.New(context.Background(), l, config)
+	db, err := database.New(t.Context(), l, config)
 	if err != nil {
 		t.Fatal(err)
 	}

internal/incoming/odfi/download.go

@@ -50,7 +50,7 @@ type Downloader interface {
 
 func NewDownloader(logger log.Logger, cfg service.ODFIStorage) (Downloader, error) {
 	baseDir := strx.Or(cfg.Directory, "storage")
-	if err := os.MkdirAll(baseDir, 0777); err != nil {
+	if err := os.MkdirAll(baseDir, 0777); err != nil { //nolint:gosec
 		return nil, fmt.Errorf("problem creating %s: %v", baseDir, err)
 	}
 	return &downloaderImpl{
@@ -117,15 +117,15 @@ func (dl *downloaderImpl) setup(agent upload.Agent) (*downloadedFiles, error) {
 
 	// Create sub-directories for files we download
 	path := filepath.Join(dir, agent.InboundPath())
-	if err := os.MkdirAll(path, 0777); err != nil {
+	if err := os.MkdirAll(path, 0777); err != nil { //nolint:gosec
 		return nil, fmt.Errorf("problem creating %s: %v", path, err)
 	}
 	path = filepath.Join(dir, agent.ReconciliationPath())
-	if err := os.MkdirAll(path, 0777); err != nil {
+	if err := os.MkdirAll(path, 0777); err != nil { //nolint:gosec
 		return nil, fmt.Errorf("problem creating %s: %v", path, err)
 	}
 	path = filepath.Join(dir, agent.ReturnPath())
-	if err := os.MkdirAll(path, 0777); err != nil {
+	if err := os.MkdirAll(path, 0777); err != nil { //nolint:gosec
 		return nil, fmt.Errorf("problem creating %s: %v", path, err)
 	}
 
@@ -186,7 +186,7 @@ func saveFilepaths(ctx context.Context, logger log.Logger, agent upload.Agent, f
 	var firstErr error
 	var errordFilenames []string
 
-	os.MkdirAll(dir, 0777) // ignore errors
+	os.MkdirAll(dir, 0777) //nolint:gosec
 	for i := range filepaths {
 		outPath := filepath.Join(dir, filepath.Base(filepaths[i]))
 		f, err := os.Create(outPath)

internal/incoming/stream/streamtest/streamtest.go

@@ -45,7 +45,7 @@ func InmemStream(t *testing.T) (stream.Publisher, stream.Subscription) {
 
 	sub, err := stream.OpenSubscription(log.NewTestLogger(), conf)
 	require.NoError(t, err)
-	t.Cleanup(func() { sub.Shutdown(context.Background()) })
+	t.Cleanup(func() { sub.Shutdown(t.Context()) })
 
 	return topic, sub
 }

internal/kafka/kafka.go

@@ -64,7 +64,9 @@ func OpenTopic(logger log.Logger, cfg *service.KafkaConfig) (*pubsub.Topic, erro
 		}
 		config.Net.SASL.Mechanism = sarama.SASLTypeOAuth
 		config.Net.TLS.Enable = true
-		config.Net.TLS.Config = &tls.Config{}
+		config.Net.TLS.Config = &tls.Config{
+			MinVersion: tls.VersionTLS12,
+		}
 
 	default:
 		config.Net.SASL.Mechanism = sarama.SASLTypePlaintext
@@ -108,7 +110,9 @@ func OpenSubscription(logger log.Logger, cfg *service.KafkaConfig) (*pubsub.Subs
 		}
 		config.Net.SASL.Mechanism = sarama.SASLTypeOAuth
 		config.Net.TLS.Enable = true
-		config.Net.TLS.Config = &tls.Config{}
+		config.Net.TLS.Config = &tls.Config{
+			MinVersion: tls.VersionTLS12,
+		}
 
 	default:
 		config.Net.SASL.Mechanism = sarama.SASLTypePlaintext

internal/pipeline/pending_files_api.go

@@ -183,7 +183,7 @@ func marshalFile(contents fs.File) (string, error) {
 	var buf bytes.Buffer
 	if err == nil {
 		if writeErr := ach.NewWriter(&buf).Write(&file); writeErr != nil {
-			err = fmt.Errorf("error parsing file: %v -- error writing file: %v", err, writeErr)
+			err = fmt.Errorf("error writing file: %v", writeErr)
 		}
 	}
 	if err == nil {

internal/storage/filesystem.go

@@ -19,7 +19,7 @@ func NewFilesystem(root string) (Chest, error) {
 	if err != nil {
 		return nil, err
 	}
-	if err := os.MkdirAll(fullpath, 0777); err != nil {
+	if err := os.MkdirAll(fullpath, 0777); err != nil { //nolint:gosec
 		return nil, err
 	}
 	return &filesystem{
@@ -112,7 +112,7 @@ func (f *filesystem) ReplaceFile(oldpath, newpath string) error {
 
 	// Create the new dir(s)
 	dir, _ := filepath.Split(newpath)
-	if err := os.MkdirAll(dir, 0777); err != nil {
+	if err := os.MkdirAll(dir, 0777); err != nil { //nolint:gosec
 		return err
 	}
 
@@ -130,15 +130,15 @@ func (f *filesystem) ReplaceDir(oldpath, newpath string) error {
 
 	if _, err := os.Stat(path); err != nil && os.IsNotExist(err) {
 		// dir doesn't exist, so write newpath
-		return os.MkdirAll(filepath.Join(f.root, newpath), 0777)
+		return os.MkdirAll(filepath.Join(f.root, newpath), 0777) //nolint:gosec
 	}
 
 	// move the existing file
 	return os.Rename(path, filepath.Join(f.root, newpath))
 }
 
 func (f *filesystem) MkdirAll(path string) error {
-	return os.MkdirAll(filepath.Join(f.root, path), 0777)
+	return os.MkdirAll(filepath.Join(f.root, path), 0777) //nolint:gosec
 }
 
 func (f *filesystem) RmdirAll(path string) error {
@@ -149,7 +149,7 @@ func (f *filesystem) WriteFile(path string, contents []byte) error {
 	dir, path := filepath.Split(path)
 	dir = filepath.Join(f.root, dir)
 
-	if err := os.MkdirAll(dir, 0777); err != nil {
+	if err := os.MkdirAll(dir, 0777); err != nil { //nolint:gosec
 		return err
 	}