Minor code fixes based on golangci

Author: boekkooi-fresh

aggregate/repository_test.go

@@ -15,6 +15,7 @@ import (
 	"github.com/hellofresh/goengine/mocks"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
+	"github.com/stretchr/testify/require"
 )
 
 func TestNewRepository(t *testing.T) {
@@ -103,7 +104,9 @@ func TestRepository_SaveAggregateRoot(t *testing.T) {
 			{order: 2},
 		}
 		for _, event := range events {
-			aggregate.RecordChange(root, event)
+			require.NoError(t,
+				aggregate.RecordChange(root, event),
+			)
 		}
 		err := repo.SaveAggregateRoot(context.Background(), root)
 

driver/sql/postgres/eventstore.go

@@ -57,7 +57,7 @@ func NewEventStore(
 		logger = goengine.NopLogger
 	}
 
-	columns := fmt.Sprintf("%s", strings.Join(persistenceStrategy.ColumnNames(), ", "))
+	columns := strings.Join(persistenceStrategy.ColumnNames(), ", ")
 
 	return &EventStore{
 		persistenceStrategy:       persistenceStrategy,
@@ -169,6 +169,7 @@ func (e *EventStore) loadQuery(
 
 	rows, err := db.QueryContext(
 		ctx,
+		/* #nosec */
 		fmt.Sprintf(
 			`SELECT * FROM %s WHERE %s ORDER BY no %s`,
 			tableName,
@@ -206,6 +207,7 @@ func (e *EventStore) AppendToWithExecer(ctx context.Context, conn driverSQL.Exec
 
 	result, err := conn.ExecContext(
 		ctx,
+		/* #nosec */
 		fmt.Sprintf(
 			"INSERT INTO %s (%s) VALUES %s",
 			tableName,

driver/sql/postgres/projector_aggregate_storage.go

@@ -114,7 +114,7 @@ func newAggregateProjectionStorage(
 	}, nil
 }
 
-func (a *aggregateProjectionStorage) LoadOutOfSync(ctx context.Context, conn *sql.Conn) (*sql.Rows, error) {
+func (a *aggregateProjectionStorage) LoadOutOfSync(ctx context.Context, conn driverSQL.Queryer) (*sql.Rows, error) {
 	return conn.QueryContext(ctx, a.queryOutOfSyncProjections)
 }
 
@@ -136,7 +136,7 @@ func (a *aggregateProjectionStorage) PersistState(conn *sql.Conn, notification *
 	return nil
 }
 
-func (a *aggregateProjectionStorage) PersistFailure(ctx context.Context, conn *sql.Conn, notification *driverSQL.ProjectionNotification) error {
+func (a *aggregateProjectionStorage) PersistFailure(ctx context.Context, conn driverSQL.Execer, notification *driverSQL.ProjectionNotification) error {
 	if _, err := conn.ExecContext(ctx, a.queryPersistFailure, notification.AggregateID); err != nil {
 		return err
 	}

driver/sql/postgres/projector_test.go

@@ -4,9 +4,10 @@ package postgres
 
 import (
 	"fmt"
+	"testing"
+
 	"github.com/hellofresh/goengine"
 	"github.com/stretchr/testify/assert"
-	"testing"
 )
 
 func TestDefaultProjectionStateEncoder(t *testing.T) {

message.go

@@ -33,8 +33,7 @@ type (
 
 // GenerateUUID creates a new random UUID or panics
 func GenerateUUID() UUID {
-
-	return UUID(uuid.New())
+	return uuid.New()
 }
 
 // IsUUIDEmpty returns true if the UUID is empty

metadata/matcher_test.go

@@ -86,9 +86,7 @@ func TestMatcherIterate(t *testing.T) {
 
 	for _, testCase := range testCases {
 		t.Run("multiple constraints", func(t *testing.T) {
-			var m metadata.Matcher
-			m = testCase.matcher
-
+			m := testCase.matcher
 			for _, c := range testCase.expectedConstraints {
 				m = metadata.WithConstraint(m, c.field, c.operator, c.value)
 			}

strategy/json/sql/postgres/single_stream_strategy_test.go

@@ -150,10 +150,6 @@ func TestColumnNames(t *testing.T) {
 	})
 
 	t.Run("cannot modify data", func(t *testing.T) {
-		colsOrig := strategy.ColumnNames()
-		colsOrig = append(colsOrig, "field1")
-		colsOrig = append(colsOrig, "field2")
-
 		assert.Equal(t, strategy.ColumnNames(), expectedColumns)
 	})
 }

strategy/json/sql/postgres/sql_schema.go

@@ -27,6 +27,7 @@ $$;`
 // sqlTriggerEventStreamNotify a helper to create the sql on a event store table
 func sqlTriggerEventStreamNotifyTemplate(eventStreamName goengine.StreamName, eventStreamTable string) string {
 	triggerName := fmt.Sprintf("%s_notify", eventStreamTable)
+	/* #nosec */
 	return fmt.Sprintf(
 		`DO LANGUAGE plpgsql $$
 		 BEGIN
@@ -57,6 +58,7 @@ func sqlTriggerEventStreamNotifyTemplate(eventStreamName goengine.StreamName, ev
 
 // StreamProjectorCreateSchema return the sql statement needed for the postgres database in order to use the StreamProjector
 func StreamProjectorCreateSchema(projectionTable string, streamName goengine.StreamName, streamTable string) []string {
+	/* #nosec */
 	return []string{
 		sqlFuncEventStreamNotify,
 		sqlTriggerEventStreamNotifyTemplate(streamName, streamTable),
@@ -77,6 +79,7 @@ func StreamProjectorCreateSchema(projectionTable string, streamName goengine.Str
 
 // AggregateProjectorCreateSchema return the sql statement needed for the postgres database in order to use the AggregateProjector
 func AggregateProjectorCreateSchema(projectionTable string, streamName goengine.StreamName, streamTable string) []string {
+	/* #nosec */
 	return []string{
 		sqlFuncEventStreamNotify,
 		sqlTriggerEventStreamNotifyTemplate(streamName, streamTable),

test/internal/postgres.go

@@ -66,16 +66,23 @@ func (c *dbController) Create(t *testing.T, databaseName string) {
 func (c *dbController) disableDatabaseAccess(t *testing.T, databaseName string) {
 	// Making sure the database exists
 	row := c.db.QueryRow("SELECT datname FROM pg_database WHERE datname = $1", databaseName)
-	if row == nil {
+	if err := row.Scan(&databaseName); err != nil {
 		// No database so no one has access
+		if err != sql.ErrNoRows {
+			return
+		}
+		require.NoError(t, err)
 		return
 	}
+
 	// Disallow new connections
 	_, err := c.db.Exec(fmt.Sprintf(`ALTER DATABASE "%s" WITH ALLOW_CONNECTIONS false`, databaseName))
 	require.NoError(t, err, "test.postgres: Unable to disallow connections to the db")
 
 	// Terminate existing connections
-	row = c.db.QueryRow("SELECT pg_terminate_backend(pid) FROM pg_stat_activity WHERE datname = $1", databaseName)
+	rows, err := c.db.Query("SELECT pg_terminate_backend(pid) FROM pg_stat_activity WHERE datname = $1", databaseName)
+	require.NoError(t, err)
+	defer rows.Close()
 }
 
 func (c *dbController) enableDatabaseAccess(t *testing.T, databaseName string) {