From f26d9b1d4e6383e31cd03e9a387fd83008da10ad Mon Sep 17 00:00:00 2001
From: Kris Carr <32299738+KrisCarr@users.noreply.github.com>
Date: Mon, 31 Oct 2022 13:44:53 +0000
Subject: [PATCH] v3 (deps): update to use gofiber/utils/v2 (#2184)

---
 app.go                                 | 2 +-
 bind.go                                | 2 +-
 binder/cookie.go                       | 2 +-
 binder/form.go                         | 2 +-
 binder/header.go                       | 2 +-
 binder/json.go                         | 2 +-
 binder/mapping.go                      | 2 +-
 binder/query.go                        | 2 +-
 binder/resp_header.go                  | 2 +-
 client.go                              | 2 +-
 ctx.go                                 | 2 +-
 ctx_test.go                            | 2 +-
 go.mod                                 | 4 ++--
 go.sum                                 | 8 +++++---
 helpers_test.go                        | 2 +-
 internal/memory/memory.go              | 2 +-
 internal/memory/memory_test.go         | 2 +-
 internal/storage/memory/memory.go      | 2 +-
 internal/storage/memory/memory_test.go | 2 +-
 middleware/adaptor/adopter.go          | 2 +-
 middleware/basicauth/basicauth.go      | 2 +-
 middleware/basicauth/config.go         | 2 +-
 middleware/cache/cache.go              | 2 +-
 middleware/cache/cache_test.go         | 2 +-
 middleware/cache/config.go             | 2 +-
 middleware/csrf/config.go              | 2 +-
 middleware/csrf/csrf_test.go           | 2 +-
 middleware/csrf/manager.go             | 2 +-
 middleware/limiter/limiter_fixed.go    | 2 +-
 middleware/limiter/limiter_sliding.go  | 2 +-
 middleware/proxy/proxy.go              | 2 +-
 middleware/proxy/proxy_test.go         | 2 +-
 middleware/requestid/config.go         | 2 +-
 middleware/session/config.go           | 2 +-
 middleware/session/session.go          | 2 +-
 middleware/session/store.go            | 2 +-
 redirect.go                            | 2 +-
 router.go                              | 2 +-
 router_test.go                         | 2 +-
 39 files changed, 44 insertions(+), 42 deletions(-)

diff --git a/app.go b/app.go
index 5aaa2d91..523089fa 100644
--- a/app.go
+++ b/app.go
@@ -22,7 +22,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/gofiber/utils"
+	"github.com/gofiber/utils/v2"
 	"github.com/valyala/fasthttp"
 )
 
diff --git a/bind.go b/bind.go
index 147afa0b..512a4afb 100644
--- a/bind.go
+++ b/bind.go
@@ -2,7 +2,7 @@ package fiber
 
 import (
 	"github.com/gofiber/fiber/v3/binder"
-	"github.com/gofiber/utils"
+	"github.com/gofiber/utils/v2"
 )
 
 // An interface to register custom binders.
diff --git a/binder/cookie.go b/binder/cookie.go
index f5550d7a..2c107af8 100644
--- a/binder/cookie.go
+++ b/binder/cookie.go
@@ -4,7 +4,7 @@ import (
 	"reflect"
 	"strings"
 
-	"github.com/gofiber/utils"
+	"github.com/gofiber/utils/v2"
 	"github.com/valyala/fasthttp"
 )
 
diff --git a/binder/form.go b/binder/form.go
index 610ebed4..0b469086 100644
--- a/binder/form.go
+++ b/binder/form.go
@@ -4,7 +4,7 @@ import (
 	"reflect"
 	"strings"
 
-	"github.com/gofiber/utils"
+	"github.com/gofiber/utils/v2"
 	"github.com/valyala/fasthttp"
 )
 
diff --git a/binder/header.go b/binder/header.go
index c94c21cb..19616369 100644
--- a/binder/header.go
+++ b/binder/header.go
@@ -4,7 +4,7 @@ import (
 	"reflect"
 	"strings"
 
-	"github.com/gofiber/utils"
+	"github.com/gofiber/utils/v2"
 	"github.com/valyala/fasthttp"
 )
 
