try out golangci/golangci-lint-action

justtrackio · Dec 9, 2020 · f0ddec9 · f0ddec9
1 parent 90e05b5
commit f0ddec9
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 26 deletions.
diff --git a/pkg/apiserver/auth/basic_auth.go b/pkg/apiserver/auth/basic_auth.go
@@ -19,8 +19,7 @@ const (
 )
 
 type basicAuthAuthenticator struct {
-	logger mon.Logger
-	users  map[string]string
+	users map[string]string
 }
 
 func NewBasicAuthHandler(config cfg.Config, logger mon.Logger) gin.HandlerFunc {
@@ -66,13 +65,12 @@ func NewBasicAuthAuthenticator(config cfg.Config, logger mon.Logger) Authenticat
 		users[split[0]] = split[1]
 	}
 
-	return NewBasicAuthAuthenticatorWithInterfaces(logger, users)
+	return NewBasicAuthAuthenticatorWithInterfaces(users)
 }
 
-func NewBasicAuthAuthenticatorWithInterfaces(logger mon.Logger, users map[string]string) Authenticator {
+func NewBasicAuthAuthenticatorWithInterfaces(users map[string]string) Authenticator {
 	return &basicAuthAuthenticator{
-		logger: logger,
-		users:  users,
+		users: users,
 	}
 }
 

diff --git a/pkg/apiserver/auth/basic_auth_test.go b/pkg/apiserver/auth/basic_auth_test.go
@@ -4,17 +4,13 @@ import (
 	"encoding/base64"
 	"fmt"
 	"github.com/applike/gosoline/pkg/apiserver/auth"
-	"github.com/applike/gosoline/pkg/mon"
-	"github.com/applike/gosoline/pkg/mon/mocks"
 	"github.com/gin-gonic/gin"
 	"github.com/stretchr/testify/assert"
 	"net/http"
 	"testing"
 )
 
-func getBasicAuthMocks(user string, password string) (mon.Logger, *gin.Context) {
-	logger := mocks.NewLoggerMockedAll()
-
+func getBasicAuthMocks(user string, password string) *gin.Context {
 	header := http.Header{}
 	header.Set("Authorization", fmt.Sprintf("Basic %s", base64.StdEncoding.EncodeToString([]byte(fmt.Sprintf("%s:%s", user, password)))))
 
@@ -27,13 +23,13 @@ func getBasicAuthMocks(user string, password string) (mon.Logger, *gin.Context)
 
 	ginCtx.Request = request
 
-	return logger, ginCtx
+	return ginCtx
 }
 
 func TestBasicAuth_Authenticate_InvalidUser(t *testing.T) {
-	logger, ginCtx := getBasicAuthMocks("user", "password")
+	ginCtx := getBasicAuthMocks("user", "password")
 
-	a := auth.NewBasicAuthAuthenticatorWithInterfaces(logger, map[string]string{
+	a := auth.NewBasicAuthAuthenticatorWithInterfaces(map[string]string{
 		"other user": "other password",
 	})
 	_, err := a.IsValid(ginCtx)
@@ -44,9 +40,9 @@ func TestBasicAuth_Authenticate_InvalidUser(t *testing.T) {
 }
 
 func TestBasicAuth_Authenticate_InvalidPassword(t *testing.T) {
-	logger, ginCtx := getBasicAuthMocks("user", "password")
+	ginCtx := getBasicAuthMocks("user", "password")
 
-	a := auth.NewBasicAuthAuthenticatorWithInterfaces(logger, map[string]string{
+	a := auth.NewBasicAuthAuthenticatorWithInterfaces(map[string]string{
 		"user": "other password",
 	})
 	_, err := a.IsValid(ginCtx)
@@ -57,9 +53,9 @@ func TestBasicAuth_Authenticate_InvalidPassword(t *testing.T) {
 }
 
 func TestBasicAuth_Authenticate_ValidUser(t *testing.T) {
-	logger, ginCtx := getBasicAuthMocks("user", "password")
+	ginCtx := getBasicAuthMocks("user", "password")
 
-	a := auth.NewBasicAuthAuthenticatorWithInterfaces(logger, map[string]string{
+	a := auth.NewBasicAuthAuthenticatorWithInterfaces(map[string]string{
 		"user": "password",
 	})
 	_, err := a.IsValid(ginCtx)

diff --git a/pkg/ddb/metric_repo.go b/pkg/ddb/metric_repo.go
@@ -23,7 +23,7 @@ func NewMetricRepository(_ cfg.Config, _ mon.Logger, repo Repository) *metricRep
 	}
 }
 
-func (r metricRepository) PutItem(ctx context.Context, qb PutItemBuilder, item interface{}) (*PutItemResult, error) {
+func (r metricRepository) PutItem(ctx context.Context, _ PutItemBuilder, item interface{}) (*PutItemResult, error) {
 	start := time.Time{}
 	saved, err := r.Repository.PutItem(ctx, nil, item)
 	r.writeMetric(OpSave, err, start)

diff --git a/pkg/refl/map_test.go b/pkg/refl/map_test.go
@@ -40,11 +40,11 @@ func TestMapOf(t *testing.T) {
 
 	item := m.NewElement().(*Item)
 	item.Value = "foo"
-	m.Set(3, item)
+	_ = m.Set(3, item)
 
 	item = m.NewElement().(*Item)
 	item.Value = "bar"
-	m.Set(5, item)
+	_ = m.Set(5, item)
 
 	assert.Len(t, items, 2)
 	assert.Equal(t, "foo", items[3].Value)
@@ -59,11 +59,11 @@ func TestMapOfPointer(t *testing.T) {
 
 	item := m.NewElement().(*Item)
 	item.Value = "foo"
-	m.Set(3, item)
+	_ = m.Set(3, item)
 
 	item = m.NewElement().(*Item)
 	item.Value = "bar"
-	m.Set(5, item)
+	_ = m.Set(5, item)
 
 	assert.Len(t, items, 2)
 	assert.Equal(t, "foo", items[3].Value)

diff --git a/pkg/sqs/queue.go b/pkg/sqs/queue.go
@@ -20,8 +20,7 @@ import (
 )
 
 const (
-	sqsBatchSize      = 10
-	sqsMaxMessageSize = 256 * 1024
+	sqsBatchSize = 10
 )
 
 //go:generate mockery -name Queue

diff --git a/pkg/test/env/environment.go b/pkg/test/env/environment.go
@@ -57,7 +57,7 @@ func NewEnvironment(t *testing.T, options ...Option) (*Environment, error) {
 	var err error
 	var skeletons []*componentSkeleton
 	var component Component
-	var containers = make(map[string]*container)
+	var containers = map[string]*container{}
 	var components = NewComponentsContainer()
 	var componentConfigManger = NewComponentsConfigManager(config)