From 6acb54b0f5aa4b680ed8b3dbe1f14dce062b4d05 Mon Sep 17 00:00:00 2001 From: Abel Tay Date: Mon, 1 Mar 2021 10:39:02 +0800 Subject: [PATCH] fix(deps): update go-chi packages to v5 --- go.mod | 4 ++-- go.sum | 10 ++++------ pkg/s3-proxy/authx/authentication/client.go | 2 +- pkg/s3-proxy/authx/authentication/oidc.go | 2 +- pkg/s3-proxy/server/hostrouter.go | 2 +- pkg/s3-proxy/server/hostrouter_test.go | 2 +- pkg/s3-proxy/server/internal-server.go | 4 ++-- pkg/s3-proxy/server/middlewares/improve-tracing.go | 2 +- pkg/s3-proxy/server/middlewares/log-middleware.go | 2 +- pkg/s3-proxy/server/server.go | 4 ++-- 10 files changed, 16 insertions(+), 18 deletions(-) diff --git a/go.mod b/go.mod index ba4f65c7..adb4a8d2 100644 --- a/go.mod +++ b/go.mod @@ -10,9 +10,9 @@ require ( github.com/dimiro1/health v0.0.0-20191019130555-c5cbb4d46ffc github.com/dustin/go-humanize v1.0.0 github.com/fsnotify/fsnotify v1.4.9 - github.com/go-chi/chi v4.1.2+incompatible + github.com/go-chi/chi/v5 v5.0.0 github.com/go-chi/cors v1.1.1 - github.com/go-chi/httptracer v0.2.1 + github.com/go-chi/httptracer v0.3.0 github.com/go-playground/validator/v10 v10.4.1 github.com/gobwas/glob v0.2.3 github.com/golang/mock v1.5.0 diff --git a/go.sum b/go.sum index d1f1e7d3..787a1ec6 100644 --- a/go.sum +++ b/go.sum @@ -128,13 +128,12 @@ github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWo github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/garyburd/redigo v0.0.0-20160302234602-4ed1111375cb/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= -github.com/go-chi/chi v1.5.1/go.mod h1:REp24E+25iKvxgeTfHmdUoL5x15kBiDBlnIl5bCwe2k= -github.com/go-chi/chi v4.1.2+incompatible h1:fGFk2Gmi/YKXk0OmGfBh0WgmN3XB8lVnEyNz34tQRec= -github.com/go-chi/chi v4.1.2+incompatible/go.mod h1:eB3wogJHnLi3x/kFX2A+IbTBlXxmMeXJVKy9tTv1XzQ= +github.com/go-chi/chi/v5 v5.0.0 h1:DBPx88FjZJH3FsICfDAfIfnb7XxKIYVGG6lOPlhENAg= +github.com/go-chi/chi/v5 v5.0.0/go.mod h1:BBug9lr0cqtdAhsu6R4AAdvufI0/XBzAQSsUqJpoZOs= github.com/go-chi/cors v1.1.1 h1:eHuqxsIw89iXcWnWUN8R72JMibABJTN/4IOYI5WERvw= github.com/go-chi/cors v1.1.1/go.mod h1:K2Yje0VW/SJzxiyMYu6iPQYa7hMjQX2i/F491VChg1I= -github.com/go-chi/httptracer v0.2.1 h1:dpWyGxyLFSP2iZiqVpBc/SAavrjRH3BrKSfDhmerbEE= -github.com/go-chi/httptracer v0.2.1/go.mod h1:wqyFHrAypiiDqXDUBDSX+75wsxqhHE4GDaWunCvCGJQ= +github.com/go-chi/httptracer v0.3.0 h1:dMkFM9MlP9S3af2aXYv8DOIvrLChx9WLMGRr174BVfc= +github.com/go-chi/httptracer v0.3.0/go.mod h1:x0pcrlMfaOnG1mgpklalK42B2lv2zTPbQVxORZLgzo8= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= @@ -352,7 +351,6 @@ github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go github.com/opentracing/basictracer-go v1.0.0/go.mod h1:QfBfYuafItcjQuMwinw9GhYKwFXS9KnPs5lxoYwgW74= github.com/opentracing/opentracing-go v1.0.2/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= -github.com/opentracing/opentracing-go v1.1.1-0.20200408192505-9b906502e23c/go.mod h1:C+iumr2ni468+1jvcHXLCdqP9uQnoQbdX93F3aWahWU= github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs= github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc= github.com/openzipkin-contrib/zipkin-go-opentracing v0.4.5/go.mod h1:/wsWhb9smxSfWAKL3wpBW7V8scJMt8N8gnaMCS9E/cA= diff --git a/pkg/s3-proxy/authx/authentication/client.go b/pkg/s3-proxy/authx/authentication/client.go index 4580c295..a0df63c7 100644 --- a/pkg/s3-proxy/authx/authentication/client.go +++ b/pkg/s3-proxy/authx/authentication/client.go @@ -4,7 +4,7 @@ import ( "net/http" oidc "github.com/coreos/go-oidc/v3/oidc" - "github.com/go-chi/chi" + "github.com/go-chi/chi/v5" "github.com/oxyno-zeta/s3-proxy/pkg/s3-proxy/config" "github.com/oxyno-zeta/s3-proxy/pkg/s3-proxy/metrics" ) diff --git a/pkg/s3-proxy/authx/authentication/oidc.go b/pkg/s3-proxy/authx/authentication/oidc.go index ebc3102d..51ea1181 100644 --- a/pkg/s3-proxy/authx/authentication/oidc.go +++ b/pkg/s3-proxy/authx/authentication/oidc.go @@ -9,7 +9,7 @@ import ( "strings" oidc "github.com/coreos/go-oidc/v3/oidc" - "github.com/go-chi/chi" + "github.com/go-chi/chi/v5" "github.com/oxyno-zeta/s3-proxy/pkg/s3-proxy/authx/models" "github.com/oxyno-zeta/s3-proxy/pkg/s3-proxy/config" "github.com/oxyno-zeta/s3-proxy/pkg/s3-proxy/log" diff --git a/pkg/s3-proxy/server/hostrouter.go b/pkg/s3-proxy/server/hostrouter.go index 87bd5a6e..29746da3 100644 --- a/pkg/s3-proxy/server/hostrouter.go +++ b/pkg/s3-proxy/server/hostrouter.go @@ -4,7 +4,7 @@ import ( "net/http" "strings" - "github.com/go-chi/chi" + "github.com/go-chi/chi/v5" "github.com/gobwas/glob" "github.com/oxyno-zeta/s3-proxy/pkg/s3-proxy/server/utils" ) diff --git a/pkg/s3-proxy/server/hostrouter_test.go b/pkg/s3-proxy/server/hostrouter_test.go index 401aefb8..6382f040 100644 --- a/pkg/s3-proxy/server/hostrouter_test.go +++ b/pkg/s3-proxy/server/hostrouter_test.go @@ -7,7 +7,7 @@ import ( "net/http/httptest" "testing" - "github.com/go-chi/chi" + "github.com/go-chi/chi/v5" "github.com/stretchr/testify/assert" ) diff --git a/pkg/s3-proxy/server/internal-server.go b/pkg/s3-proxy/server/internal-server.go index cfab57ff..e640a97f 100644 --- a/pkg/s3-proxy/server/internal-server.go +++ b/pkg/s3-proxy/server/internal-server.go @@ -5,8 +5,8 @@ import ( "strconv" "github.com/dimiro1/health" - "github.com/go-chi/chi" - "github.com/go-chi/chi/middleware" + "github.com/go-chi/chi/v5" + "github.com/go-chi/chi/v5/middleware" "github.com/oxyno-zeta/s3-proxy/pkg/s3-proxy/config" "github.com/oxyno-zeta/s3-proxy/pkg/s3-proxy/log" "github.com/oxyno-zeta/s3-proxy/pkg/s3-proxy/metrics" diff --git a/pkg/s3-proxy/server/middlewares/improve-tracing.go b/pkg/s3-proxy/server/middlewares/improve-tracing.go index 2fceb6cd..5eb5c263 100644 --- a/pkg/s3-proxy/server/middlewares/improve-tracing.go +++ b/pkg/s3-proxy/server/middlewares/improve-tracing.go @@ -3,7 +3,7 @@ package middlewares import ( "net/http" - "github.com/go-chi/chi/middleware" + "github.com/go-chi/chi/v5/middleware" "github.com/oxyno-zeta/s3-proxy/pkg/s3-proxy/server/utils" "github.com/oxyno-zeta/s3-proxy/pkg/s3-proxy/tracing" ) diff --git a/pkg/s3-proxy/server/middlewares/log-middleware.go b/pkg/s3-proxy/server/middlewares/log-middleware.go index d97fa36b..8674ac0f 100644 --- a/pkg/s3-proxy/server/middlewares/log-middleware.go +++ b/pkg/s3-proxy/server/middlewares/log-middleware.go @@ -5,7 +5,7 @@ import ( "net/http" "time" - "github.com/go-chi/chi/middleware" + "github.com/go-chi/chi/v5/middleware" "github.com/oxyno-zeta/s3-proxy/pkg/s3-proxy/log" "github.com/oxyno-zeta/s3-proxy/pkg/s3-proxy/server/utils" "github.com/oxyno-zeta/s3-proxy/pkg/s3-proxy/tracing" diff --git a/pkg/s3-proxy/server/server.go b/pkg/s3-proxy/server/server.go index 1659d1b8..519af20e 100644 --- a/pkg/s3-proxy/server/server.go +++ b/pkg/s3-proxy/server/server.go @@ -4,8 +4,8 @@ import ( "net/http" "strconv" - "github.com/go-chi/chi" - "github.com/go-chi/chi/middleware" + "github.com/go-chi/chi/v5" + "github.com/go-chi/chi/v5/middleware" "github.com/go-chi/cors" "github.com/go-chi/httptracer" "github.com/oxyno-zeta/s3-proxy/pkg/s3-proxy/authx/authentication"