modify description of cdh and return nonRetryError when cdh sold out

Author: ChrisdeR

tencentcloud/data_source_tc_cdh_instances.go

@@ -151,22 +151,22 @@ func dataSourceTencentCloudCdhInstances() *schema.Resource {
 									"memory_total_size": {
 										Type:        schema.TypeFloat,
 										Computed:    true,
-										Description: "Instance memory total capacity, unit in GiB.",
+										Description: "Instance memory total capacity, unit in GB.",
 									},
 									"memory_available_size": {
 										Type:        schema.TypeFloat,
 										Computed:    true,
-										Description: "Instance memory available capacity, unit in GiB.",
+										Description: "Instance memory available capacity, unit in GB.",
 									},
 									"disk_total_size": {
 										Type:        schema.TypeInt,
 										Computed:    true,
-										Description: "Instance disk total capacity, unit in GiB.",
+										Description: "Instance disk total capacity, unit in GB.",
 									},
 									"disk_available_size": {
 										Type:        schema.TypeInt,
 										Computed:    true,
-										Description: "Instance disk available capacity, unit in GiB.",
+										Description: "Instance disk available capacity, unit in GB.",
 									},
 									"disk_type": {
 										Type:        schema.TypeString,

tencentcloud/extension_cdh.go

@@ -11,6 +11,8 @@ const (
 	CDH_HOST_STATE_LAUNCH_FAILURE = "LAUNCH_FAILURE"
 	CDH_HOST_RUNNING              = "RUNNING"
 	CDH_HOST_EXPIRED              = "EXPIRED"
+
+	CDH_ZONE_SOLD_OUT_FOR_SPECIFIED_INSTANCE_ERROR = "ResourceInsufficient.ZoneSoldOutForSpecifiedInstance"
 )
 
 var CDH_PREPAID_PERIOD = []int{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 24, 36}

tencentcloud/resource_tc_cdh_instance.go

@@ -35,6 +35,7 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	sdkErrors "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/errors"
 	cvm "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm/v20170312"
 	"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper"
 )
@@ -138,22 +139,22 @@ func resourceTencentCloudCdhInstance() *schema.Resource {
 						"memory_total_size": {
 							Type:        schema.TypeFloat,
 							Computed:    true,
-							Description: "Instance memory total capacity, unit in GiB.",
+							Description: "Instance memory total capacity, unit in GB.",
 						},
 						"memory_available_size": {
 							Type:        schema.TypeFloat,
 							Computed:    true,
-							Description: "Instance memory available capacity, unit in GiB.",
+							Description: "Instance memory available capacity, unit in GB.",
 						},
 						"disk_total_size": {
 							Type:        schema.TypeInt,
 							Computed:    true,
-							Description: "Instance disk total capacity, unit in GiB.",
+							Description: "Instance disk total capacity, unit in GB.",
 						},
 						"disk_available_size": {
 							Type:        schema.TypeInt,
 							Computed:    true,
-							Description: "Instance disk available capacity, unit in GiB.",
+							Description: "Instance disk available capacity, unit in GB.",
 						},
 						"disk_type": {
 							Type:        schema.TypeString,
@@ -202,6 +203,9 @@ func resourceTencentCloudCdhInstanceCreate(d *schema.ResourceData, meta interfac
 	outErr = resource.Retry(writeRetryTimeout, func() *resource.RetryError {
 		hostId, inErr = cdhService.CreateCdhInstance(ctx, &placement, &hostChargePrepaid, chargeType, hostType)
 		if inErr != nil {
+			if sdkErr, ok := inErr.(*sdkErrors.TencentCloudSDKError); ok && sdkErr.Code == CDH_ZONE_SOLD_OUT_FOR_SPECIFIED_INSTANCE_ERROR {
+				return resource.NonRetryableError(inErr)
+			}
 			return retryError(inErr)
 		}
 		return nil

website/docs/d/cdh_instances.html.markdown

@@ -50,11 +50,11 @@ In addition to all arguments above, the following attributes are exported:
   * `host_resource` - An information list of host resource. Each element contains the following attributes:
     * `cpu_available_num` - The number of available CPU cores of the instance.
     * `cpu_total_num` - The number of total CPU cores of the instance.
-    * `disk_available_size` - Instance disk available capacity, unit in GiB.
-    * `disk_total_size` - Instance disk total capacity, unit in GiB.
+    * `disk_available_size` - Instance disk available capacity, unit in GB.
+    * `disk_total_size` - Instance disk total capacity, unit in GB.
     * `disk_type` - Type of the disk.
-    * `memory_available_size` - Instance memory available capacity, unit in GiB.
-    * `memory_total_size` - Instance memory total capacity, unit in GiB.
+    * `memory_available_size` - Instance memory available capacity, unit in GB.
+    * `memory_total_size` - Instance memory total capacity, unit in GB.
   * `host_state` - State of the CDH instance.
   * `host_type` - Type of the CDH instance.
   * `prepaid_renew_flag` - Auto renewal flag.

website/docs/r/cdh_instance.html.markdown

@@ -51,11 +51,11 @@ In addition to all arguments above, the following attributes are exported:
 * `host_resource` - An information list of host resource. Each element contains the following attributes:
   * `cpu_available_num` - The number of available CPU cores of the instance.
   * `cpu_total_num` - The number of total CPU cores of the instance.
-  * `disk_available_size` - Instance disk available capacity, unit in GiB.
-  * `disk_total_size` - Instance disk total capacity, unit in GiB.
+  * `disk_available_size` - Instance disk available capacity, unit in GB.
+  * `disk_total_size` - Instance disk total capacity, unit in GB.
   * `disk_type` - Type of the disk.
-  * `memory_available_size` - Instance memory available capacity, unit in GiB.
-  * `memory_total_size` - Instance memory total capacity, unit in GiB.
+  * `memory_available_size` - Instance memory available capacity, unit in GB.
+  * `memory_total_size` - Instance memory total capacity, unit in GB.
 * `host_state` - State of the CDH instance.