feat: cvm - support prepaid/postpaid charge type dual modify (#1091)

* feat: cvm - support prepaid/postpaid charge type dual modify

* fix: cvm data testcase

* fix: cvm data testcase az

Author: Kagashino

tencentcloud/data_source_tc_instances_test.go

@@ -21,11 +21,11 @@ func TestAccTencentCloudDataSourceInstancesBase(t *testing.T) {
 					resource.TestCheckResourceAttrSet("data.tencentcloud_instances.foo", "instance_list.0.instance_id"),
 					resource.TestCheckResourceAttr("data.tencentcloud_instances.foo", "instance_list.0.instance_name", defaultInsName),
 					resource.TestCheckResourceAttrSet("data.tencentcloud_instances.foo", "instance_list.0.instance_type"),
-					resource.TestCheckResourceAttr("data.tencentcloud_instances.foo", "instance_list.0.cpu", "1"),
-					resource.TestCheckResourceAttr("data.tencentcloud_instances.foo", "instance_list.0.memory", "1"),
-					resource.TestCheckResourceAttr("data.tencentcloud_instances.foo", "instance_list.0.availability_zone", defaultAZone),
+					resource.TestCheckResourceAttrSet("data.tencentcloud_instances.foo", "instance_list.0.cpu"),
+					resource.TestCheckResourceAttrSet("data.tencentcloud_instances.foo", "instance_list.0.memory"),
+					resource.TestCheckResourceAttrSet("data.tencentcloud_instances.foo", "instance_list.0.availability_zone"),
 					resource.TestCheckResourceAttr("data.tencentcloud_instances.foo", "instance_list.0.project_id", "0"),
-					resource.TestCheckResourceAttr("data.tencentcloud_instances.foo", "instance_list.0.system_disk_type", "CLOUD_PREMIUM"),
+					resource.TestCheckResourceAttrSet("data.tencentcloud_instances.foo", "instance_list.0.system_disk_type"),
 				),
 			},
 		},

tencentcloud/resource_tc_instance.go

@@ -1016,28 +1016,31 @@ func resourceTencentCloudInstanceUpdate(d *schema.ResourceData, meta interface{}
 	}
 
 	var (
-		periodSet      = false
-		renewFlagSet   = false
-		alreadyPrepaid = *instanceInfo.InstanceChargeType == CVM_CHARGE_TYPE_PREPAID
+		periodSet         = false
+		renewFlagSet      = false
+		expectChargeType  = CVM_CHARGE_TYPE_POSTPAID
+		currentChargeType = *instanceInfo.InstanceChargeType
 	)
 
-	if d.HasChange("instance_charge_type") && !alreadyPrepaid {
-		old, chargeType := d.GetChange("instance_charge_type")
-		if old.(string) != CVM_CHARGE_TYPE_POSTPAID || chargeType.(string) != CVM_CHARGE_TYPE_PREPAID {
-			return fmt.Errorf("Only support change chargeType from POSTPAID_BY_HOUR to PREPAID.")
-		}
+	chargeType, chargeOk := d.GetOk("instance_charge_type")
+	if chargeOk {
+		expectChargeType = chargeType.(string)
+	}
+
+	if d.HasChange("instance_charge_type") && expectChargeType != currentChargeType {
 		var (
-			period    int
+			period    = -1
 			renewFlag string
 		)
+
 		if v, ok := d.GetOk("instance_charge_type_prepaid_period"); ok {
 			period = v.(int)
 		}
 		if v, ok := d.GetOk("instance_charge_type_prepaid_renew_flag"); ok {
 			renewFlag = v.(string)
 		}
 		// change charge type
-		err := cvmService.ModifyInstanceChargeType(ctx, instanceId, chargeType.(string), period, renewFlag)
+		err := cvmService.ModifyInstanceChargeType(ctx, instanceId, expectChargeType, period, renewFlag)
 		if err != nil {
 			return err
 		}

tencentcloud/resource_tc_instance_test.go

@@ -529,6 +529,39 @@ func TestAccTencentCloudInstancePostpaidToPrepaid(t *testing.T) {
 	})
 }
 
+func TestAccTencentCloudInstancePrepaidFallbackToPostpaid(t *testing.T) {
+
+	id := "tencentcloud_instance.foo"
+	resource.Test(t, resource.TestCase{
+		PreCheck:      func() { testAccPreCheck(t) },
+		IDRefreshName: id,
+		Providers:     testAccProviders,
+		CheckDestroy:  testAccCheckInstanceDestroy,
+		Steps: []resource.TestStep{
+			{
+				PreConfig: func() { testAccStepPreConfigSetTempAKSK(t, ACCOUNT_TYPE_PREPAY) },
+				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"),
+				),
+			},
+			{
+				PreConfig: func() { testAccStepPreConfigSetTempAKSK(t, ACCOUNT_TYPE_PREPAY) },
+				Config:    testAccTencentCloudInstancePostPaid,
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckTencentCloudDataSourceID(id),
+					testAccCheckTencentCloudInstanceExists(id),
+					resource.TestCheckResourceAttr(id, "instance_status", "RUNNING"),
+				),
+			},
+		},
+	})
+}
+
 func testAccCheckTencentCloudInstanceExists(n string) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		logId := getLogId(contextNil)

tencentcloud/service_tencentcloud_cvm.go

@@ -1038,12 +1038,14 @@ func (me *CvmService) ModifyInstanceChargeType(ctx context.Context, instanceId s
 	request := cvm.NewModifyInstancesChargeTypeRequest()
 	request.InstanceIds = []*string{&instanceId}
 	request.InstanceChargeType = &chargeType
-	request.InstanceChargePrepaid = &cvm.InstanceChargePrepaid{}
-	if period != -1 {
-		request.InstanceChargePrepaid.Period = helper.IntInt64(period)
-	}
-	if renewFlag != "" {
-		request.InstanceChargePrepaid.RenewFlag = &renewFlag
+	if chargeType == CVM_CHARGE_TYPE_PREPAID {
+		request.InstanceChargePrepaid = &cvm.InstanceChargePrepaid{}
+		if period != -1 {
+			request.InstanceChargePrepaid.Period = helper.IntInt64(period)
+		}
+		if renewFlag != "" {
+			request.InstanceChargePrepaid.RenewFlag = &renewFlag
+		}
 	}
 
 	ratelimit.Check(request.GetAction())