Merge pull request #40 from aliyun/test

Publish 0.11.0

ChangeLog.txt

@@ -1,3 +1,8 @@
+2018-01-29 Version: 0.11.0
+1, Support dep
+2, Add 4 usage of credentials for each services
+3, Standard interface naming
+
 2018-01-29 Version: 0.10.0
 1, Add 'notificationChannel' parameter to Push API
 
@@ -8,7 +13,6 @@
 2018-01-24 Version: 0.9.2
 1, Add ActiveAlert API : ListActiveAlertRuleRequest/ListProductOfActiceAlertRequest/EnableActiceAlertRequest/DisableActiceAlertRequest
 
-
 2018-01-24 Version: 0.9.1
 1. improve: asyncWithChan avoid panic of "write on closed channel"
 2. improve: asyncWithChan support select case usage

Gopkg.lock

@@ -0,0 +1,44 @@
+# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
+
+
+[[projects]]
+  name = "github.com/davecgh/go-spew"
+  packages = ["spew"]
+  revision = "346938d642f2ec3594ed81d874461961cd0faa76"
+  version = "v1.1.0"
+
+[[projects]]
+  name = "github.com/jmespath/go-jmespath"
+  packages = ["."]
+  revision = "3433f3ea46d9f8019119e7dd41274e112a2359a9"
+  version = "0.2.2"
+
+[[projects]]
+  name = "github.com/json-iterator/go"
+  packages = ["."]
+  revision = "f7279a603edee96fe7764d3de9c6ff8cf9970994"
+  version = "1.0.4"
+
+[[projects]]
+  name = "github.com/pmezard/go-difflib"
+  packages = ["difflib"]
+  revision = "d8ed2627bdf02c080bf22230dbb337003b7aba2d"
+
+[[projects]]
+  name = "github.com/satori/go.uuid"
+  packages = ["."]
+  revision = "879c5887cd475cd7864858769793b2ceb0d44feb"
+  version = "v1.1.0"
+
+[[projects]]
+  name = "github.com/stretchr/testify"
+  packages = ["assert"]
+  revision = "b91bfb9ebec76498946beb6af7c0230c7cc7ba6c"
+  version = "v1.2.0"
+
+[solve-meta]
+  analyzer-name = "dep"
+  analyzer-version = 1
+  inputs-digest = "5efcb858de37371dee78e5421ff3756fafe43502bea86ae16e3ff3bdf2d692f4"
+  solver-name = "gps-cdcl"
+  solver-version = 1

vendor/github.com/stretchr/testify/Gopkg.toml → Gopkg.toml

@@ -1,4 +1,3 @@
-
 # Gopkg.toml example
 #
 # Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md
@@ -17,10 +16,31 @@
 #   source = "github.com/myfork/project2"
 #
 # [[override]]
-#  name = "github.com/x/y"
-#  version = "2.4.0"
+#   name = "github.com/x/y"
+#   version = "2.4.0"
+#
+# [prune]
+#   non-go = false
+#   go-tests = true
+#   unused-packages = true
 
 
 [[constraint]]
-  name = "github.com/davecgh/go-spew"
-  version = ">=1.0.0, <=3.0.0-g6d21280"
+  name = "github.com/jmespath/go-jmespath"
+  version = "0.2.2"
+
+[[constraint]]
+  name = "github.com/json-iterator/go"
+  version = "1.0.4"
+
+[[constraint]]
+  name = "github.com/satori/go.uuid"
+  version = "1.1.0"
+
+[[constraint]]
+  name = "github.com/stretchr/testify"
+  version = "1.1.4"
+
+[prune]
+  go-tests = true
+  unused-packages = true

integration/ecs_test.go

