diff --git a/app.go b/app.go index 5d7e721d..83abfb9d 100644 --- a/app.go +++ b/app.go @@ -25,7 +25,7 @@ import ( "github.com/gofiber/fiber/v2/internal/colorable" "github.com/gofiber/fiber/v2/internal/isatty" - "github.com/gofiber/fiber/v2/internal/utils" + "github.com/gofiber/fiber/v2/utils" "github.com/valyala/fasthttp" ) diff --git a/app_test.go b/app_test.go index c1fb8d85..853c92fe 100644 --- a/app_test.go +++ b/app_test.go @@ -20,7 +20,7 @@ import ( "testing" "time" - "github.com/gofiber/fiber/v2/internal/utils" + "github.com/gofiber/fiber/v2/utils" "github.com/valyala/fasthttp" "github.com/valyala/fasthttp/fasthttputil" ) diff --git a/ctx.go b/ctx.go index aac1f138..389fec99 100644 --- a/ctx.go +++ b/ctx.go @@ -22,7 +22,7 @@ import ( "github.com/gofiber/fiber/v2/internal/bytebufferpool" "github.com/gofiber/fiber/v2/internal/encoding/json" "github.com/gofiber/fiber/v2/internal/schema" - "github.com/gofiber/fiber/v2/internal/utils" + "github.com/gofiber/fiber/v2/utils" "github.com/valyala/fasthttp" ) diff --git a/ctx_test.go b/ctx_test.go index 48305a60..4bcd67c5 100644 --- a/ctx_test.go +++ b/ctx_test.go @@ -25,7 +25,7 @@ import ( "time" "github.com/gofiber/fiber/v2/internal/bytebufferpool" - "github.com/gofiber/fiber/v2/internal/utils" + "github.com/gofiber/fiber/v2/utils" "github.com/valyala/fasthttp" ) diff --git a/go.mod b/go.mod index d92be4cc..11924adf 100644 --- a/go.mod +++ b/go.mod @@ -3,6 +3,7 @@ module github.com/gofiber/fiber/v2 go 1.14 require ( + github.com/klauspost/compress v1.11.0 // indirect github.com/valyala/fasthttp v1.16.0 - golang.org/x/sys v0.0.0-20200602225109-6fdc65e7d980 + golang.org/x/sys v0.0.0-20200909081042-eff7692f9009 ) diff --git a/go.sum b/go.sum index 1c6e6cd3..71b18a3c 100644 --- a/go.sum +++ b/go.sum @@ -1,8 +1,9 @@ github.com/andybalholm/brotli v1.0.0 h1:7UCwP93aiSfvWpapti8g88vVVGp2qqtGyePsSuDafo4= github.com/andybalholm/brotli v1.0.0/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y= -github.com/gofiber/fiber v1.14.6 h1:QRUPvPmr8ijQuGo1MgupHBn8E+wW0IKqiOvIZPtV70o= github.com/klauspost/compress v1.10.7 h1:7rix8v8GpI3ZBb0nSozFRgbtXKv+hOe+qfEpZqybrAg= github.com/klauspost/compress v1.10.7/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= +github.com/klauspost/compress v1.11.0 h1:wJbzvpYMVGG9iTI9VxpnNZfd4DzMPoCWze3GgSqz8yg= +github.com/klauspost/compress v1.11.0/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= github.com/valyala/fasthttp v1.16.0 h1:9zAqOYLl8Tuy3E5R6ckzGDJ1g8+pw15oQp2iL9Jl6gQ= @@ -18,5 +19,7 @@ golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd h1:xhmwyvizuTgC2qz7ZlMluP20u golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200602225109-6fdc65e7d980 h1:OjiUf46hAmXblsZdnoSXsEUSKU8r1UEzcL5RVZ4gO9Y= golang.org/x/sys v0.0.0-20200602225109-6fdc65e7d980/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200909081042-eff7692f9009 h1:W0lCpv29Hv0UaM1LXb9QlBHLNP8UFfcKjblhVCWftOM= +golang.org/x/sys v0.0.0-20200909081042-eff7692f9009/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/helpers.go b/helpers.go index 0192f943..3ddbcace 100644 --- a/helpers.go +++ b/helpers.go @@ -19,7 +19,7 @@ import ( "unsafe" "github.com/gofiber/fiber/v2/internal/bytebufferpool" - "github.com/gofiber/fiber/v2/internal/utils" + "github.com/gofiber/fiber/v2/utils" "github.com/valyala/fasthttp" ) diff --git a/helpers_test.go b/helpers_test.go index 15a2098e..d965e70d 100644 --- a/helpers_test.go +++ b/helpers_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "github.com/gofiber/fiber/v2/internal/utils" + "github.com/gofiber/fiber/v2/utils" "github.com/valyala/fasthttp" ) diff --git a/middleware/basicauth/basicauth.go b/middleware/basicauth/basicauth.go index 89fe57a7..2100659f 100644 --- a/middleware/basicauth/basicauth.go +++ b/middleware/basicauth/basicauth.go @@ -5,7 +5,7 @@ import ( "strings" "github.com/gofiber/fiber/v2" - "github.com/gofiber/fiber/v2/internal/utils" + "github.com/gofiber/fiber/v2/utils" ) // Config defines the config for middleware. diff --git a/middleware/basicauth/basicauth_test.go b/middleware/basicauth/basicauth_test.go index d28c73c4..2becceae 100644 --- a/middleware/basicauth/basicauth_test.go +++ b/middleware/basicauth/basicauth_test.go @@ -9,7 +9,7 @@ import ( b64 "encoding/base64" "github.com/gofiber/fiber/v2" - "github.com/gofiber/fiber/v2/internal/utils" + "github.com/gofiber/fiber/v2/utils" ) func Test_Middleware_BasicAuth(t *testing.T) { diff --git a/middleware/compress/compress_test.go b/middleware/compress/compress_test.go index 9753f932..66aa64f5 100644 --- a/middleware/compress/compress_test.go +++ b/middleware/compress/compress_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/gofiber/fiber/v2" - "github.com/gofiber/fiber/v2/internal/utils" + "github.com/gofiber/fiber/v2/utils" ) var filedata []byte diff --git a/middleware/cors/cors_test.go b/middleware/cors/cors_test.go index 2cab982d..1f7081b1 100644 --- a/middleware/cors/cors_test.go +++ b/middleware/cors/cors_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/gofiber/fiber/v2" - "github.com/gofiber/fiber/v2/internal/utils" + "github.com/gofiber/fiber/v2/utils" "github.com/valyala/fasthttp" ) diff --git a/middleware/csrf/csrf.go b/middleware/csrf/csrf.go index 7e1e112b..ad03ef46 100644 --- a/middleware/csrf/csrf.go +++ b/middleware/csrf/csrf.go @@ -7,7 +7,7 @@ import ( "time" "github.com/gofiber/fiber/v2" - "github.com/gofiber/fiber/v2/internal/utils" + "github.com/gofiber/fiber/v2/utils" ) // Config defines the config for middleware. diff --git a/middleware/csrf/csrf_test.go b/middleware/csrf/csrf_test.go index d3eb7110..79b6a085 100644 --- a/middleware/csrf/csrf_test.go +++ b/middleware/csrf/csrf_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/gofiber/fiber/v2" - "github.com/gofiber/fiber/v2/internal/utils" + "github.com/gofiber/fiber/v2/utils" "github.com/valyala/fasthttp" ) diff --git a/middleware/favicon/favicon_test.go b/middleware/favicon/favicon_test.go index fe308c9d..78cf63a4 100644 --- a/middleware/favicon/favicon_test.go +++ b/middleware/favicon/favicon_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/gofiber/fiber/v2" - "github.com/gofiber/fiber/v2/internal/utils" + "github.com/gofiber/fiber/v2/utils" "github.com/valyala/fasthttp" ) diff --git a/middleware/filesystem/filesystem_test.go b/middleware/filesystem/filesystem_test.go index 687461e7..7c0661a4 100644 --- a/middleware/filesystem/filesystem_test.go +++ b/middleware/filesystem/filesystem_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/gofiber/fiber/v2" - "github.com/gofiber/fiber/v2/internal/utils" + "github.com/gofiber/fiber/v2/utils" ) // go test -run Test_FileSystem diff --git a/middleware/limiter/limiter_test.go b/middleware/limiter/limiter_test.go index 9c818d00..b330c5a5 100644 --- a/middleware/limiter/limiter_test.go +++ b/middleware/limiter/limiter_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "github.com/gofiber/fiber/v2/internal/utils" + "github.com/gofiber/fiber/v2/utils" "github.com/gofiber/fiber/v2" "github.com/valyala/fasthttp" diff --git a/middleware/logger/logger__test.go b/middleware/logger/logger__test.go index 5779570d..1bb797c8 100644 --- a/middleware/logger/logger__test.go +++ b/middleware/logger/logger__test.go @@ -7,7 +7,7 @@ import ( "github.com/gofiber/fiber/v2" "github.com/gofiber/fiber/v2/internal/bytebufferpool" - "github.com/gofiber/fiber/v2/internal/utils" + "github.com/gofiber/fiber/v2/utils" ) // go test -run Test_Logger diff --git a/middleware/proxy/proxy_test.go b/middleware/proxy/proxy_test.go index 8a434e01..c45d72c1 100644 --- a/middleware/proxy/proxy_test.go +++ b/middleware/proxy/proxy_test.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/gofiber/fiber/v2" - "github.com/gofiber/fiber/v2/internal/utils" + "github.com/gofiber/fiber/v2/utils" ) // go test -run Test_Proxy_Empty_Host diff --git a/middleware/recover/recover_test.go b/middleware/recover/recover_test.go index 07db4b4f..05e7c34a 100644 --- a/middleware/recover/recover_test.go +++ b/middleware/recover/recover_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/gofiber/fiber/v2" - "github.com/gofiber/fiber/v2/internal/utils" + "github.com/gofiber/fiber/v2/utils" ) // go test -run Test_Recover diff --git a/middleware/requestid/requestid.go b/middleware/requestid/requestid.go index 0e13158e..68f6faff 100644 --- a/middleware/requestid/requestid.go +++ b/middleware/requestid/requestid.go @@ -2,7 +2,7 @@ package requestid import ( "github.com/gofiber/fiber/v2" - "github.com/gofiber/fiber/v2/internal/utils" + "github.com/gofiber/fiber/v2/utils" ) // Config defines the config for middleware. diff --git a/middleware/requestid/requestid_test.go b/middleware/requestid/requestid_test.go index 2166b9a4..84db2d19 100644 --- a/middleware/requestid/requestid_test.go +++ b/middleware/requestid/requestid_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/gofiber/fiber/v2" - "github.com/gofiber/fiber/v2/internal/utils" + "github.com/gofiber/fiber/v2/utils" ) // go test -run Test_RequestID diff --git a/path.go b/path.go index c32680c7..d8a15e70 100644 --- a/path.go +++ b/path.go @@ -10,7 +10,7 @@ import ( "strconv" "strings" - "github.com/gofiber/fiber/v2/internal/utils" + "github.com/gofiber/fiber/v2/utils" ) // routeParser holds the path segments and param names diff --git a/path_test.go b/path_test.go index 664c2fcf..8bfcc232 100644 --- a/path_test.go +++ b/path_test.go @@ -8,7 +8,7 @@ import ( "fmt" "testing" - "github.com/gofiber/fiber/v2/internal/utils" + "github.com/gofiber/fiber/v2/utils" ) // go test -race -run Test_Path_parseRoute diff --git a/prefork_test.go b/prefork_test.go index 5d09da04..0f162f2b 100644 --- a/prefork_test.go +++ b/prefork_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/gofiber/fiber/v2/internal/utils" + "github.com/gofiber/fiber/v2/utils" ) func Test_App_Prefork_Child_Process(t *testing.T) { diff --git a/router.go b/router.go index 4fb87339..aac9008d 100644 --- a/router.go +++ b/router.go @@ -10,7 +10,7 @@ import ( "strings" "time" - "github.com/gofiber/fiber/v2/internal/utils" + "github.com/gofiber/fiber/v2/utils" "github.com/valyala/fasthttp" ) diff --git a/router_test.go b/router_test.go index bcfed236..50c23635 100644 --- a/router_test.go +++ b/router_test.go @@ -13,7 +13,7 @@ import ( "net/http/httptest" "testing" - "github.com/gofiber/fiber/v2/internal/utils" + "github.com/gofiber/fiber/v2/utils" "github.com/valyala/fasthttp" ) diff --git a/internal/utils/README.md b/utils/README.md similarity index 100% rename from internal/utils/README.md rename to utils/README.md diff --git a/internal/utils/utils.go b/utils/utils.go similarity index 100% rename from internal/utils/utils.go rename to utils/utils.go diff --git a/internal/utils/utils_test.go b/utils/utils_test.go similarity index 98% rename from internal/utils/utils_test.go rename to utils/utils_test.go index 494521a5..46ebcda7 100644 --- a/internal/utils/utils_test.go +++ b/utils/utils_test.go @@ -16,9 +16,9 @@ import ( func Test_Utils_FunctionName(t *testing.T) { t.Parallel() - AssertEqual(t, "github.com/gofiber/fiber/v2/internal/utils.Test_Utils_UUID", FunctionName(Test_Utils_UUID)) + AssertEqual(t, "github.com/gofiber/fiber/v2/utils.Test_Utils_UUID", FunctionName(Test_Utils_UUID)) - AssertEqual(t, "github.com/gofiber/fiber/v2/internal/utils.Test_Utils_FunctionName.func1", FunctionName(func() {})) + AssertEqual(t, "github.com/gofiber/fiber/v2/utils.Test_Utils_FunctionName.func1", FunctionName(func() {})) var dummyint = 20 AssertEqual(t, "int", FunctionName(dummyint))