meta: linter fixup

internal/alerting/pagerduty.go

@@ -120,7 +120,7 @@ func (pd *PagerDuty) ping() error {
 		return fmt.Errorf("pagerduty list abilities: %v", err)
 	}
 	if len(resp.Abilities) <= 0 {
-		return fmt.Errorf("pagerduty: missing abilities")
+		return errors.New("pagerduty: missing abilities")
 	}
 
 	return nil

internal/alerting/slack.go

@@ -54,7 +54,7 @@ func (s *Slack) AuthTest() error {
 		return fmt.Errorf("slack auth test: %v", err)
 	}
 	if resp.UserID == "" {
-		return fmt.Errorf("slack: missing user_id")
+		return errors.New("slack: missing user_id")
 	}
 
 	return nil

internal/dbtest/sql.go

@@ -66,13 +66,13 @@ func CreateTestDatabase(t *testing.T, config database.DatabaseConfig) database.D
 	}
 
 	dbName := "test" + base.ID()
-	_, err = rootDb.Exec(fmt.Sprintf("CREATE DATABASE %s", dbName))
+	_, err = rootDb.Exec("CREATE DATABASE " + dbName)
 	if err != nil {
 		t.Fatal(err)
 	}
 
 	t.Cleanup(func() {
-		rootDb.Exec(fmt.Sprintf("DROP DATABASE %s", dbName))
+		rootDb.Exec("DROP DATABASE " + dbName)
 		rootDb.Close()
 	})
 

internal/environment_test.go

@@ -60,7 +60,7 @@ func TestEnvironment_Startup(t *testing.T) {
 	}
 
 	env, err := NewEnvironment(env)
-	a.Nil(err)
+	a.NoError(err)
 
 	t.Cleanup(env.Shutdown)
 }

internal/incoming/odfi/prenotes.go

@@ -21,6 +21,7 @@ import (
 	"context"
 	"fmt"
 	"path/filepath"
+	"strconv"
 	"strings"
 
 	"github.com/moov-io/ach"
@@ -92,12 +93,12 @@ func (pc *prenoteEmitter) Handle(ctx context.Context, logger log.Logger, file Fi
 				"origin":      log.String(file.ACHFile.Header.ImmediateOrigin),
 				"destination": log.String(file.ACHFile.Header.ImmediateDestination),
 			})
-			logger.Log(fmt.Sprintf("odfi: pre-notification traceNumber=%s", entries[j].TraceNumber))
+			logger.Log("odfi: pre-notification traceNumber=" + entries[j].TraceNumber)
 
 			prenoteEntriesProcessed.With(
 				"origin", file.ACHFile.Header.ImmediateOrigin,
 				"destination", file.ACHFile.Header.ImmediateDestination,
-				"transactionCode", fmt.Sprintf("%d", entries[j].TransactionCode),
+				"transactionCode", strconv.Itoa(entries[j].TransactionCode),
 			).Add(1)
 		}
 	}

internal/incoming/odfi/reconciliation_test.go

@@ -65,7 +65,7 @@ func TestCreditReconciliation(t *testing.T) {
 		}
 		batch.AddEntry(&entry)
 	}
-	require.Equal(t, 20, len(file.Batches))
+	require.Len(t, file.Batches, 20)
 
 	// Set ValidateOpts similar to what Processor sets
 	file.SetValidation(&ach.ValidateOpts{
@@ -122,7 +122,7 @@ func TestCreditReconciliation(t *testing.T) {
 			return len(sent) > 0
 		}, 5*time.Second, 100*time.Millisecond)
 
-		require.Equal(t, 499, len(sent)) // one from previous subtest
+		require.Len(t, sent, 499) // one from previous subtest
 
 		foundTraces := make(map[string]bool)
 		for i := range sent {
@@ -132,6 +132,6 @@ func TestCreditReconciliation(t *testing.T) {
 			require.True(t, ok)
 			foundTraces[event.Entry.TraceNumber] = true
 		}
-		require.Equal(t, 499, len(foundTraces)) // 499 unique trace numbers
+		require.Len(t, foundTraces, 499) // 499 unique trace numbers
 	})
 }

