Merge pull request #145 from unistack-org/update

add HandlerMetadata server.HandlerOption
2023-02-13 23:39:03 +03:00 · 2023-02-13 23:36:50 +03:00 · 2023-02-13 21:04:15 +03:00 · 2023-02-13 18:01:59 +00:00 · 2023-02-13 00:12:07 +03:00 · 2023-02-13 00:09:54 +03:00
4 changed files with 18 additions and 12 deletions
--- a/go.mod
+++ b/go.mod
@@ -3,7 +3,7 @@ module go.unistack.org/micro-server-http/v3
 go 1.16

 require (
-	go.unistack.org/micro/v3 v3.10.9
+	go.unistack.org/micro/v3 v3.10.11
 	golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
--- a/go.sum
+++ b/go.sum
@@ -74,8 +74,8 @@ github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQ
 go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
 go.unistack.org/micro-proto/v3 v3.3.1 h1:nQ0MtWvP2G3QrpOgawVOPhpZZYkq6umTGDqs8FxJYIo=
 go.unistack.org/micro-proto/v3 v3.3.1/go.mod h1:cwRyv8uInM2I7EbU7O8Fx2Ls3N90Uw9UCCcq4olOdfE=
-go.unistack.org/micro/v3 v3.10.9 h1:o8gdlE5JC9b2sm89RmztQPHnP4thN6FkGZyrKrahxX8=
-go.unistack.org/micro/v3 v3.10.9/go.mod h1:gI4RkJKHLPW7KV6h4+ZBOZD997MRvFRXMPQIHpozikI=
+go.unistack.org/micro/v3 v3.10.11 h1:IPUEVQ5oGZ6Ft2/2zQAOIkp+Ztt6GIHxwMoG4l+eJGQ=
+go.unistack.org/micro/v3 v3.10.11/go.mod h1:gI4RkJKHLPW7KV6h4+ZBOZD997MRvFRXMPQIHpozikI=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
--- a/handler.go
+++ b/handler.go
@@ -79,16 +79,16 @@ func (h *httpServer) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		md = metadata.New(len(r.Header) + 8)
 	}
 	for k, v := range r.Header {
-		md.Set(k, strings.Join(v, ", "))
+		md[k] = strings.Join(v, ", ")
 	}
-	md.Set("RemoteAddr", r.RemoteAddr)
-	md.Set("Method", r.Method)
-	md.Set("URL", r.URL.String())
-	md.Set("Proto", r.Proto)
-	md.Set("ContentLength", fmt.Sprintf("%d", r.ContentLength))
-	md.Set("TransferEncoding", strings.Join(r.TransferEncoding, ","))
-	md.Set("Host", r.Host)
-	md.Set("RequestURI", r.RequestURI)
+	md["RemoteAddr"] = r.RemoteAddr
+	md["Method"] = r.Method
+	md["URL"] = r.URL.String()
+	md["Proto"] = r.Proto
+	md["ContentLength"] = fmt.Sprintf("%d", r.ContentLength)
+	md["TransferEncoding"] = strings.Join(r.TransferEncoding, ",")
+	md["Host"] = r.Host
+	md["RequestURI"] = r.RequestURI
 	ctx = metadata.NewIncomingContext(ctx, md)

 	defer r.Body.Close()
--- a/options.go
+++ b/options.go
@@ -133,6 +133,12 @@ func RegisterRPCHandler(b bool) server.Option {
 	return server.SetOption(registerRPCHandlerKey{}, b)
 }

+type handlerMetadataKey struct{}
+
+func HandlerMetadata(md map[string]map[string]string) server.HandlerOption {
+	return server.SetHandlerOption(handlerMetadataKey{}, md)
+}
+
 type headerKey struct{}

 type handlerOptions struct {
Author	SHA1	Message	Date
Vasiliy Tolstov	9bc1629e77	Merge pull request #145 from unistack-org/update add HandlerMetadata server.HandlerOption	2023-02-13 23:39:03 +03:00
Vasiliy Tolstov	c27a8b7cf8	add HandlerMetadata server.HandlerOption Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2023-02-13 23:36:50 +03:00
Vasiliy Tolstov	6b845853e2	Merge pull request #144 from unistack-org/dependabot/go_modules/go.unistack.org/micro/v3-3.10.10 Bump go.unistack.org/micro/v3 from 3.10.9 to 3.10.10	2023-02-13 21:04:15 +03:00
dependabot[bot]	dbc3c12eed	Bump go.unistack.org/micro/v3 from 3.10.9 to 3.10.10 Bumps [go.unistack.org/micro/v3](https://github.com/unistack-org/micro) from 3.10.9 to 3.10.10. - [Release notes](https://github.com/unistack-org/micro/releases) - [Commits](https://github.com/unistack-org/micro/compare/v3.10.9...v3.10.10) --- updated-dependencies: - dependency-name: go.unistack.org/micro/v3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2023-02-13 18:01:59 +00:00
Vasiliy Tolstov	7f1a55958e	Merge pull request #143 from unistack-org/headers dont mangle header names	2023-02-13 00:12:07 +03:00
Vasiliy Tolstov	02f9d6d8f7	dont mangle header names Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2023-02-13 00:09:54 +03:00