ae1a7a4 fix(registry): change DeleteBlob to return size of removed blob · gordon

M internal/adapters/out/filesystem/blob.go +14 -6


@@ -136,26 +136,34 @@ func (s *BlobStorage) PutBlob(digest string, data io.Reader, size int64) error {
136	136		}
137	137
138	138		// DeleteBlob removes a blob by digest.
139		-	func (s *BlobStorage) DeleteBlob(digest string) error {
	139	+	// Returns the size in bytes of the removed blob.
	140	+	func (s *BlobStorage) DeleteBlob(digest string) (int64, error) {
140	141		blobPath, err := s.getBlobPath(digest)
141	142		if err != nil {
142		-	return fmt.Errorf("invalid path: %w", err)
	143	+	return 0, fmt.Errorf("invalid path: %w", err)
143	144		}
144	145
145		-	if err := os.Remove(blobPath); err != nil {
	146	+	info, err := os.Stat(blobPath)
	147	+	if err != nil {
146	148		if os.IsNotExist(err) {
147		-	return fmt.Errorf("blob not found: %s", digest)
	149	+	return 0, fmt.Errorf("blob not found: %s", digest)
148	150		}
149		-	return fmt.Errorf("failed to delete blob: %w", err)
	151	+	return 0, fmt.Errorf("failed to stat blob: %w", err)
	152	+	}
	153	+	size := info.Size()
	154	+
	155	+	if err := os.Remove(blobPath); err != nil {
	156	+	return 0, fmt.Errorf("failed to delete blob: %w", err)
150	157		}
151	158
152	159		s.log.Info().
153	160		Str(zerowrap.FieldLayer, "adapter").
154	161		Str(zerowrap.FieldAdapter, "filesystem").
155	162		Str("digest", digest).
	163	+	Int64(zerowrap.FieldSize, size).
156	164		Msg("blob deleted")
157	165
158		-	return nil
	166	+	return size, nil
159	167		}
160	168
161	169		// BlobExists checks if a blob exists.

 }
 // DeleteBlob removes a blob by digest.
-func (s *BlobStorage) DeleteBlob(digest string) error {
+// Returns the size in bytes of the removed blob.
+func (s *BlobStorage) DeleteBlob(digest string) (int64, error) {
 	blobPath, err := s.getBlobPath(digest)
 	if err != nil {
-		return fmt.Errorf("invalid path: %w", err)
+		return 0, fmt.Errorf("invalid path: %w", err)
 	}
-	if err := os.Remove(blobPath); err != nil {
+	info, err := os.Stat(blobPath)
+	if err != nil {
 		if os.IsNotExist(err) {
-			return fmt.Errorf("blob not found: %s", digest)
+			return 0, fmt.Errorf("blob not found: %s", digest)
 		}
-		return fmt.Errorf("failed to delete blob: %w", err)
+		return 0, fmt.Errorf("failed to stat blob: %w", err)
+	}
+	size := info.Size()
+	if err := os.Remove(blobPath); err != nil {
+		return 0, fmt.Errorf("failed to delete blob: %w", err)
 	}
 	s.log.Info().
 		Str(zerowrap.FieldLayer, "adapter").
 		Str(zerowrap.FieldAdapter, "filesystem").
 		Str("digest", digest).
+		Int64(zerowrap.FieldSize, size).
 		Msg("blob deleted")
-	return nil
+	return size, nil
 }
 // BlobExists checks if a blob exists.

M internal/adapters/out/filesystem/blob_test.go +4 -2


@@ -175,8 +175,9 @@ func TestBlobStorage_DeleteBlob(t *testing.T) {
175	175		assert.True(t, storage.BlobExists(testDigest2))
176	176
177	177		// Delete blob
178		-	err = storage.DeleteBlob(testDigest2)
	178	+	size, err := storage.DeleteBlob(testDigest2)
179	179		require.NoError(t, err)
	180	+	assert.Equal(t, int64(len(blobData)), size)
180	181
181	182		// Verify it's gone
182	183		assert.False(t, storage.BlobExists(testDigest2))

@@ -189,9 +190,10 @@ func TestBlobStorage_DeleteBlob_NotFound(t *testing.T) {
189	190		storage, err := NewBlobStorage(tmpDir, log)
190	191		require.NoError(t, err)
191	192
192		-	err = storage.DeleteBlob(testDigestMissing)
	193	+	size, err := storage.DeleteBlob(testDigestMissing)
193	194
194	195		assert.Error(t, err)
	196	+	assert.Equal(t, int64(0), size)
195	197		assert.Contains(t, err.Error(), "blob not found")
196	198		}
197	199

 	assert.True(t, storage.BlobExists(testDigest2))
 	// Delete blob
-	err = storage.DeleteBlob(testDigest2)
+	size, err := storage.DeleteBlob(testDigest2)
 	require.NoError(t, err)
+	assert.Equal(t, int64(len(blobData)), size)
 	// Verify it's gone
 	assert.False(t, storage.BlobExists(testDigest2))
 	storage, err := NewBlobStorage(tmpDir, log)
 	require.NoError(t, err)
-	err = storage.DeleteBlob(testDigestMissing)
+	size, err := storage.DeleteBlob(testDigestMissing)
 	assert.Error(t, err)
+	assert.Equal(t, int64(0), size)
 	assert.Contains(t, err.Error(), "blob not found")
 }

M internal/boundaries/out/storage.go +2 -1


@@ -17,7 +17,8 @@ type BlobStorage interface {
17	17		PutBlob(digest string, data io.Reader, size int64) error
18	18
19	19		// DeleteBlob removes a blob by digest.
20		-	DeleteBlob(digest string) error
	20	+	// Returns the size in bytes of the removed blob.
	21	+	DeleteBlob(digest string) (int64, error)
21	22
22	23		// BlobExists checks if a blob exists.
23	24		BlobExists(digest string) bool


@@ -17,7 +17,8 @@ type BlobStorage interface {
17		PutBlob(digest string, data io.Reader, size int64) error	17		PutBlob(digest string, data io.Reader, size int64) error
18			18
19		// DeleteBlob removes a blob by digest.	19		// DeleteBlob removes a blob by digest.
20	-	DeleteBlob(digest string) error	20	+	// Returns the size in bytes of the removed blob.
			21	+	DeleteBlob(digest string) (int64, error)
21			22
22		// BlobExists checks if a blob exists.	23		// BlobExists checks if a blob exists.
23		BlobExists(digest string) bool	24		BlobExists(digest string) bool