[fix]rollback instance_charge_type_prepaid_period (#799)

* [fix]rollback instance_charge_type_prepaid_period

* [fix]rollback instance_charge_type_prepaid_period

Co-authored-by: mikatong <[email protected]>

Author: tongyiming

tencentcloud/extension_cvm.go

@@ -1,9 +1,5 @@
 package tencentcloud
 
-import (
-	"time"
-)
-
 const (
 	CVM_CHARGE_TYPE_PREPAID  = "PREPAID"
 	CVM_CHARGE_TYPE_POSTPAID = "POSTPAID_BY_HOUR"
@@ -103,23 +99,3 @@ var CVM_PLACEMENT_GROUP_TYPE = []string{
 var CVM_SPOT_INSTANCE_TYPE = []string{
 	CVM_SPOT_INSTANCE_TYPE_ONE_TIME,
 }
-
-func DeltaMonth(t1, t2 string) (deltaMonth int, err error) {
-	// t1-t2
-	timeTemplate := "2006-01-02T15:04:05Z"
-	tt1, err := time.Parse(timeTemplate, t1)
-	if err != nil {
-		return
-	}
-	tt2, err := time.Parse(timeTemplate, t2)
-	if err != nil {
-		return
-	}
-	tt1Month := int(tt1.Month())
-	tt2Month := int(tt2.Month())
-	deltaMonth = tt1Month - tt2Month
-	if deltaMonth < 0 {
-		deltaMonth += 12
-	}
-	return
-}

tencentcloud/resource_tc_instance.go

@@ -10,7 +10,7 @@ Example Usage
 ```hcl
 data "tencentcloud_images" "my_favorite_image" {
   image_type = ["PUBLIC_IMAGE"]
-  os_name    = "centos"
+  os_name    = "Tencent Linux release 3.2 (Final)"
 }
 
 data "tencentcloud_instance_types" "my_favorite_instance_types" {
@@ -51,9 +51,7 @@ resource "tencentcloud_instance" "my_awesome_app" {
   project_id                 = 0
   vpc_id                     = tencentcloud_vpc.app.id
   subnet_id                  = tencentcloud_subnet.app.id
-  internet_max_bandwidth_out = 20
   count                      = 2
-  cam_role_name              = "CVM_QcsRole"
 
   data_disks {
     data_disk_type = "CLOUD_PREMIUM"
@@ -146,7 +144,6 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
-	"github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/errors"
 	sdkErrors "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/errors"
 	cvm "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm/v20170312"
 	"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper"
@@ -886,16 +883,6 @@ func resourceTencentCloudInstanceRead(d *schema.ResourceData, meta interface{})
 	if d.Get("image_id").(string) == "" || !IsContains(cvmImages, *instance.ImageId) {
 		_ = d.Set("image_id", instance.ImageId)
 	}
-	expiredTime := instance.ExpiredTime
-	createdTime := instance.CreatedTime
-	if expiredTime != nil && createdTime != nil {
-		deltaMonth, err := DeltaMonth(*instance.ExpiredTime, *instance.CreatedTime)
-		if err != nil {
-			return err
-		}
-		_ = d.Set("instance_charge_type_prepaid_period", deltaMonth)
-
-	}
 
 	_ = d.Set("availability_zone", instance.Placement.Zone)
 	_ = d.Set("instance_name", instance.InstanceName)
@@ -1449,7 +1436,7 @@ func resourceTencentCloudInstanceDelete(d *schema.ResourceData, meta interface{}
 		//when state is terminating, do not delete but check exist
 		if errRet != nil {
 			//check InvalidInstanceState.Terminating
-			ee, ok := errRet.(*errors.TencentCloudSDKError)
+			ee, ok := errRet.(*sdkErrors.TencentCloudSDKError)
 			if !ok {
 				return retryError(errRet)
 			}

website/docs/r/instance.html.markdown

@@ -20,7 +20,7 @@ Provides a CVM instance resource.
 ```hcl
 data "tencentcloud_images" "my_favorite_image" {
   image_type = ["PUBLIC_IMAGE"]
-  os_name    = "centos"
+  os_name    = "Tencent Linux release 3.2 (Final)"
 }
 
 data "tencentcloud_instance_types" "my_favorite_instance_types" {
@@ -51,19 +51,17 @@ resource "tencentcloud_subnet" "app" {
 
 // Create 2 CVM instances to host awesome_app
 resource "tencentcloud_instance" "my_awesome_app" {
-  instance_name              = "awesome_app"
-  availability_zone          = data.tencentcloud_availability_zones.my_favorite_zones.zones.0.name
-  image_id                   = data.tencentcloud_images.my_favorite_image.images.0.image_id
-  instance_type              = data.tencentcloud_instance_types.my_favorite_instance_types.instance_types.0.instance_type
-  system_disk_type           = "CLOUD_PREMIUM"
-  system_disk_size           = 50
-  hostname                   = "user"
-  project_id                 = 0
-  vpc_id                     = tencentcloud_vpc.app.id
-  subnet_id                  = tencentcloud_subnet.app.id
-  internet_max_bandwidth_out = 20
-  count                      = 2
-  cam_role_name              = "CVM_QcsRole"
+  instance_name     = "awesome_app"
+  availability_zone = data.tencentcloud_availability_zones.my_favorite_zones.zones.0.name
+  image_id          = data.tencentcloud_images.my_favorite_image.images.0.image_id
+  instance_type     = data.tencentcloud_instance_types.my_favorite_instance_types.instance_types.0.instance_type
+  system_disk_type  = "CLOUD_PREMIUM"
+  system_disk_size  = 50
+  hostname          = "user"
+  project_id        = 0
+  vpc_id            = tencentcloud_vpc.app.id
+  subnet_id         = tencentcloud_subnet.app.id
+  count             = 2
 
   data_disks {
     data_disk_type = "CLOUD_PREMIUM"