Skip to content

Commit 34f2600

Browse files
authored
fix: support pay_mode (#2432)
* fix: support pay_mode : command not found * feat:add 2432 changelog * fix: modify doc
1 parent aea1b01 commit 34f2600

File tree

10 files changed

+576
-210
lines changed

10 files changed

+576
-210
lines changed

.changelog/2432.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:enhancement
2+
resource/tencentcloud_apm_instance: support param `pay_mode`
3+
```

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ require (
2929
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/antiddos v1.0.799
3030
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/api v1.0.285
3131
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/apigateway v1.0.763
32-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/apm v1.0.624
32+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/apm v1.0.825
3333
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/as v1.0.756
3434
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/bi v1.0.824
3535
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cam v1.0.760

go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -826,6 +826,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/apigateway v1.0.763 h1:
826826
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/apigateway v1.0.763/go.mod h1:OlRreot089Ec7bEYMUovUBSuCD/x0D0ONPZ0g3YA5hg=
827827
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/apm v1.0.624 h1:AXDRZPPJ1dD5NpIU9C+Rh8wgvlqT2RsZPmcWCH24rrs=
828828
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/apm v1.0.624/go.mod h1:ONtHJxQQsy6nuRdsnGj6X9G5/+a+EJdt1EtckvyVIS4=
829+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/apm v1.0.825 h1:yiC2lsZ3nNsZ/6Vm7FKFEkAJ37sqzIfmdL7DY0LouMc=
830+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/apm v1.0.825/go.mod h1:6qtSa8OZKwJOWoOCYWVZd6+T62O96AxbPll0I43d4yw=
829831
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/as v1.0.756 h1:dx4aBdOWIqAUDQw9A6lU10EAaLpLwI2WRPVbuQgxzck=
830832
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/as v1.0.756/go.mod h1:lwWeh6aHg6GlttTMp+VIVtpZOtmpP6DQnnYWpyYW37Y=
831833
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/bi v1.0.770 h1:5FWt9F+ajshQEEQFfbvTe+n5lJai0eHbEsGDqYmJu5o=

tencentcloud/services/apm/resource_tc_apm_instance.go

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,12 @@ func ResourceTencentCloudApmInstance() *schema.Resource {
4949
Description: "Quota Of Instance Reporting.",
5050
},
5151

52+
"pay_mode": {
53+
Optional: true,
54+
Type: schema.TypeInt,
55+
Description: "Modify the billing mode: `1` means prepaid, `0` means pay-as-you-go, the default value is `0`.",
56+
},
57+
5258
"tags": {
5359
Type: schema.TypeMap,
5460
Optional: true,
@@ -85,6 +91,10 @@ func resourceTencentCloudApmInstanceCreate(d *schema.ResourceData, meta interfac
8591
request.SpanDailyCounters = helper.IntUint64(v.(int))
8692
}
8793

94+
if v, ok := d.GetOkExists("pay_mode"); ok {
95+
request.PayMode = helper.IntInt64(v.(int))
96+
}
97+
8898
err := resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError {
8999
result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseApmClient().CreateApmInstance(request)
90100
if e != nil {
@@ -155,6 +165,10 @@ func resourceTencentCloudApmInstanceRead(d *schema.ResourceData, meta interface{
155165
_ = d.Set("span_daily_counters", instance.SpanDailyCounters)
156166
}
157167

168+
if instance.PayMode != nil {
169+
_ = d.Set("pay_mode", instance.PayMode)
170+
}
171+
158172
tcClient := meta.(tccommon.ProviderMeta).GetAPIV3Conn()
159173
tagService := svctag.NewTagService(tcClient)
160174
tags, err := tagService.DescribeResourceTags(ctx, "apm", "apm-instance", tcClient.Region, d.Id())
@@ -180,7 +194,7 @@ func resourceTencentCloudApmInstanceUpdate(d *schema.ResourceData, meta interfac
180194

181195
request.InstanceId = &instanceId
182196

183-
mutableArgs := []string{"name", "description", "trace_duration", "span_daily_counters"}
197+
mutableArgs := []string{"name", "description", "trace_duration", "span_daily_counters", "pay_mode"}
184198

185199
for _, v := range mutableArgs {
186200
if d.HasChange(v) {
@@ -207,6 +221,10 @@ func resourceTencentCloudApmInstanceUpdate(d *schema.ResourceData, meta interfac
207221
request.SpanDailyCounters = helper.IntUint64(v.(int))
208222
}
209223

224+
if v, ok := d.GetOkExists("pay_mode"); ok {
225+
request.PayMode = helper.IntInt64(v.(int))
226+
}
227+
210228
err := resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError {
211229
result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseApmClient().ModifyApmInstance(request)
212230
if e != nil {

tencentcloud/services/apm/resource_tc_apm_instance.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
Provides a resource to create a apm instance
22

3+
~> **NOTE:** To use the field `pay_mode`, you need to contact official customer service to join the whitelist.
4+
35
Example Usage
46

57
```hcl

vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/apm/v20210622/client.go

Lines changed: 83 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/apm/v20210622/errors.go

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)