Added extra linters

roblaszczak · roblaszczak · commit f0a7bf43b2e3 · 2021-11-08T18:20:51.000+01:00
diff --git a/Makefile b/Makefile
@@ -23,6 +23,7 @@ proto:
 
 .PHONY: lint
 lint:
+	@go-cleanarch
 	@./scripts/lint.sh trainer
 	@./scripts/lint.sh trainings
 	@./scripts/lint.sh users
diff --git a/cloudbuild.yaml b/cloudbuild.yaml
@@ -1,16 +1,20 @@
 steps:
+- id: common-lint
+  name: golang
+  entrypoint: ./scripts/lint.sh
+  args: ['common', '-install']
 - id: trainer-lint
   name: golang
   entrypoint: ./scripts/lint.sh
-  args: [trainer]
+  args: ['trainer', '-install']
 - id: trainings-lint
   name: golang
   entrypoint: ./scripts/lint.sh
-  args: [trainings]
+  args: ['trainings', '-install']
 - id: users-lint
   name: golang
   entrypoint: ./scripts/lint.sh
-  args: [users]
+  args: ['users', '-install']
 
 - id: trainer-docker
   name: gcr.io/cloud-builders/docker
@@ -35,6 +39,11 @@ steps:
     - 'PROJECT_ID=$PROJECT_ID'
   waitFor: [trainer-docker, trainings-docker, users-docker]
 
+- id: common-tests
+  name: golang
+  entrypoint: ./scripts/test.sh
+  args: ["common", ".test.ci.env"]
+  waitFor: [docker-compose]
 - id: trainer-tests
   name: golang
   entrypoint: ./scripts/test.sh
@@ -96,7 +105,7 @@ steps:
   dir: web
   waitFor: ['-']
 - id: openapi-js
-  name: openapitools/openapi-generator-cli:v4.3.0 
+  name: openapitools/openapi-generator-cli:v4.3.0
   entrypoint: "./scripts/openapi-js.sh"
   waitFor: ['-']
 - id: web-build
diff --git a/internal/common/.golangci.yml b/internal/common/.golangci.yml
@@ -0,0 +1,47 @@
+linters:
+  disable-all: true
+  enable:
+    - deadcode
+    - errcheck
+    - gosimple
+    - govet
+    - ineffassign
+    - staticcheck
+    - structcheck
+    - typecheck
+    - unused
+    - varcheck
+    - asciicheck
+    - bodyclose
+    - dogsled
+    - exhaustive
+    - exportloopref
+    - gocognit
+    - goconst
+    - gofmt
+    - goheader
+    - goimports
+    - gosec
+    - misspell
+    - nakedret
+    - nestif
+    - noctx
+    - rowserrcheck
+    - sqlclosecheck
+    - unconvert
+    - unparam
+    - whitespace
+
+issues:
+  exclude:
+    - "composite literal uses unkeyed fields"
+  exclude-rules:
+    - path: _test\.go
+      linters:
+        - gosec
+        - noctx
+        - unparam
+        - bodyclose
+    - path: fixtures.go
+      linters:
+        - gosec
diff --git a/internal/trainer/.golangci.yml b/internal/trainer/.golangci.yml
@@ -0,0 +1,47 @@
+linters:
+  disable-all: true
+  enable:
+    - deadcode
+    - errcheck
+    - gosimple
+    - govet
+    - ineffassign
+    - staticcheck
+    - structcheck
+    - typecheck
+    - unused
+    - varcheck
+    - asciicheck
+    - bodyclose
+    - dogsled
+    - exhaustive
+    - exportloopref
+    - gocognit
+    - goconst
+    - gofmt
+    - goheader
+    - goimports
+    - gosec
+    - misspell
+    - nakedret
+    - nestif
+    - noctx
+    - rowserrcheck
+    - sqlclosecheck
+    - unconvert
+    - unparam
+    - whitespace
+
+issues:
+  exclude:
+    - "composite literal uses unkeyed fields"
+  exclude-rules:
+    - path: _test\.go
+      linters:
+        - gosec
+        - noctx
+        - unparam
+        - bodyclose
+    - path: fixtures.go
+      linters:
+        - gosec
diff --git a/internal/trainer/adapters/dates_firestore_repository.go b/internal/trainer/adapters/dates_firestore_repository.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/ThreeDotsLabs/wild-workouts-go-ddd-example/internal/trainer/app/query"
 	"github.com/ThreeDotsLabs/wild-workouts-go-ddd-example/internal/trainer/domain/hour"
