fix: reserved_instance (#916)

* fix: reserved_instance

* fix: tke unit test

* fix: reserved instance

* fix reserved_instance

* fix: rollback tks unit test

* fix: update vendor

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

Author: tongyiming

go.mod

@@ -30,8 +30,8 @@ require (
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.283
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit v1.0.199
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.377
-	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.383
-	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.351
+	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.385
+	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.385
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.0.359
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dayu v1.0.335
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dc v1.0.199

go.sum

@@ -518,10 +518,18 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.378 h1:o+GK
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.378/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.383 h1:1TFCoXSDga/8jO66SGD7K7jMveZGVNJaD4IhX+vfvL0=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.383/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.385 h1:bwgb0FZJRlPcDn3uRJfA7rI7dZejg7LZS0b8rUBE2CQ=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.385/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.199 h1:ajgJogYSIQ5u1PIbiV5nsvr5K0fYpm1/T7Dy+mxEM6U=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.199/go.mod h1:AqyM/ZZMD7q5mHBqNY9YImbSpEpoEe7E/vrTbUWX+po=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.351 h1:zqJsH5pxGT57La7NAOOyMQxsuM11pupNBwV1dzXcT24=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.351/go.mod h1:IZH6xMdFwRrdxy6nEOdxdor+1AwDoOu/GG4PfPajwzM=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.381 h1:F8YmauCBhAgVxTymZHVe9PgzZyFU+USP4Rg/qvtJLeQ=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.381/go.mod h1:nwt2812GuKjmWNGtp7ISkcfku5td24JdzrRmeAEMT80=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.382 h1:wyCkL9Q/EnxWqZqPRw0/pziSHMn1vwxH+yIeE46utQA=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.382/go.mod h1:te3A+aQ1UnK4TOK7DBzS0a8ABE5fPljB28EiRIevyIw=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.385 h1:8bwloRxRwSADSK48KxaUeO9JHmmgniNGJbA7Or/HUEk=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.385/go.mod h1:PMxA0L4o8Fbx/6+ju1cAMAU7x2bV4C6e/LTqVe745yM=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.0.199 h1:L0twFkJMOZzLkX08w8S14nX6oanD8YxMQDIaYXVim6A=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.0.199/go.mod h1:AvfGfE5JXkyMV6uGd6B++SIDp+VV/SSphg1q2RiANFw=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.0.359 h1:cNKqelPgUxrJkLY0Azd2QHr/UMYOPPnmqs88clt2akk=

tencentcloud/data_source_tc_reserved_instance_configs.go

@@ -43,6 +43,16 @@ func dataSourceTencentCloudReservedInstanceConfigs() *schema.Resource {
 				Optional:    true,
 				Description: "The type of reserved instance.",
 			},
+			"offering_type": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				Description: "Filter by Payment Type. Such as All Upfront.",
+			},
+			"product_description": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				Description: "Filter by the Platform Description (that is, operating system) for Reserved Instance billing. Shaped like: linux.",
+			},
 			"result_output_file": {
 				Type:        schema.TypeString,
 				Optional:    true,
@@ -77,7 +87,7 @@ func dataSourceTencentCloudReservedInstanceConfigs() *schema.Resource {
 							Description: "Validity period of the reserved instance.",
 						},
 						"price": {
-							Type:        schema.TypeInt,
+							Type:        schema.TypeFloat,
 							Computed:    true,
 							Description: "Purchase price of the reserved instance.",
 						},
@@ -91,6 +101,16 @@ func dataSourceTencentCloudReservedInstanceConfigs() *schema.Resource {
 							Computed:    true,
 							Description: "Platform of the reserved instance.",
 						},
+						"offering_type": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "OfferingType of the reserved instance.",
+						},
+						"usage_price": {
+							Type:        schema.TypeFloat,
+							Computed:    true,
+							Description: "UsagePrice of the reserved instance.",
+						},
 					},
 				},
 			},
