Skip to content

Commit 7eef77e

Browse files
feat: support deletion for OCI storage (#608)
Signed-off-by: Xiaoxuan Wang <[email protected]> Part 3/4 of #454 Based on draft PR #582 --------- Signed-off-by: Xiaoxuan Wang <[email protected]>
1 parent 6456d16 commit 7eef77e

File tree

2 files changed

+46
-0
lines changed

2 files changed

+46
-0
lines changed

content/oci/storage.go

+10
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,16 @@ func (s *Storage) Push(_ context.Context, expected ocispec.Descriptor, content i
106106
return nil
107107
}
108108

109+
// Delete removes the target from the system.
110+
func (s *Storage) Delete(ctx context.Context, target ocispec.Descriptor) error {
111+
path, err := blobPath(target.Digest)
112+
if err != nil {
113+
return fmt.Errorf("%s: %s: %w", target.Digest, target.MediaType, errdef.ErrInvalidDigest)
114+
}
115+
targetPath := filepath.Join(s.root, path)
116+
return os.Remove(targetPath)
117+
}
118+
109119
// ingest write the content into a temporary ingest file.
110120
func (s *Storage) ingest(expected ocispec.Descriptor, content io.Reader) (path string, ingestErr error) {
111121
if err := ensureDir(s.ingestRoot); err != nil {

content/oci/storage_test.go

+36
Original file line numberDiff line numberDiff line change
@@ -377,3 +377,39 @@ func TestStorage_Fetch_Concurrent(t *testing.T) {
377377
t.Fatal(err)
378378
}
379379
}
380+
381+
func TestStorage_Delete(t *testing.T) {
382+
content := []byte("test delete")
383+
desc := ocispec.Descriptor{
384+
MediaType: "test",
385+
Digest: digest.FromBytes(content),
386+
Size: int64(len(content)),
387+
}
388+
tempDir := t.TempDir()
389+
s, err := NewStorage(tempDir)
390+
if err != nil {
391+
t.Fatal("New() error =", err)
392+
}
393+
ctx := context.Background()
394+
if err := s.Push(ctx, desc, bytes.NewReader(content)); err != nil {
395+
t.Fatal("Storage.Push() error =", err)
396+
}
397+
exists, err := s.Exists(ctx, desc)
398+
if err != nil {
399+
t.Fatal("Storage.Exists() error =", err)
400+
}
401+
if !exists {
402+
t.Errorf("Storage.Exists() = %v, want %v", exists, true)
403+
}
404+
err = s.Delete(ctx, desc)
405+
if err != nil {
406+
t.Fatal("Storage.Delete() error =", err)
407+
}
408+
exists, err = s.Exists(ctx, desc)
409+
if err != nil {
410+
t.Fatal("Storage.Exists() error =", err)
411+
}
412+
if exists {
413+
t.Errorf("Storage.Exists() = %v, want %v", exists, false)
414+
}
415+
}

0 commit comments

Comments
 (0)