zeromicro/go-zero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: refactoring mapping name (#2168)

Browse Source
This commit is contained in:
Kevin Wan
2022-07-19 09:58:46 +08:00
committed by GitHub
parent 8d567b5508
commit 2a6f801978
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
gateway/config.go
View File

@@ -11,12 +11,12 @@ type (
// GatewayConf is the configuration for gateway. // GatewayConf is the configuration for gateway.
GatewayConf struct { GatewayConf struct {
rest.RestConf rest.RestConf
Upstreams []upstream Upstreams []Upstream
Timeout time.Duration `json:",default=5s"` Timeout time.Duration `json:",default=5s"`
} }
// mapping is a mapping between a gateway route and a upstream rpc method. // RouteMapping is a mapping between a gateway route and an upstream rpc method.
mapping struct { RouteMapping struct {
// Method is the HTTP method, like GET, POST, PUT, DELETE. // Method is the HTTP method, like GET, POST, PUT, DELETE.
Method string Method string
// Path is the HTTP path. // Path is the HTTP path.
@@ -25,14 +25,14 @@ type (
RpcPath string RpcPath string
} }
// upstream is the configuration for upstream. // Upstream is the configuration for an upstream.
upstream struct { Upstream struct {
// Grpc is the target of upstream. // Grpc is the target of the upstream.
Grpc zrpc.RpcClientConf Grpc zrpc.RpcClientConf
// ProtoSet is the file of proto set, like hello.pb // ProtoSet is the file of proto set, like hello.pb
ProtoSet string `json:",optional"` ProtoSet string `json:",optional"`
// Mapping is the mapping between gateway routes and upstream rpc methods. // Mapping is the mapping between gateway routes and Upstream rpc methods.
// Keep it blank if annotations are added in rpc methods. // Keep it blank if annotations are added in rpc methods.
Mapping []mapping `json:",optional"` Mapping []RouteMapping `json:",optional"`
} }
) )

6
gateway/server.go
View File

@@ -23,7 +23,7 @@ type (
// Server is a gateway server. // Server is a gateway server.
Server struct { Server struct {
*rest.Server *rest.Server
upstreams []upstream upstreams []Upstream
timeout time.Duration timeout time.Duration
processHeader func(http.Header) []string processHeader func(http.Header) []string
} }
@@ -63,7 +63,7 @@ func (s *Server) build() error {
source <- up source <- up
} }
}, func(item interface{}, writer mr.Writer, cancel func(error)) { }, func(item interface{}, writer mr.Writer, cancel func(error)) {
up := item.(upstream) up := item.(Upstream)
cli := zrpc.MustNewClient(up.Grpc) cli := zrpc.MustNewClient(up.Grpc)
source, err := s.createDescriptorSource(cli, up) source, err := s.createDescriptorSource(cli, up)
if err != nil { if err != nil {
@@ -138,7 +138,7 @@ func (s *Server) buildHandler(source grpcurl.DescriptorSource, resolver jsonpb.A
} }
} }
func (s *Server) createDescriptorSource(cli zrpc.Client, up upstream) (grpcurl.DescriptorSource, error) { func (s *Server) createDescriptorSource(cli zrpc.Client, up Upstream) (grpcurl.DescriptorSource, error) {
var source grpcurl.DescriptorSource var source grpcurl.DescriptorSource
var err error var err error