55 "strings"
66 "time"
77
8+ "github.com/gotidy/ptr"
89 "go.uber.org/ratelimit"
910
10- "github.com/aws/aws-sdk-go/aws"
1111 "github.com/aws/aws-sdk-go/service/cloudwatchlogs"
1212
1313 "github.com/ekristen/libnuke/pkg/registry"
@@ -46,7 +46,7 @@ func (l *CloudWatchLogsLogGroupLister) List(_ context.Context, o interface{}) ([
4646 streamRl := ratelimit .New (15 )
4747
4848 params := & cloudwatchlogs.DescribeLogGroupsInput {
49- Limit : aws .Int64 (50 ),
49+ Limit : ptr .Int64 (50 ),
5050 }
5151
5252 for {
@@ -72,9 +72,9 @@ func (l *CloudWatchLogsLogGroupLister) List(_ context.Context, o interface{}) ([
7272 // get last event ingestion time
7373 lsResp , err := svc .DescribeLogStreams (& cloudwatchlogs.DescribeLogStreamsInput {
7474 LogGroupName : logGroup .LogGroupName ,
75- OrderBy : aws .String ("LastEventTime" ),
76- Limit : aws .Int64 (1 ),
77- Descending : aws .Bool (true ),
75+ OrderBy : ptr .String ("LastEventTime" ),
76+ Limit : ptr .Int64 (1 ),
77+ Descending : ptr .Bool (true ),
7878 })
7979 if err != nil {
8080 return nil , err
@@ -87,14 +87,21 @@ func (l *CloudWatchLogsLogGroupLister) List(_ context.Context, o interface{}) ([
8787 lastEvent = time .Unix (* logGroup .CreationTime / 1000 , 0 )
8888 }
8989
90+ var retentionInDays int64
91+ if logGroup .RetentionInDays != nil {
92+ retentionInDays = ptr .ToInt64 (logGroup .RetentionInDays )
93+ }
94+
9095 resources = append (resources , & CloudWatchLogsLogGroup {
91- svc : svc ,
92- logGroup : logGroup ,
93- lastEvent : lastEvent .Format (time .RFC3339 ),
94- tags : tagResp .Tags ,
96+ svc : svc ,
97+ Name : logGroup .LogGroupName ,
98+ CreatedTime : logGroup .CreationTime ,
99+ CreationTime : ptr .Time (time .Unix (* logGroup .CreationTime / 1000 , 0 ).UTC ()),
100+ LastEvent : ptr .Time (lastEvent ), // TODO(v4): convert to UTC
101+ RetentionInDays : retentionInDays ,
102+ Tags : tagResp .Tags ,
95103 })
96104 }
97-
98105 if output .NextToken == nil {
99106 break
100107 }
@@ -106,32 +113,28 @@ func (l *CloudWatchLogsLogGroupLister) List(_ context.Context, o interface{}) ([
106113}
107114
108115type CloudWatchLogsLogGroup struct {
109- svc * cloudwatchlogs.CloudWatchLogs
110- logGroup * cloudwatchlogs.LogGroup
111- lastEvent string
112- tags map [string ]* string
116+ svc * cloudwatchlogs.CloudWatchLogs
117+ Name * string `description:"The name of the log group"`
118+ CreatedTime * int64 `description:"The creation time of the log group in unix timestamp format"`
119+ CreationTime * time.Time `description:"The creation time of the log group in RFC3339 format"`
120+ LastEvent * time.Time `description:"The last event time of the log group in RFC3339 format"`
121+ RetentionInDays int64 `description:"The number of days to retain log events in the log group"`
122+ Tags map [string ]* string
113123}
114124
115- func (f * CloudWatchLogsLogGroup ) Remove (_ context.Context ) error {
116- _ , err := f .svc .DeleteLogGroup (& cloudwatchlogs.DeleteLogGroupInput {
117- LogGroupName : f . logGroup . LogGroupName ,
125+ func (r * CloudWatchLogsLogGroup ) Remove (_ context.Context ) error {
126+ _ , err := r .svc .DeleteLogGroup (& cloudwatchlogs.DeleteLogGroupInput {
127+ LogGroupName : r . Name ,
118128 })
119129
120130 return err
121131}
122132
123- func (f * CloudWatchLogsLogGroup ) String () string {
124- return * f . logGroup . LogGroupName
133+ func (r * CloudWatchLogsLogGroup ) String () string {
134+ return * r . Name
125135}
126136
127- func (f * CloudWatchLogsLogGroup ) Properties () types.Properties {
128- properties := types .NewProperties ().
129- Set ("logGroupName" , f .logGroup .LogGroupName ).
130- Set ("CreatedTime" , f .logGroup .CreationTime ).
131- Set ("LastEvent" , f .lastEvent )
132-
133- for k , v := range f .tags {
134- properties .SetTag (& k , v )
135- }
136- return properties
137+ func (r * CloudWatchLogsLogGroup ) Properties () types.Properties {
138+ return types .NewPropertiesFromStruct (r ).
139+ Set ("logGroupName" , r .Name ) // TODO(v4): remove this property
137140}
0 commit comments