From ab47b48da2c06ae3a88bfa58d4beb06e9c990203 Mon Sep 17 00:00:00 2001 From: William Collishaw Date: Fri, 27 Feb 2026 15:10:38 -0700 Subject: [PATCH 1/2] fix: upgrades to go-chi 5.2.5 --- THIRD-PARTY-LICENSES.md | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/THIRD-PARTY-LICENSES.md b/THIRD-PARTY-LICENSES.md index 6852840..2ed7c5f 100644 --- a/THIRD-PARTY-LICENSES.md +++ b/THIRD-PARTY-LICENSES.md @@ -57,8 +57,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ## github.com/go-chi/chi/v5 * Name: github.com/go-chi/chi/v5 -* Version: v5.2.2 -* License: [MIT](https://github.com/go-chi/chi/blob/v5.2.2/LICENSE) +* Version: v5.2.5 +* License: [MIT](https://github.com/go-chi/chi/blob/v5.2.5/LICENSE) ``` Copyright (c) 2015-present Peter Kieltyka (https://github.com/pkieltyka), Google Inc. diff --git a/go.mod b/go.mod index 6f85ee0..6a3cab1 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.25.7 require ( github.com/aws/aws-lambda-go v1.46.0 github.com/go-chi/chi v1.5.5 - github.com/go-chi/chi/v5 v5.2.2 + github.com/go-chi/chi/v5 v5.2.5 github.com/google/uuid v1.6.0 github.com/jessevdk/go-flags v1.5.0 github.com/orcaman/concurrent-map v1.0.0 diff --git a/go.sum b/go.sum index 973da62..2d852cd 100644 --- a/go.sum +++ b/go.sum @@ -5,8 +5,8 @@ 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/go-chi/chi v1.5.5 h1:vOB/HbEMt9QqBqErz07QehcOKHaWFtuj87tTDVz2qXE= github.com/go-chi/chi v1.5.5/go.mod h1:C9JqLr3tIYjDOZpzn+BCuxY8z8vmca43EeMgyZt7irw= -github.com/go-chi/chi/v5 v5.2.2 h1:CMwsvRVTbXVytCk1Wd72Zy1LAsAh9GxMmSNWLHCG618= -github.com/go-chi/chi/v5 v5.2.2/go.mod h1:L2yAIGWB3H+phAw1NxKwWM+7eUH/lU8pOMm5hHcoops= +github.com/go-chi/chi/v5 v5.2.5 h1:Eg4myHZBjyvJmAFjFvWgrqDTXFyOzjj7YIm3L3mu6Ug= +github.com/go-chi/chi/v5 v5.2.5/go.mod h1:X7Gx4mteadT3eDOMTsXzmI4/rwUpOwBHLpAfupzFJP0= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/jessevdk/go-flags v1.5.0 h1:1jKYvbxEjfUl0fmqTCOfonvskHHXMjBySTLW4y9LFvc= From 1435a9b64dd03ec7122d36c85dbbd69ec307548e Mon Sep 17 00:00:00 2001 From: William Collishaw Date: Fri, 27 Feb 2026 15:21:09 -0700 Subject: [PATCH 2/2] fix: removes usage of deprecated go-chi v1 --- THIRD-PARTY-LICENSES.md | 30 ------------------- go.mod | 1 - go.sum | 2 -- .../aws-lambda-rie/internal/app.go | 2 +- .../rapi/handler/invocationerror.go | 2 +- .../rapi/handler/invocationresponse.go | 2 +- .../rapi/middleware/middleware_test.go | 2 +- .../lambda-managed-instances/rapi/router.go | 2 +- .../lambda-managed-instances/rapi/server.go | 2 +- 9 files changed, 6 insertions(+), 39 deletions(-) diff --git a/THIRD-PARTY-LICENSES.md b/THIRD-PARTY-LICENSES.md index 2ed7c5f..219006f 100644 --- a/THIRD-PARTY-LICENSES.md +++ b/THIRD-PARTY-LICENSES.md @@ -24,36 +24,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ``` -## github.com/go-chi/chi - -* Name: github.com/go-chi/chi -* Version: v1.5.5 -* License: [MIT](https://github.com/go-chi/chi/blob/v1.5.5/LICENSE) - -``` -Copyright (c) 2015-present Peter Kieltyka (https://github.com/pkieltyka), Google Inc. - -MIT License - -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of -the Software, and to permit persons to whom the Software is furnished to do so, -subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS -FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR -COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -``` - ## github.com/go-chi/chi/v5 * Name: github.com/go-chi/chi/v5 diff --git a/go.mod b/go.mod index 6a3cab1..5ae8829 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,6 @@ go 1.25.7 require ( github.com/aws/aws-lambda-go v1.46.0 - github.com/go-chi/chi v1.5.5 github.com/go-chi/chi/v5 v5.2.5 github.com/google/uuid v1.6.0 github.com/jessevdk/go-flags v1.5.0 diff --git a/go.sum b/go.sum index 2d852cd..96c366f 100644 --- a/go.sum +++ b/go.sum @@ -3,8 +3,6 @@ github.com/aws/aws-lambda-go v1.46.0/go.mod h1:dpMpZgvWx5vuQJfBt0zqBha60q7Dd7Rfg 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/go-chi/chi v1.5.5 h1:vOB/HbEMt9QqBqErz07QehcOKHaWFtuj87tTDVz2qXE= -github.com/go-chi/chi v1.5.5/go.mod h1:C9JqLr3tIYjDOZpzn+BCuxY8z8vmca43EeMgyZt7irw= github.com/go-chi/chi/v5 v5.2.5 h1:Eg4myHZBjyvJmAFjFvWgrqDTXFyOzjj7YIm3L3mu6Ug= github.com/go-chi/chi/v5 v5.2.5/go.mod h1:X7Gx4mteadT3eDOMTsXzmI4/rwUpOwBHLpAfupzFJP0= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= diff --git a/internal/lambda-managed-instances/aws-lambda-rie/internal/app.go b/internal/lambda-managed-instances/aws-lambda-rie/internal/app.go index 18dbe8e..5d09855 100644 --- a/internal/lambda-managed-instances/aws-lambda-rie/internal/app.go +++ b/internal/lambda-managed-instances/aws-lambda-rie/internal/app.go @@ -10,7 +10,7 @@ import ( "sync" "time" - "github.com/go-chi/chi" + "github.com/go-chi/chi/v5" rieinvoke "github.com/aws/aws-lambda-runtime-interface-emulator/internal/lambda-managed-instances/aws-lambda-rie/internal/invoke" "github.com/aws/aws-lambda-runtime-interface-emulator/internal/lambda-managed-instances/interop" diff --git a/internal/lambda-managed-instances/rapi/handler/invocationerror.go b/internal/lambda-managed-instances/rapi/handler/invocationerror.go index 1ba0b0b..d592363 100644 --- a/internal/lambda-managed-instances/rapi/handler/invocationerror.go +++ b/internal/lambda-managed-instances/rapi/handler/invocationerror.go @@ -8,7 +8,7 @@ import ( "context" "net/http" - "github.com/go-chi/chi" + "github.com/go-chi/chi/v5" "github.com/aws/aws-lambda-runtime-interface-emulator/internal/lambda-managed-instances/invoke" "github.com/aws/aws-lambda-runtime-interface-emulator/internal/lambda-managed-instances/logging" diff --git a/internal/lambda-managed-instances/rapi/handler/invocationresponse.go b/internal/lambda-managed-instances/rapi/handler/invocationresponse.go index 8fb6ce2..c5b63fd 100644 --- a/internal/lambda-managed-instances/rapi/handler/invocationresponse.go +++ b/internal/lambda-managed-instances/rapi/handler/invocationresponse.go @@ -7,7 +7,7 @@ import ( "context" "net/http" - "github.com/go-chi/chi" + "github.com/go-chi/chi/v5" "github.com/aws/aws-lambda-runtime-interface-emulator/internal/lambda-managed-instances/invoke" "github.com/aws/aws-lambda-runtime-interface-emulator/internal/lambda-managed-instances/logging" diff --git a/internal/lambda-managed-instances/rapi/middleware/middleware_test.go b/internal/lambda-managed-instances/rapi/middleware/middleware_test.go index c619b96..6ee1aef 100644 --- a/internal/lambda-managed-instances/rapi/middleware/middleware_test.go +++ b/internal/lambda-managed-instances/rapi/middleware/middleware_test.go @@ -12,7 +12,7 @@ import ( "net/http/httptest" "testing" - "github.com/go-chi/chi" + "github.com/go-chi/chi/v5" "github.com/google/uuid" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/internal/lambda-managed-instances/rapi/router.go b/internal/lambda-managed-instances/rapi/router.go index 63486ec..99854ba 100644 --- a/internal/lambda-managed-instances/rapi/router.go +++ b/internal/lambda-managed-instances/rapi/router.go @@ -6,7 +6,7 @@ package rapi import ( "net/http" - "github.com/go-chi/chi" + "github.com/go-chi/chi/v5" "github.com/aws/aws-lambda-runtime-interface-emulator/internal/lambda-managed-instances/appctx" "github.com/aws/aws-lambda-runtime-interface-emulator/internal/lambda-managed-instances/core" diff --git a/internal/lambda-managed-instances/rapi/server.go b/internal/lambda-managed-instances/rapi/server.go index 8a974bc..a20ae57 100644 --- a/internal/lambda-managed-instances/rapi/server.go +++ b/internal/lambda-managed-instances/rapi/server.go @@ -11,7 +11,7 @@ import ( "net/http" "net/netip" - "github.com/go-chi/chi" + "github.com/go-chi/chi/v5" "github.com/aws/aws-lambda-runtime-interface-emulator/internal/lambda-managed-instances/appctx" "github.com/aws/aws-lambda-runtime-interface-emulator/internal/lambda-managed-instances/core"