@@ -48,7 +48,7 @@ func TestEcsInstance(t *testing.T) {
 	startEcsInstance(t, ecsClient, instanceId)
 
 	// wait
-	waitForEcsInstance(t, ecsClient, instanceId, EcsInstanceStatusRunning, 120)
+	waitForEcsInstance(t, ecsClient, instanceId, EcsInstanceStatusRunning, 240)
 
 	// stop
 	stopEcsInstance(t, ecsClient, instanceId)

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()

sdk/requests/roa_request.go

@@ -95,7 +95,6 @@ func (request *RoaRequest) BuildUrl() string {
 	return strings.ToLower(request.Scheme) + "://" + request.Domain + ":" + request.Port + request.BuildQueries()
 }
 
-
 func (request *RoaRequest) addPathParam(key, value string) {
 	request.PathParams[key] = value
 }

services/alidns/add_batch_domain_records.go

@@ -38,7 +38,6 @@ func (client *Client) AddBatchDomainRecordsWithChan(request *AddBatchDomainRecor
 		} else {
 			responseChan <- response
 		}
-
 	})
 	if err != nil {
 		errChan <- err

services/alidns/add_domain.go

@@ -38,7 +38,6 @@ func (client *Client) AddDomainWithChan(request *AddDomainRequest) (<-chan *AddD
 		} else {
 			responseChan <- response
 		}
-
 	})
 	if err != nil {
 		errChan <- err

services/alidns/add_domain_group.go

@@ -38,7 +38,6 @@ func (client *Client) AddDomainGroupWithChan(request *AddDomainGroupRequest) (<-
 		} else {
 			responseChan <- response
 		}
-
 	})
 	if err != nil {
 		errChan <- err

services/alidns/add_domain_record.go

@@ -38,7 +38,6 @@ func (client *Client) AddDomainRecordWithChan(request *AddDomainRecordRequest) (
 		} else {
 			responseChan <- response
 		}
-
 	})
 	if err != nil {
 		errChan <- err

services/alidns/apply_for_retrieval_domain_name.go

@@ -38,7 +38,6 @@ func (client *Client) ApplyForRetrievalDomainNameWithChan(request *ApplyForRetri
 		} else {
 			responseChan <- response
 		}
-
 	})
 	if err != nil {
 		errChan <- err

services/alidns/change_domain_group.go

@@ -38,7 +38,6 @@ func (client *Client) ChangeDomainGroupWithChan(request *ChangeDomainGroupReques
 		} else {
 			responseChan <- response
 		}
-
 	})
 	if err != nil {
 		errChan <- err

services/alidns/change_domain_of_dns_product.go

@@ -38,7 +38,6 @@ func (client *Client) ChangeDomainOfDnsProductWithChan(request *ChangeDomainOfDn
 		} else {
 			responseChan <- response
 		}
-
 	})
 	if err != nil {
 		errChan <- err

services/alidns/check_domain_record.go

@@ -38,7 +38,6 @@ func (client *Client) CheckDomainRecordWithChan(request *CheckDomainRecordReques
 		} else {
 			responseChan <- response
 		}
-
 	})
 	if err != nil {
 		errChan <- err

services/alidns/client.go

@@ -41,3 +41,27 @@ func NewClientWithAccessKey(regionId, accessKeyId, accessKeySecret string) (clie
 	err = client.InitWithAccessKey(regionId, accessKeyId, accessKeySecret)
 	return
 }
+
+func NewClientWithStsToken(regionId, stsAccessKeyId, stsAccessKeySecret, stsToken string) (client *Client, err error) {
+	client = &Client{}
+	err = client.InitWithStsToken(regionId, stsAccessKeyId, stsAccessKeySecret, stsToken)
+	return
+}
+
+func NewClientWithRamRoleArn(regionId string, accessKeyId, accessKeySecret, roleArn, roleSessionName string) (client *Client, err error) {
+	client = &Client{}
+	err = client.InitWithRamRoleArn(regionId, accessKeyId, accessKeySecret, roleArn, roleSessionName)
+	return
+}
+
+func NewClientWithEcsRamRole(regionId string, roleName string) (client *Client, err error) {
+	client = &Client{}
+	err = client.InitWithEcsRamRole(regionId, roleName)
+	return
+}
+
+func NewClientWithRsaKeyPair(regionId string, publicKeyId, privateKey string, sessionExpiration int) (client *Client, err error) {
+	client = &Client{}
+	err = client.InitWithRsaKeyPair(regionId, publicKeyId, privateKey, sessionExpiration)
+	return
+}

services/alidns/delete_batch_domain_records.go

@@ -38,7 +38,6 @@ func (client *Client) DeleteBatchDomainRecordsWithChan(request *DeleteBatchDomai
 		} else {
 			responseChan <- response
 		}
-
 	})
 	if err != nil {
 		errChan <- err

services/alidns/delete_batch_domains.go

@@ -38,7 +38,6 @@ func (client *Client) DeleteBatchDomainsWithChan(request *DeleteBatchDomainsRequ
 		} else {
 			responseChan <- response
 		}
-
 	})
 	if err != nil {
 		errChan <- err

services/alidns/delete_domain.go

@@ -38,7 +38,6 @@ func (client *Client) DeleteDomainWithChan(request *DeleteDomainRequest) (<-chan
 		} else {
 			responseChan <- response
 		}
-
 	})
 	if err != nil {
 		errChan <- err

services/alidns/delete_domain_group.go

@@ -38,7 +38,6 @@ func (client *Client) DeleteDomainGroupWithChan(request *DeleteDomainGroupReques
 		} else {
 			responseChan <- response
 		}
-
 	})
 	if err != nil {
 		errChan <- err

services/alidns/delete_domain_record.go

@@ -38,7 +38,6 @@ func (client *Client) DeleteDomainRecordWithChan(request *DeleteDomainRecordRequ
 		} else {
 			responseChan <- response
 		}
-
 	})
 	if err != nil {
 		errChan <- err

services/alidns/delete_sub_domain_records.go

@@ -38,7 +38,6 @@ func (client *Client) DeleteSubDomainRecordsWithChan(request *DeleteSubDomainRec
 		} else {
 			responseChan <- response
 		}
-
 	})
 	if err != nil {
 		errChan <- err

services/alidns/describe_batch_result.go

@@ -38,7 +38,6 @@ func (client *Client) DescribeBatchResultWithChan(request *DescribeBatchResultRe
 		} else {
 			responseChan <- response
 		}
-
 	})
 	if err != nil {
 		errChan <- err

services/alidns/describe_dns_product_instance.go

@@ -38,7 +38,6 @@ func (client *Client) DescribeDnsProductInstanceWithChan(request *DescribeDnsPro
 		} else {
 			responseChan <- response
 		}
-
 	})
 	if err != nil {
 		errChan <- err

services/alidns/describe_dns_product_instances.go

@@ -38,7 +38,6 @@ func (client *Client) DescribeDnsProductInstancesWithChan(request *DescribeDnsPr
 		} else {
 			responseChan <- response
 		}
-
 	})
 	if err != nil {
 		errChan <- err

services/alidns/describe_dnsslb_sub_domains.go

@@ -38,7 +38,6 @@ func (client *Client) DescribeDNSSLBSubDomainsWithChan(request *DescribeDNSSLBSu
 		} else {
 			responseChan <- response
 		}
-
 	})
 	if err != nil {
 		errChan <- err

services/alidns/describe_domain_groups.go

@@ -38,7 +38,6 @@ func (client *Client) DescribeDomainGroupsWithChan(request *DescribeDomainGroups
 		} else {
 			responseChan <- response
 		}
-
 	})
 	if err != nil {
 		errChan <- err

services/alidns/describe_domain_info.go

@@ -38,7 +38,6 @@ func (client *Client) DescribeDomainInfoWithChan(request *DescribeDomainInfoRequ
 		} else {
 			responseChan <- response
 		}
-
 	})
 	if err != nil {
 		errChan <- err

services/alidns/describe_domain_logs.go

@@ -38,7 +38,6 @@ func (client *Client) DescribeDomainLogsWithChan(request *DescribeDomainLogsRequ
 		} else {
 			responseChan <- response
 		}
-
 	})
 	if err != nil {
 		errChan <- err

services/alidns/describe_domain_ns.go

@@ -38,7 +38,6 @@ func (client *Client) DescribeDomainNsWithChan(request *DescribeDomainNsRequest)
 		} else {
 			responseChan <- response
 		}
