public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Chore: Disable default golangci-lint filter (#29751)

Browse Source 
* Disable default golangci-lint filter

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Chore: Fix linter warnings

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
This commit is contained in:
Arve Knudsen
2020-12-15 09:32:06 +01:00
committed by GitHub
parent 5d4910dd52
commit c2cad26ca9
76 changed files with 598 additions and 274 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/setting/dynamic_settings_test.go
+6 -2
View File
@@ -15,8 +15,12 @@ func TestDynamicSettingsSupport_Override(t *testing.T) {
keyName := "bar"
expected := "dynamic value"
os.Setenv(envKey, expected)
defer func() { os.Unsetenv(envKey) }()
err := os.Setenv(envKey, expected)
require.NoError(t, err)
defer func() {
err := os.Unsetenv(envKey)
require.NoError(t, err)
}()
value := cfg.SectionWithEnvOverrides(sectionName).Key(keyName).MustString("default value")
require.Equal(t, expected, value)
pkg/setting/expanders_test.go
+6 -3
View File
@@ -16,7 +16,8 @@ import (
func TestExpandVar_EnvSuccessful(t *testing.T) {
const key = "GF_TEST_SETTING_EXPANDER_ENV"
const expected = "aurora borealis"
os.Setenv(key, expected)
err := os.Setenv(key, expected)
require.NoError(t, err)
// expanded format
{
@@ -39,12 +40,14 @@ func TestExpandVar_FileSuccessful(t *testing.T) {
file := f.Name()
defer func() {
os.Remove(file)
err := os.Remove(file)
require.NoError(t, err)
}()
_, err = f.WriteString("hello, world")
require.NoError(t, err)
f.Close()
err = f.Close()
require.NoError(t, err)
got, err := ExpandVar(fmt.Sprintf("$__file{%s}", file))
assert.NoError(t, err)
pkg/setting/setting_test.go
+22 -13
View File
@@ -39,7 +39,10 @@ func TestLoadingSettings(t *testing.T) {
if err != nil {
t.Errorf("failed to load defaults.ini file: %v", err)
}
defer file.Close()
defer func() {
err := file.Close()
So(err, ShouldBeNil)
}()
scanner := bufio.NewScanner(file)
for scanner.Scan() {
@@ -51,10 +54,11 @@ func TestLoadingSettings(t *testing.T) {
})
Convey("Should be able to override via environment variables", func() {
os.Setenv("GF_SECURITY_ADMIN_USER", "superduper")
err := os.Setenv("GF_SECURITY_ADMIN_USER", "superduper")
require.NoError(t, err)
cfg := NewCfg()
err := cfg.Load(&CommandLineArgs{HomePath: "../../"})
err = cfg.Load(&CommandLineArgs{HomePath: "../../"})
So(err, ShouldBeNil)
So(AdminUser, ShouldEqual, "superduper")
@@ -63,29 +67,32 @@ func TestLoadingSettings(t *testing.T) {
})
Convey("Should replace password when defined in environment", func() {
os.Setenv("GF_SECURITY_ADMIN_PASSWORD", "supersecret")
err := os.Setenv("GF_SECURITY_ADMIN_PASSWORD", "supersecret")
require.NoError(t, err)
cfg := NewCfg()
err := cfg.Load(&CommandLineArgs{HomePath: "../../"})
err = cfg.Load(&CommandLineArgs{HomePath: "../../"})
So(err, ShouldBeNil)
So(appliedEnvOverrides, ShouldContain, "GF_SECURITY_ADMIN_PASSWORD=*********")
})
Convey("Should return an error when url is invalid", func() {
os.Setenv("GF_DATABASE_URL", "postgres.%31://grafana:secret@postgres:5432/grafana")
err := os.Setenv("GF_DATABASE_URL", "postgres.%31://grafana:secret@postgres:5432/grafana")
require.NoError(t, err)
cfg := NewCfg()
err := cfg.Load(&CommandLineArgs{HomePath: "../../"})
err = cfg.Load(&CommandLineArgs{HomePath: "../../"})
So(err, ShouldNotBeNil)
})
Convey("Should replace password in URL when url environment is defined", func() {
os.Setenv("GF_DATABASE_URL", "mysql://user:secret@localhost:3306/database")
err := os.Setenv("GF_DATABASE_URL", "mysql://user:secret@localhost:3306/database")
require.NoError(t, err)
cfg := NewCfg()
err := cfg.Load(&CommandLineArgs{HomePath: "../../"})
err = cfg.Load(&CommandLineArgs{HomePath: "../../"})
So(err, ShouldBeNil)
So(appliedEnvOverrides, ShouldContain, "GF_DATABASE_URL=mysql://user:-redacted-@localhost:3306/database")
@@ -186,9 +193,10 @@ func TestLoadingSettings(t *testing.T) {
Convey("Can use environment variables in config values", func() {
if runtime.GOOS == windows {
os.Setenv("GF_DATA_PATH", `c:\tmp\env_override`)
err := os.Setenv("GF_DATA_PATH", `c:\tmp\env_override`)
require.NoError(t, err)
cfg := NewCfg()
err := cfg.Load(&CommandLineArgs{
err = cfg.Load(&CommandLineArgs{
HomePath: "../../",
Args: []string{"cfg:paths.data=${GF_DATA_PATH}"},
})
@@ -196,9 +204,10 @@ func TestLoadingSettings(t *testing.T) {
So(cfg.DataPath, ShouldEqual, `c:\tmp\env_override`)
} else {
os.Setenv("GF_DATA_PATH", "/tmp/env_override")
err := os.Setenv("GF_DATA_PATH", "/tmp/env_override")
require.NoError(t, err)
cfg := NewCfg()
err := cfg.Load(&CommandLineArgs{
err = cfg.Load(&CommandLineArgs{
HomePath: "../../",
Args: []string{"cfg:paths.data=${GF_DATA_PATH}"},
})