Merge pull request #1563 from tencentcloudstack/feat/support_create_prepaid_eip

support create prepaid eip

Author: tongyiming

.changelog/1563.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/tencentcloud_eip: support create prepaid eip.
+```

tencentcloud/extension_vpc.go

@@ -81,6 +81,8 @@ var EIP_ANYCAST_ZONE = []string{
 	EIP_ANYCAST_ZONE_OVERSEAS,
 }
 
+var EIP_AVAILABLE_PERIOD = []int{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 24, 36}
+
 // ENI
 const (
 	ENI_DESCRIBE_LIMIT = 100

tencentcloud/resource_tc_eip.go

@@ -84,9 +84,25 @@ func resourceTencentCloudEip() *schema.Resource {
 				ForceNew:    true,
 				Description: "The charge type of eip. Valid values: `BANDWIDTH_PACKAGE`, `BANDWIDTH_POSTPAID_BY_HOUR`, `BANDWIDTH_PREPAID_BY_MONTH` and `TRAFFIC_POSTPAID_BY_HOUR`.",
 			},
+
+			"prepaid_period": {
+				Type:         schema.TypeInt,
+				Optional:     true,
+				ValidateFunc: validateAllowedIntValue(EIP_AVAILABLE_PERIOD),
+				Description:  "Period of instance. Default value: `1`. Valid value: `1`, `2`, `3`, `4`, `6`, `7`, `8`, `9`, `12`, `24`, `36`. NOTES: must set when `internet_charge_type` is `BANDWIDTH_PREPAID_BY_MONTH`.",
+			},
+
+			"auto_renew_flag": {
+				Type:         schema.TypeInt,
+				Optional:     true,
+				ValidateFunc: validateAllowedIntValue([]int{0, 1, 2}),
+				Description:  "Auto renew flag.  0 - default state (manual renew); 1 - automatic renew; 2 - explicit no automatic renew. NOTES: Only supported prepaid EIP.",
+			},
+
 			"internet_max_bandwidth_out": {
 				Type:        schema.TypeInt,
 				Optional:    true,
+				Computed:    true,
 				Description: "The bandwidth limit of EIP, unit is Mbps.",
 			},
 			"tags": {
@@ -97,6 +113,7 @@ func resourceTencentCloudEip() *schema.Resource {
 			"bandwidth_package_id": {
 				Type:        schema.TypeString,
 				Optional:    true,
+				Computed:    true,
 				Description: "ID of bandwidth package, it will set when `internet_charge_type` is `BANDWIDTH_PACKAGE`.",
 			},
 			// computed
@@ -125,6 +142,8 @@ func resourceTencentCloudEipCreate(d *schema.ResourceData, meta interface{}) err
 	tagService := TagService{client: client}
 	region := client.Region
 
+	var internetChargeType string
+
 	request := vpc.NewAllocateAddressesRequest()
 	if v, ok := d.GetOk("type"); ok {
 		request.AddressType = helper.String(v.(string))
@@ -136,11 +155,22 @@ func resourceTencentCloudEipCreate(d *schema.ResourceData, meta interface{}) err
 		request.InternetServiceProvider = helper.String(v.(string))
 	}
 	if v, ok := d.GetOk("internet_charge_type"); ok {
+		internetChargeType = v.(string)
 		request.InternetChargeType = helper.String(v.(string))
 	}
 	if v, ok := d.GetOk("internet_max_bandwidth_out"); ok {
 		request.InternetMaxBandwidthOut = helper.IntInt64(v.(int))
 	}
+
+	if internetChargeType == "BANDWIDTH_PREPAID_BY_MONTH" {
+		addressChargePrepaid := vpc.AddressChargePrepaid{}
+		period := d.Get("prepaid_period")
+		renewFlag := d.Get("auto_renew_flag")
+		addressChargePrepaid.Period = helper.IntInt64(period.(int))
+		addressChargePrepaid.AutoRenewFlag = helper.IntInt64(renewFlag.(int))
+		request.AddressChargePrepaid = &addressChargePrepaid
+	}
+
 	if v := helper.GetTags(d, "tags"); len(v) > 0 {
 		for tagKey, tagValue := range v {
 			tag := vpc.Tag{
@@ -264,6 +294,11 @@ func resourceTencentCloudEipRead(d *schema.ResourceData, meta interface{}) error
 	_ = d.Set("status", eip.AddressStatus)
 	_ = d.Set("internet_charge_type", eip.InternetChargeType)
 	_ = d.Set("tags", tags)
+
+	if eip.Bandwidth != nil {
+		_ = d.Set("internet_max_bandwidth_out", eip.Bandwidth)
+	}
+
 	if bgp != nil {
 		_ = d.Set("bandwidth_package_id", bgp.BandwidthPackageId)
 	}
@@ -315,6 +350,15 @@ func resourceTencentCloudEipUpdate(d *schema.ResourceData, meta interface{}) err
 		}
 	}
 
+	if d.HasChange("prepaid_period") || d.HasChange("auto_renew_flag") {
+		period := d.Get("prepaid_period").(int)
+		renewFlag := d.Get("auto_renew_flag").(int)
+		err := vpcService.RenewAddress(ctx, eipId, period, renewFlag)
+		if err != nil {
+			return err
+		}
+	}
+
 	if d.HasChange("tags") {
 		oldTags, newTags := d.GetChange("tags")
 		replaceTags, deleteTags := diffTags(oldTags.(map[string]interface{}), newTags.(map[string]interface{}))
@@ -363,6 +407,40 @@ func resourceTencentCloudEipDelete(d *schema.ResourceData, meta interface{}) err
 		return err
 	}
 
+	var internetChargeType string
+	if v, ok := d.GetOk("internet_charge_type"); ok {
+		internetChargeType = v.(string)
+	}
+
+	if internetChargeType == "BANDWIDTH_PREPAID_BY_MONTH" {
+		// isolated
+		err = resource.Retry(readRetryTimeout, func() *resource.RetryError {
+			eip, errRet := vpcService.DescribeEipById(ctx, eipId)
+			if errRet != nil {
+				return retryError(errRet)
+			}
+			if !*eip.IsArrears {
+				return resource.RetryableError(fmt.Errorf("eip is still isolate"))
+			}
+			return nil
+		})
+		if err != nil {
+			return err
+		}
+
+		// release
+		err = resource.Retry(writeRetryTimeout, func() *resource.RetryError {
+			errRet := vpcService.DeleteEip(ctx, eipId)
+			if errRet != nil {
+				return retryError(errRet, "DesOperation.MutexTaskRunning")
+			}
+			return nil
+		})
+		if err != nil {
+			return err
+		}
+	}
+
 	err = resource.Retry(readRetryTimeout, func() *resource.RetryError {
 		eip, errRet := vpcService.DescribeEipById(ctx, eipId)
 		if errRet != nil {

tencentcloud/resource_tc_eip_test.go

@@ -66,7 +66,7 @@ func testSweepEipInstance(region string) error {
 	return nil
 }
 
-func TestAccTencentCloudEip_basic(t *testing.T) {
+func TestAccTencentCloudEipResource_basic(t *testing.T) {
 	t.Parallel()
 	resource.Test(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t) },
@@ -127,7 +127,7 @@ func TestAccTencentCloudEip_basic(t *testing.T) {
 	})
 }
 
-func TestAccTencentCloudEip_anycast(t *testing.T) {
+func TestAccTencentCloudEipResource_anycast(t *testing.T) {
 	defer func() {
 		os.Setenv(PROVIDER_REGION, "")
 	}()
@@ -149,7 +149,7 @@ func TestAccTencentCloudEip_anycast(t *testing.T) {
 	})
 }
 
-func TestAccTencentCloudEip_provider(t *testing.T) {
+func TestAccTencentCloudEipResource_provider(t *testing.T) {
 	t.Parallel()
 	resource.Test(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t) },
@@ -168,7 +168,7 @@ func TestAccTencentCloudEip_provider(t *testing.T) {
 	})
 }
 
-func TestAccTencentCloudEip_bandwidth(t *testing.T) {
+func TestAccTencentCloudEipResource_bandwidth(t *testing.T) {
 	t.Parallel()
 	resource.Test(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t) },
@@ -187,7 +187,7 @@ func TestAccTencentCloudEip_bandwidth(t *testing.T) {
 	})
 }
 
-func TestAccTencentCloudEip_chargetype(t *testing.T) {
+func TestAccTencentCloudEipResource_chargetype(t *testing.T) {
 	t.Parallel()
 	resource.Test(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t) },
@@ -210,6 +210,30 @@ func TestAccTencentCloudEip_chargetype(t *testing.T) {
 	})
 }
 
+func TestAccTencentCloudEipResource_prepaid(t *testing.T) {
+	t.Parallel()
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheckCommon(t, ACCOUNT_TYPE_PREPAY) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckEipDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccEipPrepaid,
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckEipExists("tencentcloud_eip.foo"),
+					resource.TestCheckResourceAttr("tencentcloud_eip.foo", "internet_charge_type", "BANDWIDTH_PREPAID_BY_MONTH"),
+				),
+			},
+			{
+				ResourceName:            "tencentcloud_eip.foo",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"prepaid_period", "auto_renew_flag"},
+			},
+		},
+	})
+}
+
 func testAccCheckEipExists(n string) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		logId := getLogId(contextNil)
@@ -324,7 +348,7 @@ resource "tencentcloud_eip" "foo" {
 const testAccEipProvider = `
 resource "tencentcloud_eip" "foo" {
   name = "eip_provider"
-  internet_service_provider = "CUCC"
+  internet_service_provider = "CMCC"
 }
 `
 
@@ -342,3 +366,13 @@ resource "tencentcloud_eip" "foo" {
 	internet_charge_type = "TRAFFIC_POSTPAID_BY_HOUR"
   }
 `
