Skip to content

Commit 20b0fc3

Browse files
SevenEarthSevenEarth
authored
fix(as): [124069151] tencentcloud_as_last_activity support exclude_cancelled_activity (#3368)
* add * add
1 parent c443e9e commit 20b0fc3

File tree

11 files changed

+492
-191
lines changed

11 files changed

+492
-191
lines changed

‎.changelog/3368.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:enhancement
2+
datasource/tencentcloud_as_last_activity: support `exclude_cancelled_activity`
3+
```

‎go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ require (
3030
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/api v1.0.285
3131
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/apigateway v1.0.763
3232
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/apm v1.0.825
33-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/as v1.0.1078
33+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/as v1.0.1164
3434
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/bi v1.0.824
3535
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cam v1.0.1071
3636
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cat v1.0.825
@@ -46,7 +46,7 @@ require (
4646
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.1107
4747
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit v1.0.1033
4848
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.1148
49-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1163
49+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1164
5050
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.1153
5151
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cwp v1.0.762
5252
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.0.1161

‎go.sum

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -829,6 +829,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/apm v1.0.825 h1:yiC2lsZ
829829
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/apm v1.0.825/go.mod h1:6qtSa8OZKwJOWoOCYWVZd6+T62O96AxbPll0I43d4yw=
830830
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/as v1.0.1078 h1:61WsmpYC2LEyJ492SYQ7/ABvcZGw5u6pS+wibvQVMY8=
831831
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/as v1.0.1078/go.mod h1:PC3PuWjgDqScMDrVXe9+QEH/r95FHd4p560GjkDf2rk=
832+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/as v1.0.1164 h1:XsqO8lrHWTphz8jmgkU09gcX+V6XnPN2QMOiZezrISk=
833+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/as v1.0.1164/go.mod h1:hEhWTzJLNl5WkKi4cIWi9rtEAectaRY02RqYqC4Twi4=
832834
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/bi v1.0.824 h1:DVKvZ6h+qd7tadUrCjVAkCCmE3TsbK2ZmwGd3AJcpWc=
833835
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/bi v1.0.824/go.mod h1:DvBpDX/qdJG4KKLeULmRvhAjPYiw8za0HeTSu2y/lFw=
834836
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cam v1.0.1071 h1:2CeivXYc7PtD2kgZEJXk9/SDQA9dzLejH5FmNzAW3QU=
@@ -975,6 +977,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1162 h1:bsc
975977
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1162/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
976978
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1163 h1:RZs8N4afU816Foz4/M1byw1iIBK80ZuV3S66re64J+o=
977979
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1163/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
980+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1164 h1:qEzZCZf1sgvvrZ8ngws0gZlyW+sOdY0K9VXGm4AcvTE=
981+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1164/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
978982
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/controlcenter v1.0.993 h1:WlPgXldQCxt7qi5Xrc6j6zTrsXWzN5BcOGs7Irq7fwQ=
979983
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/controlcenter v1.0.993/go.mod h1:Z9U8zNtyuyKhjS0698wqsrG/kLx1TQ5CEixXBwVe7xY=
980984
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/csip v1.0.860 h1:F3esKBIT3HW9+7Gt8cVgf8X06VdGIczpgLBUECzSEzU=

‎tencentcloud/services/as/data_source_tc_as_last_activity.go

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,12 @@ func DataSourceTencentCloudAsLastActivity() *schema.Resource {
2525
Description: "ID list of an auto scaling group.",
2626
},
2727

28+
"exclude_cancelled_activity": {
29+
Optional: true,
30+
Type: schema.TypeBool,
31+
Description: "Exclude cancellation type activities when querying. The default value is false, indicating that cancellation type activities are not excluded.",
32+
},
33+
2834
"activity_set": {
2935
Computed: true,
3036
Type: schema.TypeList,
@@ -249,39 +255,42 @@ func dataSourceTencentCloudAsLastActivityRead(d *schema.ResourceData, meta inter
249255
defer tccommon.LogElapsed("data_source.tencentcloud_as_last_activity.read")()
250256
defer tccommon.InconsistentCheck(d, meta)()
251257

252-
logId := tccommon.GetLogId(tccommon.ContextNil)
253-
254-
ctx := context.WithValue(context.TODO(), tccommon.LogIdKey, logId)
258+
var (
259+
logId = tccommon.GetLogId(tccommon.ContextNil)
260+
ctx = context.WithValue(context.TODO(), tccommon.LogIdKey, logId)
261+
service = AsService{client: meta.(tccommon.ProviderMeta).GetAPIV3Conn()}
262+
)
255263

256264
paramMap := make(map[string]interface{})
257265
if v, ok := d.GetOk("auto_scaling_group_ids"); ok {
258266
autoScalingGroupIdsSet := v.(*schema.Set).List()
259267
paramMap["AutoScalingGroupIds"] = helper.InterfacesStringsPoint(autoScalingGroupIdsSet)
260268
}
261269

262-
service := AsService{client: meta.(tccommon.ProviderMeta).GetAPIV3Conn()}
270+
if v, ok := d.GetOk("exclude_cancelled_activity"); ok {
271+
paramMap["ExcludeCancelledActivity"] = helper.Bool(v.(bool))
272+
}
263273

264274
var activitySet []*as.Activity
265-
266275
err := resource.Retry(tccommon.ReadRetryTimeout, func() *resource.RetryError {
267276
result, e := service.DescribeAsLastActivity(ctx, paramMap)
268277
if e != nil {
269278
return tccommon.RetryError(e)
270279
}
280+
271281
activitySet = result
272282
return nil
273283
})
284+
274285
if err != nil {
275286
return err
276287
}
277288

278289
ids := make([]string, 0, len(activitySet))
279290
tmpList := make([]map[string]interface{}, 0, len(activitySet))
280-
281291
if activitySet != nil {
282292
for _, activity := range activitySet {
283293
activityMap := map[string]interface{}{}
284-
285294
if activity.AutoScalingGroupId != nil {
286295
activityMap["auto_scaling_group_id"] = activity.AutoScalingGroupId
287296
}
@@ -472,5 +481,6 @@ func dataSourceTencentCloudAsLastActivityRead(d *schema.ResourceData, meta inter
472481
return e
473482
}
474483
}
484+
475485
return nil
476486
}

‎tencentcloud/services/as/data_source_tc_as_last_activity.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
Use this data source to query detailed information of as last_activity
1+
Use this data source to query detailed information of AS last activity
22

33
Example Usage
44

55
```hcl
6-
data "tencentcloud_as_last_activity" "last_activity" {
7-
auto_scaling_group_ids = ["asc-lo0b94oy"]
6+
data "tencentcloud_as_last_activity" "example" {
7+
auto_scaling_group_ids = ["asg-3st9wq9m"]
8+
exclude_cancelled_activity = true
89
}
910
```

‎tencentcloud/services/as/service_tencentcloud_as.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -722,19 +722,21 @@ func (me *AsService) DescribeAsLastActivity(ctx context.Context, param map[strin
722722
if k == "AutoScalingGroupIds" {
723723
request.AutoScalingGroupIds = v.([]*string)
724724
}
725+
726+
if k == "ExcludeCancelledActivity" {
727+
request.ExcludeCancelledActivity = v.(*bool)
728+
}
725729
}
726730

727731
ratelimit.Check(request.GetAction())
728-
729732
response, err := me.client.UseAsClient().DescribeAutoScalingGroupLastActivities(request)
730733
if err != nil {
731734
errRet = err
732735
return
733736
}
734-
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), response.ToJsonString())
735737

738+
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), response.ToJsonString())
736739
lastActivity = response.Response.ActivitySet
737-
738740
return
739741
}
740742

‎vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/as/v20180419/client.go

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

0 commit comments

Comments
 (0)