Standard interface naming

Signed-off-by: gaort <rutong.grt@alibaba-inc.com>

sdk/auth/credentials/access_key_credential.go

@@ -0,0 +1,34 @@
+package credentials
+
+// Deprecated: Use AccessKeyCredential in this package instead.
+type BaseCredential struct {
+	AccessKeyId     string
+	AccessKeySecret string
+}
+
+type AccessKeyCredential struct {
+	AccessKeyId     string
+	AccessKeySecret string
+}
+
+// Deprecated: Use NewAccessKeyCredential in this package instead.
+func NewBaseCredential(accessKeyId, accessKeySecret string) *BaseCredential {
+	return &BaseCredential{
+		AccessKeyId:     accessKeyId,
+		AccessKeySecret: accessKeySecret,
+	}
+}
+
+func (baseCred *BaseCredential) ToAccessKeyCredential() (*AccessKeyCredential) {
+	return &AccessKeyCredential{
+		AccessKeyId:     baseCred.AccessKeyId,
+		AccessKeySecret: baseCred.AccessKeySecret,
+	}
+}
+
+func NewAccessKeyCredential(accessKeyId, accessKeySecret string) *AccessKeyCredential {
+	return &AccessKeyCredential{
+		AccessKeyId:     accessKeyId,
+		AccessKeySecret: accessKeySecret,
+	}
+}

sdk/auth/credentials/base_credential.go

@@ -1,13 +0,0 @@
-package credentials
-
-type BaseCredential struct {
-	AccessKeyId     string
-	AccessKeySecret string
-}
-
-func NewBaseCredential(accessKeyId, accessKeySecret string) *BaseCredential {
-	return &BaseCredential{
-		AccessKeyId:     accessKeyId,
-		AccessKeySecret: accessKeySecret,
-	}
-}

sdk/auth/credentials/ecs_ram_role.go

@@ -0,0 +1,29 @@
+package credentials
+
+// Deprecated: Use EcsRamRoleCredential in this package instead.
+type StsRoleNameOnEcsCredential struct {
+	RoleName string
+}
+
+// Deprecated: Use NewEcsRamRoleCredential in this package instead.
+func NewStsRoleNameOnEcsCredential(roleName string) *StsRoleNameOnEcsCredential {
+	return &StsRoleNameOnEcsCredential{
+		RoleName: roleName,
+	}
+}
+
+func (oldCred *StsRoleNameOnEcsCredential) ToEcsRamRoleCredential() (*EcsRamRoleCredential) {
+	return &EcsRamRoleCredential{
+		RoleName: oldCred.RoleName,
+	}
+}
+
+type EcsRamRoleCredential struct {
+	RoleName string
+}
+
+func NewEcsRamRoleCredential(roleName string) *EcsRamRoleCredential {
+	return &EcsRamRoleCredential{
+		RoleName: roleName,
+	}
+}

sdk/auth/credentials/sts_role_arn_credential.go

@@ -1,5 +1,6 @@
 package credentials
 