@@ -118,6 +138,12 @@ func dataSourceTencentCloudReservedInstanceConfigsRead(d *schema.ResourceData, m
 	if v, ok := d.GetOk("instance_type"); ok {
 		filter["instance-type"] = v.(string)
 	}
+	if v, ok := d.GetOk("offering_type"); ok {
+		filter["offering-type"] = v.(string)
+	}
+	if v, ok := d.GetOk("product_description"); ok {
+		filter["product-description"] = v.(string)
+	}
 
 	var configs []*cvm.ReservedInstancesOffering
 	var errRet error
@@ -143,6 +169,8 @@ func dataSourceTencentCloudReservedInstanceConfigsRead(d *schema.ResourceData, m
 			"price":             config.FixedPrice,
 			"currency_code":     config.CurrencyCode,
 			"platform":          config.ProductDescription,
+			"offering_type":     config.OfferingType,
+			"usage_price":       config.UsagePrice,
 		}
 		configList = append(configList, mapping)
 		ids = append(ids, *config.ReservedInstancesOfferingId)

tencentcloud/data_source_tc_reserved_instance_configs_test.go

@@ -9,7 +9,7 @@ import (
 func TestAccTencentCloudReservedInstanceConfigsDataSource(t *testing.T) {
 	t.Parallel()
 	resource.Test(t, resource.TestCase{
-		PreCheck:  func() { testAccPreCheck(t) },
+		PreCheck:  func() { testAccPreCheckCommon(t, ACCOUNT_TYPE_INTERNATION) },
 		Providers: testAccProviders,
 		Steps: []resource.TestStep{
 			{

tencentcloud/resource_tc_reserved_instance.go

@@ -53,6 +53,13 @@ func resourceTencentCloudReservedInstance() *schema.Resource {
 				ValidateFunc: validateIntegerMin(1),
 				Description:  "Number of reserved instances to be purchased.",
 			},
+			"reserved_instance_name": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Description: `Reserved Instance display name.
+				- If you do not specify an instance display name, 'Unnamed' is displayed by default.
+				- Up to 60 characters (including pattern strings) are supported.`,
+			},
 
 			// computed
 			"start_time": {
@@ -84,10 +91,14 @@ func resourceTencentCloudReservedInstanceCreate(d *schema.ResourceData, meta int
 	cvmService := CvmService{
 		client: meta.(*TencentCloudClient).apiV3Conn,
 	}
+	extendParams := make(map[string]interface{})
+	if v, ok := d.GetOk("reserved_instance_name"); ok {
+		extendParams["reserved_instance_name"] = v.(string)
+	}
 	var instanceId string
 	var errRet error
 	err := resource.Retry(writeRetryTimeout, func() *resource.RetryError {
-		instanceId, errRet = cvmService.CreateReservedInstance(ctx, configId, int64(count))
+		instanceId, errRet = cvmService.CreateReservedInstance(ctx, configId, int64(count), extendParams)
 		if errRet != nil {
 			return retryError(errRet)
 		}
@@ -137,6 +148,7 @@ func resourceTencentCloudReservedInstanceRead(d *schema.ResourceData, meta inter
 	_ = d.Set("start_time", instance.StartTime)
 	_ = d.Set("end_time", instance.EndTime)
 	_ = d.Set("status", instance.State)
+	_ = d.Set("reserved_instance_name", instance.ReservedInstanceName)
 
 	return nil
 }

tencentcloud/service_tencentcloud_cvm.go

@@ -727,11 +727,15 @@ func (me *CvmService) DescribeZones(ctx context.Context) (zones []*cvm.ZoneInfo,
 	return
 }
 
-func (me *CvmService) CreateReservedInstance(ctx context.Context, configId string, count int64) (instanceId string, errRet error) {
+func (me *CvmService) CreateReservedInstance(ctx context.Context, configId string, count int64, extendParams map[string]interface{}) (instanceId string, errRet error) {
 	logId := getLogId(ctx)
 	request := cvm.NewPurchaseReservedInstancesOfferingRequest()
 	request.ReservedInstancesOfferingId = &configId
 	request.InstanceCount = &count
+	if v, ok := extendParams["reserved_instance_name"]; ok {
+		reservedInstanceName := v.(string)
+		request.ReservedInstanceName = &reservedInstanceName
+	}
 
 	ratelimit.Check(request.GetAction())
 	response, err := me.client.UseCvmClient().PurchaseReservedInstancesOffering(request)