fix: cvm optimize charge type modification (#924)

Author: Kagashino

tencentcloud/resource_tc_instance.go

@@ -994,6 +994,11 @@ func resourceTencentCloudInstanceUpdate(d *schema.ResourceData, meta interface{}
 
 	d.Partial(true)
 
+	var (
+		periodSet    = false
+		renewFlagSet = false
+	)
+
 	if d.HasChange("instance_charge_type") {
 		old, chargeType := d.GetChange("instance_charge_type")
 		if old.(string) != CVM_CHARGE_TYPE_POSTPAID || chargeType.(string) != CVM_CHARGE_TYPE_PREPAID {
@@ -1030,17 +1035,17 @@ func resourceTencentCloudInstanceUpdate(d *schema.ResourceData, meta interface{}
 				if *instance.LatestOperationState == CVM_LATEST_OPERATION_STATE_FAILED {
 					return resource.NonRetryableError(fmt.Errorf("failed operation when modify instance charge type"))
 				}
-			} else if instance != nil && *instance.InstanceChargeType == CVM_CHARGE_TYPE_POSTPAID {
-				return resource.RetryableError(fmt.Errorf("cvm charge type is still %s, retry", CVM_CHARGE_TYPE_POSTPAID))
 			}
 			return nil
 		})
 		if err != nil {
 			return err
 		}
+		periodSet = true
+		renewFlagSet = true
 	}
 
-	if d.HasChange("instance_charge_type_prepaid_period") {
+	if d.HasChange("instance_charge_type_prepaid_period") && !periodSet {
 		chargeType := d.Get("instance_charge_type").(string)
 		if chargeType != CVM_CHARGE_TYPE_PREPAID {
 			return fmt.Errorf("tencentcloud_cvm_instance update on instance_charge_type_prepaid_period or instance_charge_type_prepaid_renew_flag is only supported with charge type PREPAID")
@@ -1050,7 +1055,7 @@ func resourceTencentCloudInstanceUpdate(d *schema.ResourceData, meta interface{}
 		}
 	}
 
-	if d.HasChange("instance_charge_type_prepaid_renew_flag") {
+	if d.HasChange("instance_charge_type_prepaid_renew_flag") && !renewFlagSet {
 		//check
 		chargeType := d.Get("instance_charge_type").(string)
 		if chargeType != CVM_CHARGE_TYPE_PREPAID {

tencentcloud/resource_tc_instance_test.go

@@ -464,6 +464,38 @@ func TestAccTencentCloudInstanceWithSpotpaid(t *testing.T) {
 	})
 }
 
+func TestAccTencentCloudInstancePostpaidToPrepaid(t *testing.T) {
+	t.Parallel()
+
+	id := "tencentcloud_instance.foo"
+	resource.Test(t, resource.TestCase{
+		PreCheck:      func() { testAccPreCheckCommon(t, ACCOUNT_TYPE_PREPAY) },
+		IDRefreshName: id,
+		Providers:     testAccProviders,
+		CheckDestroy:  testAccCheckInstanceDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccTencentCloudInstancePostPaid,
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckTencentCloudDataSourceID(id),
+					testAccCheckTencentCloudInstanceExists(id),
+					resource.TestCheckResourceAttr(id, "instance_status", "RUNNING"),
+				),
+			},
+			{
+				Config: testAccTencentCloudInstanceBasicToPrepaid,
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckTencentCloudDataSourceID(id),
+					testAccCheckTencentCloudInstanceExists(id),
+					resource.TestCheckResourceAttr(id, "instance_charge_type", "PREPAID"),
+					resource.TestCheckResourceAttr(id, "instance_charge_type_prepaid_period", "1"),
+					resource.TestCheckResourceAttr(id, "instance_charge_type_prepaid_renew_flag", "NOTIFY_AND_MANUAL_RENEW"),
+				),
+			},
+		},
+	})
+}
+
 func testAccCheckTencentCloudInstanceExists(n string) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		logId := getLogId(contextNil)
@@ -524,7 +556,7 @@ func testAccCheckInstanceDestroy(s *terraform.State) error {
 		if err != nil {
 			return err
 		}
-		if instance != nil {
+		if instance != nil && *instance.InstanceState != CVM_STATUS_SHUTDOWN && *instance.InstanceState != CVM_STATUS_TERMINATING {
 			return fmt.Errorf("cvm instance still exists: %s", rs.Primary.ID)
 		}
 	}
@@ -544,6 +576,49 @@ resource "tencentcloud_instance" "foo" {
 }
 `
 
+const testAccTencentCloudInstancePostPaid = `
+data "tencentcloud_instance_types" "default" {
+  filter {
+    name   = "instance-family"
+    values = ["S1"]
+  }
+
+  cpu_core_count = 1
+  memory_size    = 1
+}
+
+resource "tencentcloud_instance" "foo" {
+  instance_name     = "` + defaultInsName + `"
+  availability_zone = "` + defaultAZone + `"
+  image_id          = "` + defaultTkeOSImageId + `"
+  instance_type     = data.tencentcloud_instance_types.default.instance_types.0.instance_type
+  system_disk_type  = "CLOUD_PREMIUM"
+}
+`
+
+const testAccTencentCloudInstanceBasicToPrepaid = `
+data "tencentcloud_instance_types" "default" {
+  filter {
+    name   = "instance-family"
+    values = ["S1"]
+  }
+
+  cpu_core_count = 1
+  memory_size    = 1
+}
+
+resource "tencentcloud_instance" "foo" {
+  instance_name     = "` + defaultInsName + `"
+  availability_zone = "` + defaultAZone + `"
+  image_id          = "` + defaultTkeOSImageId + `"
+  instance_type     = data.tencentcloud_instance_types.default.instance_types.0.instance_type
+  system_disk_type  = "CLOUD_PREMIUM"
+  instance_charge_type       = "PREPAID"
+  instance_charge_type_prepaid_period = 1
+  instance_charge_type_prepaid_renew_flag = "NOTIFY_AND_MANUAL_RENEW"
+}
+`
+
 const testAccTencentCloudInstanceModifyInstanceType = defaultInstanceVariable + `
 data "tencentcloud_instance_types" "new_type" {
   filter {