Skip to content

✨ Add pagination to describe repositories and describe images calls. #6331

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
chris-rock merged 1 commit into from
Dec 22, 2025
Merged

✨ Add pagination to describe repositories and describe images calls. #6331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 5 additions & 3 deletions providers/aws/resources/aws.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,11 @@ func (a *mqlAws) regions() ([]any, error) {
func Is400AccessDeniedError(err error) bool {
var respErr *http.ResponseError
if errors.As(err, &respErr) {
if (respErr.HTTPStatusCode() == 400 || respErr.HTTPStatusCode() == 403) && (strings.Contains(respErr.Error(), "AccessDenied") || strings.Contains(respErr.Error(), "UnauthorizedOperation") || strings.Contains(respErr.Error(), "AuthorizationError")) {
return true
}
statusCodeMatches := respErr.HTTPStatusCode() == 400 || respErr.HTTPStatusCode() == 403
errorMessageMatches := strings.Contains(respErr.Error(), "AccessDenied") ||
strings.Contains(respErr.Error(), "UnauthorizedOperation") ||
strings.Contains(respErr.Error(), "AuthorizationError")
return statusCodeMatches && errorMessageMatches
}
return false
}
Expand Down
156 changes: 80 additions & 76 deletions providers/aws/resources/aws_ecr.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,34 +102,36 @@ func (a *mqlAwsEcr) getPrivateRepositories(conn *connection.AwsConnection) []*jo
svc := conn.Ecr(region)
res := []any{}

