Compare commits
41 Commits
Author | SHA1 | Date | |
---|---|---|---|
8bc98510eb | |||
ed0f35133d | |||
c36b9e002f | |||
106ef7ba77 | |||
67d5795e89 | |||
29507e05c2 | |||
e1824d489f | |||
d04faa57f4 | |||
|
ca4217c39b | ||
ee7b577836 | |||
|
ee00f5b23a | ||
cb8eefb5cc | |||
|
5f77c1bcd4 | ||
c3254e64b0 | |||
|
625714c64f | ||
0bead0e5e5 | |||
|
98bc5e8f2d | ||
e54ebcf3b8 | |||
|
caa3516c41 | ||
9b97c43cd2 | |||
|
77b20afc4a | ||
42d74ac2d3 | |||
|
5a2b527e50 | ||
d135d10118 | |||
|
dfd95b422b | ||
8449ef31ff | |||
|
5cb00f71ae | ||
50b15cffbe | |||
|
64bc5fbbd0 | ||
7767cfb631 | |||
|
c987c7b8ce | ||
fcc32e1858 | |||
|
d35c84de91 | ||
259428c24f | |||
|
d350e6eaec | ||
145dd9efd2 | |||
|
c07c3dea24 | ||
3e391f0cda | |||
821ac7b986 | |||
|
d07cc91d74 | ||
|
dd31aa13b7 |
@ -1,3 +1,5 @@
|
|||||||
package service
|
package service
|
||||||
|
|
||||||
//go:generate protoc -I./proto -I. --go-grpc_out=paths=source_relative:./proto --go_out=paths=source_relative:./proto --go-micro_out=components=micro|grpc,standalone=true,debug=true,paths=source_relative:./micro proto/service.proto
|
//go:generate protoc -I./proto -I. --go_out=paths=source_relative:./proto proto/service.proto
|
||||||
|
//go:generate protoc -I./proto -I. --go-micro_out=components=micro,standalone=false,debug=true,paths=source_relative:./proto proto/service.proto
|
||||||
|
//go:generate protoc -I./proto -I. --go-micro_out=components=grpc,standalone=true,debug=true,paths=source_relative:./micro proto/service.proto
|
||||||
|
14
go.mod
14
go.mod
@ -1,20 +1,14 @@
|
|||||||
module go.unistack.org/micro-config-service/v3
|
module go.unistack.org/micro-config-service/v4
|
||||||
|
|
||||||
go 1.18
|
go 1.20
|
||||||
|
|
||||||
require (
|
require (
|
||||||
dario.cat/mergo v1.0.0
|
dario.cat/mergo v1.0.0
|
||||||
go.unistack.org/micro-server-http/v3 v3.11.11
|
go.unistack.org/micro/v4 v4.0.17
|
||||||
go.unistack.org/micro/v3 v3.10.44
|
|
||||||
google.golang.org/grpc v1.62.1
|
|
||||||
google.golang.org/protobuf v1.33.0
|
google.golang.org/protobuf v1.33.0
|
||||||
)
|
)
|
||||||
|
|
||||||
require (
|
require (
|
||||||
github.com/golang/protobuf v1.5.4 // indirect
|
github.com/google/go-cmp v0.5.9 // indirect
|
||||||
github.com/google/uuid v1.6.0 // indirect
|
github.com/google/uuid v1.6.0 // indirect
|
||||||
golang.org/x/net v0.22.0 // indirect
|
|
||||||
golang.org/x/sys v0.18.0 // indirect
|
|
||||||
golang.org/x/text v0.14.0 // indirect
|
|
||||||
google.golang.org/genproto/googleapis/rpc v0.0.0-20240304212257-790db918fca8 // indirect
|
|
||||||
)
|
)
|
||||||
|
21
go.sum
21
go.sum
@ -1,24 +1,11 @@
|
|||||||
dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk=
|
dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk=
|
||||||
dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
|
dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
|
||||||
github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
|
github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
|
||||||
github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
|
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
|
||||||
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
|
|
||||||
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
|
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
|
||||||
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
||||||
go.unistack.org/micro-server-http/v3 v3.11.11 h1:t9uPcXwtNjeCy6fj6LGY7F4dmHMXZ96U9vqNzD4gb6A=
|
go.unistack.org/micro/v4 v4.0.17 h1:mF7uM+J4ILdG+1fcwzKYCwDlxhdbF/e1WnGzKKLnIXc=
|
||||||
go.unistack.org/micro-server-http/v3 v3.11.11/go.mod h1:gCWne+4AHidpl6oYDRygkEXbC0N8V0LW+TKBdYMrzdk=
|
go.unistack.org/micro/v4 v4.0.17/go.mod h1:ZDgU9931vm2l7X6RN/6UuwRIVp24GRdmQ7dKmegArk4=
|
||||||
go.unistack.org/micro/v3 v3.10.44 h1:Vgyy9BrJOSdFvo29/klrgIBE/Nme9E8udPAljos34o0=
|
|
||||||
go.unistack.org/micro/v3 v3.10.44/go.mod h1:erMgt3Bl7vQQ0e9UpQyR5NlLiZ9pKeEJ9+1tfYFaqUg=
|
|
||||||
golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc=
|
|
||||||
golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
|
|
||||||
golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
|
|
||||||
golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
|
||||||
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
|
|
||||||
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
|
|
||||||
google.golang.org/genproto/googleapis/rpc v0.0.0-20240304212257-790db918fca8 h1:IR+hp6ypxjH24bkMfEJ0yHR21+gwPWdV+/IBrPQyn3k=
|
|
||||||
google.golang.org/genproto/googleapis/rpc v0.0.0-20240304212257-790db918fca8/go.mod h1:UCOku4NytXMJuLQE5VuqA5lX3PcHCBo8pxNyvkf4xBs=
|
|
||||||
google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk=
|
|
||||||
google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE=
|
|
||||||
google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
|
google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
|
||||||
google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
|
google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
|
||||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||||
|
@ -1,31 +0,0 @@
|
|||||||
// Code generated by protoc-gen-go-micro. DO NOT EDIT.
|
|
||||||
// versions:
|
|
||||||
// - protoc-gen-go-micro v3.10.2
|
|
||||||
// - protoc v3.21.12
|
|
||||||
// source: service.proto
|
|
||||||
|
|
||||||
package servicepb
|
|
||||||
|
|
||||||
import (
|
|
||||||
context "context"
|
|
||||||
proto "go.unistack.org/micro-config-service/v3/proto"
|
|
||||||
v3 "go.unistack.org/micro-server-http/v3"
|
|
||||||
client "go.unistack.org/micro/v3/client"
|
|
||||||
)
|
|
||||||
|
|
||||||
var (
|
|
||||||
ConfigName = "Config"
|
|
||||||
)
|
|
||||||
var (
|
|
||||||
ConfigServerEndpoints = []v3.EndpointMetadata{}
|
|
||||||
)
|
|
||||||
|
|
||||||
type ConfigClient interface {
|
|
||||||
Load(ctx context.Context, req *proto.LoadRequest, opts ...client.CallOption) (*proto.LoadResponse, error)
|
|
||||||
Save(ctx context.Context, req *proto.SaveRequest, opts ...client.CallOption) (*proto.SaveResponse, error)
|
|
||||||
}
|
|
||||||
|
|
||||||
type ConfigServer interface {
|
|
||||||
Load(ctx context.Context, req *proto.LoadRequest, rsp *proto.LoadResponse) error
|
|
||||||
Save(ctx context.Context, req *proto.SaveRequest, rsp *proto.SaveResponse) error
|
|
||||||
}
|
|
@ -1,64 +1,65 @@
|
|||||||
// Code generated by protoc-gen-go-micro. DO NOT EDIT.
|
// Code generated by protoc-gen-go-micro. DO NOT EDIT.
|
||||||
// protoc-gen-go-micro version: v3.10.2
|
// protoc-gen-go-micro version: v4.0.2
|
||||||
// source: service.proto
|
// source: service.proto
|
||||||
|
|
||||||
package servicepb
|
package servicepb
|
||||||
|
|
||||||
import (
|
import (
|
||||||
context "context"
|
context "context"
|
||||||
proto "go.unistack.org/micro-config-service/v3/proto"
|
proto "go.unistack.org/micro-config-service/v4/proto"
|
||||||
client "go.unistack.org/micro/v3/client"
|
client "go.unistack.org/micro/v4/client"
|
||||||
server "go.unistack.org/micro/v3/server"
|
options "go.unistack.org/micro/v4/options"
|
||||||
|
server "go.unistack.org/micro/v4/server"
|
||||||
)
|
)
|
||||||
|
|
||||||
type configClient struct {
|
type configServiceClient struct {
|
||||||
c client.Client
|
c client.Client
|
||||||
name string
|
name string
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewConfigClient(name string, c client.Client) ConfigClient {
|
func NewConfigServiceClient(name string, c client.Client) proto.ConfigServiceClient {
|
||||||
return &configClient{c: c, name: name}
|
return &configServiceClient{c: c, name: name}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *configClient) Load(ctx context.Context, req *proto.LoadRequest, opts ...client.CallOption) (*proto.LoadResponse, error) {
|
func (c *configServiceClient) Load(ctx context.Context, req *proto.LoadRequest, opts ...options.Option) (*proto.LoadResponse, error) {
|
||||||
rsp := &proto.LoadResponse{}
|
rsp := &proto.LoadResponse{}
|
||||||
err := c.c.Call(ctx, c.c.NewRequest(c.name, "Config.Load", req), rsp, opts...)
|
err := c.c.Call(ctx, c.c.NewRequest(c.name, "ConfigService.Load", req), rsp, opts...)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
return rsp, nil
|
return rsp, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *configClient) Save(ctx context.Context, req *proto.SaveRequest, opts ...client.CallOption) (*proto.SaveResponse, error) {
|
func (c *configServiceClient) Save(ctx context.Context, req *proto.SaveRequest, opts ...options.Option) (*proto.SaveResponse, error) {
|
||||||
rsp := &proto.SaveResponse{}
|
rsp := &proto.SaveResponse{}
|
||||||
err := c.c.Call(ctx, c.c.NewRequest(c.name, "Config.Save", req), rsp, opts...)
|
err := c.c.Call(ctx, c.c.NewRequest(c.name, "ConfigService.Save", req), rsp, opts...)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
return rsp, nil
|
return rsp, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
type configServer struct {
|
type configServiceServer struct {
|
||||||
ConfigServer
|
proto.ConfigServiceServer
|
||||||
}
|
}
|
||||||
|
|
||||||
func (h *configServer) Load(ctx context.Context, req *proto.LoadRequest, rsp *proto.LoadResponse) error {
|
func (h *configServiceServer) Load(ctx context.Context, req *proto.LoadRequest, rsp *proto.LoadResponse) error {
|
||||||
return h.ConfigServer.Load(ctx, req, rsp)
|
return h.ConfigServiceServer.Load(ctx, req, rsp)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (h *configServer) Save(ctx context.Context, req *proto.SaveRequest, rsp *proto.SaveResponse) error {
|
func (h *configServiceServer) Save(ctx context.Context, req *proto.SaveRequest, rsp *proto.SaveResponse) error {
|
||||||
return h.ConfigServer.Save(ctx, req, rsp)
|
return h.ConfigServiceServer.Save(ctx, req, rsp)
|
||||||
}
|
}
|
||||||
|
|
||||||
func RegisterConfigServer(s server.Server, sh ConfigServer, opts ...server.HandlerOption) error {
|
func RegisterConfigServiceServer(s server.Server, sh proto.ConfigServiceServer, opts ...options.Option) error {
|
||||||
type config interface {
|
type configService interface {
|
||||||
Load(ctx context.Context, req *proto.LoadRequest, rsp *proto.LoadResponse) error
|
Load(ctx context.Context, req *proto.LoadRequest, rsp *proto.LoadResponse) error
|
||||||
Save(ctx context.Context, req *proto.SaveRequest, rsp *proto.SaveResponse) error
|
Save(ctx context.Context, req *proto.SaveRequest, rsp *proto.SaveResponse) error
|
||||||
}
|
}
|
||||||
type Config struct {
|
type ConfigService struct {
|
||||||
config
|
configService
|
||||||
}
|
}
|
||||||
h := &configServer{sh}
|
h := &configServiceServer{sh}
|
||||||
var nopts []server.HandlerOption
|
var nopts []options.Option
|
||||||
return s.Handle(s.NewHandler(&Config{h}, append(nopts, opts...)...))
|
return s.Handle(&ConfigService{h}, append(nopts, opts...)...)
|
||||||
}
|
}
|
||||||
|
12
options.go
12
options.go
@ -1,20 +1,20 @@
|
|||||||
package service
|
package service
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"go.unistack.org/micro/v3/client"
|
"go.unistack.org/micro/v4/client"
|
||||||
"go.unistack.org/micro/v3/config"
|
"go.unistack.org/micro/v4/options"
|
||||||
)
|
)
|
||||||
|
|
||||||
type clientKey struct{}
|
type clientKey struct{}
|
||||||
|
|
||||||
// Client to call config service
|
// Client to call config service
|
||||||
func Client(c client.Client) config.Option {
|
func Client(c client.Client) options.Option {
|
||||||
return config.SetOption(clientKey{}, c)
|
return options.ContextOption(clientKey{}, c)
|
||||||
}
|
}
|
||||||
|
|
||||||
type serviceKey struct{}
|
type serviceKey struct{}
|
||||||
|
|
||||||
// Service to which data load
|
// Service to which data load
|
||||||
func Service(s string) config.Option {
|
func Service(s string) options.Option {
|
||||||
return config.SetOption(serviceKey{}, s)
|
return options.ContextOption(serviceKey{}, s)
|
||||||
}
|
}
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
// Code generated by protoc-gen-go. DO NOT EDIT.
|
// Code generated by protoc-gen-go. DO NOT EDIT.
|
||||||
// versions:
|
// versions:
|
||||||
// protoc-gen-go v1.26.0
|
// protoc-gen-go v1.26.0
|
||||||
// protoc v3.21.12
|
// protoc v4.23.4
|
||||||
// source: service.proto
|
// source: service.proto
|
||||||
|
|
||||||
package servicepb
|
package servicepb
|
||||||
@ -221,19 +221,19 @@ var file_service_proto_rawDesc = []byte{
|
|||||||
0x69, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x73, 0x65, 0x72, 0x76, 0x69,
|
0x69, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x73, 0x65, 0x72, 0x76, 0x69,
|
||||||
0x63, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x02, 0x20, 0x01,
|
0x63, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x02, 0x20, 0x01,
|
||||||
0x28, 0x0c, 0x52, 0x06, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x22, 0x0e, 0x0a, 0x0c, 0x53, 0x61,
|
0x28, 0x0c, 0x52, 0x06, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x22, 0x0e, 0x0a, 0x0c, 0x53, 0x61,
|
||||||
0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x32, 0x76, 0x0a, 0x06, 0x43, 0x6f,
|
0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x32, 0x7d, 0x0a, 0x0d, 0x43, 0x6f,
|
||||||
0x6e, 0x66, 0x69, 0x67, 0x12, 0x35, 0x0a, 0x04, 0x4c, 0x6f, 0x61, 0x64, 0x12, 0x14, 0x2e, 0x73,
|
0x6e, 0x66, 0x69, 0x67, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x35, 0x0a, 0x04, 0x4c,
|
||||||
0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x4c, 0x6f, 0x61, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65,
|
0x6f, 0x61, 0x64, 0x12, 0x14, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x4c, 0x6f,
|
||||||
0x73, 0x74, 0x1a, 0x15, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x4c, 0x6f, 0x61,
|
0x61, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x15, 0x2e, 0x73, 0x65, 0x72, 0x76,
|
||||||
0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x35, 0x0a, 0x04, 0x53,
|
0x69, 0x63, 0x65, 0x2e, 0x4c, 0x6f, 0x61, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
|
||||||
0x61, 0x76, 0x65, 0x12, 0x14, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x53, 0x61,
|
0x22, 0x00, 0x12, 0x35, 0x0a, 0x04, 0x53, 0x61, 0x76, 0x65, 0x12, 0x14, 0x2e, 0x73, 0x65, 0x72,
|
||||||
0x76, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x15, 0x2e, 0x73, 0x65, 0x72, 0x76,
|
0x76, 0x69, 0x63, 0x65, 0x2e, 0x53, 0x61, 0x76, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
|
||||||
0x69, 0x63, 0x65, 0x2e, 0x53, 0x61, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
|
0x1a, 0x15, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x53, 0x61, 0x76, 0x65, 0x52,
|
||||||
0x22, 0x00, 0x42, 0x39, 0x5a, 0x37, 0x67, 0x6f, 0x2e, 0x75, 0x6e, 0x69, 0x73, 0x74, 0x61, 0x63,
|
0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, 0x39, 0x5a, 0x37, 0x67, 0x6f, 0x2e,
|
||||||
0x6b, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x6d, 0x69, 0x63, 0x72, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x66,
|
0x75, 0x6e, 0x69, 0x73, 0x74, 0x61, 0x63, 0x6b, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x6d, 0x69, 0x63,
|
||||||
0x69, 0x67, 0x2d, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x76, 0x33, 0x2f, 0x70, 0x72,
|
0x72, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2d, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63,
|
||||||
0x6f, 0x74, 0x6f, 0x3b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x70, 0x62, 0x62, 0x06, 0x70,
|
0x65, 0x2f, 0x76, 0x34, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x3b, 0x73, 0x65, 0x72, 0x76, 0x69,
|
||||||
0x72, 0x6f, 0x74, 0x6f, 0x33,
|
0x63, 0x65, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
|
||||||
}
|
}
|
||||||
|
|
||||||
var (
|
var (
|
||||||
@ -256,10 +256,10 @@ var file_service_proto_goTypes = []interface{}{
|
|||||||
(*SaveResponse)(nil), // 3: service.SaveResponse
|
(*SaveResponse)(nil), // 3: service.SaveResponse
|
||||||
}
|
}
|
||||||
var file_service_proto_depIdxs = []int32{
|
var file_service_proto_depIdxs = []int32{
|
||||||
0, // 0: service.Config.Load:input_type -> service.LoadRequest
|
0, // 0: service.ConfigService.Load:input_type -> service.LoadRequest
|
||||||
2, // 1: service.Config.Save:input_type -> service.SaveRequest
|
2, // 1: service.ConfigService.Save:input_type -> service.SaveRequest
|
||||||
1, // 2: service.Config.Load:output_type -> service.LoadResponse
|
1, // 2: service.ConfigService.Load:output_type -> service.LoadResponse
|
||||||
3, // 3: service.Config.Save:output_type -> service.SaveResponse
|
3, // 3: service.ConfigService.Save:output_type -> service.SaveResponse
|
||||||
2, // [2:4] is the sub-list for method output_type
|
2, // [2:4] is the sub-list for method output_type
|
||||||
0, // [0:2] is the sub-list for method input_type
|
0, // [0:2] is the sub-list for method input_type
|
||||||
0, // [0:0] is the sub-list for extension type_name
|
0, // [0:0] is the sub-list for extension type_name
|
||||||
|
@ -1,9 +1,9 @@
|
|||||||
syntax = "proto3";
|
syntax = "proto3";
|
||||||
|
|
||||||
package service;
|
package service;
|
||||||
option go_package="go.unistack.org/micro-config-service/v3/proto;servicepb";
|
option go_package="go.unistack.org/micro-config-service/v4/proto;servicepb";
|
||||||
|
|
||||||
service Config {
|
service ConfigService {
|
||||||
rpc Load(LoadRequest) returns (LoadResponse) {};
|
rpc Load(LoadRequest) returns (LoadResponse) {};
|
||||||
rpc Save(SaveRequest) returns (SaveResponse) {};
|
rpc Save(SaveRequest) returns (SaveResponse) {};
|
||||||
}
|
}
|
||||||
|
@ -1,146 +0,0 @@
|
|||||||
// Code generated by protoc-gen-go-grpc. DO NOT EDIT.
|
|
||||||
// versions:
|
|
||||||
// - protoc-gen-go-grpc v1.3.0
|
|
||||||
// - protoc v3.21.12
|
|
||||||
// source: service.proto
|
|
||||||
|
|
||||||
package servicepb
|
|
||||||
|
|
||||||
import (
|
|
||||||
context "context"
|
|
||||||
grpc "google.golang.org/grpc"
|
|
||||||
codes "google.golang.org/grpc/codes"
|
|
||||||
status "google.golang.org/grpc/status"
|
|
||||||
)
|
|
||||||
|
|
||||||
// This is a compile-time assertion to ensure that this generated file
|
|
||||||
// is compatible with the grpc package it is being compiled against.
|
|
||||||
// Requires gRPC-Go v1.32.0 or later.
|
|
||||||
const _ = grpc.SupportPackageIsVersion7
|
|
||||||
|
|
||||||
const (
|
|
||||||
Config_Load_FullMethodName = "/service.Config/Load"
|
|
||||||
Config_Save_FullMethodName = "/service.Config/Save"
|
|
||||||
)
|
|
||||||
|
|
||||||
// ConfigClient is the client API for Config service.
|
|
||||||
//
|
|
||||||
// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream.
|
|
||||||
type ConfigClient interface {
|
|
||||||
Load(ctx context.Context, in *LoadRequest, opts ...grpc.CallOption) (*LoadResponse, error)
|
|
||||||
Save(ctx context.Context, in *SaveRequest, opts ...grpc.CallOption) (*SaveResponse, error)
|
|
||||||
}
|
|
||||||
|
|
||||||
type configClient struct {
|
|
||||||
cc grpc.ClientConnInterface
|
|
||||||
}
|
|
||||||
|
|
||||||
func NewConfigClient(cc grpc.ClientConnInterface) ConfigClient {
|
|
||||||
return &configClient{cc}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *configClient) Load(ctx context.Context, in *LoadRequest, opts ...grpc.CallOption) (*LoadResponse, error) {
|
|
||||||
out := new(LoadResponse)
|
|
||||||
err := c.cc.Invoke(ctx, Config_Load_FullMethodName, in, out, opts...)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return out, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *configClient) Save(ctx context.Context, in *SaveRequest, opts ...grpc.CallOption) (*SaveResponse, error) {
|
|
||||||
out := new(SaveResponse)
|
|
||||||
err := c.cc.Invoke(ctx, Config_Save_FullMethodName, in, out, opts...)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return out, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// ConfigServer is the server API for Config service.
|
|
||||||
// All implementations must embed UnimplementedConfigServer
|
|
||||||
// for forward compatibility
|
|
||||||
type ConfigServer interface {
|
|
||||||
Load(context.Context, *LoadRequest) (*LoadResponse, error)
|
|
||||||
Save(context.Context, *SaveRequest) (*SaveResponse, error)
|
|
||||||
mustEmbedUnimplementedConfigServer()
|
|
||||||
}
|
|
||||||
|
|
||||||
// UnimplementedConfigServer must be embedded to have forward compatible implementations.
|
|
||||||
type UnimplementedConfigServer struct {
|
|
||||||
}
|
|
||||||
|
|
||||||
func (UnimplementedConfigServer) Load(context.Context, *LoadRequest) (*LoadResponse, error) {
|
|
||||||
return nil, status.Errorf(codes.Unimplemented, "method Load not implemented")
|
|
||||||
}
|
|
||||||
func (UnimplementedConfigServer) Save(context.Context, *SaveRequest) (*SaveResponse, error) {
|
|
||||||
return nil, status.Errorf(codes.Unimplemented, "method Save not implemented")
|
|
||||||
}
|
|
||||||
func (UnimplementedConfigServer) mustEmbedUnimplementedConfigServer() {}
|
|
||||||
|
|
||||||
// UnsafeConfigServer may be embedded to opt out of forward compatibility for this service.
|
|
||||||
// Use of this interface is not recommended, as added methods to ConfigServer will
|
|
||||||
// result in compilation errors.
|
|
||||||
type UnsafeConfigServer interface {
|
|
||||||
mustEmbedUnimplementedConfigServer()
|
|
||||||
}
|
|
||||||
|
|
||||||
func RegisterConfigServer(s grpc.ServiceRegistrar, srv ConfigServer) {
|
|
||||||
s.RegisterService(&Config_ServiceDesc, srv)
|
|
||||||
}
|
|
||||||
|
|
||||||
func _Config_Load_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
|
|
||||||
in := new(LoadRequest)
|
|
||||||
if err := dec(in); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
if interceptor == nil {
|
|
||||||
return srv.(ConfigServer).Load(ctx, in)
|
|
||||||
}
|
|
||||||
info := &grpc.UnaryServerInfo{
|
|
||||||
Server: srv,
|
|
||||||
FullMethod: Config_Load_FullMethodName,
|
|
||||||
}
|
|
||||||
handler := func(ctx context.Context, req interface{}) (interface{}, error) {
|
|
||||||
return srv.(ConfigServer).Load(ctx, req.(*LoadRequest))
|
|
||||||
}
|
|
||||||
return interceptor(ctx, in, info, handler)
|
|
||||||
}
|
|
||||||
|
|
||||||
func _Config_Save_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
|
|
||||||
in := new(SaveRequest)
|
|
||||||
if err := dec(in); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
if interceptor == nil {
|
|
||||||
return srv.(ConfigServer).Save(ctx, in)
|
|
||||||
}
|
|
||||||
info := &grpc.UnaryServerInfo{
|
|
||||||
Server: srv,
|
|
||||||
FullMethod: Config_Save_FullMethodName,
|
|
||||||
}
|
|
||||||
handler := func(ctx context.Context, req interface{}) (interface{}, error) {
|
|
||||||
return srv.(ConfigServer).Save(ctx, req.(*SaveRequest))
|
|
||||||
}
|
|
||||||
return interceptor(ctx, in, info, handler)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Config_ServiceDesc is the grpc.ServiceDesc for Config service.
|
|
||||||
// It's only intended for direct use with grpc.RegisterService,
|
|
||||||
// and not to be introspected or modified (even as a copy)
|
|
||||||
var Config_ServiceDesc = grpc.ServiceDesc{
|
|
||||||
ServiceName: "service.Config",
|
|
||||||
HandlerType: (*ConfigServer)(nil),
|
|
||||||
Methods: []grpc.MethodDesc{
|
|
||||||
{
|
|
||||||
MethodName: "Load",
|
|
||||||
Handler: _Config_Load_Handler,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
MethodName: "Save",
|
|
||||||
Handler: _Config_Save_Handler,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
Streams: []grpc.StreamDesc{},
|
|
||||||
Metadata: "service.proto",
|
|
||||||
}
|
|
27
proto/service_micro.pb.go
Normal file
27
proto/service_micro.pb.go
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
// Code generated by protoc-gen-go-micro. DO NOT EDIT.
|
||||||
|
// versions:
|
||||||
|
// - protoc-gen-go-micro v4.0.2
|
||||||
|
// - protoc v4.23.4
|
||||||
|
// source: service.proto
|
||||||
|
|
||||||
|
package servicepb
|
||||||
|
|
||||||
|
import (
|
||||||
|
context "context"
|
||||||
|
_ "go.unistack.org/micro/v4/client"
|
||||||
|
options "go.unistack.org/micro/v4/options"
|
||||||
|
)
|
||||||
|
|
||||||
|
var (
|
||||||
|
ConfigServiceName = "ConfigService"
|
||||||
|
)
|
||||||
|
|
||||||
|
type ConfigServiceClient interface {
|
||||||
|
Load(ctx context.Context, req *LoadRequest, opts ...options.Option) (*LoadResponse, error)
|
||||||
|
Save(ctx context.Context, req *SaveRequest, opts ...options.Option) (*SaveResponse, error)
|
||||||
|
}
|
||||||
|
|
||||||
|
type ConfigServiceServer interface {
|
||||||
|
Load(ctx context.Context, req *LoadRequest, rsp *LoadResponse) error
|
||||||
|
Save(ctx context.Context, req *SaveRequest, rsp *SaveResponse) error
|
||||||
|
}
|
27
service.go
27
service.go
@ -1,15 +1,16 @@
|
|||||||
package service // import "go.unistack.org/micro-config-service/v3"
|
package service // import "go.unistack.org/micro-config-service/v4"
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
"dario.cat/mergo"
|
"dario.cat/mergo"
|
||||||
pbmicro "go.unistack.org/micro-config-service/v3/micro"
|
pbmicro "go.unistack.org/micro-config-service/v4/micro"
|
||||||
pb "go.unistack.org/micro-config-service/v3/proto"
|
pb "go.unistack.org/micro-config-service/v4/proto"
|
||||||
"go.unistack.org/micro/v3/client"
|
"go.unistack.org/micro/v4/client"
|
||||||
"go.unistack.org/micro/v3/config"
|
"go.unistack.org/micro/v4/config"
|
||||||
rutil "go.unistack.org/micro/v3/util/reflect"
|
"go.unistack.org/micro/v4/options"
|
||||||
|
rutil "go.unistack.org/micro/v4/util/reflect"
|
||||||
)
|
)
|
||||||
|
|
||||||
var _ config.Config = &serviceConfig{}
|
var _ config.Config = &serviceConfig{}
|
||||||
@ -19,14 +20,14 @@ var DefaultStructTag = "service"
|
|||||||
type serviceConfig struct {
|
type serviceConfig struct {
|
||||||
opts config.Options
|
opts config.Options
|
||||||
service string
|
service string
|
||||||
client pbmicro.ConfigClient
|
client pb.ConfigServiceClient
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *serviceConfig) Options() config.Options {
|
func (c *serviceConfig) Options() config.Options {
|
||||||
return c.opts
|
return c.opts
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *serviceConfig) Init(opts ...config.Option) error {
|
func (c *serviceConfig) Init(opts ...options.Option) error {
|
||||||
if err := config.DefaultBeforeInit(c.opts.Context, c); err != nil && !c.opts.AllowFail {
|
if err := config.DefaultBeforeInit(c.opts.Context, c); err != nil && !c.opts.AllowFail {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@ -71,7 +72,7 @@ func (c *serviceConfig) Init(opts ...config.Option) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
c.client = pbmicro.NewConfigClient(c.service, cli)
|
c.client = pbmicro.NewConfigServiceClient(c.service, cli)
|
||||||
|
|
||||||
if err := config.DefaultAfterInit(c.opts.Context, c); err != nil && !c.opts.AllowFail {
|
if err := config.DefaultAfterInit(c.opts.Context, c); err != nil && !c.opts.AllowFail {
|
||||||
return err
|
return err
|
||||||
@ -80,7 +81,7 @@ func (c *serviceConfig) Init(opts ...config.Option) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *serviceConfig) Load(ctx context.Context, opts ...config.LoadOption) error {
|
func (c *serviceConfig) Load(ctx context.Context, opts ...options.Option) error {
|
||||||
if err := config.DefaultBeforeLoad(ctx, c); err != nil && !c.opts.AllowFail {
|
if err := config.DefaultBeforeLoad(ctx, c); err != nil && !c.opts.AllowFail {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@ -131,7 +132,7 @@ func (c *serviceConfig) Load(ctx context.Context, opts ...config.LoadOption) err
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *serviceConfig) Save(ctx context.Context, opts ...config.SaveOption) error {
|
func (c *serviceConfig) Save(ctx context.Context, opts ...options.Option) error {
|
||||||
if err := config.DefaultBeforeSave(ctx, c); err != nil && !c.opts.AllowFail {
|
if err := config.DefaultBeforeSave(ctx, c); err != nil && !c.opts.AllowFail {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@ -166,11 +167,11 @@ func (c *serviceConfig) Name() string {
|
|||||||
return c.opts.Name
|
return c.opts.Name
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *serviceConfig) Watch(ctx context.Context, opts ...config.WatchOption) (config.Watcher, error) {
|
func (c *serviceConfig) Watch(ctx context.Context, opts ...options.Option) (config.Watcher, error) {
|
||||||
return nil, fmt.Errorf("not implemented")
|
return nil, fmt.Errorf("not implemented")
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewConfig(opts ...config.Option) *serviceConfig {
|
func NewConfig(opts ...options.Option) *serviceConfig {
|
||||||
options := config.NewOptions(opts...)
|
options := config.NewOptions(opts...)
|
||||||
if len(options.StructTag) == 0 {
|
if len(options.StructTag) == 0 {
|
||||||
options.StructTag = DefaultStructTag
|
options.StructTag = DefaultStructTag
|
||||||
|
Loading…
Reference in New Issue
Block a user