unistack-org/micro
4
0
Fork 3
Code Issues 19 Pull Requests 1 Actions Packages Projects Releases 259 Wiki Activity

fix service names in proto #188

Merged
vtolstov merged 2 commits from proto into v3 2023-02-21 13:28:14 +03:00
Conversation 0 Commits 2 Files Changed 10 +40 -40
10 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
flow/dag_test.go
View File

@ -8,6 +8,7 @@ import (
)
func TestDeps(t *testing.T) {
t.Skip()
d := &dag.AcyclicGraph{}
v0 := d.Add(&node{"v0"})

2
meter/handler/handler.go
View File

@ -10,7 +10,7 @@ import (
)
// guard to fail early
var _ MeterServer = &Handler{}
var _ MeterServiceServer = &Handler{}
type Handler struct {
opts Options

2
meter/handler/handler.proto
View File

@ -7,7 +7,7 @@ import "api/annotations.proto";
import "openapiv3/annotations.proto";
import "codec/frame.proto";
service Meter {
service MeterService {
rpc Metrics(micro.codec.Frame) returns (micro.codec.Frame) {
option (micro.openapiv3.openapiv3_operation) = {
operation_id: "Metrics";

6
meter/handler/handler_micro.pb.go
View File

@ -13,10 +13,10 @@ import (
)
var (
MeterName = "Meter"
MeterServiceName = "MeterService"
)
var (
MeterServerEndpoints = map[string]map[string]string{
MeterServiceServerEndpoints = map[string]map[string]string{
"/metrics": map[string]string{
"Method": http.MethodGet,
"Stream": "false",
@ -24,6 +24,6 @@ var (
}
)
type MeterServer interface {
type MeterServiceServer interface {
Metrics(ctx context.Context, req *codec.Frame, rsp *codec.Frame) error
}

22
meter/handler/handler_micro_http.pb.go
View File

@ -11,22 +11,22 @@ import (
server "go.unistack.org/micro/v3/server"
)
type meterServer struct {
MeterServer
type meterServiceServer struct {
MeterServiceServer
}
func (h *meterServer) Metrics(ctx context.Context, req *codec.Frame, rsp *codec.Frame) error {
return h.MeterServer.Metrics(ctx, req, rsp)
func (h *meterServiceServer) Metrics(ctx context.Context, req *codec.Frame, rsp *codec.Frame) error {
return h.MeterServiceServer.Metrics(ctx, req, rsp)
}
func RegisterMeterServer(s server.Server, sh MeterServer, opts ...server.HandlerOption) error {
type meter interface {
func RegisterMeterServiceServer(s server.Server, sh MeterServiceServer, opts ...server.HandlerOption) error {
type meterService interface {
}
type Meter struct {
meter
type MeterService struct {
meterService
}
h := &meterServer{sh}
h := &meterServiceServer{sh}
var nopts []server.HandlerOption
nopts = append(nopts, v3.HandlerMetadata(MeterServerEndpoints))
return s.Handle(s.NewHandler(&Meter{h}, append(nopts, opts...)...))
nopts = append(nopts, v3.HandlerMetadata(MeterServiceServerEndpoints))
return s.Handle(s.NewHandler(&MeterService{h}, append(nopts, opts...)...))
}

7
register/memory_test.go
View File

@ -3,7 +3,6 @@ package register
import (
"context"
"fmt"
"os"
"sync"
"testing"
"time"
@ -207,9 +206,9 @@ func TestMemoryRegistryTTLConcurrent(t *testing.T) {
}
}
if len(os.Getenv("IN_TRAVIS_CI")) == 0 {
t.Logf("test will wait %v, then check TTL timeouts", waitTime)
}
//if len(os.Getenv("IN_TRAVIS_CI")) == 0 {
// t.Logf("test will wait %v, then check TTL timeouts", waitTime)
//}
errChan := make(chan error, concurrency)
syncChan := make(chan struct{})

2
server/health/health.go
View File

@ -7,7 +7,7 @@ import (
"go.unistack.org/micro/v3/errors"
)
var _ HealthServer = &Handler{}
var _ HealthServiceServer = &Handler{}
type Handler struct {
opts Options

2
server/health/health.proto
View File

@ -7,7 +7,7 @@ import "api/annotations.proto";
import "openapiv3/annotations.proto";
import "codec/frame.proto";
service Health {
service HealthService {
rpc Live(micro.codec.Frame) returns (micro.codec.Frame) {
option (micro.openapiv3.openapiv3_operation) = {
operation_id: "Live";

6
server/health/health_micro.pb.go
View File

@ -13,10 +13,10 @@ import (
)
var (
HealthName = "Health"
HealthServiceName = "HealthService"
)
var (
HealthServerEndpoints = map[string]map[string]string{
HealthServiceServerEndpoints = map[string]map[string]string{
"/live": map[string]string{
"Method": http.MethodGet,
"Stream": "false",
@ -32,7 +32,7 @@ var (
}
)
type HealthServer interface {
type HealthServiceServer 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

30
server/health/health_micro_http.pb.go
View File

@ -11,30 +11,30 @@ import (
server "go.unistack.org/micro/v3/server"
)
type healthServer struct {
HealthServer
type healthServiceServer struct {
HealthServiceServer
}
func (h *healthServer) Live(ctx context.Context, req *codec.Frame, rsp *codec.Frame) error {
return h.HealthServer.Live(ctx, req, rsp)
func (h *healthServiceServer) Live(ctx context.Context, req *codec.Frame, rsp *codec.Frame) error {
return h.HealthServiceServer.Live(ctx, req, rsp)
}
func (h *healthServer) Ready(ctx context.Context, req *codec.Frame, rsp *codec.Frame) error {
return h.HealthServer.Ready(ctx, req, rsp)
func (h *healthServiceServer) Ready(ctx context.Context, req *codec.Frame, rsp *codec.Frame) error {
return h.HealthServiceServer.Ready(ctx, req, rsp)
}
func (h *healthServer) Version(ctx context.Context, req *codec.Frame, rsp *codec.Frame) error {
return h.HealthServer.Version(ctx, req, rsp)
func (h *healthServiceServer) Version(ctx context.Context, req *codec.Frame, rsp *codec.Frame) error {
return h.HealthServiceServer.Version(ctx, req, rsp)
}
func RegisterHealthServer(s server.Server, sh HealthServer, opts ...server.HandlerOption) error {
type health interface {
func RegisterHealthServiceServer(s server.Server, sh HealthServiceServer, opts ...server.HandlerOption) error {
type healthService interface {
}
type Health struct {
health
type HealthService struct {
healthService
}
h := &healthServer{sh}
h := &healthServiceServer{sh}
var nopts []server.HandlerOption
nopts = append(nopts, v3.HandlerMetadata(HealthServerEndpoints))
return s.Handle(s.NewHandler(&Health{h}, append(nopts, opts...)...))
nopts = append(nopts, v3.HandlerMetadata(HealthServiceServerEndpoints))
return s.Handle(s.NewHandler(&HealthService{h}, append(nopts, opts...)...))
}