From 58f3e439dd8547fe237398f5ec8567d88913cd16 Mon Sep 17 00:00:00 2001 From: Jonathan Yu Date: Sun, 30 Jan 2022 19:13:14 -0800 Subject: [PATCH] chore: upgrade from chi 1.5.4 to 5.0.7 (#109) --- coderd/coderd.go | 2 +- go.mod | 2 +- go.sum | 4 ++-- httpmw/organizationparam.go | 2 +- httpmw/organizationparam_test.go | 2 +- httpmw/projectparam.go | 2 +- httpmw/projectparam_test.go | 2 +- httpmw/userparam.go | 2 +- httpmw/userparam_test.go | 2 +- httpmw/workspaceparam.go | 2 +- httpmw/workspaceparam_test.go | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/coderd/coderd.go b/coderd/coderd.go index aa624c4cc6..b6c01e3e30 100644 --- a/coderd/coderd.go +++ b/coderd/coderd.go @@ -3,7 +3,7 @@ package coderd import ( "net/http" - "github.com/go-chi/chi" + "github.com/go-chi/chi/v5" "cdr.dev/slog" "github.com/coder/coder/database" diff --git a/go.mod b/go.mod index 8a204cc59a..ccb270022d 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ replace github.com/hashicorp/terraform-config-inspect => github.com/kylecarbs/te require ( cdr.dev/slog v1.4.1 - github.com/go-chi/chi v1.5.4 + github.com/go-chi/chi/v5 v5.0.7 github.com/go-chi/render v1.0.1 github.com/go-playground/validator/v10 v10.10.0 github.com/golang-migrate/migrate/v4 v4.15.1 diff --git a/go.sum b/go.sum index 85350bdbd9..095be72dc4 100644 --- a/go.sum +++ b/go.sum @@ -445,8 +445,8 @@ github.com/garyburd/redigo v0.0.0-20150301180006-535138d7bcd7/go.mod h1:NR3MbYis github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= -github.com/go-chi/chi v1.5.4 h1:QHdzF2szwjqVV4wmByUnTcsbIg7UGaQ0tPF2t5GcAIs= -github.com/go-chi/chi v1.5.4/go.mod h1:uaf8YgoFazUOkPBG7fxPftUylNumIev9awIWOENIuEg= +github.com/go-chi/chi/v5 v5.0.7 h1:rDTPXLDHGATaeHvVlLcR4Qe0zftYethFucbjVQ1PxU8= +github.com/go-chi/chi/v5 v5.0.7/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8= github.com/go-chi/render v1.0.1 h1:4/5tis2cKaNdnv9zFLfXzcquC9HbeZgCnxGnKrltBS8= github.com/go-chi/render v1.0.1/go.mod h1:pq4Rr7HbnsdaeHagklXub+p6Wd16Af5l9koip1OvJns= github.com/go-fonts/dejavu v0.1.0/go.mod h1:4Wt4I4OU2Nq9asgDCteaAaWZOV24E+0/Pwo0gppep4g= diff --git a/httpmw/organizationparam.go b/httpmw/organizationparam.go index 62f46e60d7..a85903924c 100644 --- a/httpmw/organizationparam.go +++ b/httpmw/organizationparam.go @@ -7,7 +7,7 @@ import ( "fmt" "net/http" - "github.com/go-chi/chi" + "github.com/go-chi/chi/v5" "github.com/coder/coder/database" "github.com/coder/coder/httpapi" diff --git a/httpmw/organizationparam_test.go b/httpmw/organizationparam_test.go index b1b43356a9..3fb387909c 100644 --- a/httpmw/organizationparam_test.go +++ b/httpmw/organizationparam_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "github.com/go-chi/chi" + "github.com/go-chi/chi/v5" "github.com/google/uuid" "github.com/stretchr/testify/require" diff --git a/httpmw/projectparam.go b/httpmw/projectparam.go index 136f013a1a..099cc01d15 100644 --- a/httpmw/projectparam.go +++ b/httpmw/projectparam.go @@ -7,7 +7,7 @@ import ( "fmt" "net/http" - "github.com/go-chi/chi" + "github.com/go-chi/chi/v5" "github.com/coder/coder/database" "github.com/coder/coder/httpapi" diff --git a/httpmw/projectparam_test.go b/httpmw/projectparam_test.go index 26fbcfb827..866fe3a9c3 100644 --- a/httpmw/projectparam_test.go +++ b/httpmw/projectparam_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "github.com/go-chi/chi" + "github.com/go-chi/chi/v5" "github.com/google/uuid" "github.com/stretchr/testify/require" diff --git a/httpmw/userparam.go b/httpmw/userparam.go index f5f1563036..0ce3f67144 100644 --- a/httpmw/userparam.go +++ b/httpmw/userparam.go @@ -5,7 +5,7 @@ import ( "fmt" "net/http" - "github.com/go-chi/chi" + "github.com/go-chi/chi/v5" "github.com/coder/coder/database" "github.com/coder/coder/httpapi" diff --git a/httpmw/userparam_test.go b/httpmw/userparam_test.go index 867833ffbd..4a83084d01 100644 --- a/httpmw/userparam_test.go +++ b/httpmw/userparam_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "github.com/go-chi/chi" + "github.com/go-chi/chi/v5" "github.com/stretchr/testify/require" "github.com/coder/coder/database" diff --git a/httpmw/workspaceparam.go b/httpmw/workspaceparam.go index 07d879862b..dff494a24a 100644 --- a/httpmw/workspaceparam.go +++ b/httpmw/workspaceparam.go @@ -7,7 +7,7 @@ import ( "fmt" "net/http" - "github.com/go-chi/chi" + "github.com/go-chi/chi/v5" "github.com/coder/coder/database" "github.com/coder/coder/httpapi" diff --git a/httpmw/workspaceparam_test.go b/httpmw/workspaceparam_test.go index 906ffd9de2..39dd156319 100644 --- a/httpmw/workspaceparam_test.go +++ b/httpmw/workspaceparam_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "github.com/go-chi/chi" + "github.com/go-chi/chi/v5" "github.com/google/uuid" "github.com/stretchr/testify/require"