Feat/cvm resource (#1521)

* append tencentcloud_cvm_launch_template

* append tencentcloud_cvm_instances_modification

* add doc

* update doc

* update

* add changelog

Co-authored-by: mikatong <mikatong@tencent.com>

Author: tongyiming

.changelog/1521.txt

@@ -0,0 +1,7 @@
+```release-note:new-data-source
+tencentcloud_cvm_instances_modification
+```
+
+```release-note:new-resource
+tencentcloud_cvm_launch_template
+```

tencentcloud/basic_test.go

@@ -145,6 +145,14 @@ variable "snap_id" {
 }
 `
 
+// cvm-modification
+const defaultCommonCvmId = "ins-cr2rfq78"
+const defaultCvmModificationVariable = `
+variable "cvm_id" {
+  default = "` + defaultCommonCvmId + `"
+}
+`
+
 // AS
 const defaultAsVariable = `
 variable "availability_zone" {

tencentcloud/data_source_tc_cvm_instances_modification.go

@@ -0,0 +1,209 @@
+/*
+Use this data source to query cvm instances modification.
+
+Example Usage
+
+```hcl
+data "tencentcloud_cvm_instances_modification" "foo" {
+  instance_ids = ["ins-xxxxxxx"]
+}
+```
+*/
+package tencentcloud
+
+import (
+	"log"
+
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	cvm "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm/v20170312"
+	"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper"
+)
+
+func dataSourceTencentCloudCvmInstancesModification() *schema.Resource {
+	return &schema.Resource{
+		Read: dataSourceTencentCloudCvmInstancesModificationRead,
+
+		Schema: map[string]*schema.Schema{
+			"instance_ids": {
+				Optional: true,
+				Type:     schema.TypeSet,
+				Elem: &schema.Schema{
+					Type: schema.TypeString,
+				},
+				Description: "One or more instance ID to be queried. It can be obtained from the InstanceId in the returned value of API DescribeInstances. The maximum number of instances in batch for each request is 20.",
+			},
+			"filters": {
+				Optional:    true,
+				Type:        schema.TypeList,
+				Description: "The upper limit of Filters for each request is 10 and the upper limit for Filter.Values is 2.",
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"name": {
+							Type:        schema.TypeString,
+							Required:    true,
+							Description: "Fields to be filtered.",
+						},
+						"values": {
+							Type: schema.TypeSet,
+							Elem: &schema.Schema{
+								Type: schema.TypeString,
+							},
+							Required:    true,
+							Description: "Value of the field.",
+						},
+					},
+				},
+			},
+
+			"result_output_file": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				Description: "Used to save results.",
+			},
+
+			"instance_type_config_status_list": {
+				Computed:    true,
+				Type:        schema.TypeList,
+				Description: "The list of model configurations that can be adjusted by the instance.",
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"status": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "State description.",
+						},
+						"message": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "Status description information.",
+						},
+						"instance_type_config": {
+							Type:        schema.TypeList,
+							Computed:    true,
+							Description: "Configuration information.",
+							Elem: &schema.Resource{
+								Schema: map[string]*schema.Schema{
+									"zone": {
+										Type:        schema.TypeString,
+										Computed:    true,
+										Description: "Availability zone.",
+									},
+									"instance_type": {
+										Type:        schema.TypeString,
+										Computed:    true,
+										Description: "Instance type.",
+									},
+									"instance_family": {
+										Type:        schema.TypeString,
+										Computed:    true,
+										Description: "Instance family.",
+									},
+									"gpu": {
+										Type:        schema.TypeInt,
+										Computed:    true,
+										Description: "The number of GPU kernels, in cores.",
+									},
+									"cpu": {
+										Type:        schema.TypeInt,
+										Computed:    true,
+										Description: "The number of CPU kernels, in cores.",
+									},
+									"memory": {
+										Type:        schema.TypeInt,
+										Computed:    true,
+										Description: "Memory capacity (in GB).",
+									},
+									"fpga": {
+										Type:        schema.TypeInt,
+										Computed:    true,
+										Description: "The number of FPGA kernels, in cores.",
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+	}
+}
+
+func dataSourceTencentCloudCvmInstancesModificationRead(d *schema.ResourceData, meta interface{}) error {
+	defer logElapsed("data_source.tencentcloud_cvm_instances_modification.read")()
+	logId := getLogId(contextNil)
+
+	var (
+		request  = cvm.NewDescribeInstancesModificationRequest()
+		response = cvm.NewDescribeInstancesModificationResponse()
+	)
+	if v, ok := d.GetOk("instance_ids"); ok {
+		request.InstanceIds = helper.InterfacesStringsPoint(v.(*schema.Set).List())
+	}
+
+	if v, ok := d.GetOk("filters"); ok {
+		filters := make([]*cvm.Filter, 0)
+		for _, item := range v.(*schema.Set).List() {
+			filter := item.(map[string]interface{})
+			name := filter["name"].(string)
+			filters = append(filters, &cvm.Filter{
+				Name:   &name,
+				Values: helper.StringsStringsPoint(filter["values"].([]string)),
+			})
+		}
+		request.Filters = filters
+	}
+
+	instanceTypeConfigStatusList := make([]map[string]interface{}, 0)
+
+	var innerErr error
+	err := resource.Retry(readRetryTimeout, func() *resource.RetryError {
+		response, innerErr = meta.(*TencentCloudClient).apiV3Conn.UseCvmClient().DescribeInstancesModification(request)
+		if innerErr != nil {
+			return retryError(innerErr)
+		}
+		return nil
+	})
+	if err != nil {
+		return err
+	}
+
+	ids := make([]string, 0)
+	for _, instanceTypeConfigStatusSetItem := range response.Response.InstanceTypeConfigStatusSet {
+		instanceTypeConfigStatus := make(map[string]interface{})
+		instanceTypeConfigStatus["status"] = instanceTypeConfigStatusSetItem.Status
+		instanceTypeConfigStatus["message"] = instanceTypeConfigStatusSetItem.Message
+
+		instanceTypeConfigMaps := make([]map[string]interface{}, 0)
+		instanceTypeConfigMap := make(map[string]interface{})
+		instanceTypeConfig := instanceTypeConfigStatusSetItem.InstanceTypeConfig
+		instanceTypeConfigMap["zone"] = instanceTypeConfig.Zone
+		ids = append(ids, *instanceTypeConfig.InstanceType)
+		instanceTypeConfigMap["instance_type"] = instanceTypeConfig.InstanceType
+		instanceTypeConfigMap["instance_family"] = instanceTypeConfig.InstanceFamily
+		instanceTypeConfigMap["gpu"] = instanceTypeConfig.GPU
+		instanceTypeConfigMap["cpu"] = instanceTypeConfig.CPU
+		instanceTypeConfigMap["memory"] = instanceTypeConfig.Memory
+		instanceTypeConfigMap["fpga"] = instanceTypeConfig.FPGA
+		instanceTypeConfigMaps = append(instanceTypeConfigMaps, instanceTypeConfigMap)
+		instanceTypeConfigStatus["instance_type_config"] = instanceTypeConfigMaps
+
+		instanceTypeConfigStatusList = append(instanceTypeConfigStatusList, instanceTypeConfigStatus)
+	}
+
+	d.SetId(helper.DataResourceIdsHash(ids))
+	err = d.Set("instance_type_config_status_list", instanceTypeConfigStatusList)
+	if err != nil {
+		log.Printf("[CRITAL]%s provider set instance list fail, reason:%s\n ", logId, err.Error())
+		return err
+	}
+
+	output, ok := d.GetOk("result_output_file")
+	if ok && output.(string) != "" {
+		if err := writeToFile(output.(string), instanceTypeConfigStatusList); err != nil {
+			return err
+		}
+	}
+	return nil
+
+}

tencentcloud/data_source_tc_cvm_instances_modification_test.go

@@ -0,0 +1,32 @@
+package tencentcloud
+
+import (
+	"testing"
+
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+)
+
+func TestAccTencentCloudCvmInstancesModificationDataSource_basic(t *testing.T) {
+	t.Parallel()
+	resource.Test(t, resource.TestCase{
+		PreCheck: func() {
+			testAccPreCheck(t)
+		},
+		Providers: testAccProviders,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccCvmInstancesModificationDataSource,
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckTencentCloudDataSourceID("data.tencentcloud_cvm_instances_modification.foo"),
+					resource.TestCheckResourceAttrSet("data.tencentcloud_cvm_instances_modification.foo", "instance_type_config_status_list.#"),
+				),
+			},
+		},
+	})
+}
+
+const testAccCvmInstancesModificationDataSource = defaultCvmModificationVariable + `
+data "tencentcloud_cvm_instances_modification" "foo" {
+	instance_ids = [var.cvm_id]
+}
+`

