This is an automated email from the ASF dual-hosted git repository.
tianxiaoliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-mesher.git
The following commit(s) were added to refs/heads/master by this push:
new c166226 upgrade deps (#141)
c166226 is described below
commit c16622610c5085c970824e2f5a3cea0d0a44eaca
Author: Shawn <[email protected]>
AuthorDate: Fri Feb 26 14:45:08 2021 +0800
upgrade deps (#141)
---
go.mod | 11 ++++-------
proxy/bootstrap/bootstrap.go | 6 +++---
proxy/protocol/dubbo/client/chassis/dubbo_chassis_client.go | 6 ++++++
proxy/protocol/dubbo/proxy/dubbo_proxy_ouput_test.go | 4 ++--
proxy/protocol/grpc/client.go | 6 ++++++
proxy/protocol/grpc/reverse_proxy.go | 2 +-
proxy/protocol/http/sidecar.go | 2 +-
7 files changed, 23 insertions(+), 14 deletions(-)
diff --git a/go.mod b/go.mod
index 648ab14..7f69f0f 100644
--- a/go.mod
+++ b/go.mod
@@ -2,24 +2,21 @@ module github.com/apache/servicecomb-mesher
require (
github.com/ghodss/yaml v1.0.0
- github.com/go-chassis/foundation v0.1.1-0.20200825060850-b16bf420f7b3
- github.com/go-chassis/go-archaius v1.3.6-0.20201103103813-43dd1680ebfb
- github.com/go-chassis/go-chassis/v2 v2.1.0
+ github.com/go-chassis/foundation v0.2.2
+ github.com/go-chassis/go-archaius v1.3.6-0.20201210061741-7450779aaeb8
+ github.com/go-chassis/go-chassis/v2 v2.1.1
github.com/go-chassis/gohessian v0.0.0-20180702061429-e5130c25af55
github.com/go-chassis/openlog v1.1.2
- github.com/gogo/protobuf v1.3.0
github.com/patrickmn/go-cache v2.1.0+incompatible
github.com/prometheus/client_golang v0.9.1
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4
github.com/stretchr/testify v1.6.1
github.com/tetratelabs/go2sky v0.1.1-0.20190703154722-1eaab8035277
github.com/urfave/cli v1.20.1-0.20181029213200-b67dcf995b6a
- golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7
+ golang.org/x/net v0.0.0-20201209123823-ac852fbbde11
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45
google.golang.org/grpc v1.27.0
gopkg.in/yaml.v2 v2.3.0
- k8s.io/apimachinery v0.17.0
- k8s.io/client-go v0.17.0
)
replace (
diff --git a/proxy/bootstrap/bootstrap.go b/proxy/bootstrap/bootstrap.go
index 6a378dc..56a00d1 100644
--- a/proxy/bootstrap/bootstrap.go
+++ b/proxy/bootstrap/bootstrap.go
@@ -117,11 +117,11 @@ func SetHandlers() {
chassisHandler.Router,
"ratelimiter-consumer",
"bizkeeper-consumer",
- chassisHandler.Loadbalance,
+ chassisHandler.LoadBalancing,
chassisHandler.Transport,
}, ",")
providerChain := strings.Join([]string{
- chassisHandler.RateLimiterProvider,
+ "ratelimiter-provider",
chassisHandler.Transport,
}, ",")
consumerChainMap := map[string]string{
@@ -129,7 +129,7 @@ func SetHandlers() {
}
providerChainMap := map[string]string{
common.ChainProviderIncoming: providerChain,
- "default":
chassisHandler.RateLimiterProvider,
+ "default": "ratelimiter-provider",
}
chassis.SetDefaultConsumerChains(consumerChainMap)
chassis.SetDefaultProviderChains(providerChainMap)
diff --git a/proxy/protocol/dubbo/client/chassis/dubbo_chassis_client.go
b/proxy/protocol/dubbo/client/chassis/dubbo_chassis_client.go
index 9fb45f9..ae61642 100644
--- a/proxy/protocol/dubbo/client/chassis/dubbo_chassis_client.go
+++ b/proxy/protocol/dubbo/client/chassis/dubbo_chassis_client.go
@@ -62,6 +62,12 @@ func (c *dubboChassisClient) String() string {
func (c *dubboChassisClient) Close() error {
return nil
}
+
+// if your protocol has response status(such as http return 200, 500 status
code),
+// you need to return it according to response
+func (c *dubboChassisClient) Status(rsp interface{}) (status int, err error) {
+ return 0, nil
+}
func (c *dubboChassisClient) Call(ctx context.Context, addr string, inv
*invocation.Invocation, rsp interface{}) error {
resp := rsp.(*dubboClient.WrapResponse)
resp.Resp = &dubbo.DubboRsp{}
diff --git a/proxy/protocol/dubbo/proxy/dubbo_proxy_ouput_test.go
b/proxy/protocol/dubbo/proxy/dubbo_proxy_ouput_test.go
index 62c1d95..0596d34 100644
--- a/proxy/protocol/dubbo/proxy/dubbo_proxy_ouput_test.go
+++ b/proxy/protocol/dubbo/proxy/dubbo_proxy_ouput_test.go
@@ -109,7 +109,7 @@ func TestHandle(t *testing.T) {
}
providerChainMap := map[string]string{
common.ChainProviderIncoming: providerChain,
- "default":
handler.RateLimiterProvider,
+ "default": "ratelimiter-provider",
}
registry.DefaultContractDiscoveryService =
new(MockContractDiscoveryService)
@@ -166,7 +166,7 @@ func TestHandle(t *testing.T) {
}
providerChainMap := map[string]string{
common.ChainProviderIncoming: providerChain,
- "default":
handler.RateLimiterProvider,
+ "default": "ratelimiter-provider",
}
registry.DefaultContractDiscoveryService =
new(MockContractDiscoveryService)
diff --git a/proxy/protocol/grpc/client.go b/proxy/protocol/grpc/client.go
index 641eb4d..df2b6d9 100644
--- a/proxy/protocol/grpc/client.go
+++ b/proxy/protocol/grpc/client.go
@@ -76,6 +76,12 @@ func NewClient(opts client.Options) (client.ProtocolClient,
error) {
}, nil
}
+// if your protocol has response status(such as http return 200, 500 status
code),
+// you need to return it according to response
+func (c *Client) Status(rsp interface{}) (status int, err error) {
+ return 0, nil
+}
+
//Call is a method which uses grpc protocol to transfer invocation
func (c *Client) Call(ctx context.Context, addr string, inv
*invocation.Invocation, rsp interface{}) error {
var err error
diff --git a/proxy/protocol/grpc/reverse_proxy.go
b/proxy/protocol/grpc/reverse_proxy.go
index f35db78..1077c37 100755
--- a/proxy/protocol/grpc/reverse_proxy.go
+++ b/proxy/protocol/grpc/reverse_proxy.go
@@ -30,12 +30,12 @@ import (
"github.com/apache/servicecomb-mesher/proxy/protocol"
"github.com/apache/servicecomb-mesher/proxy/resolver"
"github.com/apache/servicecomb-mesher/proxy/util"
+ "github.com/go-chassis/foundation/stringutil"
"github.com/go-chassis/go-chassis/v2/client/rest"
chassisCommon "github.com/go-chassis/go-chassis/v2/core/common"
"github.com/go-chassis/go-chassis/v2/core/handler"
"github.com/go-chassis/go-chassis/v2/core/invocation"
"github.com/go-chassis/go-chassis/v2/pkg/runtime"
- "github.com/go-chassis/go-chassis/v2/pkg/string"
"github.com/go-chassis/go-chassis/v2/pkg/util/tags"
"github.com/go-chassis/openlog"
"google.golang.org/grpc/codes"
diff --git a/proxy/protocol/http/sidecar.go b/proxy/protocol/http/sidecar.go
index a62a00a..d782657 100755
--- a/proxy/protocol/http/sidecar.go
+++ b/proxy/protocol/http/sidecar.go
@@ -33,6 +33,7 @@ import (
"github.com/apache/servicecomb-mesher/proxy/protocol"
"github.com/apache/servicecomb-mesher/proxy/resolver"
"github.com/apache/servicecomb-mesher/proxy/util"
+ "github.com/go-chassis/foundation/stringutil"
"github.com/go-chassis/go-chassis/v2/client/rest"
chassisCommon "github.com/go-chassis/go-chassis/v2/core/common"
@@ -41,7 +42,6 @@ import (
"github.com/go-chassis/go-chassis/v2/core/invocation"
"github.com/go-chassis/go-chassis/v2/core/loadbalancer"
"github.com/go-chassis/go-chassis/v2/pkg/runtime"
- "github.com/go-chassis/go-chassis/v2/pkg/string"
utiltags "github.com/go-chassis/go-chassis/v2/pkg/util/tags"
"github.com/go-chassis/go-chassis/v2/third_party/forked/afex/hystrix-go/hystrix"
"github.com/go-chassis/openlog"
