-
Notifications
You must be signed in to change notification settings - Fork 99
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.
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
[WIP] Implement Delete for OCI Layout #582
Closed
wangxiaoxuan273
wants to merge
26
commits into
oras-project:main
from
wangxiaoxuan273:draft-oci-delete
+1,021
−0
Closed
Changes from all commits
Commits
Show all changes
26 commits
Select commit
Hold shift + click to select a range
77dc7dd
implemented draft version 0, need to analyze deadlock
wangxiaoxuan273 d4949d7
moved the lock up to the DeletableStore level
wangxiaoxuan273 5cd6043
removed the DeletableStorage interface
wangxiaoxuan273 4a0bf32
added unit tests
wangxiaoxuan273 110fb3e
added Resolve
wangxiaoxuan273 daa8dcd
removed the RS variable name
wangxiaoxuan273 536664b
added back Tag and Tags
wangxiaoxuan273 5a8ad61
merged the locks and refactored saveIndex
wangxiaoxuan273 b1c621c
implemented the delete. Need to add extensive tests and refine
wangxiaoxuan273 1163345
refined delete and removed the draft test
wangxiaoxuan273 b27a59c
fixed failed unit test
wangxiaoxuan273 7db91b6
added test
wangxiaoxuan273 8bb46b6
added another smaller check
wangxiaoxuan273 7381e9b
created memory with delete
wangxiaoxuan273 589934f
added lock, need to change sync map to regular map
wangxiaoxuan273 ed49d71
changed successors to regular maps, updated tests
wangxiaoxuan273 1044252
changed predecessors to regular map
wangxiaoxuan273 4c5457d
changed the places of lock operations
wangxiaoxuan273 ed0e652
per discussion of yesterday
wangxiaoxuan273 76c33d4
moved loadFile function
wangxiaoxuan273 5bc32d2
updated file names
wangxiaoxuan273 466ffd1
resolved the comments and refined code, need unit tests
wangxiaoxuan273 2117a8d
removed the unit test it's too hard to write
wangxiaoxuan273 5d6bede
refined the code
wangxiaoxuan273 cb8749e
bug fix and basic unit tests
wangxiaoxuan273 6a4ade0
removed an outdated comment
wangxiaoxuan273 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,357 @@ | ||
/* | ||
Copyright The ORAS Authors. | ||
Licensed under the Apache License, Version 2.0 (the "License"); | ||
you may not use this file except in compliance with the License. | ||
You may obtain a copy of the License at | ||
|
||
http://www.apache.org/licenses/LICENSE-2.0 | ||
|
||
Unless required by applicable law or agreed to in writing, software | ||
distributed under the License is distributed on an "AS IS" BASIS, | ||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
See the License for the specific language governing permissions and | ||
limitations under the License. | ||
*/ | ||
|
||
// Package oci provides access to an OCI content store. | ||
// Reference: https://github.com/opencontainers/image-spec/blob/v1.1.0-rc4/image-layout.md | ||
package oci | ||
|
||
import ( | ||
"context" | ||
"encoding/json" | ||
"errors" | ||
"fmt" | ||
"io" | ||
"os" | ||
"path/filepath" | ||
"sync" | ||
|
||
"github.com/opencontainers/go-digest" | ||
specs "github.com/opencontainers/image-spec/specs-go" | ||
ocispec "github.com/opencontainers/image-spec/specs-go/v1" | ||
"oras.land/oras-go/v2/content" | ||
"oras.land/oras-go/v2/errdef" | ||
"oras.land/oras-go/v2/internal/container/set" | ||
"oras.land/oras-go/v2/internal/descriptor" | ||
"oras.land/oras-go/v2/internal/graph" | ||
"oras.land/oras-go/v2/internal/resolver" | ||
) | ||
|
||
// DeletableStore implements `oras.Target`, and represents a content store | ||
// extended with the delete operation. | ||
// Reference: https://github.com/opencontainers/image-spec/blob/v1.1.0-rc4/image-layout.md | ||
type DeletableStore struct { | ||
// AutoSaveIndex controls if the OCI store will automatically save the index | ||
// file on each Tag() call. | ||
// - If AutoSaveIndex is set to true, the OCI store will automatically call | ||
// this method on each Tag() call. | ||
// - If AutoSaveIndex is set to false, it's the caller's responsibility | ||
// to manually call SaveIndex() when needed. | ||
// - Default value: true. | ||
AutoSaveIndex bool | ||
root string | ||
indexPath string | ||
index *ocispec.Index | ||
lock sync.RWMutex | ||
|
||
storage *Storage | ||
tagResolver *resolver.Memory | ||
graph *graph.DeletableMemory | ||
} | ||
|
||
// NewDeletableStore returns a new DeletableStore. | ||
func NewDeletableStore(root string) (*DeletableStore, error) { | ||
return NewDeletableStoreWithContext(context.Background(), root) | ||
} | ||
|
||
// NewDeletableStoreWithContext creates a new DeletableStore. | ||
func NewDeletableStoreWithContext(ctx context.Context, root string) (*DeletableStore, error) { | ||
rootAbs, err := filepath.Abs(root) | ||
if err != nil { | ||
return nil, fmt.Errorf("failed to resolve absolute path for %s: %w", root, err) | ||
} | ||
storage, err := NewStorage(rootAbs) | ||
if err != nil { | ||
return nil, fmt.Errorf("failed to create storage: %w", err) | ||
} | ||
store := &DeletableStore{ | ||
AutoSaveIndex: true, | ||
root: rootAbs, | ||
indexPath: filepath.Join(rootAbs, ociImageIndexFile), | ||
storage: storage, | ||
tagResolver: resolver.NewMemory(), | ||
graph: graph.NewDeletableMemory(), | ||
} | ||
if err := ensureDir(filepath.Join(rootAbs, ociBlobsDir)); err != nil { | ||
return nil, err | ||
} | ||
if err := store.ensureOCILayoutFile(); err != nil { | ||
return nil, fmt.Errorf("invalid OCI Image Layout: %w", err) | ||
} | ||
if err := store.loadIndexFile(ctx); err != nil { | ||
return nil, fmt.Errorf("invalid OCI Image Index: %w", err) | ||
} | ||
return store, nil | ||
} | ||
|
||
// Fetch fetches the content identified by the descriptor. | ||
func (ds *DeletableStore) Fetch(ctx context.Context, target ocispec.Descriptor) (io.ReadCloser, error) { | ||
ds.lock.RLock() | ||
defer ds.lock.RUnlock() | ||
return ds.storage.Fetch(ctx, target) | ||
} | ||
|
||
// Push pushes the content, matching the expected descriptor. | ||
func (ds *DeletableStore) Push(ctx context.Context, expected ocispec.Descriptor, reader io.Reader) error { | ||
ds.lock.Lock() | ||
defer ds.lock.Unlock() | ||
if err := ds.storage.Push(ctx, expected, reader); err != nil { | ||
return err | ||
} | ||
if err := ds.graph.Index(ctx, ds.storage, expected); err != nil { | ||
return err | ||
} | ||
if descriptor.IsManifest(expected) { | ||
// tag by digest | ||
return ds.tag(ctx, expected, expected.Digest.String()) | ||
} | ||
return nil | ||
} | ||
|
||
// Delete removes the content matching the descriptor from the store. | ||
func (ds *DeletableStore) Delete(ctx context.Context, target ocispec.Descriptor) error { | ||
ds.lock.Lock() | ||
defer ds.lock.Unlock() | ||
resolvers := ds.tagResolver.Map() | ||
for reference, desc := range resolvers { | ||
if content.Equal(desc, target) { | ||
ds.tagResolver.Delete(reference) | ||
} | ||
} | ||
if err := ds.graph.Remove(ctx, target); err != nil { | ||
return err | ||
} | ||
if ds.AutoSaveIndex { | ||
err := ds.saveIndex() | ||
if err != nil { | ||
return err | ||
} | ||
} | ||
return ds.storage.Delete(ctx, target) | ||
} | ||
|
||
// Exists returns true if the described content exists. | ||
func (ds *DeletableStore) Exists(ctx context.Context, target ocispec.Descriptor) (bool, error) { | ||
ds.lock.RLock() | ||
defer ds.lock.RUnlock() | ||
return ds.storage.Exists(ctx, target) | ||
} | ||
|
||
// Tag tags a descriptor with a reference string. | ||
// reference should be a valid tag (e.g. "latest"). | ||
// Reference: https://github.com/opencontainers/image-spec/blob/v1.1.0-rc4/image-layout.md#indexjson-file | ||
func (ds *DeletableStore) Tag(ctx context.Context, desc ocispec.Descriptor, reference string) error { | ||
ds.lock.Lock() | ||
defer ds.lock.Unlock() | ||
if err := validateReference(reference); err != nil { | ||
return err | ||
} | ||
exists, err := ds.storage.Exists(ctx, desc) | ||
if err != nil { | ||
return err | ||
} | ||
if !exists { | ||
return fmt.Errorf("%s: %s: %w", desc.Digest, desc.MediaType, errdef.ErrNotFound) | ||
} | ||
return ds.tag(ctx, desc, reference) | ||
} | ||
|
||
// tag tags a descriptor with a reference string. | ||
func (ds *DeletableStore) tag(ctx context.Context, desc ocispec.Descriptor, reference string) error { | ||
dgst := desc.Digest.String() | ||
if reference != dgst { | ||
// also tag desc by its digest | ||
if err := ds.tagResolver.Tag(ctx, desc, dgst); err != nil { | ||
return err | ||
} | ||
} | ||
if err := ds.tagResolver.Tag(ctx, desc, reference); err != nil { | ||
return err | ||
} | ||
if ds.AutoSaveIndex { | ||
return ds.saveIndex() | ||
} | ||
return nil | ||
} | ||
|
||
// Resolve resolves a reference to a descriptor. If the reference to be resolved | ||
// is a tag, the returned descriptor will be a full descriptor declared by | ||
// github.com/opencontainers/image-spec/specs-go/v1. If the reference is a | ||
// digest the returned descriptor will be a plain descriptor (containing only | ||
// the digest, media type and size). | ||
func (ds *DeletableStore) Resolve(ctx context.Context, reference string) (ocispec.Descriptor, error) { | ||
ds.lock.RLock() | ||
defer ds.lock.RUnlock() | ||
if reference == "" { | ||
return ocispec.Descriptor{}, errdef.ErrMissingReference | ||
} | ||
// attempt resolving manifest | ||
desc, err := ds.tagResolver.Resolve(ctx, reference) | ||
if err != nil { | ||
if errors.Is(err, errdef.ErrNotFound) { | ||
// attempt resolving blob | ||
return resolveBlob(os.DirFS(ds.root), reference) | ||
} | ||
return ocispec.Descriptor{}, err | ||
} | ||
if reference == desc.Digest.String() { | ||
return descriptor.Plain(desc), nil | ||
} | ||
return desc, nil | ||
} | ||
|
||
// Predecessors returns the nodes directly pointing to the current node. | ||
// Predecessors returns nil without error if the node does not exists in the | ||
// store. | ||
func (ds *DeletableStore) Predecessors(ctx context.Context, node ocispec.Descriptor) ([]ocispec.Descriptor, error) { | ||
ds.lock.RLock() | ||
defer ds.lock.RUnlock() | ||
return ds.graph.Predecessors(ctx, node) | ||
} | ||
|
||
// Tags lists the tags presented in the `index.json` file of the OCI layout, | ||
// returned in ascending order. | ||
// If `last` is NOT empty, the entries in the response start after the tag | ||
// specified by `last`. Otherwise, the response starts from the top of the tags | ||
// list. | ||
// | ||
// See also `Tags()` in the package `registry`. | ||
func (ds *DeletableStore) Tags(ctx context.Context, last string, fn func(tags []string) error) error { | ||
ds.lock.RLock() | ||
defer ds.lock.RUnlock() | ||
return listTags(ctx, ds.tagResolver, last, fn) | ||
} | ||
|
||
// ensureOCILayoutFile ensures the `oci-layout` file. | ||
func (ds *DeletableStore) ensureOCILayoutFile() error { | ||
layoutFilePath := filepath.Join(ds.root, ocispec.ImageLayoutFile) | ||
layoutFile, err := os.Open(layoutFilePath) | ||
if err != nil { | ||
if !os.IsNotExist(err) { | ||
return fmt.Errorf("failed to open OCI layout file: %w", err) | ||
} | ||
layout := ocispec.ImageLayout{ | ||
Version: ocispec.ImageLayoutVersion, | ||
} | ||
layoutJSON, err := json.Marshal(layout) | ||
if err != nil { | ||
return fmt.Errorf("failed to marshal OCI layout file: %w", err) | ||
} | ||
return os.WriteFile(layoutFilePath, layoutJSON, 0666) | ||
} | ||
defer layoutFile.Close() | ||
var layout ocispec.ImageLayout | ||
err = json.NewDecoder(layoutFile).Decode(&layout) | ||
if err != nil { | ||
return fmt.Errorf("failed to decode OCI layout file: %w", err) | ||
} | ||
return validateOCILayout(&layout) | ||
} | ||
|
||
// loadIndexFile reads index.json from the file system. | ||
// Create index.json if it does not exist. | ||
func (ds *DeletableStore) loadIndexFile(ctx context.Context) error { | ||
indexFile, err := os.Open(ds.indexPath) | ||
if err != nil { | ||
if !os.IsNotExist(err) { | ||
return fmt.Errorf("failed to open index file: %w", err) | ||
} | ||
// write index.json if it does not exist | ||
ds.index = &ocispec.Index{ | ||
Versioned: specs.Versioned{ | ||
SchemaVersion: 2, // historical value | ||
}, | ||
Manifests: []ocispec.Descriptor{}, | ||
} | ||
return ds.writeIndexFile() | ||
} | ||
defer indexFile.Close() | ||
var index ocispec.Index | ||
if err := json.NewDecoder(indexFile).Decode(&index); err != nil { | ||
return fmt.Errorf("failed to decode index file: %w", err) | ||
} | ||
ds.index = &index | ||
return loadIndexInDeletableMemory(ctx, ds.index, ds.storage, ds.tagResolver, ds.graph) | ||
} | ||
|
||
// SaveIndex writes the `index.json` file to the file system. | ||
// - If AutoSaveIndex is set to true (default value), | ||
// the OCI store will automatically save the index on each Tag() call. | ||
// - If AutoSaveIndex is set to false, it's the caller's responsibility | ||
// to manually call this method when needed. | ||
func (ds *DeletableStore) SaveIndex() error { | ||
ds.lock.Lock() | ||
defer ds.lock.Unlock() | ||
return ds.saveIndex() | ||
} | ||
|
||
func (ds *DeletableStore) saveIndex() error { | ||
var manifests []ocispec.Descriptor | ||
tagged := set.New[digest.Digest]() | ||
refMap := ds.tagResolver.Map() | ||
|
||
// 1. Add descriptors that are associated with tags | ||
// Note: One descriptor can be associated with multiple tags. | ||
for ref, desc := range refMap { | ||
if ref != desc.Digest.String() { | ||
annotations := make(map[string]string, len(desc.Annotations)+1) | ||
for k, v := range desc.Annotations { | ||
annotations[k] = v | ||
} | ||
annotations[ocispec.AnnotationRefName] = ref | ||
desc.Annotations = annotations | ||
manifests = append(manifests, desc) | ||
// mark the digest as tagged for deduplication in step 2 | ||
tagged.Add(desc.Digest) | ||
} | ||
} | ||
// 2. Add descriptors that are not associated with any tag | ||
for ref, desc := range refMap { | ||
if ref == desc.Digest.String() && !tagged.Contains(desc.Digest) { | ||
// skip tagged ones since they have been added in step 1 | ||
manifests = append(manifests, deleteAnnotationRefName(desc)) | ||
} | ||
} | ||
|
||
ds.index.Manifests = manifests | ||
return ds.writeIndexFile() | ||
} | ||
|
||
// writeIndexFile writes the `index.json` file. | ||
func (ds *DeletableStore) writeIndexFile() error { | ||
indexJSON, err := json.Marshal(ds.index) | ||
if err != nil { | ||
return fmt.Errorf("failed to marshal index file: %w", err) | ||
} | ||
return os.WriteFile(ds.indexPath, indexJSON, 0666) | ||
} | ||
|
||
// loadIndexInDeletableMemory loads index into the memory. | ||
func loadIndexInDeletableMemory(ctx context.Context, index *ocispec.Index, fetcher content.Fetcher, tagger content.Tagger, graph *graph.DeletableMemory) error { | ||
for _, desc := range index.Manifests { | ||
if err := tagger.Tag(ctx, deleteAnnotationRefName(desc), desc.Digest.String()); err != nil { | ||
return err | ||
} | ||
if ref := desc.Annotations[ocispec.AnnotationRefName]; ref != "" { | ||
if err := tagger.Tag(ctx, desc, ref); err != nil { | ||
return err | ||
} | ||
} | ||
plain := descriptor.Plain(desc) | ||
if err := graph.IndexAll(ctx, fetcher, plain); err != nil { | ||
return err | ||
} | ||
} | ||
return nil | ||
} |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If we want to maintain
DeletableStore
separately, this function can be renamed tofunc (ds *DeletableStore) loadIndex
since it is only used byDeletableStore
.