From f8bf0078aa165460ceac3181c397486fbd92f15f Mon Sep 17 00:00:00 2001 From: Nicolas De Loof Date: Fri, 24 Apr 2020 10:13:38 +0200 Subject: [PATCH] Use DescribeCluster as ListCluster is a Paginated API Signed-off-by: Nicolas De Loof --- ecs/pkg/amazon/ecs.go | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/ecs/pkg/amazon/ecs.go b/ecs/pkg/amazon/ecs.go index 232d1d60..03ca92f4 100644 --- a/ecs/pkg/amazon/ecs.go +++ b/ecs/pkg/amazon/ecs.go @@ -2,8 +2,7 @@ package amazon import ( "errors" - "strings" - + "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ecs" "github.com/sirupsen/logrus" ) @@ -40,13 +39,11 @@ func (c client) DeleteCluster() error { func (c client) ClusterExists() (bool, error) { logrus.Debug("Check if cluster was already created: ", c.Cluster) - clusters, err := c.ECS.ListClusters(nil) + clusters, err := c.ECS.DescribeClusters(&ecs.DescribeClustersInput{ + Clusters: []*string{aws.String(c.Cluster)}, + }) if err != nil { return false, err } - found := false - for _, arn := range clusters.ClusterArns { - found = found || strings.HasSuffix(*arn, "/"+c.Cluster) - } - return found, nil + return len(clusters.Clusters) > 0, nil }