Skip to content

v0.14.1 #157

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
yimsk merged 2 commits into from
Jan 26, 2026
Merged

v0.14.1 #157

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b4589a2
fix(ecs): batch DescribeClusters to handle >100 clusters (#156)
yimsk Jan 25, 2026
8596a7b
Merge remote-tracking branch 'origin/main' into develop
yimsk Jan 26, 2026
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
33 changes: 21 additions & 12 deletions custom/ecs/clusters/dao.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (
appaws "github.com/clawscli/claws/internal/aws"
"github.com/clawscli/claws/internal/dao"
apperrors "github.com/clawscli/claws/internal/errors"
"github.com/clawscli/claws/internal/log"
)

// ClusterDAO provides data access for ECS clusters
Expand Down Expand Up @@ -49,20 +50,28 @@ func (d *ClusterDAO) List(ctx context.Context) ([]dao.Resource, error) {
return nil, nil
}

// Describe clusters to get details
descInput := &ecs.DescribeClustersInput{
Clusters: clusterArns,
Include: []types.ClusterField{types.ClusterFieldStatistics, types.ClusterFieldSettings},
}
// Describe clusters in batches of 100 (API limit)
resources := make([]dao.Resource, 0, len(clusterArns))
for i := 0; i < len(clusterArns); i += 100 {
end := i + 100
if end > len(clusterArns) {
end = len(clusterArns)
}

descOutput, err := d.client.DescribeClusters(ctx, descInput)
if err != nil {
return nil, apperrors.Wrap(err, "describe clusters")
}
descInput := &ecs.DescribeClustersInput{
Clusters: clusterArns[i:end],
Include: []types.ClusterField{types.ClusterFieldStatistics, types.ClusterFieldSettings},
}

resources := make([]dao.Resource, 0, len(descOutput.Clusters))
for _, cluster := range descOutput.Clusters {
resources = append(resources, NewClusterResource(cluster))
descOutput, err := d.client.DescribeClusters(ctx, descInput)
if err != nil {
log.Warn("describe clusters", "error", err)
continue
}

for _, cluster := range descOutput.Clusters {
resources = append(resources, NewClusterResource(cluster))
}
}

return resources, nil
Expand Down