Improve lint rules

Signed-off-by: Mark Sagi-Kazar <[email protected]>

.golangci.yml

@@ -1,6 +1,8 @@
 linters-settings:
+    gci:
+        local-prefixes: github.com/spf13/viper
     golint:
-        min-confidence: 0.1
+        min-confidence: 0
     goimports:
         local-prefixes: github.com/spf13/viper
 
@@ -13,8 +15,10 @@ linters:
         - dupl
         - exhaustive
         - exportloopref
+        - gci
         - goconst
         - gofmt
+        - gofumpt
         - goimports
         - golint
         - goprintffuncname
@@ -39,14 +43,12 @@ linters:
 
         # fixme
         # - errcheck
-        # - gci
         # - gochecknoglobals
         # - gochecknoinits
         # - gocognit
         # - gocritic
         # - gocyclo
         # - godot
-        # - gofumpt
         # - gosec
         # - gosimple
         # - lll

flags_test.go

@@ -10,13 +10,13 @@ import (
 func TestBindFlagValueSet(t *testing.T) {
 	flagSet := pflag.NewFlagSet("test", pflag.ContinueOnError)
 
-	var testValues = map[string]*string{
+	testValues := map[string]*string{
 		"host":     nil,
 		"port":     nil,
 		"endpoint": nil,
 	}
 
-	var mutatedTestValues = map[string]string{
+	mutatedTestValues := map[string]string{
 		"host":     "localhost",
 		"port":     "6060",
 		"endpoint": "/public",
@@ -44,8 +44,8 @@ func TestBindFlagValueSet(t *testing.T) {
 }
 
 func TestBindFlagValue(t *testing.T) {
-	var testString = "testing"
-	var testValue = newStringValue(testString, &testString)
+	testString := "testing"
+	testValue := newStringValue(testString, &testString)
 
 	flag := &pflag.Flag{
 		Name:    "testflag",
@@ -59,7 +59,7 @@ func TestBindFlagValue(t *testing.T) {
 	assert.Equal(t, testString, Get("testvalue"))
 
 	flag.Value.Set("testing_mutate")
-	flag.Changed = true //hack for pflag usage
+	flag.Changed = true // hack for pflag usage
 
 	assert.Equal(t, "testing_mutate", Get("testvalue"))
 }

overrides_test.go

@@ -78,6 +78,7 @@ func TestNestedOverrides(t *testing.T) {
 func overrideDefault(assert *assert.Assertions, firstPath string, firstValue interface{}, secondPath string, secondValue interface{}) *Viper {
 	return overrideFromLayer(defaultLayer, assert, firstPath, firstValue, secondPath, secondValue)
 }
+
 func override(assert *assert.Assertions, firstPath string, firstValue interface{}, secondPath string, secondValue interface{}) *Viper {
 	return overrideFromLayer(overrideLayer, assert, firstPath, firstValue, secondPath, secondValue)
 }

remote/remote.go

@@ -11,9 +11,9 @@ import (
 	"io"
 	"os"
 
-	"github.com/spf13/viper"
-
 	crypt "github.com/bketelsen/crypt/config"
+
+	"github.com/spf13/viper"
 )
 
 type remoteConfigProvider struct{}

util_test.go

@@ -24,14 +24,16 @@ func TestCopyAndInsensitiviseMap(t *testing.T) {
 			"Bar": map[interface{}]interface {
 			}{
 				"ABc": "A",
-				"cDE": "B"},
+				"cDE": "B",
+			},
 		}
 		expected = map[string]interface{}{
 			"foo": 32,
 			"bar": map[string]interface {
 			}{
 				"abc": "A",
-				"cde": "B"},
+				"cde": "B",
+			},
 		}
 	)