IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Chore: remove use of == false (#17036)

Browse Source 
Interestingly enough, golint or revive doesn't not prohibit
the use that construction :)

Ref #17035
This commit is contained in:
Oleg Gaidarenko 2019-05-14 10:18:28 +03:00 committed by GitHub
parent 34f9b3ff2b
commit 79ac3fd699
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/middleware/auth_proxy.go
View File

@ -20,17 +20,17 @@ func initContextWithAuthProxy(store *remotecache.RemoteCache, ctx *m.ReqContext,
}) })
// Bail if auth proxy is not enabled // Bail if auth proxy is not enabled
if auth.IsEnabled() == false { if !auth.IsEnabled() {
return false return false
} }
// If the there is no header - we can't move forward // If the there is no header - we can't move forward
if auth.HasHeader() == false { if !auth.HasHeader() {
return false return false
} }
// Check if allowed to continue with this IP // Check if allowed to continue with this IP
if result, err := auth.IsAllowedIP(); result == false { if result, err := auth.IsAllowedIP(); !result {
ctx.Handle(407, err.Error(), err.DetailsError) ctx.Handle(407, err.Error(), err.DetailsError)
return true return true
} }

2
pkg/middleware/auth_proxy/auth_proxy.go
View File

@ -92,7 +92,7 @@ func New(options *Options) *AuthProxy {
func (auth *AuthProxy) IsEnabled() bool { func (auth *AuthProxy) IsEnabled() bool {
// Bail if the setting is not enabled // Bail if the setting is not enabled
if auth.enabled == false { if !auth.enabled {
return false return false
} }

7
pkg/services/ldap/settings.go
View File

@ -5,12 +5,12 @@ import (
"sync" "sync"
"github.com/BurntSushi/toml" "github.com/BurntSushi/toml"
"github.com/grafana/grafana/pkg/util/errutil"
"golang.org/x/xerrors" "golang.org/x/xerrors"
"github.com/grafana/grafana/pkg/infra/log" "github.com/grafana/grafana/pkg/infra/log"
m "github.com/grafana/grafana/pkg/models" m "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"
"github.com/grafana/grafana/pkg/util/errutil"
) )
type Config struct { type Config struct {
@ -68,9 +68,10 @@ func IsEnabled() bool {
// ReloadConfig reads the config from the disc and caches it. // ReloadConfig reads the config from the disc and caches it.
func ReloadConfig() error { func ReloadConfig() error {
if IsEnabled() == false { if !IsEnabled() {
return nil return nil
} }
loadingMutex.Lock() loadingMutex.Lock()
defer loadingMutex.Unlock() defer loadingMutex.Unlock()
@ -82,7 +83,7 @@ func ReloadConfig() error {
// GetConfig returns the LDAP config if LDAP is enabled otherwise it returns nil. It returns either cached value of // GetConfig returns the LDAP config if LDAP is enabled otherwise it returns nil. It returns either cached value of
// the config or it reads it and caches it first. // the config or it reads it and caches it first.
func GetConfig() (*Config, error) { func GetConfig() (*Config, error) {
if IsEnabled() == false { if !IsEnabled() {
return nil, nil return nil, nil
} }