-
 	})
 	if err != nil {
 		errChan <- err

services/alidns/describe_domain_record_info.go

@@ -38,7 +38,6 @@ func (client *Client) DescribeDomainRecordInfoWithChan(request *DescribeDomainRe
 		} else {
 			responseChan <- response
 		}
-
 	})
 	if err != nil {
 		errChan <- err

services/alidns/describe_domain_records.go

@@ -38,7 +38,6 @@ func (client *Client) DescribeDomainRecordsWithChan(request *DescribeDomainRecor
 		} else {
 			responseChan <- response
 		}
-
 	})
 	if err != nil {
 		errChan <- err

services/alidns/describe_domain_whois_info.go

@@ -38,7 +38,6 @@ func (client *Client) DescribeDomainWhoisInfoWithChan(request *DescribeDomainWho
 		} else {
 			responseChan <- response
 		}
-
 	})
 	if err != nil {
 		errChan <- err

services/alidns/describe_domains.go

@@ -38,7 +38,6 @@ func (client *Client) DescribeDomainsWithChan(request *DescribeDomainsRequest) (
 		} else {
 			responseChan <- response
 		}
-
 	})
 	if err != nil {
 		errChan <- err

services/alidns/describe_record_logs.go

@@ -38,7 +38,6 @@ func (client *Client) DescribeRecordLogsWithChan(request *DescribeRecordLogsRequ
 		} else {
 			responseChan <- response
 		}
-
 	})
 	if err != nil {
 		errChan <- err

services/alidns/describe_sub_domain_records.go

@@ -38,7 +38,6 @@ func (client *Client) DescribeSubDomainRecordsWithChan(request *DescribeSubDomai
 		} else {
 			responseChan <- response
 		}
-
 	})
 	if err != nil {
 		errChan <- err

services/alidns/describe_support_lines.go

@@ -38,7 +38,6 @@ func (client *Client) DescribeSupportLinesWithChan(request *DescribeSupportLines
 		} else {
 			responseChan <- response
 		}
-
 	})
 	if err != nil {
 		errChan <- err

services/alidns/get_main_domain_name.go

@@ -38,7 +38,6 @@ func (client *Client) GetMainDomainNameWithChan(request *GetMainDomainNameReques
 		} else {
 			responseChan <- response
 		}
-
 	})
 	if err != nil {
 		errChan <- err

services/alidns/modify_hichina_domain_dns.go

@@ -38,7 +38,6 @@ func (client *Client) ModifyHichinaDomainDNSWithChan(request *ModifyHichinaDomai
 		} else {
 			responseChan <- response
 		}
-
 	})
 	if err != nil {
 		errChan <- err

services/alidns/retrieval_domain_name.go

@@ -38,7 +38,6 @@ func (client *Client) RetrievalDomainNameWithChan(request *RetrievalDomainNameRe
 		} else {
 			responseChan <- response
 		}
-
 	})
 	if err != nil {
 		errChan <- err

services/alidns/set_dnsslb_status.go

@@ -38,7 +38,6 @@ func (client *Client) SetDNSSLBStatusWithChan(request *SetDNSSLBStatusRequest) (
 		} else {
 			responseChan <- response
 		}
-
 	})
 	if err != nil {
 		errChan <- err

services/alidns/set_domain_record_status.go

@@ -38,7 +38,6 @@ func (client *Client) SetDomainRecordStatusWithChan(request *SetDomainRecordStat
 		} else {
 			responseChan <- response
 		}
-
 	})
 	if err != nil {
 		errChan <- err

services/alidns/update_batch_domain_records.go

@@ -38,7 +38,6 @@ func (client *Client) UpdateBatchDomainRecordsWithChan(request *UpdateBatchDomai
 		} else {
 			responseChan <- response
 		}
-
 	})
 	if err != nil {
 		errChan <- err

services/alidns/update_dnsslb_weight.go

@@ -38,7 +38,6 @@ func (client *Client) UpdateDNSSLBWeightWithChan(request *UpdateDNSSLBWeightRequ
 		} else {
 			responseChan <- response
 		}
-
 	})
 	if err != nil {
 		errChan <- err

services/alidns/update_domain_group.go

@@ -38,7 +38,6 @@ func (client *Client) UpdateDomainGroupWithChan(request *UpdateDomainGroupReques
 		} else {
 			responseChan <- response
 		}
-
 	})
 	if err != nil {
 		errChan <- err

services/alidns/update_domain_record.go

@@ -38,7 +38,6 @@ func (client *Client) UpdateDomainRecordWithChan(request *UpdateDomainRecordRequ
 		} else {
 			responseChan <- response
 		}
-
 	})
 	if err != nil {
 		errChan <- err

services/arms/client.go

@@ -41,3 +41,27 @@ func NewClientWithAccessKey(regionId, accessKeyId, accessKeySecret string) (clie
 	err = client.InitWithAccessKey(regionId, accessKeyId, accessKeySecret)
 	return
 }
+
+func NewClientWithStsToken(regionId, stsAccessKeyId, stsAccessKeySecret, stsToken string) (client *Client, err error) {
+	client = &Client{}
+	err = client.InitWithStsToken(regionId, stsAccessKeyId, stsAccessKeySecret, stsToken)
+	return
+}
+
+func NewClientWithRamRoleArn(regionId string, accessKeyId, accessKeySecret, roleArn, roleSessionName string) (client *Client, err error) {
+	client = &Client{}
+	err = client.InitWithRamRoleArn(regionId, accessKeyId, accessKeySecret, roleArn, roleSessionName)
+	return
+}
+
+func NewClientWithEcsRamRole(regionId string, roleName string) (client *Client, err error) {
+	client = &Client{}
+	err = client.InitWithEcsRamRole(regionId, roleName)
+	return
+}
+
+func NewClientWithRsaKeyPair(regionId string, publicKeyId, privateKey string, sessionExpiration int) (client *Client, err error) {
+	client = &Client{}
+	err = client.InitWithRsaKeyPair(regionId, publicKeyId, privateKey, sessionExpiration)
+	return
+}

services/arms/where_in_dim_query.go

@@ -38,7 +38,6 @@ func (client *Client) WhereInDimQueryWithChan(request *WhereInDimQueryRequest) (
 		} else {
 			responseChan <- response
 		}
-
 	})
 	if err != nil {
 		errChan <- err

services/arms4finance/arms_query_data_set.go

@@ -38,7 +38,6 @@ func (client *Client) ARMSQueryDataSetWithChan(request *ARMSQueryDataSetRequest)
 		} else {
 			responseChan <- response
 		}
