Merge pull request #18 from hellofresh/patch/gometalinter

Introducing gometalinter

Author: boekkooi-fresh

.golangci.yml

@@ -0,0 +1,25 @@
+run:
+  build-tags:
+    - unit
+  skip-files:
+    - driver/inmemory/matcher_gen.go
+
+linters:
+  enable:
+    - maligned
+    - deadcode
+    - errcheck
+    - gosec
+    - goconst
+    - gocyclo
+    - gofmt
+    - goimports
+    - golint
+    - ineffassign
+    - interfacer
+    - staticcheck
+    - structcheck
+    - unconvert
+    - varcheck
+    - vet
+    - vetshadow

.travis.yml

@@ -8,13 +8,24 @@ addons:
   postgresql: '10'
 cache:
   directories:
+    - "$GOPATH/pkg/dep"
     - "$HOME/gopath/pkg/mod"
 env:
   global:
     - secure: KONX7893Jxeu3zBnNRWMl0x9DNsriN+RFojuFE28bDBjE2NJKTBeIhWNF4Jnoy7ba9hvE3LB7aGFUETnUR2sxKgNp/yz1Q6Wjk2qFvIPxYB8soOXWnOcRRvRulM2jOpLLJdT4aKewyTGTQfszib/3BD2fWgIgnH0aAvhoV6F/e9Mhtt1ZXLvvRDyDX2q0XkDtjK9tTB8/QOJFz6c9UI/fScYglI+Ob5lx7GwjYg6LHbIaPXt4wrGLXW9/FXOHTI1F6+FuDE08n7EtqkuEqmh3gURQRRyjmX2nDnxUuvSPpbTR6cRHctgwaYSL2gu0321lbXIUv4bFAW14MoQLnI5xKW8nFjuD0Z3DrePr3G96sTombrg2PeI0eM/twW9YgTlHpjt+gkblSriOZ8vVe1UDMZ0OidXSzO9dOk0vDustwvbA+TYP3/e7Tw60wn1NWoEFl38W8F+jB2kBuMON45AT4I5zPQAjZLmEwTgYm4jOahpnvOY3Z6cxqpN+zDNlqllETJCdf+e5bp8xk9vYZtEZ0ML3L7cMMw3IbLg+slE4rIUZuydvk4rC9EXwqPw/089BhCFhpc62GfvlVhDrPJfnHIPhzZ9nyYS1FDBl96gVNze2uFOyaEMACFtevFF4EP0NmUYRhLWPcasdjbhUjUsIiFQVS3CFQODR9FL0SXSM9M=
     - POSTGRES_DSN="postgres://postgres@localhost:5432/goengine?sslmode=disable&client_encoding=UTF8"
 
 matrix:
+  include:
+    - name: "GoLang CI lint"
+      go: 1.11.x
+      install:
+        - dep ensure -v
+        - curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin v1.15.0
+      before_script: []
+      script:
+        - golangci-lint run
+      after_success: []
   allow_failures:
     - go: master
 

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/inmemory/eventstore_test.go