internal/incoming/stream/streamtest/streamtest.go

@@ -19,7 +19,7 @@ package streamtest
 
 import (
 	"context"
-	"fmt"
+
 	"testing"
 
 	"github.com/moov-io/achgateway/internal/incoming/stream"
@@ -36,7 +36,7 @@ func InmemStream(t *testing.T) (stream.Publisher, stream.Subscription) {
 	conf := &service.Config{
 		Inbound: service.Inbound{
 			InMem: &service.InMemory{
-				URL: fmt.Sprintf("mem://%s", t.Name()),
+				URL: "mem://" + t.Name(),
 			},
 		},
 	}

internal/notify/mailslurper_test.go

@@ -5,7 +5,6 @@
 package notify
 
 import (
-	"fmt"
 	"net"
 	"testing"
 	"time"
@@ -50,7 +49,7 @@ func spawnMailslurp(t *testing.T) *mailslurpDeployment {
 	err = pool.Retry(func() error {
 		time.Sleep(1 * time.Second)
 
-		conn, err := net.Dial("tcp", fmt.Sprintf("localhost:%s", dep.SMTPPort()))
+		conn, err := net.Dial("tcp", "localhost:"+dep.SMTPPort())
 		if err != nil {
 			return err
 		}

internal/notify/pagerduty.go

@@ -47,7 +47,7 @@ func (pd *PagerDuty) Ping() error {
 		return fmt.Errorf("pagerduty list abilities: %v", err)
 	}
 	if len(resp.Abilities) <= 0 {
-		return fmt.Errorf("pagerduty: missing abilities")
+		return errors.New("pagerduty: missing abilities")
 	}
 
 	return nil

internal/notify/slack.go

@@ -63,9 +63,9 @@ func marshalSlackMessage(status uploadStatus, msg *Message) string {
 	slackMsg := fmt.Sprintf("%s %s of %s", status, msg.Direction, msg.Filename)
 	if msg.Hostname != "" {
 		if msg.Direction == Upload {
-			slackMsg += fmt.Sprintf(" to %s", msg.Hostname)
+			slackMsg += " to " + msg.Hostname
 		} else {
-			slackMsg += fmt.Sprintf(" from %s", msg.Hostname)
+			slackMsg += " from " + msg.Hostname
 		}
 	}
 	slackMsg += " with ODFI server\n"

internal/pipeline/aggregate.go

@@ -436,7 +436,7 @@ func formatHolidayMessage(day *schedule.Day, shardName string) string {
 	hostname, _ := os.Hostname()
 
 	if shardName != "" {
-		shardName = fmt.Sprintf("for %s", shardName)
+		shardName = "for " + shardName
 	}
 
 	return strings.TrimSpace(fmt.Sprintf("%s %s so %s will skip processing %s", day.Time.Format("Jan 02"), name, hostname, shardName))

internal/pipeline/events_api_test.go

@@ -169,11 +169,11 @@ func TestEventsAPI_FileUploadedErrors(t *testing.T) {
 		for i := range paths {
 			address := fmt.Sprintf("http://%s/shards/testing/pipeline/%s/file-uploaded", adminServer.BindAddr(), paths[i])
 			req, err := http.NewRequest("PUT", address, nil)
-			require.NoError(t, err, fmt.Sprintf("on address %s", address))
+			require.NoError(t, err, "on address "+address)
 			resp, err := http.DefaultClient.Do(req)
 			require.NoError(t, err)
 			defer resp.Body.Close()
-			require.Equal(t, http.StatusNotFound, resp.StatusCode, fmt.Sprintf("on address %s", address))
+			require.Equal(t, http.StatusNotFound, resp.StatusCode, "on address "+address)
 		}
 	})
 

internal/pipeline/file_receiver_test.go

@@ -81,7 +81,7 @@ func testFileReceiver(t *testing.T) *TestFileReceiver {
 	conf := &service.Config{
 		Inbound: service.Inbound{
 			InMem: &service.InMemory{
-				URL: fmt.Sprintf("mem://%s", t.Name()),
+				URL: "mem://" + t.Name(),
 			},
 		},
 		Sharding: service.Sharding{

internal/pipeline/manual_cutoff_times_test.go

@@ -94,7 +94,7 @@ func TestFileReceiver__ManualCutoffErr(t *testing.T) {
 	require.NoError(t, err)
 
 	require.Len(t, resp.Shards, 1)
-	require.Equal(t, *resp.Shards["testing"], "bad thing")
+	require.Equal(t, "bad thing", *resp.Shards["testing"])
 }
 
 func setupFileReceiver(t *testing.T, waiterResponse error) (*FileReceiver, *sync.WaitGroup) {

internal/pipeline/merging.go

@@ -104,7 +104,7 @@ func (m *filesystemMerging) writeACHFile(ctx context.Context, xfer incoming.ACHF
 	}
 
 	fileID := strings.TrimSuffix(xfer.FileID, ".ach")
-	path := filepath.Join("mergable", m.shard.Name, fmt.Sprintf("%s.ach", fileID))
+	path := filepath.Join("mergable", m.shard.Name, fileID+".ach")
 	if err := m.storage.WriteFile(path, buf.Bytes()); err != nil {
 		return err
 	}
@@ -119,7 +119,7 @@ func (m *filesystemMerging) writeACHFile(ctx context.Context, xfer incoming.ACHF
 			}).Logf("ERROR encoding ValidateOpts: %v", err)
 		}
 
-		path := filepath.Join("mergable", m.shard.Name, fmt.Sprintf("%s.json", fileID))
+		path := filepath.Join("mergable", m.shard.Name, fileID+".json")
 		if err := m.storage.WriteFile(path, buf.Bytes()); err != nil {
 			m.logger.Warn().With(log.Fields{
 				"fileID":   log.String(xfer.FileID),
@@ -140,7 +140,7 @@ func (m *filesystemMerging) HandleCancel(ctx context.Context, cancel incoming.Ca
 	defer span.End()
 
 	fileID := strings.TrimSuffix(cancel.FileID, ".ach")
-	path := filepath.Join("mergable", m.shard.Name, fmt.Sprintf("%s.ach", fileID))
+	path := filepath.Join("mergable", m.shard.Name, fileID+".ach")
 
 	// Check if the file exists already
 	originalFile, _ := m.storage.Open(path)
@@ -563,7 +563,7 @@ func (m *filesystemMerging) saveMergedFile(ctx context.Context, dir string, file
 	}
 
 	name := hash(buf.Bytes())
-	path := filepath.Join(dir, fmt.Sprintf("%s.ach", name))
+	path := filepath.Join(dir, name+".ach")
 
 	span.SetAttributes(
 		attribute.String("achgateway.merged_filename", path),
@@ -584,7 +584,7 @@ func (m *filesystemMerging) saveMergedFile(ctx context.Context, dir string, file
 			return fmt.Errorf("marshal of merged ACH file validate opts: %w", err)
 		}
 
-		path = filepath.Join(dir, fmt.Sprintf("%s.json", name))
+		path = filepath.Join(dir, name+".json")
 		err = m.storage.WriteFile(path, buf.Bytes())
 		if err != nil {
 			return fmt.Errorf("writing merged ACH file validate opts: %w", err)

internal/pipeline/merging_test.go

@@ -47,15 +47,15 @@ func TestMerging__getCanceledFiles(t *testing.T) {
 	dir := filepath.Join(root, "test-2024")
 	require.NoError(t, os.MkdirAll(dir, 0777))
 
-	name1 := fmt.Sprintf("%s.ach", base.ID())
+	name1 := base.ID() + ".ach"
 	xfer1 := write(t, filepath.Join(dir, name1), nil)
-	write(t, filepath.Join(dir, fmt.Sprintf("%s.canceled", xfer1)), nil)
+	write(t, filepath.Join(dir, xfer1+".canceled"), nil)
 
-	name2 := fmt.Sprintf("%s.ach", base.ID())
+	name2 := base.ID() + ".ach"
 	write(t, filepath.Join(dir, name2), nil)
 
-	name3 := fmt.Sprintf("%s.ach", base.ID())
-	write(t, filepath.Join(dir, fmt.Sprintf("%s.canceled", name3)), nil)
+	name3 := base.ID() + ".ach"
+	write(t, filepath.Join(dir, name3+".canceled"), nil)
 
 	fs, err := storage.NewFilesystem(root)
 	require.NoError(t, err)
@@ -76,12 +76,12 @@ func TestMerging__getNonCanceledMatches(t *testing.T) {
 	dir := filepath.Join(root, "test-2021")
 	require.NoError(t, os.Mkdir(dir, 0777))
 
-	xfer1 := write(t, filepath.Join(dir, fmt.Sprintf("%s.ach", base.ID())), nil)
+	xfer1 := write(t, filepath.Join(dir, base.ID()+".ach"), nil)
 
-	cancel1 := write(t, filepath.Join(dir, fmt.Sprintf("%s.ach.canceled", base.ID())), nil)
+	cancel1 := write(t, filepath.Join(dir, base.ID()+".ach.canceled"), nil)
 
-	xfer2 := write(t, filepath.Join(dir, fmt.Sprintf("%s.ach", base.ID())), nil)
-	cancel2 := write(t, filepath.Join(dir, fmt.Sprintf("%s.canceled", xfer2)), nil)
+	xfer2 := write(t, filepath.Join(dir, base.ID()+".ach"), nil)
+	cancel2 := write(t, filepath.Join(dir, xfer2+".canceled"), nil)
 
 	fs, err := storage.NewFilesystem(root)
 	require.NoError(t, err)
@@ -122,9 +122,9 @@ func write(t *testing.T, where string, contents []byte) string {
 }
 
 func TestMerging_fileAcceptor(t *testing.T) {
-	name1 := fmt.Sprintf("%s.ach", base.ID())
-	name2 := fmt.Sprintf("%s.ach", base.ID())
-	json1 := fmt.Sprintf("%s.json", base.ID())
+	name1 := base.ID() + ".ach"
+	name2 := base.ID() + ".ach"
+	json1 := base.ID() + ".json"
 
 	output := fileAcceptor(nil)(name1)
 	require.Equal(t, ach.AcceptFile, output)
@@ -245,7 +245,7 @@ func TestMerging_mappings(t *testing.T) {
 	expected := []string{"duplicate-trace.ach", "ppd-debit.ach", "ppd-debit2.ach", "ppd-debit3.ach", "ppd-debit4.ach"}
 	require.ElementsMatch(t, expected, mapped[0].InputFilepaths)
 	require.Equal(t, "MAPPING-0.ach", mapped[0].UploadedFilename)
-	require.Equal(t, 2, len(mapped[0].ACHFile.Batches))
+	require.Len(t, mapped[0].ACHFile.Batches, 2)
 }
 
 func enqueueFile(t *testing.T, merging XferMerging, path string) {
@@ -317,7 +317,7 @@ func TestMerging__writeACHFile(t *testing.T) {
 
 	// Verify the .ach and .json files were written
 	mergableFilenames := getFilenames(t, m.storage, "mergable/testing")
-	expected := []string{fmt.Sprintf("%s.ach", fileID), fmt.Sprintf("%s.json", fileID)}
+	expected := []string{fileID + ".ach", fileID + ".json"}
 	require.ElementsMatch(t, expected, mergableFilenames)
 
 	var mergeConditions ach.Conditions

internal/schedule/cutoff.go

@@ -105,7 +105,7 @@ func (ct *CutoffTimes) register(tz string, timestamp string) error {
 	var zone string
 	var location *time.Location
 	if tz != "" {
-		zone = fmt.Sprintf("CRON_TZ=%s", tz)
+		zone = "CRON_TZ=" + tz
 		l, _ := time.LoadLocation(tz)
 		location = l
 	} else {

internal/server.go

@@ -100,7 +100,7 @@ func bootAdminServer(errs chan<- error, logger log.Logger, config service.Admin)
 	}
 
 	go func() {
-		logger.Info().Log(fmt.Sprintf("listening on %s", adminServer.BindAddr()))
+		logger.Info().Log("listening on " + adminServer.BindAddr())
 		if err := adminServer.Listen(); err != nil {
 			errs <- logger.Fatal().LogErrorf("problem starting admin http: %w", err).Err()
 		}

internal/service/config_test.go

@@ -35,7 +35,7 @@ func Test_ConfigLoading(t *testing.T) {
 
 	gc := &service.GlobalConfig{}
 	err := ConfigService.Load(gc)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	// Validate config
 	require.NoError(t, gc.ACHGateway.Validate())

internal/service/model_audit_test.go

@@ -28,5 +28,5 @@ func TestSignerMasking(t *testing.T) {
 	cfg := &Signer{KeyFile: "/foo.pem", KeyPassword: "secret"}
 	bs, err := json.Marshal(cfg)
 	require.NoError(t, err)
-	require.Equal(t, bs, []byte(`{"KeyFile":"/foo.pem","KeyPassword":"s****t"}`))
+	require.JSONEq(t, string(bs), `{"KeyFile":"/foo.pem","KeyPassword":"s****t"}`)
 }

internal/service/model_upload_test.go

@@ -19,7 +19,6 @@ package service
 
 import (
 	"encoding/json"
-	"strings"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -29,12 +28,12 @@ func TestFTPMasking(t *testing.T) {
 	cfg := &FTP{Password: "secret"}
 	bs, err := json.Marshal(cfg)
 	require.NoError(t, err)
-	require.True(t, strings.Contains(string(bs), `,"Password":"s****t",`))
+	require.Contains(t, string(bs), `,"Password":"s****t",`)
 }
 
 func TestSFTPMasking(t *testing.T) {
 	cfg := &SFTP{Password: "secret"}
 	bs, err := json.Marshal(cfg)
 	require.NoError(t, err)
-	require.True(t, strings.Contains(string(bs), `,"Password":"s****t",`))
+	require.Contains(t, string(bs), `,"Password":"s****t",`)
 }

internal/shards/api_shard_mapping_test.go

@@ -3,7 +3,6 @@
 package shards_test
 
 import (
-	"fmt"
 	"github.com/moov-io/achgateway/internal/service"
 	"net/http"
 	"testing"
@@ -74,7 +73,7 @@ func clientShardMappingCreate(s ShardMappingTestScope, create *service.ShardMapp
 
 func clientShardMappingGet(s ShardMappingTestScope, shardKey string) (*service.ShardMapping, *http.Response) {
 	i := &service.ShardMapping{}
-	resp := s.MakeCall(s.MakeRequest("GET", fmt.Sprintf("/shard_mappings/%s", shardKey), nil), i)
+	resp := s.MakeCall(s.MakeRequest("GET", "/shard_mappings/"+shardKey, nil), i)
 	return i, resp
 }
 

internal/shards/service_shard_mapping_test.go

@@ -49,7 +49,7 @@ func TestFacilitatorService_List(t *testing.T) {
 
 	list, err := s.Service.List()
 	require.NoError(t, err)
-	require.Equal(t, 3, len(list))
+	require.Len(t, list, 3)
 }
 
 func TestFacilitatorService_Get(t *testing.T) {