diff --git a/glide.lock b/glide.lock index c51f7aac..3ad58b04 100644 --- a/glide.lock +++ b/glide.lock @@ -1,10 +1,10 @@ -hash: 3de2a96bbdc145cce325de2a482111b0524cc330f60a4fbc781a08ed3b879e58 -updated: 2017-01-28T10:22:00.230111692-08:00 +hash: ffd2479be96adb7a9a21f8672a826e1e5868ab022bc7da1aa71f7b5d005ce03e +updated: 2017-02-10T11:14:02.230514143+09:00 imports: - name: github.com/daaku/go.zipexe version: a5fe2436ffcb3236e175e5149162b41cd28bd27d - name: github.com/dgrijalva/jwt-go - version: a601269ab70c205d26370c16f7c81e9017c14e04 + version: 2268707a8f0843315e2004ee4f1d021dc08baedf - name: github.com/facebookgo/clock version: 600d898af40aa09a7a93ecb9265d87b0504b6f03 - name: github.com/facebookgo/grace @@ -27,7 +27,7 @@ imports: - name: github.com/gorilla/websocket version: c36f2fe5c330f0ac404b616b96c438b8616b1aaf - name: github.com/kardianos/osext - version: c2c54e542fb797ad986b31721e1baedf214ca413 + version: 9b883c5eb462dd5cb1b0a7a104fe86bc6b9bd391 - name: github.com/labstack/gommon version: f72d3c883f8ea180da8f085dd320804c41332ad1 subpackages: @@ -38,30 +38,32 @@ imports: - name: github.com/mattn/go-colorable version: d228849504861217f796da67fae4f6e347643f15 - name: github.com/mattn/go-isatty - version: 30a891c33c7cde7b02a981314b4228ec99380cca + version: 281032e84ae07510239465db46bf442aa44b953a +- name: github.com/satori/go.uuid + version: b061729afc07e77a8aa4fad0a2fd840958f1942a - name: github.com/tylerb/graceful - version: 0e9129e9c6d47da90dc0c188b26bd7bb1dab53cd + version: 4654dfbb6ad53cb5e27f37d99b02e16c1872fbbb - name: github.com/valyala/bytebufferpool version: e746df99fe4a3986f4d4f79e13c1e0117ce9c2f7 - name: github.com/valyala/fasttemplate version: d090d65668a286d9a180d43a19dfdc5dcad8fe88 - name: golang.org/x/crypto - version: 9477e0b78b9ac3d0b03822fd95422e2fe07627cd + version: 453249f01cfeb54c3d549ddb75ff152ca243f9d8 subpackages: - acme - acme/autocert - name: golang.org/x/net - version: f2499483f923065a842d38eb4c7f1927e6fc6e6d + version: a689eb3bc4b53af70390acc3cf68c9f549b6b8d6 subpackages: - context - context/ctxhttp - websocket - name: golang.org/x/sys - version: d75a52659825e75fff6158388dddc6a5b04f9ba5 + version: 7a6e5648d140666db5d920909e082ca00a87ba2c subpackages: - unix - name: google.golang.org/appengine - version: a2c54d2174c17540446e0ced57d9d459af61bc1c + version: 2e4a801b39fc199db615bfca7d0b9f8cd9580599 subpackages: - internal - internal/app_identity @@ -87,6 +89,6 @@ testImports: subpackages: - difflib - name: github.com/stretchr/testify - version: 2402e8e7a02fc811447d11f881aa9746cdc57983 + version: 4d4bfba8f1d1027c4fdbe371823030df51419987 subpackages: - assert diff --git a/glide.yaml b/glide.yaml index 9ac9d1c8..a14982d7 100644 --- a/glide.yaml +++ b/glide.yaml @@ -12,6 +12,7 @@ import: - color - log - random +- package: github.com/satori/go.uuid - package: github.com/tylerb/graceful - package: github.com/valyala/fasttemplate - package: golang.org/x/crypto diff --git a/middleware/request_id.go b/middleware/request_id.go new file mode 100644 index 00000000..2a6e3227 --- /dev/null +++ b/middleware/request_id.go @@ -0,0 +1,52 @@ +package middleware + +import ( + "github.com/labstack/echo" + "github.com/labstack/echo/middleware" + uuid "github.com/satori/go.uuid" +) + +type ( + // RequestIDConfig defines the config for RequestID middleware. + RequestIDConfig struct { + // Skipper defines a function to skip middleware. + Skipper middleware.Skipper + } +) + +var ( + // DefaultRequestIDConfig is the default RequestID middleware config. + DefaultRequestIDConfig = RequestIDConfig{ + Skipper: DefaultSkipper, + } +) + +// RequestID returns a X-Request-ID middleware. +func RequestID() echo.MiddlewareFunc { + return RequestIDWithConfig(DefaultRequestIDConfig) +} + +// RequestIDWithConfig returns a X-Request-ID middleware with config. +func RequestIDWithConfig(config RequestIDConfig) echo.MiddlewareFunc { + if config.Skipper == nil { + config.Skipper = DefaultRequestIDConfig.Skipper + } + + return func(next echo.HandlerFunc) echo.HandlerFunc { + return func(c echo.Context) error { + if config.Skipper(c) { + return next(c) + } + + req := c.Request() + res := c.Response() + rid := req.Header.Get("X-Request-ID") + if rid == "" { + rid = uuid.NewV4().String() + } + res.Header().Set("X-Request-ID", rid) + + return next(c) + } + } +} diff --git a/middleware/request_id_test.go b/middleware/request_id_test.go new file mode 100644 index 00000000..5895230b --- /dev/null +++ b/middleware/request_id_test.go @@ -0,0 +1,32 @@ +package middleware + +import ( + "net/http" + "net/http/httptest" + "testing" + + "github.com/davecgh/go-spew/spew" + "github.com/labstack/echo" + uuid "github.com/satori/go.uuid" + "github.com/stretchr/testify/assert" +) + +func TestRequestID(t *testing.T) { + e := echo.New() + req, _ := http.NewRequest(echo.GET, "/", nil) + rec := httptest.NewRecorder() + c := e.NewContext(req, rec) + rid := RequestIDWithConfig(RequestIDConfig{}) + h := rid(func(c echo.Context) error { + return c.String(http.StatusOK, "test") + }) + + h(c) + if assert.NotEmpty(t, rec.Header().Get("X-Request-ID")) { + u, err := uuid.FromString(rec.Header().Get("X-Request-ID")) + spew.Dump(u) + assert.NoError(t, err) + assert.Equal(t, uint(4), u.Version()) + assert.Equal(t, uint(uuid.VariantRFC4122), u.Variant()) + } +}