fix: cleanup the purge uploads as well when running the prune command (#138)

Signed-off-by: chlins <[email protected]>

Author: chlins

.golangci.yml

@@ -1,6 +1,8 @@
 run:
   timeout: 3m
   modules-download-mode: readonly
+  skip-dirs:
+    - test/mocks
 
 linters-settings:
   gocyclo:
@@ -17,8 +19,6 @@ issues:
     - linters:
         - staticcheck
       text: "SA1019:"
-  exclude-dirs:
-    - test/mocks
 
 linters:
   disable-all: true

pkg/backend/prune.go

@@ -18,9 +18,18 @@ package backend
 
 import (
 	"context"
+	"fmt"
 )
 
 // Prune prunes the unused blobs and clean up the storage.
 func (b *backend) Prune(ctx context.Context, dryRun, removeUntagged bool) error {
-	return b.store.PerformGC(ctx, dryRun, removeUntagged)
+	if err := b.store.PerformGC(ctx, dryRun, removeUntagged); err != nil {
+		return fmt.Errorf("faile to perform gc: %w", err)
+	}
+
+	if err := b.store.PerformPurgeUploads(ctx, dryRun); err != nil {
+		return fmt.Errorf("failed to perform purge uploads: %w", err)
+	}
+
+	return nil
 }

pkg/storage/distribution/distribution.go

@@ -22,6 +22,7 @@ import (
 	"fmt"
 	"io"
 	"regexp"
+	"time"
 
 	distribution "github.com/distribution/distribution/v3"
 	registry "github.com/distribution/distribution/v3/registry/storage"
@@ -315,3 +316,9 @@ func (s *storage) PerformGC(ctx context.Context, dryRun, removeUntagged bool) er
 		RemoveUntagged: removeUntagged,
 	})
 }
+
+// PerformPurgeUploads performs the purge uploads in the storage to free up the space.
+func (s *storage) PerformPurgeUploads(ctx context.Context, dryRun bool) error {
+	_, errs := registry.PurgeUploads(ctx, s.driver, time.Now(), !dryRun)
+	return errors.Join(errs...)
+}

pkg/storage/storage.go

@@ -56,6 +56,8 @@ type Storage interface {
 	ListTags(ctx context.Context, repo string) ([]string, error)
 	// PerformGC performs the garbage collection in the storage to free up the space.
 	PerformGC(ctx context.Context, dryRun, removeUntagged bool) error
+	// PerformPurgeUploads performs the purge uploads in the storage to free up the space.
+	PerformPurgeUploads(ctx context.Context, dryRun bool) error
 }
 
 // WithRootDir sets the root directory of the storage.