From 43aa8179259d0eba7b07672aa28c46e8cb852bb7 Mon Sep 17 00:00:00 2001 From: AlexStocks <alexstocks@foxmail.com> Date: Sun, 3 Jan 2021 02:40:07 +0800 Subject: [PATCH] fix filter linter error --- filter/filter_impl/auth/sign_util.go | 8 ++++++- metadata/report/zookeeper/report_test.go | 5 ++++- .../service/inmemory/service_proxy_test.go | 21 ++++++++++++------- 3 files changed, 25 insertions(+), 9 deletions(-) diff --git a/filter/filter_impl/auth/sign_util.go b/filter/filter_impl/auth/sign_util.go index 45170bb81..cb185376c 100644 --- a/filter/filter_impl/auth/sign_util.go +++ b/filter/filter_impl/auth/sign_util.go @@ -26,6 +26,10 @@ import ( "strings" ) +import ( + "github.com/apache/dubbo-go/common/logger" +) + // Sign gets a signature string with given bytes func Sign(metadata, key string) string { return doSign([]byte(metadata), key) @@ -56,7 +60,9 @@ func toBytes(data []interface{}) ([]byte, error) { func doSign(bytes []byte, key string) string { mac := hmac.New(sha256.New, []byte(key)) - mac.Write(bytes) + if _, err := mac.Write(bytes); err != nil { + logger.Error(err) + } signature := mac.Sum(nil) return base64.URLEncoding.EncodeToString(signature) } diff --git a/metadata/report/zookeeper/report_test.go b/metadata/report/zookeeper/report_test.go index adedaaa6f..3f927b1af 100644 --- a/metadata/report/zookeeper/report_test.go +++ b/metadata/report/zookeeper/report_test.go @@ -144,7 +144,10 @@ func (suite *zookeeperMetadataReportTestSuite) testGetServiceDefinition() { func test1(t *testing.T) { testCluster, err := zk.StartTestCluster(1, nil, nil) assert.NoError(t, err) - defer testCluster.Stop() + defer func() { + err := testCluster.Stop() + assert.Nil(t, err) + }() url := newProviderRegistryUrl("127.0.0.1", testCluster.Servers[0].Port) mf := extension.GetMetadataReportFactory("zookeeper") diff --git a/metadata/service/inmemory/service_proxy_test.go b/metadata/service/inmemory/service_proxy_test.go index f7fc8fd88..01d9206f4 100644 --- a/metadata/service/inmemory/service_proxy_test.go +++ b/metadata/service/inmemory/service_proxy_test.go @@ -48,13 +48,20 @@ func TestMetadataServiceProxy_GetExportedURLs(t *testing.T) { // when we implement them, adding UT func TestNewMetadataService(t *testing.T) { pxy := createPxy() - pxy.ServiceName() - pxy.PublishServiceDefinition(&common.URL{}) - pxy.GetServiceDefinition(constant.ANY_VALUE, constant.ANY_VALUE, constant.ANY_VALUE) - pxy.Version() - pxy.GetSubscribedURLs() - pxy.UnsubscribeURL(&common.URL{}) - pxy.GetServiceDefinitionByServiceKey("any") + _, err := pxy.ServiceName() + assert.Nil(t, err) + err = pxy.PublishServiceDefinition(&common.URL{}) + assert.Nil(t, err) + _, err = pxy.GetServiceDefinition(constant.ANY_VALUE, constant.ANY_VALUE, constant.ANY_VALUE) + assert.Nil(t, err) + _, err = pxy.Version() + assert.Nil(t, err) + _, err = pxy.GetSubscribedURLs() + assert.Nil(t, err) + err = pxy.UnsubscribeURL(&common.URL{}) + assert.Nil(t, err) + _, err = pxy.GetServiceDefinitionByServiceKey("any") + assert.Nil(t, err) pxy.ExportURL(&common.URL{}) pxy.SubscribeURL(&common.URL{}) pxy.MethodMapper() -- GitLab