diff --git a/tencentcloud/resource_tc_elasticsearch_instance.go b/tencentcloud/resource_tc_elasticsearch_instance.go index 6a323e52f0..726bec3bc4 100755 --- a/tencentcloud/resource_tc_elasticsearch_instance.go +++ b/tencentcloud/resource_tc_elasticsearch_instance.go @@ -54,11 +54,11 @@ import ( "context" "errors" "fmt" - sdkErrors "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/errors" "log" "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" es "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/es/v20180416" "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper" "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/ratelimit" diff --git a/tencentcloud/resource_tc_vpc_bandwidth_package.go b/tencentcloud/resource_tc_vpc_bandwidth_package.go index 0230397404..14e701a5b3 100644 --- a/tencentcloud/resource_tc_vpc_bandwidth_package.go +++ b/tencentcloud/resource_tc_vpc_bandwidth_package.go @@ -53,7 +53,7 @@ func resourceTencentCloudVpcBandwidthPackage() *schema.Resource { "charge_type": { Type: schema.TypeString, Optional: true, - Description: "Bandwidth package billing type, default: TOP5_POSTPAID_BY_MONTH, optional value:- `TOP5_POSTPAID_BY_MONTH`: TOP5 billed by monthly postpaid- `PERCENT95_POSTPAID_BY_MONTH`: 95 billed monthly postpaid- `FIXED_PREPAID_BY_MONTH`: Monthly prepaid billing.", + Description: "Bandwidth package billing type, default: TOP5_POSTPAID_BY_MONTH, optional value:- `TOP5_POSTPAID_BY_MONTH`: TOP5 billed by monthly postpaid- `PERCENT95_POSTPAID_BY_MONTH`: 95 billed monthly postpaid- `FIXED_PREPAID_BY_MONTH`: Monthly prepaid billing (Type FIXED_PREPAID_BY_MONTH product API capability is under construction).", }, "bandwidth_package_name": { @@ -94,6 +94,16 @@ func resourceTencentCloudVpcBandwidthPackageCreate(d *schema.ResourceData, meta request.BandwidthPackageName = helper.String(v.(string)) } + if v := helper.GetTags(d, "tags"); len(v) > 0 { + for tagKey, tagValue := range v { + tag := vpc.Tag{ + Key: helper.String(tagKey), + Value: helper.String(tagValue), + } + request.Tags = append(request.Tags, &tag) + } + } + err := resource.Retry(writeRetryTimeout, func() *resource.RetryError { result, e := meta.(*TencentCloudClient).apiV3Conn.UseVpcClient().CreateBandwidthPackage(request) if e != nil { @@ -134,7 +144,7 @@ func resourceTencentCloudVpcBandwidthPackageCreate(d *schema.ResourceData, meta if tags := helper.GetTags(d, "tags"); len(tags) > 0 { tagService := TagService{client: meta.(*TencentCloudClient).apiV3Conn} region := meta.(*TencentCloudClient).apiV3Conn.Region - resourceName := fmt.Sprintf("qcs::cam:%s:uin/:bandwidthPackage/%s", region, bandwidthPackageId) + resourceName := fmt.Sprintf("qcs::vpc:%s:uin/:bandwidthPackage/%s", region, bandwidthPackageId) if err := tagService.ModifyTags(ctx, resourceName, tags, nil); err != nil { return err } @@ -178,7 +188,7 @@ func resourceTencentCloudVpcBandwidthPackageRead(d *schema.ResourceData, meta in tcClient := meta.(*TencentCloudClient).apiV3Conn tagService := &TagService{client: tcClient} - tags, err := tagService.DescribeResourceTags(ctx, "cam", "bandwidthPackage", tcClient.Region, d.Id()) + tags, err := tagService.DescribeResourceTags(ctx, "vpc", "bandwidthPackage", tcClient.Region, d.Id()) if err != nil { return err } @@ -230,10 +240,8 @@ func resourceTencentCloudVpcBandwidthPackageUpdate(d *schema.ResourceData, meta } } - if d.HasChange("bandwidth_package_name") { - if v, ok := d.GetOk("bandwidth_package_name"); ok { - request.BandwidthPackageName = helper.String(v.(string)) - } + if v, ok := d.GetOk("bandwidth_package_name"); ok { + request.BandwidthPackageName = helper.String(v.(string)) } err := resource.Retry(writeRetryTimeout, func() *resource.RetryError { @@ -257,7 +265,7 @@ func resourceTencentCloudVpcBandwidthPackageUpdate(d *schema.ResourceData, meta tagService := &TagService{client: tcClient} oldTags, newTags := d.GetChange("tags") replaceTags, deleteTags := diffTags(oldTags.(map[string]interface{}), newTags.(map[string]interface{})) - resourceName := BuildTagResourceName("cam", "bandwidthPackage", tcClient.Region, d.Id()) + resourceName := BuildTagResourceName("vpc", "bandwidthPackage", tcClient.Region, d.Id()) if err := tagService.ModifyTags(ctx, resourceName, replaceTags, deleteTags); err != nil { return err } diff --git a/website/docs/r/vpc_bandwidth_package.html.markdown b/website/docs/r/vpc_bandwidth_package.html.markdown index 3534ac28db..7370cf3358 100644 --- a/website/docs/r/vpc_bandwidth_package.html.markdown +++ b/website/docs/r/vpc_bandwidth_package.html.markdown @@ -29,7 +29,7 @@ resource "tencentcloud_vpc_bandwidth_package" "bandwidth_package" { The following arguments are supported: * `bandwidth_package_name` - (Optional, String) Bandwidth package name. -* `charge_type` - (Optional, String) Bandwidth package billing type, default: TOP5_POSTPAID_BY_MONTH, optional value:- `TOP5_POSTPAID_BY_MONTH`: TOP5 billed by monthly postpaid- `PERCENT95_POSTPAID_BY_MONTH`: 95 billed monthly postpaid- `FIXED_PREPAID_BY_MONTH`: Monthly prepaid billing. +* `charge_type` - (Optional, String) Bandwidth package billing type, default: TOP5_POSTPAID_BY_MONTH, optional value:- `TOP5_POSTPAID_BY_MONTH`: TOP5 billed by monthly postpaid- `PERCENT95_POSTPAID_BY_MONTH`: 95 billed monthly postpaid- `FIXED_PREPAID_BY_MONTH`: Monthly prepaid billing (Type FIXED_PREPAID_BY_MONTH product API capability is under construction). * `network_type` - (Optional, String) Bandwidth packet type, default:BGP, optional:- `BGP`: common BGP shared bandwidth package- `HIGH_QUALITY_BGP`: Quality BGP Shared Bandwidth Package. * `tags` - (Optional, Map) Tag description list.