Merge pull request ThreeDotsLabs#46 from ThreeDotsLabs/added-linters

Added linters

Makefile

@@ -23,6 +23,8 @@ proto:
 
 .PHONY: lint
 lint:
+	@go-cleanarch
+	@./scripts/lint.sh common
 	@./scripts/lint.sh trainer
 	@./scripts/lint.sh trainings
 	@./scripts/lint.sh users

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

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

internal/common/client/grpc.go

@@ -70,7 +70,8 @@ func grpcDialOpts(grpcAddr string) ([]grpc.DialOption, error) {
 		return nil, errors.Wrap(err, "cannot load root CA cert")
 	}
 	creds := credentials.NewTLS(&tls.Config{
-		RootCAs: systemRoots,
+		RootCAs:    systemRoots,
+		MinVersion: tls.VersionTLS12,
 	})
 
 	return []grpc.DialOption{

internal/common/server/http.go

@@ -31,7 +31,7 @@ func RunHTTPServerOnAddr(addr string, createHandler func(router chi.Router) http
 
 	logrus.Info("Starting HTTP server")
 
-	http.ListenAndServe(addr, rootRouter)
+	_ = http.ListenAndServe(addr, rootRouter)
 }
 
 func setMiddlewares(router *chi.Mux) {

internal/common/tests/clients.go

@@ -49,6 +49,8 @@ func (c TrainerHTTPClient) MakeHourAvailable(t *testing.T, hour time.Time) int {
 		Hours: []time.Time{hour},
 	})
 	require.NoError(t, err)
+	require.NoError(t, response.Body.Close())
+
 	return response.StatusCode
 }
 
@@ -57,6 +59,8 @@ func (c TrainerHTTPClient) MakeHourUnavailable(t *testing.T, hour time.Time) {
 		Hours: []time.Time{hour},
 	})
 	require.NoError(t, err)
+	require.NoError(t, response.Body.Close())
+
 	require.Equal(t, http.StatusNoContent, response.StatusCode)
 }
 
@@ -113,6 +117,8 @@ func (c TrainingsHTTPClient) CreateTrainingShouldFail(t *testing.T, note string,
 		Time:  hour,
 	})
 	require.NoError(t, err)
+	require.NoError(t, response.Body.Close())
+
 	require.Equal(t, http.StatusInternalServerError, response.StatusCode)
 }
 
@@ -127,6 +133,8 @@ func (c TrainingsHTTPClient) GetTrainings(t *testing.T) trainings.Trainings {
 func (c TrainingsHTTPClient) CancelTraining(t *testing.T, trainingUUID string, expectedStatusCode int) {
 	response, err := c.client.CancelTraining(context.Background(), trainingUUID)
 	require.NoError(t, err)
+	require.NoError(t, response.Body.Close())
+
 	require.Equal(t, expectedStatusCode, response.StatusCode)
 }
 

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

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 {

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())

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 {

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)
 }

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,

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