-
 	})
 	if err != nil {
 		errChan <- err

services/arms4finance/client.go

@@ -41,3 +41,27 @@ func NewClientWithAccessKey(regionId, accessKeyId, accessKeySecret string) (clie
 	err = client.InitWithAccessKey(regionId, accessKeyId, accessKeySecret)
 	return
 }
+
+func NewClientWithStsToken(regionId, stsAccessKeyId, stsAccessKeySecret, stsToken string) (client *Client, err error) {
+	client = &Client{}
+	err = client.InitWithStsToken(regionId, stsAccessKeyId, stsAccessKeySecret, stsToken)
+	return
+}
+
+func NewClientWithRamRoleArn(regionId string, accessKeyId, accessKeySecret, roleArn, roleSessionName string) (client *Client, err error) {
+	client = &Client{}
+	err = client.InitWithRamRoleArn(regionId, accessKeyId, accessKeySecret, roleArn, roleSessionName)
+	return
+}
+
+func NewClientWithEcsRamRole(regionId string, roleName string) (client *Client, err error) {
+	client = &Client{}
+	err = client.InitWithEcsRamRole(regionId, roleName)
+	return
+}
+
+func NewClientWithRsaKeyPair(regionId string, publicKeyId, privateKey string, sessionExpiration int) (client *Client, err error) {
+	client = &Client{}
+	err = client.InitWithRsaKeyPair(regionId, publicKeyId, privateKey, sessionExpiration)
+	return
+}

services/arms4finance/where_in_dim_query.go

@@ -38,7 +38,6 @@ func (client *Client) WhereInDimQueryWithChan(request *WhereInDimQueryRequest) (
 		} else {
 			responseChan <- response
 		}
-
 	})
 	if err != nil {
 		errChan <- err

services/ccc/add_phone_number.go

@@ -38,7 +38,6 @@ func (client *Client) AddPhoneNumberWithChan(request *AddPhoneNumberRequest) (<-
 		} else {
 			responseChan <- response
 		}
-
 	})
 	if err != nil {
 		errChan <- err

services/ccc/assign_users.go

@@ -38,7 +38,6 @@ func (client *Client) AssignUsersWithChan(request *AssignUsersRequest) (<-chan *
 		} else {
 			responseChan <- response
 		}
-
 	})
 	if err != nil {
 		errChan <- err

services/ccc/client.go

@@ -41,3 +41,27 @@ func NewClientWithAccessKey(regionId, accessKeyId, accessKeySecret string) (clie
 	err = client.InitWithAccessKey(regionId, accessKeyId, accessKeySecret)
 	return
 }
+
+func NewClientWithStsToken(regionId, stsAccessKeyId, stsAccessKeySecret, stsToken string) (client *Client, err error) {
+	client = &Client{}
+	err = client.InitWithStsToken(regionId, stsAccessKeyId, stsAccessKeySecret, stsToken)
+	return
+}
+
+func NewClientWithRamRoleArn(regionId string, accessKeyId, accessKeySecret, roleArn, roleSessionName string) (client *Client, err error) {
+	client = &Client{}
+	err = client.InitWithRamRoleArn(regionId, accessKeyId, accessKeySecret, roleArn, roleSessionName)
+	return
+}
+
+func NewClientWithEcsRamRole(regionId string, roleName string) (client *Client, err error) {
+	client = &Client{}
+	err = client.InitWithEcsRamRole(regionId, roleName)
+	return
+}
+
+func NewClientWithRsaKeyPair(regionId string, publicKeyId, privateKey string, sessionExpiration int) (client *Client, err error) {
+	client = &Client{}
+	err = client.InitWithRsaKeyPair(regionId, publicKeyId, privateKey, sessionExpiration)
+	return
+}

services/ccc/create_skill_group.go

@@ -38,7 +38,6 @@ func (client *Client) CreateSkillGroupWithChan(request *CreateSkillGroupRequest)
 		} else {
 			responseChan <- response
 		}
