diff --git a/pkg/middleware/auth_proxy/auth_proxy.go b/pkg/middleware/auth_proxy/auth_proxy.go index 4cb2de38c7f..2e1e72b82f6 100644 --- a/pkg/middleware/auth_proxy/auth_proxy.go +++ b/pkg/middleware/auth_proxy/auth_proxy.go @@ -64,7 +64,7 @@ func newError(message string, err error) *Error { // Error returns a Error error string func (err *Error) Error() string { - return fmt.Sprintf("%s", err.Message) + return err.Message } // Options for the AuthProxy @@ -98,20 +98,12 @@ func New(options *Options) *AuthProxy { func (auth *AuthProxy) IsEnabled() bool { // Bail if the setting is not enabled - if !auth.enabled { - return false - } - - return true + return auth.enabled } // HasHeader checks if the we have specified header func (auth *AuthProxy) HasHeader() bool { - if len(auth.header) == 0 { - return false - } - - return true + return len(auth.header) != 0 } // IsAllowedIP compares presented IP with the whitelist one diff --git a/pkg/services/alerting/notifiers/discord.go b/pkg/services/alerting/notifiers/discord.go index 9933ad5e587..f85fa7f785e 100644 --- a/pkg/services/alerting/notifiers/discord.go +++ b/pkg/services/alerting/notifiers/discord.go @@ -171,7 +171,7 @@ func (this *DiscordNotifier) embedImage(cmd *models.SendWebhookSync, imagePath s w.Close() - cmd.Body = string(b.Bytes()) + cmd.Body = b.String() cmd.ContentType = w.FormDataContentType() return nil diff --git a/pkg/services/alerting/notifiers/victorops.go b/pkg/services/alerting/notifiers/victorops.go index b1fd78d8df3..c118d811b9c 100644 --- a/pkg/services/alerting/notifiers/victorops.go +++ b/pkg/services/alerting/notifiers/victorops.go @@ -92,7 +92,7 @@ func (vn *VictoropsNotifier) Notify(evalContext *alerting.EvalContext) error { messageType = alertStateRecovery } - fields := make(map[string]interface{}, 0) + fields := make(map[string]interface{}) fieldLimitCount := 4 for index, evt := range evalContext.EvalMatches { fields[evt.Metric] = evt.Value diff --git a/pkg/services/sqlstore/login_attempt.go b/pkg/services/sqlstore/login_attempt.go index fe77dd7e914..a9adbca5bfe 100644 --- a/pkg/services/sqlstore/login_attempt.go +++ b/pkg/services/sqlstore/login_attempt.go @@ -43,7 +43,7 @@ func DeleteOldLoginAttempts(cmd *m.DeleteOldLoginAttemptsCommand) error { if err != nil { return err } - + // nolint: gosimple if result == nil || len(result) == 0 || result[0] == nil { return nil } diff --git a/scripts/backend-lint.sh b/scripts/backend-lint.sh index b447071efa0..6e7305364fd 100755 --- a/scripts/backend-lint.sh +++ b/scripts/backend-lint.sh @@ -27,6 +27,7 @@ exit_if_fail gometalinter --enable-gc --vendor --deadline 10m --disable-all \ exit_if_fail golangci-lint run --deadline 10m --disable-all \ --enable=deadcode\ --enable=gofmt\ + --enable=gosimple\ --enable=ineffassign\ --enable=structcheck\ --enable=unconvert\