Fix/emr import (#753)

* [fix]cvm instance type query

* [fix]emr import close

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

Author: tongyiming

tencentcloud/data_source_tc_instance_types.go

@@ -120,6 +120,16 @@ func dataSourceInstanceTypes() *schema.Resource {
 							Computed:    true,
 							Description: "Type series of the instance.",
 						},
+						"instance_charge_type": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "Charge type of the instance.",
+						},
+						"status": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "Sell status of the instance.",
+						},
 					},
 				},
 			},
@@ -252,12 +262,14 @@ func dataSourceTencentCloudInstanceTypesRead(d *schema.ResourceData, meta interf
 
 			if flag {
 				mapping := map[string]interface{}{
-					"availability_zone": instanceType.Zone,
-					"cpu_core_count":    instanceType.Cpu,
-					"gpu_core_count":    instanceType.Gpu,
-					"memory_size":       instanceType.Memory,
-					"family":            instanceType.InstanceFamily,
-					"instance_type":     instanceType.InstanceType,
+					"availability_zone":    instanceType.Zone,
+					"cpu_core_count":       instanceType.Cpu,
+					"gpu_core_count":       instanceType.Gpu,
+					"memory_size":          instanceType.Memory,
+					"family":               instanceType.InstanceFamily,
+					"instance_type":        instanceType.InstanceType,
+					"instance_charge_type": instanceType.InstanceChargeType,
+					"status":               instanceType.Status,
 				}
 				typeList = append(typeList, mapping)
 				ids = append(ids, *instanceType.InstanceType)

tencentcloud/resource_tc_emr_cluster.go

@@ -67,9 +67,6 @@ func resourceTencentCloudEmrCluster() *schema.Resource {
 		Read:   resourceTencentCloudEmrClusterRead,
 		Delete: resourceTencentCloudEmrClusterDelete,
 		Update: resourceTencentCloudEmrClusterUpdate,
-		Importer: &schema.ResourceImporter{
-			State: schema.ImportStatePassthrough,
-		},
 		Schema: map[string]*schema.Schema{
 			"display_strategy": {
 				Type:        schema.TypeString,

website/docs/d/instance_types.html.markdown

@@ -47,7 +47,9 @@ In addition to all arguments above, the following attributes are exported:
   * `cpu_core_count` - The number of CPU cores of the instance.
   * `family` - Type series of the instance.
   * `gpu_core_count` - The number of GPU cores of the instance.
+  * `instance_charge_type` - Charge type of the instance.
   * `instance_type` - Type of the instance.
   * `memory_size` - Instance memory capacity, unit in GB.
+  * `status` - Sell status of the instance.