repoResp, err := svc.DescribeRepositories(ctx, &ecr.DescribeRepositoriesInput{})
if err != nil {
if Is400AccessDeniedError(err) {
log.Warn().Str("region", region).Msg("error accessing region for AWS API")
return res, nil
}
return nil, err
}
for i := range repoResp.Repositories {
imageScanOnPush := false
r := repoResp.Repositories[i]
if r.ImageScanningConfiguration != nil {
imageScanOnPush = r.ImageScanningConfiguration.ScanOnPush
}
mqlRepoResource, err := CreateResource(a.MqlRuntime, "aws.ecr.repository",
map[string]*llx.RawData{
"arn": llx.StringDataPtr(r.RepositoryArn),
"name": llx.StringDataPtr(r.RepositoryName),
"uri": llx.StringDataPtr(r.RepositoryUri),
"registryId": llx.StringDataPtr(r.RegistryId),
"public": llx.BoolData(false),
"region": llx.StringData(region),
"imageScanOnPush": llx.BoolData(imageScanOnPush),
})
paginator := ecr.NewDescribeRepositoriesPaginator(svc, &ecr.DescribeRepositoriesInput{})
for paginator.HasMorePages() {
repoResp, err := paginator.NextPage(ctx)
if err != nil {
if Is400AccessDeniedError(err) {
log.Warn().Str("region", region).Msg("error accessing region for AWS API")
return res, nil
}
return nil, err
}
res = append(res, mqlRepoResource)
for _, r := range repoResp.Repositories {
imageScanOnPush := false
if r.ImageScanningConfiguration != nil {
imageScanOnPush = r.ImageScanningConfiguration.ScanOnPush
}
mqlRepoResource, err := CreateResource(a.MqlRuntime, ResourceAwsEcrRepository,
map[string]*llx.RawData{
"arn": llx.StringDataPtr(r.RepositoryArn),
"name": llx.StringDataPtr(r.RepositoryName),
"uri": llx.StringDataPtr(r.RepositoryUri),
"registryId": llx.StringDataPtr(r.RegistryId),
"public": llx.BoolData(false),
"region": llx.StringData(region),
"imageScanOnPush": llx.BoolData(imageScanOnPush),
})
if err != nil {
return nil, err
}
res = append(res, mqlRepoResource)
}
}

return jobpool.JobResult(res), nil
Expand All @@ -150,39 +152,42 @@ func (a *mqlAwsEcrRepository) images() ([]any, error) {
mqlres := []any{}
if public {
svc := conn.EcrPublic(region)
res, err := svc.DescribeImages(ctx, &ecrpublic.DescribeImagesInput{RepositoryName: &name})
if err != nil {
if Is400AccessDeniedError(err) {
log.Warn().Str("region", region).Msg("error accessing region for AWS API")
return nil, nil
}
return nil, err
}

for _, image := range res.ImageDetails {
tags := []any{}
for _, imageTag := range image.ImageTags {
tags = append(tags, imageTag)
}
mqlImage, err := CreateResource(a.MqlRuntime, ResourceAwsEcrImage,
map[string]*llx.RawData{
"digest": llx.StringDataPtr(image.ImageDigest),
"mediaType": llx.StringDataPtr(image.ImageManifestMediaType),
"tags": llx.ArrayData(tags, types.String),
"registryId": llx.StringDataPtr(image.RegistryId),
"repoName": llx.StringData(name),
"region": llx.StringData(region),
"arn": llx.StringData(ecrImageArn(ImageInfo{Region: region, RegistryId: convert.ToValue(image.RegistryId), RepoName: name, Digest: convert.ToValue(image.ImageDigest)})),
"uri": llx.StringData(uri),
})
paginator := ecrpublic.NewDescribeImagesPaginator(svc, &ecrpublic.DescribeImagesInput{RepositoryName: &name})
for paginator.HasMorePages() {
res, err := paginator.NextPage(ctx)
if err != nil {
if Is400AccessDeniedError(err) {
log.Warn().Str("region", region).Msg("error accessing region for AWS API")
return nil, nil
}
return nil, err
}
mqlres = append(mqlres, mqlImage)
for _, image := range res.ImageDetails {
mqlImage, err := CreateResource(a.MqlRuntime, ResourceAwsEcrImage,
map[string]*llx.RawData{
"digest": llx.StringDataPtr(image.ImageDigest),
"mediaType": llx.StringDataPtr(image.ImageManifestMediaType),
"tags": llx.ArrayData(toInterfaceArr(image.ImageTags), types.String),
"registryId": llx.StringDataPtr(image.RegistryId),
"repoName": llx.StringData(name),
"region": llx.StringData(region),
"arn": llx.StringData(ecrImageArn(ImageInfo{Region: region, RegistryId: convert.ToValue(image.RegistryId), RepoName: name, Digest: convert.ToValue(image.ImageDigest)})),
"uri": llx.StringData(uri),
})
if err != nil {
return nil, err
}
mqlres = append(mqlres, mqlImage)
}
}
} else {
svc := conn.Ecr(region)
res, err := svc.DescribeImages(ctx, &ecr.DescribeImagesInput{RepositoryName: &name})
return mqlres, nil
}

// private
svc := conn.Ecr(region)
paginator := ecr.NewDescribeImagesPaginator(svc, &ecr.DescribeImagesInput{RepositoryName: &name})
for paginator.HasMorePages() {
res, err := paginator.NextPage(ctx)
if err != nil {
if Is400AccessDeniedError(err) {
log.Warn().Str("region", region).Msg("error accessing region for AWS API")
Expand All @@ -191,10 +196,6 @@ func (a *mqlAwsEcrRepository) images() ([]any, error) {
return nil, err
}
for _, image := range res.ImageDetails {
tags := []any{}
for _, itag := range image.ImageTags {
tags = append(tags, itag)
}
mqlImage, err := CreateResource(a.MqlRuntime, ResourceAwsEcrImage,
map[string]*llx.RawData{
"arn": llx.StringData(ecrImageArn(ImageInfo{Region: region, RegistryId: convert.ToValue(image.RegistryId), RepoName: name, Digest: convert.ToValue(image.ImageDigest)})),
Expand All @@ -206,7 +207,7 @@ func (a *mqlAwsEcrRepository) images() ([]any, error) {
"registryId": llx.StringDataPtr(image.RegistryId),
"repoName": llx.StringData(name),
"sizeInBytes": llx.IntDataPtr(image.ImageSizeInBytes),
"tags": llx.ArrayData(tags, types.String),
"tags": llx.ArrayData(toInterfaceArr(image.ImageTags), types.String),
"uri": llx.StringData(uri),
})
if err != nil {
Expand Down Expand Up @@ -275,26 +276,29 @@ func (a *mqlAwsEcr) publicRepositories() ([]any, error) {
svc := conn.EcrPublic("us-east-1") // only supported for us-east-1
res := []any{}

// TODO: consider using pagination here
repoResp, err := svc.DescribeRepositories(context.TODO(), &ecrpublic.DescribeRepositoriesInput{RegistryId: aws.String(conn.AccountId())})
if err != nil {
return nil, err
}
for _, r := range repoResp.Repositories {
mqlRepoResource, err := CreateResource(a.MqlRuntime, "aws.ecr.repository",
map[string]*llx.RawData{
"arn": llx.StringDataPtr(r.RepositoryArn),
"name": llx.StringDataPtr(r.RepositoryName),
"uri": llx.StringDataPtr(r.RepositoryUri),
"registryId": llx.StringDataPtr(r.RegistryId),
"public": llx.BoolData(true),
"region": llx.StringData("us-east-1"),
"imageScanOnPush": llx.BoolData(false),
})
paginator := ecrpublic.NewDescribeRepositoriesPaginator(svc, &ecrpublic.DescribeRepositoriesInput{RegistryId: aws.String(conn.AccountId())})
for paginator.HasMorePages() {
repoResp, err := paginator.NextPage(context.TODO())
if err != nil {
return nil, err
}
res = append(res, mqlRepoResource)

for _, r := range repoResp.Repositories {
mqlRepoResource, err := CreateResource(a.MqlRuntime, ResourceAwsEcrRepository,
map[string]*llx.RawData{
"arn": llx.StringDataPtr(r.RepositoryArn),
"name": llx.StringDataPtr(r.RepositoryName),
"uri": llx.StringDataPtr(r.RepositoryUri),
"registryId": llx.StringDataPtr(r.RegistryId),
"public": llx.BoolData(true),
"region": llx.StringData("us-east-1"),
"imageScanOnPush": llx.BoolData(false),
})
if err != nil {
return nil, err
}
res = append(res, mqlRepoResource)
}
}

return res, nil
Expand Down
Loading