Fix creating slb listener in international region failed error

CHANGELOG.md

@@ -1,3 +1,12 @@
+## 1.11.0 (Unreleased)
+
+IMPROVEMENTS:
+
+
+BUG FIXES:
+
+- Fix creating slb listener in international region failed error ([#577](https://github.com/alibaba/terraform-provider/pull/577))
+
 ## 1.10.1 (August 3, 2018)
 
 IMPROVEMENTS:

alicloud/config.go

@@ -60,6 +60,7 @@ type AliyunClient struct {
 	//In order to build ots table client, add accesskey and secretkey in aliyunclient temporarily.
 	AccessKey       string
 	SecretKey       string
+	SecurityToken   string
 	OtsInstanceName string
 	AccountId       string
 	ecsconn         *ecs.Client
@@ -151,6 +152,7 @@ func (c *Config) Client() (*AliyunClient, error) {
 		RegionId:        c.RegionId,
 		AccessKey:       c.AccessKey,
 		SecretKey:       c.SecretKey,
+		SecurityToken:   c.SecurityToken,
 		OtsInstanceName: c.OtsInstanceName,
 		AccountId:       c.AccountId,
 		ecsconn:         ecsconn,

alicloud/diff_suppress_funcs.go

@@ -101,8 +101,8 @@ func slbInternetDiffSuppressFunc(k, old, new string, d *schema.ResourceData) boo
 
 func slbInternetChargeTypeDiffSuppressFunc(k, old, new string, d *schema.ResourceData) bool {
 	// Uniform all internet chare type value and be compatible with previous lower value.
-	if strings.ToLower(old) != strings.ToLower(string(new)) {
-		return false
+	if strings.ToLower(old) == strings.ToLower(new) {
+		return true
 	}
 	return !slbInternetDiffSuppressFunc(k, old, new, d)
 }

alicloud/extension_slb.go

@@ -3,8 +3,6 @@ package alicloud
 import (
 	"fmt"
 	"strings"
-
-	"github.com/aliyun/alibaba-cloud-sdk-go/sdk/requests"
 )
 
 type SchedulerType string
@@ -108,10 +106,3 @@ func expandBackendServersWithPortToString(items []interface{}) string {
 	}
 	return fmt.Sprintf("[%s]", strings.Join(servers, COMMA_SEPARATED))
 }
-
-func buildSlbCommonRequest() *requests.CommonRequest {
-	request := requests.NewCommonRequest()
-	request.Domain = "slb.aliyuncs.com"
-	request.Version = ApiVersion20140515
-	return request
-}

alicloud/resource_alicloud_slb_listener.go

@@ -217,7 +217,7 @@ func resourceAliyunSlbListenerCreate(d *schema.ResourceData, meta interface{}) e
 	lb_id := d.Get("load_balancer_id").(string)
 	frontend := d.Get("frontend_port").(int)
 
-	req := buildListenerCommonArgs(d)
+	req := buildListenerCommonArgs(d, meta)
 	req.ApiName = fmt.Sprintf("CreateLoadBalancer%sListener", strings.ToUpper(protocol))
 
 	if Protocol(protocol) == Http || Protocol(protocol) == Https {
@@ -289,7 +289,7 @@ func resourceAliyunSlbListenerUpdate(d *schema.ResourceData, meta interface{}) e
 
 	d.Partial(true)
 
-	commonArgs := buildListenerCommonArgs(d)
+	commonArgs := buildListenerCommonArgs(d, meta)
 	commonArgs.ApiName = fmt.Sprintf("SetLoadBalancer%sListenerAttribute", strings.ToUpper(string(protocol)))
 
 	update := false
@@ -464,8 +464,8 @@ func resourceAliyunSlbListenerDelete(d *schema.ResourceData, meta interface{}) e
 	})
 }
 
-func buildListenerCommonArgs(d *schema.ResourceData) *requests.CommonRequest {
-	req := buildSlbCommonRequest()
+func buildListenerCommonArgs(d *schema.ResourceData, meta interface{}) *requests.CommonRequest {
+	req := meta.(*AliyunClient).BuildSlbCommonRequest()
 	req.QueryParams["LoadBalancerId"] = d.Get("load_balancer_id").(string)
 	req.QueryParams["ListenerPort"] = string(requests.NewInteger(d.Get("frontend_port").(int)))
 	req.QueryParams["BackendServerPort"] = string(requests.NewInteger(d.Get("backend_port").(int)))

alicloud/service_alicloud_common.go

@@ -7,6 +7,11 @@ import (
 
 	"io/ioutil"
 
+	"fmt"
+	"strings"
+
+	"github.com/denverdino/aliyungo/common"
+	"github.com/denverdino/aliyungo/location"
 	"github.com/mitchellh/go-homedir"
 	"gopkg.in/yaml.v2"
 )
@@ -73,3 +78,35 @@ func loadFileContent(v string) ([]byte, error) {
 	}
 	return fileContent, nil
 }
+
+func (client *AliyunClient) DescribeEndpointByCode(region string, code ServiceCode) (string, error) {
+	endpointClient := location.NewClient(client.AccessKey, client.SecretKey)
+	endpointClient.SetSecurityToken(client.SecurityToken)
+	args := &location.DescribeEndpointsArgs{
+		Id:          common.Region(region),
+		ServiceCode: strings.ToLower(string(code)),
+		Type:        "openAPI",
+	}
+	invoker := NewInvoker()
+	var endpoints *location.DescribeEndpointsResponse
+	if err := invoker.Run(func() error {
+		es, err := endpointClient.DescribeEndpoints(args)
+		if err != nil {
+			return err
+		}
+		endpoints = es
+		return nil
+	}); err != nil {
+		return "", fmt.Errorf("Describe %s endpoint using region: %#v got an error: %#v.", code, client.RegionId, err)
+	}
+	endpointItem := endpoints.Endpoints.Endpoint
+	var endpoint string
+	if endpointItem == nil || len(endpointItem) <= 0 {
+		log.Printf("Cannot find endpoint in the region: %#v", client.RegionId)
+		endpoint = ""
+	} else {
+		endpoint = endpointItem[0].Endpoint
+	}
+
+	return endpoint, nil
+}

alicloud/service_alicloud_slb.go

@@ -11,6 +11,20 @@ import (
 	"github.com/aliyun/alibaba-cloud-sdk-go/services/slb"
 )
 
+func (client *AliyunClient) BuildSlbCommonRequest() *requests.CommonRequest {
+	request := requests.NewCommonRequest()
+	endpoint := LoadEndpoint(client.RegionId, SLBCode)
+	if endpoint == "" {
+		endpoint, _ = client.DescribeEndpointByCode(client.RegionId, SLBCode)
+	}
+	if endpoint == "" {
+		endpoint = fmt.Sprintf("slb.%s.aliyuncs.com", client.RegionId)
+	}
+	request.Domain = endpoint
+	request.Version = ApiVersion20140515
+	request.RegionId = client.RegionId
+	return request
+}
 func (client *AliyunClient) DescribeLoadBalancerAttribute(slbId string) (loadBalancer *slb.DescribeLoadBalancerAttributeResponse, err error) {
 
 	req := slb.CreateDescribeLoadBalancerAttributeRequest()
@@ -78,7 +92,7 @@ func (client *AliyunClient) DescribeSlbVServerGroupAttribute(groupId string) (*s
 }
 
 func (client *AliyunClient) DescribeLoadBalancerListenerAttribute(loadBalancerId string, port int, protocol Protocol) (listener map[string]interface{}, err error) {
-	req := buildSlbCommonRequest()
+	req := client.BuildSlbCommonRequest()
 	req.ApiName = fmt.Sprintf("DescribeLoadBalancer%sListenerAttribute", strings.ToUpper(string(protocol)))
 	req.QueryParams["LoadBalancerId"] = loadBalancerId
 	req.QueryParams["ListenerPort"] = string(requests.NewInteger(port))