-
 	})
 	if err != nil {
 		errChan <- err

services/ccc/create_user.go

@@ -38,7 +38,6 @@ func (client *Client) CreateUserWithChan(request *CreateUserRequest) (<-chan *Cr
 		} else {
 			responseChan <- response
 		}
-
 	})
 	if err != nil {
 		errChan <- err

services/ccc/delete_skill_group.go

@@ -38,7 +38,6 @@ func (client *Client) DeleteSkillGroupWithChan(request *DeleteSkillGroupRequest)
 		} else {
 			responseChan <- response
 		}
-
 	})
 	if err != nil {
 		errChan <- err

services/ccc/download_recording.go

@@ -38,7 +38,6 @@ func (client *Client) DownloadRecordingWithChan(request *DownloadRecordingReques
 		} else {
 			responseChan <- response
 		}
-
 	})
 	if err != nil {
 		errChan <- err

services/ccc/get_config.go

@@ -38,7 +38,6 @@ func (client *Client) GetConfigWithChan(request *GetConfigRequest) (<-chan *GetC
 		} else {
 			responseChan <- response
 		}
-
 	})
 	if err != nil {
 		errChan <- err

services/ccc/get_service_extensions.go

@@ -38,7 +38,6 @@ func (client *Client) GetServiceExtensionsWithChan(request *GetServiceExtensions
 		} else {
 			responseChan <- response
 		}
-
 	})
 	if err != nil {
 		errChan <- err

services/ccc/get_user.go

@@ -38,7 +38,6 @@ func (client *Client) GetUserWithChan(request *GetUserRequest) (<-chan *GetUserR
 		} else {
 			responseChan <- response
 		}
-
 	})
 	if err != nil {
 		errChan <- err

services/ccc/list_call_detail_records.go

@@ -38,7 +38,6 @@ func (client *Client) ListCallDetailRecordsWithChan(request *ListCallDetailRecor
 		} else {
 			responseChan <- response
 		}
-
 	})
 	if err != nil {
 		errChan <- err

services/ccc/list_contact_flows.go

@@ -38,7 +38,6 @@ func (client *Client) ListContactFlowsWithChan(request *ListContactFlowsRequest)
 		} else {
 			responseChan <- response
 		}
