From 18fd161bed6c38eb854456d56ac49f1522f3aea7 Mon Sep 17 00:00:00 2001 From: SystemGlitch Date: Thu, 11 May 2023 11:31:03 +0200 Subject: [PATCH] Fix lint issues --- auth/authenticator_test.go | 2 +- database/database.go | 6 +++--- goyave_test.go | 2 +- lang/lang.go | 8 ++++---- router.go | 6 +++--- testsuite_test.go | 7 ++++++- validation/placeholder.go | 2 +- websocket/conn.go | 2 +- websocket/websocket.go | 4 ++-- 9 files changed, 22 insertions(+), 17 deletions(-) diff --git a/auth/authenticator_test.go b/auth/authenticator_test.go index 5a600ee3..9b5c944f 100644 --- a/auth/authenticator_test.go +++ b/auth/authenticator_test.go @@ -47,7 +47,7 @@ type TestBasicUnauthorizer struct { BasicAuthenticator } -func (a *TestBasicUnauthorizer) OnUnauthorized(response *goyave.Response, request *goyave.Request, err error) { +func (a *TestBasicUnauthorizer) OnUnauthorized(response *goyave.Response, _ *goyave.Request, err error) { response.JSON(http.StatusUnauthorized, map[string]string{"custom error key": err.Error()}) } diff --git a/database/database.go b/database/database.go index 12922193..bd812c7d 100644 --- a/database/database.go +++ b/database/database.go @@ -72,7 +72,7 @@ func SetConnection(dialector gorm.Dialector) (*gorm.DB, error) { mu.Lock() defer mu.Unlock() if dbConnection != nil { - if err := close(); err != nil { + if err := closeDB(); err != nil { return nil, err } } @@ -86,7 +86,7 @@ func SetConnection(dialector gorm.Dialector) (*gorm.DB, error) { return dbConnection, nil } -func close() error { +func closeDB() error { var err error if dbConnection != nil { db, _ := dbConnection.DB() @@ -100,7 +100,7 @@ func close() error { func Close() error { mu.Lock() defer mu.Unlock() - return close() + return closeDB() } // AddInitializer adds a database connection initializer function. diff --git a/goyave_test.go b/goyave_test.go index b1f9839d..16e465b4 100644 --- a/goyave_test.go +++ b/goyave_test.go @@ -22,7 +22,7 @@ type GoyaveTestSuite struct { TestSuite } -func helloHandler(response *Response, request *Request) { +func helloHandler(response *Response, _ *Request) { response.String(http.StatusOK, "Hi!") } diff --git a/lang/lang.go b/lang/lang.go index 06f3383e..8722e566 100644 --- a/lang/lang.go +++ b/lang/lang.go @@ -198,17 +198,17 @@ func Get(lang string, line string, placeholders ...string) string { } return convertEmptyLine(line, languages[lang].validation.rules[strings.Join(path[2:], ".")], placeholders) case "fields": - len := len(path) - if len < 3 { + length := len(path) + if length < 3 { return line } attr := languages[lang].validation.fields[path[2]] - if len == 4 { + if length == 4 { if attr.Rules == nil { return line } return convertEmptyLine(line, attr.Rules[path[3]], placeholders) - } else if len == 3 { + } else if length == 3 { return convertEmptyLine(line, attr.Name, placeholders) } else { return line diff --git a/router.go b/router.go index c15f2b1a..0103a415 100644 --- a/router.go +++ b/router.go @@ -68,7 +68,7 @@ var ( // print stacktrace in the console. // If debugging is not enabled, writes `{"error": "Internal Server Error"}` // to the response. -func PanicStatusHandler(response *Response, request *Request) { +func PanicStatusHandler(response *Response, _ *Request) { response.error(response.GetError()) if response.empty { message := map[string]string{ @@ -80,7 +80,7 @@ func PanicStatusHandler(response *Response, request *Request) { // ErrorStatusHandler a generic status handler for non-success codes. // Writes the corresponding status message to the response. -func ErrorStatusHandler(response *Response, request *Request) { +func ErrorStatusHandler(response *Response, _ *Request) { message := map[string]string{ "error": http.StatusText(response.GetStatus()), } @@ -89,7 +89,7 @@ func ErrorStatusHandler(response *Response, request *Request) { // ValidationStatusHandler for HTTP 400 and HTTP 422 errors. // Writes the validation errors to the response. -func ValidationStatusHandler(response *Response, request *Request) { +func ValidationStatusHandler(response *Response, _ *Request) { message := map[string]interface{}{"validationError": response.GetError()} response.JSON(response.GetStatus(), message) } diff --git a/testsuite_test.go b/testsuite_test.go index e1e35bee..3426b0d7 100644 --- a/testsuite_test.go +++ b/testsuite_test.go @@ -207,29 +207,33 @@ func (suite *CustomTestSuite) TestRequests() { if err == nil { suite.Equal("post", string(suite.GetBody(resp))) } + resp.Body.Close() resp, err = suite.Put("/put", nil, strings.NewReader("field=value")) suite.Nil(err) if err == nil { suite.Equal("put", string(suite.GetBody(resp))) } + resp.Body.Close() resp, err = suite.Patch("/patch", nil, strings.NewReader("field=value")) suite.Nil(err) if err == nil { suite.Equal("patch", string(suite.GetBody(resp))) } + resp.Body.Close() resp, err = suite.Delete("/delete", nil, strings.NewReader("field=value")) suite.Nil(err) if err == nil { suite.Equal("delete", string(suite.GetBody(resp))) } + resp.Body.Close() // Headers resp, err = suite.Get("/headers", map[string]string{"Accept-Language": "en-US"}) suite.Nil(err) if err == nil { suite.Equal("en-US", string(suite.GetBody(resp))) - resp.Body.Close() } + resp.Body.Close() // Errors resp, err = suite.Get("invalid", nil) @@ -368,6 +372,7 @@ func (suite *CustomTestSuite) TestMultipartForm() { suite.Equal("hello world", json["field"]) } } + resp.Body.Close() }) } diff --git a/validation/placeholder.go b/validation/placeholder.go index 87c4e57d..d775f399 100644 --- a/validation/placeholder.go +++ b/validation/placeholder.go @@ -55,7 +55,7 @@ func replaceField(field, language string) string { return attr } -func simpleParameterPlaceholder(field string, language string, ctx *Context) string { +func simpleParameterPlaceholder(_ string, _ string, ctx *Context) string { return ctx.Rule.Params[0] } diff --git a/websocket/conn.go b/websocket/conn.go index a379b54e..efe654b5 100644 --- a/websocket/conn.go +++ b/websocket/conn.go @@ -42,7 +42,7 @@ func (c *Conn) GetCloseHandshakeTimeout() time.Duration { return c.timeout } -func (c *Conn) closeHandler(code int, text string) error { +func (c *Conn) closeHandler(_ int, _ string) error { c.waitClose <- struct{}{} return nil } diff --git a/websocket/websocket.go b/websocket/websocket.go index 0d543915..e4b60650 100644 --- a/websocket/websocket.go +++ b/websocket/websocket.go @@ -85,7 +85,7 @@ type Handler func(*Conn, *goyave.Request) error // These handlers are called when an error occurs while the protocol switching. type UpgradeErrorHandler func(response *goyave.Response, request *goyave.Request, status int, reason error) -func defaultUpgradeErrorHandler(response *goyave.Response, request *goyave.Request, status int, reason error) { +func defaultUpgradeErrorHandler(response *goyave.Response, _ *goyave.Request, status int, reason error) { text := http.StatusText(status) if config.GetBool("app.debug") && reason != nil { text = reason.Error() @@ -243,7 +243,7 @@ type adapter struct { request *goyave.Request } -func (a *adapter) onError(w http.ResponseWriter, r *http.Request, status int, reason error) { +func (a *adapter) onError(w http.ResponseWriter, _ *http.Request, status int, reason error) { if status == http.StatusInternalServerError { panic(reason) }