Skip to content
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

Exclude most recent image when pruning a repo #8

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Exclude most recent image when pruning a repo #8

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
97 changes: 58 additions & 39 deletions pkg/prune/prune.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,9 +202,8 @@ func (gc *Client) PruneRepo(ctx context.Context, name string, until time.Time, e
period,
name,
)
whitelist := newWhitelist(excluded...)
pruneableImageIDs := []*ecr.ImageIdentifier{}
var pageErr error
imageDetails := make([]*ecr.ImageDetail, 0)
var mostRecentImageDetail *ecr.ImageDetail
if err := gc.client.DescribeImagesPagesWithContext(
ctx,
&ecr.DescribeImagesInput{
Expand All @@ -213,41 +212,13 @@ func (gc *Client) PruneRepo(ctx context.Context, name string, until time.Time, e
},
func(page *ecr.DescribeImagesOutput, lastPage bool) bool {
for _, imageDetail := range page.ImageDetails {
excluded := false
for _, imageTag := range imageDetail.ImageTags {
if imageTag == nil {
pageErr = fmt.Errorf(
"found unexpected nil image tag in Elastic Container Registry repository %s",
*repo.RepositoryUri,
)
return false
}
imageRef := fmt.Sprintf("%s:%s", *repo.RepositoryUri, *imageTag)
if whitelist.IsExcluded(imageRef) {
excluded = true
break
}
}
if excluded {
continue
}
if imageDetail.ImagePushedAt == nil {
pageErr = fmt.Errorf(
"found unexpected nil image pushed at time in Elastic Container Registry repository %s",
*repo.RepositoryUri,
)
return false
}
pushedAt := imageDetail.ImagePushedAt.UTC()
period := -time.Duration(period) * 24 * time.Hour
cutoff := until.UTC().Add(period)
if pushedAt.After(cutoff) {
continue
}
for _, imageTag := range imageDetail.ImageTags {
pruneableImageIDs = append(pruneableImageIDs, &ecr.ImageIdentifier{ImageTag: imageTag})
isFirst := mostRecentImageDetail == nil
isMostRecent := isFirst || imageDetail.ImagePushedAt.After(*mostRecentImageDetail.ImagePushedAt)
if isMostRecent {
mostRecentImageDetail = imageDetail
}
}
imageDetails = append(imageDetails, page.ImageDetails...)
return true
},
); err != nil {
Expand All @@ -258,9 +229,57 @@ func (gc *Client) PruneRepo(ctx context.Context, name string, until time.Time, e
err,
)
}
if pageErr != nil {
span.Finish(tracer.WithError(pageErr))
return pruned, pageErr
if mostRecentImageDetail != nil {
log.Println("*****")
mostRecentImageIDs := make([]*ecr.ImageIdentifier, 0, len(mostRecentImageDetail.ImageTags))
for _, imageTag := range mostRecentImageDetail.ImageTags {
imageID := &ecr.ImageIdentifier{ImageTag: imageTag}
mostRecentImageIDs = append(mostRecentImageIDs, imageID)
}
mostRecentImageRefs, err := repoImageRefsFromURIAndImageIDs(
ctx,
*repo.RepositoryUri,
mostRecentImageIDs,
)
if err != nil {
span.Finish(tracer.WithError(err))
return nil, err
}
excluded = append(excluded, mostRecentImageRefs...)
}
whitelist := newWhitelist(excluded...)
log.Println(whitelist)
pruneableImageIDs := make([]*ecr.ImageIdentifier, 0, len(imageDetails))
excluded:
for _, imageDetail := range imageDetails {
if imageDetail.ImagePushedAt == nil {
span.Finish(tracer.WithError(err))
return nil, fmt.Errorf(
"found unexpected nil image pushed at time in Elastic Container Registry repository %s",
*repo.RepositoryUri,
)
}
pushedAt := imageDetail.ImagePushedAt.UTC()
cutoff := until.UTC().Add(-time.Duration(period) * 24 * time.Hour)
if pushedAt.After(cutoff) {
continue excluded
}
for _, imageTag := range imageDetail.ImageTags {
if imageTag == nil {
span.Finish(tracer.WithError(err))
return nil, fmt.Errorf(
"found unexpected nil image tag in Elastic Container Registry repository %s",
*repo.RepositoryUri,
)
}
imageRef := fmt.Sprintf("%s:%s", *repo.RepositoryUri, *imageTag)
if whitelist.IsExcluded(imageRef) {
continue excluded
}
log.Println(imageRef, "is prunable")
imageID := &ecr.ImageIdentifier{ImageTag: imageTag}
pruneableImageIDs = append(pruneableImageIDs, imageID)
}
}
log.Printf(
"found %d unique pruneable images for Elastic Container Registry repository %s",
Expand Down
47 changes: 47 additions & 0 deletions pkg/prune/prune_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,53 @@ func TestGarbageCollector_PruneAllRepos(t *testing.T) {
},
DeletedCount: 1,
},
{
Name: "ExcludeMostRecent",
Repositories: []*ecr.Repository{
{
RepositoryArn: aws.String(
"arn:aws:ecr:us-east-1:000123456789:repository/thermite",
),
RepositoryName: aws.String("thermite"),
RepositoryUri: aws.String(
"000123456789.dkr.ecr.us-east-1.amazonaws.com/thermite",
),
},
},
TagsByResourceARN: map[string][]*ecr.Tag{
"arn:aws:ecr:us-east-1:000123456789:repository/thermite": {
{
Key: aws.String("thermite:prune-period"),
Value: aws.String("30"),
},
},
},
ImageDetailsByRepositoryName: map[string][]*ecr.ImageDetail{
"thermite": {
{
ImagePushedAt: aws.Time(until.Add(-(30*24 + 1) * time.Hour)),
ImageTags: []*string{
aws.String("0437aec133abca7f3d054a5be48dde8ed9b2af22"),
},
},
{
ImagePushedAt: aws.Time(until.Add(-(30*24 + 2) * time.Hour)),
ImageTags: []*string{
aws.String("878d0cb2b7e6f6017c096fa613b1b521b95325a6"),
},
},
},
},
Opts: []Option{WithRemoveImages()},
Until: until,
Excluded: []string{
"000123456789.dkr.ecr.us-east-1.amazonaws.com/thermite:5379a3dcddb42eb007a68ea7990c643066263fb8",
},
Pruned: []string{
"000123456789.dkr.ecr.us-east-1.amazonaws.com/thermite:878d0cb2b7e6f6017c096fa613b1b521b95325a6",
},
DeletedCount: 1,
},
{
Name: "WithDryRun",
Repositories: []*ecr.Repository{
Expand Down