+// Deprecated: Use RamRoleArnCredential in this package instead.
 type StsRoleArnCredential struct {
 	AccessKeyId           string
 	AccessKeySecret       string
@@ -8,6 +9,15 @@ type StsRoleArnCredential struct {
 	RoleSessionExpiration int
 }
 
+type RamRoleArnCredential struct {
+	AccessKeyId           string
+	AccessKeySecret       string
+	RoleArn               string
+	RoleSessionName       string
+	RoleSessionExpiration int
+}
+
+// Deprecated: Use RamRoleArnCredential in this package instead.
 func NewStsRoleArnCredential(accessKeyId, accessKeySecret, roleArn, roleSessionName string, roleSessionExpiration int) *StsRoleArnCredential {
 	return &StsRoleArnCredential{
 		AccessKeyId:           accessKeyId,
@@ -17,3 +27,23 @@ func NewStsRoleArnCredential(accessKeyId, accessKeySecret, roleArn, roleSessionN
 		RoleSessionExpiration: roleSessionExpiration,
 	}
 }
+
+func (oldCred *StsRoleArnCredential) ToRamRoleArnCredential() (*RamRoleArnCredential) {
+	return &RamRoleArnCredential{
+		AccessKeyId:           oldCred.AccessKeyId,
+		AccessKeySecret:       oldCred.AccessKeySecret,
+		RoleArn:               oldCred.RoleArn,
+		RoleSessionName:       oldCred.RoleSessionName,
+		RoleSessionExpiration: oldCred.RoleSessionExpiration,
+	}
+}
+
+func NewRamRoleArnCredential(accessKeyId, accessKeySecret, roleArn, roleSessionName string, roleSessionExpiration int) *RamRoleArnCredential {
+	return &RamRoleArnCredential{
+		AccessKeyId:           accessKeyId,
+		AccessKeySecret:       accessKeySecret,
+		RoleArn:               roleArn,
+		RoleSessionName:       roleSessionName,
+		RoleSessionExpiration: roleSessionExpiration,
+	}
+}

sdk/auth/credentials/sts_role_name_on_ecs_credential.go

@@ -1,11 +0,0 @@
-package credentials
-
-type StsRoleNameOnEcsCredential struct {
-	RoleName string
-}
-
-func NewStsRoleNameOnEcsCredential(roleName string) *StsRoleNameOnEcsCredential {
-	return &StsRoleNameOnEcsCredential{
-		RoleName: roleName,
-	}
-}

sdk/auth/signer.go

@@ -36,25 +36,38 @@ type Signer interface {
 
 func NewSignerWithCredential(credential Credential, commonApi func(request *requests.CommonRequest, signer interface{}) (response *responses.CommonResponse, err error)) (signer Signer, err error) {
 	switch instance := credential.(type) {
-	case *credentials.BaseCredential:
+	case *credentials.AccessKeyCredential:
 		{
-			signer, err = signers.NewSignerV1(instance)
+			signer, err = signers.NewAccessKeySigner(instance)
 		}
 	case *credentials.StsTokenCredential:
 		{
-			signer, err = signers.NewSignerSts(instance)
+			signer, err = signers.NewStsTokenSigner(instance)
 		}
-	case *credentials.StsRoleArnCredential:
+
+	case *credentials.RamRoleArnCredential:
 		{
-			signer, err = signers.NewSignerStsAssumeRole(instance, commonApi)
+			signer, err = signers.NewRamRoleArnSigner(instance, commonApi)
 		}
 	case *credentials.RsaKeyPairCredential:
 		{
 			signer, err = signers.NewSignerKeyPair(instance, commonApi)
 		}
-	case *credentials.StsRoleNameOnEcsCredential:
+	case *credentials.EcsRamRoleCredential:
+		{
+			signer, err = signers.NewEcsRamRoleSigner(instance, commonApi)
+		}
+	case *credentials.BaseCredential: // deprecated user interface
+		{
+			signer, err = signers.NewAccessKeySigner(instance.ToAccessKeyCredential())
+		}
+	case *credentials.StsRoleArnCredential: // deprecated user interface
+		{
+			signer, err = signers.NewRamRoleArnSigner(instance.ToRamRoleArnCredential(), commonApi)
+		}
+	case *credentials.StsRoleNameOnEcsCredential: // deprecated user interface
 		{
-			signer, err = signers.NewSignereEcsInstance(instance, commonApi)
+			signer, err = signers.NewEcsRamRoleSigner(instance.ToEcsRamRoleCredential(), commonApi)
 		}
 	default:
 		message := fmt.Sprintf(errors.UnsupportedCredentialErrorMessage, reflect.TypeOf(credential))

sdk/auth/signers/signer_v1.go → sdk/auth/signers/signer_access_key.go

@@ -18,41 +18,41 @@ import (
 	"github.com/aliyun/alibaba-cloud-sdk-go/sdk/auth/credentials"
 )
 
-type SignerV1 struct {
-	credential *credentials.BaseCredential
+type AccessKeySigner struct {
+	credential *credentials.AccessKeyCredential
 }
 
-func (signer *SignerV1) GetExtraParam() map[string]string {
+func (signer *AccessKeySigner) GetExtraParam() map[string]string {
 	return nil
 }
 
-func NewSignerV1(credential *credentials.BaseCredential) (*SignerV1, error) {
-	return &SignerV1{
+func NewAccessKeySigner(credential *credentials.AccessKeyCredential) (*AccessKeySigner, error) {
+	return &AccessKeySigner{
 		credential: credential,
 	}, nil
 }
 
-func (*SignerV1) GetName() string {
+func (*AccessKeySigner) GetName() string {
 	return "HMAC-SHA1"
 }
 
-func (*SignerV1) GetType() string {
+func (*AccessKeySigner) GetType() string {
 	return ""
 }
 
-func (*SignerV1) GetVersion() string {
+func (*AccessKeySigner) GetVersion() string {
 	return "1.0"
 }
 
-func (signer *SignerV1) GetAccessKeyId() string {
+func (signer *AccessKeySigner) GetAccessKeyId() string {
 	return signer.credential.AccessKeyId
 }
 
-func (signer *SignerV1) Sign(stringToSign, secretSuffix string) string {
+func (signer *AccessKeySigner) Sign(stringToSign, secretSuffix string) string {
 	secret := signer.credential.AccessKeySecret + secretSuffix
 	return ShaHmac1(stringToSign, secret)
 }
 
-func (signer *SignerV1) Shutdown() {
+func (signer *AccessKeySigner) Shutdown() {
 
 }

sdk/auth/signers/signer_ecs_instance.go → sdk/auth/signers/signer_ecs_ram_role.go

@@ -26,15 +26,15 @@ import (
 	"time"
 )
 
-type SignerEcsInstance struct {
+type EcsRamRoleSigner struct {
 	*credentialUpdater
 	sessionCredential *sessionCredential
-	credential        *credentials.StsRoleNameOnEcsCredential
+	credential        *credentials.EcsRamRoleCredential
 	commonApi         func(request *requests.CommonRequest, signer interface{}) (response *responses.CommonResponse, err error)
 }
 
-func NewSignereEcsInstance(credential *credentials.StsRoleNameOnEcsCredential, commonApi func(*requests.CommonRequest, interface{}) (response *responses.CommonResponse, err error)) (signer *SignerEcsInstance, err error) {
-	signer = &SignerEcsInstance{
+func NewEcsRamRoleSigner(credential *credentials.EcsRamRoleCredential, commonApi func(*requests.CommonRequest, interface{}) (response *responses.CommonResponse, err error)) (signer *EcsRamRoleSigner, err error) {
+	signer = &EcsRamRoleSigner{
 		credential: credential,
 		commonApi:  commonApi,
 	}
@@ -49,19 +49,19 @@ func NewSignereEcsInstance(credential *credentials.StsRoleNameOnEcsCredential, c
 	return
 }
 
-func (*SignerEcsInstance) GetName() string {
+func (*EcsRamRoleSigner) GetName() string {
 	return "HMAC-SHA1"
 }
 
-func (*SignerEcsInstance) GetType() string {
+func (*EcsRamRoleSigner) GetType() string {
 	return ""
 }
 
-func (*SignerEcsInstance) GetVersion() string {
+func (*EcsRamRoleSigner) GetVersion() string {
 	return "1.0"
 }
 
-func (signer *SignerEcsInstance) GetAccessKeyId() string {
+func (signer *EcsRamRoleSigner) GetAccessKeyId() string {
 	if signer.sessionCredential == nil || signer.needUpdateCredential() {
 		signer.updateCredential()
 	}
@@ -71,7 +71,7 @@ func (signer *SignerEcsInstance) GetAccessKeyId() string {
 	return signer.sessionCredential.accessKeyId
 }
 
-func (signer *SignerEcsInstance) GetExtraParam() map[string]string {
+func (signer *EcsRamRoleSigner) GetExtraParam() map[string]string {
 	if signer.sessionCredential == nil {
 		return make(map[string]string)
 	}
@@ -81,17 +81,17 @@ func (signer *SignerEcsInstance) GetExtraParam() map[string]string {
 	return map[string]string{"SecurityToken": signer.sessionCredential.securityToken}
 }
 
-func (signer *SignerEcsInstance) Sign(stringToSign, secretSuffix string) string {
+func (signer *EcsRamRoleSigner) Sign(stringToSign, secretSuffix string) string {
 	secret := signer.sessionCredential.accessKeySecret + secretSuffix
 	return ShaHmac1(stringToSign, secret)
 }
 
-func (signer *SignerEcsInstance) buildCommonRequest() (request *requests.CommonRequest, err error) {
+func (signer *EcsRamRoleSigner) buildCommonRequest() (request *requests.CommonRequest, err error) {
 	request = requests.NewCommonRequest()
 	return
 }
 
-func (signer *SignerEcsInstance) refreshApi(request *requests.CommonRequest) (response *responses.CommonResponse, err error) {
+func (signer *EcsRamRoleSigner) refreshApi(request *requests.CommonRequest) (response *responses.CommonResponse, err error) {
 	requestUrl := "http://100.100.100.200/latest/meta-data/ram/security-credentials/" + signer.credential.RoleName
 	httpRequest, err := http.NewRequest(requests.GET, requestUrl, strings.NewReader(""))
 	if err != nil {
@@ -111,7 +111,7 @@ func (signer *SignerEcsInstance) refreshApi(request *requests.CommonRequest) (re
 	return
 }
 
-func (signer *SignerEcsInstance) refreshCredential(response *responses.CommonResponse) (err error) {
+func (signer *EcsRamRoleSigner) refreshCredential(response *responses.CommonResponse) (err error) {
 	if response.GetHttpStatus() != http.StatusOK {
 		fmt.Println("refresh Ecs sts token err, httpStatus: " + string(response.GetHttpStatus()) + ", message = " + response.GetHttpContentString())
 		return
@@ -168,6 +168,6 @@ func (signer *SignerEcsInstance) refreshCredential(response *responses.CommonRes
 	return
 }
 
-func (signer *SignerEcsInstance) Shutdown() {
+func (signer *EcsRamRoleSigner) Shutdown() {
 
 }

sdk/auth/signers/signer_sts_assume_role.go → sdk/auth/signers/signer_ram_role_arn.go

@@ -31,11 +31,11 @@ const (
 	defaultDurationSeconds = 3600
 )
 
-type SignerStsAssumeRole struct {
+type RamRoleArnSigner struct {
 	*credentialUpdater
 	roleSessionName   string
 	sessionCredential *sessionCredential
-	credential        *credentials.StsRoleArnCredential
+	credential        *credentials.RamRoleArnCredential
 	commonApi         func(request *requests.CommonRequest, signer interface{}) (response *responses.CommonResponse, err error)
 }
 
@@ -45,8 +45,8 @@ type sessionCredential struct {
 	securityToken   string
 }
 
-func NewSignerStsAssumeRole(credential *credentials.StsRoleArnCredential, commonApi func(request *requests.CommonRequest, signer interface{}) (response *responses.CommonResponse, err error)) (signer *SignerStsAssumeRole, err error) {
-	signer = &SignerStsAssumeRole{
+func NewRamRoleArnSigner(credential *credentials.RamRoleArnCredential, commonApi func(request *requests.CommonRequest, signer interface{}) (response *responses.CommonResponse, err error)) (signer *RamRoleArnSigner, err error) {
+	signer = &RamRoleArnSigner{
 		credential: credential,
 		commonApi:  commonApi,
 	}
@@ -75,19 +75,19 @@ func NewSignerStsAssumeRole(credential *credentials.StsRoleArnCredential, common
 	return
 }
 
-func (*SignerStsAssumeRole) GetName() string {
+func (*RamRoleArnSigner) GetName() string {
 	return "HMAC-SHA1"
 }
 
-func (*SignerStsAssumeRole) GetType() string {
+func (*RamRoleArnSigner) GetType() string {
 	return ""
 }
 
-func (*SignerStsAssumeRole) GetVersion() string {
+func (*RamRoleArnSigner) GetVersion() string {
 	return "1.0"
 }
 
-func (signer *SignerStsAssumeRole) GetAccessKeyId() string {
+func (signer *RamRoleArnSigner) GetAccessKeyId() string {
 	if signer.sessionCredential == nil || signer.needUpdateCredential() {
 		signer.updateCredential()
 	}
@@ -97,7 +97,7 @@ func (signer *SignerStsAssumeRole) GetAccessKeyId() string {
 	return signer.sessionCredential.accessKeyId
 }
 
-func (signer *SignerStsAssumeRole) GetExtraParam() map[string]string {
+func (signer *RamRoleArnSigner) GetExtraParam() map[string]string {
 	if signer.sessionCredential == nil || signer.needUpdateCredential() {
 		signer.updateCredential()
 	}
@@ -107,12 +107,12 @@ func (signer *SignerStsAssumeRole) GetExtraParam() map[string]string {
 	return map[string]string{"SecurityToken": signer.sessionCredential.securityToken}
 }
 
-func (signer *SignerStsAssumeRole) Sign(stringToSign, secretSuffix string) string {
+func (signer *RamRoleArnSigner) Sign(stringToSign, secretSuffix string) string {
 	secret := signer.sessionCredential.accessKeySecret + secretSuffix
 	return ShaHmac1(stringToSign, secret)
 }
 
-func (signer *SignerStsAssumeRole) buildCommonRequest() (request *requests.CommonRequest, err error) {
+func (signer *RamRoleArnSigner) buildCommonRequest() (request *requests.CommonRequest, err error) {
 	request = requests.NewCommonRequest()
 	request.Product = "Sts"
 	request.Version = "2015-04-01"
@@ -124,16 +124,16 @@ func (signer *SignerStsAssumeRole) buildCommonRequest() (request *requests.Commo
 	return
 }
 
-func (signerStsAssumeRole *SignerStsAssumeRole) refreshApi(request *requests.CommonRequest) (response *responses.CommonResponse, err error) {
-	credential := &credentials.BaseCredential{
+func (signerStsAssumeRole *RamRoleArnSigner) refreshApi(request *requests.CommonRequest) (response *responses.CommonResponse, err error) {
+	credential := &credentials.AccessKeyCredential{
 		AccessKeyId:     signerStsAssumeRole.credential.AccessKeyId,
 		AccessKeySecret: signerStsAssumeRole.credential.AccessKeySecret,
 	}
-	signerV1, err := NewSignerV1(credential)
+	signerV1, err := NewAccessKeySigner(credential)
 	return signerStsAssumeRole.commonApi(request, signerV1)
 }
 
-func (signer *SignerStsAssumeRole) refreshCredential(response *responses.CommonResponse) (err error) {
+func (signer *RamRoleArnSigner) refreshCredential(response *responses.CommonResponse) (err error) {
 	if response.GetHttpStatus() != http.StatusOK {
 		message := "refresh session token failed, message = " + response.GetHttpContentString()
 		err = errors.NewServerError(response.GetHttpStatus(), response.GetOriginHttpResponse().Status, message)
@@ -176,6 +176,6 @@ func (signer *SignerStsAssumeRole) refreshCredential(response *responses.CommonR
 	return
 }
 
-func (signer *SignerStsAssumeRole) Shutdown() {
+func (signer *RamRoleArnSigner) Shutdown() {
 
 }

sdk/auth/signers/signer_sts.go → sdk/auth/signers/signer_sts_token.go

@@ -18,41 +18,41 @@ import (
 	"github.com/aliyun/alibaba-cloud-sdk-go/sdk/auth/credentials"
 )
 
-type SignerSts struct {
+type StsTokenSigner struct {
 	credential *credentials.StsTokenCredential
 }
 
-func NewSignerSts(credential *credentials.StsTokenCredential) (*SignerSts, error) {
-	return &SignerSts{
+func NewStsTokenSigner(credential *credentials.StsTokenCredential) (*StsTokenSigner, error) {
+	return &StsTokenSigner{
 		credential: credential,
 	}, nil
 }
 
-func (*SignerSts) GetName() string {
+func (*StsTokenSigner) GetName() string {
 	return "HMAC-SHA1"
 }
 
-func (*SignerSts) GetType() string {
+func (*StsTokenSigner) GetType() string {
 	return ""
 }
 
-func (*SignerSts) GetVersion() string {
+func (*StsTokenSigner) GetVersion() string {
 	return "1.0"
 }
 
-func (signer *SignerSts) GetAccessKeyId() string {
+func (signer *StsTokenSigner) GetAccessKeyId() string {
 	return signer.credential.AccessKeyId
 }
 
-func (signer *SignerSts) GetExtraParam() map[string]string {
+func (signer *StsTokenSigner) GetExtraParam() map[string]string {
 	return map[string]string{"SecurityToken": signer.credential.AccessKeyStsToken}
 }
 
-func (signer *SignerSts) Sign(stringToSign, secretSuffix string) string {
+func (signer *StsTokenSigner) Sign(stringToSign, secretSuffix string) string {
 	secret := signer.credential.AccessKeySecret + secretSuffix
 	return ShaHmac1(stringToSign, secret)
 }
 
-func (signer *SignerSts) Shutdown() {
+func (signer *StsTokenSigner) Shutdown() {
 
 }

sdk/client.go

@@ -100,7 +100,7 @@ func (client *Client) InitWithAccessKey(regionId, accessKeyId, accessKeySecret s
 	return client.InitWithOptions(regionId, config, credential)
 }
 
-func (client *Client) InitWithSecurityToken(regionId, accessKeyId, accessKeySecret, securityToken string) (err error) {
+func (client *Client) InitWithStsToken(regionId, accessKeyId, accessKeySecret, securityToken string) (err error) {
 	config := client.InitClientConfig()
 	credential := &credentials.StsTokenCredential{
 		AccessKeyId:       accessKeyId,
@@ -110,9 +110,9 @@ func (client *Client) InitWithSecurityToken(regionId, accessKeyId, accessKeySecr
 	return client.InitWithOptions(regionId, config, credential)
 }
 
-func (client *Client) InitWithStsRoleArn(regionId, accessKeyId, accessKeySecret, roleArn, roleSessionName string) (err error) {
+func (client *Client) InitWithRamRoleArn(regionId, accessKeyId, accessKeySecret, roleArn, roleSessionName string) (err error) {
 	config := client.InitClientConfig()
-	credential := &credentials.StsRoleArnCredential{
+	credential := &credentials.RamRoleArnCredential{
 		AccessKeyId:     accessKeyId,
 		AccessKeySecret: accessKeySecret,
 		RoleArn:         roleArn,
@@ -131,9 +131,9 @@ func (client *Client) InitWithRsaKeyPair(regionId, publicKeyId, privateKey strin
 	return client.InitWithOptions(regionId, config, credential)
 }
 
-func (client *Client) InitWithStsRoleNameOnEcs(regionId, roleName string) (err error) {
+func (client *Client) InitWithEcsRamRole(regionId, roleName string) (err error) {
 	config := client.InitClientConfig()
-	credential := &credentials.StsRoleNameOnEcsCredential{
+	credential := &credentials.EcsRamRoleCredential{
 		RoleName: roleName,
 	}
 	return client.InitWithOptions(regionId, config, credential)
@@ -295,30 +295,40 @@ func NewClientWithAccessKey(regionId, accessKeyId, accessKeySecret string) (clie
 	return
 }
 
-func NewClientWithStsToken(regionId, accessKeyId, accessKeySecret, accessKeyStsToken string) (client *Client, err error) {
+func NewClientWithStsToken(regionId, stsAccessKeyId, stsAccessKeySecret, stsToken string) (client *Client, err error) {
 	client = &Client{}
-	err = client.InitWithSecurityToken(regionId, accessKeyId, accessKeySecret, accessKeyStsToken)
+	err = client.InitWithStsToken(regionId, stsAccessKeyId, stsAccessKeySecret, stsToken)
 	return
 }
 
-func NewClientWithRsaKeyPair(regionId string, publicKeyId, privateKey string, sessionExpiration int) (client *Client, err error) {
+func NewClientWithRamRoleArn(regionId string, accessKeyId, accessKeySecret, roleArn, roleSessionName string) (client *Client, err error) {
 	client = &Client{}
-	err = client.InitWithRsaKeyPair(regionId, publicKeyId, privateKey, sessionExpiration)
+	err = client.InitWithRamRoleArn(regionId, accessKeyId, accessKeySecret, roleArn, roleSessionName)
 	return
 }
 
-func NewClientWithStsRoleNameOnEcs(regionId string, roleName string) (client *Client, err error) {
+func NewClientWithEcsRamRole(regionId string, roleName string) (client *Client, err error) {
 	client = &Client{}
-	err = client.InitWithStsRoleNameOnEcs(regionId, roleName)
+	err = client.InitWithEcsRamRole(regionId, roleName)
 	return
 }
 
-func NewClientWithStsRoleArn(regionId string, accessKeyId, accessKeySecret, roleArn, roleSessionName string) (client *Client, err error) {
+func NewClientWithRsaKeyPair(regionId string, publicKeyId, privateKey string, sessionExpiration int) (client *Client, err error) {
 	client = &Client{}
-	err = client.InitWithStsRoleArn(regionId, accessKeyId, accessKeySecret, roleArn, roleSessionName)
+	err = client.InitWithRsaKeyPair(regionId, publicKeyId, privateKey, sessionExpiration)
 	return
 }
 
+// Deprecated: Use NewClientWithRamRoleArn in this package instead.
+func NewClientWithStsRoleArn(regionId string, accessKeyId, accessKeySecret, roleArn, roleSessionName string) (client *Client, err error) {
+	return NewClientWithRamRoleArn(regionId, accessKeyId, accessKeySecret, roleArn, roleSessionName)
+}
+
+// Deprecated: Use NewClientWithEcsRamRole in this package instead.
+func NewClientWithStsRoleNameOnEcs(regionId string, roleName string) (client *Client, err error) {
+	return NewClientWithEcsRamRole(regionId, roleName)
+}
+
 func (client *Client) ProcessCommonRequest(request *requests.CommonRequest) (response *responses.CommonResponse, err error) {
 	request.TransToAcsRequest()
 	response = responses.NewCommonResponse()