adjusted according to review comments

Signed-off-by: Gergely Brautigam <182850+Skarlso@users.noreply.github.com>

Author: Skarlso

api/config/utils.go

@@ -38,8 +38,6 @@ type (
 	BlobAccess                       = internal.BlobAccess
 	DataAccess                       = internal.DataAccess
 	ConsumerIdentityProvider         = internal.ConsumerIdentityProvider
-
-	UniformRepositorySpecProvider = internal.UniformRepositorySpecProvider
 )
 
 func DefaultContext() internal.Context {

api/oci/interface.go

@@ -20,15 +20,11 @@ type IntermediateRepositorySpecAspect interface {
 	IsIntermediate() bool
 }
 
-type UniformRepositorySpecProvider interface {
-	UniformRepositorySpec() *UniformRepositorySpec
-}
-
 type RepositorySpec interface {
 	runtime.VersionedTypedObject
-	UniformRepositorySpecProvider
 
 	Name() string
+	UniformRepositorySpec() *UniformRepositorySpec
 	Repository(Context, credentials.Credentials) (Repository, error)
 
 	Validate(Context, credentials.Credentials, ...credentials.UsageContext) error

api/oci/internal/repotypes.go

@@ -84,12 +84,10 @@ func (a *AccessSpec) GetOCIReference(cv accspeccpi.ComponentVersionAccess) (stri
 	if o, ok := accspeccpi.GetAccessMethodImplementation(m).(ociartifact.OCIArtifactReferenceProvider); ok {
 		im, err := o.GetOCIReference(cv)
 		if err == nil {
-			if s, ok := cv.Repository().GetSpecification().(oci.UniformRepositorySpecProvider); ok {
-				host := s.UniformRepositorySpec().Host
-				// not supported for fake repos
-				if host != "" {
-					im = host + "/" + im
-				}
+			spec := cv.Repository().GetSpecification().AsUniformSpec(cv.GetContext())
+			// not supported for fake repos
+			if spec.Host != "" {
+				im = spec.Host + "/" + im
 			}
 		}
 		return im, err

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

@@ -8,8 +8,8 @@ import (
 )
 
 const (
-	ATTR_KEY   = "github.com/mandelsoft/ocm/preferrelativeaccess"
 	ATTR_SHORT = "preferrelativeaccess"
+	ATTR_KEY   = "ocm.software/ocm/oci/" + ATTR_SHORT
 )
 
 func init() {

api/ocm/extensions/attrs/preferrelativeattr/attr.go

@@ -11,7 +11,7 @@ import (
 	"github.com/mandelsoft/goutils/sliceutils"
 	"github.com/opencontainers/go-digest"
 
-	cfgctx "ocm.software/ocm/api/config"
+	cfgcpi "ocm.software/ocm/api/config/cpi"
 	"ocm.software/ocm/api/oci"
 	"ocm.software/ocm/api/oci/artdesc"
 	"ocm.software/ocm/api/oci/extensions/repositories/artifactset"
@@ -230,10 +230,11 @@ func (b *artifactHandler) StoreBlob(blob cpi.BlobAccess, artType, hint string, g
 
 	keep := keepblobattr.Get(ctx.GetContext())
 
-	opts, _ := cfgctx.GetConfigured[config.UploadOptions](ctx.GetContext())
-	if opts == nil {
-		opts = &config.UploadOptions{}
+	opts := &config.UploadOptions{}
+	if err := cfgcpi.NewUpdater(ctx.GetContext().ConfigContext(), opts).Update(); err != nil {
+		return nil, err
 	}
+
 	// this attribute (only if set) overrides the enabling set in the
 	// config.
 	preferrelativeattr.ApplyTo(ctx.GetContext(), &opts.PreferRelativeAccess)

api/ocm/extensions/blobhandler/handlers/oci/ocirepo/blobhandler.go

@@ -8,7 +8,7 @@ import (
 )
 
 const (
-	ConfigType   = "local.oci.uploader" + cfgcpi.OCM_CONFIG_TYPE_SUFFIX
+	ConfigType   = "oci.uploader" + cfgcpi.OCM_CONFIG_TYPE_SUFFIX
 	ConfigTypeV1 = ConfigType + runtime.VersionSeparator + "v1"
 )
 

api/ocm/extensions/blobhandler/handlers/oci/ocirepo/config/type.go

@@ -238,12 +238,6 @@ The value can be a simple type or a JSON/YAML string for complex values
 
   Directory to look for OCM plugin executables.
 
-- <code>github.com/mandelsoft/ocm/preferrelativeaccess</code> [<code>preferrelativeaccess</code>]: *bool*
-
-  If an artifact blob is uploaded to the technical repository
-  used as OCM repository, the uploader should prefer to return
-  a relative access method.
-
 - <code>github.com/mandelsoft/ocm/rootcerts</code> [<code>rootcerts</code>]: *JSON*
 
   General root certificate settings given as JSON document with the following
@@ -312,6 +306,12 @@ The value can be a simple type or a JSON/YAML string for complex values
   the backend and descriptor updated will be persisted on AddVersion
   or closing a provided existing component version.
 
+- <code>ocm.software/ocm/oci/preferrelativeaccess</code> [<code>preferrelativeaccess</code>]: *bool*
+
+  If an artifact blob is uploaded to the technical repository
+  used as OCM repository, the uploader should prefer to return
+  a relative access method.
+
 - <code>ocm.software/signing/sigstore</code> [<code>sigstore</code>]: *sigstore config* Configuration to use for sigstore based signing.
 
   The following fields are used.

docs/reference/ocm.md

@@ -130,12 +130,6 @@ OCM library:
 
   Directory to look for OCM plugin executables.
 
-- <code>github.com/mandelsoft/ocm/preferrelativeaccess</code> [<code>preferrelativeaccess</code>]: *bool*
-
-  If an artifact blob is uploaded to the technical repository
-  used as OCM repository, the uploader should prefer to return
-  a relative access method.
-
 - <code>github.com/mandelsoft/ocm/rootcerts</code> [<code>rootcerts</code>]: *JSON*
 
   General root certificate settings given as JSON document with the following
@@ -204,6 +198,12 @@ OCM library:
   the backend and descriptor updated will be persisted on AddVersion
   or closing a provided existing component version.
 
+- <code>ocm.software/ocm/oci/preferrelativeaccess</code> [<code>preferrelativeaccess</code>]: *bool*
+
+  If an artifact blob is uploaded to the technical repository
+  used as OCM repository, the uploader should prefer to return
+  a relative access method.
+
 - <code>ocm.software/signing/sigstore</code> [<code>sigstore</code>]: *sigstore config* Configuration to use for sigstore based signing.
 
   The following fields are used.

docs/reference/ocm_attributes.md

@@ -168,27 +168,6 @@ The following configuration types are supported:
 
   At least the given values must be present in the certificate
   to be accepted for a successful signature validation.
-- <code>local.oci.uploader.config.ocm.software</code>
-  The config type <code>local.oci.uploader.config.ocm.software</code> can be used to set some
-  configurations for the implicit OCI artifact upload for OCI based OCM repositories.
-
-  <pre>
-      type: local.oci.uploader.config.ocm.software
-      preferRelativeAccess: true # use relative access methods for given target repositories.
-      repositories:
-  	- localhost:5000
-  </pre>
-
-  If <code>preferRelativeAccess</code> is set to <code>true</code> the
-  OCI uploader for OCI based OCM repositories does not use the
-  OCI repository to create absolute OCI access methods
-  if the target repository is in the <code>repositories</code> list.
-  Instead, a relative  <code>relativeOciReference</code> access method
-  is created.
-  If this list is empty, all uploads are handled this way.
-
-  If the global attribute <code>preferrelativeaccess</code>
-  is configured, it overrides the <code>preferRelativeAccess</code> setting.
 - <code>logging.config.ocm.software</code>
   The config type <code>logging.config.ocm.software</code> can be used to configure the logging
   aspect of a dedicated context type:
@@ -254,6 +233,27 @@ The following configuration types are supported:
          &lt;name>: &lt;OCI registry specification>
          ...
   </pre>
+- <code>oci.uploader.config.ocm.software</code>
+  The config type <code>oci.uploader.config.ocm.software</code> can be used to set some
+  configurations for the implicit OCI artifact upload for OCI based OCM repositories.
+
+  <pre>
+      type: oci.uploader.config.ocm.software
+      preferRelativeAccess: true # use relative access methods for given target repositories.
+      repositories:
+  	- localhost:5000
+  </pre>
+
+  If <code>preferRelativeAccess</code> is set to <code>true</code> the
+  OCI uploader for OCI based OCM repositories does not use the
+  OCI repository to create absolute OCI access methods
+  if the target repository is in the <code>repositories</code> list.
+  Instead, a relative  <code>relativeOciReference</code> access method
+  is created.
+  If this list is empty, all uploads are handled this way.
+
+  If the global attribute <code>preferrelativeaccess</code>
+  is configured, it overrides the <code>preferRelativeAccess</code> setting.
 - <code>ocm.cmd.config.ocm.software</code>
   The config type <code>ocm.cmd.config.ocm.software</code> can be used to
   configure predefined aliases for dedicated OCM repositories and