+
+const testAccEipPrepaid = `
+resource "tencentcloud_eip" "foo" {
+  name = "eip_prepaid"
+  internet_charge_type = "BANDWIDTH_PREPAID_BY_MONTH"
+  prepaid_period = 6
+  auto_renew_flag = 1
+  internet_max_bandwidth_out = 2
+}
+`

tencentcloud/service_tencentcloud_vpc.go

@@ -2325,6 +2325,27 @@ func (me *VpcService) ModifyEipBandwidthOut(ctx context.Context, eipId string, b
 	return nil
 }
 
+func (me *VpcService) RenewAddress(ctx context.Context, eipId string, period int, renewFlag int) error {
+	logId := getLogId(ctx)
+	request := vpc.NewRenewAddressesRequest()
+	request.AddressIds = []*string{&eipId}
+	addressChargePrepaid := vpc.AddressChargePrepaid{}
+	addressChargePrepaid.AutoRenewFlag = helper.IntInt64(renewFlag)
+	addressChargePrepaid.Period = helper.IntInt64(period)
+	request.AddressChargePrepaid = &addressChargePrepaid
+	ratelimit.Check(request.GetAction())
+	response, err := me.client.UseVpcClient().RenewAddresses(request)
+	if err != nil {
+		log.Printf("[CRITAL]%s api[%s] fail, request body [%s], reason[%s]\n",
+			logId, request.GetAction(), request.ToJsonString(), err.Error())
+		return err
+	}
+	log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n",
+		logId, request.GetAction(), request.ToJsonString(), response.ToJsonString())
+
+	return nil
+}
+
 func (me *VpcService) DeleteEip(ctx context.Context, eipId string) error {
 	logId := getLogId(ctx)
 	request := vpc.NewReleaseAddressesRequest()

website/docs/r/eip.html.markdown

@@ -28,11 +28,13 @@ The following arguments are supported:
 
 * `anycast_zone` - (Optional, String, ForceNew) The zone of anycast. Valid value: `ANYCAST_ZONE_GLOBAL` and `ANYCAST_ZONE_OVERSEAS`.
 * `applicable_for_clb` - (Optional, Bool, **Deprecated**) It has been deprecated from version 1.27.0. Indicates whether the anycast eip can be associated to a CLB.
+* `auto_renew_flag` - (Optional, Int) Auto renew flag.  0 - default state (manual renew); 1 - automatic renew; 2 - explicit no automatic renew. NOTES: Only supported prepaid EIP.
 * `bandwidth_package_id` - (Optional, String) ID of bandwidth package, it will set when `internet_charge_type` is `BANDWIDTH_PACKAGE`.
 * `internet_charge_type` - (Optional, String, ForceNew) The charge type of eip. Valid values: `BANDWIDTH_PACKAGE`, `BANDWIDTH_POSTPAID_BY_HOUR`, `BANDWIDTH_PREPAID_BY_MONTH` and `TRAFFIC_POSTPAID_BY_HOUR`.
 * `internet_max_bandwidth_out` - (Optional, Int) The bandwidth limit of EIP, unit is Mbps.
 * `internet_service_provider` - (Optional, String, ForceNew) Internet service provider of eip. Valid value: `BGP`, `CMCC`, `CTCC` and `CUCC`.
 * `name` - (Optional, String) The name of eip.
+* `prepaid_period` - (Optional, Int) Period of instance. Default value: `1`. Valid value: `1`, `2`, `3`, `4`, `6`, `7`, `8`, `9`, `12`, `24`, `36`. NOTES: must set when `internet_charge_type` is `BANDWIDTH_PREPAID_BY_MONTH`.
 * `tags` - (Optional, Map) The tags of eip.
 * `type` - (Optional, String, ForceNew) The type of eip. Valid value:  `EIP` and `AnycastEIP` and `HighQualityEIP`. Default is `EIP`.