Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

V2 to v3 merge #2864

Merged
merged 59 commits into from
Feb 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
2d3027e
Update pull_request_template.md
ReneWerner87 Dec 3, 2023
9bcc7f3
Update v3-changes.md
ReneWerner87 Dec 3, 2023
a80b288
Update CONTRIBUTING.md (#2752)
tokelo-12 Dec 5, 2023
e4d7e84
chore(encryptcookie)!: update default config (#2753)
sixcolors Dec 7, 2023
8aa8868
build(deps): bump actions/setup-go from 4 to 5 (#2754)
dependabot[bot] Dec 7, 2023
c441bdf
🩹 middleware/logger/: log client IP address by default (#2755)
iredmail Dec 8, 2023
b185083
fix: don't constrain middlewares' context-keys to strings :bug: (#2751)
benjajaja Dec 12, 2023
090acbb
📚 Update app.md for indentation (#2761)
MehmetFiratKomurcu Dec 13, 2023
c3fed55
build(deps): bump github.com/google/uuid from 1.4.0 to 1.5.0 (#2762)
dependabot[bot] Dec 13, 2023
b0925dc
build(deps): bump github/codeql-action from 2 to 3 (#2763)
dependabot[bot] Dec 16, 2023
dc2d2ef
Changing default log output (#2730)
brunodmartins Dec 18, 2023
43fa236
Update hooks.md
ReneWerner87 Dec 19, 2023
1fac52a
🩹 Fix: CORS middleware should use the defined AllowedOriginsFunc conf…
muhammadkholidb Dec 22, 2023
c49faf9
🐛 [Bug]: Adaptator + otelfiber issue #2641 (#2772)
ReneWerner87 Dec 22, 2023
d6c8876
🩹🚨 - fix for redirect with query params (#2748)
gilwo Dec 22, 2023
38eb4bd
♻️ logger/middleware colorize logger error message #2593 (#2773)
ReneWerner87 Dec 23, 2023
6249bc4
:sparkles: feat: add liveness and readiness checks (#2509)
luk3skyw4lker Jan 3, 2024
89f551b
prepare release v2.52.0
ReneWerner87 Jan 5, 2024
476e1ed
fix healthcheck.md
ReneWerner87 Jan 5, 2024
2e66937
configure workflows for V2 branch
ReneWerner87 Jan 6, 2024
7ba3137
configure workflows for V2 branch
ReneWerner87 Jan 6, 2024
e524b73
Fix default value to false in docs of QueryBool (#2811)
CAEL0 Jan 28, 2024
8325ed0
update queryParser config
ReneWerner87 Feb 6, 2024
56d2ec7
Update ctx.md
ReneWerner87 Feb 6, 2024
4e0f180
Update routing.md
ReneWerner87 Feb 8, 2024
e9bce45
Merge remote-tracking branch 'origin/v2'
ReneWerner87 Feb 18, 2024
58b0e11
merge v2 in v3
ReneWerner87 Feb 18, 2024
b75e7f8
merge v2 in v3
ReneWerner87 Feb 18, 2024
980b52b
lint fixes
ReneWerner87 Feb 18, 2024
a84a7ce
:books: Doc: Fix code snippet indentation in /docs/api/middleware/key…
grivera64 Feb 19, 2024
cf54c25
Merge pull request #2867 from grivera64/v2
gaby Feb 19, 2024
9c0dc5e
Merge branch 'main' into v2ToV3Merge
ReneWerner87 Feb 19, 2024
5e30112
fix: healthcheck middleware not working with route group (#2863)
luk3skyw4lker Feb 19, 2024
3167c49
Merge remote-tracking branch 'origin/main' into v2ToV3Merge
ReneWerner87 Feb 21, 2024
2048c75
merge v2 in v3
ReneWerner87 Feb 21, 2024
f0cd3b4
Merge pull request from GHSA-fmg4-x8pw-hjhg
gaby Feb 21, 2024
f9fcb02
Update app.go
ReneWerner87 Feb 21, 2024
70f21d5
fix cors domain normalize
ReneWerner87 Feb 21, 2024
f48957b
Merge remote-tracking branch 'origin/v2' into v2ToV3Merge
ReneWerner87 Feb 21, 2024
0df0e08
fix sync-docs workflow
ReneWerner87 Feb 21, 2024
f50b57b
test: fix failing tests
sixcolors Feb 21, 2024
ddc6b23
fix sync-docs workflow
ReneWerner87 Feb 21, 2024
8d739f1
test: cors middleware use testify require
sixcolors Feb 21, 2024
7c805cd
chore: fix lint warnings
sixcolors Feb 21, 2024
cdaeb3b
chore: revert test isolation.
sixcolors Feb 21, 2024
2151f75
Merge branch 'main' into v2ToV3Merge
ReneWerner87 Feb 26, 2024
a81b36e
Merge remote-tracking branch 'origin/v2' into v2ToV3Merge
ReneWerner87 Feb 26, 2024
5a0167a
fixed the fasthttp ctx race condition problem
ReneWerner87 Feb 27, 2024
e623e1d
Update middleware/cors/utils.go
gaby Feb 27, 2024
420d51d
fix sync_docs.sh
ReneWerner87 Feb 27, 2024
dd198e4
Merge remote-tracking branch 'origin/v2ToV3Merge' into v2ToV3Merge
ReneWerner87 Feb 27, 2024
639f552
fix review comments/hints
ReneWerner87 Feb 27, 2024
4c9e76d
fix review comments/hints
ReneWerner87 Feb 27, 2024
e392d04
stabilize Test_Proxy_Timeout_Slow_Server test
ReneWerner87 Feb 27, 2024
4bd6090
stabilize Test_Proxy_.* tests
ReneWerner87 Feb 27, 2024
4a1891b
ignore bodyclose linter for tests
ReneWerner87 Feb 27, 2024
7661fbb
revert(tests): undo http.NoBody usage
ReneWerner87 Feb 28, 2024
ab2b0fc
fix(ctx pool): postpone the reset for some values
ReneWerner87 Feb 28, 2024
ac64308
refactor(tests): use testify panic method instead of custom solution
ReneWerner87 Feb 28, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Titles always we must use prefix according to below:
- 📚 Doc: Translate to Portuguese middleware redirect
- 🎨 Style: Respected pattern Golint

All pull request that contains a feature or fix is mandatory to have unit tests. Your PR is only to be merged if you respect this flow.
All pull requests that contain a feature or fix are mandatory to have unit tests. Your PR is only to be merged if you respect this flow.

# 👍 Contribute

Expand Down
74 changes: 0 additions & 74 deletions .github/ISSUE_TEMPLATE/feature-request-v3.yaml

This file was deleted.

54 changes: 0 additions & 54 deletions .github/ISSUE_TEMPLATE/maintenance-task-v3.yaml

This file was deleted.

45 changes: 0 additions & 45 deletions .github/PULL_REQUEST_TEMPLATE/v3-changes.md

This file was deleted.

6 changes: 3 additions & 3 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Please provide a clear and concise description of the changes you've made and th

Related to # (issue)

## Changes Introduced
## Changes introduced

List the new features or adjustments introduced in this pull request. Provide details on benchmarks, documentation updates, changelog entries, and if applicable, the migration guide.

Expand All @@ -16,7 +16,7 @@ List the new features or adjustments introduced in this pull request. Provide de
- [ ] API Longevity: Discuss the steps taken to ensure that the new or updated APIs are consistent and not prone to breaking changes.
- [ ] Examples: Provide examples demonstrating the new features or changes in action.

## Type of Change
## Type of change

Please delete options that are not relevant.

Expand All @@ -39,6 +39,6 @@ Before you submit your pull request, please make sure you meet these requirement
- [ ] Aimed for optimal performance with minimal allocations in the new code.
- [ ] Provided benchmarks for the new code to analyze and improve upon.

## Commit Formatting
## Commit formatting

Please use emojis in commit messages for an easy way to identify the purpose or intention of a commit. Check out the emoji cheatsheet here: [CONTRIBUTING.md](https://github.com/gofiber/fiber/blob/master/.github/CONTRIBUTING.md#pull-requests-or-commits)
6 changes: 6 additions & 0 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,12 @@ linters-settings:
issues:
exclude-use-default: false

exclude-rules:
# Exclude some linters from running on tests files.
- path: _test\.go
linters:
- bodyclose

linters:
disable:
- spancheck # opentelemetry, irrelevant
Expand Down
6 changes: 2 additions & 4 deletions app.go
Original file line number Diff line number Diff line change
Expand Up @@ -496,7 +496,7 @@ func New(config ...Config) *App {
// Create Ctx pool
app.pool = sync.Pool{
New: func() any {
return app.NewCtx(&fasthttp.RequestCtx{})
return app.newCtx()
},
}

Expand Down Expand Up @@ -1071,9 +1071,7 @@ func (app *App) ErrorHandler(ctx Ctx, err error) error {
// errors before calling the application's error handler method.
func (app *App) serverErrorHandler(fctx *fasthttp.RequestCtx, err error) {
// Acquire Ctx with fasthttp request from pool
c := app.AcquireCtx()
c.Reset(fctx)

c := app.AcquireCtx(fctx)
defer app.ReleaseCtx(c)

var (
Expand Down
15 changes: 7 additions & 8 deletions app_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// 🤖 Github Repository: https://github.com/gofiber/fiber
// 📌 API Documentation: https://docs.gofiber.io

//nolint:bodyclose, goconst // Much easier to just ignore memory leaks in tests
//nolint:goconst // Much easier to just ignore memory leaks in tests
package fiber

import (
Expand Down Expand Up @@ -314,7 +314,7 @@ func Test_App_serverErrorHandler_Internal_Error(t *testing.T) {
t.Parallel()
app := New()
msg := "test err"
c := app.NewCtx(&fasthttp.RequestCtx{}).(*DefaultCtx) //nolint:errcheck, forcetypeassert // not needed
c := app.AcquireCtx(&fasthttp.RequestCtx{}).(*DefaultCtx) //nolint:errcheck, forcetypeassert // not needed

app.serverErrorHandler(c.fasthttp, errors.New(msg))
require.Equal(t, string(c.fasthttp.Response.Body()), msg)
Expand All @@ -324,7 +324,7 @@ func Test_App_serverErrorHandler_Internal_Error(t *testing.T) {
func Test_App_serverErrorHandler_Network_Error(t *testing.T) {
t.Parallel()
app := New()
c := app.NewCtx(&fasthttp.RequestCtx{}).(*DefaultCtx) //nolint:errcheck, forcetypeassert // not needed
c := app.AcquireCtx(&fasthttp.RequestCtx{}).(*DefaultCtx) //nolint:errcheck, forcetypeassert // not needed

app.serverErrorHandler(c.fasthttp, &net.DNSError{
Err: "test error",
Expand Down Expand Up @@ -1400,8 +1400,7 @@ func Test_App_Next_Method(t *testing.T) {
func Benchmark_AcquireCtx(b *testing.B) {
app := New()
for n := 0; n < b.N; n++ {
c := app.AcquireCtx()
c.Reset(&fasthttp.RequestCtx{})
c := app.AcquireCtx(&fasthttp.RequestCtx{})

app.ReleaseCtx(c)
}
Expand Down Expand Up @@ -1612,7 +1611,7 @@ func Test_App_SmallReadBuffer(t *testing.T) {

go func() {
time.Sleep(500 * time.Millisecond)
req, err := http.NewRequestWithContext(context.Background(), MethodGet, "http://127.0.0.1:4006/small-read-buffer", http.NoBody)
req, err := http.NewRequestWithContext(context.Background(), MethodGet, "http://127.0.0.1:4006/small-read-buffer", nil)
require.NoError(t, err)
var client http.Client
resp, err := client.Do(req)
Expand Down Expand Up @@ -1736,7 +1735,7 @@ func Test_App_Test_no_timeout_infinitely(t *testing.T) {
return nil
})

req := httptest.NewRequest(MethodGet, "/", http.NoBody)
req := httptest.NewRequest(MethodGet, "/", nil)
_, err = app.Test(req, -1)
}()

Expand Down Expand Up @@ -1765,7 +1764,7 @@ func Test_App_SetTLSHandler(t *testing.T) {
app := New()
app.SetTLSHandler(tlsHandler)

c := app.NewCtx(&fasthttp.RequestCtx{})
c := app.AcquireCtx(&fasthttp.RequestCtx{})
defer app.ReleaseCtx(c)

require.Equal(t, "example.golang", c.ClientHelloInfo().ServerName)
Expand Down
Loading
Loading