From c8c2ec42b151192beca6bcd157e1920b97dc2c75 Mon Sep 17 00:00:00 2001
From: Ooo0oO0o0oO <907709476@qq.com>
Date: Sun, 19 Jan 2020 15:43:31 +0800
Subject: [PATCH] fix comment issue

---
 filter/filter_impl/auth/accesskey_storage_test.go | 5 ++++-
 filter/filter_impl/auth/authenticator.go          | 2 +-
 filter/filter_impl/auth/authenticator_test.go     | 5 ++++-
 filter/filter_impl/auth/consumer_sign.go          | 4 ++--
 filter/filter_impl/auth/consumer_sign_test.go     | 7 +++++--
 filter/filter_impl/auth/provider_auth_test.go     | 8 ++++++--
 filter/filter_impl/auth/sign_util.go              | 4 +---
 filter/filter_impl/auth/sign_util_test.go         | 1 +
 8 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/filter/filter_impl/auth/accesskey_storage_test.go b/filter/filter_impl/auth/accesskey_storage_test.go
index ab734bfb66..1e53174cba 100644
--- a/filter/filter_impl/auth/accesskey_storage_test.go
+++ b/filter/filter_impl/auth/accesskey_storage_test.go
@@ -5,11 +5,14 @@ import (
 	"testing"
 )
 
+import(
+	"github.com/stretchr/testify/assert"
+)
+
 import (
 	"github.com/apache/dubbo-go/common"
 	"github.com/apache/dubbo-go/common/constant"
 	invocation2 "github.com/apache/dubbo-go/protocol/invocation"
-	"github.com/stretchr/testify/assert"
 )
 
 func TestDefaultAccesskeyStorage_GetAccesskeyPair(t *testing.T) {
diff --git a/filter/filter_impl/auth/authenticator.go b/filter/filter_impl/auth/authenticator.go
index a3e20c9e3f..4cc8d3cdd8 100644
--- a/filter/filter_impl/auth/authenticator.go
+++ b/filter/filter_impl/auth/authenticator.go
@@ -69,7 +69,7 @@ func (authenticator *DefaultAuthenticator) Authenticate(invocation protocol.Invo
 	consumer := invocation.AttachmentsByKey(constant.CONSUMER, "")
 	if IsEmpty(accessKeyId, false) || IsEmpty(consumer, false) ||
 		IsEmpty(requestTimestamp, false) || IsEmpty(originSignature, false) {
-		return errors.New("failed to authenticate, maybe consumer not enable the auth")
+		return errors.New("failed to authenticate your ak/sk, maybe the consumer has not enabled the auth")
 	}
 
 	accessKeyPair, err := getAccessKeyPair(invocation, url)
diff --git a/filter/filter_impl/auth/authenticator_test.go b/filter/filter_impl/auth/authenticator_test.go
index 6aba4fe761..f1e014b5c6 100644
--- a/filter/filter_impl/auth/authenticator_test.go
+++ b/filter/filter_impl/auth/authenticator_test.go
@@ -9,11 +9,14 @@ import (
 	"time"
 )
 
+import (
+	"github.com/stretchr/testify/assert"
+)
+
 import (
 	"github.com/apache/dubbo-go/common"
 	"github.com/apache/dubbo-go/common/constant"
 	"github.com/apache/dubbo-go/protocol/invocation"
-	"github.com/stretchr/testify/assert"
 )
 
 func TestDefaultAuthenticator_Authenticate(t *testing.T) {
diff --git a/filter/filter_impl/auth/consumer_sign.go b/filter/filter_impl/auth/consumer_sign.go
index f17d7e5b64..506cb91431 100644
--- a/filter/filter_impl/auth/consumer_sign.go
+++ b/filter/filter_impl/auth/consumer_sign.go
@@ -21,8 +21,8 @@ func init() {
 func (filter *ConsumerSignFilter) Invoke(invoker protocol.Invoker, invocation protocol.Invocation) protocol.Result {
 	logger.Infof("invoking ConsumerSign filter.")
 	url := invoker.GetUrl()
-	shouldAuth := url.GetParamBool(constant.SERVICE_AUTH_KEY, false)
-	if shouldAuth {
+	shouldSign := url.GetParamBool(constant.SERVICE_AUTH_KEY, false)
+	if shouldSign {
 		authenticator := extension.GetAuthenticator(url.GetParam(constant.AUTHENTICATOR_KEY, constant.DEFAULT_AUTHENTICATOR))
 		if err := authenticator.Sign(invocation, &url); err != nil {
 			panic(fmt.Sprintf("Sign for invocation %s # %s failed", url.ServiceKey(), invocation.MethodName()))
diff --git a/filter/filter_impl/auth/consumer_sign_test.go b/filter/filter_impl/auth/consumer_sign_test.go
index 64a1045409..23d6ba1b4e 100644
--- a/filter/filter_impl/auth/consumer_sign_test.go
+++ b/filter/filter_impl/auth/consumer_sign_test.go
@@ -5,14 +5,17 @@ import (
 	"testing"
 )
 
+import (
+	"github.com/golang/mock/gomock"
+	"github.com/stretchr/testify/assert"
+)
+
 import (
 	"github.com/apache/dubbo-go/common"
 	"github.com/apache/dubbo-go/common/constant"
 	"github.com/apache/dubbo-go/protocol"
 	"github.com/apache/dubbo-go/protocol/invocation"
 	"github.com/apache/dubbo-go/protocol/mock"
-	"github.com/golang/mock/gomock"
-	"github.com/stretchr/testify/assert"
 )
 
 func TestConsumerSignFilter_Invoke(t *testing.T) {
diff --git a/filter/filter_impl/auth/provider_auth_test.go b/filter/filter_impl/auth/provider_auth_test.go
index b75b6b7446..56c3f6121b 100644
--- a/filter/filter_impl/auth/provider_auth_test.go
+++ b/filter/filter_impl/auth/provider_auth_test.go
@@ -6,14 +6,18 @@ import (
 	"testing"
 	"time"
 )
+
+import (
+	"github.com/golang/mock/gomock"
+	"github.com/stretchr/testify/assert"
+)
+
 import (
 	"github.com/apache/dubbo-go/common"
 	"github.com/apache/dubbo-go/common/constant"
 	"github.com/apache/dubbo-go/protocol"
 	"github.com/apache/dubbo-go/protocol/invocation"
 	"github.com/apache/dubbo-go/protocol/mock"
-	"github.com/golang/mock/gomock"
-	"github.com/stretchr/testify/assert"
 )
 
 func TestProviderAuthFilter_Invoke(t *testing.T) {
diff --git a/filter/filter_impl/auth/sign_util.go b/filter/filter_impl/auth/sign_util.go
index 5312ec2c0b..5f7e97ed70 100644
--- a/filter/filter_impl/auth/sign_util.go
+++ b/filter/filter_impl/auth/sign_util.go
@@ -47,9 +47,7 @@ func IsEmpty(s string, allowSpace bool) bool {
 		return true
 	}
 	if !allowSpace {
-		if strings.TrimSpace(s) == "" {
-			return true
-		}
+		return strings.TrimSpace(s) == ""
 	}
 	return false
 }
diff --git a/filter/filter_impl/auth/sign_util_test.go b/filter/filter_impl/auth/sign_util_test.go
index 01185f5343..de6154e885 100644
--- a/filter/filter_impl/auth/sign_util_test.go
+++ b/filter/filter_impl/auth/sign_util_test.go
@@ -3,6 +3,7 @@ package auth
 import (
 	"testing"
 )
+
 import (
 	"github.com/stretchr/testify/assert"
 )