update cbs wait time && remove emr product_id validate (#1910)

* update cbs wait time && remove emr product_id validate

* update emr product_id doc

---------

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

Author: tongyiming

tencentcloud/resource_tc_cbs_storage.go

@@ -255,7 +255,7 @@ func resourceTencentCloudCbsStorageCreate(d *schema.ResourceData, meta interface
 	}
 
 	// must wait for finishing creating disk
-	err = resource.Retry(readRetryTimeout, func() *resource.RetryError {
+	err = resource.Retry(10*readRetryTimeout, func() *resource.RetryError {
 		storage, e := cbsService.DescribeDiskById(ctx, storageId)
 		if e != nil {
 			return retryError(e, InternalError)

tencentcloud/resource_tc_emr_cluster.go

@@ -75,11 +75,22 @@ func resourceTencentCloudEmrCluster() *schema.Resource {
 				Description: "Display strategy of EMR instance.",
 			},
 			"product_id": {
-				Type:         schema.TypeInt,
-				Required:     true,
-				ForceNew:     true,
-				ValidateFunc: validateIntegerInRange(1, 30),
-				Description:  "The product id of EMR instance.",
+				Type:     schema.TypeInt,
+				Required: true,
+				ForceNew: true,
+				Description: "Product ID. Different products ID represents different EMR product versions. Value range:\n" +
+					"- 16: represents EMR-V2.3.0\n" +
+					"- 20: indicates EMR-V2.5.0\n" +
+					"- 25: represents EMR-V3.1.0\n" +
+					"- 27: represents KAFKA-V1.0.0\n" +
+					"- 30: indicates EMR-V2.6.0\n" +
+					"- 33: represents EMR-V3.2.1\n" +
+					"- 34: stands for EMR-V3.3.0\n" +
+					"- 36: represents STARROCKS-V1.0.0\n" +
+					"- 37: indicates EMR-V3.4.0\n" +
+					"- 38: represents EMR-V2.7.0\n" +
+					"- 39: stands for STARROCKS-V1.1.0\n" +
+					"- 41: represents DRUID-V1.1.0.",
 			},
 			"vpc_settings": {
 				Type:        schema.TypeMap,

website/docs/r/emr_cluster.html.markdown

@@ -66,7 +66,19 @@ The following arguments are supported:
 * `login_settings` - (Required, Map, ForceNew) Instance login settings.
 * `pay_mode` - (Required, Int) The pay mode of instance. 0 represent POSTPAID_BY_HOUR, 1 represent PREPAID.
 * `placement` - (Required, Map, ForceNew) The location of the instance.
-* `product_id` - (Required, Int, ForceNew) The product id of EMR instance.
+* `product_id` - (Required, Int, ForceNew) Product ID. Different products ID represents different EMR product versions. Value range:
+- 16: represents EMR-V2.3.0
+- 20: indicates EMR-V2.5.0
+- 25: represents EMR-V3.1.0
+- 27: represents KAFKA-V1.0.0
+- 30: indicates EMR-V2.6.0
+- 33: represents EMR-V3.2.1
+- 34: stands for EMR-V3.3.0
+- 36: represents STARROCKS-V1.0.0
+- 37: indicates EMR-V3.4.0
+- 38: represents EMR-V2.7.0
+- 39: stands for STARROCKS-V1.1.0
+- 41: represents DRUID-V1.1.0.
 * `softwares` - (Required, List: [`String`], ForceNew) The softwares of a EMR instance.
 * `support_ha` - (Required, Int, ForceNew) The flag whether the instance support high availability.(0=>not support, 1=>support).
 * `time_span` - (Required, Int) The length of time the instance was purchased. Use with TimeUnit.When TimeUnit is s, the parameter can only be filled in at 3600, representing a metered instance.