chore: upgrade to chi v5

hazzik · hazzik · commit ed5d0c2bb4a5 · 2025-03-13T16:20:18.000+10:00
diff --git a/exp/services/recoverysigner/internal/serve/account_delete_test.go b/exp/services/recoverysigner/internal/serve/account_delete_test.go
@@ -7,7 +7,7 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	"github.com/go-chi/chi"
+	"github.com/go-chi/chi/v5"
 	"github.com/stellar/go/exp/services/recoverysigner/internal/account"
 	"github.com/stellar/go/exp/services/recoverysigner/internal/db/dbtest"
 	"github.com/stellar/go/exp/services/recoverysigner/internal/serve/auth"
diff --git a/exp/services/recoverysigner/internal/serve/account_get_test.go b/exp/services/recoverysigner/internal/serve/account_get_test.go
@@ -7,7 +7,7 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	"github.com/go-chi/chi"
+	"github.com/go-chi/chi/v5"
 	"github.com/stellar/go/exp/services/recoverysigner/internal/account"
 	"github.com/stellar/go/exp/services/recoverysigner/internal/db/dbtest"
 	"github.com/stellar/go/exp/services/recoverysigner/internal/serve/auth"
diff --git a/exp/services/recoverysigner/internal/serve/account_post_test.go b/exp/services/recoverysigner/internal/serve/account_post_test.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/go-chi/chi"
+	"github.com/go-chi/chi/v5"
 	"github.com/stellar/go/exp/services/recoverysigner/internal/account"
 	"github.com/stellar/go/exp/services/recoverysigner/internal/db/dbtest"
 	"github.com/stellar/go/exp/services/recoverysigner/internal/serve/auth"
diff --git a/exp/services/recoverysigner/internal/serve/account_put_test.go b/exp/services/recoverysigner/internal/serve/account_put_test.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/go-chi/chi"
+	"github.com/go-chi/chi/v5"
 	"github.com/stellar/go/exp/services/recoverysigner/internal/account"
 	"github.com/stellar/go/exp/services/recoverysigner/internal/db/dbtest"
 	"github.com/stellar/go/exp/services/recoverysigner/internal/serve/auth"
diff --git a/exp/services/recoverysigner/internal/serve/account_sign_signing_address_test.go b/exp/services/recoverysigner/internal/serve/account_sign_signing_address_test.go
@@ -10,7 +10,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/go-chi/chi"
+	"github.com/go-chi/chi/v5"
 	"github.com/stellar/go/exp/services/recoverysigner/internal/account"
 	"github.com/stellar/go/exp/services/recoverysigner/internal/db/dbtest"
 	"github.com/stellar/go/exp/services/recoverysigner/internal/serve/auth"
diff --git a/exp/services/recoverysigner/internal/serve/serve.go b/exp/services/recoverysigner/internal/serve/serve.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 
 	firebaseauth "firebase.google.com/go/auth"
-	"github.com/go-chi/chi"
+	"github.com/go-chi/chi/v5"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/stellar/go/exp/services/recoverysigner/internal/account"
 	"github.com/stellar/go/exp/services/recoverysigner/internal/db"