diff --git a/binder/json.go b/binder/json.go
index b3ae2e89..4eed4e68 100644
--- a/binder/json.go
+++ b/binder/json.go
@@ -1,7 +1,7 @@
 package binder
 
 import (
-	"github.com/gofiber/utils"
+	"github.com/gofiber/utils/v2"
 )
 
 type jsonBinding struct{}
diff --git a/binder/mapping.go b/binder/mapping.go
index b8ffea3e..e526918f 100644
--- a/binder/mapping.go
+++ b/binder/mapping.go
@@ -6,7 +6,7 @@ import (
 	"sync"
 
 	"github.com/gofiber/fiber/v3/internal/schema"
-	"github.com/gofiber/utils"
+	"github.com/gofiber/utils/v2"
 	"github.com/valyala/bytebufferpool"
 )
 
diff --git a/binder/query.go b/binder/query.go
index fe722c41..440b5878 100644
--- a/binder/query.go
+++ b/binder/query.go
@@ -4,7 +4,7 @@ import (
 	"reflect"
 	"strings"
 
-	"github.com/gofiber/utils"
+	"github.com/gofiber/utils/v2"
 	"github.com/valyala/fasthttp"
 )
 
diff --git a/binder/resp_header.go b/binder/resp_header.go
index 823109a6..0455185b 100644
--- a/binder/resp_header.go
+++ b/binder/resp_header.go
@@ -4,7 +4,7 @@ import (
 	"reflect"
 	"strings"
 
-	"github.com/gofiber/utils"
+	"github.com/gofiber/utils/v2"
 	"github.com/valyala/fasthttp"
 )
 
diff --git a/client.go b/client.go
index dc18f142..ebd0df89 100644
--- a/client.go
+++ b/client.go
@@ -16,7 +16,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/gofiber/utils"
+	"github.com/gofiber/utils/v2"
 	"github.com/valyala/fasthttp"
 )
 
