fix(golint): all linting issues have been fixed

ar3s3ru · ar3s3ru · commit 05533afd3f9b · 2024-12-26T22:52:18.000+01:00
diff --git a/.golangci.yml b/.golangci.yml
@@ -1,7 +1,7 @@
 ---
-# See https://github.com/golangci/golangci-lint/blob/master/.golangci.example.yml
+# See https://github.com/golangci/golangci-lint/blob/master/.golangci.reference.yml
 run:
-  go: '1.21'
+  go: '1.23' # Depends on the version with which golangci-lint was built.
   tests: true
 
 linters-settings:
@@ -14,9 +14,9 @@ linters-settings:
       - default
       - prefix(github.com/get-eventually/go-eventually)
   gocyclo:
-    min-complexity: 15
+    min-complexity: 20
   goimports:
-    local-prefixes: prefix(github.com/get-eventually/go-eventually)
+    local-prefixes: prefix(flugg.app/flugg)
   gocritic:
     enabled-tags:
       - diagnostic
@@ -29,14 +29,13 @@ linters-settings:
   misspell:
     locale: US
   lll:
-    line-length: 120
+    line-length: 160
   tagliatelle:
     case:
       rules:
         json: snake
   unused:
-    exported-is-used: true
-    exported-fields-are-used: true
+    exported-fields-are-used: false
   unparam:
     check-exported: true
   gomodguard:
@@ -59,7 +58,7 @@ linters:
     - errcheck
     - exhaustive
     - exhaustruct
-    - exportloopref
+    - copyloopvar
     - funlen
     - gci
     - gochecknoinits
@@ -69,13 +68,12 @@ linters:
     - gocritic
     - gocyclo
     - godot
-    - godox
+    # - godox
     - gofumpt
     - goimports
     - gomodguard
-    - gomnd
+    - mnd
     - goprintffuncname
-    - exportloopref
     - gosec
     - gosimple
     - govet
@@ -105,6 +103,8 @@ linters:
     - wsl
 
 issues:
+  max-issues-per-linter: 0
+  max-same-issues: 0
   exclude-use-default: false
   exclude-rules:
     - path: _test\.go
diff --git a/aggregate/event_sourced_repository.go b/aggregate/event_sourced_repository.go
@@ -117,7 +117,7 @@ func (repo EventSourcedRepository[I, T]) Save(ctx context.Context, root T) error
 	}
 
 	streamID := event.StreamID(root.AggregateID().String())
