added lint job to the ci

.circleci/config.yml

@@ -46,6 +46,10 @@ jobs:
               sleep 1
             done
             echo Failed waiting for MySQL && exit 1
+      - run:
+          name: Lint
+          command: |
+            make lint
       - run:
           name: Run tests
           environment:

.golangci.yml

@@ -41,7 +41,7 @@ linters:
     - varcheck
     - goimports
     - typecheck
-    - errorlint
+    #- errorlint
     - gofmt
     - misspell
     - nestif
@@ -57,6 +57,12 @@ linters-settings:
     go: "1.16"
   unused:
     go: "1.16"
+  gosec:
+    # Available rules: https://github.com/securego/gosec#available-rules
+    excludes:
+      - G404
+  nestif:
+    min-complexity: 8
 
 
 issues:

log/default.go

@@ -15,20 +15,24 @@ type defaultLogger struct {
 	internalLogger *log.Logger
 }
 
-func (l defaultLogger) Log(level Level, v... interface{}) {
+func (l defaultLogger) Log(level Level, v ...interface{}) {
 	if level == FatalLevel {
 		l.internalLogger.Fatal(v...)
 		return
 	}
-	l.internalLogger.Output(3, fmt.Sprint(v...))
-}
 
-func (l defaultLogger) Logf(level Level, template string, args... interface{}) {
-	if level == FatalLevel {
-		l.internalLogger.Fatalf(template, args...)
+	if level == PanicLevel {
+		l.internalLogger.Panic(v...)
 		return
 	}
-	l.internalLogger.Output(3, fmt.Sprintf(template, args...))
+
+	if err := l.internalLogger.Output(3, fmt.Sprint(v...)); err != nil {
+		l.internalLogger.Println(fmt.Sprintf("err logging an entry: %s. %s", err, v))
+	}
+}
+
+func (l defaultLogger) Logf(level Level, template string, args ...interface{}) {
+	l.Log(level, fmt.Sprintf(template, args...))
 }
 
 func (l defaultLogger) SetLevel(level Level) {

messagebus.go

@@ -2,6 +2,7 @@ package brigadier
 
 import (
 	"errors"
+
 	"github.com/go-foreman/foreman/log"
 	"github.com/go-foreman/foreman/pubsub/dispatcher"
 	"github.com/go-foreman/foreman/pubsub/endpoint"

pubsub/dispatcher/dispatcher.go

@@ -2,10 +2,11 @@ package dispatcher
 
 import (
 	"fmt"
+	"reflect"
+
 	"github.com/go-foreman/foreman/pubsub/message"
 	"github.com/go-foreman/foreman/pubsub/message/execution"
 	"github.com/go-foreman/foreman/runtime/scheme"
-	"reflect"
 )
 
 type Dispatcher interface {
@@ -17,14 +18,14 @@ type Dispatcher interface {
 
 func NewDispatcher() Dispatcher {
 	return &dispatcher{
-		handlers: make(map[reflect.Type][]execution.Executor),
+		handlers:  make(map[reflect.Type][]execution.Executor),
 		listeners: make(map[reflect.Type][]execution.Executor),
 	}
 }
 
 type dispatcher struct {
-	handlers  map[reflect.Type][]execution.Executor
-	listeners map[reflect.Type][]execution.Executor
+	handlers        map[reflect.Type][]execution.Executor
+	listeners       map[reflect.Type][]execution.Executor
 	allEvsListeners []execution.Executor
 }
 

pubsub/dispatcher/dispatcher_test.go

@@ -1,13 +1,14 @@
 package dispatcher
 
 import (
+	"reflect"
+	"testing"
+
 	"github.com/go-foreman/foreman/pubsub/message"
 	"github.com/go-foreman/foreman/pubsub/message/execution"
 	"github.com/go-foreman/foreman/runtime/scheme"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"reflect"
-	"testing"
 )
 
 type registerAccountCmd struct {
@@ -26,10 +27,6 @@ type confirmationSentEvent struct {
 	message.ObjectMeta
 }
 
-func allExecutor(execCtx execution.MessageExecutionCtx) error {
-	return nil
-}
-
 type service struct {
 }
 
@@ -77,7 +74,7 @@ func TestDispatcher_SubscribeForCmd(t *testing.T) {
 			dispatcher.SubscribeForCmd(wrongType, handler.handle)
 		})
 	})
-	
+
 	t.Run("cross subscription for an event", func(t *testing.T) {
 		dispatcher := NewDispatcher()
 		dispatcher.SubscribeForCmd(&registerAccountCmd{}, handler.handle)
@@ -140,7 +137,7 @@ func TestDispatcher_SubscribeForAllEvents(t *testing.T) {
 		require.Len(t, listeners, 1)
 		assertThisValueExists(t, handler.handle, listeners)
 	})
-	
+
 	t.Run("subscribe for an event by duplicating handler for all events", func(t *testing.T) {
 		dispatcher := NewDispatcher()
 		dispatcher.SubscribeForAllEvents(handler.handle)
@@ -182,4 +179,3 @@ func assertThisValueExists(t *testing.T, expected execution.Executor, executors
 	}
 	assert.True(t, exists, "expected executor is not found among executors")
 }
-

pubsub/endpoint/amqp.go

@@ -2,11 +2,12 @@ package endpoint
 
 import (
 	"context"
+	"time"
+
 	"github.com/go-foreman/foreman/pubsub/message"
 	"github.com/go-foreman/foreman/pubsub/transport"
 	"github.com/go-foreman/foreman/pubsub/transport/pkg"
 	"github.com/pkg/errors"
-	"time"
 )
 
 type AmqpEndpoint struct {
@@ -27,11 +28,9 @@ func (a AmqpEndpoint) Name() string {
 func (a AmqpEndpoint) Send(ctx context.Context, msg *message.OutcomingMessage, opts ...DeliveryOption) error {
 	deliveryOpts := &deliveryOptions{}
 
-	if opts != nil {
-		for _, opt := range opts {
-			if err := opt(deliveryOpts); err != nil {
-				return errors.Wrapf(err, "error compiling delivery options for message %s", msg.UID())
-			}
+	for _, opt := range opts {
+		if err := opt(deliveryOpts); err != nil {
+			return errors.Wrapf(err, "error compiling delivery options for message %s", msg.UID())
 		}
 	}
 

pubsub/endpoint/endpoint.go

@@ -2,8 +2,9 @@ package endpoint
 
 import (
 	"context"
-	"github.com/go-foreman/foreman/pubsub/message"
 	"time"
+
+	"github.com/go-foreman/foreman/pubsub/message"
 )
 
 type Endpoint interface {
@@ -13,7 +14,6 @@ type Endpoint interface {
 
 type deliveryOptions struct {
 	delay *time.Duration
-	headers message.Headers
 }
 
 func WithDelay(delay time.Duration) DeliveryOption {

pubsub/endpoint/router.go

@@ -1,13 +1,14 @@
 package endpoint
 
 import (
+	"reflect"
+
 	"github.com/go-foreman/foreman/pubsub/message"
 	"github.com/go-foreman/foreman/runtime/scheme"
-	"reflect"
 )
 
 type Router interface {
-	RegisterEndpoint(endpoint Endpoint, objects... message.Object)
+	RegisterEndpoint(endpoint Endpoint, objects ...message.Object)
 	Route(obj message.Object) []Endpoint
 }
 
@@ -21,7 +22,7 @@ type router struct {
 	routes map[reflect.Type][]Endpoint
 }
 
-func (r *router) RegisterEndpoint(endpoint Endpoint, objects... message.Object) {
+func (r *router) RegisterEndpoint(endpoint Endpoint, objects ...message.Object) {
 	for _, obj := range objects {
 		structType := scheme.GetStructType(obj)
 		r.routes[structType] = append(r.routes[structType], endpoint)

pubsub/errors/errors.go

@@ -1,4 +1,5 @@
 package errors
+
 //
 //type Status int
 //

pubsub/message/decoder.go

@@ -2,11 +2,12 @@ package message
 
 import (
 	"encoding/json"
+	"reflect"
+	"strings"
+
 	"github.com/go-foreman/foreman/runtime/scheme"
 	"github.com/mitchellh/mapstructure"
 	"github.com/pkg/errors"
-	"reflect"
-	"strings"
 )
 
 type Marshaller interface {
@@ -28,7 +29,6 @@ func WithDecoderErr(err error) error {
 
 type jsonDecoder struct {
 	knownTypes scheme.KnownTypesRegistry
-	decoder mapstructure.Decoder
 }
 
 func (j jsonDecoder) Unmarshal(b []byte) (Object, error) {
@@ -162,7 +162,7 @@ func (j jsonDecoder) Marshal(obj Object) ([]byte, error) {
 
 var objectType = reflect.TypeOf((*Object)(nil)).Elem()
 
-func(j jsonDecoder) setGroupKind(obj Object) error {
+func (j jsonDecoder) setGroupKind(obj Object) error {
 	if gk := obj.GroupKind(); gk.Empty() {
 		gk, err := j.knownTypes.ObjectKind(obj)
 		if err != nil {
@@ -188,4 +188,4 @@ func(j jsonDecoder) setGroupKind(obj Object) error {
 	}
 
 	return nil
-}
+}

pubsub/message/decoder_test.go

@@ -2,11 +2,12 @@ package message
 
 import (
 	"encoding/json"
+	"strings"
+	"testing"
+
 	"github.com/go-foreman/foreman/runtime/scheme"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"strings"
-	"testing"
 )
 
 const (
@@ -16,13 +17,13 @@ const (
 type WrapperType struct {
 	ObjectMeta
 	Nested Object
-	Value int
+	Value  int
 }
 
 type SomeTypeWithNestedType struct {
 	ObjectMeta
 	Nested Object
-	Value int
+	Value  int
 }
 
 type SomeTestType struct {
@@ -35,8 +36,6 @@ type ChildType struct {
 	Value int
 }
 
-
-
 func TestJsonDecoder(t *testing.T) {
 	knownRegistry := scheme.NewKnownTypesRegistry()
 	decoder := NewJsonMarshaller(knownRegistry)
@@ -50,7 +49,7 @@ func TestJsonDecoder(t *testing.T) {
 					Group: group.String(),
 				},
 			},
-			Value:          1,
+			Value: 1,
 		}
 
 		marshaled, err := decoder.Marshal(instance)
@@ -66,7 +65,7 @@ func TestJsonDecoder(t *testing.T) {
 	t.Run("verify that GK is set from schema before encoding", func(t *testing.T) {
 		knownRegistry.AddKnownTypes(group, &SomeTestType{})
 		instance := &SomeTestType{
-			Value:          1,
+			Value: 1,
 		}
 		marshaled, err := decoder.Marshal(instance)
 		require.NoError(t, err)
@@ -77,7 +76,7 @@ func TestJsonDecoder(t *testing.T) {
 		assert.IsType(t, &SomeTestType{}, decodedObj)
 		assert.Equal(t, instance.Value, instance.Value)
 	})
-	
+
 	t.Run("decode invalid payload with empty GK", func(t *testing.T) {
 		instance := &SomeTestType{
 			ObjectMeta: ObjectMeta{
@@ -86,7 +85,7 @@ func TestJsonDecoder(t *testing.T) {
 					Group: group.String(),
 				},
 			},
-			Value:          1,
+			Value: 1,
 		}
 
 		marshaled, err := json.Marshal(instance)
@@ -111,7 +110,7 @@ func TestJsonDecoder(t *testing.T) {
 		knownRegistry.AddKnownTypes(group, &WrapperType{})
 		instance := &WrapperType{
 			Nested: &SomeTypeWithNestedType{
-				Nested:     &SomeTestType{
+				Nested: &SomeTestType{
 					Value: 1,
 					Child: ChildType{
 						Value: -1,
@@ -131,4 +130,3 @@ func TestJsonDecoder(t *testing.T) {
 		assert.EqualValues(t, instance, decodedObj)
 	})
 }
-

pubsub/message/execution/context.go

@@ -2,6 +2,7 @@ package execution
 
 import (
 	"context"
+
 	"github.com/go-foreman/foreman/log"
 	"github.com/go-foreman/foreman/pubsub/endpoint"
 	"github.com/go-foreman/foreman/pubsub/message"