@@ -61,7 +61,8 @@ func TestEventStore_HasStream(t *testing.T) {
 	asserts.False(store.HasStream(ctx, createThisStream))
 	asserts.False(store.HasStream(ctx, unkownStream))
 
-	store.Create(ctx, createThisStream)
+	err := store.Create(ctx, createThisStream)
+	asserts.NoError(err)
 	asserts.True(store.HasStream(ctx, createThisStream))
 	asserts.False(store.HasStream(ctx, unkownStream))
 

driver/inmemory/eventstream_test.go

@@ -9,6 +9,7 @@ import (
 	"github.com/hellofresh/goengine/driver/inmemory"
 	"github.com/hellofresh/goengine/mocks"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func TestEventStream(t *testing.T) {
@@ -44,15 +45,12 @@ func TestEventStream(t *testing.T) {
 			asserts := assert.New(t)
 
 			stream, err := inmemory.NewEventStream(testCase.messages, testCase.messageNumbers)
-			if !asserts.NoError(err) {
-				return
-			}
+			require.NoError(t, err)
 			asserts.NotNil(stream)
 
 			messages, messageNumbers, err := goengine.ReadEventStream(stream)
-			if !asserts.NoError(stream.Err()) {
-				asserts.FailNow("no exception was expected while reading the stream")
-			}
+			require.NoError(t, err)
+			require.NoError(t, stream.Err(), "no exception was expected while reading the stream")
 
 			asserts.Equal(testCase.messages, messages)
 			asserts.Equal(testCase.messageNumbers, messageNumbers)

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/eventstore_test.go

@@ -21,6 +21,7 @@ import (
 	strategyPostgres "github.com/hellofresh/goengine/strategy/json/sql/postgres"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
+	"github.com/stretchr/testify/require"
 )
 
 func TestNewEventStore(t *testing.T) {
@@ -301,6 +302,7 @@ func TestEventStore_Load(t *testing.T) {
 				strategy.On("GenerateTableName", goengine.StreamName("event_stream")).Return("event_stream", nil)
 
 				store, err := postgres.NewEventStore(strategy, db, factory, nil)
+				require.NoError(t, err)
 
 				stream, err := store.Load(
 					context.Background(),
@@ -309,10 +311,9 @@ func TestEventStore_Load(t *testing.T) {
 					testCase.count,
 					testCase.matcher(),
 				)
+				require.NoError(t, err)
+				assert.Equal(t, expectedStream, stream)
 
-				if assert.NoError(t, err) {
-					assert.Equal(t, expectedStream, stream)
-				}
 				factory.AssertExpectations(t)
 				strategy.AssertExpectations(t)
 			})
@@ -355,6 +356,7 @@ func TestEventStore_Load(t *testing.T) {
 			test.RunWithMockDB(t, testCase.title, func(t *testing.T, db *sql.DB, dbMock sqlmock.Sqlmock) {
 				strategy := testCase.strategy()
 				store, err := postgres.NewEventStore(strategy, db, &mockSQL.MessageFactory{}, nil)
+				require.NoError(t, err)
 
 				stream, err := store.Load(context.Background(), "event_stream", 1, nil, nil)
 				if assert.Error(t, err) {

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_stream.go

@@ -8,11 +8,10 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/pkg/errors"
-
 	"github.com/hellofresh/goengine"
 	driverSQL "github.com/hellofresh/goengine/driver/sql"
 	internalSQL "github.com/hellofresh/goengine/driver/sql/internal"
+	"github.com/pkg/errors"
 )
 
 // StreamProjector is a postgres projector used to execute a projection against an event stream.
@@ -172,80 +171,16 @@ func (s *StreamProjector) processNotification(
 
 // setupProjection Creates the projection if none exists
 func (s *StreamProjector) setupProjection(ctx context.Context) error {
-	conn, err := internalSQL.AcquireConn(ctx, s.db)
-	if err != nil {
-		return err
-	}
-	defer func() {
-		if err := conn.Close(); err != nil {
-			s.logger.WithError(err).Warn("failed to db close connection")
-		}
-	}()
-
-	if s.projectionExists(ctx, conn) {
-		return nil
-	}
-	if err := s.createProjection(ctx, conn); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (s *StreamProjector) projectionExists(ctx context.Context, conn *sql.Conn) bool {
-	rows, err := conn.QueryContext(
-		ctx,
-		fmt.Sprintf(
-			`SELECT 1 FROM %s WHERE name = $1 LIMIT 1`,
-			QuoteIdentifier(s.projectionTable),
-		),
-		s.projectionName,
-	)
-	if err != nil {
-		s.logger.
-			WithError(err).
-			WithField("table", s.projectionTable).
-			Error("failed to query projection table")
-		return false
-	}
-	defer func() {
-		if err := rows.Close(); err != nil {
-			s.logger.
-				WithError(err).
-				WithField("table", s.projectionTable).
-				Warn("failed to close rows")
-		}
-	}()
-
-	if !rows.Next() {
-		return false
-	}
-
-	var found bool
-	if err := rows.Scan(&found); err != nil {
-		s.logger.
-			WithError(err).
-			WithField("table", s.projectionTable).
-			Error("failed to scan projection table")
-		return false
-	}
-
-	return found
-}
-
-func (s *StreamProjector) createProjection(ctx context.Context, conn *sql.Conn) error {
-	// Ignore duplicate inserts. This can occur when multiple projectors are started at the same time.
-	_, err := conn.ExecContext(
+	// Ignore duplicate inserts
+	_, err := s.db.ExecContext(
 		ctx,
+		/* #nosec */
 		fmt.Sprintf(
 			`INSERT INTO %s (name) VALUES ($1) ON CONFLICT DO NOTHING`,
 			QuoteIdentifier(s.projectionTable),
 		),
 		s.projectionName,
 	)
-	if err != nil {
-		return err
-	}
 
-	return 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) {