summaryrefslogtreecommitdiff
path: root/plugins/config
diff options
context:
space:
mode:
authorValery Piashchynski <[email protected]>2020-10-20 17:36:41 +0300
committerValery Piashchynski <[email protected]>2020-10-20 17:36:41 +0300
commitde6a38c0f3e1f21349e6361b8fe2829a09cf02b8 (patch)
treefc99ba06106145c1b9d2279e0616795ed106588f /plugins/config
parent4a3a8a1b94ce7a1ff697aee6c4e8a34e3a736195 (diff)
GolangCi warnings fix
Diffstat (limited to 'plugins/config')
-rw-r--r--plugins/config/tests/config_test.go3
-rw-r--r--plugins/config/viper.go7
2 files changed, 2 insertions, 8 deletions
diff --git a/plugins/config/tests/config_test.go b/plugins/config/tests/config_test.go
index cf5d8489..c85a841f 100644
--- a/plugins/config/tests/config_test.go
+++ b/plugins/config/tests/config_test.go
@@ -40,7 +40,7 @@ func TestViperProvider_Init(t *testing.T) {
}
// stop by CTRL+C
- c := make(chan os.Signal)
+ c := make(chan os.Signal, 1)
signal.Notify(c, os.Interrupt)
tt := time.NewTicker(time.Second * 2)
@@ -63,5 +63,4 @@ func TestViperProvider_Init(t *testing.T) {
return
}
}
-
}
diff --git a/plugins/config/viper.go b/plugins/config/viper.go
index b276dbe2..0c34313c 100644
--- a/plugins/config/viper.go
+++ b/plugins/config/viper.go
@@ -14,7 +14,6 @@ type ViperProvider struct {
Prefix string
}
-//////// ENDURE //////////
func (v *ViperProvider) Init() error {
v.viper = viper.New()
@@ -35,8 +34,6 @@ func (v *ViperProvider) Init() error {
return v.viper.ReadInConfig()
}
-///////////// VIPER ///////////////
-
// Overwrite overwrites existing config with provided values
func (v *ViperProvider) Overwrite(values map[string]string) error {
if len(values) != 0 {
@@ -71,8 +68,6 @@ func (v *ViperProvider) Has(name string) bool {
return v.viper.IsSet(name)
}
-/////////// PRIVATE //////////////
-
func parseFlag(flag string) (string, string, error) {
if !strings.Contains(flag, "=") {
return "", "", fmt.Errorf("invalid flag `%s`", flag)
@@ -88,7 +83,7 @@ func parseValue(value string) string {
if escape == '"' || escape == '\'' || escape == '`' {
value = strings.Trim(value, string(escape))
- value = strings.Replace(value, fmt.Sprintf("\\%s", string(escape)), string(escape), -1)
+ value = strings.ReplaceAll(value, fmt.Sprintf("\\%s", string(escape)), string(escape))
}
return value