From 82b0641cb5aab18a589cec41676c4962e4516089 Mon Sep 17 00:00:00 2001 From: Allenxuxu <120582243@qq.com> Date: Sat, 11 Dec 2021 14:24:13 +0800 Subject: [PATCH] =?UTF-8?q?fix(rpc):=20rpc=20client=20selector=20https://g?= =?UTF-8?q?ithub.com/grpc/grpc-go/issues/4717=20https://github.com/grpc/gr?= =?UTF-8?q?pc-go/releases/tag/v1.42.0=20https://github.com/grpc/grpc-go/pu?= =?UTF-8?q?ll/4817=20=E4=BB=8E=201.42.0=20=E4=B9=8B=E5=90=8E=EF=BC=8Cgrpc-?= =?UTF-8?q?go=20=E4=BD=BF=E7=94=A8=20url.Parse=20=E6=9D=A5=E8=A7=A3?= =?UTF-8?q?=E6=9E=90=20dial=20target=20=EF=BC=8C=E5=8D=B3=20"scheme://xxx/?= =?UTF-8?q?xxx"=20,=20=E4=B9=8B=E5=89=8D=E7=9A=84=20secheme=20=E5=90=AB?= =?UTF-8?q?=E6=9C=89=E9=9D=9E=E6=B3=95=E5=AD=97=E7=AC=A6=E4=B8=8B=E5=88=92?= =?UTF-8?q?=E7=BA=BF=E4=BC=9A=E5=AF=BC=E8=87=B4=E8=A7=A3=E6=9E=90=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rpc/client/resolver/resolver.go | 2 +- rpc/client/selector/registry/registry_selector.go | 2 +- rpc/client/selector/registry/registry_selector_test.go | 10 ++++++++++ rpc/client/selector/static/static_selector.go | 2 +- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/rpc/client/resolver/resolver.go b/rpc/client/resolver/resolver.go index 8cd0552..b90b9e5 100644 --- a/rpc/client/resolver/resolver.go +++ b/rpc/client/resolver/resolver.go @@ -11,7 +11,7 @@ import ( "google.golang.org/grpc/resolver" ) -// "stark_registry:///{service}" +// "stark-registry:///{service}" type builder struct { scheme string selector *atomic.Value diff --git a/rpc/client/selector/registry/registry_selector.go b/rpc/client/selector/registry/registry_selector.go index d7b9b02..f94eeb5 100644 --- a/rpc/client/selector/registry/registry_selector.go +++ b/rpc/client/selector/registry/registry_selector.go @@ -12,7 +12,7 @@ import ( "google.golang.org/grpc/resolver" ) -const scheme = "stark_registry" +const scheme = "stark-registry" var _selector atomic.Value diff --git a/rpc/client/selector/registry/registry_selector_test.go b/rpc/client/selector/registry/registry_selector_test.go index 1b9f595..ed42e9e 100644 --- a/rpc/client/selector/registry/registry_selector_test.go +++ b/rpc/client/selector/registry/registry_selector_test.go @@ -1,6 +1,8 @@ package registry import ( + "fmt" + "net/url" "testing" "github.com/Allenxuxu/stark/rpc/client/selector" @@ -82,3 +84,11 @@ func TestRegistrySelectorFilter(t *testing.T) { assert.Equal(t, service[0].Name, "foo") assert.Equal(t, service[0].Version, version) } + +func Test_schema(t *testing.T) { + _, err := url.Parse(fmt.Sprintf("%s:///%s", "stark_registry", "test")) + assert.Error(t, err) + + _, err = url.Parse(fmt.Sprintf("%s:///%s", "stark-registry", "test")) + assert.NoError(t, err) +} diff --git a/rpc/client/selector/static/static_selector.go b/rpc/client/selector/static/static_selector.go index f9900cf..1838779 100644 --- a/rpc/client/selector/static/static_selector.go +++ b/rpc/client/selector/static/static_selector.go @@ -11,7 +11,7 @@ import ( "google.golang.org/grpc/resolver" ) -const scheme = "stark_static" +const scheme = "stark-static" var _selector atomic.Value