Modify EIP default to PayByTraffic for international account

alibaba · Jan 31, 2018 · 649f50f · 649f50f
1 parent eb44d2f
commit 649f50f
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,8 @@
-## 1.8.0 (Unreleased)
+## 1.7.1 (Unreleased)
 
 IMPROVEMENTS:
 
+- Modify EIP default to PayByTraffic for international account (([#369](https://github.com/alibaba/terraform-provider/pull/369)))
 - Deprecate nat gateway fileds 'spec' and 'bandwidth_packages' ([#368](https://github.com/alibaba/terraform-provider/pull/368))
 - Support to associate EIP with SLB and Nat Gateway ([#367](https://github.com/alibaba/terraform-provider/pull/367))
 

diff --git a/alicloud/errors.go b/alicloud/errors.go
@@ -26,7 +26,7 @@ const (
 	EipIncorrectStatus      = "IncorrectEipStatus"
 	InstanceIncorrectStatus = "IncorrectInstanceStatus"
 	HaVipIncorrectStatus    = "IncorrectHaVipStatus"
-	EipTaskConflict         = "TaskConflict"
+	COMMODITYINVALID_COMPONENT = "COMMODITY.INVALID_COMPONENT"
 	// slb
 	LoadBalancerNotFound        = "InvalidLoadBalancerId.NotFound"
 	UnsupportedProtocalPort     = "UnsupportedOperationonfixedprotocalport"

diff --git a/alicloud/resource_alicloud_eip.go b/alicloud/resource_alicloud_eip.go
@@ -29,7 +29,7 @@ func resourceAliyunEip() *schema.Resource {
 			},
 			"internet_charge_type": &schema.Schema{
 				Type:         schema.TypeString,
-				Default:      "PayByBandwidth",
+				Default:      "PayByTraffic",
 				Optional:     true,
 				ForceNew:     true,
 				ValidateFunc: validateInternetChargeType,
@@ -64,6 +64,9 @@ func resourceAliyunEipCreate(d *schema.ResourceData, meta interface{}) error {
 
 	_, allocationID, err := conn.AllocateEipAddress(args)
 	if err != nil {
+		if IsExceptedError(err, COMMODITYINVALID_COMPONENT) && args.InternetChargeType == common.PayByBandwidth {
+			return fmt.Errorf("Your account is international and it can only create '%s' elastic IP. Please change it and try again.", common.PayByTraffic)
+		}
 		return err
 	}
 

diff --git a/alicloud/resource_alicloud_eip_association.go b/alicloud/resource_alicloud_eip_association.go
@@ -5,7 +5,6 @@ import (
 	"strings"
 	"time"
 
-	"github.com/denverdino/aliyungo/common"
 	"github.com/denverdino/aliyungo/ecs"
 	"github.com/hashicorp/terraform/helper/resource"
 	"github.com/hashicorp/terraform/helper/schema"
@@ -54,7 +53,7 @@ func resourceAliyunEipAssociationCreate(d *schema.ResourceData, meta interface{}
 	if err := resource.Retry(3*time.Minute, func() *resource.RetryError {
 		ar := args
 		if err := conn.NewAssociateEipAddress(&ar); err != nil {
-			if IsExceptedError(err, EipTaskConflict) {
+			if IsExceptedError(err, TaskConflict) {
 				return resource.RetryableError(fmt.Errorf("AssociateEip got an error: %#v", err))
 			}
 			return resource.NonRetryableError(fmt.Errorf("AssociateEip got an error: %#v", err))
@@ -114,9 +113,9 @@ func resourceAliyunEipAssociationDelete(d *schema.ResourceData, meta interface{}
 		err := conn.UnassociateEipAddress(allocationId, instanceId)
 
 		if err != nil {
-			e, _ := err.(*common.Error)
-			errCode := e.ErrorResponse.Code
-			if errCode == InstanceIncorrectStatus || errCode == HaVipIncorrectStatus {
+			if IsExceptedError(err, InstanceIncorrectStatus) ||
+				IsExceptedError(err, HaVipIncorrectStatus) ||
+				IsExceptedError(err, TaskConflict) {
 				return resource.RetryableError(fmt.Errorf("Unassociat EIP timeout and got an error:%#v.", err))
 			}
 		}