Skip to content

Commit

Permalink
chore: Bump golangci-lint to v1.60.3 (#3119)
Browse files Browse the repository at this point in the history
Bump golangci-lint to v1.60.3
  • Loading branch information
gaby authored Sep 2, 2024
1 parent 4acdc60 commit f668537
Show file tree
Hide file tree
Showing 20 changed files with 31 additions and 42 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,4 @@ jobs:
uses: golangci/golangci-lint-action@v6
with:
# NOTE: Keep this in sync with the version from .golangci.yml
version: v1.60.1
version: v1.60.3
4 changes: 0 additions & 4 deletions .github/workflows/markdown.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,7 @@ on:
branches:
- master
- main
paths:
- "**/*.md"
pull_request:
paths:
- "**/*.md"

jobs:
markdownlint:
Expand Down
11 changes: 5 additions & 6 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ linters:
- depguard
- dogsled
# - dupl
# - dupword # TODO: Enable
- dupword # TODO: Enable
- durationcheck
- errcheck
- errchkjson
Expand All @@ -287,7 +287,7 @@ linters:
- exhaustive
# - exhaustivestruct
# - exhaustruct
- exportloopref
- copyloopvar
- forbidigo
- forcetypeassert
# - funlen
Expand All @@ -298,7 +298,7 @@ linters:
# - gochecknoinits # TODO: Enable
- gochecksumtype
# - gocognit
# - goconst # TODO: Enable
- goconst # TODO: Enable
- gocritic
# - gocyclo
# - godot
Expand All @@ -307,9 +307,8 @@ linters:
- gofmt
- gofumpt
# - goheader
# - goimports
# - golint
# - gomnd # TODO: Enable
- goimports
# - mnd # TODO: Enable
- gomoddirectives
# - gomodguard
- goprintffuncname
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ markdown:
## lint: 🚨 Run lint checks
.PHONY: lint
lint:
go run github.com/golangci/golangci-lint/cmd/[email protected].1 run ./...
go run github.com/golangci/golangci-lint/cmd/[email protected].3 run ./...

## test: 🚦 Execute all tests
.PHONY: test
Expand Down
2 changes: 0 additions & 2 deletions addon/retry/exponential_backoff_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ func Test_ExponentialBackoff_Retry(t *testing.T) {
}

for _, tt := range tests {
tt := tt
t.Run(tt.name, func(t *testing.T) {
t.Parallel()
err := tt.expBackoff.Retry(tt.f)
Expand Down Expand Up @@ -106,7 +105,6 @@ func Test_ExponentialBackoff_Next(t *testing.T) {
}

for _, tt := range tests {
tt := tt
t.Run(tt.name, func(t *testing.T) {
t.Parallel()
for i := 0; i < tt.expBackoff.MaxRetryCount; i++ {
Expand Down
1 change: 0 additions & 1 deletion client/core_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ func Test_AddMissing_Port(t *testing.T) {
},
}
for _, tt := range tests {
tt := tt // create a new 'tt' variable for the goroutine
t.Run(tt.name, func(t *testing.T) {
t.Parallel()
require.Equal(t, tt.want, addMissingPort(tt.args.addr, tt.args.isTLS))
Expand Down
3 changes: 1 addition & 2 deletions client/hooks_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ func Test_Rand_String(t *testing.T) {
},
}
for _, tt := range tests {
tt := tt
t.Run(tt.name, func(t *testing.T) {
t.Parallel()
got := randString(tt.args)
Expand Down Expand Up @@ -188,7 +187,7 @@ func Test_Parser_Request_URL(t *testing.T) {
flag1 = true
case "foo2":
flag2 = true
case "foo":
case "foo": //nolint:goconst // test
flag3 = true
}
}
Expand Down
2 changes: 1 addition & 1 deletion client/request_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1340,7 +1340,7 @@ func Test_SetValWithStruct(t *testing.T) {

require.True(t, func() bool {
for _, v := range p.PeekMulti("TSlice") {
if string(v) == "bar" {
if string(v) == "bar" { //nolint:goconst // test
return true
}
}
Expand Down
4 changes: 0 additions & 4 deletions ctx_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -908,7 +908,6 @@ func Test_Ctx_UserContext_Multiple_Requests(t *testing.T) {

// Consecutive Requests
for i := 1; i <= 10; i++ {
i := i
t.Run(fmt.Sprintf("request_%d", i), func(t *testing.T) {
t.Parallel()
resp, err := app.Test(httptest.NewRequest(MethodGet, fmt.Sprintf("/?input=%d", i), nil))
Expand Down Expand Up @@ -3122,8 +3121,6 @@ func Test_Static_Compress(t *testing.T) {
// Note: deflate is not supported by fasthttp.FS
algorithms := []string{"zstd", "gzip", "br"}
for _, algo := range algorithms {
algo := algo

t.Run(algo+"_compression", func(t *testing.T) {
t.Parallel()

Expand Down Expand Up @@ -3338,7 +3335,6 @@ func Test_Ctx_SendFile_Immutable(t *testing.T) {
}

for _, endpoint := range endpointsForTest {
endpoint := endpoint
t.Run(endpoint, func(t *testing.T) {
t.Parallel()
// 1st try
Expand Down
5 changes: 3 additions & 2 deletions helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ func getSplicedStrList(headerValue string, dst []string) []string {
var (
index int
character rune
lastElementEndsAt uint8
lastElementEndsAt int
insertIndex int
)
for index, character = range headerValue + "$" {
Expand All @@ -337,7 +337,7 @@ func getSplicedStrList(headerValue string, dst []string) []string {
copy(dst, oldSlice)
}
dst[insertIndex] = utils.TrimLeft(headerValue[lastElementEndsAt:index], ' ')
lastElementEndsAt = uint8(index + 1)
lastElementEndsAt = index + 1
insertIndex++
}
}
Expand Down Expand Up @@ -766,6 +766,7 @@ func genericParseBool[V GenericType](str string, parser func(bool) V, defaultVal
return genericParseDefault[V](err, func() V { return parser(result) }, defaultValue...)
}

//nolint:gosec // Casting in this function is not a concern
func genericParseType[V GenericType](str string, v V, defaultValue ...V) V {
switch any(v).(type) {
case int:
Expand Down
2 changes: 0 additions & 2 deletions middleware/compress/compress_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,7 @@ func Test_Compress_Different_Level(t *testing.T) {
algorithms := []string{"gzip", "deflate", "br", "zstd"}

for _, algo := range algorithms {
algo := algo
for _, level := range levels {
level := level
t.Run(fmt.Sprintf("%s_level %d", algo, level), func(t *testing.T) {
t.Parallel()
app := fiber.New()
Expand Down
2 changes: 0 additions & 2 deletions middleware/encryptcookie/encryptcookie_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ func Test_Middleware_InvalidKeys(t *testing.T) {
}

for _, tt := range tests {
tt := tt
t.Run(strconv.Itoa(tt.length)+"_length_encrypt", func(t *testing.T) {
t.Parallel()
key := make([]byte, tt.length)
Expand Down Expand Up @@ -296,7 +295,6 @@ func Test_GenerateKey(t *testing.T) {
}

for _, tt := range tests {
tt := tt
t.Run(strconv.Itoa(tt.length)+"_length", func(t *testing.T) {
t.Parallel()
key := GenerateKey(tt.length)
Expand Down
10 changes: 9 additions & 1 deletion middleware/etag/etag.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package etag
import (
"bytes"
"hash/crc32"
"math"

"github.com/gofiber/fiber/v3"
"github.com/valyala/bytebufferpool"
Expand Down Expand Up @@ -56,8 +57,15 @@ func New(config ...Config) fiber.Handler {
bb.Write(weakPrefix)
}

// Write ETag
bb.WriteByte('"')
bb.B = appendUint(bb.Bytes(), uint32(len(body)))

bodyLength := len(body)
if bodyLength > math.MaxUint32 {
return c.SendStatus(fiber.StatusRequestEntityTooLarge)
}

bb.B = appendUint(bb.Bytes(), uint32(bodyLength)) //nolint:gosec // Body length is validated above
bb.WriteByte('-')
bb.B = appendUint(bb.Bytes(), crc32.Checksum(body, crc32q))
bb.WriteByte('"')
Expand Down
4 changes: 2 additions & 2 deletions middleware/limiter/limiter_sliding.go
Original file line number Diff line number Diff line change
Expand Up @@ -89,14 +89,14 @@ func (SlidingWindow) New(cfg Config) fiber.Handler {
// ^ ^ ^ ^
// ts e.exp End sample window End next window
// <------------>
// resetInSec
// Reset In Sec
// resetInSec = e.exp - ts - time until end of current window.
// duration + expiration = end of next window.
// Because we don't want to garbage collect in the middle of a window
// we add the expiration to the duration.
// Otherwise after the end of "sample window", attackers could launch
// a new request with the full window length.
manager.set(key, e, time.Duration(resetInSec+expiration)*time.Second)
manager.set(key, e, time.Duration(resetInSec+expiration)*time.Second) //nolint:gosec // Not a concern

// Unlock entry
mux.Unlock()
Expand Down
4 changes: 2 additions & 2 deletions middleware/limiter/limiter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ func Test_Limiter_With_Max_Func_With_Zero_And_Limiter_Sliding(t *testing.T) {
}))

app.Get("/:status", func(c fiber.Ctx) error {
if c.Params("status") == "fail" {
if c.Params("status") == "fail" { //nolint:goconst // test
return c.SendStatus(400)
}
return c.SendStatus(200)
Expand Down Expand Up @@ -241,7 +241,7 @@ func Test_Limiter_Fixed_Window_No_Skip_Choices(t *testing.T) {
}))

app.Get("/:status", func(c fiber.Ctx) error {
if c.Params("status") == "fail" { //nolint:goconst // False positive
if c.Params("status") == "fail" {
return c.SendStatus(400)
}
return c.SendStatus(200)
Expand Down
2 changes: 0 additions & 2 deletions middleware/pprof/pprof_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,6 @@ func Test_Pprof_Subs(t *testing.T) {
}

for _, sub := range subs {
sub := sub
t.Run(sub, func(t *testing.T) {
target := "/debug/pprof/" + sub
if sub == "profile" {
Expand Down Expand Up @@ -128,7 +127,6 @@ func Test_Pprof_Subs_WithPrefix(t *testing.T) {
}

for _, sub := range subs {
sub := sub
t.Run(sub, func(t *testing.T) {
target := "/federated-fiber/debug/pprof/" + sub
if sub == "profile" {
Expand Down
3 changes: 1 addition & 2 deletions middleware/static/static_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -723,7 +723,7 @@ func Test_isFile(t *testing.T) {

func Test_Static_Compress(t *testing.T) {
t.Parallel()
dir := "../../.github/testdata/fs"
dir := "../../.github/testdata/fs" //nolint:goconst // test
app := fiber.New()
app.Get("/*", New(dir, Config{
Compress: true,
Expand All @@ -733,7 +733,6 @@ func Test_Static_Compress(t *testing.T) {
algorithms := []string{"zstd", "gzip", "br"}

for _, algo := range algorithms {
algo := algo
t.Run(algo+"_compression", func(t *testing.T) {
t.Parallel()
// request non-compressable file (less than 200 bytes), Content Lengh will remain the same
Expand Down
4 changes: 2 additions & 2 deletions mount.go
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ func (app *App) processSubAppsRoutes() {
// If not, update the route's position and continue
route.pos = routePos
if !route.use || (route.use && m == 0) {
handlersCount += uint32(len(route.Handlers))
handlersCount += uint32(len(route.Handlers)) //nolint:gosec // Not a concern
}
continue
}
Expand Down Expand Up @@ -219,7 +219,7 @@ func (app *App) processSubAppsRoutes() {
atomic.AddUint32(&app.routesCount, ^uint32(0))
i--
// Increase the parent app's route count to account for the sub-app's routes
atomic.AddUint32(&app.routesCount, uint32(len(subRoutes)))
atomic.AddUint32(&app.routesCount, uint32(len(subRoutes))) //nolint:gosec // Not a concern

// Mark the parent app's routes as refreshed
app.routesRefreshed = true
Expand Down
4 changes: 2 additions & 2 deletions mount_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ func Test_App_UseMountedErrorHandlerForBestPrefixMatch(t *testing.T) {
app := New()

tsf := func(c Ctx, _ error) error {
return c.Status(200).SendString("hi, i'm a custom sub sub fiber error")
return c.Status(200).SendString("hi, i'm a custom sub fiber error 2")
}
tripleSubFiber := New(Config{
ErrorHandler: tsf,
Expand Down Expand Up @@ -394,7 +394,7 @@ func Test_App_UseMountedErrorHandlerForBestPrefixMatch(t *testing.T) {

b, err = io.ReadAll(resp2.Body)
require.NoError(t, err, "iotuil.ReadAll()")
require.Equal(t, "hi, i'm a custom sub sub fiber error", string(b), "Third fiber Response body")
require.Equal(t, "hi, i'm a custom sub fiber error 2", string(b), "Third fiber Response body")
}

// go test -run Test_Mount_Route_Names
Expand Down
2 changes: 1 addition & 1 deletion router.go
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ func (app *App) register(methods []string, pathRaw string, group *Group, handler
Handlers: handlers,
}
// Increment global handler count
atomic.AddUint32(&app.handlersCount, uint32(len(handlers)))
atomic.AddUint32(&app.handlersCount, uint32(len(handlers))) //nolint:gosec // Not a concern

// Middleware route matches all HTTP methods
if isUse {
Expand Down

1 comment on commit f668537

@github-actions
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Performance Alert ⚠️

Possible performance regression was detected for benchmark.
Benchmark result of this commit is worse than the previous benchmark result exceeding threshold 1.50.

Benchmark suite Current: f668537 Previous: 87bb93e Ratio
Benchmark_Ctx_Send 7.112 ns/op 0 B/op 0 allocs/op 4.661 ns/op 0 B/op 0 allocs/op 1.53
Benchmark_Ctx_Send - ns/op 7.112 ns/op 4.661 ns/op 1.53
Benchmark_Utils_GetOffer/1_parameter 214.7 ns/op 0 B/op 0 allocs/op 136.1 ns/op 0 B/op 0 allocs/op 1.58
Benchmark_Utils_GetOffer/1_parameter - ns/op 214.7 ns/op 136.1 ns/op 1.58
Benchmark_Middleware_BasicAuth - B/op 80 B/op 48 B/op 1.67
Benchmark_Middleware_BasicAuth - allocs/op 5 allocs/op 3 allocs/op 1.67
Benchmark_Middleware_BasicAuth_Upper - B/op 80 B/op 48 B/op 1.67
Benchmark_Middleware_BasicAuth_Upper - allocs/op 5 allocs/op 3 allocs/op 1.67
Benchmark_CORS_NewHandler - B/op 16 B/op 0 B/op +∞
Benchmark_CORS_NewHandler - allocs/op 1 allocs/op 0 allocs/op +∞
Benchmark_CORS_NewHandlerSingleOrigin - B/op 16 B/op 0 B/op +∞
Benchmark_CORS_NewHandlerSingleOrigin - allocs/op 1 allocs/op 0 allocs/op +∞
Benchmark_CORS_NewHandlerPreflight - B/op 104 B/op 0 B/op +∞
Benchmark_CORS_NewHandlerPreflight - allocs/op 5 allocs/op 0 allocs/op +∞
Benchmark_CORS_NewHandlerPreflightSingleOrigin - B/op 104 B/op 0 B/op +∞
Benchmark_CORS_NewHandlerPreflightSingleOrigin - allocs/op 5 allocs/op 0 allocs/op +∞
Benchmark_CORS_NewHandlerPreflightWildcard - B/op 104 B/op 0 B/op +∞
Benchmark_CORS_NewHandlerPreflightWildcard - allocs/op 5 allocs/op 0 allocs/op +∞
Benchmark_Middleware_CSRF_GenerateToken - B/op 524 B/op 326 B/op 1.61
Benchmark_Middleware_CSRF_GenerateToken - allocs/op 10 allocs/op 6 allocs/op 1.67

This comment was automatically generated by workflow using github-action-benchmark.

Please sign in to comment.