Fix bugs that cos unsupported logging regions (#584)

Author: gailwang

CHANGELOG.md

@@ -1,4 +1,15 @@
 ## 1.53.2 (Unreleased)
+
+ENHANCEMENTS:
+
+* Resource `tencentcloud_cbs_storage` add `throughput_performance` to support adding extra performance to the cbs resources.
+
+BUG FIXES:
+
+* Resource: `tencentcloud_cos_bucket` fix bug that error happens when applying unsupported logging region.
+* Resource: `tencentcloud_as_scaling_policy` fix bug that missing required parameters error happened when update metric parameters.
+
+
 ## 1.53.1 (January 23, 2021)
 
 ENHANCEMENTS:

tencentcloud/resource_tc_as_scaling_policy.go

@@ -223,24 +223,17 @@ func resourceTencentCloudAsScalingPolicyUpdate(d *schema.ResourceData, meta inte
 		request.AdjustmentValue = &adjustmentValue
 	}
 	request.MetricAlarm = &as.MetricAlarm{}
-	if d.HasChange("comparison_operator") {
+	if d.HasChange("comparison_operator") || d.HasChange("threshold") || d.HasChange("metric_name") || d.HasChange("period") ||
+		d.HasChange("continuous_time") || d.HasChange("statistic") {
+		//these two parameter must pass together
 		request.MetricAlarm.ComparisonOperator = helper.String(d.Get("comparison_operator").(string))
-	}
-	if d.HasChange("metric_name") {
-		request.MetricAlarm.MetricName = helper.String(d.Get("metric_name").(string))
-	}
-	if d.HasChange("threshold") {
 		request.MetricAlarm.Threshold = helper.IntUint64(d.Get("threshold").(int))
-	}
-	if d.HasChange("period") {
+		request.MetricAlarm.MetricName = helper.String(d.Get("metric_name").(string))
 		request.MetricAlarm.Period = helper.IntUint64(d.Get("period").(int))
-	}
-	if d.HasChange("continuous_time") {
 		request.MetricAlarm.ContinuousTime = helper.IntUint64(d.Get("continuous_time").(int))
-	}
-	if d.HasChange("statistic") {
 		request.MetricAlarm.Statistic = helper.String(d.Get("statistic").(string))
 	}
+
 	if d.HasChange("cooldown") {
 		request.Cooldown = helper.IntUint64(d.Get("cooldown").(int))
 	}

tencentcloud/resource_tc_cbs_storage.go

@@ -51,11 +51,10 @@ func resourceTencentCloudCbsStorage() *schema.Resource {
 
 		Schema: map[string]*schema.Schema{
 			"storage_type": {
-				Type:         schema.TypeString,
-				Required:     true,
-				ForceNew:     true,
-				ValidateFunc: validateAllowedStringValue(CBS_STORAGE_TYPE),
-				Description:  "Type of CBS medium. Valid values: CLOUD_BASIC, CLOUD_PREMIUM and CLOUD_SSD.",
+				Type:        schema.TypeString,
+				Required:    true,
+				ForceNew:    true,
+				Description: "Type of CBS medium. Valid values: CLOUD_BASIC, CLOUD_PREMIUM, CLOUD_SSD, CLOUD_TSSD and CLOUD_HSSD.",
 			},
 			"storage_size": {
 				Type:         schema.TypeInt,
@@ -132,7 +131,12 @@ func resourceTencentCloudCbsStorage() *schema.Resource {
 				Default:     false,
 				Description: "Indicate whether to delete CBS instance directly or not. Default is false. If set true, the instance will be deleted instead of staying recycle bin.",
 			},
-
+			"throughput_performance": {
+				Type:        schema.TypeInt,
+				Optional:    true,
+				Default:     0,
+				Description: "Add extra performance to the data disk. Only works when disk type is `CLOUD_TSSD` or `CLOUD_HSSD`.",
+			},
 			// computed
 			"storage_status": {
 				Type:        schema.TypeString,
@@ -173,7 +177,13 @@ func resourceTencentCloudCbsStorageCreate(d *schema.ResourceData, meta interface
 	if _, ok := d.GetOk("encrypt"); ok {
 		request.Encrypt = helper.String("ENCRYPT")
 	}
+
+	if v, ok := d.GetOk("throughput_performance"); ok {
+		request.ThroughputPerformance = helper.IntUint64(v.(int))
+	}
+
 	chargeType := d.Get("charge_type").(string)
+
 	request.DiskChargeType = &chargeType
 
 	if chargeType == CBS_CHARGE_TYPE_PREPAID {
@@ -279,6 +289,7 @@ func resourceTencentCloudCbsStorageRead(d *schema.ResourceData, meta interface{}
 	_ = d.Set("attached", storage.Attached)
 	_ = d.Set("charge_type", storage.DiskChargeType)
 	_ = d.Set("prepaid_renew_flag", storage.RenewFlag)
+	_ = d.Set("throughput_performance", storage.ThroughputPerformance)
 
 	if *storage.DiskChargeType == CBS_CHARGE_TYPE_PREPAID {
 		_ = d.Set("prepaid_renew_flag", storage.RenewFlag)
@@ -420,6 +431,23 @@ func resourceTencentCloudCbsStorageUpdate(d *schema.ResourceData, meta interface
 		d.SetPartial("snapshot_id")
 	}
 
+	if d.HasChange("throughput_performance") {
+		throughputPerformance := d.Get("throughput_performance").(int)
+		err := resource.Retry(writeRetryTimeout, func() *resource.RetryError {
+			e := cbsService.ModifyThroughputPerformance(ctx, storageId, throughputPerformance)
+			if e != nil {
+				return retryError(e)
+			}
+			return nil
+		})
+		if err != nil {
+			log.Printf("[CRITAL]%s update cbs failed, reason:%s\n ", logId, err.Error())
+			return err
+		}
+
+		d.SetPartial("throughput_performance")
+	}
+
 	if d.HasChange("tags") {
 
 		oldValue, newValue := d.GetChange("tags")

tencentcloud/resource_tc_cos_bucket.go

@@ -122,6 +122,7 @@ import (
 	"github.com/aws/aws-sdk-go/service/s3"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/hashcode"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/errors"
 	"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper"
 )
 
@@ -438,11 +439,16 @@ func resourceTencentCloudCosBucketRead(d *schema.ResourceData, meta interface{})
 	//read the log
 	logEnable, logTargetBucket, logPrefix, err := cosService.GetBucketLogStatus(ctx, bucket)
 	if err != nil {
-		return err
+		if e, ok := err.(*errors.TencentCloudSDKError); ok {
+			if e.GetCode() != "UnSupportedLoggingRegion" {
+				return err
+			}
+		}
+	} else {
+		_ = d.Set("log_enable", logEnable)
+		_ = d.Set("log_target_bucket", logTargetBucket)
+		_ = d.Set("log_prefix", logPrefix)
 	}
-	_ = d.Set("log_enable", logEnable)
-	_ = d.Set("log_target_bucket", logTargetBucket)
-	_ = d.Set("log_prefix", logPrefix)
 
 	// read the tags
 	tags, err := cosService.GetBucketTags(ctx, bucket)

tencentcloud/resource_tc_gaap_proxy.go

@@ -71,24 +71,21 @@ func resourceTencentCloudGaapProxy() *schema.Resource {
 				Description: "Maximum bandwidth of the GAAP proxy, unit is Mbps. Valid value: `10`, `20`, `50`, `100`, `200`, `500` and `1000`.",
 			},
 			"concurrent": {
-				Type:         schema.TypeInt,
-				Required:     true,
-				ValidateFunc: validateAllowedIntValue([]int{2, 5, 10, 20, 30, 40, 50, 60, 70, 80, 90, 100}),
-				Description:  "Maximum concurrency of the GAAP proxy, unit is 10k. Valid value: `2`, `5`, `10`, `20`, `30`, `40`, `50`, `60`, `70`, `80`, `90` and `100`.",
+				Type:        schema.TypeInt,
+				Required:    true,
+				Description: "Maximum concurrency of the GAAP proxy, unit is 10k. Valid value: `2`, `5`, `10`, `20`, `30`, `40`, `50`, `60`, `70`, `80`, `90` and `100`.",
 			},
 			"access_region": {
-				Type:         schema.TypeString,
-				Required:     true,
-				ForceNew:     true,
-				ValidateFunc: validateAllowedStringValue([]string{"NorthChina", "EastChina", "SouthChina", "SouthwestChina", "Hongkong", "SL_TAIWAN", "SoutheastAsia", "Korea", "SL_India", "SL_Australia", "Europe", "SL_UK", "SL_SouthAmerica", "NorthAmerica", "SL_MiddleUSA", "Canada", "SL_VIET", "WestIndia", "Thailand", "Virginia", "Russia", "Japan", "SL_Indonesia"}),
-				Description:  "Access region of the GAAP proxy. Valid value: `NorthChina`, `EastChina`, `SouthChina`, `SouthwestChina`, `Hongkong`, `SL_TAIWAN`, `SoutheastAsia`, `Korea`, `SL_India`, `SL_Australia`, `Europe`, `SL_UK`, `SL_SouthAmerica`, `NorthAmerica`, `SL_MiddleUSA`, `Canada`, `SL_VIET`, `WestIndia`, `Thailand`, `Virginia`, `Russia`, `Japan` and `SL_Indonesia`.",
+				Type:        schema.TypeString,
+				Required:    true,
+				ForceNew:    true,
+				Description: "Access region of the GAAP proxy. Valid value: `NorthChina`, `EastChina`, `SouthChina`, `SouthwestChina`, `Hongkong`, `SL_TAIWAN`, `SoutheastAsia`, `Korea`, `SL_India`, `SL_Australia`, `Europe`, `SL_UK`, `SL_SouthAmerica`, `NorthAmerica`, `SL_MiddleUSA`, `Canada`, `SL_VIET`, `WestIndia`, `Thailand`, `Virginia`, `Russia`, `Japan` and `SL_Indonesia`.",
 			},
 			"realserver_region": {
-				Type:         schema.TypeString,
-				Required:     true,
-				ForceNew:     true,
-				ValidateFunc: validateAllowedStringValue([]string{"NorthChina", "EastChina", "SouthChina", "SouthwestChina", "Hongkong", "SL_TAIWAN", "SoutheastAsia", "Korea", "SL_India", "SL_Australia", "Europe", "SL_UK", "SL_SouthAmerica", "NorthAmerica", "SL_MiddleUSA", "Canada", "SL_VIET", "WestIndia", "Thailand", "Virginia", "Russia", "Japan", "SL_Indonesia"}),
-				Description:  "Region of the GAAP realserver. Valid value: `NorthChina`, `EastChina`, `SouthChina`, `SouthwestChina`, `Hongkong`, `SL_TAIWAN`, `SoutheastAsia`, `Korea`, `SL_India`, `SL_Australia`, `Europe`, `SL_UK`, `SL_SouthAmerica`, `NorthAmerica`, `SL_MiddleUSA`, `Canada`, `SL_VIET`, `WestIndia`, `Thailand`, `Virginia`, `Russia`, `Japan` and `SL_Indonesia`.",
+				Type:        schema.TypeString,
+				Required:    true,
+				ForceNew:    true,
+				Description: "Region of the GAAP realserver. Valid value: `NorthChina`, `EastChina`, `SouthChina`, `SouthwestChina`, `Hongkong`, `SL_TAIWAN`, `SoutheastAsia`, `Korea`, `SL_India`, `SL_Australia`, `Europe`, `SL_UK`, `SL_SouthAmerica`, `NorthAmerica`, `SL_MiddleUSA`, `Canada`, `SL_VIET`, `WestIndia`, `Thailand`, `Virginia`, `Russia`, `Japan` and `SL_Indonesia`.",
 			},
 			"enable": {
 				Type:        schema.TypeBool,

tencentcloud/service_tencentcloud_cbs.go

@@ -135,6 +135,23 @@ func (me *CbsService) ResizeDisk(ctx context.Context, diskId string, diskSize in
 	return nil
 }
 
+func (me *CbsService) ModifyThroughputPerformance(ctx context.Context, diskId string, throughputPerformance int) error {
+	logId := getLogId(ctx)
+	request := cbs.NewModifyDiskExtraPerformanceRequest()
+	request.DiskId = &diskId
+	request.ThroughputPerformance = helper.IntUint64(throughputPerformance)
+	ratelimit.Check(request.GetAction())
+	response, err := me.client.UseCbsClient().ModifyDiskExtraPerformance(request)
+	if err != nil {
+		log.Printf("[CRITAL]%s api[%s] fail, request body [%s], reason[%s]\n",
+			logId, request.GetAction(), request.ToJsonString(), err.Error())
+		return err
+	}
+	log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n",
+		logId, request.GetAction(), request.ToJsonString(), response.ToJsonString())
+	return nil
+}
+
 func (me *CbsService) ApplySnapshot(ctx context.Context, diskId, snapshotId string) error {
 	logId := getLogId(ctx)
 	request := cbs.NewApplySnapshotRequest()

website/docs/r/cbs_storage.html.markdown

@@ -35,7 +35,7 @@ The following arguments are supported:
 * `availability_zone` - (Required, ForceNew) The available zone that the CBS instance locates at.
 * `storage_name` - (Required) Name of CBS. The maximum length can not exceed 60 bytes.
 * `storage_size` - (Required) Volume of CBS, and unit is GB. If storage type is `CLOUD_SSD`, the size range is [100, 16000], and the others are [10-16000].
-* `storage_type` - (Required, ForceNew) Type of CBS medium. Valid values: CLOUD_BASIC, CLOUD_PREMIUM and CLOUD_SSD.
+* `storage_type` - (Required, ForceNew) Type of CBS medium. Valid values: CLOUD_BASIC, CLOUD_PREMIUM, CLOUD_SSD, CLOUD_TSSD and CLOUD_HSSD.
 * `charge_type` - (Optional) The charge type of CBS instance. Valid values are `PREPAID` and `POSTPAID_BY_HOUR`. The default is `POSTPAID_BY_HOUR`.
 * `encrypt` - (Optional, ForceNew) Indicates whether CBS is encrypted.
 * `force_delete` - (Optional) Indicate whether to delete CBS instance directly or not. Default is false. If set true, the instance will be deleted instead of staying recycle bin.
@@ -45,6 +45,7 @@ The following arguments are supported:
 * `project_id` - (Optional) ID of the project to which the instance belongs.
 * `snapshot_id` - (Optional) ID of the snapshot. If specified, created the CBS by this snapshot.
 * `tags` - (Optional) The available tags within this CBS.
+* `throughput_performance` - (Optional) Add extra performance to the data disk. Only works when disk type is `CLOUD_TSSD` or `CLOUD_HSSD`.
 
 ## Attributes Reference