Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 cmd/internal/migrations/v3/middleware_locals.go
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ func MigrateMiddlewareLocals(cmd *cobra.Command, cwd string, _, _ *semver.Versio
reTypeAssert := regexp.MustCompile(`([\w\.]+FromContext\([^\)]+\))\.\([^\)]+\)`)
content = reTypeAssert.ReplaceAllString(content, "$1")

reComma := regexp.MustCompile(`(\w+)\s*,\s*(\w+)\s*:=\s*([\w\.]+FromContext\([^\)]+\))`)
reComma := regexp.MustCompile(`(\w+)\s*,\s*(\w+)\s*:=\s*([\w\.]+FromContext\([^\)]+\))(?:\s*,\s*true)*`)
content = reComma.ReplaceAllString(content, "$1, $2 := $3, true")

for alias := range imports {
Expand Down
32 changes: 32 additions & 0 deletions cmd/internal/migrations/v3/middleware_locals_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,38 @@ func handler(c fiber.Ctx) error {
assert.Contains(t, buf.String(), "Migrating middleware locals")
}

func Test_MigrateMiddlewareLocals_Idempotent(t *testing.T) {
t.Parallel()

dir, err := os.MkdirTemp("", "mlocals-idem")
require.NoError(t, err)
defer func() { require.NoError(t, os.RemoveAll(dir)) }()

file := writeTempFile(t, dir, `package main
import "github.com/gofiber/fiber/v2"
func handler(c fiber.Ctx) error {
csrfToken, ok := c.Locals("csrf").(string)
_ = csrfToken
_ = ok
return nil
}`)

var buf bytes.Buffer
cmd := newCmd(&buf)
require.NoError(t, v3.MigrateMiddlewareLocals(cmd, dir, nil, nil))

contentAfterFirstRun := readFile(t, file)
assert.Contains(t, contentAfterFirstRun, `csrfToken, ok := csrf.TokenFromContext(c), true`)
assert.Contains(t, buf.String(), "Migrating middleware locals")

buf.Reset()
require.NoError(t, v3.MigrateMiddlewareLocals(cmd, dir, nil, nil))

contentAfterSecondRun := readFile(t, file)
assert.Equal(t, contentAfterFirstRun, contentAfterSecondRun)
assert.Empty(t, buf.String())
}

func Test_MigrateMiddlewareLocals_ContextKey(t *testing.T) {
t.Parallel()

Expand Down
Loading