Merge pull request #148 from kzys/revisit-lint

Enable some linters on golangci-lint

.golangci.yml

@@ -1,8 +1,6 @@
 linters-settings:
   govet:
     check-shadowing: true
-  golint:
-    min-confidence: 0
   gocyclo:
     min-complexity: 50
   maligned:
@@ -42,11 +40,11 @@ linters:
     - paralleltest
     - cyclop # because we have gocyclo already
     # TODO: review the linters below. We disabled them to make the CI pass first.
-    - gocritic
-    - revive
-    - containedctx
     - ireturn
     - varnamelen
     - forcetypeassert
     - thelper
-    - wastedassign
+    # Disable deprecated linters.
+    # They will be removed from golangci-lint in future.
+    - interfacer
+    - golint

context.go

@@ -19,7 +19,7 @@ const (
 	none     operationType = "none" // not specified in ctx
 )
 
-var operationTypeEnum []operationType = []operationType{request, response, none}
+var operationTypeEnum = []operationType{request, response, none}
 
 // WithOperationRequest returns a new context with operationType request
 // in context value

context_test.go

@@ -11,7 +11,7 @@ import (
 func TestContext_ExtractOperationType(t *testing.T) {
 
 	var testCases = []struct {
-		Ctx            context.Context
+		Ctx            context.Context //nolint: containedctx
 		ExpectedOpType operationType
 	}{
 		{

jsonschema_test.go

@@ -194,8 +194,7 @@ func TestOptionalJSONSchemaSuite(t *testing.T) {
 
 // Further testing with all formats recognized by strfmt
 func TestFormat_JSONSchemaExtended(t *testing.T) {
-	jsonFormatSchemaFixturesPath := filepath.Join(formatFixturesPath)
-	files, err := ioutil.ReadDir(jsonFormatSchemaFixturesPath)
+	files, err := ioutil.ReadDir(formatFixturesPath)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -213,7 +212,7 @@ func TestFormat_JSONSchemaExtended(t *testing.T) {
 				return
 			}
 			t.Log("Running [extended formats] " + specName)
-			b, _ := ioutil.ReadFile(filepath.Join(jsonFormatSchemaFixturesPath, fileName))
+			b, _ := ioutil.ReadFile(filepath.Join(formatFixturesPath, fileName))
 			doTestSchemaSuite(t, b)
 		})
 	}

schema_props.go

@@ -163,7 +163,7 @@ func (s *schemaPropsValidator) Validate(data interface{}) *Result {
 		}
 
 		if validated != 1 {
-			additionalMsg := ""
+			var additionalMsg string
 			if validated == 0 {
 				additionalMsg = "Found none valid"
 			} else {

values.go

@@ -394,7 +394,7 @@ func IsValueValidAgainstRange(val interface{}, typeName, format, prefix, path st
 	kind := reflect.ValueOf(val).Type().Kind()
 
 	// What is the string representation of val
-	stringRep := ""
+	var stringRep string
 	switch kind {
 	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
 		stringRep = swag.FormatUint64(valueHelp.asUint64(val))