Merge pull request #499 from piggona/master

feature: update internet_max_bandwidth_out with no forceNew operation

Author: gailwang

CHANGELOG.md

@@ -4,6 +4,7 @@ BUG FIXES:
 
 * Resource: `tencentcloud_vpn_gateway` fix force new issue when apply repeatedly.
 * Resource: `tencentcloud_vpn_connection` fix force new issue when apply repeatedly.
+* Resource: `tencentcloud_instance` support for adjusting `internet_max_bandwidth_out` without forceNew when attribute `internet_charge_type` within `TRAFFIC_POSTPAID_BY_HOUR`,`BANDWIDTH_POSTPAID_BY_HOUR`,`BANDWIDTH_PACKAGE` ([#498](https://github.com/tencentcloudstack/terraform-provider-tencentcloud/issues/498)).
 
 ## 1.41.0 (August 17, 2020)
 

tencentcloud/resource_tc_instance.go

@@ -200,7 +200,6 @@ func resourceTencentCloudInstance() *schema.Resource {
 				Type:        schema.TypeInt,
 				Optional:    true,
 				Computed:    true,
-				ForceNew:    true,
 				Description: "Maximum outgoing bandwidth to the public network, measured in Mbps (Mega bit per second). This value does not need to be set when `allocate_public_ip` is false.",
 			},
 			"allocate_public_ip": {
@@ -943,6 +942,34 @@ func resourceTencentCloudInstanceUpdate(d *schema.ResourceData, meta interface{}
 		d.SetPartial("tags")
 	}
 
+	if d.HasChange("internet_max_bandwidth_out") {
+		chargeType := d.Get("internet_charge_type").(string)
+		if chargeType != "TRAFFIC_POSTPAID_BY_HOUR" && chargeType != "BANDWIDTH_POSTPAID_BY_HOUR" && chargeType != "BANDWIDTH_PACKAGE" {
+			return fmt.Errorf("charge type should be one of `TRAFFIC_POSTPAID_BY_HOUR BANDWIDTH_POSTPAID_BY_HOUR BANDWIDTH_PACKAGE` when adjusting internet_max_bandwidth_out")
+		}
+
+		err := cvmService.ModifyInternetMaxBandwidthOut(ctx, instanceId, chargeType, int64(d.Get("internet_max_bandwidth_out").(int)))
+		if err != nil {
+			return err
+		}
+		d.SetPartial("internet_max_bandwidth_out")
+		time.Sleep(1 * time.Second)
+		err = resource.Retry(2*readRetryTimeout, func() *resource.RetryError {
+			instance, errRet := cvmService.DescribeInstanceById(ctx, instanceId)
+			if errRet != nil {
+				return retryError(errRet, InternalError)
+			}
+			if instance != nil && *instance.LatestOperationState == CVM_LATEST_OPERATION_STATE_OPERATING {
+				return resource.RetryableError(fmt.Errorf("cvm instance latest operetion status is %s, retry...", *instance.LatestOperationState))
+			}
+			return nil
+		})
+		if err != nil {
+			return err
+		}
+
+	}
+
 	d.Partial(false)
 
 	return resourceTencentCloudInstanceRead(d, meta)

tencentcloud/resource_tc_instance_test.go

@@ -131,7 +131,7 @@ func TestAccTencentCloudInstanceWithNetwork(t *testing.T) {
 		CheckDestroy:  testAccCheckInstanceDestroy,
 		Steps: []resource.TestStep{
 			{
-				Config: testAccTencentCloudInstanceWithNetwork("false"),
+				Config: testAccTencentCloudInstanceWithNetwork("false", 1),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckTencentCloudDataSourceID(id),
 					testAccCheckTencentCloudInstanceExists(id),
@@ -140,10 +140,11 @@ func TestAccTencentCloudInstanceWithNetwork(t *testing.T) {
 				),
 			},
 			{
-				Config: testAccTencentCloudInstanceWithNetwork("true"),
+				Config: testAccTencentCloudInstanceWithNetwork("true", 5),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckTencentCloudDataSourceID(id),
 					testAccCheckTencentCloudInstanceExists(id),
+					resource.TestCheckResourceAttr(id, "internet_max_bandwidth_out", "5"),
 					resource.TestCheckResourceAttr(id, "instance_status", "RUNNING"),
 					resource.TestCheckResourceAttrSet(id, "public_ip"),
 				),
@@ -579,7 +580,7 @@ resource "tencentcloud_instance" "foo" {
 }
 `
 
-func testAccTencentCloudInstanceWithNetwork(hasPublicIp string) string {
+func testAccTencentCloudInstanceWithNetwork(hasPublicIp string, maxBandWidthOut int64) string {
 	return fmt.Sprintf(
 		defaultInstanceVariable+`
 resource "tencentcloud_instance" "foo" {
@@ -588,12 +589,12 @@ resource "tencentcloud_instance" "foo" {
   image_id                   = data.tencentcloud_images.default.images.0.image_id
   instance_type              = data.tencentcloud_instance_types.default.instance_types.0.instance_type
   internet_charge_type       = "TRAFFIC_POSTPAID_BY_HOUR"
-  internet_max_bandwidth_out = 1
+  internet_max_bandwidth_out = %d
   allocate_public_ip         = %s
   system_disk_type           = "CLOUD_PREMIUM"
 }
 `,
-		hasPublicIp,
+		maxBandWidthOut, hasPublicIp,
 	)
 }
 

tencentcloud/service_tencentcloud_cvm.go

@@ -179,6 +179,25 @@ func (me *CvmService) ModifyPassword(ctx context.Context, instanceId, password s
 	return nil
 }
 
+func (me *CvmService) ModifyInternetMaxBandwidthOut(ctx context.Context, instanceId, internetChargeType string, internetMaxBandWidthOut int64) error {
+	logId := getLogId(ctx)
+	request := cvm.NewResetInstancesInternetMaxBandwidthRequest()
+	request.InstanceIds = []*string{&instanceId}
+	request.InternetAccessible = &cvm.InternetAccessible{
+		InternetChargeType:      &internetChargeType,
+		InternetMaxBandwidthOut: &internetMaxBandWidthOut,
+	}
+
+	ratelimit.Check(request.GetAction())
+	_, err := me.client.UseCvmClient().ResetInstancesInternetMaxBandwidth(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
+	}
+	return nil
+}
+
 func (me *CvmService) ModifyVpc(ctx context.Context, instanceId, vpcId, subnetId, privateIp string) error {
 	logId := getLogId(ctx)
 	request := cvm.NewModifyInstancesVpcAttributeRequest()

website/docs/r/instance.html.markdown

@@ -92,7 +92,7 @@ The following arguments are supported:
 * `instance_name` - (Optional) The name of the CVM. The max length of instance_name is 60, and default value is `Terraform-CVM-Instance`.
 * `instance_type` - (Optional) The type of instance to start.
 * `internet_charge_type` - (Optional, ForceNew) Internet charge type of the instance, Valid values are `BANDWIDTH_PREPAID`, `TRAFFIC_POSTPAID_BY_HOUR`, `BANDWIDTH_POSTPAID_BY_HOUR` and `BANDWIDTH_PACKAGE`. This value does not need to be set when `allocate_public_ip` is false.
-* `internet_max_bandwidth_out` - (Optional, ForceNew) Maximum outgoing bandwidth to the public network, measured in Mbps (Mega bit per second). This value does not need to be set when `allocate_public_ip` is false.
+* `internet_max_bandwidth_out` - (Optional) Maximum outgoing bandwidth to the public network, measured in Mbps (Mega bit per second). This value does not need to be set when `allocate_public_ip` is false.
 * `key_name` - (Optional) The key pair to use for the instance, it looks like skey-16jig7tx.
 * `password` - (Optional) Password to an instance. In order to take effect new password, the instance will be restarted after modifying the password.
 * `placement_group_id` - (Optional, ForceNew) The id of a placement group.