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

Codestyle: Fix some goconst issues (#17530)

Browse Source 
Signed-off-by: Mario Trangoni <mjtrangoni@gmail.com>
This commit is contained in:
Mario Trangoni 2019-06-12 07:27:47 +02:00 committed by Carl Bergquist
parent 39e23ba672
commit ab4e1526b3
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/api/http_server.go
View File

@ -258,7 +258,7 @@ func (hs *HTTPServer) metricsEndpoint(ctx *macaron.Context) {
return return
} }
if ctx.Req.Method != "GET" || ctx.Req.URL.Path != "/metrics" { if ctx.Req.Method != http.MethodGet || ctx.Req.URL.Path != "/metrics" {
return return
} }

4
pkg/api/playlist.go
View File

@ -1,6 +1,8 @@
package api package api
import ( import (
"net/http"
"github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/bus"
_ "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"
@ -33,7 +35,7 @@ func ValidateOrgPlaylist(c *m.ReqContext) {
return return
} }
if len(items) == 0 && c.Context.Req.Method != "DELETE" { if len(items) == 0 && c.Context.Req.Method != http.MethodDelete {
c.JsonApiErr(404, "Playlist is empty", itemsErr) c.JsonApiErr(404, "Playlist is empty", itemsErr)
return return
} }

15
pkg/setting/setting_test.go
View File

@ -1,16 +1,21 @@
package setting package setting
import ( import (
"gopkg.in/ini.v1"
"os" "os"
"path" "path"
"path/filepath" "path/filepath"
"runtime" "runtime"
"testing" "testing"
"gopkg.in/ini.v1"
. "github.com/smartystreets/goconvey/convey" . "github.com/smartystreets/goconvey/convey"
) )
const (
windows = "windows"
)
func TestLoadingSettings(t *testing.T) { func TestLoadingSettings(t *testing.T) {
Convey("Testing loading settings from ini file", t, func() { Convey("Testing loading settings from ini file", t, func() {
@ -72,7 +77,7 @@ func TestLoadingSettings(t *testing.T) {
}) })
Convey("Should be able to override via command line", func() { Convey("Should be able to override via command line", func() {
if runtime.GOOS == "windows" { if runtime.GOOS == windows {
cfg := NewCfg() cfg := NewCfg()
cfg.Load(&CommandLineArgs{ cfg.Load(&CommandLineArgs{
HomePath: "../../", HomePath: "../../",
@ -106,7 +111,7 @@ func TestLoadingSettings(t *testing.T) {
}) })
Convey("Defaults can be overridden in specified config file", func() { Convey("Defaults can be overridden in specified config file", func() {
if runtime.GOOS == "windows" { if runtime.GOOS == windows {
cfg := NewCfg() cfg := NewCfg()
cfg.Load(&CommandLineArgs{ cfg.Load(&CommandLineArgs{
HomePath: "../../", HomePath: "../../",
@ -128,7 +133,7 @@ func TestLoadingSettings(t *testing.T) {
}) })
Convey("Command line overrides specified config file", func() { Convey("Command line overrides specified config file", func() {
if runtime.GOOS == "windows" { if runtime.GOOS == windows {
cfg := NewCfg() cfg := NewCfg()
cfg.Load(&CommandLineArgs{ cfg.Load(&CommandLineArgs{
HomePath: "../../", HomePath: "../../",
@ -150,7 +155,7 @@ func TestLoadingSettings(t *testing.T) {
}) })
Convey("Can use environment variables in config values", func() { Convey("Can use environment variables in config values", func() {
if runtime.GOOS == "windows" { if runtime.GOOS == windows {
os.Setenv("GF_DATA_PATH", `c:\tmp\env_override`) os.Setenv("GF_DATA_PATH", `c:\tmp\env_override`)
cfg := NewCfg() cfg := NewCfg()
cfg.Load(&CommandLineArgs{ cfg.Load(&CommandLineArgs{