-
 	})
 	if err != nil {
 		errChan <- err

services/ccc/list_phone_numbers.go

@@ -38,7 +38,6 @@ func (client *Client) ListPhoneNumbersWithChan(request *ListPhoneNumbersRequest)
 		} else {
 			responseChan <- response
 		}
-
 	})
 	if err != nil {
 		errChan <- err

services/ccc/list_recordings.go

@@ -38,7 +38,6 @@ func (client *Client) ListRecordingsWithChan(request *ListRecordingsRequest) (<-
 		} else {
 			responseChan <- response
 		}
-
 	})
 	if err != nil {
 		errChan <- err

services/ccc/list_roles.go

@@ -38,7 +38,6 @@ func (client *Client) ListRolesWithChan(request *ListRolesRequest) (<-chan *List
 		} else {
 			responseChan <- response
 		}
-
 	})
 	if err != nil {
 		errChan <- err

services/ccc/list_skill_groups.go

@@ -38,7 +38,6 @@ func (client *Client) ListSkillGroupsWithChan(request *ListSkillGroupsRequest) (
 		} else {
 			responseChan <- response
 		}
-
 	})
 	if err != nil {
 		errChan <- err

services/ccc/list_skill_groups_of_user.go

@@ -38,7 +38,6 @@ func (client *Client) ListSkillGroupsOfUserWithChan(request *ListSkillGroupsOfUs
 		} else {
 			responseChan <- response
 		}
-
 	})
 	if err != nil {
 		errChan <- err

services/ccc/list_users.go

@@ -38,7 +38,6 @@ func (client *Client) ListUsersWithChan(request *ListUsersRequest) (<-chan *List
 		} else {
 			responseChan <- response
 		}
-
 	})
 	if err != nil {
 		errChan <- err

services/ccc/list_users_of_skill_group.go

@@ -38,7 +38,6 @@ func (client *Client) ListUsersOfSkillGroupWithChan(request *ListUsersOfSkillGro
 		} else {
 			responseChan <- response
 		}
-
 	})
 	if err != nil {
 		errChan <- err

services/ccc/modify_phone_number.go

@@ -38,7 +38,6 @@ func (client *Client) ModifyPhoneNumberWithChan(request *ModifyPhoneNumberReques
 		} else {
 			responseChan <- response
 		}
-
 	})
 	if err != nil {
 		errChan <- err

services/ccc/modify_skill_group.go

@@ -38,7 +38,6 @@ func (client *Client) ModifySkillGroupWithChan(request *ModifySkillGroupRequest)
 		} else {
 			responseChan <- response
 		}
-
 	})
 	if err != nil {
 		errChan <- err

services/ccc/modify_user.go

@@ -38,7 +38,6 @@ func (client *Client) ModifyUserWithChan(request *ModifyUserRequest) (<-chan *Mo
 		} else {
 			responseChan <- response
 		}
-
 	})
 	if err != nil {
 		errChan <- err

services/ccc/refresh_token.go

@@ -38,7 +38,6 @@ func (client *Client) RefreshTokenWithChan(request *RefreshTokenRequest) (<-chan
 		} else {
 			responseChan <- response
 		}
-
 	})
 	if err != nil {
 		errChan <- err

services/ccc/remove_phone_number.go

@@ -38,7 +38,6 @@ func (client *Client) RemovePhoneNumberWithChan(request *RemovePhoneNumberReques
 		} else {
 			responseChan <- response
 		}
-
 	})
 	if err != nil {
 		errChan <- err

services/ccc/remove_users.go

@@ -38,7 +38,6 @@ func (client *Client) RemoveUsersWithChan(request *RemoveUsersRequest) (<-chan *
 		} else {
 			responseChan <- response
 		}
-
 	})
 	if err != nil {
 		errChan <- err

services/ccc/request_login_info.go

@@ -38,7 +38,6 @@ func (client *Client) RequestLoginInfoWithChan(request *RequestLoginInfoRequest)
 		} else {
 			responseChan <- response
 		}