+	"github.com/pkg/errors"
 
 	"cloud.google.com/go/firestore"
 	"google.golang.org/api/iterator"
@@ -56,7 +57,7 @@ func (d DatesFirestoreRepository) AvailableHours(ctx context.Context, from time.
 
 	for {
 		doc, err := iter.Next()
-		if err == iterator.Done {
+		if errors.Is(err, iterator.Done) {
 			break
 		}
 		if err != nil {
diff --git a/internal/trainer/adapters/hour_repository_test.go b/internal/trainer/adapters/hour_repository_test.go
@@ -216,6 +216,7 @@ func testUpdateHour_rollback(t *testing.T, repository hour.Repository) {
 		require.NoError(t, h.MakeAvailable())
 		return h, nil
 	})
+	require.Error(t, err)
 
 	err = repository.UpdateHour(ctx, hourTime, func(h *hour.Hour) (*hour.Hour, error) {
 		assert.True(t, h.IsAvailable())
diff --git a/internal/trainer/fixtures.go b/internal/trainer/fixtures.go
@@ -25,7 +25,7 @@ func loadFixtures(app app.Application) {
 		return
 	}
 
-	logrus.WithField("after", time.Now().Sub(start)).Debug("Trainer service is available")
+	logrus.WithField("after", time.Since(start)).Debug("Trainer service is available")
 
 	if !canLoadFixtures(app, ctx) {
 		logrus.Debug("Trainer fixtures are already loaded")
@@ -42,7 +42,7 @@ func loadFixtures(app app.Application) {
 		time.Sleep(10 * time.Second)
 	}
 
-	logrus.WithField("after", time.Now().Sub(start)).Debug("Trainer fixtures loaded")
+	logrus.WithField("after", time.Since(start)).Debug("Trainer fixtures loaded")
 }
 
 func loadTrainerFixtures(ctx context.Context, application app.Application) error {
diff --git a/internal/trainer/ports/grpc.go b/internal/trainer/ports/grpc.go
@@ -2,12 +2,10 @@ package ports
 
 import (
 	"context"
-	"errors"
 	"time"
 
 	"github.com/ThreeDotsLabs/wild-workouts-go-ddd-example/internal/common/genproto/trainer"
 	"github.com/ThreeDotsLabs/wild-workouts-go-ddd-example/internal/trainer/app"
-	"github.com/golang/protobuf/ptypes"
 	"github.com/golang/protobuf/ptypes/empty"
 	"github.com/golang/protobuf/ptypes/timestamp"
 	"google.golang.org/grpc/codes"
@@ -23,10 +21,7 @@ func NewGrpcServer(application app.Application) GrpcServer {
 }
 
 func (g GrpcServer) MakeHourAvailable(ctx context.Context, request *trainer.UpdateHourRequest) (*empty.Empty, error) {
-	trainingTime, err := protoTimestampToTime(request.Time)
-	if err != nil {
-		return nil, status.Error(codes.InvalidArgument, "unable to parse time")
-	}
+	trainingTime := protoTimestampToTime(request.Time)
 
 	if err := g.app.Commands.MakeHoursAvailable.Handle(ctx, []time.Time{trainingTime}); err != nil {
 		return nil, status.Error(codes.Internal, err.Error())
@@ -36,10 +31,7 @@ func (g GrpcServer) MakeHourAvailable(ctx context.Context, request *trainer.Upda
 }
 
 func (g GrpcServer) ScheduleTraining(ctx context.Context, request *trainer.UpdateHourRequest) (*empty.Empty, error) {
-	trainingTime, err := protoTimestampToTime(request.Time)
-	if err != nil {
-		return nil, status.Error(codes.InvalidArgument, "unable to parse time")
-	}
+	trainingTime := protoTimestampToTime(request.Time)
 
 	if err := g.app.Commands.ScheduleTraining.Handle(ctx, trainingTime); err != nil {
 		return nil, status.Error(codes.Internal, err.Error())
@@ -49,10 +41,7 @@ func (g GrpcServer) ScheduleTraining(ctx context.Context, request *trainer.Updat
 }
 
 func (g GrpcServer) CancelTraining(ctx context.Context, request *trainer.UpdateHourRequest) (*empty.Empty, error) {
-	trainingTime, err := protoTimestampToTime(request.Time)
-	if err != nil {
-		return nil, status.Error(codes.InvalidArgument, "unable to parse time")
-	}
+	trainingTime := protoTimestampToTime(request.Time)
 
 	if err := g.app.Commands.CancelTraining.Handle(ctx, trainingTime); err != nil {
 		return nil, status.Error(codes.Internal, err.Error())
@@ -62,10 +51,7 @@ func (g GrpcServer) CancelTraining(ctx context.Context, request *trainer.UpdateH
 }
 
 func (g GrpcServer) IsHourAvailable(ctx context.Context, request *trainer.IsHourAvailableRequest) (*trainer.IsHourAvailableResponse, error) {
-	trainingTime, err := protoTimestampToTime(request.Time)
-	if err != nil {
-		return nil, status.Error(codes.InvalidArgument, "unable to parse time")
-	}
+	trainingTime := protoTimestampToTime(request.Time)
 
 	isAvailable, err := g.app.Queries.HourAvailability.Handle(ctx, trainingTime)
 	if err != nil {
@@ -75,13 +61,6 @@ func (g GrpcServer) IsHourAvailable(ctx context.Context, request *trainer.IsHour
 	return &trainer.IsHourAvailableResponse{IsAvailable: isAvailable}, nil
 }
 
-func protoTimestampToTime(timestamp *timestamp.Timestamp) (time.Time, error) {
-	t, err := ptypes.Timestamp(timestamp)
-	if err != nil {
-		return time.Time{}, errors.New("unable to parse time")
-	}
-
-	t = t.UTC().Truncate(time.Hour)
-
-	return t, nil
+func protoTimestampToTime(timestamp *timestamp.Timestamp) time.Time {
+	return timestamp.AsTime().UTC().Truncate(time.Hour)
 }
diff --git a/internal/trainer/ports/http.go b/internal/trainer/ports/http.go
@@ -22,7 +22,6 @@ func NewHttpServer(application app.Application) HttpServer {
 }
 
 func (h HttpServer) GetTrainerAvailableHours(w http.ResponseWriter, r *http.Request, params GetTrainerAvailableHoursParams) {
-
 	dateModels, err := h.app.Queries.TrainerAvailableHours.Handle(r.Context(), query.AvailableHours{
 		From: params.DateFrom,
 		To:   params.DateTo,
diff --git a/internal/trainings/.golangci.yml b/internal/trainings/.golangci.yml
@@ -0,0 +1,47 @@
+linters:
+  disable-all: true
+  enable:
+    - deadcode
+    - errcheck
+    - gosimple
+    - govet
+    - ineffassign
+    - staticcheck
+    - structcheck
+    - typecheck
+    - unused
+    - varcheck
+    - asciicheck
+    - bodyclose
+    - dogsled
+    - exhaustive
+    - exportloopref
+    - gocognit
+    - goconst
+    - gofmt
+    - goheader
+    - goimports
+    - gosec
+    - misspell
+    - nakedret
+    - nestif
+    - noctx
+    - rowserrcheck
+    - sqlclosecheck
+    - unconvert
+    - unparam
+    - whitespace
+
+issues:
+  exclude:
+    - "composite literal uses unkeyed fields"
+  exclude-rules:
+    - path: _test\.go
+      linters:
+        - gosec
+        - noctx
+        - unparam
+        - bodyclose
+    - path: fixtures.go
+      linters:
+        - gosec
diff --git a/internal/trainings/adapters/trainer_grpc.go b/internal/trainings/adapters/trainer_grpc.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"time"
 
-	"github.com/golang/protobuf/ptypes"
 	"github.com/pkg/errors"
+	"google.golang.org/protobuf/types/known/timestamppb"
 
 	"github.com/ThreeDotsLabs/wild-workouts-go-ddd-example/internal/common/genproto/trainer"
 )
@@ -19,26 +19,16 @@ func NewTrainerGrpc(client trainer.TrainerServiceClient) TrainerGrpc {
 }
 
 func (s TrainerGrpc) ScheduleTraining(ctx context.Context, trainingTime time.Time) error {
-	timestamp, err := ptypes.TimestampProto(trainingTime)
-	if err != nil {
-		return errors.Wrap(err, "unable to convert time to proto timestamp")
-	}
-
-	_, err = s.client.ScheduleTraining(ctx, &trainer.UpdateHourRequest{
-		Time: timestamp,
+	_, err := s.client.ScheduleTraining(ctx, &trainer.UpdateHourRequest{
+		Time: timestamppb.New(trainingTime),
 	})
 
 	return err
 }
 
 func (s TrainerGrpc) CancelTraining(ctx context.Context, trainingTime time.Time) error {
-	timestamp, err := ptypes.TimestampProto(trainingTime)
-	if err != nil {
-		return errors.Wrap(err, "unable to convert time to proto timestamp")
-	}
-
-	_, err = s.client.CancelTraining(ctx, &trainer.UpdateHourRequest{
-		Time: timestamp,
+	_, err := s.client.CancelTraining(ctx, &trainer.UpdateHourRequest{
+		Time: timestamppb.New(trainingTime),
 	})
 
 	return err
diff --git a/internal/trainings/adapters/trainings_firestore_repository_test.go b/internal/trainings/adapters/trainings_firestore_repository_test.go
@@ -246,6 +246,8 @@ func TestTrainingsFirestoreRepository_FindTrainingsForUser(t *testing.T) {
 		"User",
 		time.Now(),
 	)
+	require.NoError(t, err)
+
 	err = repo.AddTraining(ctx, tr1)
 	require.NoError(t, err)
 
@@ -255,6 +257,8 @@ func TestTrainingsFirestoreRepository_FindTrainingsForUser(t *testing.T) {
 		"User",
 		time.Now(),
 	)
+	require.NoError(t, err)
+
 	err = repo.AddTraining(ctx, tr2)
 	require.NoError(t, err)
 
@@ -265,8 +269,11 @@ func TestTrainingsFirestoreRepository_FindTrainingsForUser(t *testing.T) {
 		"User",
 		time.Now(),
 	)
+	require.NoError(t, err)
+
 	err = canceledTraining.Cancel()
 	require.NoError(t, err)
+
 	err = repo.AddTraining(ctx, canceledTraining)
 	require.NoError(t, err)
 
diff --git a/internal/trainings/domain/training/cancel.go b/internal/trainings/domain/training/cancel.go
diff --git a/internal/users/.golangci.yml b/internal/users/.golangci.yml
diff --git a/internal/users/fixtures.go b/internal/users/fixtures.go
diff --git a/internal/users/main.go b/internal/users/main.go
diff --git a/scripts/lint.sh b/scripts/lint.sh

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ func loadFixtures(app app.Application) {`
`25`	`25`	`return`
`26`	`26`	`}`
`27`	`27`
`28`		`- logrus.WithField("after", time.Now().Sub(start)).Debug("Trainer service is available")`
	`28`	`+ logrus.WithField("after", time.Since(start)).Debug("Trainer service is available")`
`29`	`29`
`30`	`30`	`if !canLoadFixtures(app, ctx) {`
`31`	`31`	`logrus.Debug("Trainer fixtures are already loaded")`
`@@ -42,7 +42,7 @@ func loadFixtures(app app.Application) {`
`42`	`42`	`time.Sleep(10 * time.Second)`
`43`	`43`	`}`
`44`	`44`
`45`		`- logrus.WithField("after", time.Now().Sub(start)).Debug("Trainer fixtures loaded")`
	`45`	`+ logrus.WithField("after", time.Since(start)).Debug("Trainer fixtures loaded")`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`func loadTrainerFixtures(ctx context.Context, application app.Application) error {`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,6 @@ func NewHttpServer(application app.Application) HttpServer {`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`func (h HttpServer) GetTrainerAvailableHours(w http.ResponseWriter, r *http.Request, params GetTrainerAvailableHoursParams) {`
`25`		`-`
`26`	`25`	`dateModels, err := h.app.Queries.TrainerAvailableHours.Handle(r.Context(), query.AvailableHours{`
`27`	`26`	`From: params.DateFrom,`
`28`	`27`	`To: params.DateTo,`