Skip to content

Commit 65bca2e

Browse files
authored
Fix/cam tag (#1357)
* fix: tag fmt doc * fix: fmt Co-authored-by: arunma <arunma@tencent.com>
1 parent 0f470ac commit 65bca2e

File tree

3 files changed

+18
-9
lines changed

3 files changed

+18
-9
lines changed

tencentcloud/resource_tc_elasticsearch_instance.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ import (
6060

6161
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
6262
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
63+
sdkErrors "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/errors"
6364
es "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/es/v20180416"
6465
"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper"
6566
"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/ratelimit"

tencentcloud/resource_tc_vpc_bandwidth_package.go

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ func resourceTencentCloudVpcBandwidthPackage() *schema.Resource {
5353
"charge_type": {
5454
Type: schema.TypeString,
5555
Optional: true,
56-
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.",
56+
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).",
5757
},
5858

5959
"bandwidth_package_name": {
@@ -94,6 +94,16 @@ func resourceTencentCloudVpcBandwidthPackageCreate(d *schema.ResourceData, meta
9494
request.BandwidthPackageName = helper.String(v.(string))
9595
}
9696

97+
if v := helper.GetTags(d, "tags"); len(v) > 0 {
98+
for tagKey, tagValue := range v {
99+
tag := vpc.Tag{
100+
Key: helper.String(tagKey),
101+
Value: helper.String(tagValue),
102+
}
103+
request.Tags = append(request.Tags, &tag)
104+
}
105+
}
106+
97107
err := resource.Retry(writeRetryTimeout, func() *resource.RetryError {
98108
result, e := meta.(*TencentCloudClient).apiV3Conn.UseVpcClient().CreateBandwidthPackage(request)
99109
if e != nil {
@@ -134,7 +144,7 @@ func resourceTencentCloudVpcBandwidthPackageCreate(d *schema.ResourceData, meta
134144
if tags := helper.GetTags(d, "tags"); len(tags) > 0 {
135145
tagService := TagService{client: meta.(*TencentCloudClient).apiV3Conn}
136146
region := meta.(*TencentCloudClient).apiV3Conn.Region
137-
resourceName := fmt.Sprintf("qcs::cam:%s:uin/:bandwidthPackage/%s", region, bandwidthPackageId)
147+
resourceName := fmt.Sprintf("qcs::vpc:%s:uin/:bandwidthPackage/%s", region, bandwidthPackageId)
138148
if err := tagService.ModifyTags(ctx, resourceName, tags, nil); err != nil {
139149
return err
140150
}
@@ -178,7 +188,7 @@ func resourceTencentCloudVpcBandwidthPackageRead(d *schema.ResourceData, meta in
178188

179189
tcClient := meta.(*TencentCloudClient).apiV3Conn
180190
tagService := &TagService{client: tcClient}
181-
tags, err := tagService.DescribeResourceTags(ctx, "cam", "bandwidthPackage", tcClient.Region, d.Id())
191+
tags, err := tagService.DescribeResourceTags(ctx, "vpc", "bandwidthPackage", tcClient.Region, d.Id())
182192
if err != nil {
183193
return err
184194
}
@@ -230,10 +240,8 @@ func resourceTencentCloudVpcBandwidthPackageUpdate(d *schema.ResourceData, meta
230240
}
231241
}
232242

233-
if d.HasChange("bandwidth_package_name") {
234-
if v, ok := d.GetOk("bandwidth_package_name"); ok {
235-
request.BandwidthPackageName = helper.String(v.(string))
236-
}
243+
if v, ok := d.GetOk("bandwidth_package_name"); ok {
244+
request.BandwidthPackageName = helper.String(v.(string))
237245
}
238246

239247
err := resource.Retry(writeRetryTimeout, func() *resource.RetryError {
@@ -257,7 +265,7 @@ func resourceTencentCloudVpcBandwidthPackageUpdate(d *schema.ResourceData, meta
257265
tagService := &TagService{client: tcClient}
258266
oldTags, newTags := d.GetChange("tags")
259267
replaceTags, deleteTags := diffTags(oldTags.(map[string]interface{}), newTags.(map[string]interface{}))
260-
resourceName := BuildTagResourceName("cam", "bandwidthPackage", tcClient.Region, d.Id())
268+
resourceName := BuildTagResourceName("vpc", "bandwidthPackage", tcClient.Region, d.Id())
261269
if err := tagService.ModifyTags(ctx, resourceName, replaceTags, deleteTags); err != nil {
262270
return err
263271
}

website/docs/r/vpc_bandwidth_package.html.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ resource "tencentcloud_vpc_bandwidth_package" "bandwidth_package" {
2929
The following arguments are supported:
3030

3131
* `bandwidth_package_name` - (Optional, String) Bandwidth package name.
32-
* `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.
32+
* `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).
3333
* `network_type` - (Optional, String) Bandwidth packet type, default:BGP, optional:- `BGP`: common BGP shared bandwidth package- `HIGH_QUALITY_BGP`: Quality BGP Shared Bandwidth Package.
3434
* `tags` - (Optional, Map) Tag description list.
3535

0 commit comments

Comments
 (0)