diff --git a/ctx.go b/ctx.go
index ae139ff3..93b10e86 100644
--- a/ctx.go
+++ b/ctx.go
@@ -21,7 +21,7 @@ import (
 	"text/template"
 	"time"
 
-	"github.com/gofiber/utils"
+	"github.com/gofiber/utils/v2"
 	"github.com/savsgio/dictpool"
 	"github.com/valyala/bytebufferpool"
 	"github.com/valyala/fasthttp"
diff --git a/ctx_test.go b/ctx_test.go
index 3ab3bdb1..353690da 100644
--- a/ctx_test.go
+++ b/ctx_test.go
@@ -25,7 +25,7 @@ import (
 	"time"
 
 	"github.com/gofiber/fiber/v3/internal/storage/memory"
-	"github.com/gofiber/utils"
+	"github.com/gofiber/utils/v2"
 	"github.com/stretchr/testify/require"
 	"github.com/valyala/bytebufferpool"
 	"github.com/valyala/fasthttp"
diff --git a/go.mod b/go.mod
index 3f7e1a27..56e11d3b 100644
--- a/go.mod
+++ b/go.mod
@@ -3,12 +3,12 @@ module github.com/gofiber/fiber/v3
 go 1.19
 
 require (
-	github.com/gofiber/utils v1.0.0
+	github.com/gofiber/utils/v2 v2.0.0-beta.1
 	github.com/google/uuid v1.3.0
 	github.com/mattn/go-colorable v0.1.13
 	github.com/mattn/go-isatty v0.0.16
 	github.com/savsgio/dictpool v0.0.0-20221023140959-7bf2e61cea94
-	github.com/stretchr/testify v1.8.0
+	github.com/stretchr/testify v1.8.1
 	github.com/tinylib/msgp v1.1.6
 	github.com/valyala/bytebufferpool v1.0.0
 	github.com/valyala/fasthttp v1.41.0
diff --git a/go.sum b/go.sum
index 5016a3a7..7412a8ab 100644
--- a/go.sum
+++ b/go.sum
@@ -3,8 +3,8 @@ github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHG
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/gofiber/utils v1.0.0 h1:goxlTmYidOhsCvuZuTLzT224DELpnz9c/+iw5eN9FJw=
-github.com/gofiber/utils v1.0.0/go.mod h1:RYennBgjLkuNtU+dxg7QgBEU8tmixFQHQ2GE1ioZlxw=
+github.com/gofiber/utils/v2 v2.0.0-beta.1 h1:ACfPdqeclx+BFIja19UjkKx7k3r5tmpILpNgzrfPLKs=
+github.com/gofiber/utils/v2 v2.0.0-beta.1/go.mod h1:CG89nDoIkEFIJaw5LdLO9AmBM11odse/LC79KQujm74=
 github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
 github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/klauspost/compress v1.15.9/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU=
@@ -24,9 +24,11 @@ github.com/savsgio/gotils v0.0.0-20220530130905-52f3993e8d6d h1:Q+gqLBOPkFGHyCJx
 github.com/savsgio/gotils v0.0.0-20220530130905-52f3993e8d6d/go.mod h1:Gy+0tqhJvgGlqnTF8CVGP0AaGRjwBtXs/a5PA0Y3+A4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
+github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
+github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/tinylib/msgp v1.1.6 h1:i+SbKraHhnrf9M5MYmvQhFnbLhAXSDWF8WWsuyRdocw=
 github.com/tinylib/msgp v1.1.6/go.mod h1:75BAfg2hauQhs3qedfdDZmWAPcFMAvJE5b9rGOMufyw=
 github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
diff --git a/helpers_test.go b/helpers_test.go
index d7f658a8..bba282b2 100644
--- a/helpers_test.go
+++ b/helpers_test.go
@@ -10,7 +10,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/gofiber/utils"
+	"github.com/gofiber/utils/v2"
 	"github.com/stretchr/testify/require"
 	"github.com/valyala/fasthttp"
 )
diff --git a/internal/memory/memory.go b/internal/memory/memory.go
index befdf67f..33273e28 100644
--- a/internal/memory/memory.go
+++ b/internal/memory/memory.go
@@ -7,7 +7,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/gofiber/utils"
+	"github.com/gofiber/utils/v2"
 )
 
 type Storage struct {
diff --git a/internal/memory/memory_test.go b/internal/memory/memory_test.go
index 5bfeeef4..2b7a0333 100644
--- a/internal/memory/memory_test.go
+++ b/internal/memory/memory_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/gofiber/utils"
+	"github.com/gofiber/utils/v2"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/internal/storage/memory/memory.go b/internal/storage/memory/memory.go
index 65ad3389..e18cac27 100644
--- a/internal/storage/memory/memory.go
+++ b/internal/storage/memory/memory.go
@@ -7,7 +7,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/gofiber/utils"
+	"github.com/gofiber/utils/v2"
 )
 
 // Storage interface that is implemented by storage providers
diff --git a/internal/storage/memory/memory_test.go b/internal/storage/memory/memory_test.go
index f73ac5fa..00dcf86b 100644
--- a/internal/storage/memory/memory_test.go
+++ b/internal/storage/memory/memory_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/gofiber/utils"
+	"github.com/gofiber/utils/v2"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/middleware/adaptor/adopter.go b/middleware/adaptor/adopter.go
index 0f37122c..2fe2a465 100644
--- a/middleware/adaptor/adopter.go
+++ b/middleware/adaptor/adopter.go
@@ -10,7 +10,7 @@ import (
 	"net/http"
 
 	"github.com/gofiber/fiber/v3"
-	"github.com/gofiber/utils"
+	"github.com/gofiber/utils/v2"
 	"github.com/valyala/fasthttp"
 	"github.com/valyala/fasthttp/fasthttpadaptor"
 )
diff --git a/middleware/basicauth/basicauth.go b/middleware/basicauth/basicauth.go
index d3349d86..9e1891f4 100644
--- a/middleware/basicauth/basicauth.go
+++ b/middleware/basicauth/basicauth.go
@@ -5,7 +5,7 @@ import (
 	"strings"
 
 	"github.com/gofiber/fiber/v3"
-	"github.com/gofiber/utils"
+	"github.com/gofiber/utils/v2"
 )
 
 // New creates a new middleware handler
diff --git a/middleware/basicauth/config.go b/middleware/basicauth/config.go
index 6e076a37..dee490a8 100644
--- a/middleware/basicauth/config.go
+++ b/middleware/basicauth/config.go
@@ -4,7 +4,7 @@ import (
 	"crypto/subtle"
 
 	"github.com/gofiber/fiber/v3"
-	"github.com/gofiber/utils"
+	"github.com/gofiber/utils/v2"
 )
 
 // Config defines the config for middleware.
diff --git a/middleware/cache/cache.go b/middleware/cache/cache.go
index b23c8f94..6114e082 100644
--- a/middleware/cache/cache.go
+++ b/middleware/cache/cache.go
@@ -10,7 +10,7 @@ import (
 	"time"
 
 	"github.com/gofiber/fiber/v3"
-	"github.com/gofiber/utils"
+	"github.com/gofiber/utils/v2"
 )
 
 // timestampUpdatePeriod is the period which is used to check the cache expiration.
diff --git a/middleware/cache/cache_test.go b/middleware/cache/cache_test.go
index f2f98c33..5567f0b9 100644
--- a/middleware/cache/cache_test.go
+++ b/middleware/cache/cache_test.go
@@ -17,7 +17,7 @@ import (
 	"github.com/gofiber/fiber/v3"
 	"github.com/gofiber/fiber/v3/internal/storage/memory"
 	"github.com/gofiber/fiber/v3/middleware/etag"
-	"github.com/gofiber/utils"
+	"github.com/gofiber/utils/v2"
 	"github.com/stretchr/testify/require"
 	"github.com/valyala/fasthttp"
 )
diff --git a/middleware/cache/config.go b/middleware/cache/config.go
index b18046cf..8e2d6226 100644
--- a/middleware/cache/config.go
+++ b/middleware/cache/config.go
@@ -4,7 +4,7 @@ import (
 	"time"
 
 	"github.com/gofiber/fiber/v3"
-	"github.com/gofiber/utils"
+	"github.com/gofiber/utils/v2"
 )
 
 // Config defines the config for middleware.
diff --git a/middleware/csrf/config.go b/middleware/csrf/config.go
index c8c81129..8c01c6c4 100644
--- a/middleware/csrf/config.go
+++ b/middleware/csrf/config.go
@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/gofiber/fiber/v3"
-	"github.com/gofiber/utils"
+	"github.com/gofiber/utils/v2"
 )
 
 // Config defines the config for middleware.
