Skip to content

Commit d30ef7d

Browse files
Merge pull request #80 from little-forest/renovate/github.com-labstack-echo-v4-5.x
fix(deps): update module github.com/labstack/echo/v4 to v5
2 parents e9a8fcb + 133eb4e commit d30ef7d

4 files changed

Lines changed: 20 additions & 42 deletions

File tree

echo.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"os"
66
"time"
77

8-
"github.com/labstack/echo/v4"
8+
echo "github.com/labstack/echo/v5"
99
)
1010

1111
type HttpHeader struct {
@@ -28,7 +28,7 @@ type DumpResult struct {
2828
Headers map[string]string `json:"headers"`
2929
}
3030

31-
func dumpRequest(c echo.Context) error {
31+
func dumpRequest(c *echo.Context) error {
3232
r := &DumpResult{}
3333

3434
r.Path = c.Request().RequestURI

go.mod

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,9 @@
11
module github.com/little-forest/echo-api
22

3-
go 1.24.0
3+
go 1.25.0
44

55
toolchain go1.26.0
66

7-
require github.com/labstack/echo/v4 v4.15.1
7+
require github.com/labstack/echo/v5 v5.0.4
88

9-
require (
10-
github.com/labstack/gommon v0.4.2 // indirect
11-
github.com/mattn/go-colorable v0.1.14 // indirect
12-
github.com/mattn/go-isatty v0.0.20 // indirect
13-
github.com/valyala/bytebufferpool v1.0.0 // indirect
14-
github.com/valyala/fasttemplate v1.2.2 // indirect
15-
golang.org/x/crypto v0.46.0 // indirect
16-
golang.org/x/net v0.48.0 // indirect
17-
golang.org/x/sys v0.39.0 // indirect
18-
golang.org/x/text v0.32.0 // indirect
19-
golang.org/x/time v0.14.0 // indirect
20-
)
9+
require golang.org/x/time v0.14.0 // indirect

go.sum

Lines changed: 6 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,15 @@
11
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
22
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
3-
github.com/labstack/echo/v4 v4.15.1 h1:S9keusg26gZpjMmPqB5hOEvNKnmd1lNmcHrbbH2lnFs=
4-
github.com/labstack/echo/v4 v4.15.1/go.mod h1:xmw1clThob0BSVRX1CRQkGQ/vjwcpOMjQZSZa9fKA/c=
5-
github.com/labstack/gommon v0.4.2 h1:F8qTUNXgG1+6WQmqoUWnz8WiEU60mXVVw0P4ht1WRA0=
6-
github.com/labstack/gommon v0.4.2/go.mod h1:QlUFxVM+SNXhDL/Z7YhocGIBYOiwB0mXm1+1bAPHPyU=
7-
github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE=
8-
github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8=
9-
github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
10-
github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
3+
github.com/labstack/echo/v5 v5.0.4 h1:ll3I/O8BifjMztj9dD1vx/peZQv8cR2CTUdQK6QxGGc=
4+
github.com/labstack/echo/v5 v5.0.4/go.mod h1:SyvlSdObGjRXeQfCCXW/sybkZdOOQZBmpKF0bvALaeo=
115
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
126
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
137
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
148
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
15-
github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
16-
github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
17-
github.com/valyala/fasttemplate v1.2.2 h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQD0Loo=
18-
github.com/valyala/fasttemplate v1.2.2/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
19-
golang.org/x/crypto v0.46.0 h1:cKRW/pmt1pKAfetfu+RCEvjvZkA9RimPbh7bhFjGVBU=
20-
golang.org/x/crypto v0.46.0/go.mod h1:Evb/oLKmMraqjZ2iQTwDwvCtJkczlDuTmdJXoZVzqU0=
21-
golang.org/x/net v0.48.0 h1:zyQRTTrjc33Lhh0fBgT/H3oZq9WuvRR5gPC70xpDiQU=
22-
golang.org/x/net v0.48.0/go.mod h1:+ndRgGjkh8FGtu1w1FGbEC31if4VrNVMuKTgcAAnQRY=
23-
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
24-
golang.org/x/sys v0.39.0 h1:CvCKL8MeisomCi6qNZ+wbb0DN9E5AATixKsvNtMoMFk=
25-
golang.org/x/sys v0.39.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
26-
golang.org/x/text v0.32.0 h1:ZD01bjUt1FQ9WJ0ClOL5vxgxOI/sVCNgX1YtKwcY0mU=
27-
golang.org/x/text v0.32.0/go.mod h1:o/rUWzghvpD5TXrTIBuJU77MTaN0ljMWE47kxGJQ7jY=
9+
golang.org/x/net v0.49.0 h1:eeHFmOGUTtaaPSGNmjBKpbng9MulQsJURQUAfUwY++o=
10+
golang.org/x/net v0.49.0/go.mod h1:/ysNB2EvaqvesRkuLAyjI1ycPZlQHM3q01F02UY/MV8=
11+
golang.org/x/text v0.33.0 h1:B3njUFyqtHDUI5jMn1YIr5B0IE2U0qck04r6d4KPAxE=
12+
golang.org/x/text v0.33.0/go.mod h1:LuMebE6+rBincTi9+xWTY8TztLzKHc/9C1uBCG27+q8=
2813
golang.org/x/time v0.14.0 h1:MRx4UaLrDotUKUdCIqzPC48t1Y9hANFKIRpNx+Te8PI=
2914
golang.org/x/time v0.14.0/go.mod h1:eL/Oa2bBBK0TkX57Fyni+NgnyQQN4LitPmob2Hjnqw4=
3015
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

server.go

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,13 @@ package main
33
import (
44
"flag"
55
"fmt"
6+
"log"
7+
"log/slog"
68
"os"
79
"strconv"
810

9-
"github.com/labstack/echo/v4"
10-
"github.com/labstack/echo/v4/middleware"
11+
echo "github.com/labstack/echo/v5"
12+
"github.com/labstack/echo/v5/middleware"
1113
)
1214

1315
const defaultPort = 8080
@@ -51,14 +53,16 @@ func main() {
5153
LogStatus: true,
5254
LogLatency: true,
5355
LogRemoteIP: true,
54-
LogValuesFunc: func(c echo.Context, v middleware.RequestLoggerValues) error {
55-
e.Logger.Infof("%s %s %d %s %s", v.RemoteIP, v.Method, v.Status, v.URI, v.Latency)
56+
LogValuesFunc: func(c *echo.Context, v middleware.RequestLoggerValues) error {
57+
slog.Info("request", "remoteIP", v.RemoteIP, "method", v.Method, "status", v.Status, "uri", v.URI, "latency", v.Latency)
5658
return nil
5759
},
5860
}))
5961
e.Use(middleware.Secure())
6062

6163
e.GET("/*", dumpRequest)
6264

63-
e.Logger.Fatal(e.Start(fmt.Sprintf(":%d", port)))
65+
if err := e.Start(fmt.Sprintf(":%d", port)); err != nil {
66+
log.Fatal(err)
67+
}
6468
}

0 commit comments

Comments
 (0)