From 742b99636ab65c734db6923cdf9657d5b1082a5b Mon Sep 17 00:00:00 2001 From: Vasiliy Tolstov Date: Wed, 22 Feb 2023 00:09:52 +0300 Subject: [PATCH] fix and regen Signed-off-by: Vasiliy Tolstov --- meter/handler/handler_micro.pb.go | 15 +++++++----- meter/handler/handler_micro_http.pb.go | 5 ++-- server/health/health_micro.pb.go | 33 ++++++++++++++++---------- server/health/health_micro_http.pb.go | 7 ++++-- 4 files changed, 38 insertions(+), 22 deletions(-) diff --git a/meter/handler/handler_micro.pb.go b/meter/handler/handler_micro.pb.go index e93ee961..e22e2253 100644 --- a/meter/handler/handler_micro.pb.go +++ b/meter/handler/handler_micro.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go-micro. DO NOT EDIT. // versions: -// - protoc-gen-go-micro v3.5.3 +// - protoc-gen-go-micro v3.10.2 // - protoc v3.21.12 // source: handler.proto @@ -8,18 +8,21 @@ package handler import ( context "context" + v3 "go.unistack.org/micro-server-http/v3" codec "go.unistack.org/micro/v3/codec" - http "net/http" ) var ( MeterServiceName = "MeterService" ) var ( - MeterServiceServerEndpoints = map[string]map[string]string{ - "/metrics": map[string]string{ - "Method": http.MethodGet, - "Stream": "false", + MeterServiceServerEndpoints = []v3.EndpointMetadata{ + { + Name: "MeterService.Metrics", + Path: "/metrics", + Method: "GET", + Body: "", + Stream: false, }, } ) diff --git a/meter/handler/handler_micro_http.pb.go b/meter/handler/handler_micro_http.pb.go index 6e9907b0..7c52af22 100644 --- a/meter/handler/handler_micro_http.pb.go +++ b/meter/handler/handler_micro_http.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-go-micro. DO NOT EDIT. -// protoc-gen-go-micro version: v3.5.3 +// protoc-gen-go-micro version: v3.10.2 // source: handler.proto package handler @@ -21,12 +21,13 @@ func (h *meterServiceServer) Metrics(ctx context.Context, req *codec.Frame, rsp func RegisterMeterServiceServer(s server.Server, sh MeterServiceServer, opts ...server.HandlerOption) error { type meterService interface { + Metrics(ctx context.Context, req *codec.Frame, rsp *codec.Frame) error } type MeterService struct { meterService } h := &meterServiceServer{sh} var nopts []server.HandlerOption - nopts = append(nopts, v3.HandlerMetadata(MeterServiceServerEndpoints)) + nopts = append(nopts, v3.HandlerEndpoints(MeterServiceServerEndpoints)) return s.Handle(s.NewHandler(&MeterService{h}, append(nopts, opts...)...)) } diff --git a/server/health/health_micro.pb.go b/server/health/health_micro.pb.go index af12098b..e1c8a45f 100644 --- a/server/health/health_micro.pb.go +++ b/server/health/health_micro.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go-micro. DO NOT EDIT. // versions: -// - protoc-gen-go-micro v3.5.3 +// - protoc-gen-go-micro v3.10.2 // - protoc v3.21.12 // source: health.proto @@ -8,26 +8,35 @@ package health import ( context "context" + v3 "go.unistack.org/micro-server-http/v3" codec "go.unistack.org/micro/v3/codec" - http "net/http" ) var ( HealthServiceName = "HealthService" ) var ( - HealthServiceServerEndpoints = map[string]map[string]string{ - "/live": map[string]string{ - "Method": http.MethodGet, - "Stream": "false", + HealthServiceServerEndpoints = []v3.EndpointMetadata{ + { + Name: "HealthService.Live", + Path: "/live", + Method: "GET", + Body: "", + Stream: false, }, - "/ready": map[string]string{ - "Method": http.MethodGet, - "Stream": "false", + { + Name: "HealthService.Ready", + Path: "/ready", + Method: "GET", + Body: "", + Stream: false, }, - "/version": map[string]string{ - "Method": http.MethodGet, - "Stream": "false", + { + Name: "HealthService.Version", + Path: "/version", + Method: "GET", + Body: "", + Stream: false, }, } ) diff --git a/server/health/health_micro_http.pb.go b/server/health/health_micro_http.pb.go index 6e2a061d..63ef9432 100644 --- a/server/health/health_micro_http.pb.go +++ b/server/health/health_micro_http.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-go-micro. DO NOT EDIT. -// protoc-gen-go-micro version: v3.5.3 +// protoc-gen-go-micro version: v3.10.2 // source: health.proto package health @@ -29,12 +29,15 @@ func (h *healthServiceServer) Version(ctx context.Context, req *codec.Frame, rsp func RegisterHealthServiceServer(s server.Server, sh HealthServiceServer, opts ...server.HandlerOption) error { type healthService interface { + Live(ctx context.Context, req *codec.Frame, rsp *codec.Frame) error + Ready(ctx context.Context, req *codec.Frame, rsp *codec.Frame) error + Version(ctx context.Context, req *codec.Frame, rsp *codec.Frame) error } type HealthService struct { healthService } h := &healthServiceServer{sh} var nopts []server.HandlerOption - nopts = append(nopts, v3.HandlerMetadata(HealthServiceServerEndpoints)) + nopts = append(nopts, v3.HandlerEndpoints(HealthServiceServerEndpoints)) return s.Handle(s.NewHandler(&HealthService{h}, append(nopts, opts...)...)) }