tencentcloud/provider.go

@@ -294,6 +294,7 @@ Cloud Virtual Machine(CVM)
     tencentcloud_placement_groups
     tencentcloud_reserved_instance_configs
     tencentcloud_reserved_instances
+	tencentcloud_cvm_instances_modification
 
   Resource
     tencentcloud_instance
@@ -305,6 +306,7 @@ Cloud Virtual Machine(CVM)
     tencentcloud_reserved_instance
     tencentcloud_image
 	tencentcloud_cvm_hpc_cluster
+	tencentcloud_cvm_launch_template
 
 TDSQL-C MySQL(CynosDB)
   Data Source
@@ -1273,6 +1275,7 @@ func Provider() terraform.ResourceProvider {
 			"tencentcloud_cynosdb_cluster_instance_groups":          dataSourceTencentCloudCynosdbClusterInstanceGroups(),
 			"tencentcloud_cynosdb_cluster_params":                   dataSourceTencentCloudCynosdbClusterParams(),
 			"tencentcloud_cynosdb_param_templates":                  dataSourceTencentCloudCynosdbParamTemplates(),
+			"tencentcloud_cvm_instances_modification":               dataSourceTencentCloudCvmInstancesModification(),
 		},
 
 		ResourcesMap: map[string]*schema.Resource{
@@ -1647,6 +1650,7 @@ func Provider() terraform.ResourceProvider {
 			"tencentcloud_dayu_ddos_ip_attachment_v2":                 resourceTencentCloudDayuDDosIpAttachmentV2(),
 			"tencentcloud_tsf_microservice":                           resourceTencentCloudTsfMicroservice(),
 			"tencentcloud_tsf_application_config":                     resourceTencentCloudTsfApplicationConfig(),
+			"tencentcloud_cvm_launch_template":                        resourceTencentCloudCvmLaunchTemplate(),
 		},
 
 		ConfigureFunc: providerConfigure,