diff --git a/go.mod b/go.mod
@@ -17,7 +17,7 @@ require (
 	github.com/djherbis/fscache v0.10.1
 	github.com/elazarl/go-bindata-assetfs v1.0.1
 	github.com/getsentry/raven-go v0.2.0
-	github.com/go-chi/chi v4.1.2+incompatible
+	github.com/go-chi/chi/v5 v5.2.1
 	github.com/go-errors/errors v1.5.1
 	github.com/golang-jwt/jwt v3.2.2+incompatible
 	github.com/google/uuid v1.6.0
diff --git a/go.sum b/go.sum
@@ -160,8 +160,8 @@ github.com/gavv/monotime v0.0.0-20161010190848-47d58efa6955 h1:gmtGRvSexPU4B1T/y
 github.com/gavv/monotime v0.0.0-20161010190848-47d58efa6955/go.mod h1:vmp8DIyckQMXOPl0AQVHt+7n5h7Gb7hS6CUydiV8QeA=
 github.com/getsentry/raven-go v0.2.0 h1:no+xWJRb5ZI7eE8TWgIq1jLulQiIoLG0IfYxv5JYMGs=
 github.com/getsentry/raven-go v0.2.0/go.mod h1:KungGk8q33+aIAZUIVWZDr2OfAEBsO49PX4NzFV5kcQ=
-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.2.1 h1:KOIHODQj58PmL80G2Eak4WdvUzjSJSm0vG72crDCqb8=
+github.com/go-chi/chi/v5 v5.2.1/go.mod h1:L2yAIGWB3H+phAw1NxKwWM+7eUH/lU8pOMm5hHcoops=
 github.com/go-errors/errors v1.5.1 h1:ZwEMSLRCapFLflTpT7NKaAc7ukJ8ZPEjzlxt8rPN8bk=
 github.com/go-errors/errors v1.5.1/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og=
 github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
diff --git a/services/federation/main.go b/services/federation/main.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/go-chi/chi"
+	"github.com/go-chi/chi/v5"
 	"github.com/spf13/cobra"
 	"github.com/stellar/go/handlers/federation"
 	"github.com/stellar/go/support/app"
diff --git a/services/friendbot/main.go b/services/friendbot/main.go
@@ -6,7 +6,7 @@ import (
 	stdhttp "net/http"
 	"os"
 
-	"github.com/go-chi/chi"
+	"github.com/go-chi/chi/v5"
 	"github.com/spf13/cobra"
 
 	"github.com/stellar/go/services/friendbot/internal"
diff --git a/services/horizon/internal/actions/helpers.go b/services/horizon/internal/actions/helpers.go
@@ -13,7 +13,7 @@ import (
 	"unicode/utf8"
 
 	"github.com/asaskevich/govalidator"
-	"github.com/go-chi/chi"
+	"github.com/go-chi/chi/v5"
 	"github.com/gorilla/schema"
 
 	"github.com/stellar/go/services/horizon/internal/assets"
diff --git a/services/horizon/internal/actions/helpers_test.go b/services/horizon/internal/actions/helpers_test.go
@@ -10,7 +10,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/go-chi/chi"
+	"github.com/go-chi/chi/v5"
 	"github.com/stretchr/testify/assert"
 
 	horizonContext "github.com/stellar/go/services/horizon/internal/context"
diff --git a/services/horizon/internal/actions_path_test.go b/services/horizon/internal/actions_path_test.go
@@ -11,7 +11,7 @@ import (
 
 	"github.com/guregu/null"
 
-	"github.com/go-chi/chi"
+	"github.com/go-chi/chi/v5"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 
diff --git a/services/horizon/internal/hchi/context.go b/services/horizon/internal/hchi/context.go
@@ -5,7 +5,7 @@ package hchi
 import (
 	"context"
 
-	"github.com/go-chi/chi/middleware"
+	"github.com/go-chi/chi/v5/middleware"
 )
 
 // key is an unexported type for keys defined in this package.
diff --git a/services/horizon/internal/hchi/context_test.go b/services/horizon/internal/hchi/context_test.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"testing"
 
-	"github.com/go-chi/chi/middleware"
+	"github.com/go-chi/chi/v5/middleware"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/services/horizon/internal/httpx/middleware.go b/services/horizon/internal/httpx/middleware.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/go-chi/chi/middleware"
+	"github.com/go-chi/chi/v5/middleware"
 	"github.com/prometheus/client_golang/prometheus"
 
 	"github.com/stellar/go/services/horizon/internal/actions"
diff --git a/services/horizon/internal/httpx/router.go b/services/horizon/internal/httpx/router.go
@@ -10,8 +10,8 @@ import (
 
 	"github.com/stellar/go/clients/stellarcore"
 
-	"github.com/go-chi/chi"
-	chimiddleware "github.com/go-chi/chi/middleware"
+	"github.com/go-chi/chi/v5"
+	chimiddleware "github.com/go-chi/chi/v5/middleware"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	"github.com/rs/cors"
diff --git a/services/horizon/internal/httpx/stream_handler_test.go b/services/horizon/internal/httpx/stream_handler_test.go
@@ -12,7 +12,7 @@ import (
 	"sync"
 	"testing"
 
-	"github.com/go-chi/chi"
+	"github.com/go-chi/chi/v5"
 	"github.com/stretchr/testify/mock"
 
 	"github.com/stellar/go/services/horizon/internal/actions"
diff --git a/services/horizon/internal/middleware_test.go b/services/horizon/internal/middleware_test.go
@@ -9,7 +9,7 @@ import (
 	"strconv"
 	"testing"
 
-	"github.com/go-chi/chi"
+	"github.com/go-chi/chi/v5"
 	"github.com/stellar/throttled"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/suite"
diff --git a/services/horizon/internal/test/http.go b/services/horizon/internal/test/http.go
@@ -6,7 +6,7 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/go-chi/chi"
+	"github.com/go-chi/chi/v5"
 )
 
 type RequestHelper interface {
diff --git a/services/regulated-assets-approval-server/internal/serve/api_kyc_status_test.go b/services/regulated-assets-approval-server/internal/serve/api_kyc_status_test.go
@@ -12,7 +12,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/go-chi/chi"
+	"github.com/go-chi/chi/v5"
 	"github.com/google/uuid"
 	"github.com/stellar/go/keypair"
 	"github.com/stellar/go/services/regulated-assets-approval-server/internal/db/dbtest"
diff --git a/services/regulated-assets-approval-server/internal/serve/api_tx_approve_test.go b/services/regulated-assets-approval-server/internal/serve/api_tx_approve_test.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/go-chi/chi"
+	"github.com/go-chi/chi/v5"
 	"github.com/stellar/go/amount"
 	"github.com/stellar/go/clients/horizonclient"
 	"github.com/stellar/go/keypair"
diff --git a/services/regulated-assets-approval-server/internal/serve/friendbot_test.go b/services/regulated-assets-approval-server/internal/serve/friendbot_test.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/go-chi/chi"
+	"github.com/go-chi/chi/v5"
 	"github.com/stellar/go/clients/horizonclient"
 	"github.com/stellar/go/network"
 	"github.com/stellar/go/protocols/horizon"
diff --git a/services/regulated-assets-approval-server/internal/serve/serve.go b/services/regulated-assets-approval-server/internal/serve/serve.go
@@ -7,8 +7,8 @@ import (
 	"path"
 	"time"
 
-	"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/stellar/go/amount"
 	"github.com/stellar/go/clients/horizonclient"
 	"github.com/stellar/go/keypair"
diff --git a/services/regulated-assets-approval-server/internal/serve/toml_test.go b/services/regulated-assets-approval-server/internal/serve/toml_test.go
@@ -7,7 +7,7 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	"github.com/go-chi/chi"
+	"github.com/go-chi/chi/v5"
 	"github.com/stellar/go/network"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
diff --git a/services/ticker/internal/graphql_test.go b/services/ticker/internal/graphql_test.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/go-chi/chi"
+	"github.com/go-chi/chi/v5"
 
 	"github.com/stellar/go/services/ticker/internal/gql"
 	"github.com/stellar/go/services/ticker/internal/tickerdb/tickerdbtest"
diff --git a/support/http/httpdecode/httpdecode.go b/support/http/httpdecode/httpdecode.go
@@ -5,7 +5,7 @@ import (
 	"mime"
 	"net/http"
 
-	"github.com/go-chi/chi"
+	"github.com/go-chi/chi/v5"
 	"github.com/gorilla/schema"
 	"github.com/stellar/go/support/errors"
 )
diff --git a/support/http/httpdecode/httpdecode_test.go b/support/http/httpdecode/httpdecode_test.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/go-chi/chi"
+	"github.com/go-chi/chi/v5"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/support/http/logging_middleware.go b/support/http/logging_middleware.go
@@ -6,8 +6,8 @@ import (
 	"strings"
 	"time"
 
-	"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/stellar/go/support/http/mutil"
 	"github.com/stellar/go/support/log"
diff --git a/support/http/logging_middleware_test.go b/support/http/logging_middleware_test.go
@@ -4,8 +4,8 @@ import (
 	stdhttp "net/http"
 	"testing"
 
-	"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/stretchr/testify/assert"
 
 	"github.com/stellar/go/support/http/httptest"
diff --git a/support/http/mux.go b/support/http/mux.go
@@ -1,8 +1,8 @@
 package http
 
 import (
-	"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/rs/cors"
 
 	"github.com/stellar/go/support/log"

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ package hchi`
`5`	`5`	`import (`
`6`	`6`	`"context"`
`7`	`7`
`8`		`- "github.com/go-chi/chi/middleware"`
	`8`	`+ "github.com/go-chi/chi/v5/middleware"`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`// key is an unexported type for keys defined in this package.`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import (`
`4`	`4`	`"context"`
`5`	`5`	`"testing"`
`6`	`6`
`7`		`- "github.com/go-chi/chi/middleware"`
	`7`	`+ "github.com/go-chi/chi/v5/middleware"`
`8`	`8`	`"github.com/stretchr/testify/assert"`
`9`	`9`	`)`
`10`	`10`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import (`
`6`	`6`	`"net/url"`
`7`	`7`	`"strings"`
`8`	`8`
`9`		`- "github.com/go-chi/chi"`
	`9`	`+ "github.com/go-chi/chi/v5"`
`10`	`10`	`)`
`11`	`11`
`12`	`12`	`type RequestHelper interface {`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import (`
`5`	`5`	`"mime"`
`6`	`6`	`"net/http"`
`7`	`7`
`8`		`- "github.com/go-chi/chi"`
	`8`	`+ "github.com/go-chi/chi/v5"`
`9`	`9`	`"github.com/gorilla/schema"`
`10`	`10`	`"github.com/stellar/go/support/errors"`
`11`	`11`	`)`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ import (`
`7`	`7`	`"strings"`
`8`	`8`	`"testing"`
`9`	`9`
`10`		`- "github.com/go-chi/chi"`
	`10`	`+ "github.com/go-chi/chi/v5"`
`11`	`11`	`"github.com/stretchr/testify/assert"`
`12`	`12`	`"github.com/stretchr/testify/require"`
`13`	`13`	`)`