diff --git a/middleware/csrf/csrf_test.go b/middleware/csrf/csrf_test.go
index fd3e89a9..45049da8 100644
--- a/middleware/csrf/csrf_test.go
+++ b/middleware/csrf/csrf_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 
 	"github.com/gofiber/fiber/v3"
-	"github.com/gofiber/utils"
+	"github.com/gofiber/utils/v2"
 	"github.com/stretchr/testify/require"
 	"github.com/valyala/fasthttp"
 )
diff --git a/middleware/csrf/manager.go b/middleware/csrf/manager.go
index 0b80f35e..f2fe9535 100644
--- a/middleware/csrf/manager.go
+++ b/middleware/csrf/manager.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/gofiber/fiber/v3"
 	"github.com/gofiber/fiber/v3/internal/memory"
-	"github.com/gofiber/utils"
+	"github.com/gofiber/utils/v2"
 )
 
 // go:generate msgp
diff --git a/middleware/limiter/limiter_fixed.go b/middleware/limiter/limiter_fixed.go
index 9948afc8..735eecaf 100644
--- a/middleware/limiter/limiter_fixed.go
+++ b/middleware/limiter/limiter_fixed.go
@@ -6,7 +6,7 @@ import (
 	"sync/atomic"
 
 	"github.com/gofiber/fiber/v3"
-	"github.com/gofiber/utils"
+	"github.com/gofiber/utils/v2"
 )
 
 type FixedWindow struct{}
