Skip to content

Commit 0fe01ec

Browse files
authored
fix: support node_ip_type (#2433)
* fix: support node_ip_type : command not found * feat: add 2433 changelog
1 parent 34f2600 commit 0fe01ec

File tree

9 files changed

+262
-35
lines changed

9 files changed

+262
-35
lines changed

.changelog/2433.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_cat_task_set: support param `node_ip_type`
3+
```

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ require (
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
36-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cat v1.0.760
36+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cat v1.0.825
3737
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cbs v1.0.591
3838
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdb v1.0.800
3939
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdn v1.0.539

go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -838,6 +838,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cam v1.0.760 h1:Ky9dRsT
838838
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cam v1.0.760/go.mod h1:AAfdrxknvUedvigxbbzKQLxN+1EG5NPbytpiqmfuFvU=
839839
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cat v1.0.760 h1:oGY4IigfIw0iQKh3/cOY29KBeEeFbvJft69e0beyfdI=
840840
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cat v1.0.760/go.mod h1:SoBOZr6fklP8zeHaq7XOnCd5xBypU2R94nOPafYX1J4=
841+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cat v1.0.825 h1:TgO9L1yNPkWeXqrvys/9RL3u958xx9dcTAy4WmaxBnE=
842+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cat v1.0.825/go.mod h1:1yCKeIioX4D0bcIDHs3JCS5lbyzndXh1E8wHyHaCjxY=
841843
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cbs v1.0.591 h1:TPGLjH6wqkA5Iirl6xCxFkWwrtCZ8ZmeF7ASzqUbsZA=
842844
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cbs v1.0.591/go.mod h1:nCAGfVTXZkVnurkbjF3b0FM6RwGztE9t8D9Ms1unaKo=
843845
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdb v1.0.800 h1:VnnmCIaAXU7t0uwNtaLs990V7+V7/7viMpOytOT6GOE=

tencentcloud/services/cat/resource_tc_cat_task_set.go

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,13 @@ func ResourceTencentCloudCatTaskSet() *schema.Resource {
9797
Description: "The input is valid when the parameter is modified, `suspend`/`resume`, used to suspend/resume the dial test task.",
9898
},
9999

100+
"node_ip_type": {
101+
Type: schema.TypeInt,
102+
Optional: true,
103+
Computed: true,
104+
Description: "`0`-Unlimit ip type, `1`-IPv4, `2`-IPv6.",
105+
},
106+
100107
"status": {
101108
Type: schema.TypeInt,
102109
Computed: true,
@@ -166,6 +173,10 @@ func resourceTencentCloudCatTaskSetCreate(d *schema.ResourceData, meta interface
166173
request.Cron = helper.String(v.(string))
167174
}
168175

176+
if v, ok := d.GetOkExists("node_ip_type"); ok {
177+
request.TaskCategory = helper.IntInt64(v.(int))
178+
}
179+
169180
err := resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError {
170181
result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseCatClient().CreateProbeTasks(request)
171182
if e != nil {
@@ -284,6 +295,10 @@ func resourceTencentCloudCatTaskSetRead(d *schema.ResourceData, meta interface{}
284295
_ = d.Set("cron", taskSet.Cron)
285296
}
286297

298+
if taskSet.NodeIpType != nil {
299+
_ = d.Set("node_ip_type", taskSet.NodeIpType)
300+
}
301+
287302
if taskSet.Status != nil {
288303
_ = d.Set("status", taskSet.Status)
289304
}
@@ -334,6 +349,12 @@ func resourceTencentCloudCatTaskSetUpdate(d *schema.ResourceData, meta interface
334349
}
335350
}
336351

352+
if d.HasChange("node_ip_type") {
353+
if v, ok := d.GetOkExists("node_ip_type"); ok {
354+
request.NodeIpType = helper.IntInt64(v.(int))
355+
}
356+
}
357+
337358
if d.HasChange("task_type") {
338359
return fmt.Errorf("`task_type` do not support change now.")
339360
}

tencentcloud/services/cat/resource_tc_cat_task_set_test.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ func TestAccTencentCloudCatTaskSet_basic(t *testing.T) {
2929
resource.TestCheckResourceAttrSet("tencentcloud_cat_task_set.task_set", "parameters"),
3030
resource.TestCheckResourceAttr("tencentcloud_cat_task_set.task_set", "task_category", "1"),
3131
resource.TestCheckResourceAttr("tencentcloud_cat_task_set.task_set", "cron", "* 0-6 * * *"),
32+
resource.TestCheckResourceAttr("tencentcloud_cat_task_set.task_set", "node_ip_type", "1"),
3233
resource.TestCheckResourceAttr("tencentcloud_cat_task_set.task_set", "tags.createdBy", "terraform"),
3334
),
3435
},
@@ -49,6 +50,7 @@ func TestAccTencentCloudCatTaskSet_basic(t *testing.T) {
4950
resource.TestCheckResourceAttrSet("tencentcloud_cat_task_set.task_set", "parameters"),
5051
resource.TestCheckResourceAttr("tencentcloud_cat_task_set.task_set", "task_category", "1"),
5152
resource.TestCheckResourceAttr("tencentcloud_cat_task_set.task_set", "cron", "* 0-6 * * *"),
53+
resource.TestCheckResourceAttr("tencentcloud_cat_task_set.task_set", "node_ip_type", "0"),
5254
resource.TestCheckResourceAttr("tencentcloud_cat_task_set.task_set", "tags.createdBy", "terraform"),
5355
resource.TestCheckResourceAttr("tencentcloud_cat_task_set.task_set", "status", "4"),
5456
),
@@ -102,6 +104,7 @@ resource "tencentcloud_cat_task_set" "task_set" {
102104
)
103105
task_category = 1
104106
cron = "* 0-6 * * *"
107+
node_ip_type = 1
105108
tags = {
106109
"createdBy" = "terraform"
107110
}
@@ -147,6 +150,7 @@ resource "tencentcloud_cat_task_set" "task_set" {
147150
)
148151
task_category = 1
149152
cron = "* 0-6 * * *"
153+
node_ip_type = 0
150154
tags = {
151155
"createdBy" = "terraform"
152156
}

vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cat/v20180409/client.go

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

0 commit comments

Comments
 (0)