cleanup unused parameters

aliyun · Jul 30, 2024 · 521f688 · 521f688
1 parent ee9cb9f
commit 521f688
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/sdk/auth/roa_signature_composer.go b/sdk/auth/roa_signature_composer.go
@@ -33,14 +33,14 @@ func init() {
 	debug = utils.Init("sdk")
 }
 
-func signRoaRequest(request requests.AcsRequest, signer Signer, regionId string) (err error) {
+func signRoaRequest(request requests.AcsRequest, signer Signer) (err error) {
 	// 先获取 accesskey，确保刷新 credential
 	accessKeyId, err := signer.GetAccessKeyId()
 	if err != nil {
 		return err
 	}
 
-	completeROASignParams(request, signer, regionId)
+	completeROASignParams(request, signer)
 	stringToSign := buildRoaStringToSign(request)
 	request.SetStringToSign(stringToSign)
 
@@ -50,7 +50,7 @@ func signRoaRequest(request requests.AcsRequest, signer Signer, regionId string)
 	return
 }
 
-func completeROASignParams(request requests.AcsRequest, signer Signer, regionId string) {
+func completeROASignParams(request requests.AcsRequest, signer Signer) {
 	headerParams := request.GetHeaders()
 
 	// complete query params

diff --git a/sdk/auth/roa_signature_composer_test.go b/sdk/auth/roa_signature_composer_test.go
@@ -46,7 +46,7 @@ func TestRoaSignatureComposer(t *testing.T) {
 	origTestHookGetDate := hookGetDate
 	defer func() { hookGetDate = origTestHookGetDate }()
 	hookGetDate = mockDate
-	signRoaRequest(request, signer, "regionId")
+	signRoaRequest(request, signer)
 	assert.Equal(t, "mock date", request.GetHeaders()["Date"])
 	assert.Equal(t, "acs accessKeyId:degLHXLEN6rMojj+bOlK74U9iic=", request.GetHeaders()["Authorization"])
 }
@@ -63,7 +63,7 @@ func TestRoaSignatureComposer2(t *testing.T) {
 	origTestHookLookupIP := hookGetDate
 	defer func() { hookGetDate = origTestHookLookupIP }()
 	hookGetDate = mockDate
-	signRoaRequest(request, signer, "regionId")
+	signRoaRequest(request, signer)
 	assert.Equal(t, "application/x-www-form-urlencoded", request.GetHeaders()["Content-Type"])
 	assert.Equal(t, "mock date", request.GetHeaders()["Date"])
 	assert.Equal(t, "application/xml", request.GetHeaders()["Accept"])
@@ -81,19 +81,20 @@ func TestRoaSignatureComposer3(t *testing.T) {
 	origTestHookGetDate := hookGetDate
 	defer func() { hookGetDate = origTestHookGetDate }()
 	hookGetDate = mockDate
-	signRoaRequest(request, signer, "regionId")
+	signRoaRequest(request, signer)
 	assert.Equal(t, "mock date", request.GetHeaders()["Date"])
 }
+
 func TestCompleteROASignParams(t *testing.T) {
 	req := requests.NewCommonRequest()
 	req.TransToAcsRequest()
 	sign := signers.NewBearerTokenSigner(credentials.NewBearerTokenCredential("Bearer.Token"))
-	completeROASignParams(req, sign, "cn-hangzhou")
+	completeROASignParams(req, sign)
 	head := req.GetHeaders()
 	assert.Equal(t, "Bearer.Token", head["x-acs-bearer-token"])
 
 	sign1 := signers.NewStsTokenSigner(credentials.NewStsTokenCredential("accessKeyId", "accessKeySecret", "accessKeyStsToken"))
-	completeROASignParams(req, sign1, "cn-hangzhou")
+	completeROASignParams(req, sign1)
 	head = req.GetHeaders()
 	assert.Equal(t, "accessKeyStsToken", head["x-acs-security-token"])
 }
diff --git a/sdk/auth/rpc_signature_composer.go b/sdk/auth/rpc_signature_composer.go
@@ -32,9 +32,8 @@ func signRpcRequest(request requests.AcsRequest, signer Signer, regionId string)
 		return
 	}
 	// remove while retry
-	if _, containsSign := request.GetQueryParams()["Signature"]; containsSign {
-		delete(request.GetQueryParams(), "Signature")
-	}
+	delete(request.GetQueryParams(), "Signature")
+
 	stringToSign := buildRpcStringToSign(request)
 	request.SetStringToSign(stringToSign)
 	signature := signer.Sign(stringToSign, "&")

diff --git a/sdk/auth/signer.go b/sdk/auth/signer.go
@@ -83,7 +83,7 @@ func Sign(request requests.AcsRequest, signer Signer, regionId string) (err erro
 	switch request.GetStyle() {
 	case requests.ROA:
 		{
-			err = signRoaRequest(request, signer, regionId)
+			err = signRoaRequest(request, signer)
 		}
 	case requests.RPC:
 		{