-	expectedVersion := version.CheckExact(root.Version() - version.Version(len(events)))
+	expectedVersion := version.CheckExact(root.Version() - version.Version(len(events))) //nolint:gosec // This should not overflow.
 
 	if _, err := repo.eventStore.Append(ctx, streamID, expectedVersion, events...); err != nil {
 		return fmt.Errorf("aggregate.EventSourcedRepository: failed to commit recorded events, %w", err)
diff --git a/event/store_inmemory.go b/event/store_inmemory.go
@@ -57,7 +57,7 @@ func (es *InMemoryStore) Stream(
 	}
 
 	for i, evt := range events {
-		eventVersion := version.Version(i) + 1
+		eventVersion := version.Version(i) + 1 //nolint:gosec // This should not overflow.
 
 		if eventVersion < selector.From {
 			continue
@@ -100,17 +100,17 @@ func (es *InMemoryStore) Append(
 	es.mx.Lock()
 	defer es.mx.Unlock()
 
-	currentVersion := version.CheckExact(len(es.events[id]))
+	currentVersion := version.CheckExact(len(es.events[id])) //nolint:gosec // This should not overflow.
 
-	if expected != version.Any && currentVersion != expected {
+	if v, expectsExactVersion := expected.(version.CheckExact); expectsExactVersion && currentVersion != expected {
 		return 0, fmt.Errorf("event.InMemoryStore: failed to append events, %w", version.ConflictError{
-			Expected: version.Version(expected.(version.CheckExact)),
+			Expected: version.Version(v),
 			Actual:   version.Version(currentVersion),
 		})
 	}
 
 	es.events[id] = append(es.events[id], events...)
-	newEventStreamVersion := version.Version(len(es.events[id]))
+	newEventStreamVersion := version.Version(len(es.events[id])) //nolint:gosec // This should not overflow.
 
 	return newEventStreamVersion, nil
 }
diff --git a/event/store_tracking.go b/event/store_tracking.go
@@ -60,12 +60,12 @@ func (es *TrackingStore) Append(
 		return v, err
 	}
 
-	previousVersion := v - version.Version(len(events))
+	previousVersion := v - version.Version(len(events)) //nolint:gosec // This should not overflow.
 
 	for i, evt := range events {
 		es.recorded = append(es.recorded, Persisted{
 			StreamID: id,
-			Version:  previousVersion + version.Version(i) + 1,
+			Version:  previousVersion + version.Version(i) + 1, //nolint:gosec // This should not overflow.
 			Envelope: evt,
 		})
 	}
diff --git a/firestore/event_store.go b/firestore/event_store.go
@@ -65,7 +65,12 @@ func (es EventStore) Stream(
 			return fmt.Errorf("firestore.EventStore.Stream: failed while reading iterator, %w", err)
 		}
 
-		msg, err := es.Serde.Deserialize(doc.Data()["payload"].([]byte))
+		payload, ok := doc.Data()["payload"].([]byte)
+		if !ok {
+			return fmt.Errorf("firestore.EventStore.Stream: invalid payload type, expected: []byte, got: %T", doc.Data()["payload"])
+		}
+
+		msg, err := es.Serde.Deserialize(payload)
 		if err != nil {
 			return fmt.Errorf("firestore.EventStore.Stream: failed to deserialize message payload, %w", err)
 		}
@@ -75,9 +80,14 @@ func (es EventStore) Stream(
 			metadata = v
 		}
 
+		v, ok := doc.Data()["version"].(int64)
+		if !ok {
+			return fmt.Errorf("firestore.EventStore.Stream: invalid version type, expected: int64, got: %T", doc.Data()["version"])
+		}
+
 		stream <- event.Persisted{
 			StreamID: id,
-			Version:  version.Version(doc.Data()["version"].(int64)),
+			Version:  version.Version(v), //nolint:gosec // This should not overflow.
 			Envelope: event.Envelope{
 				Message:  msg,
 				Metadata: metadata,
@@ -102,8 +112,14 @@ func (es EventStore) checkAndUpsertEventStream(
 	}
 
 	var currentVersion version.Version
+
 	if err == nil {
-		currentVersion = version.Version(doc.Data()["last_version"].(int64))
+		lastVersion, ok := doc.Data()["last_version"].(int64)
+		if !ok {
+			return 0, fmt.Errorf("firestore.EventStore.Append: invalid last_version type, expected: int64, got: %T", doc.Data()["last_version"])
+		}
+
+		currentVersion = version.Version(lastVersion) //nolint:gosec // This should not overflow.
 	}
 
 	if v, ok := expected.(version.CheckExact); ok && version.Version(v) != currentVersion {
@@ -113,7 +129,7 @@ func (es EventStore) checkAndUpsertEventStream(
 		})
 	}
 
-	newVersion := currentVersion + version.Version(newEventsLength)
+	newVersion := currentVersion + version.Version(newEventsLength) //nolint:gosec // This should not overflow.
 
 	if err := tx.Set(docRef, map[string]interface{}{
 		"last_version": newVersion,
@@ -165,7 +181,7 @@ func (es EventStore) Append(
 		for i, evt := range events {
 			if err := es.appendEvent(tx, event.Persisted{
 				StreamID: id,
-				Version:  currentVersion + version.Version(i) + 1,
+				Version:  currentVersion + version.Version(i) + 1, //nolint:gosec // This should not overflow.
 				Envelope: evt,
 			}); err != nil {
 				return err
@@ -177,5 +193,5 @@ func (es EventStore) Append(
 		return 0, fmt.Errorf("firestore.EventStore.Append: failed to commit transaction, %w", err)
 	}
 
-	return currentVersion + version.Version(len(events)), nil
+	return currentVersion + version.Version(len(events)), nil //nolint:gosec // This should not overflow.
 }
diff --git a/firestore/event_store_test.go b/firestore/event_store_test.go
@@ -38,7 +38,7 @@ func TestEventStore(t *testing.T) {
 		require.NoError(t, firestoreContainer.Terminate(ctx))
 	}()
 
-	conn, err := grpc.Dial(firestoreContainer.URI, grpc.WithTransportCredentials(insecure.NewCredentials()))
+	conn, err := grpc.NewClient(firestoreContainer.URI, grpc.WithTransportCredentials(insecure.NewCredentials()))
 	require.NoError(t, err)
 
 	client, err := firestore.NewClient(ctx, projectID, option.WithGRPCConn(conn))
diff --git a/internal/user/serde.go b/internal/user/serde.go
@@ -14,6 +14,7 @@ import (
 )
 
 func timeToDate(t time.Time) *date.Date {
+	//nolint:gosec // These surely won't overflow.
 	return &date.Date{
 		Year:  int32(t.Year()),
 		Month: int32(t.Month()),
diff --git a/internal/user/suite_aggregate_repository.go b/internal/user/suite_aggregate_repository.go
@@ -21,7 +21,7 @@ import (
 //
 // Package user of this module exposes a Protobuf-based serde, which can be useful
 // to test serialization and deserialization of data to the target repository implementation.
-func AggregateRepositorySuite(repository aggregate.Repository[uuid.UUID, *User]) func(t *testing.T) { //nolint:funlen,lll // It's a test suite.
+func AggregateRepositorySuite(repository aggregate.Repository[uuid.UUID, *User]) func(t *testing.T) { //nolint:funlen // It's a test suite.
 	return func(t *testing.T) {
 		ctx := context.Background()
 		now := time.Now()
@@ -83,7 +83,7 @@ func AggregateRepositorySuite(repository aggregate.Repository[uuid.UUID, *User])
 
 			expectedErr := version.ConflictError{
 				Expected: 0,
-				Actual:   2, //nolint:gomnd // False positive.
+				Actual:   2, //nolint:mnd // False positive.
 			}
 
 			var conflictErr version.ConflictError
diff --git a/internal/user/suite_event_store.go b/internal/user/suite_event_store.go
@@ -33,7 +33,7 @@ func EventStoreSuite(eventStore event.Store) func(t *testing.T) {
 			require.NoError(t, usr.UpdateEmail("dani.ross@mail.com", now, nil))
 
 			eventsToCommit := usr.FlushRecordedEvents()
-			expectedVersion := version.Version(len(eventsToCommit))
+			expectedVersion := version.Version(len(eventsToCommit)) //nolint:gosec // This should not overflow.
 
 			newVersion, err := eventStore.Append(
 				ctx,
@@ -50,7 +50,7 @@ func EventStoreSuite(eventStore event.Store) func(t *testing.T) {
 			require.NoError(t, usr.UpdateEmail("daniross123@gmail.com", now, nil))
 
 			newEventsToCommit := usr.FlushRecordedEvents()
-			expectedVersion += version.Version(len(newEventsToCommit))
+			expectedVersion += version.Version(len(newEventsToCommit)) //nolint:gosec // This should not overflow.
 
 			newVersion, err = eventStore.Append(
 				ctx,
diff --git a/postgres/aggregate_repository.go b/postgres/aggregate_repository.go
@@ -116,16 +116,15 @@ func (repo AggregateRepository[ID, T]) get(ctx context.Context, tx queryRower, i
 
 // Save saves the new state of the provided aggregate.Root instance.
 func (repo AggregateRepository[ID, T]) Save(ctx context.Context, root T) (err error) {
-	txOpts := pgx.TxOptions{
+	txOpts := pgx.TxOptions{ //nolint:exhaustruct // We don't need all fields.
 		IsoLevel:       pgx.Serializable,
 		AccessMode:     pgx.ReadWrite,
 		DeferrableMode: pgx.Deferrable,
-		BeginQuery:     "",
 	}
 
 	return internal.RunTransaction(ctx, repo.conn, txOpts, func(ctx context.Context, tx pgx.Tx) error {
 		eventsToCommit := root.FlushRecordedEvents()
-		expectedRootVersion := root.Version() - version.Version(len(eventsToCommit))
+		expectedRootVersion := root.Version() - version.Version(len(eventsToCommit)) //nolint:gosec // This should not overflow.
 		eventStreamID := event.StreamID(root.AggregateID().String())
 
 		newEventStreamVersion, err := appendDomainEvents(
diff --git a/postgres/append_domain_events.go b/postgres/append_domain_events.go
@@ -61,7 +61,7 @@ func appendDomainEvents(
 		)
 	}
 
-	newVersion := oldVersion + version.Version(len(events))
+	newVersion := oldVersion + version.Version(len(events)) //nolint:gosec // This should not overflow.
 
 	if _, err := tx.Exec(
 		ctx,
@@ -72,7 +72,7 @@ func appendDomainEvents(
 	}
 
 	for i, event := range events {
-		eventVersion := oldVersion + version.Version(i) + 1
+		eventVersion := oldVersion + version.Version(i) + 1 //nolint:gosec // This should not overflow.
 
 		if err := appendDomainEvent(
 			ctx, tx,
diff --git a/postgres/event_store.go b/postgres/event_store.go
@@ -104,11 +104,10 @@ func (es EventStore) Append(
 ) (version.Version, error) {
 	var newVersion version.Version
 
-	txOpts := pgx.TxOptions{
+	txOpts := pgx.TxOptions{ //nolint:exhaustruct // We don't need all fields.
 		IsoLevel:       pgx.Serializable,
 		AccessMode:     pgx.ReadWrite,
 		DeferrableMode: pgx.Deferrable,
-		BeginQuery:     "",
 	}
 
 	if err := internal.RunTransaction(ctx, es.conn, txOpts, func(ctx context.Context, tx pgx.Tx) error {
diff --git a/postgres/internal/container.go b/postgres/internal/container.go
@@ -28,13 +28,14 @@ func NewPostgresContainer(ctx context.Context) (*PostgresContainer, error) {
 		return fmt.Errorf("internal.NewPostgresContainer: %s, %w", msg, err)
 	}
 
-	container, err := postgres.RunContainer(ctx,
-		testcontainers.WithImage("postgres:16-alpine"),
+	container, err := postgres.Run(
+		ctx,
+		"postgres:16-alpine",
 		postgres.WithDatabase("main"),
 		postgres.WithUsername("postgres"),
 		postgres.WithPassword("notasecret"),
 		testcontainers.WithWaitStrategy(
-			//nolint:gomnd // It's ok to use a magic number here.
+			//nolint:mnd // It's ok to use a magic number here.
 			wait.ForLog("database system is ready to accept connections").
 				WithOccurrence(2).
 				WithStartupTimeout(5*time.Second),
diff --git a/postgres/internal/transaction.go b/postgres/internal/transaction.go
@@ -17,7 +17,7 @@ type TxBeginner interface {
 func RunTransaction(
 	ctx context.Context,
 	db TxBeginner,
-	options pgx.TxOptions,
+	options pgx.TxOptions, //nolint:gocritic // The pgx API uses value semantics, will do the same here.
 	do func(ctx context.Context, tx pgx.Tx) error,
 ) (err error) {
 	withContext := func(msg string, err error) error {
diff --git a/postgres/migration.go b/postgres/migration.go
@@ -28,7 +28,7 @@ func RunMigrations(db *sql.DB) error {
 		return wrapErr(err, "failed to create new iofs driver for reading migrations")
 	}
 
-	driver, err := pgx.WithInstance(db, &pgx.Config{
+	driver, err := pgx.WithInstance(db, &pgx.Config{ //nolint:exhaustruct // We don't need all fields.
 		MigrationsTable:       "eventually_schema_migrations",
 		DatabaseName:          "",
 		SchemaName:            "",
diff --git a/postgres/option.go b/postgres/option.go
@@ -11,7 +11,7 @@ type option[T any] func(T)
 
 func newOption[T any](f func(T)) option[T] { return option[T](f) }
 
-func (apply option[T]) apply(val T) { apply(val) } //nolint:unused // False positive.
+func (apply option[T]) apply(val T) { apply(val) }
 
 const (
 	// DefaultAggregateTableName is the default Aggregate table name an AggregateRepository points to.

Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ func (repo EventSourcedRepository[I, T]) Save(ctx context.Context, root T) error`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`streamID := event.StreamID(root.AggregateID().String())`
`120`		`- expectedVersion := version.CheckExact(root.Version() - version.Version(len(events)))`
	`120`	`+ expectedVersion := version.CheckExact(root.Version() - version.Version(len(events))) //nolint:gosec // This should not overflow.`
`121`	`121`
`122`	`122`	`if _, err := repo.eventStore.Append(ctx, streamID, expectedVersion, events...); err != nil {`
`123`	`123`	`return fmt.Errorf("aggregate.EventSourcedRepository: failed to commit recorded events, %w", err)`
Original file line number	Diff line number	Diff line change
`@@ -60,12 +60,12 @@ func (es *TrackingStore) Append(`
`60`	`60`	`return v, err`
`61`	`61`	`}`
`62`	`62`
`63`		`- previousVersion := v - version.Version(len(events))`
	`63`	`+ previousVersion := v - version.Version(len(events)) //nolint:gosec // This should not overflow.`
`64`	`64`
`65`	`65`	`for i, evt := range events {`
`66`	`66`	`es.recorded = append(es.recorded, Persisted{`
`67`	`67`	`StreamID: id,`
`68`		`- Version: previousVersion + version.Version(i) + 1,`
	`68`	`+ Version: previousVersion + version.Version(i) + 1, //nolint:gosec // This should not overflow.`
`69`	`69`	`Envelope: evt,`
`70`	`70`	`})`
`71`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ import (`
`14`	`14`	`)`
`15`	`15`
`16`	`16`	`func timeToDate(t time.Time) *date.Date {`
	`17`	`+ //nolint:gosec // These surely won't overflow.`
`17`	`18`	`return &date.Date{`
`18`	`19`	`Year: int32(t.Year()),`
`19`	`20`	`Month: int32(t.Month()),`