Merge pull request porter-dev#797 from porter-dev/0.4.1-fix-ecr-loading

[0.4.1] Remove max results from ECR loading and add next token
maniacs-ops · Jun 21, 2021 · 3c90f30 · 3c90f30
2 parents b7c14a6 + 8d4d51f
commit 3c90f30
Showing 1 changed file with 19 additions and 4 deletions.
diff --git a/internal/registry/registry.go b/internal/registry/registry.go
@@ -482,21 +482,36 @@ func (r *Registry) listECRImages(repoName string, repo repository.Repository) ([
 		return nil, err
 	}
 
-	var maxResults int64 = 999
-
 	describeResp, err := svc.DescribeImages(&ecr.DescribeImagesInput{
 		RepositoryName: &repoName,
 		ImageIds:       resp.ImageIds,
-		MaxResults:     &maxResults,
 	})
 
 	if err != nil {
 		return nil, err
 	}
 
+	imageDetails := describeResp.ImageDetails
+
+	nextToken := describeResp.NextToken
+
+	for nextToken != nil {
+		describeResp, err := svc.DescribeImages(&ecr.DescribeImagesInput{
+			RepositoryName: &repoName,
+			ImageIds:       resp.ImageIds,
+		})
+
+		if err != nil {
+			return nil, err
+		}
+
+		nextToken = describeResp.NextToken
+		imageDetails = append(imageDetails, describeResp.ImageDetails...)
+	}
+
 	res := make([]*Image, 0)
 
-	for _, img := range describeResp.ImageDetails {
+	for _, img := range imageDetails {
 		for _, tag := range img.ImageTags {
 			res = append(res, &Image{
 				Digest:         *img.ImageDigest,