Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions aws/table_aws_cloudtrail_query.go
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,7 @@ func getCloudTrailQuery(ctx context.Context, d *plugin.QueryData, h *plugin.Hydr
}

params := &cloudtrail.DescribeQueryInput{
//nolint:staticcheck // still required when QueryId is a bare query ID rather than a full query ARN
EventDataStore: aws.String(eventDataSourceArn),
QueryId: aws.String(queryId),
}
Expand Down
8 changes: 7 additions & 1 deletion aws/table_aws_elasticache_cluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,13 @@ func listTagsForElastiCacheCluster(ctx context.Context, d *plugin.QueryData, h *
if err != nil {
var ae smithy.APIError
if errors.As(err, &ae) {
if ae.ErrorCode() == "CacheClusterNotFound" {
// A cache cluster node's own status can be "available" while its
// parent replication group is still creating/modifying/deleting.
// ListTagsForResource fails against such a node with
// InvalidReplicationGroupState even though the row itself is valid,
// so treat it the same as CacheClusterNotFound: tags come back empty
// instead of failing the whole row.
if ae.ErrorCode() == "CacheClusterNotFound" || ae.ErrorCode() == "InvalidReplicationGroupState" {
return nil, nil
}
}
Expand Down