-
 	})
 	if err != nil {
 		errChan <- err

services/cdn/add_cdn_domain.go

@@ -38,7 +38,6 @@ func (client *Client) AddCdnDomainWithChan(request *AddCdnDomainRequest) (<-chan
 		} else {
 			responseChan <- response
 		}
-
 	})
 	if err != nil {
 		errChan <- err

services/cdn/add_live_app_record_config.go

@@ -38,7 +38,6 @@ func (client *Client) AddLiveAppRecordConfigWithChan(request *AddLiveAppRecordCo
 		} else {
 			responseChan <- response
 		}
-
 	})
 	if err != nil {
 		errChan <- err

services/cdn/add_live_app_snapshot_config.go

@@ -38,7 +38,6 @@ func (client *Client) AddLiveAppSnapshotConfigWithChan(request *AddLiveAppSnapsh
 		} else {
 			responseChan <- response
 		}
-
 	})
 	if err != nil {
 		errChan <- err

services/cdn/add_live_domain_mapping.go

@@ -38,7 +38,6 @@ func (client *Client) AddLiveDomainMappingWithChan(request *AddLiveDomainMapping
 		} else {
 			responseChan <- response
 		}
-
 	})
 	if err != nil {
 		errChan <- err

services/cdn/add_live_pull_stream_info.go

@@ -38,7 +38,6 @@ func (client *Client) AddLivePullStreamInfoWithChan(request *AddLivePullStreamIn
 		} else {
 			responseChan <- response
 		}
-
 	})
 	if err != nil {
 		errChan <- err

services/cdn/add_live_stream_transcode.go

@@ -38,7 +38,6 @@ func (client *Client) AddLiveStreamTranscodeWithChan(request *AddLiveStreamTrans
 		} else {
 			responseChan <- response
 		}
-
 	})
 	if err != nil {
 		errChan <- err

services/cdn/batch_describe_domain_bps_data.go

@@ -38,7 +38,6 @@ func (client *Client) BatchDescribeDomainBpsDataWithChan(request *BatchDescribeD
 		} else {
 			responseChan <- response
 		}
-
 	})
 	if err != nil {
 		errChan <- err

services/cdn/clear_user_black_list.go

@@ -38,7 +38,6 @@ func (client *Client) ClearUserBlackListWithChan(request *ClearUserBlackListRequ
 		} else {
 			responseChan <- response
 		}
-
 	})
 	if err != nil {
 		errChan <- err

services/cdn/clear_user_domain_black_list.go

@@ -38,7 +38,6 @@ func (client *Client) ClearUserDomainBlackListWithChan(request *ClearUserDomainB
 		} else {
 			responseChan <- response
 		}
-
 	})
 	if err != nil {
 		errChan <- err

services/cdn/client.go

@@ -41,3 +41,27 @@ func NewClientWithAccessKey(regionId, accessKeyId, accessKeySecret string) (clie
 	err = client.InitWithAccessKey(regionId, accessKeyId, accessKeySecret)
 	return
 }
+
+func NewClientWithStsToken(regionId, stsAccessKeyId, stsAccessKeySecret, stsToken string) (client *Client, err error) {
+	client = &Client{}
+	err = client.InitWithStsToken(regionId, stsAccessKeyId, stsAccessKeySecret, stsToken)
+	return
+}
+
+func NewClientWithRamRoleArn(regionId string, accessKeyId, accessKeySecret, roleArn, roleSessionName string) (client *Client, err error) {
+	client = &Client{}
+	err = client.InitWithRamRoleArn(regionId, accessKeyId, accessKeySecret, roleArn, roleSessionName)
+	return
+}
+
+func NewClientWithEcsRamRole(regionId string, roleName string) (client *Client, err error) {
+	client = &Client{}
+	err = client.InitWithEcsRamRole(regionId, roleName)
+	return
+}
+
+func NewClientWithRsaKeyPair(regionId string, publicKeyId, privateKey string, sessionExpiration int) (client *Client, err error) {
+	client = &Client{}
+	err = client.InitWithRsaKeyPair(regionId, publicKeyId, privateKey, sessionExpiration)
+	return
+}

services/cdn/create_live_stream_record_index_files.go

@@ -38,7 +38,6 @@ func (client *Client) CreateLiveStreamRecordIndexFilesWithChan(request *CreateLi
 		} else {
 			responseChan <- response
 		}
-
 	})
 	if err != nil {
 		errChan <- err

services/cdn/delete_cache_expired_config.go

@@ -0,0 +1,95 @@
+package cdn
+
+//Licensed under the Apache License, Version 2.0 (the "License");
+//you may not use this file except in compliance with the License.
+//You may obtain a copy of the License at
+//
+//http://www.apache.org/licenses/LICENSE-2.0
+//
+//Unless required by applicable law or agreed to in writing, software
+//distributed under the License is distributed on an "AS IS" BASIS,
+//WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//See the License for the specific language governing permissions and
+//limitations under the License.
+//
+// Code generated by Alibaba Cloud SDK Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is regenerated.
+
+import (
+	"github.com/aliyun/alibaba-cloud-sdk-go/sdk/requests"
+	"github.com/aliyun/alibaba-cloud-sdk-go/sdk/responses"
+)
+
+func (client *Client) DeleteCacheExpiredConfig(request *DeleteCacheExpiredConfigRequest) (response *DeleteCacheExpiredConfigResponse, err error) {
+	response = CreateDeleteCacheExpiredConfigResponse()
+	err = client.DoAction(request, response)
+	return
+}
+
+func (client *Client) DeleteCacheExpiredConfigWithChan(request *DeleteCacheExpiredConfigRequest) (<-chan *DeleteCacheExpiredConfigResponse, <-chan error) {
+	responseChan := make(chan *DeleteCacheExpiredConfigResponse, 1)
+	errChan := make(chan error, 1)
+	err := client.AddAsyncTask(func() {
+		defer close(responseChan)
+		defer close(errChan)
+		response, err := client.DeleteCacheExpiredConfig(request)
+		if err != nil {
+			errChan <- err
+		} else {
+			responseChan <- response
+		}
+	})
+	if err != nil {
+		errChan <- err
+		close(responseChan)
+		close(errChan)
+	}
+	return responseChan, errChan
+}
+
+func (client *Client) DeleteCacheExpiredConfigWithCallback(request *DeleteCacheExpiredConfigRequest, callback func(response *DeleteCacheExpiredConfigResponse, err error)) <-chan int {
+	result := make(chan int, 1)
+	err := client.AddAsyncTask(func() {
+		var response *DeleteCacheExpiredConfigResponse
+		var err error
+		defer close(result)
+		response, err = client.DeleteCacheExpiredConfig(request)
+		callback(response, err)
+		result <- 1
+	})
+	if err != nil {
+		defer close(result)
+		callback(nil, err)
+		result <- 0
+	}
+	return result
+}
+
+type DeleteCacheExpiredConfigRequest struct {
+	*requests.RpcRequest
+	DomainName    string           `position:"Query" name:"DomainName"`
+	ConfigID      string           `position:"Query" name:"ConfigID"`
+	CacheType     string           `position:"Query" name:"CacheType"`
+	OwnerId       requests.Integer `position:"Query" name:"OwnerId"`
+	SecurityToken string           `position:"Query" name:"SecurityToken"`
+}
+
+type DeleteCacheExpiredConfigResponse struct {
+	*responses.BaseResponse
+	RequestId string `json:"RequestId" xml:"RequestId"`
+}
+
+func CreateDeleteCacheExpiredConfigRequest() (request *DeleteCacheExpiredConfigRequest) {
+	request = &DeleteCacheExpiredConfigRequest{
+		RpcRequest: &requests.RpcRequest{},
+	}
+	request.InitWithApiInfo("Cdn", "2014-11-11", "DeleteCacheExpiredConfig", "", "")
+	return
+}
+
+func CreateDeleteCacheExpiredConfigResponse() (response *DeleteCacheExpiredConfigResponse) {
+	response = &DeleteCacheExpiredConfigResponse{
+		BaseResponse: &responses.BaseResponse{},
+	}
+	return
+}

services/cdn/delete_cdn_domain.go

@@ -38,7 +38,6 @@ func (client *Client) DeleteCdnDomainWithChan(request *DeleteCdnDomainRequest) (
 		} else {
 			responseChan <- response
 		}
-
 	})
 	if err != nil {
 		errChan <- err

services/cdn/delete_http_header_config.go

@@ -38,7 +38,6 @@ func (client *Client) DeleteHttpHeaderConfigWithChan(request *DeleteHttpHeaderCo
 		} else {
 			responseChan <- response
 		}
-
 	})
 	if err != nil {
 		errChan <- err