Skip to content

Commit 427783b

Browse files
author
fusikai
committed
升级echo
1 parent db91d63 commit 427783b

File tree

6 files changed

+62
-41
lines changed

6 files changed

+62
-41
lines changed

‎echo/adapter.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"context"
88
"net/http"
99

10-
"github.com/labstack/echo"
10+
"github.com/labstack/echo/v4"
1111
"github.com/linthan/scf-go-api-proxy/core"
1212
"github.com/tencentyun/scf-go-lib/events"
1313
)

‎echo/echoadapter_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@ package echoadapter_test
33
import (
44
"log"
55

6-
"github.com/labstack/echo"
6+
"github.com/labstack/echo/v4"
77
echoadapter "github.com/linthan/scf-go-api-proxy/echo"
88
"github.com/tencentyun/scf-go-lib/events"
9-
109
. "github.com/onsi/ginkgo"
1110
. "github.com/onsi/gomega"
1211
)

‎go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ module github.com/linthan/scf-go-api-proxy
33
go 1.12
44

55
require (
6-
github.com/aws/aws-lambda-go v1.13.2
7-
github.com/awslabs/aws-lambda-go-api-proxy v0.4.1
6+
github.com/aws/aws-lambda-go v1.13.2 // indirect
7+
github.com/awslabs/aws-lambda-go-api-proxy v0.4.1 // indirect
88
github.com/gin-gonic/gin v1.4.0
99
github.com/go-chi/chi v4.0.2+incompatible
1010
github.com/labstack/echo v3.3.10+incompatible
11+
github.com/labstack/echo/v4 v4.1.16
1112
github.com/labstack/gommon v0.3.0 // indirect
1213
github.com/onsi/ginkgo v1.10.1
1314
github.com/onsi/gomega v1.7.0
1415
github.com/tencentyun/scf-go-lib v0.0.0-20190817080819-4a2819cda320
15-
golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7 // indirect
1616
)

‎go.sum

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ github.com/awslabs/aws-lambda-go-api-proxy v0.4.1/go.mod h1:NxIVpehCd5ZcK9B/K39H
88
github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
99
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
1010
github.com/dchest/safefile v0.0.0-20151022103144-855e8d98f185/go.mod h1:cFRxtTwTOJkz2x3rQUNCYKWC93yP1VKjR8NUhqFxZNU=
11+
github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
1112
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
1213
github.com/gin-contrib/sse v0.0.0-20170109093832-22d885f9ecc7/go.mod h1:VJ0WA2NBN22VlZ2dKZQPAPnyWw5XTlK1KymzLKsr59s=
1314
github.com/gin-contrib/sse v0.0.0-20190301062529-5545eab6dad3 h1:t8FVkw33L+wilf2QiWkw0UV77qRpcH/JHPKGpKa2E8g=
@@ -32,19 +33,26 @@ github.com/json-iterator/go v0.0.0-20180128142709-bca911dae073/go.mod h1:+SdeFBv
3233
github.com/json-iterator/go v1.1.6 h1:MrUvLMLTMxbqFJ9kzlvat/rYZqZnW3u4wkLzWTaFwKs=
3334
github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
3435
github.com/kardianos/govendor v1.0.9/go.mod h1:yvmR6q9ZZ7nSF5Wvh40v0wfP+3TwwL8zYQp+itoZSVM=
36+
github.com/labstack/echo v1.4.4 h1:1bEiBNeGSUKxcPDGfZ/7IgdhJJZx8wV/pICJh4W2NJI=
3537
github.com/labstack/echo v3.3.10+incompatible h1:pGRcYk231ExFAyoAjAfD85kQzRJCRI8bbnE7CX5OEgg=
3638
github.com/labstack/echo v3.3.10+incompatible/go.mod h1:0INS7j/VjnFxD4E2wkz67b8cVwCLbBmJyDaka6Cmk1s=
39+
github.com/labstack/echo/v4 v4.1.16 h1:8swiwjE5Jkai3RPfZoahp8kjVCRNq+y7Q0hPji2Kz0o=
40+
github.com/labstack/echo/v4 v4.1.16/go.mod h1:awO+5TzAjvL8XpibdsfXxPgHr+orhtXZJZIQCVjogKI=
3741
github.com/labstack/gommon v0.2.8/go.mod h1:/tj9csK2iPSBvn+3NLM9e52usepMtrd5ilFYA+wQNJ4=
3842
github.com/labstack/gommon v0.3.0 h1:JEeO0bvc78PKdyHxloTKiF8BD5iGrH8T6MSeGvSgob0=
3943
github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL7NoOu+k=
4044
github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ=
4145
github.com/mattn/go-colorable v0.1.2 h1:/bC9yWikZXAL9uJdulbSfyVNIR3n3trXl+v8+1sx8mU=
4246
github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
47+
github.com/mattn/go-colorable v0.1.6 h1:6Su7aK7lXmJ/U79bYtBjLNaha4Fs1Rg9plHpcH+vvnE=
48+
github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
4349
github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
4450
github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
4551
github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
4652
github.com/mattn/go-isatty v0.0.9 h1:d5US/mDsogSGW37IV293h//ZFaeajb69h+EHFsv2xGg=
4753
github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ=
54+
github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
55+
github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
4856
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
4957
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
5058
github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI=
@@ -74,15 +82,21 @@ github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6Kllzaw
7482
github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
7583
github.com/valyala/fasttemplate v1.0.1 h1:tY9CJiPnMXf1ERmG2EyK7gNUd+c6RKGD0IfU8WdUSz8=
7684
github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8=
85+
github.com/valyala/fasttemplate v1.1.0 h1:RZqt0yGBsps8NGvLSGW804QQqCUYYLsaOjTVHy1Ocw4=
86+
github.com/valyala/fasttemplate v1.1.0/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8=
7787
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
7888
golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7 h1:0hQKqeLdqlt5iIwVOBErRisrHJAN57yOiPRQItI20fU=
7989
golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
90+
golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d h1:1ZiEyfaQIg3Qh0EoqpwAakHVhecoE5wlSg5GjnafJGw=
91+
golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
8092
golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
8193
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
8294
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3 h1:0GoQqolDA55aaLxZyTzK/Y2ePZzZTUrRacwib7cNsYQ=
8395
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
8496
golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c h1:uOCk1iQW6Vc18bnC13MfzScl+wdKBmM9Y9kU7Z83/lw=
8597
golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
98+
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b h1:0mm1VjtFUOIlE1SbDlwjYaDxZVDP2S5ou6y0gSgXHu8=
99+
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
86100
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
87101
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
88102
golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -91,8 +105,14 @@ golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5h
91105
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
92106
golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a h1:aYOabOQFp6Vj6W1F80affTUvO9UxmJRx8K0gsfABByQ=
93107
golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
108+
golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
109+
golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae h1:/WDfKMnPU+m5M4xB+6x4kaepxRw6jWvR5iDRdvjHgy8=
110+
golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
94111
golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
95112
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
113+
golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
114+
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
115+
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
96116
golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
97117
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
98118
gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=

