chore(lint): relinted

Signed-off-by: Frederic BIDON <fredbi@yahoo.com>
go-openapi · Mar 4, 2024 · 35b5892 · 35b5892
1 parent e6a1173
commit 35b5892
Show file tree

Hide file tree

Showing 13 changed files with 49 additions and 43 deletions.
diff --git a/client/opentelemetry_test.go b/client/opentelemetry_test.go
@@ -30,7 +30,8 @@ func Test_OpenTelemetryRuntime_submit(t *testing.T) {
 	otel.SetTracerProvider(tp)
 
 	tracer := tp.Tracer("go-runtime")
-	ctx, _ := tracer.Start(context.Background(), "op")
+	ctx, span := tracer.Start(context.Background(), "op")
+	defer span.End()
 
 	assertOpenTelemetrySubmit(t, testOperation(ctx), exporter, 1)
 }
@@ -48,7 +49,8 @@ func Test_OpenTelemetryRuntime_submit_nilAuthInfo(t *testing.T) {
 	otel.SetTracerProvider(tp)
 
 	tracer := tp.Tracer("go-runtime")
-	ctx, _ := tracer.Start(context.Background(), "op")
+	ctx, span := tracer.Start(context.Background(), "op")
+	defer span.End()
 
 	operation := testOperation(ctx)
 	operation.AuthInfo = nil
@@ -66,7 +68,8 @@ func Test_OpenTelemetryRuntime_submit_nilContext(t *testing.T) {
 	otel.SetTracerProvider(tp)
 
 	tracer := tp.Tracer("go-runtime")
-	ctx, _ := tracer.Start(context.Background(), "op")
+	ctx, span := tracer.Start(context.Background(), "op")
+	defer span.End()
 	operation := testOperation(ctx)
 	operation.Context = nil
 
@@ -86,7 +89,8 @@ func Test_injectOpenTelemetrySpanContext(t *testing.T) {
 	otel.SetTracerProvider(tp)
 
 	tracer := tp.Tracer("go-runtime")
-	ctx, _ := tracer.Start(context.Background(), "op")
+	ctx, span := tracer.Start(context.Background(), "op")
+	defer span.End()
 	operation := testOperation(ctx)
 
 	header := map[string][]string{}

diff --git a/client/opentracing_test.go b/client/opentracing_test.go
@@ -56,7 +56,7 @@ func testOperation(ctx context.Context) *runtime.ClientOperation {
 		Reader: runtime.ClientResponseReaderFunc(func(runtime.ClientResponse, runtime.Consumer) (interface{}, error) {
 			return nil, nil
 		}),
-		Params: runtime.ClientRequestWriterFunc(func(req runtime.ClientRequest, reg strfmt.Registry) error {
+		Params: runtime.ClientRequestWriterFunc(func(_ runtime.ClientRequest, _ strfmt.Registry) error {
 			return nil
 		}),
 		AuthInfo: PassThroughAuth,

diff --git a/client/request_test.go b/client/request_test.go
@@ -428,7 +428,7 @@ func TestBuildRequest_BuildHTTP_Files(t *testing.T) {
 	emptyFile, err := os.CreateTemp("", "empty")
 	require.NoError(t, err)
 
-	reqWrtr := runtime.ClientRequestWriterFunc(func(req runtime.ClientRequest, reg strfmt.Registry) error {
+	reqWrtr := runtime.ClientRequestWriterFunc(func(req runtime.ClientRequest, _ strfmt.Registry) error {
 		_ = req.SetFormParam("something", "some value")
 		_ = req.SetFileParam("file", mustGetFile("./runtime.go"))
 		_ = req.SetFileParam("otherfiles", mustGetFile("./runtime.go"), mustGetFile("./request.go"))
@@ -736,7 +736,7 @@ func TestGetBodyCallsBeforeRoundTrip(t *testing.T) {
 			bodyContent, e := io.ReadAll(io.Reader(body))
 			require.NoError(t, e)
 
-			require.EqualValues(t, req.ContentLength, len(bodyContent))
+			require.Len(t, bodyContent, int(req.ContentLength))
 			require.EqualValues(t, "\"test body\"\n", string(bodyContent))
 
 			// Read the body a second time before sending the request

diff --git a/client/runtime.go b/client/runtime.go
@@ -22,6 +22,7 @@ import (
 	"crypto/tls"
 	"crypto/x509"
 	"encoding/pem"
+	"errors"
 	"fmt"
 	"mime"
 	"net/http"
@@ -142,7 +143,7 @@ func TLSClientAuth(opts TLSClientOptions) (*tls.Config, error) {
 				return nil, fmt.Errorf("tls client priv key: %v", err)
 			}
 		default:
-			return nil, fmt.Errorf("tls client priv key: unsupported key type")
+			return nil, errors.New("tls client priv key: unsupported key type")
 		}
 
 		block = pem.Block{Type: "PRIVATE KEY", Bytes: keyBytes}

diff --git a/client/runtime_test.go b/client/runtime_test.go
@@ -73,7 +73,7 @@ func TestRuntime_Concurrent(t *testing.T) {
 	}))
 	defer server.Close()
 
-	rwrtr := runtime.ClientRequestWriterFunc(func(req runtime.ClientRequest, _ strfmt.Registry) error {
+	rwrtr := runtime.ClientRequestWriterFunc(func(_ runtime.ClientRequest, _ strfmt.Registry) error {
 		return nil
 	})
 
@@ -149,7 +149,7 @@ func TestRuntime_Canary(t *testing.T) {
 	}))
 	defer server.Close()
 
-	rwrtr := runtime.ClientRequestWriterFunc(func(req runtime.ClientRequest, _ strfmt.Registry) error {
+	rwrtr := runtime.ClientRequestWriterFunc(func(_ runtime.ClientRequest, _ strfmt.Registry) error {
 		return nil
 	})
 
@@ -200,7 +200,7 @@ func TestRuntime_XMLCanary(t *testing.T) {
 	}))
 	defer server.Close()
 
-	rwrtr := runtime.ClientRequestWriterFunc(func(req runtime.ClientRequest, _ strfmt.Registry) error {
+	rwrtr := runtime.ClientRequestWriterFunc(func(_ runtime.ClientRequest, _ strfmt.Registry) error {
 		return nil
 	})
 
@@ -242,7 +242,7 @@ func TestRuntime_TextCanary(t *testing.T) {
 	}))
 	defer server.Close()
 
-	rwrtr := runtime.ClientRequestWriterFunc(func(req runtime.ClientRequest, _ strfmt.Registry) error {
+	rwrtr := runtime.ClientRequestWriterFunc(func(_ runtime.ClientRequest, _ strfmt.Registry) error {
 		return nil
 	})
 
@@ -287,7 +287,7 @@ func TestRuntime_CSVCanary(t *testing.T) {
 	}))
 	defer server.Close()
 
-	rwrtr := runtime.ClientRequestWriterFunc(func(req runtime.ClientRequest, _ strfmt.Registry) error {
+	rwrtr := runtime.ClientRequestWriterFunc(func(_ runtime.ClientRequest, _ strfmt.Registry) error {
 		return nil
 	})
 
@@ -325,7 +325,7 @@ func (fn roundTripperFunc) RoundTrip(req *http.Request) (*http.Response, error)
 }
 
 func TestRuntime_CustomTransport(t *testing.T) {
-	rwrtr := runtime.ClientRequestWriterFunc(func(req runtime.ClientRequest, _ strfmt.Registry) error {
+	rwrtr := runtime.ClientRequestWriterFunc(func(_ runtime.ClientRequest, _ strfmt.Registry) error {
 		return nil
 	})
 	result := []task{
@@ -402,7 +402,7 @@ func TestRuntime_CustomCookieJar(t *testing.T) {
 	}))
 	defer server.Close()
 
-	rwrtr := runtime.ClientRequestWriterFunc(func(req runtime.ClientRequest, _ strfmt.Registry) error {
+	rwrtr := runtime.ClientRequestWriterFunc(func(_ runtime.ClientRequest, _ strfmt.Registry) error {
 		return nil
 	})
 
@@ -457,7 +457,7 @@ func TestRuntime_AuthCanary(t *testing.T) {
 	}))
 	defer server.Close()
 
-	rwrtr := runtime.ClientRequestWriterFunc(func(req runtime.ClientRequest, _ strfmt.Registry) error {
+	rwrtr := runtime.ClientRequestWriterFunc(func(_ runtime.ClientRequest, _ strfmt.Registry) error {
 		return nil
 	})
 
@@ -559,7 +559,7 @@ func TestRuntime_ContentTypeCanary(t *testing.T) {
 	}))
 	defer server.Close()
 
-	rwrtr := runtime.ClientRequestWriterFunc(func(req runtime.ClientRequest, _ strfmt.Registry) error {
+	rwrtr := runtime.ClientRequestWriterFunc(func(_ runtime.ClientRequest, _ strfmt.Registry) error {
 		return nil
 	})
 
@@ -613,7 +613,7 @@ func TestRuntime_ChunkedResponse(t *testing.T) {
 	}))
 	defer server.Close()
 
-	rwrtr := runtime.ClientRequestWriterFunc(func(req runtime.ClientRequest, _ strfmt.Registry) error {
+	rwrtr := runtime.ClientRequestWriterFunc(func(_ runtime.ClientRequest, _ strfmt.Registry) error {
 		return nil
 	})
 
@@ -728,7 +728,7 @@ func TestRuntime_OverrideClientOperation(t *testing.T) {
 
 	_, err := rt.Submit(&runtime.ClientOperation{
 		Client: client2,
-		Params: runtime.ClientRequestWriterFunc(func(r runtime.ClientRequest, _ strfmt.Registry) error {
+		Params: runtime.ClientRequestWriterFunc(func(_ runtime.ClientRequest, _ strfmt.Registry) error {
 			return nil
 		}),
 		Reader: runtime.ClientResponseReaderFunc(func(_ runtime.ClientResponse, _ runtime.Consumer) (interface{}, error) {
@@ -759,7 +759,7 @@ func TestRuntime_PreserveTrailingSlash(t *testing.T) {
 	require.NoError(t, err)
 
 	rt := New(hu.Host, "/", []string{schemeHTTP})
-	rwrtr := runtime.ClientRequestWriterFunc(func(req runtime.ClientRequest, _ strfmt.Registry) error {
+	rwrtr := runtime.ClientRequestWriterFunc(func(_ runtime.ClientRequest, _ strfmt.Registry) error {
 		return nil
 	})
 
@@ -1200,7 +1200,7 @@ func TestRuntime_Timeout(t *testing.T) { //nolint:maintidx // linter evaluates t
 		})
 	})
 	t.Run("with no context, request uses the default timeout", func(t *testing.T) {
-		requestEmptyWriter := runtime.ClientRequestWriterFunc(func(req runtime.ClientRequest, _ strfmt.Registry) error {
+		requestEmptyWriter := runtime.ClientRequestWriterFunc(func(_ runtime.ClientRequest, _ strfmt.Registry) error {
 			return nil
 		})
 		host, cleaner := serverBuilder(t, serverDelay, result)

diff --git a/client/runtime_tls_test.go b/client/runtime_tls_test.go
@@ -116,7 +116,7 @@ func TestRuntimeTLSOptions(t *testing.T) {
 		})
 
 		t.Run("with TLSAuthConfig with VerifyPeer option", func(t *testing.T) {
-			verify := func(rawCerts [][]byte, verifiedChains [][]*x509.Certificate) error {
+			verify := func(_ [][]byte, _ [][]*x509.Certificate) error {
 				return nil
 			}
 
@@ -156,7 +156,7 @@ func TestRuntimeManualCertificateValidation(t *testing.T) {
 		ID:          "getTasks",
 		Method:      http.MethodGet,
 		PathPattern: "/",
-		Params: runtime.ClientRequestWriterFunc(func(req runtime.ClientRequest, _ strfmt.Registry) error {
+		Params: runtime.ClientRequestWriterFunc(func(_ runtime.ClientRequest, _ strfmt.Registry) error {
 			return nil
 		}),
 		Reader: runtime.ClientResponseReaderFunc(func(response runtime.ClientResponse, consumer runtime.Consumer) (interface{}, error) {

diff --git a/internal/testing/simplepetstore/api.go b/internal/testing/simplepetstore/api.go
@@ -44,7 +44,7 @@ func NewPetstore() (http.Handler, error) {
 	return middleware.Serve(spec, api), nil
 }
 
-var getAllPets = runtime.OperationHandlerFunc(func(data interface{}) (interface{}, error) {
+var getAllPets = runtime.OperationHandlerFunc(func(_ interface{}) (interface{}, error) {
 	return pets, nil
 })
 

diff --git a/middleware/denco/router.go b/middleware/denco/router.go
@@ -2,6 +2,7 @@
 package denco
 
 import (
+	"errors"
 	"fmt"
 	"sort"
 	"strings"
@@ -71,7 +72,7 @@ func (rt *Router) Lookup(path string) (data interface{}, params Params, found bo
 func (rt *Router) Build(records []Record) error {
 	statics, params := makeRecords(records)
 	if len(params) > MaxSize {
-		return fmt.Errorf("denco: too many records")
+		return errors.New("denco: too many records")
 	}
 	if rt.SizeHint < 0 {
 		rt.SizeHint = 0
@@ -331,7 +332,7 @@ func (da *doubleArray) arrange(records []*record, idx, depth int, usedBase map[i
 	}
 	base = da.findBase(siblings, idx, usedBase)
 	if base > MaxSize {
-		return -1, nil, nil, fmt.Errorf("denco: too many elements of internal slice")
+		return -1, nil, nil, errors.New("denco: too many elements of internal slice")
 	}
 	da.setBase(idx, base)
 	return base, siblings, leaf, err
@@ -392,7 +393,7 @@ func makeSiblings(records []*record, depth int) (sib []sibling, leaf *record, er
 		case pc == c:
 			continue
 		default:
-			return nil, nil, fmt.Errorf("denco: BUG: routing table hasn't been sorted")
+			return nil, nil, errors.New("denco: BUG: routing table hasn't been sorted")
 		}
 		if n > 0 {
 			sib[n-1].end = i

diff --git a/middleware/operation_test.go b/middleware/operation_test.go
@@ -29,7 +29,7 @@ import (
 
 func TestOperationExecutor(t *testing.T) {
 	spec, api := petstore.NewAPI(t)
-	api.RegisterOperation("get", "/pets", runtime.OperationHandlerFunc(func(params interface{}) (interface{}, error) {
+	api.RegisterOperation("get", "/pets", runtime.OperationHandlerFunc(func(_ interface{}) (interface{}, error) {
 		return []interface{}{
 			map[string]interface{}{"id": 1, "name": "a dog"},
 		}, nil
@@ -49,7 +49,7 @@ func TestOperationExecutor(t *testing.T) {
 	assert.Equal(t, `[{"id":1,"name":"a dog"}]`+"\n", recorder.Body.String())
 
 	spec, api = petstore.NewAPI(t)
-	api.RegisterOperation("get", "/pets", runtime.OperationHandlerFunc(func(params interface{}) (interface{}, error) {
+	api.RegisterOperation("get", "/pets", runtime.OperationHandlerFunc(func(_ interface{}) (interface{}, error) {
 		return nil, errors.New(http.StatusUnprocessableEntity, "expected")
 	}))
 

diff --git a/middleware/request_test.go b/middleware/request_test.go
@@ -219,8 +219,8 @@ func TestRequestBindingDefaultValue(t *testing.T) {
 	assert.Equal(t, delivered, data["delivered"])
 	assert.Equal(t, confirmed, data["confirmed"])
 	assert.Equal(t, age, data["age"])
-	assert.Equal(t, factor, data["factor"])
-	assert.Equal(t, score, data["score"])
+	assert.InDelta(t, factor, data["factor"], 1e-6)
+	assert.InDelta(t, score, data["score"], 1e-6)
 	assert.Equal(t, "hello", string(data["picture"].(strfmt.Base64)))
 }
 

diff --git a/middleware/untyped_request_test.go b/middleware/untyped_request_test.go
@@ -218,8 +218,8 @@ func TestUntypedBindingTypesForValid(t *testing.T) {
 	assert.Equal(t, delivered, data["delivered"])
 	assert.Equal(t, confirmed, data["confirmed"])
 	assert.Equal(t, age, data["age"])
-	assert.Equal(t, factor, data["factor"])
-	assert.Equal(t, score, data["score"])
+	assert.InDelta(t, factor, data["factor"], 1e-6)
+	assert.InDelta(t, score, data["score"], 1e-6)
 	pb, err := base64.URLEncoding.DecodeString(picture)
 	require.NoError(t, err)
 	assert.EqualValues(t, pb, data["picture"].(strfmt.Base64))

diff --git a/security/apikey_auth_test.go b/security/apikey_auth_test.go
@@ -61,7 +61,7 @@ func TestApiKeyAuth(t *testing.T) {
 
 			ok, usr, err := ta.Authenticate(req)
 			assert.True(t, ok)
-			assert.Equal(t, nil, usr)
+			assert.Nil(t, usr)
 			require.Error(t, err)
 		})
 
@@ -73,7 +73,7 @@ func TestApiKeyAuth(t *testing.T) {
 
 			ok, usr, err := ta.Authenticate(req)
 			assert.False(t, ok)
-			assert.Equal(t, nil, usr)
+			assert.Nil(t, usr)
 			require.NoError(t, err)
 		})
 	})
@@ -99,7 +99,7 @@ func TestApiKeyAuth(t *testing.T) {
 
 			ok, usr, err := ta.Authenticate(req)
 			assert.True(t, ok)
-			assert.Equal(t, nil, usr)
+			assert.Nil(t, usr)
 			require.Error(t, err)
 		})
 
@@ -110,7 +110,7 @@ func TestApiKeyAuth(t *testing.T) {
 
 			ok, usr, err := ta.Authenticate(req)
 			assert.False(t, ok)
-			assert.Equal(t, nil, usr)
+			assert.Nil(t, usr)
 			require.NoError(t, err)
 		})
 	})
@@ -150,7 +150,7 @@ func TestApiKeyAuthCtx(t *testing.T) {
 			require.NoError(t, err)
 			ok, usr, err := ta.Authenticate(req)
 			assert.True(t, ok)
-			assert.Equal(t, nil, usr)
+			assert.Nil(t, usr)
 			require.Error(t, err)
 
 			assert.Equal(t, wisdom, req.Context().Value(original))
@@ -165,7 +165,7 @@ func TestApiKeyAuthCtx(t *testing.T) {
 
 			ok, usr, err := ta.Authenticate(req)
 			assert.False(t, ok)
-			assert.Equal(t, nil, usr)
+			assert.Nil(t, usr)
 			require.NoError(t, err)
 
 			assert.Equal(t, wisdom, req.Context().Value(original))
@@ -199,7 +199,7 @@ func TestApiKeyAuthCtx(t *testing.T) {
 
 			ok, usr, err := ta.Authenticate(req)
 			assert.True(t, ok)
-			assert.Equal(t, nil, usr)
+			assert.Nil(t, usr)
 			require.Error(t, err)
 
 			assert.Equal(t, wisdom, req.Context().Value(original))
@@ -213,7 +213,7 @@ func TestApiKeyAuthCtx(t *testing.T) {
 
 			ok, usr, err := ta.Authenticate(req)
 			assert.False(t, ok)
-			assert.Equal(t, nil, usr)
+			assert.Nil(t, usr)
 			require.NoError(t, err)
 
 			assert.Equal(t, wisdom, req.Context().Value(original))

diff --git a/security/basic_auth_test.go b/security/basic_auth_test.go
@@ -80,7 +80,7 @@ func TestBasicAuth(t *testing.T) {
 		ok, usr, err := ba.Authenticate(req)
 		require.NoError(t, err)
 		assert.False(t, ok)
-		assert.Equal(t, nil, usr)
+		assert.Nil(t, usr)
 
 		assert.NotEmpty(t, FailedBasicAuth(req))
 		assert.Equal(t, DefaultRealmName, FailedBasicAuth(req))
@@ -169,7 +169,7 @@ func TestBasicAuthCtx(t *testing.T) {
 		ok, usr, err := ba.Authenticate(req)
 		require.NoError(t, err)
 		assert.False(t, ok)
-		assert.Equal(t, nil, usr)
+		assert.Nil(t, usr)
 
 		assert.Equal(t, wisdom, req.Context().Value(original))
 		assert.Nil(t, req.Context().Value(extra))