adapt plugin interface

Author: mandelsoft

api/ocm/plugin/ppi/cmds/upload/put/cmd.go

@@ -9,6 +9,7 @@ import (
 	"github.com/mandelsoft/goutils/errors"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
+	"ocm.software/ocm/api/ocm/refhints"
 
 	"ocm.software/ocm/api/credentials"
 	"ocm.software/ocm/api/ocm/plugin/descriptor"
@@ -59,22 +60,25 @@ type Options struct {
 	MediaType    string
 	ArtifactType string
 
-	Hint string
+	hint string
+
+	Hints ppi.ReferenceHints
 }
 
 func (o *Options) AddFlags(fs *pflag.FlagSet) {
 	flag.YAMLVarP(fs, &o.Credentials, OptCreds, "c", nil, "credentials")
 	flag.StringToStringVarPF(fs, &o.Credentials, "credential", "C", nil, "dedicated credential value")
 	fs.StringVarP(&o.MediaType, OptMedia, "m", "", "media type of input blob")
 	fs.StringVarP(&o.ArtifactType, OptArt, "a", "", "artifact type of input blob")
-	fs.StringVarP(&o.Hint, OptHint, "H", "", "reference hint for storing blob")
+	fs.StringVarP(&o.hint, OptHint, "H", "", "reference hint for storing blob")
 }
 
 func (o *Options) Complete(args []string) error {
 	o.Name = args[0]
 	if err := runtime.DefaultYAMLEncoding.Unmarshal([]byte(args[1]), &o.Specification); err != nil {
 		return errors.Wrapf(err, "invalid repository specification")
 	}
+	o.Hints = refhints.ParseHints(o.hint)
 	return nil
 }
 
@@ -88,7 +92,7 @@ func Command(p ppi.Plugin, cmd *cobra.Command, opts *Options) error {
 	if u == nil {
 		return errors.ErrNotFound(descriptor.KIND_UPLOADER, fmt.Sprintf("%s:%s", opts.ArtifactType, opts.MediaType))
 	}
-	w, h, err := u.Writer(p, opts.ArtifactType, opts.MediaType, opts.Hint, spec, opts.Credentials)
+	w, h, err := u.Writer(p, opts.ArtifactType, opts.MediaType, opts.Hints, spec, opts.Credentials)
 	if err != nil {
 		return err
 	}

api/ocm/plugin/ppi/interface.go

@@ -5,6 +5,7 @@ import (
 	"io"
 
 	"github.com/spf13/cobra"
+	"ocm.software/ocm/api/ocm/refhints"
 
 	"ocm.software/ocm/api/config/cpi"
 	"ocm.software/ocm/api/credentials"
@@ -106,14 +107,18 @@ type AccessSpecProvider func() AccessSpec
 
 type UploadFormats runtime.KnownTypes[runtime.TypedObject, runtime.TypedObjectDecoder[runtime.TypedObject]]
 
+type ReferenceHints = refhints.ReferenceHints
+
+type ReferenceHint = refhints.ReferenceHint
+
 type Uploader interface {
 	Decoders() UploadFormats
 
 	Name() string
 	Description() string
 
 	ValidateSpecification(p Plugin, spec UploadTargetSpec) (info *UploadTargetSpecInfo, err error)
-	Writer(p Plugin, arttype, mediatype string, hint string, spec UploadTargetSpec, creds credentials.Credentials) (io.WriteCloser, AccessSpecProvider, error)
+	Writer(p Plugin, arttype, mediatype string, hints ReferenceHints, spec UploadTargetSpec, creds credentials.Credentials) (io.WriteCloser, AccessSpecProvider, error)
 }
 
 type UploadTargetSpec = runtime.TypedObject

cmds/demoplugin/accessmethods/demo.go

@@ -8,6 +8,7 @@ import (
 
 	"github.com/mandelsoft/filepath/pkg/filepath"
 	"github.com/mandelsoft/goutils/errors"
+	"ocm.software/ocm/api/ocm/refhints"
 
 	"ocm.software/ocm/api/credentials"
 	"ocm.software/ocm/api/credentials/cpi"
@@ -25,6 +26,8 @@ const (
 	VERSION = "v1"
 )
 
+const ReferenceHintType = "demo"
+
 type AccessSpec struct {
 	runtime.ObjectVersionedType `json:",inline"`
 
@@ -86,7 +89,7 @@ func (a *AccessMethod) ValidateSpecification(p ppi.Plugin, spec ppi.AccessSpec)
 		identity.ID_PATHPREFIX: my.Path,
 	}
 	info.Short = "temp file " + my.Path
-	info.Hint = "temp file " + my.Path
+	info.Hint = refhints.New(ReferenceHintType, my.Path).Serialize()
 	return &info, nil
 }
 

cmds/demoplugin/uploaders/demo.go

@@ -72,7 +72,7 @@ func (a *Uploader) ValidateSpecification(p ppi.Plugin, spec ppi.UploadTargetSpec
 	return &info, nil
 }
 
-func (a *Uploader) Writer(p ppi.Plugin, arttype, mediatype, hint string, repo ppi.UploadTargetSpec, creds credentials.Credentials) (io.WriteCloser, ppi.AccessSpecProvider, error) {
+func (a *Uploader) Writer(p ppi.Plugin, arttype, mediatype string, hints ppi.ReferenceHints, repo ppi.UploadTargetSpec, creds credentials.Credentials) (io.WriteCloser, ppi.AccessSpecProvider, error) {
 	var file *os.File
 	var err error
 
@@ -90,6 +90,12 @@ func (a *Uploader) Writer(p ppi.Plugin, arttype, mediatype, hint string, repo pp
 		}
 	}
 
+	h := hints.GetReferenceHint(accessmethods.ReferenceHintType, "")
+	var hint string
+	if h != nil {
+		hint = h.GetReference()
+	}
+
 	path := hint
 	my := repo.(*TargetSpec)
 	dir := root