rename to DisableExtraIdentityDefaulting

api/ocm/cpi/modopts.go

@@ -35,8 +35,8 @@ func NewTargetElementOptions(list ...TargetElementOption) *TargetElementOptions
 	return &m
 }
 
-func RawIdentity(flag ...bool) internal.TargetOptionImpl {
-	return internal.RawIdentity(flag...)
+func DisableExtraIdentityDefaulting(flag ...bool) internal.TargetOptionImpl {
+	return internal.DisableExtraIdentityDefaulting(flag...)
 }
 
 ////////////////////////////////////////////////////////////////////////////////

api/ocm/cpi/repocpi/view_cv.go

@@ -468,7 +468,7 @@ func (c *componentVersionAccessView) SetResource(meta *cpi.ResourceMeta, acc com
 		} else {
 			cd.Resources[idx] = *res
 		}
-		if opts.IsModifyElement() && !opts.IsRawIdentity() {
+		if opts.IsModifyElement() && !opts.IsDisableExtraIdentityDefaulting() {
 			// default handling for completing an extra identity for modifications, only.
 			compdesc.DefaultResources(cd)
 		}
@@ -549,7 +549,7 @@ func (c *componentVersionAccessView) SetSource(meta *cpi.SourceMeta, acc compdes
 		} else {
 			cd.Sources[idx] = *res
 		}
-		if !opts.IsRawIdentity() {
+		if !opts.IsDisableExtraIdentityDefaulting() {
 			compdesc.DefaultSources(cd)
 		}
 		return c.bridge.Update(false)
@@ -587,7 +587,7 @@ func (c *componentVersionAccessView) SetReference(ref *cpi.ComponentReference, o
 			cd.References[idx].Equivalent(ref)
 			cd.References[idx] = *ref
 		}
-		if opts.IsModifyElement(moddef) && !opts.IsRawIdentity() {
+		if opts.IsModifyElement(moddef) && !opts.IsDisableExtraIdentityDefaulting() {
 			compdesc.DefaultReferences(cd)
 		}
 		return c.bridge.Update(false)

api/ocm/internal/modopts.go

@@ -109,9 +109,9 @@ type TargetOptionImpl interface {
 type TargetElementOptions struct {
 	TargetElement TargetElement
 
-	// RawIdentity disables the implicit defaulting of the extraIdentity.
+	// DisableExtraIdentityDefaulting disables the implicit defaulting of the extraIdentity.
 	// A transfer operation must set this flag to preserve the normalizations.
-	RawIdentity *bool
+	DisableExtraIdentityDefaulting *bool
 }
 
 type TargetElementOption interface {
@@ -132,11 +132,11 @@ func (m *TargetElementOptions) ApplyElementModificationOption(opts *ElementModif
 
 func (m *TargetElementOptions) ApplyTargetOption(opts *TargetElementOptions) {
 	optionutils.Transfer(&opts.TargetElement, m.TargetElement)
-	optionutils.Transfer(&opts.RawIdentity, m.RawIdentity)
+	optionutils.Transfer(&opts.DisableExtraIdentityDefaulting, m.DisableExtraIdentityDefaulting)
 }
 
-func (m *TargetElementOptions) IsRawIdentity() bool {
-	return utils.AsBool(m.RawIdentity)
+func (m *TargetElementOptions) IsDisableExtraIdentityDefaulting() bool {
+	return utils.AsBool(m.DisableExtraIdentityDefaulting)
 }
 
 func (m *TargetElementOptions) ApplyTargetOptions(list ...TargetElementOption) *TargetElementOptions {
@@ -364,27 +364,27 @@ func (m TargetIdentity) ApplyTargetOption(opts *TargetElementOptions) {
 
 ////////////////////////////////////////////////////////////////////////////////
 
-type rawidentity bool
+type disableextraidentitydefaulting bool
 
-func (m rawidentity) ApplyBlobModificationOption(opts *BlobModificationOptions) {
+func (m disableextraidentitydefaulting) ApplyBlobModificationOption(opts *BlobModificationOptions) {
 	m.ApplyModificationOption(&opts.ModificationOptions)
 }
 
-func (m rawidentity) ApplyModificationOption(opts *ModificationOptions) {
+func (m disableextraidentitydefaulting) ApplyModificationOption(opts *ModificationOptions) {
 	m.ApplyTargetOption(&opts.TargetElementOptions)
 }
 
-func (m rawidentity) ApplyElementModificationOption(opts *ElementModificationOptions) {
+func (m disableextraidentitydefaulting) ApplyElementModificationOption(opts *ElementModificationOptions) {
 	m.ApplyTargetOption(&opts.TargetElementOptions)
 }
 
-func (m rawidentity) ApplyTargetOption(opts *TargetElementOptions) {
-	opts.RawIdentity = utils.BoolP(m)
+func (m disableextraidentitydefaulting) ApplyTargetOption(opts *TargetElementOptions) {
+	opts.DisableExtraIdentityDefaulting = utils.BoolP(m)
 }
 
-// RawIdentity disables the defaulting of the extra identity.
-func RawIdentity(flag ...bool) TargetOptionImpl {
-	return rawidentity(utils.OptionalDefaultedBool(true, flag...))
+// DisableExtraIdentityDefaulting disables the defaulting of the extra identity.
+func DisableExtraIdentityDefaulting(flag ...bool) TargetOptionImpl {
+	return disableextraidentitydefaulting(utils.OptionalDefaultedBool(true, flag...))
 }
 
 ////////////////////////////////////////////////////////////////////////////////

api/ocm/modopts.go

@@ -66,9 +66,9 @@ func TargetIndex(idx int) internal.TargetOptionImpl {
 	return internal.TargetIndex(idx)
 }
 
-// RawIdentity disables the defaulting of the extra identity
-func RawIdentity(flag ...bool) internal.TargetOptionImpl {
-	return internal.RawIdentity(flag...)
+// DisableExtraIdentityDefaulting disables the defaulting of the extra identity
+func DisableExtraIdentityDefaulting(flag ...bool) internal.TargetOptionImpl {
+	return internal.DisableExtraIdentityDefaulting(flag...)
 }
 
 const AppendElement = internal.TargetIndex(-1)

api/ocm/tools/transfer/transfer.go

@@ -273,7 +273,7 @@ func copyVersion(printer common.Printer, log logging.Logger, hist common.History
 					err = handler.HandleTransferResource(r, m, hint, t)
 				} else {
 					if err == nil { // old resource found -> keep current access method
-						t.SetResource(r.Meta(), old.Access, ocm.ModifyElement(), ocm.SkipVerify(), ocm.RawIdentity())
+						t.SetResource(r.Meta(), old.Access, ocm.ModifyElement(), ocm.SkipVerify(), ocm.DisableExtraIdentityDefaulting())
 					}
 					notifyArtifactInfo(printer, log, "resource", i, r.Meta(), hint, "already present")
 				}

api/ocm/tools/transfer/transferhandler/standard/handler.go

@@ -87,7 +87,7 @@ func (h *Handler) HandleTransferResource(r ocm.ResourceAccess, m cpi.AccessMetho
 	}
 	defer blob.Close()
 	return accessio.Retry(h.opts.GetRetries(), time.Second, func() error {
-		return t.SetResourceBlob(r.Meta(), blob, hint, h.GlobalAccess(t.GetContext(), m), ocm.SkipVerify(), ocm.RawIdentity())
+		return t.SetResourceBlob(r.Meta(), blob, hint, h.GlobalAccess(t.GetContext(), m), ocm.SkipVerify(), ocm.DisableExtraIdentityDefaulting())
 	})
 }
 
@@ -98,7 +98,7 @@ func (h *Handler) HandleTransferSource(r ocm.SourceAccess, m cpi.AccessMethod, h
 	}
 	defer blob.Close()
 	return accessio.Retry(h.opts.GetRetries(), time.Second, func() error {
-		return t.SetSourceBlob(r.Meta(), blob, hint, h.GlobalAccess(t.GetContext(), m), ocm.RawIdentity())
+		return t.SetSourceBlob(r.Meta(), blob, hint, h.GlobalAccess(t.GetContext(), m), ocm.DisableExtraIdentityDefaulting())
 	})
 }