restruct blobaccess (#804)

* auto update vendor hash

* separate internal and external usage

* fix blobaccess doc.go

* add Validate description

---------

Co-authored-by: ocmbot[bot] <125909804+ocmbot[bot]@users.noreply.github.com>

cmds/ocm/commands/common/options/formatoption/option.go

@@ -2,6 +2,7 @@ package formatoption
 
 import (
 	"fmt"
+	"sort"
 	"strings"
 
 	"github.com/mandelsoft/vfs/pkg/vfs"
@@ -11,7 +12,6 @@ import (
 	"github.com/open-component-model/ocm/pkg/common/accessio"
 	"github.com/open-component-model/ocm/pkg/common/accessobj"
 	"github.com/open-component-model/ocm/pkg/contexts/clictx"
-	"github.com/open-component-model/ocm/pkg/utils"
 )
 
 func From(o options.OptionSetProvider) *Option {
@@ -67,11 +67,11 @@ func (o *Option) Usage() string {
 The <code>--type</code> option accepts a file format for the
 target archive to use. The following formats are supported:
 `
-	list := utils.StringSlice{}
+	list := []string{}
 	for k := range accessobj.GetFormats() {
-		list.Add(k.String())
+		list = append(list, k.String())
 	}
-	list.Sort()
+	sort.Strings(list)
 	for _, k := range list {
 		s = s + "- " + k + "\n"
 	}

cmds/ocm/commands/ocicmds/tags/show/cmd.go

@@ -5,6 +5,7 @@ import (
 
 	"github.com/Masterminds/semver/v3"
 	"github.com/mandelsoft/goutils/errors"
+	"github.com/mandelsoft/goutils/sliceutils"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 
@@ -16,7 +17,6 @@ import (
 	"github.com/open-component-model/ocm/pkg/contexts/clictx"
 	"github.com/open-component-model/ocm/pkg/contexts/oci"
 	"github.com/open-component-model/ocm/pkg/out"
-	utils2 "github.com/open-component-model/ocm/pkg/utils"
 )
 
 var (
@@ -89,7 +89,7 @@ func (o *Command) Run() error {
 	}
 
 	versions := Versions{}
-	tags := utils2.StringSlice{}
+	tags := sliceutils.OrderedSlice[string]{}
 	repo := repooption.From(o)
 
 	var art oci.ArtifactAccess
@@ -127,7 +127,7 @@ func (o *Command) Run() error {
 	if err != nil {
 		return err
 	}
-	tags = utils2.StringSlice(list)
+	tags = sliceutils.OrderedSlice[string](list)
 	// determine version base set
 	if art != nil {
 		dig := art.Digest()
@@ -137,7 +137,7 @@ func (o *Command) Run() error {
 				return err
 			}
 			if a.Digest() != dig {
-				tags.Delete(i)
+				tags.DeleteIndex(i)
 				i--
 			} else {
 				v, err := semver.NewVersion(tags[i])

cmds/ocm/commands/ocmcmds/common/inputs/types/binary/spec.go

@@ -36,5 +36,5 @@ func (s *Spec) Validate(fldPath *field.Path, ctx inputs.Context, inputFilePath s
 }
 
 func (s *Spec) GetBlob(ctx inputs.Context, info inputs.InputResourceInfo) (blobaccess.BlobAccess, string, error) {
-	return s.ProcessBlob(ctx, blobaccess.DataAccessForBytes([]byte(s.Data)), ctx.FileSystem())
+	return s.ProcessBlob(ctx, blobaccess.DataAccessForData([]byte(s.Data)), ctx.FileSystem())
 }

cmds/ocm/commands/ocmcmds/common/inputs/types/directory/spec.go

@@ -64,7 +64,7 @@ func (s *Spec) GetBlob(ctx inputs.Context, info inputs.InputResourceInfo) (bloba
 		return nil, "", fmt.Errorf("resource type is dir but a file was provided")
 	}
 
-	access, err := dirtree.BlobAccessForDirTree(inputPath,
+	access, err := dirtree.BlobAccess(inputPath,
 		dirtree.WithMimeType(s.MediaType),
 		dirtree.WithFileSystem(fs),
 		dirtree.WithCompressWithGzip(s.Compress()),

cmds/ocm/commands/ocmcmds/common/inputs/types/docker/spec.go

@@ -47,7 +47,7 @@ func (s *Spec) GetBlob(ctx inputs.Context, info inputs.InputResourceInfo) (bloba
 	if err != nil {
 		return nil, "", err
 	}
-	blob, version, err := dockerdaemon.BlobAccessForImageFromDockerDaemon(s.Path, dockerdaemon.WithVersion(info.ComponentVersion.GetVersion()), dockerdaemon.WithOrigin(info.ComponentVersion))
+	blob, version, err := dockerdaemon.BlobAccess(s.Path, dockerdaemon.WithVersion(info.ComponentVersion.GetVersion()), dockerdaemon.WithOrigin(info.ComponentVersion))
 	if err != nil {
 		return nil, "", err
 	}

cmds/ocm/commands/ocmcmds/common/inputs/types/dockermulti/spec.go

@@ -4,7 +4,6 @@ import (
 	"fmt"
 
 	. "github.com/mandelsoft/goutils/finalizer"
-
 	"k8s.io/apimachinery/pkg/util/validation/field"
 
 	"github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs"
@@ -92,7 +91,7 @@ func (s *Spec) getVariant(ctx clictx.Context, finalize *Finalizer, variant strin
 }
 
 func (s *Spec) GetBlob(ctx inputs.Context, info inputs.InputResourceInfo) (blobaccess.BlobAccess, string, error) {
-	blob, err := dockermulti.BlobAccessForMultiImageFromDockerDaemon(
+	blob, err := dockermulti.BlobAccess(
 		dockermulti.WithContext(ctx),
 		dockermulti.WithPrinter(ctx.Printer()),
 		dockermulti.WithVariants(s.Variants...),

cmds/ocm/commands/ocmcmds/common/inputs/types/helm/spec.go

@@ -99,7 +99,7 @@ func (s *Spec) GetBlob(ctx inputs.Context, info inputs.InputResourceInfo) (blob
 		override = false
 	}
 
-	blob, name, vers, err := helm.BlobAccessForHelmChart(path,
+	blob, name, vers, err := helm.BlobAccess(path,
 		helm.WithContext(ctx),
 		helm.WithFileSystem(ctx.FileSystem()),
 		helm.WithPrinter(ctx.Printer()),

cmds/ocm/commands/ocmcmds/common/inputs/types/maven/spec.go

@@ -89,7 +89,7 @@ func (s *Spec) GetBlob(ctx inputs.Context, info inputs.InputResourceInfo) (bloba
 			return nil, "", err
 		}
 	}
-	access, err := mavenblob.BlobAccessForMavenCoords(repo, &s.Coordinates,
+	access, err := mavenblob.BlobAccessForCoords(repo, &s.Coordinates,
 		mavenblob.WithCredentialContext(ctx),
 		mavenblob.WithLoggingContext(ctx),
 		mavenblob.WithCachingFileSystem(vfsattr.Get(ctx)),

cmds/ocm/commands/ocmcmds/common/inputs/types/ociartifact/spec.go

@@ -8,7 +8,7 @@ import (
 	"github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs"
 	"github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/cpi"
 	"github.com/open-component-model/ocm/pkg/blobaccess"
-	ociartifact2 "github.com/open-component-model/ocm/pkg/blobaccess/ociartifact"
+	ociartifactblob "github.com/open-component-model/ocm/pkg/blobaccess/ociartifact"
 	"github.com/open-component-model/ocm/pkg/contexts/oci/grammar"
 	"github.com/open-component-model/ocm/pkg/contexts/oci/repositories/docker"
 	"github.com/open-component-model/ocm/pkg/contexts/oci/transfer/filters"
@@ -47,7 +47,7 @@ func (s *Spec) Validate(fldPath *field.Path, ctx inputs.Context, inputFilePath s
 	return allErrs
 }
 
-func (s *Spec) CreateFilter() ociartifact2.Option {
+func (s *Spec) CreateFilter() ociartifactblob.Option {
 	var filter []filters.Filter
 
 	for _, v := range s.Platforms {
@@ -57,18 +57,18 @@ func (s *Spec) CreateFilter() ociartifact2.Option {
 		}
 	}
 	if len(filter) > 0 {
-		return ociartifact2.WithFilter(filters.Or(filter...))
+		return ociartifactblob.WithFilter(filters.Or(filter...))
 	}
 	return nil
 }
 
 func (s *Spec) GetBlob(ctx inputs.Context, info inputs.InputResourceInfo) (blobaccess.BlobAccess, string, error) {
 	filter := s.CreateFilter()
-	blob, version, err := ociartifact2.BlobAccessForOCIArtifact(s.Path,
+	blob, version, err := ociartifactblob.BlobAccess(s.Path,
 		filter,
-		ociartifact2.WithContext(ctx),
-		ociartifact2.WithPrinter(ctx.Printer()),
-		ociartifact2.WithVersion(info.ComponentVersion.GetVersion()),
+		ociartifactblob.WithContext(ctx),
+		ociartifactblob.WithPrinter(ctx.Printer()),
+		ociartifactblob.WithVersion(info.ComponentVersion.GetVersion()),
 	)
 	if err != nil {
 		return nil, "", err

cmds/ocm/commands/ocmcmds/common/inputs/types/utf8/spec.go

@@ -121,7 +121,7 @@ func (s *Spec) GetBlob(ctx inputs.Context, info inputs.InputResourceInfo) (bloba
 	if err != nil {
 		return nil, "", err
 	}
-	return s.ProcessBlob(ctx, blobaccess.DataAccessForBytes(data), ctx.FileSystem())
+	return s.ProcessBlob(ctx, blobaccess.DataAccessForData(data), ctx.FileSystem())
 }
 
 func Prepare(raw []byte) (interface{}, error) {

cmds/ocm/commands/ocmcmds/common/inputs/types/wget/spec.go

@@ -55,7 +55,7 @@ func (s *Spec) Validate(fldPath *field.Path, ctx inputs.Context, inputFilePath s
 }
 
 func (s *Spec) GetBlob(ctx inputs.Context, info inputs.InputResourceInfo) (blobaccess.BlobAccess, string, error) {
-	access, err := wget.BlobAccessForWget(s.URL,
+	access, err := wget.BlobAccess(s.URL,
 		wget.WithCredentialContext(ctx),
 		wget.WithLoggingContext(ctx),
 		wget.WithMimeType(s.MimeType),

cmds/ocm/commands/ocmcmds/sources/add/cmd_test.go

@@ -9,8 +9,8 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	. "github.com/open-component-model/ocm/cmds/ocm/testhelper"
-
 	"github.com/open-component-model/ocm/pkg/blobaccess"
+
 	"github.com/open-component-model/ocm/pkg/common"
 	"github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/localblob"
 	"github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc"

cmds/ocm/commands/toicmds/package/bootstrap/cmd.go

@@ -200,7 +200,7 @@ func (o *Command) Complete(args []string) error {
 		if err != nil {
 			return errors.Wrapf(err, "failed reading credentials file %q", o.CredentialsFile)
 		}
-		o.Credentials = blobaccess.DataAccessForBytes(data, o.CredentialsFile)
+		o.Credentials = blobaccess.DataAccessForData(data, o.CredentialsFile)
 	}
 	if len(o.ParameterFile) == 0 {
 		if ok, _ := vfs.FileExists(o.FileSystem(), DEFAULT_PARAMETER_FILE); ok {
@@ -212,7 +212,7 @@ func (o *Command) Complete(args []string) error {
 		if err != nil {
 			return errors.Wrapf(err, "failed reading parameter file %q", o.ParameterFile)
 		}
-		o.Parameters = blobaccess.DataAccessForBytes(data, o.ParameterFile)
+		o.Parameters = blobaccess.DataAccessForData(data, o.ParameterFile)
 	}
 	return nil
 }

cmds/ocm/pkg/output/options.go

@@ -5,6 +5,7 @@ import (
 	"strings"
 
 	"github.com/mandelsoft/goutils/errors"
+	"github.com/mandelsoft/goutils/sliceutils"
 	"github.com/mandelsoft/logging"
 	"github.com/spf13/pflag"
 
@@ -143,7 +144,7 @@ func (o *Options) Configure(ctx clictx.Context) error {
 		o.Output = f(o)
 	}
 
-	var avail utils.StringSlice
+	var avail sliceutils.OrderedSlice[string]
 
 	var fields []string
 

examples/lib/creds.md

@@ -120,7 +120,7 @@ consumer ids always feature the attribute `type`, describing the kind of
 context.
 
 For example, to describe the request for credentials for
-an [OCI registry](../../pkg/contexts/oci/identity/identity.go) and repository,
+an [OCI registry](../../pkg/contexts/credentials/builtin/oci/identity/identity.go) and repository,
 the type value is `oci.CONSUMER_TYPE`. Additionally, the following
 attributes are used to fully describe the usage context.
 

examples/lib/ctf/example.go

@@ -6,8 +6,8 @@ import (
 	"github.com/mandelsoft/goutils/errors"
 	"github.com/mandelsoft/goutils/finalizer"
 	"github.com/mandelsoft/vfs/pkg/memoryfs"
-
 	"github.com/open-component-model/ocm/pkg/blobaccess"
+
 	"github.com/open-component-model/ocm/pkg/common/accessio"
 	"github.com/open-component-model/ocm/pkg/common/accessobj"
 	"github.com/open-component-model/ocm/pkg/contexts/ocm"

examples/lib/tour/02-composing-a-component-version/01-basic-componentversion-creation.go

@@ -6,8 +6,8 @@ import (
 
 	"github.com/mandelsoft/goutils/errors"
 	"github.com/mandelsoft/goutils/finalizer"
-
 	"github.com/open-component-model/ocm/pkg/blobaccess"
+
 	"github.com/open-component-model/ocm/pkg/common"
 	"github.com/open-component-model/ocm/pkg/contexts/ocm"
 	"github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/ociartifact"

examples/lib/tour/03-working-with-credentials/common.go

@@ -6,8 +6,8 @@ import (
 
 	"github.com/mandelsoft/goutils/errors"
 	"github.com/mandelsoft/goutils/finalizer"
-
 	"github.com/open-component-model/ocm/pkg/blobaccess"
+
 	"github.com/open-component-model/ocm/pkg/common"
 	"github.com/open-component-model/ocm/pkg/contexts/credentials"
 	"github.com/open-component-model/ocm/pkg/contexts/ocm"

examples/lib/tour/05-transporting-component-versions/common.go

@@ -6,8 +6,8 @@ import (
 
 	"github.com/mandelsoft/goutils/errors"
 	"github.com/mandelsoft/goutils/finalizer"
-
 	"github.com/open-component-model/ocm/pkg/blobaccess"
+
 	"github.com/open-component-model/ocm/pkg/common"
 	"github.com/open-component-model/ocm/pkg/contexts/ocm"
 	"github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/ociartifact"

examples/lib/tour/06-signing-component-versions/common.go

@@ -8,9 +8,9 @@ import (
 
 	"github.com/mandelsoft/goutils/errors"
 	"github.com/mandelsoft/goutils/finalizer"
+	"github.com/open-component-model/ocm/pkg/blobaccess"
 
 	"github.com/open-component-model/ocm/examples/lib/helper"
-	"github.com/open-component-model/ocm/pkg/blobaccess"
 	"github.com/open-component-model/ocm/pkg/common"
 	"github.com/open-component-model/ocm/pkg/contexts/ocm"
 	"github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/ociartifact"

examples/lib/transfer1/example.go

@@ -8,10 +8,10 @@ import (
 	"github.com/mandelsoft/goutils/finalizer"
 	"github.com/mandelsoft/vfs/pkg/osfs"
 	"github.com/mandelsoft/vfs/pkg/vfs"
+	"github.com/open-component-model/ocm/pkg/blobaccess"
 
 	"github.com/mandelsoft/goutils/errors"
 	"github.com/open-component-model/ocm/examples/lib/helper"
-	"github.com/open-component-model/ocm/pkg/blobaccess"
 	"github.com/open-component-model/ocm/pkg/common"
 	"github.com/open-component-model/ocm/pkg/common/accessio"
 	"github.com/open-component-model/ocm/pkg/common/accessobj"

pkg/blobaccess/blobaccess/access.go

@@ -0,0 +1,73 @@
+package blobaccess
+
+import (
+	"bytes"
+	"io"
+
+	"github.com/mandelsoft/filepath/pkg/filepath"
+	"github.com/opencontainers/go-digest"
+
+	"github.com/open-component-model/ocm/pkg/blobaccess/bpi"
+	"github.com/open-component-model/ocm/pkg/iotools"
+	mimetypes "github.com/open-component-model/ocm/pkg/mime"
+)
+
+type bytesAccess struct {
+	_nopCloser
+	data   []byte
+	origin string
+}
+
+func DataAccessForData(data []byte, origin ...string) bpi.DataSource {
+	path := ""
+	if len(origin) > 0 {
+		path = filepath.Join(origin...)
+	}
+	return &bytesAccess{data: data, origin: path}
+}
+
+func DataAccessForString(data string, origin ...string) bpi.DataSource {
+	return DataAccessForData([]byte(data), origin...)
+}
+
+func (a *bytesAccess) Get() ([]byte, error) {
+	return a.data, nil
+}
+
+func (a *bytesAccess) Reader() (io.ReadCloser, error) {
+	return iotools.ReadCloser(bytes.NewReader(a.data)), nil
+}
+
+func (a *bytesAccess) Origin() string {
+	return a.origin
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+// ForString wraps a string into a BlobAccess, which does not need a close.
+func ForString(mime string, data string) bpi.BlobAccess {
+	if mime == "" {
+		mime = mimetypes.MIME_TEXT
+	}
+	return ForData(mime, []byte(data))
+}
+
+func ProviderForString(mime, data string) bpi.BlobAccessProvider {
+	return bpi.BlobAccessProviderFunction(func() (bpi.BlobAccess, error) {
+		return ForString(mime, data), nil
+	})
+}
+
+// ForData wraps data into a BlobAccess, which does not need a close.
+func ForData(mime string, data []byte) bpi.BlobAccess {
+	if mime == "" {
+		mime = mimetypes.MIME_OCTET
+	}
+	return bpi.ForStaticDataAccessAndMeta(mime, DataAccessForData(data), digest.FromBytes(data), int64(len(data)))
+}
+
+func ProviderForData(mime string, data []byte) bpi.BlobAccessProvider {
+	return bpi.BlobAccessProviderFunction(func() (bpi.BlobAccess, error) {
+		return ForData(mime, data), nil
+	})
+}