diff --git a/content/oci/oci.go b/content/oci/oci.go index 4c25af80..748aeecc 100644 --- a/content/oci/oci.go +++ b/content/oci/oci.go @@ -334,7 +334,7 @@ func (s *Store) Tags(ctx context.Context, last string, fn func(tags []string) er s.sync.RLock() defer s.sync.RUnlock() - return listTags(ctx, s.tagResolver, last, fn) + return listTags(s.tagResolver, last, fn) } // ensureOCILayoutFile ensures the `oci-layout` file. diff --git a/content/oci/readonlyoci.go b/content/oci/readonlyoci.go index 2f390bb3..3f1ee4ee 100644 --- a/content/oci/readonlyoci.go +++ b/content/oci/readonlyoci.go @@ -22,7 +22,7 @@ import ( "fmt" "io" "io/fs" - "sort" + "slices" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" @@ -125,7 +125,7 @@ func (s *ReadOnlyStore) Predecessors(ctx context.Context, node ocispec.Descripto // // See also `Tags()` in the package `registry`. func (s *ReadOnlyStore) Tags(ctx context.Context, last string, fn func(tags []string) error) error { - return listTags(ctx, s.tagResolver, last, fn) + return listTags(s.tagResolver, last, fn) } // validateOCILayoutFile validates the `oci-layout` file. @@ -216,7 +216,7 @@ func resolveBlob(fsys fs.FS, dgst string) (ocispec.Descriptor, error) { // list. // // See also `Tags()` in the package `registry`. -func listTags(ctx context.Context, tagResolver *resolver.Memory, last string, fn func(tags []string) error) error { +func listTags(tagResolver *resolver.Memory, last string, fn func(tags []string) error) error { var tags []string tagMap := tagResolver.Map() @@ -229,7 +229,7 @@ func listTags(ctx context.Context, tagResolver *resolver.Memory, last string, fn } tags = append(tags, tag) } - sort.Strings(tags) + slices.Sort(tags) return fn(tags) } diff --git a/registry/remote/auth/scope.go b/registry/remote/auth/scope.go index adf79791..d81cc0d4 100644 --- a/registry/remote/auth/scope.go +++ b/registry/remote/auth/scope.go @@ -18,7 +18,6 @@ package auth import ( "context" "slices" - "sort" "strings" "oras.land/oras-go/v2/registry" @@ -276,14 +275,14 @@ func CleanScopes(scopes []string) []string { } actions = append(actions, action) } - sort.Strings(actions) + slices.Sort(actions) scope := resourceType + ":" + resourceName + ":" + strings.Join(actions, ",") result = append(result, scope) } } // sort and return - sort.Strings(result) + slices.Sort(result) return result } @@ -302,7 +301,7 @@ func cleanActions(actions []string) []string { } // slow path - sort.Strings(actions) + slices.Sort(actions) n := 0 for i := 0; i < len(actions); i++ { if actions[i] == "*" {