Skip to content

fix(as): [124069151] tencentcloud_as_last_activity support exclude_cancelled_activity #3368

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 21, 2025
Merged

fix(as): [124069151] tencentcloud_as_last_activity support exclude_cancelled_activity #3368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5427d61
add
SevenEarth May 20, 2025
0290101
add
SevenEarth May 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .changelog/3368.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:enhancement
datasource/tencentcloud_as_last_activity: support `exclude_cancelled_activity`
```
4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ require (
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/api v1.0.285
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/apigateway v1.0.763
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/apm v1.0.825
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/as v1.0.1078
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/as v1.0.1164
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/bi v1.0.824
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cam v1.0.1071
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cat v1.0.825
Expand All @@ -46,7 +46,7 @@ require (
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.1107
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit v1.0.1033
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.1148
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1163
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1164
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.1153
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cwp v1.0.762
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.0.1161
Expand Down
4 changes: 4 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -829,6 +829,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/apm v1.0.825 h1:yiC2lsZ
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/apm v1.0.825/go.mod h1:6qtSa8OZKwJOWoOCYWVZd6+T62O96AxbPll0I43d4yw=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/as v1.0.1078 h1:61WsmpYC2LEyJ492SYQ7/ABvcZGw5u6pS+wibvQVMY8=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/as v1.0.1078/go.mod h1:PC3PuWjgDqScMDrVXe9+QEH/r95FHd4p560GjkDf2rk=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/as v1.0.1164 h1:XsqO8lrHWTphz8jmgkU09gcX+V6XnPN2QMOiZezrISk=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/as v1.0.1164/go.mod h1:hEhWTzJLNl5WkKi4cIWi9rtEAectaRY02RqYqC4Twi4=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/bi v1.0.824 h1:DVKvZ6h+qd7tadUrCjVAkCCmE3TsbK2ZmwGd3AJcpWc=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/bi v1.0.824/go.mod h1:DvBpDX/qdJG4KKLeULmRvhAjPYiw8za0HeTSu2y/lFw=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cam v1.0.1071 h1:2CeivXYc7PtD2kgZEJXk9/SDQA9dzLejH5FmNzAW3QU=
Expand Down Expand Up @@ -975,6 +977,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1162 h1:bsc
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1162/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1163 h1:RZs8N4afU816Foz4/M1byw1iIBK80ZuV3S66re64J+o=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1163/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1164 h1:qEzZCZf1sgvvrZ8ngws0gZlyW+sOdY0K9VXGm4AcvTE=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1164/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/controlcenter v1.0.993 h1:WlPgXldQCxt7qi5Xrc6j6zTrsXWzN5BcOGs7Irq7fwQ=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/controlcenter v1.0.993/go.mod h1:Z9U8zNtyuyKhjS0698wqsrG/kLx1TQ5CEixXBwVe7xY=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/csip v1.0.860 h1:F3esKBIT3HW9+7Gt8cVgf8X06VdGIczpgLBUECzSEzU=
Expand Down
24 changes: 17 additions & 7 deletions tencentcloud/services/as/data_source_tc_as_last_activity.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,12 @@ func DataSourceTencentCloudAsLastActivity() *schema.Resource {
Description: "ID list of an auto scaling group.",
},

"exclude_cancelled_activity": {
Optional: true,
Type: schema.TypeBool,
Description: "Exclude cancellation type activities when querying. The default value is false, indicating that cancellation type activities are not excluded.",
},

"activity_set": {
Computed: true,
Type: schema.TypeList,
Expand Down Expand Up @@ -249,39 +255,42 @@ func dataSourceTencentCloudAsLastActivityRead(d *schema.ResourceData, meta inter
defer tccommon.LogElapsed("data_source.tencentcloud_as_last_activity.read")()
defer tccommon.InconsistentCheck(d, meta)()

logId := tccommon.GetLogId(tccommon.ContextNil)

ctx := context.WithValue(context.TODO(), tccommon.LogIdKey, logId)
var (
logId = tccommon.GetLogId(tccommon.ContextNil)
ctx = context.WithValue(context.TODO(), tccommon.LogIdKey, logId)
service = AsService{client: meta.(tccommon.ProviderMeta).GetAPIV3Conn()}
)

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

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

var activitySet []*as.Activity

err := resource.Retry(tccommon.ReadRetryTimeout, func() *resource.RetryError {
result, e := service.DescribeAsLastActivity(ctx, paramMap)
if e != nil {
return tccommon.RetryError(e)
}

activitySet = result
return nil
})

if err != nil {
return err
}

ids := make([]string, 0, len(activitySet))
tmpList := make([]map[string]interface{}, 0, len(activitySet))

if activitySet != nil {
for _, activity := range activitySet {
activityMap := map[string]interface{}{}

if activity.AutoScalingGroupId != nil {
activityMap["auto_scaling_group_id"] = activity.AutoScalingGroupId
}
Expand Down Expand Up @@ -472,5 +481,6 @@ func dataSourceTencentCloudAsLastActivityRead(d *schema.ResourceData, meta inter
return e
}
}

return nil
}
7 changes: 4 additions & 3 deletions tencentcloud/services/as/data_source_tc_as_last_activity.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
Use this data source to query detailed information of as last_activity
Use this data source to query detailed information of AS last activity

Example Usage

```hcl
data "tencentcloud_as_last_activity" "last_activity" {
auto_scaling_group_ids = ["asc-lo0b94oy"]
data "tencentcloud_as_last_activity" "example" {
auto_scaling_group_ids = ["asg-3st9wq9m"]
exclude_cancelled_activity = true
}
```
8 changes: 5 additions & 3 deletions tencentcloud/services/as/service_tencentcloud_as.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -722,19 +722,21 @@ func (me *AsService) DescribeAsLastActivity(ctx context.Context, param map[strin
if k == "AutoScalingGroupIds" {
request.AutoScalingGroupIds = v.([]*string)
}

if k == "ExcludeCancelledActivity" {
request.ExcludeCancelledActivity = v.(*bool)
}
}

ratelimit.Check(request.GetAction())

response, err := me.client.UseAsClient().DescribeAutoScalingGroupLastActivities(request)
if err != nil {
errRet = err
return
}
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), response.ToJsonString())

log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), response.ToJsonString())
lastActivity = response.Response.ActivitySet

return
}

Expand Down
105 changes: 99 additions & 6 deletions vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/as/v20180419/client.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading