chore(lint): updated linters, relinted code

Signed-off-by: Frédéric BIDON <[email protected]>

Author: fredbi

.golangci.yml

@@ -22,7 +22,9 @@ linters:
     - nestif
     - nlreturn
     - nonamedreturns
+    - noinlineerr
     - paralleltest
+    - recvcheck
     - testpackage
     - thelper
     - tparallel
@@ -31,6 +33,7 @@ linters:
     - whitespace
     - wrapcheck
     - wsl
+    - wsl_v5
   settings:
     dupl:
       threshold: 200

contact_info_test.go

@@ -43,5 +43,5 @@ func TestIntegrationContactInfo(t *testing.T) {
 	actual := ContactInfo{}
 	err = json.Unmarshal([]byte(contactInfoJSON), &actual)
 	require.NoError(t, err)
-	assert.EqualValues(t, contactInfo, actual)
+	assert.Equal(t, contactInfo, actual)
 }

header_test.go

@@ -33,7 +33,7 @@ func int64Ptr(f int64) *int64 {
 }
 
 var header = Header{
-	VendorExtensible: VendorExtensible{Extensions: map[string]interface{}{
+	VendorExtensible: VendorExtensible{Extensions: map[string]any{
 		"x-framework": "swagger-go",
 	}},
 	HeaderProps: HeaderProps{Description: "the description of this header"},
@@ -57,7 +57,7 @@ var header = Header{
 		MinItems:         int64Ptr(5),
 		UniqueItems:      true,
 		MultipleOf:       float64Ptr(5),
-		Enum:             []interface{}{"hello", "world"},
+		Enum:             []any{"hello", "world"},
 	},
 }
 
@@ -87,7 +87,7 @@ const headerJSON = `{
 func TestIntegrationHeader(t *testing.T) {
 	var actual Header
 	require.NoError(t, json.Unmarshal([]byte(headerJSON), &actual))
-	assert.EqualValues(t, actual, header)
+	assert.Equal(t, actual, header)
 
 	assertParsesJSON(t, headerJSON, header)
 }
@@ -104,13 +104,13 @@ func TestJSONLookupHeader(t *testing.T) {
 	require.True(t, ok)
 	assert.Equal(t, "8", def)
 
-	var x *interface{}
+	var x *any
 	res, err = header.JSONLookup("x-framework")
 	require.NoError(t, err)
 	require.NotNil(t, res)
 	require.IsType(t, x, res)
 
-	x, ok = res.(*interface{})
+	x, ok = res.(*any)
 	require.True(t, ok)
 	assert.EqualValues(t, "swagger-go", *x)
 
@@ -144,7 +144,7 @@ func TestWithHeader(t *testing.T) {
 	i := new(Items).Typed("string", "date")
 	h = new(Header).CollectionOf(i, "pipe")
 
-	assert.EqualValues(t, *i, *h.Items)
+	assert.Equal(t, *i, *h.Items)
 	assert.Equal(t, "pipe", h.CollectionFormat)
 
 	h = new(Header).WithDefault([]string{"a", "b", "c"}).WithMaxLength(10).WithMinLength(3)
@@ -162,7 +162,7 @@ func TestWithHeader(t *testing.T) {
 	h = new(Header).WithEnum("a", "b", "c")
 	assert.Equal(t, Header{
 		CommonValidations: CommonValidations{
-			Enum: []interface{}{
+			Enum: []any{
 				"a",
 				"b",
 				"c",
@@ -173,5 +173,5 @@ func TestWithHeader(t *testing.T) {
 
 func TestHeaderWithValidation(t *testing.T) {
 	h := new(Header).WithValidations(CommonValidations{MaxLength: swag.Int64(15)})
-	assert.EqualValues(t, swag.Int64(15), h.MaxLength)
+	assert.Equal(t, swag.Int64(15), h.MaxLength)
 }

info_test.go

@@ -53,7 +53,7 @@ var testInfo = Info{
 		},
 		},
 	},
-	VendorExtensible: VendorExtensible{Extensions: map[string]interface{}{"x-framework": "go-swagger"}},
+	VendorExtensible: VendorExtensible{Extensions: map[string]any{"x-framework": "go-swagger"}},
 }
 
 func TestInfo(t *testing.T) {
@@ -66,13 +66,13 @@ func TestInfo(t *testing.T) {
 	t.Run("should unmarshal Info", func(t *testing.T) {
 		actual := Info{}
 		require.NoError(t, json.Unmarshal([]byte(infoJSON), &actual))
-		assert.EqualValues(t, testInfo, actual)
+		assert.Equal(t, testInfo, actual)
 	})
 
 	t.Run("should GobEncode Info", func(t *testing.T) {
 		var src, dst Info
 		require.NoError(t, json.Unmarshal([]byte(infoJSON), &src))
-		assert.EqualValues(t, src, testInfo)
+		assert.Equal(t, src, testInfo)
 		doTestAnyGobEncoding(t, &src, &dst)
 	})
 }

items_test.go

@@ -76,17 +76,17 @@ const itemsJSON = `{
 func TestIntegrationItems(t *testing.T) {
 	var actual Items
 	require.NoError(t, json.Unmarshal([]byte(itemsJSON), &actual))
-	assert.EqualValues(t, actual, testItems)
+	assert.Equal(t, actual, testItems)
 
 	assertParsesJSON(t, itemsJSON, testItems)
 }
 
 func TestTypeNameItems(t *testing.T) {
 	var nilItems Items
-	assert.Equal(t, "", nilItems.TypeName())
+	assert.Empty(t, nilItems.TypeName())
 
 	assert.Equal(t, "date", testItems.TypeName())
-	assert.Equal(t, "", testItems.ItemsTypeName())
+	assert.Empty(t, testItems.ItemsTypeName())
 
 	nested := Items{
 		SimpleSchema: SimpleSchema{
@@ -110,7 +110,7 @@ func TestTypeNameItems(t *testing.T) {
 	}
 
 	assert.Equal(t, "string", simple.TypeName())
-	assert.Equal(t, "", simple.ItemsTypeName())
+	assert.Empty(t, simple.ItemsTypeName())
 
 	simple.Items = NewItems()
 	simple.Type = "array"
@@ -159,7 +159,7 @@ func TestJSONLookupItems(t *testing.T) {
 
 		ref, ok := res.(*Ref)
 		require.True(t, ok)
-		assert.EqualValues(t, MustCreateRef("Dog"), *ref)
+		assert.Equal(t, MustCreateRef("Dog"), *ref)
 	})
 
 	t.Run(`lookup should find "maximum"`, func(t *testing.T) {
@@ -196,5 +196,5 @@ func TestJSONLookupItems(t *testing.T) {
 
 func TestItemsWithValidation(t *testing.T) {
 	i := new(Items).WithValidations(CommonValidations{MaxLength: swag.Int64(15)})
-	assert.EqualValues(t, swag.Int64(15), i.MaxLength)
+	assert.Equal(t, swag.Int64(15), i.MaxLength)
 }

license_test.go

@@ -45,6 +45,6 @@ func TestIntegrationLicense(t *testing.T) {
 		actual := License{}
 		err := json.Unmarshal([]byte(licenseJSON), &actual)
 		require.NoError(t, err)
-		assert.EqualValues(t, testLicense, actual)
+		assert.Equal(t, testLicense, actual)
 	})
 }

operation.go

@@ -25,8 +25,8 @@ import (
 )
 
 func init() {
-	gob.Register(map[string]interface{}{})
-	gob.Register([]interface{}{})
+	gob.Register(map[string]any{})
+	gob.Register([]any{})
 }
 
 // OperationProps describes an operation
@@ -58,19 +58,22 @@ func (op OperationProps) MarshalJSON() ([]byte, error) {
 	type Alias OperationProps
 	if op.Security == nil {
 		return json.Marshal(&struct {
-			Security []map[string][]string `json:"security,omitempty"`
 			*Alias
+
+			Security []map[string][]string `json:"security,omitempty"`
 		}{
-			Security: op.Security,
 			Alias:    (*Alias)(&op),
+			Security: op.Security,
 		})
 	}
+
 	return json.Marshal(&struct {
-		Security []map[string][]string `json:"security"`
 		*Alias
+
+		Security []map[string][]string `json:"security"`
 	}{
-		Security: op.Security,
 		Alias:    (*Alias)(&op),
+		Security: op.Security,
 	})
 }
 
@@ -82,6 +85,14 @@ type Operation struct {
 	OperationProps
 }
 
+// NewOperation creates a new operation instance.
+// It expects an ID as parameter but not passing an ID is also valid.
+func NewOperation(id string) *Operation {
+	op := new(Operation)
+	op.ID = id
+	return op
+}
+
 // SuccessResponse gets a success response model
 func (o *Operation) SuccessResponse() (*Response, int, bool) {
 	if o.Responses == nil {
@@ -104,7 +115,7 @@ func (o *Operation) SuccessResponse() (*Response, int, bool) {
 }
 
 // JSONLookup look up a value by the json property name
-func (o Operation) JSONLookup(token string) (interface{}, error) {
+func (o Operation) JSONLookup(token string) (any, error) {
 	if ex, ok := o.Extensions[token]; ok {
 		return &ex, nil
 	}
@@ -134,14 +145,6 @@ func (o Operation) MarshalJSON() ([]byte, error) {
 	return concated, nil
 }
 
-// NewOperation creates a new operation instance.
-// It expects an ID as parameter but not passing an ID is also valid.
-func NewOperation(id string) *Operation {
-	op := new(Operation)
-	op.ID = id
-	return op
-}
-
 // WithID sets the ID property on this operation, allows for chaining.
 func (o *Operation) WithID(id string) *Operation {
 	o.ID = id

operation_test.go

@@ -259,7 +259,7 @@ func TestOperationBuilder(t *testing.T) {
 func TestIntegrationOperation(t *testing.T) {
 	var actual Operation
 	require.NoError(t, json.Unmarshal([]byte(operationJSON), &actual))
-	assert.EqualValues(t, actual, operation)
+	assert.Equal(t, actual, operation)
 
 	assertParsesJSON(t, operationJSON, operation)
 }

parameters_test.go

@@ -94,7 +94,7 @@ var parameterJSON = `{
 func TestIntegrationParameter(t *testing.T) {
 	var actual Parameter
 	require.NoError(t, json.Unmarshal([]byte(parameterJSON), &actual))
-	assert.EqualValues(t, actual, parameter)
+	assert.Equal(t, actual, parameter)
 
 	assertParsesJSON(t, parameterJSON, parameter)
 }
@@ -164,5 +164,5 @@ func TestParameterGobEncoding(t *testing.T) {
 
 func TestParametersWithValidation(t *testing.T) {
 	p := new(Parameter).WithValidations(CommonValidations{MaxLength: swag.Int64(15)})
-	assert.EqualValues(t, swag.Int64(15), p.MaxLength)
+	assert.Equal(t, swag.Int64(15), p.MaxLength)
 }

path_item_test.go

@@ -75,7 +75,7 @@ const pathItemJSON = `{
 func TestIntegrationPathItem(t *testing.T) {
 	var actual PathItem
 	require.NoError(t, json.Unmarshal([]byte(pathItemJSON), &actual))
-	assert.EqualValues(t, actual, pathItem)
+	assert.Equal(t, actual, pathItem)
 
 	assertParsesJSON(t, pathItemJSON, pathItem)
 }