feat: Extend plugin API to support transfer handlers

.github/config/wordlist.txt

@@ -281,6 +281,7 @@ toi
 toiexecutor
 toolset
 transportarchive
+transferhandler
 typehandler
 typename
 unmarshaller

api/oci/utils.go

@@ -19,18 +19,22 @@ func AsTags(tag string) []string {
 }
 
 func StandardOCIRef(host, repository, version string) string {
+	return fmt.Sprintf("%s%s%s", host, grammar.RepositorySeparator, RelativeOCIRef(repository, version))
+}
+
+func RelativeOCIRef(repository, version string) string {
 	sep := grammar.TagSeparator
 	i := strings.Index(version, grammar.DigestSeparator)
 	if i > 1 {
-		return fmt.Sprintf("%s%s%s%s%s", host, grammar.RepositorySeparator, repository, sep, version)
+		return fmt.Sprintf("%s%s%s", repository, sep, version)
 	}
 	if ok, _ := artdesc.IsDigest(version); ok {
 		sep = grammar.DigestSeparator
 		if strings.HasPrefix(version, sep) {
 			sep = ""
 		}
 	}
-	return fmt.Sprintf("%s%s%s%s%s", host, grammar.RepositorySeparator, repository, sep, version)
+	return fmt.Sprintf("%s%s%s", repository, sep, version)
 }
 
 func IsIntermediate(spec RepositorySpec) bool {

api/ocm/cpi/accspeccpi/interface.go

@@ -11,10 +11,11 @@ type (
 
 	AccessType = internal.AccessType
 
-	AccessMethodImpl = internal.AccessMethodImpl
-	AccessMethod     = internal.AccessMethod
-	AccessSpec       = internal.AccessSpec
-	AccessSpecRef    = internal.AccessSpecRef
+	AccessMethodImpl      = internal.AccessMethodImpl
+	AccessMethod          = internal.AccessMethod
+	UniformAccessSpecInfo = internal.UniformAccessSpecInfo
+	AccessSpec            = internal.AccessSpec
+	AccessSpecRef         = internal.AccessSpecRef
 
 	HintProvider            = internal.HintProvider
 	GlobalAccessProvider    = internal.GlobalAccessProvider

api/ocm/cpi/interface.go

@@ -50,6 +50,7 @@ type (
 	ComponentLister                  = internal.ComponentLister
 	ComponentAccess                  = internal.ComponentAccess
 	ComponentVersionAccess           = internal.ComponentVersionAccess
+	UniformAccessSpecInfo            = internal.UniformAccessSpecInfo
 	AccessSpec                       = internal.AccessSpec
 	AccessSpecDecoder                = internal.AccessSpecDecoder
 	GenericAccessSpec                = internal.GenericAccessSpec
@@ -183,6 +184,8 @@ func ToGenericRepositorySpec(spec RepositorySpec) (*GenericRepositorySpec, error
 
 type AccessSpecRef = internal.AccessSpecRef
 
+var _ AccessSpec = &AccessSpecRef{}
+
 func NewAccessSpecRef(spec AccessSpec) *AccessSpecRef {
 	return internal.NewAccessSpecRef(spec)
 }

api/ocm/extensions/accessmethods/compose/method.go

@@ -68,6 +68,12 @@ func (a *AccessSpec) Describe(ctx accspeccpi.Context) string {
 	return fmt.Sprintf("Composition blob %s", a.Id)
 }
 
+func (a *AccessSpec) Info(ctx accspeccpi.Context) *accspeccpi.UniformAccessSpecInfo {
+	return &accspeccpi.UniformAccessSpecInfo{
+		Kind: Type,
+	}
+}
+
 func (_ *AccessSpec) IsLocal(accspeccpi.Context) bool {
 	return true
 }

api/ocm/extensions/accessmethods/github/method.go

@@ -105,6 +105,20 @@ func (a *AccessSpec) Describe(ctx accspeccpi.Context) string {
 	return fmt.Sprintf("GitHub commit %s[%s]", a.RepoURL, a.Commit)
 }
 
+func (a *AccessSpec) Info(ctx accspeccpi.Context) *accspeccpi.UniformAccessSpecInfo {
+	u, err := url.Parse(a.RepoURL)
+	if err != nil {
+		u = &url.URL{}
+	}
+	return &accspeccpi.UniformAccessSpecInfo{
+		Kind: Type,
+		Host: u.Hostname(),
+		Port: u.Port(),
+		Path: u.Path,
+		Info: a.Commit,
+	}
+}
+
 func (_ *AccessSpec) IsLocal(accspeccpi.Context) bool {
 	return false
 }

api/ocm/extensions/accessmethods/helm/method.go

@@ -3,6 +3,7 @@ package helm
 import (
 	"fmt"
 	"io"
+	"net/url"
 	"strings"
 	"sync"
 
@@ -63,6 +64,20 @@ func (a *AccessSpec) Describe(ctx accspeccpi.Context) string {
 	return fmt.Sprintf("Helm chart %s:%s in repository %s", a.GetChartName(), a.GetVersion(), a.HelmRepository)
 }
 
+func (a *AccessSpec) Info(ctx accspeccpi.Context) *accspeccpi.UniformAccessSpecInfo {
+	u, err := url.Parse(a.HelmRepository)
+	if err != nil {
+		u = &url.URL{}
+	}
+	return &accspeccpi.UniformAccessSpecInfo{
+		Kind: Type,
+		Host: u.Hostname(),
+		Port: u.Port(),
+		Path: u.Path,
+		Info: a.HelmChart,
+	}
+}
+
 func (a *AccessSpec) IsLocal(ctx accspeccpi.Context) bool {
 	return false
 }

api/ocm/extensions/accessmethods/localblob/method.go

@@ -115,6 +115,13 @@ func (a *AccessSpec) Describe(ctx accspeccpi.Context) string {
 	return fmt.Sprintf("Local blob %s[%s]", a.LocalReference, a.ReferenceName)
 }
 
+func (a *AccessSpec) Info(ctx accspeccpi.Context) *accspeccpi.UniformAccessSpecInfo {
+	return &accspeccpi.UniformAccessSpecInfo{
+		Kind: Type,
+		Info: a.LocalReference,
+	}
+}
+
 func (a *AccessSpec) IsLocal(accspeccpi.Context) bool {
 	return true
 }

api/ocm/extensions/accessmethods/maven/method.go

@@ -2,6 +2,7 @@ package maven
 
 import (
 	"fmt"
+	"net/url"
 
 	"github.com/mandelsoft/goutils/optionutils"
 
@@ -78,6 +79,20 @@ func (a *AccessSpec) Describe(_ accspeccpi.Context) string {
 	return fmt.Sprintf("Maven package '%s' in repository '%s' path '%s'", a.Coordinates.String(), a.RepoUrl, a.Coordinates.FilePath())
 }
 
+func (a *AccessSpec) Info(ctx accspeccpi.Context) *accspeccpi.UniformAccessSpecInfo {
+	u, err := url.Parse(a.RepoUrl)
+	if err != nil {
+		u = &url.URL{}
+	}
+	return &accspeccpi.UniformAccessSpecInfo{
+		Kind: Type,
+		Host: u.Hostname(),
+		Port: u.Port(),
+		Path: u.Path,
+		Info: a.Coordinates.String(),
+	}
+}
+
 func (_ *AccessSpec) IsLocal(accspeccpi.Context) bool {
 	return false
 }

api/ocm/extensions/accessmethods/none/method.go

@@ -43,6 +43,12 @@ func (a *AccessSpec) Describe(ctx accspeccpi.Context) string {
 	return "none"
 }
 
+func (a *AccessSpec) Info(ctx accspeccpi.Context) *accspeccpi.UniformAccessSpecInfo {
+	return &accspeccpi.UniformAccessSpecInfo{
+		Kind: Type,
+	}
+}
+
 func (s *AccessSpec) IsLocal(context accspeccpi.Context) bool {
 	return false
 }

api/ocm/extensions/accessmethods/npm/method.go

@@ -2,6 +2,7 @@ package npm
 
 import (
 	"fmt"
+	"net/url"
 
 	"ocm.software/ocm/api/ocm/cpi/accspeccpi"
 	"ocm.software/ocm/api/utils/blobaccess/blobaccess"
@@ -49,6 +50,20 @@ func (a *AccessSpec) Describe(_ accspeccpi.Context) string {
 	return fmt.Sprintf("NPM package %s:%s in registry %s", a.Package, a.Version, a.Registry)
 }
 
+func (a *AccessSpec) Info(ctx accspeccpi.Context) *accspeccpi.UniformAccessSpecInfo {
+	u, err := url.Parse(a.Registry)
+	if err != nil {
+		u = &url.URL{}
+	}
+	return &accspeccpi.UniformAccessSpecInfo{
+		Kind: Type,
+		Host: u.Hostname(),
+		Port: u.Port(),
+		Path: u.Path,
+		Info: a.GetReferenceHint(nil),
+	}
+}
+
 func (_ *AccessSpec) IsLocal(accspeccpi.Context) bool {
 	return false
 }

api/ocm/extensions/accessmethods/ociartifact/method.go

@@ -75,6 +75,25 @@ func (a *AccessSpec) Describe(ctx accspeccpi.Context) string {
 	return fmt.Sprintf("OCI artifact %s", a.ImageReference)
 }
 
+func (a *AccessSpec) Info(ctx accspeccpi.Context) *accspeccpi.UniformAccessSpecInfo {
+	ref, _ := oci.ParseRef(a.ImageReference)
+	host, port := ref.HostPort()
+
+	r := ref.Repository
+	if ref.Tag != nil {
+		r += ":" + *ref.Tag
+	}
+	if ref.Digest != nil {
+		r += "@" + ref.Digest.String()
+	}
+	return &accspeccpi.UniformAccessSpecInfo{
+		Kind: Type,
+		Host: host,
+		Port: port,
+		Info: r,
+	}
+}
+
 func (_ *AccessSpec) IsLocal(accspeccpi.Context) bool {
 	return false
 }

api/ocm/extensions/accessmethods/ociblob/method.go

@@ -3,6 +3,7 @@ package ociblob
 import (
 	"fmt"
 	"io"
+	"strings"
 	"sync"
 
 	"github.com/mandelsoft/goutils/errors"
@@ -62,6 +63,22 @@ func (a *AccessSpec) Describe(ctx accspeccpi.Context) string {
 	return fmt.Sprintf("OCI blob %s in repository %s", a.Digest, a.Reference)
 }
 
+func (a *AccessSpec) Info(ctx accspeccpi.Context) *accspeccpi.UniformAccessSpecInfo {
+	segs := strings.Split(a.Reference, "/")
+	comps := strings.Split(segs[0], ":")
+	port := ""
+	if len(comps) > 1 {
+		port = comps[1]
+	}
+	return &accspeccpi.UniformAccessSpecInfo{
+		Kind: Type,
+		Host: comps[0],
+		Port: port,
+		Path: strings.Join(segs[1:], "/"),
+		Info: a.Digest.String(),
+	}
+}
+
 func (s *AccessSpec) IsLocal(context accspeccpi.Context) bool {
 	return false
 }

api/ocm/extensions/accessmethods/ocm/method.go

@@ -77,6 +77,21 @@ func (a *AccessSpec) Describe(ctx accspeccpi.Context) string {
 	return fmt.Sprintf("OCM resource %s%s", a.ResourceRef.String(), comp)
 }
 
+func (a *AccessSpec) Info(ctx accspeccpi.Context) *accspeccpi.UniformAccessSpecInfo {
+	ref := a.OCMRepository.AsUniformSpec(ctx)
+	if ref == nil {
+		return &accspeccpi.UniformAccessSpecInfo{Kind: Type}
+	}
+	host, port := ref.HostPort()
+	return &accspeccpi.UniformAccessSpecInfo{
+		Kind: Type,
+		Host: host,
+		Port: port,
+		Path: ref.SubPath,
+		Info: ref.Info,
+	}
+}
+
 func (a *AccessSpec) IsLocal(ctx accspeccpi.Context) bool {
 	return false
 }

api/ocm/extensions/accessmethods/plugin/method.go

@@ -36,6 +36,10 @@ func (s *AccessSpec) Describe(ctx cpi.Context) string {
 	return s.handler.Describe(s, ctx)
 }
 
+func (s *AccessSpec) Info(ctx cpi.Context) *cpi.UniformAccessSpecInfo {
+	return s.handler.Info(s, ctx)
+}
+
 func (_ *AccessSpec) IsLocal(cpi.Context) bool {
 	return false
 }

api/ocm/extensions/accessmethods/plugin/plugin.go

@@ -33,7 +33,7 @@ func NewPluginHandler(p plugin.Plugin) *PluginHandler {
 	return &PluginHandler{plug: p}
 }
 
-func (p *PluginHandler) Info(spec *AccessSpec) (*ppi.AccessSpecInfo, error) {
+func (p *PluginHandler) GetAccessSpecInfo(spec *AccessSpec) (*ppi.AccessSpecInfo, error) {
 	if p.info != nil || p.err != nil {
 		raw, err := spec.UnstructuredVersionedTypedObject.GetRaw()
 		if err != nil {
@@ -58,15 +58,15 @@ func (p *PluginHandler) AccessMethod(spec *AccessSpec, cv cpi.ComponentVersionAc
 		return nil, err
 	}
 
-	info, err := p.Info(spec)
+	info, err := p.GetAccessSpecInfo(spec)
 	if err != nil {
 		return nil, err
 	}
 	return accspeccpi.AccessMethodForImplementation(newMethod(p, spec, cv.GetContext(), info, creddata), nil)
 }
 
 func (p *PluginHandler) getCredentialData(spec *AccessSpec, cv cpi.ComponentVersionAccess) (json.RawMessage, error) {
-	info, err := p.Info(spec)
+	info, err := p.GetAccessSpecInfo(spec)
 	if err != nil {
 		return nil, err
 	}
@@ -94,19 +94,41 @@ func (p *PluginHandler) Describe(spec *AccessSpec, ctx cpi.Context) string {
 	if mspec == nil {
 		return "unknown type " + spec.GetType()
 	}
-	info, err := p.Info(spec)
+	info, err := p.GetAccessSpecInfo(spec)
 	if err != nil {
 		return err.Error()
 	}
 	return info.Short
 }
 
+func (p *PluginHandler) Info(spec *AccessSpec, ctx cpi.Context) *cpi.UniformAccessSpecInfo {
+	mspec := p.GetAccessMethodDescriptor(spec.GetKind(), spec.GetVersion())
+	if mspec == nil {
+		return &cpi.UniformAccessSpecInfo{
+			Kind: spec.GetKind(),
+		}
+	}
+	info, err := p.GetAccessSpecInfo(spec)
+	if err != nil || info.Info == nil {
+		return &cpi.UniformAccessSpecInfo{
+			Kind: spec.GetKind(),
+		}
+	}
+	return &cpi.UniformAccessSpecInfo{
+		Kind: spec.GetKind(),
+		Host: info.Info.Host,
+		Port: info.Info.Port,
+		Path: info.Info.Path,
+		Info: info.Info.Info,
+	}
+}
+
 func (p *PluginHandler) GetMimeType(spec *AccessSpec) string {
 	mspec := p.GetAccessMethodDescriptor(spec.GetKind(), spec.GetVersion())
 	if mspec == nil {
 		return "unknown type " + spec.GetType()
 	}
-	info, err := p.Info(spec)
+	info, err := p.GetAccessSpecInfo(spec)
 	if err != nil {
 		return ""
 	}
@@ -118,7 +140,7 @@ func (p *PluginHandler) GetReferenceHint(spec *AccessSpec, cv cpi.ComponentVersi
 	if mspec == nil {
 		return "unknown type " + spec.GetType()
 	}
-	info, err := p.Info(spec)
+	info, err := p.GetAccessSpecInfo(spec)
 	if err != nil {
 		return ""
 	}

api/ocm/extensions/accessmethods/relativeociref/method.go

@@ -44,6 +44,13 @@ func (a *AccessSpec) Describe(context accspeccpi.Context) string {
 	return fmt.Sprintf("local OCI artifact %s", a.Reference)
 }
 
+func (a *AccessSpec) Info(ctx accspeccpi.Context) *accspeccpi.UniformAccessSpecInfo {
+	return &accspeccpi.UniformAccessSpecInfo{
+		Kind: Type,
+		Info: a.Reference,
+	}
+}
+
 func (a *AccessSpec) IsLocal(context accspeccpi.Context) bool {
 	return true
 }