‎sample/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package main
33
import (
44
"context"
55

6-
"github.com/labstack/echo"
6+
"github.com/labstack/echo/v4"
77
echoadapter "github.com/linthan/scf-go-api-proxy/echo"
88
"github.com/tencentyun/scf-go-lib/cloudfunction"
99
"github.com/tencentyun/scf-go-lib/events"

‎vendor/modules.txt

Lines changed: 36 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
# github.com/aws/aws-lambda-go v1.13.2
2-
github.com/aws/aws-lambda-go/events
3-
github.com/aws/aws-lambda-go/lambdacontext
4-
# github.com/awslabs/aws-lambda-go-api-proxy v0.4.1
5-
github.com/awslabs/aws-lambda-go-api-proxy/gin
6-
github.com/awslabs/aws-lambda-go-api-proxy/core
71
# github.com/gin-contrib/sse v0.0.0-20190301062529-5545eab6dad3
82
github.com/gin-contrib/sse
93
# github.com/gin-gonic/gin v1.4.0
@@ -25,12 +19,14 @@ github.com/hpcloud/tail/winfile
2519
github.com/json-iterator/go
2620
# github.com/labstack/echo v3.3.10+incompatible
2721
github.com/labstack/echo
22+
# github.com/labstack/echo/v4 v4.1.16
23+
github.com/labstack/echo/v4
2824
# github.com/labstack/gommon v0.3.0
2925
github.com/labstack/gommon/color
3026
github.com/labstack/gommon/log
31-
# github.com/mattn/go-colorable v0.1.2
27+
# github.com/mattn/go-colorable v0.1.6
3228
github.com/mattn/go-colorable
33-
# github.com/mattn/go-isatty v0.0.9
29+
# github.com/mattn/go-isatty v0.0.12
3430
github.com/mattn/go-isatty
3531
# github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd
3632
github.com/modern-go/concurrent
@@ -40,74 +36,80 @@ github.com/modern-go/reflect2
4036
github.com/onsi/ginkgo
4137
github.com/onsi/ginkgo/config
4238
github.com/onsi/ginkgo/internal/codelocation
39+
github.com/onsi/ginkgo/internal/containernode
4340
github.com/onsi/ginkgo/internal/failer
41+
github.com/onsi/ginkgo/internal/leafnodes
4442
github.com/onsi/ginkgo/internal/remote
43+
github.com/onsi/ginkgo/internal/spec
44+
github.com/onsi/ginkgo/internal/spec_iterator
45+
github.com/onsi/ginkgo/internal/specrunner
4546
github.com/onsi/ginkgo/internal/suite
4647
github.com/onsi/ginkgo/internal/testingtproxy
4748
github.com/onsi/ginkgo/internal/writer
4849
github.com/onsi/ginkgo/reporters
4950
github.com/onsi/ginkgo/reporters/stenographer
5051
github.com/onsi/ginkgo/reporters/stenographer/support/go-colorable
51-
github.com/onsi/ginkgo/types
52-
github.com/onsi/ginkgo/internal/spec_iterator
53-
github.com/onsi/ginkgo/internal/containernode
54-
github.com/onsi/ginkgo/internal/leafnodes
55-
github.com/onsi/ginkgo/internal/spec
56-
github.com/onsi/ginkgo/internal/specrunner
5752
github.com/onsi/ginkgo/reporters/stenographer/support/go-isatty
53+
github.com/onsi/ginkgo/types
5854
# github.com/onsi/gomega v1.7.0
5955
github.com/onsi/gomega
56+
github.com/onsi/gomega/format
6057
github.com/onsi/gomega/internal/assertion
6158
github.com/onsi/gomega/internal/asyncassertion
59+
github.com/onsi/gomega/internal/oraclematcher
6260
github.com/onsi/gomega/internal/testingtsupport
6361
github.com/onsi/gomega/matchers
64-
github.com/onsi/gomega/types
65-
github.com/onsi/gomega/internal/oraclematcher
66-
github.com/onsi/gomega/format
6762
github.com/onsi/gomega/matchers/support/goraph/bipartitegraph
6863
github.com/onsi/gomega/matchers/support/goraph/edge
6964
github.com/onsi/gomega/matchers/support/goraph/node
7065
github.com/onsi/gomega/matchers/support/goraph/util
66+
github.com/onsi/gomega/types
7167
# github.com/tencentyun/scf-go-lib v0.0.0-20190817080819-4a2819cda320
72-
github.com/tencentyun/scf-go-lib/events
73-
github.com/tencentyun/scf-go-lib/functioncontext
7468
github.com/tencentyun/scf-go-lib/cloudfunction
7569
github.com/tencentyun/scf-go-lib/cloudfunction/messages
70+
github.com/tencentyun/scf-go-lib/events
71+
github.com/tencentyun/scf-go-lib/functioncontext
7672
# github.com/ugorji/go v1.1.4
7773
github.com/ugorji/go/codec
7874
# github.com/valyala/bytebufferpool v1.0.0
7975
github.com/valyala/bytebufferpool
80-
# github.com/valyala/fasttemplate v1.0.1
76+
# github.com/valyala/fasttemplate v1.1.0
8177
github.com/valyala/fasttemplate
82-
# golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7
83-
golang.org/x/crypto/acme/autocert
78+
# golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d
8479
golang.org/x/crypto/acme
85-
# golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c
86-
golang.org/x/net/idna
87-
golang.org/x/net/html/charset
80+
golang.org/x/crypto/acme/autocert
81+
# golang.org/x/net v0.0.0-20200226121028-0de0cce0169b
8882
golang.org/x/net/html
8983
golang.org/x/net/html/atom
90-
# golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a
84+
golang.org/x/net/html/charset
85+
golang.org/x/net/http/httpguts
86+
golang.org/x/net/http2
87+
golang.org/x/net/http2/h2c
88+
golang.org/x/net/http2/hpack
89+
golang.org/x/net/idna
90+
# golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae
9191
golang.org/x/sys/unix
92-
# golang.org/x/text v0.3.0
93-
golang.org/x/text/secure/bidirule
94-
golang.org/x/text/unicode/bidi
95-
golang.org/x/text/unicode/norm
92+
# golang.org/x/text v0.3.2
9693
golang.org/x/text/encoding
9794
golang.org/x/text/encoding/charmap
9895
golang.org/x/text/encoding/htmlindex
99-
golang.org/x/text/transform
100-
golang.org/x/text/encoding/internal/identifier
10196
golang.org/x/text/encoding/internal
97+
golang.org/x/text/encoding/internal/identifier
10298
golang.org/x/text/encoding/japanese
10399
golang.org/x/text/encoding/korean
104100
golang.org/x/text/encoding/simplifiedchinese
105101
golang.org/x/text/encoding/traditionalchinese
106102
golang.org/x/text/encoding/unicode
107-
golang.org/x/text/language
103+
golang.org/x/text/internal/language
104+
golang.org/x/text/internal/language/compact
105+
golang.org/x/text/internal/tag
108106
golang.org/x/text/internal/utf8internal
107+
golang.org/x/text/language
109108
golang.org/x/text/runes
110-
golang.org/x/text/internal/tag
109+
golang.org/x/text/secure/bidirule
110+
golang.org/x/text/transform
111+
golang.org/x/text/unicode/bidi
112+
golang.org/x/text/unicode/norm
111113
# gopkg.in/fsnotify.v1 v1.4.7
112114
gopkg.in/fsnotify.v1
113115
# gopkg.in/go-playground/validator.v8 v8.18.2

0 commit comments

Comments
 (0)