Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 28, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
337c4d7
update cbs wait time && remove emr product_id validate
Jun 25, 2023
d932362
update emr product_id doc
Jun 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tencentcloud/resource_tc_cbs_storage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
21 changes: 16 additions & 5 deletions tencentcloud/resource_tc_emr_cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
14 changes: 13 additions & 1 deletion website/docs/r/emr_cluster.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down