diff --git a/middleware/limiter/limiter_sliding.go b/middleware/limiter/limiter_sliding.go
index 5fc1d730..fcf1cb5f 100644
--- a/middleware/limiter/limiter_sliding.go
+++ b/middleware/limiter/limiter_sliding.go
@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"github.com/gofiber/fiber/v3"
-	"github.com/gofiber/utils"
+	"github.com/gofiber/utils/v2"
 )
 
 type SlidingWindow struct{}
diff --git a/middleware/proxy/proxy.go b/middleware/proxy/proxy.go
index 00285e6e..6ce4ba0b 100644
--- a/middleware/proxy/proxy.go
+++ b/middleware/proxy/proxy.go
@@ -8,7 +8,7 @@ import (
 	"sync"
 
 	"github.com/gofiber/fiber/v3"
-	"github.com/gofiber/utils"
+	"github.com/gofiber/utils/v2"
 	"github.com/valyala/fasthttp"
 )
 
diff --git a/middleware/proxy/proxy_test.go b/middleware/proxy/proxy_test.go
index e0b3c429..cbf1c681 100644
--- a/middleware/proxy/proxy_test.go
+++ b/middleware/proxy/proxy_test.go
@@ -12,7 +12,7 @@ import (
 
 	"github.com/gofiber/fiber/v3"
 	"github.com/gofiber/fiber/v3/internal/tlstest"
-	"github.com/gofiber/utils"
+	"github.com/gofiber/utils/v2"
 	"github.com/stretchr/testify/require"
 	"github.com/valyala/fasthttp"
 )
diff --git a/middleware/requestid/config.go b/middleware/requestid/config.go
index 9909bee5..d29a62a4 100644
--- a/middleware/requestid/config.go
+++ b/middleware/requestid/config.go
@@ -2,7 +2,7 @@ package requestid
 
 import (
 	"github.com/gofiber/fiber/v3"
-	"github.com/gofiber/utils"
+	"github.com/gofiber/utils/v2"
 )
 
 // Config defines the config for middleware.
diff --git a/middleware/session/config.go b/middleware/session/config.go
index 0da7ea6b..b304001d 100644
--- a/middleware/session/config.go
+++ b/middleware/session/config.go
@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"github.com/gofiber/fiber/v3"
-	"github.com/gofiber/utils"
+	"github.com/gofiber/utils/v2"
 )
 
 // Config defines the config for middleware.
diff --git a/middleware/session/session.go b/middleware/session/session.go
index 987838c6..ce145e56 100644
--- a/middleware/session/session.go
+++ b/middleware/session/session.go
@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"github.com/gofiber/fiber/v3"
-	"github.com/gofiber/utils"
+	"github.com/gofiber/utils/v2"
 	"github.com/valyala/fasthttp"
 )
 
diff --git a/middleware/session/store.go b/middleware/session/store.go
index c3694a6e..77537abe 100644
--- a/middleware/session/store.go
+++ b/middleware/session/store.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/gofiber/fiber/v3"
 	"github.com/gofiber/fiber/v3/internal/storage/memory"
-	"github.com/gofiber/utils"
+	"github.com/gofiber/utils/v2"
 	"github.com/valyala/fasthttp"
 )
 
diff --git a/redirect.go b/redirect.go
index e6ae673b..bcb709c4 100644
--- a/redirect.go
+++ b/redirect.go
@@ -9,7 +9,7 @@ import (
 	"sync"
 
 	"github.com/gofiber/fiber/v3/binder"
-	"github.com/gofiber/utils"
+	"github.com/gofiber/utils/v2"
 	"github.com/valyala/bytebufferpool"
 )
 
diff --git a/router.go b/router.go
index 391c20a1..02a4315b 100644
--- a/router.go
+++ b/router.go
@@ -12,7 +12,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/gofiber/utils"
+	"github.com/gofiber/utils/v2"
 	"github.com/valyala/fasthttp"
 )
 
diff --git a/router_test.go b/router_test.go
index 9692fc9b..299d5def 100644
--- a/router_test.go
+++ b/router_test.go
@@ -16,7 +16,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/gofiber/utils"
+	"github.com/gofiber/utils/v2"
 	"github.com/stretchr/testify/require"
 	"github.com/valyala/fasthttp"
 )