perfect the integration(7)

integration/api_test.go

@@ -25,7 +25,7 @@ var (
 )
 
 func Test_DescribeClusteWithROArequestWithXMLWithGet(t *testing.T) {
-	client, err := cs.NewClientWithAccessKey("cn-hangzhou", os.Getenv("ACCESS_KEY_ID"), os.Getenv("ACCESS_KEY_SECRET"))
+	client, err := cs.NewClientWithAccessKey(os.Getenv("REGION_ID"), os.Getenv("ACCESS_KEY_ID"), os.Getenv("ACCESS_KEY_SECRET"))
 	assert.Nil(t, err)
 	request := cs.CreateDescribeClusterDetailRequest()
 	request.SetContentType("XML")
@@ -38,7 +38,7 @@ func Test_DescribeClusteWithROArequestWithXMLWithGet(t *testing.T) {
 }
 
 func Test_ScaleClusterWithROArequestWithXMLWithPUT(t *testing.T) {
-	client, err := cs.NewClientWithAccessKey("cn-hangzhou", os.Getenv("ACCESS_KEY_ID"), os.Getenv("ACCESS_KEY_SECRET"))
+	client, err := cs.NewClientWithAccessKey(os.Getenv("REGION_ID"), os.Getenv("ACCESS_KEY_ID"), os.Getenv("ACCESS_KEY_SECRET"))
 	assert.Nil(t, err)
 	request := cs.CreateScaleClusterRequest()
 	request.SetContentType("XML")
@@ -51,7 +51,7 @@ func Test_ScaleClusterWithROArequestWithXMLWithPUT(t *testing.T) {
 }
 
 func Test_CreateClusterTokenWithROArequestWithXMLWithPOST(t *testing.T) {
-	client, err := cs.NewClientWithAccessKey("cn-hangzhou", os.Getenv("ACCESS_KEY_ID"), os.Getenv("ACCESS_KEY_SECRET"))
+	client, err := cs.NewClientWithAccessKey(os.Getenv("REGION_ID"), os.Getenv("ACCESS_KEY_ID"), os.Getenv("ACCESS_KEY_SECRET"))
 	assert.Nil(t, err)
 	request := cs.CreateCreateClusterTokenRequest()
 	request.SetContentType("XML")
@@ -64,7 +64,7 @@ func Test_CreateClusterTokenWithROArequestWithXMLWithPOST(t *testing.T) {
 }
 
 func Test_DeleteClusterWithROArequestWithXMLWithDelete(t *testing.T) {
-	client, err := cs.NewClientWithAccessKey("cn-hangzhou", os.Getenv("ACCESS_KEY_ID"), os.Getenv("ACCESS_KEY_SECRET"))
+	client, err := cs.NewClientWithAccessKey(os.Getenv("REGION_ID"), os.Getenv("ACCESS_KEY_ID"), os.Getenv("ACCESS_KEY_SECRET"))
 	assert.Nil(t, err)
 	request := cs.CreateDeleteClusterRequest()
 	request.SetContentType("XML")
@@ -77,7 +77,7 @@ func Test_DeleteClusterWithROArequestWithXMLWithDelete(t *testing.T) {
 }
 
 func Test_DeleteClusterWithROArequestWithJSONWithDelete(t *testing.T) {
-	client, err := cs.NewClientWithAccessKey("cn-hangzhou", os.Getenv("ACCESS_KEY_ID"), os.Getenv("ACCESS_KEY_SECRET"))
+	client, err := cs.NewClientWithAccessKey(os.Getenv("REGION_ID"), os.Getenv("ACCESS_KEY_ID"), os.Getenv("ACCESS_KEY_SECRET"))
 	assert.Nil(t, err)
 	request := cs.CreateDeleteClusterRequest()
 	request.SetContentType("JSON")
@@ -90,7 +90,7 @@ func Test_DeleteClusterWithROArequestWithJSONWithDelete(t *testing.T) {
 }
 
 func Test_ScaleClusterWithROArequestWithJSONWithPUT(t *testing.T) {
-	client, err := cs.NewClientWithAccessKey("cn-hangzhou", os.Getenv("ACCESS_KEY_ID"), os.Getenv("ACCESS_KEY_SECRET"))
+	client, err := cs.NewClientWithAccessKey(os.Getenv("REGION_ID"), os.Getenv("ACCESS_KEY_ID"), os.Getenv("ACCESS_KEY_SECRET"))
 	assert.Nil(t, err)
 	request := cs.CreateScaleClusterRequest()
 	request.SetContentType("JSON")
@@ -103,7 +103,7 @@ func Test_ScaleClusterWithROArequestWithJSONWithPUT(t *testing.T) {
 }
 
 func Test_CreateSecurityGroupWithRPCrequestWithJSONWithNestingparametersWithPOST(t *testing.T) {
-	client, err := ecs.NewClientWithAccessKey("cn-hangzhou", os.Getenv("ACCESS_KEY_ID"), os.Getenv("ACCESS_KEY_SECRET"))
+	client, err := ecs.NewClientWithAccessKey(os.Getenv("REGION_ID"), os.Getenv("ACCESS_KEY_ID"), os.Getenv("ACCESS_KEY_SECRET"))
 	assert.Nil(t, err)
 	request := ecs.CreateCreateSecurityGroupRequest()
 	request.SetContentType("JSON")
@@ -121,7 +121,7 @@ func Test_CreateSecurityGroupWithRPCrequestWithJSONWithNestingparametersWithPOST
 }
 
 func Test_ECS_DescribeSecurityGroupsWithRPCrequestWithJSONWithNestingparametersWithGET(t *testing.T) {
-	client, err := ecs.NewClientWithAccessKey("cn-hangzhou", os.Getenv("ACCESS_KEY_ID"), os.Getenv("ACCESS_KEY_SECRET"))
+	client, err := ecs.NewClientWithAccessKey(os.Getenv("REGION_ID"), os.Getenv("ACCESS_KEY_ID"), os.Getenv("ACCESS_KEY_SECRET"))
 	assert.Nil(t, err)
 	request := ecs.CreateDescribeSecurityGroupsRequest()
 	request.SetContentType("JSON")
@@ -142,7 +142,7 @@ func Test_ECS_DescribeSecurityGroupsWithRPCrequestWithJSONWithNestingparametersW
 }
 
 func Test_ECS_DeleteSecurityGroupWithRPCrequestWithJSONWithPOST(t *testing.T) {
-	client, err := ecs.NewClientWithAccessKey("cn-hangzhou", os.Getenv("ACCESS_KEY_ID"), os.Getenv("ACCESS_KEY_SECRET"))
+	client, err := ecs.NewClientWithAccessKey(os.Getenv("REGION_ID"), os.Getenv("ACCESS_KEY_ID"), os.Getenv("ACCESS_KEY_SECRET"))
 	assert.Nil(t, err)
 	request := ecs.CreateDeleteSecurityGroupRequest()
 	request.SetContentType("JSON")
@@ -155,7 +155,7 @@ func Test_ECS_DeleteSecurityGroupWithRPCrequestWithJSONWithPOST(t *testing.T) {
 }
 
 func Test_RDS_DescribeDBInstancesWithRPCrequest(t *testing.T) {
-	client, err := rds.NewClientWithAccessKey("cn-hangzhou", os.Getenv("ACCESS_KEY_ID"), os.Getenv("ACCESS_KEY_SECRET"))
+	client, err := rds.NewClientWithAccessKey(os.Getenv("REGION_ID"), os.Getenv("ACCESS_KEY_ID"), os.Getenv("ACCESS_KEY_SECRET"))
 	assert.Nil(t, err)
 	assert.NotNil(t, client)
 	request := rds.CreateDescribeDBInstancesRequest()
@@ -167,7 +167,7 @@ func Test_RDS_DescribeDBInstancesWithRPCrequest(t *testing.T) {
 }
 
 func Test_CDN_DescribeCdnDomainDetailWithRPCrequest(t *testing.T) {
-	client, err := cdn.NewClientWithAccessKey("cn-hangzhou", os.Getenv("ACCESS_KEY_ID"), os.Getenv("ACCESS_KEY_SECRET"))
+	client, err := cdn.NewClientWithAccessKey(os.Getenv("REGION_ID"), os.Getenv("ACCESS_KEY_ID"), os.Getenv("ACCESS_KEY_SECRET"))
 	assert.Nil(t, err)
 	assert.NotNil(t, client)
 	request := cdn.CreateDescribeRefreshTasksRequest()
@@ -178,7 +178,7 @@ func Test_CDN_DescribeCdnDomainDetailWithRPCrequest(t *testing.T) {
 }
 
 func Test_RAM_ListRolesWithRPCrequest(t *testing.T) {
-	client, err := ram.NewClientWithAccessKey("cn-hangzhou", os.Getenv("ACCESS_KEY_ID"), os.Getenv("ACCESS_KEY_SECRET"))
+	client, err := ram.NewClientWithAccessKey(os.Getenv("REGION_ID"), os.Getenv("ACCESS_KEY_ID"), os.Getenv("ACCESS_KEY_SECRET"))
 	assert.Nil(t, err)
 	request := ram.CreateListRolesRequest()
 	request.Scheme = "HTTPS"
@@ -189,7 +189,7 @@ func Test_RAM_ListRolesWithRPCrequest(t *testing.T) {
 }
 
 func Test_SLB_DescribeRegionsWithRPCrequest(t *testing.T) {
-	client, err := slb.NewClientWithAccessKey("cn-hangzhou", os.Getenv("ACCESS_KEY_ID"), os.Getenv("ACCESS_KEY_SECRET"))
+	client, err := slb.NewClientWithAccessKey(os.Getenv("REGION_ID"), os.Getenv("ACCESS_KEY_ID"), os.Getenv("ACCESS_KEY_SECRET"))
 	assert.Nil(t, err)
 	request := slb.CreateDescribeRegionsRequest()
 	response, err := client.DescribeRegions(request)
@@ -200,7 +200,7 @@ func Test_SLB_DescribeRegionsWithRPCrequest(t *testing.T) {
 }
 
 func Test_VPC_DescribeRegionsWithRPCrequest(t *testing.T) {
-	client, err := vpc.NewClientWithAccessKey("cn-hangzhou", os.Getenv("ACCESS_KEY_ID"), os.Getenv("ACCESS_KEY_SECRET"))
+	client, err := vpc.NewClientWithAccessKey(os.Getenv("REGION_ID"), os.Getenv("ACCESS_KEY_ID"), os.Getenv("ACCESS_KEY_SECRET"))
 	assert.Nil(t, err)
 	request := vpc.CreateDescribeRegionsRequest()
 	response, err := client.DescribeRegions(request)
@@ -221,7 +221,7 @@ func mockServer(status int, json string) (server *httptest.Server) {
 }
 
 func Test_DescribeRegionsWithRPCrequestWithunicode(t *testing.T) {
-	client, err := ecs.NewClientWithAccessKey("cn-hangzhou", os.Getenv("ACCESS_KEY_ID"), os.Getenv("ACCESS_KEY_SECRET"))
+	client, err := ecs.NewClientWithAccessKey(os.Getenv("REGION_ID"), os.Getenv("ACCESS_KEY_ID"), os.Getenv("ACCESS_KEY_SECRET"))
 	assert.Nil(t, err)
 	request := ecs.CreateDescribeRegionsRequest()
 	request.Scheme = "HTTP"
@@ -236,7 +236,7 @@ func Test_DescribeRegionsWithRPCrequestWithunicode(t *testing.T) {
 }
 
 func Test_DescribeRegionsWithRPCrequestWithescape(t *testing.T) {
-	client, err := ecs.NewClientWithAccessKey("cn-hangzhou", os.Getenv("ACCESS_KEY_ID"), os.Getenv("ACCESS_KEY_SECRET"))
+	client, err := ecs.NewClientWithAccessKey(os.Getenv("REGION_ID"), os.Getenv("ACCESS_KEY_ID"), os.Getenv("ACCESS_KEY_SECRET"))
 	assert.Nil(t, err)
 	request := ecs.CreateDescribeRegionsRequest()
 	request.Scheme = "HTTP"
@@ -251,7 +251,7 @@ func Test_DescribeRegionsWithRPCrequestWithescape(t *testing.T) {
 }
 
 func Test_DescribeRegionsWithRPCrequestWith3XX(t *testing.T) {
-	client, err := ecs.NewClientWithAccessKey("cn-hangzhou", os.Getenv("ACCESS_KEY_ID"), os.Getenv("ACCESS_KEY_SECRET"))
+	client, err := ecs.NewClientWithAccessKey(os.Getenv("REGION_ID"), os.Getenv("ACCESS_KEY_ID"), os.Getenv("ACCESS_KEY_SECRET"))
 	assert.Nil(t, err)
 	request := ecs.CreateDescribeRegionsRequest()
 	request.Scheme = "HTTP"

integration/base.go

@@ -26,12 +26,13 @@ var (
 	travisValue = strings.Split(os.Getenv("TRAVIS_JOB_NUMBER"), ".")
 	username    = "testuser" + travisValue[len(travisValue)-1]
 	rolename    = "testrole" + travisValue[len(travisValue)-1]
+	rolearn     = fmt.Sprintf("acs:ram::%s:role/%s", os.Getenv("USER_ID"), rolename)
 )
 
 func createRole(userid string) (string, string, error) {
 	listRequest := ram.CreateListRolesRequest()
 	listRequest.Scheme = "HTTPS"
-	client, err := ram.NewClientWithAccessKey("cn-hangzhou", os.Getenv("ACCESS_KEY_ID"), os.Getenv("ACCESS_KEY_SECRET"))
+	client, err := ram.NewClientWithAccessKey(os.Getenv("REGION_ID"), os.Getenv("ACCESS_KEY_ID"), os.Getenv("ACCESS_KEY_SECRET"))
 	if err != nil {
 		return "", "", err
 	}
@@ -58,7 +59,7 @@ func createRole(userid string) (string, string, error) {
 func createUser() error {
 	listRequest := ram.CreateListUsersRequest()
 	listRequest.Scheme = "HTTPS"
-	client, err := ram.NewClientWithAccessKey("cn-hangzhou", os.Getenv("ACCESS_KEY_ID"), os.Getenv("ACCESS_KEY_SECRET"))
+	client, err := ram.NewClientWithAccessKey(os.Getenv("REGION_ID"), os.Getenv("ACCESS_KEY_ID"), os.Getenv("ACCESS_KEY_SECRET"))
 	if err != nil {
 		return err
 	}
@@ -85,7 +86,7 @@ func createAttachPolicyToUser() error {
 	listRequest := ram.CreateListPoliciesForUserRequest()
 	listRequest.UserName = username
 	listRequest.Scheme = "HTTPS"
-	client, err := ram.NewClientWithAccessKey("cn-hangzhou", os.Getenv("ACCESS_KEY_ID"), os.Getenv("ACCESS_KEY_SECRET"))
+	client, err := ram.NewClientWithAccessKey(os.Getenv("REGION_ID"), os.Getenv("ACCESS_KEY_ID"), os.Getenv("ACCESS_KEY_SECRET"))
 	if err != nil {
 		return err
 	}
@@ -111,7 +112,7 @@ func createAttachPolicyToUser() error {
 }
 
 func createAccessKey() (string, string, error) {
-	client, err := ram.NewClientWithAccessKey("cn-hangzhou", os.Getenv("ACCESS_KEY_ID"), os.Getenv("ACCESS_KEY_SECRET"))
+	client, err := ram.NewClientWithAccessKey(os.Getenv("REGION_ID"), os.Getenv("ACCESS_KEY_ID"), os.Getenv("ACCESS_KEY_SECRET"))
 	if err != nil {
 		return "", "", err
 	}
@@ -164,10 +165,10 @@ func createAssumeRole() (*sts.AssumeRoleResponse, error) {
 		return nil, err
 	}
 	request := sts.CreateAssumeRoleRequest()
-	request.RoleArn = fmt.Sprintf("acs:ram::%s:role/testrole", os.Getenv("USER_ID"))
+	request.RoleArn = rolearn
 	request.RoleSessionName = "alice_test"
 	request.Scheme = "HTTPS"
-	client, err := sts.NewClientWithAccessKey("cn-hangzhou", subaccesskeyid, subaccesskeysecret)
+	client, err := sts.NewClientWithAccessKey(os.Getenv("REGION_ID"), subaccesskeyid, subaccesskeysecret)
 	response, err := client.AssumeRole(request)
 	if err != nil {
 		return nil, err

integration/core_test.go

@@ -19,7 +19,7 @@ func Test_DescribeRegionsWithCommonRequestWithRPC(t *testing.T) {
 	request.ApiName = "DescribeRegions"
 	request.SetDomain("ecs.aliyuncs.com")
 	request.TransToAcsRequest()
-	client, err := sdk.NewClientWithAccessKey("cn-hangzhou", os.Getenv("ACCESS_KEY_ID"), os.Getenv("ACCESS_KEY_SECRET"))
+	client, err := sdk.NewClientWithAccessKey(os.Getenv("REGION_ID"), os.Getenv("ACCESS_KEY_ID"), os.Getenv("ACCESS_KEY_SECRET"))
 	assert.Nil(t, err)
 	response, err := client.ProcessCommonRequest(request)
 	assert.Nil(t, err)
@@ -36,7 +36,7 @@ func Test_DescribeRegionsWithCommonRequestWithSTStoken(t *testing.T) {
 	request.ApiName = "DescribeRegions"
 	request.SetDomain("ecs.aliyuncs.com")
 	request.TransToAcsRequest()
-	client, err := sdk.NewClientWithStsToken("cn-hangzhou", credential.AccessKeyId, credential.AccessKeySecret, credential.SecurityToken)
+	client, err := sdk.NewClientWithStsToken(os.Getenv("REGION_ID"), credential.AccessKeyId, credential.AccessKeySecret, credential.SecurityToken)
 	assert.Nil(t, err)
 	response, err := client.ProcessCommonRequest(request)
 	assert.Nil(t, err)
@@ -51,7 +51,7 @@ func Test_DescribeRegionsWithCommonRequestWithHTTPS(t *testing.T) {
 	request.SetDomain("ecs.aliyuncs.com")
 	request.TransToAcsRequest()
 	request.SetScheme("HTTPS")
-	client, err := sdk.NewClientWithAccessKey("cn-hangzhou", os.Getenv("ACCESS_KEY_ID"), os.Getenv("ACCESS_KEY_SECRET"))
+	client, err := sdk.NewClientWithAccessKey(os.Getenv("REGION_ID"), os.Getenv("ACCESS_KEY_ID"), os.Getenv("ACCESS_KEY_SECRET"))
 	assert.Nil(t, err)
 	response, err := client.ProcessCommonRequest(request)
 	assert.Nil(t, err)
@@ -66,7 +66,7 @@ func Test_DescribeRegionsWithCommonRequestWithUnicodeSpecificParams(t *testing.T
 	request.SetDomain("ecs.aliyuncs.com")
 	request.TransToAcsRequest()
 	request.SetContent([]byte("sdk&-杭&&&州-test"))
-	client, err := sdk.NewClientWithAccessKey("cn-hangzhou", os.Getenv("ACCESS_KEY_ID"), os.Getenv("ACCESS_KEY_SECRET"))
+	client, err := sdk.NewClientWithAccessKey(os.Getenv("REGION_ID"), os.Getenv("ACCESS_KEY_ID"), os.Getenv("ACCESS_KEY_SECRET"))
 	assert.Nil(t, err)
 	response, err := client.ProcessCommonRequest(request)
 	assert.Nil(t, err)
@@ -80,7 +80,7 @@ func Test_DescribeRegionsWithCommonRequestWithError(t *testing.T) {
 	request.ApiName = "Describe"
 	request.SetDomain("ecs.aliyuncs.com")
 	request.TransToAcsRequest()
-	client, err := sdk.NewClientWithAccessKey("cn-hangzhou", os.Getenv("ACCESS_KEY_ID"), os.Getenv("ACCESS_KEY_SECRET"))
+	client, err := sdk.NewClientWithAccessKey(os.Getenv("REGION_ID"), os.Getenv("ACCESS_KEY_ID"), os.Getenv("ACCESS_KEY_SECRET"))
 	assert.Nil(t, err)
 	_, err = client.ProcessCommonRequest(request)
 	realerr := err.(errors.Error)
@@ -89,14 +89,14 @@ func Test_DescribeRegionsWithCommonRequestWithError(t *testing.T) {
 }
 
 func Test_DescribeClustersWithCommonRequestWithROA(t *testing.T) {
-	client, err := sdk.NewClientWithAccessKey("default", os.Getenv("ACCESS_KEY_ID"), os.Getenv("ACCESS_KEY_SECRET"))
+	client, err := sdk.NewClientWithAccessKey(os.Getenv("REGION_ID"), os.Getenv("ACCESS_KEY_ID"), os.Getenv("ACCESS_KEY_SECRET"))
 	assert.Nil(t, err)
 	request := requests.NewCommonRequest()
 	request.Method = "GET"
 	request.Domain = "cs.aliyuncs.com"
 	request.Version = "2015-12-15"
 	request.PathPattern = "/clusters/[ClusterId]"
-	request.QueryParams["RegionId"] = "default"
+	request.QueryParams["RegionId"] = os.Getenv("REGION_ID")
 	request.TransToAcsRequest()
 	_, err = client.ProcessCommonRequest(request)
 	assert.NotNil(t, err)
@@ -107,7 +107,7 @@ func Test_DescribeClustersWithCommonRequestWithROAWithSTStoken(t *testing.T) {
 	assumeresponse, err := createAssumeRole()
 	assert.Nil(t, err)
 	credential := assumeresponse.Credentials
-	client, err := sdk.NewClientWithStsToken("default", credential.AccessKeyId, credential.AccessKeySecret, credential.SecurityToken)
+	client, err := sdk.NewClientWithStsToken(os.Getenv("REGION_ID"), credential.AccessKeyId, credential.AccessKeySecret, credential.SecurityToken)
 	assert.Nil(t, err)
 	assert.Nil(t, err)
 	request := requests.NewCommonRequest()
@@ -115,7 +115,7 @@ func Test_DescribeClustersWithCommonRequestWithROAWithSTStoken(t *testing.T) {
 	request.Domain = "cs.aliyuncs.com"
 	request.Version = "2015-12-15"
 	request.PathPattern = "/clusters/[ClusterId]"
-	request.QueryParams["RegionId"] = "default"
+	request.QueryParams["RegionId"] = os.Getenv("REGION_ID")
 	request.TransToAcsRequest()
 	_, err = client.ProcessCommonRequest(request)
 	assert.NotNil(t, err)
@@ -123,7 +123,7 @@ func Test_DescribeClustersWithCommonRequestWithROAWithSTStoken(t *testing.T) {
 }
 
 func Test_DescribeClusterDetailWithCommonRequestWithROAWithHTTPS(t *testing.T) {
-	client, err := sdk.NewClientWithAccessKey("default", os.Getenv("ACCESS_KEY_ID"), os.Getenv("ACCESS_KEY_SECRET"))
+	client, err := sdk.NewClientWithAccessKey(os.Getenv("REGION_ID"), os.Getenv("ACCESS_KEY_ID"), os.Getenv("ACCESS_KEY_SECRET"))
 	assert.Nil(t, err)
 	request := requests.NewCommonRequest()
 	request.Method = "GET"
@@ -131,7 +131,7 @@ func Test_DescribeClusterDetailWithCommonRequestWithROAWithHTTPS(t *testing.T) {
 	request.Version = "2015-12-15"
 	request.SetScheme("HTTPS")
 	request.PathPattern = "/clusters/[ClusterId]"
-	request.QueryParams["RegionId"] = "default"
+	request.QueryParams["RegionId"] = os.Getenv("REGION_ID")
 	request.TransToAcsRequest()
 	_, err = client.ProcessCommonRequest(request)
 	assert.NotNil(t, err)

integration/cr_test.go

@@ -30,11 +30,12 @@ func genKeyFunc() func() string {
 }
 
 func Test_CR_CreateNamespace(t *testing.T) {
-	client, err := cr.NewClientWithAccessKey("cn-hangzhou", os.Getenv("ACCESS_KEY_ID"), os.Getenv("ACCESS_KEY_SECRET"))
+	client, err := cr.NewClientWithAccessKey(os.Getenv("REGION_ID"), os.Getenv("ACCESS_KEY_ID"), os.Getenv("ACCESS_KEY_SECRET"))
 	assert.Nil(t, err)
 
 	request := cr.CreateCreateNamespaceRequest()
-	request.SetDomain("cr.cn-hangzhou.aliyuncs.com")
+	domain := fmt.Sprintf("cr." + os.Getenv("REGION_ID") + ".aliyuncs.com")
+	request.SetDomain(domain)
 	request.SetContentType("JSON")
 	content := fmt.Sprintf(
 		`{
@@ -52,11 +53,12 @@ func Test_CR_CreateNamespace(t *testing.T) {
 }
 
 func Test_CR_UpdateNamespace(t *testing.T) {
-	client, err := cr.NewClientWithAccessKey("cn-hangzhou", os.Getenv("ACCESS_KEY_ID"), os.Getenv("ACCESS_KEY_SECRET"))
+	client, err := cr.NewClientWithAccessKey(os.Getenv("REGION_ID"), os.Getenv("ACCESS_KEY_ID"), os.Getenv("ACCESS_KEY_SECRET"))
 	assert.Nil(t, err)
 
 	request := cr.CreateUpdateNamespaceRequest()
-	request.SetDomain("cr.cn-hangzhou.aliyuncs.com")
+	domain := fmt.Sprintf("cr." + os.Getenv("REGION_ID") + ".aliyuncs.com")
+	request.SetDomain(domain)
 	request.Namespace = genKey()
 	request.SetContentType("JSON")
 	content := fmt.Sprintf(
@@ -75,11 +77,12 @@ func Test_CR_UpdateNamespace(t *testing.T) {
 }
 
 func Test_CR_GetNamespace(t *testing.T) {
-	client, err := cr.NewClientWithAccessKey("cn-hangzhou", os.Getenv("ACCESS_KEY_ID"), os.Getenv("ACCESS_KEY_SECRET"))
+	client, err := cr.NewClientWithAccessKey(os.Getenv("REGION_ID"), os.Getenv("ACCESS_KEY_ID"), os.Getenv("ACCESS_KEY_SECRET"))
 	assert.Nil(t, err)
 
 	request := cr.CreateGetNamespaceRequest()
-	request.SetDomain("cr.cn-hangzhou.aliyuncs.com")
+	domain := fmt.Sprintf("cr." + os.Getenv("REGION_ID") + ".aliyuncs.com")
+	request.SetDomain(domain)
 	request.Namespace = genKey()
 
 	response, err := client.GetNamespace(request)
@@ -88,11 +91,12 @@ func Test_CR_GetNamespace(t *testing.T) {
 }
 
 func Test_CR_GetNamespaceList(t *testing.T) {
-	client, err := cr.NewClientWithAccessKey("cn-hangzhou", os.Getenv("ACCESS_KEY_ID"), os.Getenv("ACCESS_KEY_SECRET"))
+	client, err := cr.NewClientWithAccessKey(os.Getenv("REGION_ID"), os.Getenv("ACCESS_KEY_ID"), os.Getenv("ACCESS_KEY_SECRET"))
 	assert.Nil(t, err)
 
 	request := cr.CreateGetNamespaceListRequest()
-	request.SetDomain("cr.cn-hangzhou.aliyuncs.com")
+	domain := fmt.Sprintf("cr." + os.Getenv("REGION_ID") + ".aliyuncs.com")
+	request.SetDomain(domain)
 
 	response, err := client.GetNamespaceList(request)
 	assert.Nil(t, err)
@@ -100,11 +104,12 @@ func Test_CR_GetNamespaceList(t *testing.T) {
 }
 
 func Test_CR_DeleteNamespace(t *testing.T) {
-	client, err := cr.NewClientWithAccessKey("cn-hangzhou", os.Getenv("ACCESS_KEY_ID"), os.Getenv("ACCESS_KEY_SECRET"))
+	client, err := cr.NewClientWithAccessKey(os.Getenv("REGION_ID"), os.Getenv("ACCESS_KEY_ID"), os.Getenv("ACCESS_KEY_SECRET"))
 	assert.Nil(t, err)
 
 	request := cr.CreateDeleteNamespaceRequest()
-	request.SetDomain("cr.cn-hangzhou.aliyuncs.com")
+	domain := fmt.Sprintf("cr." + os.Getenv("REGION_ID") + ".aliyuncs.com")
+	request.SetDomain(domain)
 	request.Namespace = genKey()
 
 	response, err := client.DeleteNamespace(request)

integration/credential_test.go

@@ -10,7 +10,7 @@ import (
 )
 
 func Test_DescribeRegionsWithRPCrequestWithAK(t *testing.T) {
-	client, err := ecs.NewClientWithAccessKey("cn-hangzhou", os.Getenv("ACCESS_KEY_ID"), os.Getenv("ACCESS_KEY_SECRET"))
+	client, err := ecs.NewClientWithAccessKey(os.Getenv("REGION_ID"), os.Getenv("ACCESS_KEY_ID"), os.Getenv("ACCESS_KEY_SECRET"))
 	assert.Nil(t, err)
 	assert.NotNil(t, client)
 	request := ecs.CreateDescribeRegionsRequest()
@@ -26,7 +26,7 @@ func Test_DescribeRegionsWithRPCrequestWithSTStoken(t *testing.T) {
 	assumeresponse, err := createAssumeRole()
 	assert.Nil(t, err)
 	credential := assumeresponse.Credentials
-	client, err := ecs.NewClientWithStsToken("cn-hangzhou", credential.AccessKeyId, credential.AccessKeySecret, credential.SecurityToken)
+	client, err := ecs.NewClientWithStsToken(os.Getenv("REGION_ID"), credential.AccessKeyId, credential.AccessKeySecret, credential.SecurityToken)
 	assert.Nil(t, err)
 	assert.NotNil(t, client)
 	request := ecs.CreateDescribeRegionsRequest()
@@ -39,11 +39,11 @@ func Test_DescribeRegionsWithRPCrequestWithSTStoken(t *testing.T) {
 }
 
 func Test_DescribeClusterDetailWithROArequestWithAK(t *testing.T) {
-	client, err := cs.NewClientWithAccessKey("default", os.Getenv("ACCESS_KEY_ID"), os.Getenv("ACCESS_KEY_SECRET"))
+	client, err := cs.NewClientWithAccessKey(os.Getenv("REGION_ID"), os.Getenv("ACCESS_KEY_ID"), os.Getenv("ACCESS_KEY_SECRET"))
 	assert.Nil(t, err)
 	request := cs.CreateDescribeClusterDetailRequest()
 	request.SetDomain("cs.aliyuncs.com")
-	request.QueryParams["RegionId"] = "default"
+	request.QueryParams["RegionId"] = os.Getenv("REGION_ID")
 	request.Method = "GET"
 	response, err := client.DescribeClusterDetail(request)
 	assert.NotNil(t, err)
@@ -51,18 +51,16 @@ func Test_DescribeClusterDetailWithROArequestWithAK(t *testing.T) {
 	assert.Contains(t, err.Error(), "Request url is invalid")
 }
 
-//func Test_DescribeRegionsWithRPCrequestWithArn(t *testing.T) {
-//	assumeresponse, err := createAssumeRole()
-//	assert.Nil(t, assumeresponse)
-//	credential := assumeresponse.Credentials
-//	assert.Nil(t, err)
-//	client, err := ecs.NewClientWithRamRoleArn("cn-hangzhou", credential.AccessKeyId, credential.AccessKeySecret, assumeresponse.AssumedRoleUser.Arn,"testrole")
-//	assert.Nil(t, err)
-//	request := ecs.CreateDescribeRegionsRequest()
-//	request.Scheme = "https"
-//	response, err := client.DescribeRegions(request)
-//	assert.Nil(t, err)
-//	realerr := err.(errors.Error)
-//	assert.Nil(t, realerr.OriginError().Error())
-//	assert.Equal(t, 36, len(response.RequestId))
-//}
+func Test_DescribeRegionsWithRPCrequestWithArn(t *testing.T) {
+	subaccesskeyid, subaccesskeysecret, err := createAccessKey()
+	assert.Nil(t, err)
+	client, err := ecs.NewClientWithRamRoleArn(os.Getenv("REGION_ID"), subaccesskeyid, subaccesskeysecret, rolearn, "alice_test")
+	assert.Nil(t, err)
+
+	request := ecs.CreateDescribeRegionsRequest()
+	request.Scheme = "https"
+	request.Domain = "ecs.aliyuncs.com"
+	response, err := client.DescribeRegions(request)
+	assert.Nil(t, err)
+	assert.Equal(t, 36, len(response.RequestId))
+}

integration/error_test.go

@@ -20,7 +20,7 @@ func Test_DescribeRegionsWithParameterError(t *testing.T) {
 	request.ApiName = "Describe"
 	request.SetDomain("ecs.aliyuncs.com")
 	request.TransToAcsRequest()
-	client, err := sdk.NewClientWithAccessKey("cn-hangzhou", os.Getenv("ACCESS_KEY_ID"), os.Getenv("ACCESS_KEY_SECRET"))
+	client, err := sdk.NewClientWithAccessKey(os.Getenv("REGION_ID"), os.Getenv("ACCESS_KEY_ID"), os.Getenv("ACCESS_KEY_SECRET"))
 	assert.Nil(t, err)
 	_, err = client.ProcessCommonRequest(request)
 	realerr := err.(errors.Error)
@@ -35,7 +35,7 @@ func Test_DescribeRegionsWithUnreachableError(t *testing.T) {
 	request.ApiName = "DescribeRegions"
 	request.SetDomain("www.aliyun-hangzhou.com")
 	request.TransToAcsRequest()
-	client, err := sdk.NewClientWithAccessKey("cn-hangzhou", os.Getenv("ACCESS_KEY_ID"), os.Getenv("ACCESS_KEY_SECRET"))
+	client, err := sdk.NewClientWithAccessKey(os.Getenv("REGION_ID"), os.Getenv("ACCESS_KEY_ID"), os.Getenv("ACCESS_KEY_SECRET"))
 	assert.Nil(t, err)
 	response, err := client.ProcessCommonRequest(request)
 	assert.Equal(t, 0, response.GetHttpStatus())
@@ -50,10 +50,11 @@ func Test_DescribeRegionsWithTimeout(t *testing.T) {
 	}
 	request := ecs.CreateDescribeRegionsRequest()
 	request.Scheme = "https"
-	client, err := ecs.NewClientWithOptions("cn-hangzhou", config, credentail)
+	request.SetDomain("ecs.aliyuncs.com")
+	client, err := ecs.NewClientWithOptions(os.Getenv("REGION_ID"), config, credentail)
 	response, err := client.DescribeRegions(request)
 	assert.Equal(t, 0, response.GetHttpStatus())
-	assert.Contains(t, err.Error(), "https://ecs-cn-hangzhou.aliyuncs.com")
+	assert.Contains(t, err.Error(), "https://ecs.aliyuncs.com")
 	assert.Contains(t, err.Error(), "Client.Timeout exceeded while awaiting headers")
 }
 
@@ -67,7 +68,7 @@ func Test_DescribeRegionsWithNilbody(t *testing.T) {
 	domain := strings.Replace(ts.URL, "http://", "", 1)
 	request.Domain = domain
 	request.TransToAcsRequest()
-	client, err := sdk.NewClientWithAccessKey("cn-hangzhou", os.Getenv("ACCESS_KEY_ID"), os.Getenv("ACCESS_KEY_SECRET"))
+	client, err := sdk.NewClientWithAccessKey(os.Getenv("REGION_ID"), os.Getenv("ACCESS_KEY_ID"), os.Getenv("ACCESS_KEY_SECRET"))
 	assert.Nil(t, err)
 	response, err := client.ProcessCommonRequest(request)
 	assert.Equal(t, 400, response.GetHttpStatus())
@@ -84,7 +85,7 @@ func Test_DescribeRegionsWithFormatError(t *testing.T) {
 	domain := strings.Replace(ts.URL, "http://", "", 1)
 	request.Domain = domain
 	request.TransToAcsRequest()
-	client, err := sdk.NewClientWithAccessKey("cn-hangzhou", os.Getenv("ACCESS_KEY_ID"), os.Getenv("ACCESS_KEY_SECRET"))
+	client, err := sdk.NewClientWithAccessKey(os.Getenv("REGION_ID"), os.Getenv("ACCESS_KEY_ID"), os.Getenv("ACCESS_KEY_SECRET"))
 	assert.Nil(t, err)
 	response, err := client.ProcessCommonRequest(request)
 	assert.Equal(t, 400, response.GetHttpStatus())