error realm ocm
+`))
+ })
+})
diff --git a/pkg/logging/interface.go b/api/utils/logging/interface.go
similarity index 100%
rename from pkg/logging/interface.go
rename to api/utils/logging/interface.go
diff --git a/pkg/logging/logging.go b/api/utils/logging/logging.go
similarity index 100%
rename from pkg/logging/logging.go
rename to api/utils/logging/logging.go
diff --git a/pkg/logging/stdkeys.go b/api/utils/logging/stdkeys.go
similarity index 100%
rename from pkg/logging/stdkeys.go
rename to api/utils/logging/stdkeys.go
diff --git a/pkg/logging/suite_test.go b/api/utils/logging/suite_test.go
similarity index 100%
rename from pkg/logging/suite_test.go
rename to api/utils/logging/suite_test.go
diff --git a/pkg/logging/testhelper/testhelper.go b/api/utils/logging/testhelper/testhelper.go
similarity index 100%
rename from pkg/logging/testhelper/testhelper.go
rename to api/utils/logging/testhelper/testhelper.go
diff --git a/pkg/logging/utils.go b/api/utils/logging/utils.go
similarity index 100%
rename from pkg/logging/utils.go
rename to api/utils/logging/utils.go
diff --git a/api/utils/mime/types.go b/api/utils/mime/types.go
new file mode 100644
index 000000000..9c4b6f2d1
--- /dev/null
+++ b/api/utils/mime/types.go
@@ -0,0 +1,50 @@
+package mime
+
+import (
+ "mime"
+
+ "ocm.software/ocm/api/utils/logging"
+)
+
+const (
+ MIME_TEXT = "text/plain"
+ MIME_OCTET = "application/octet-stream"
+
+ MIME_JSON = "application/x-json"
+ MIME_JSON_ALT = "text/json" // no utf8
+ MIME_JSON_OFFICIAL = "application/json"
+ MIME_XML = "application/xml"
+ MIME_YAML = "application/x-yaml"
+ MIME_YAML_ALT = "text/yaml" // no utf8
+ MIME_YAML_OFFICIAL = "application/yaml"
+
+ MIME_GZIP = "application/gzip"
+ MIME_TAR = "application/x-tar"
+ MIME_TGZ = "application/x-tgz"
+ MIME_TGZ_ALT = MIME_TAR + "+gzip"
+
+ MIME_JAR = "application/x-jar"
+)
+
+func init() {
+ ocmTypes := map[string]string{
+ // added entries
+ ".txt": MIME_TEXT,
+ ".yaml": MIME_YAML_OFFICIAL,
+ ".gzip": MIME_GZIP,
+ ".tar": MIME_TAR,
+ ".tgz": MIME_TGZ,
+ ".tar.gz": MIME_TGZ,
+ ".pom": MIME_XML,
+ ".zip": MIME_GZIP,
+ ".jar": MIME_JAR,
+ ".module": MIME_JSON, // gradle module metadata
+ }
+
+ for k, v := range ocmTypes {
+ err := mime.AddExtensionType(k, v)
+ if err != nil {
+ logging.DynamicLogger(logging.DefineSubRealm("mimeutils")).Error("failed to add extension type", "extension", k, "type", v, "error", err)
+ }
+ }
+}
diff --git a/pkg/mime/util.go b/api/utils/mime/util.go
similarity index 100%
rename from pkg/mime/util.go
rename to api/utils/mime/util.go
diff --git a/pkg/common/const.go b/api/utils/misc/const.go
similarity index 100%
rename from pkg/common/const.go
rename to api/utils/misc/const.go
diff --git a/pkg/common/history.go b/api/utils/misc/history.go
similarity index 100%
rename from pkg/common/history.go
rename to api/utils/misc/history.go
diff --git a/pkg/common/history_test.go b/api/utils/misc/history_test.go
similarity index 98%
rename from pkg/common/history_test.go
rename to api/utils/misc/history_test.go
index 03852ff16..ad0011f19 100644
--- a/pkg/common/history_test.go
+++ b/api/utils/misc/history_test.go
@@ -4,7 +4,7 @@ import (
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
- "github.com/open-component-model/ocm/pkg/common"
+ common "ocm.software/ocm/api/utils/misc"
)
type Elem struct {
diff --git a/pkg/common/printer.go b/api/utils/misc/printer.go
similarity index 98%
rename from pkg/common/printer.go
rename to api/utils/misc/printer.go
index 946ce2d8b..20526740b 100644
--- a/pkg/common/printer.go
+++ b/api/utils/misc/printer.go
@@ -9,7 +9,7 @@ import (
"github.com/mandelsoft/logging"
- "github.com/open-component-model/ocm/pkg/utils"
+ "ocm.software/ocm/api/utils"
)
type Flusher interface {
diff --git a/pkg/common/printer_test.go b/api/utils/misc/printer_test.go
similarity index 97%
rename from pkg/common/printer_test.go
rename to api/utils/misc/printer_test.go
index 6b0aa46fc..d78427377 100644
--- a/pkg/common/printer_test.go
+++ b/api/utils/misc/printer_test.go
@@ -9,7 +9,7 @@ import (
"github.com/mandelsoft/goutils/testutils"
"github.com/mandelsoft/logging"
- ocmlog "github.com/open-component-model/ocm/pkg/logging"
+ ocmlog "ocm.software/ocm/api/utils/logging"
)
var _ = Describe("Printer", func() {
diff --git a/pkg/common/properties.go b/api/utils/misc/properties.go
similarity index 100%
rename from pkg/common/properties.go
rename to api/utils/misc/properties.go
diff --git a/pkg/common/suite_test.go b/api/utils/misc/suite_test.go
similarity index 100%
rename from pkg/common/suite_test.go
rename to api/utils/misc/suite_test.go
diff --git a/api/utils/misc/types.go b/api/utils/misc/types.go
new file mode 100644
index 000000000..e8a8a3fe6
--- /dev/null
+++ b/api/utils/misc/types.go
@@ -0,0 +1,86 @@
+package common
+
+import (
+ "encoding/json"
+ "fmt"
+ "strings"
+
+ "github.com/mandelsoft/goutils/errors"
+
+ "ocm.software/ocm/api/utils/semverutils"
+)
+
+// VersionedElement describes an element that has a name and a version.
+type VersionedElement interface {
+ // GetName gets the name of the element
+ GetName() string
+ // GetVersion gets the version of the element
+ GetVersion() string
+}
+
+type NameVersion struct {
+ name string
+ version string
+}
+
+var (
+ _ json.Marshaler = (*NameVersion)(nil)
+ _ VersionedElement = (*NameVersion)(nil)
+)
+
+func NewNameVersion(name, version string) NameVersion {
+ return NameVersion{name, version}
+}
+
+func VersionedElementKey(v VersionedElement) NameVersion {
+ if k, ok := v.(NameVersion); ok {
+ return k
+ }
+ return NameVersion{v.GetName(), v.GetVersion()}
+}
+
+func (n NameVersion) GetName() string {
+ return n.name
+}
+
+func (n NameVersion) GetVersion() string {
+ return n.version
+}
+
+func (n NameVersion) MarshalJSON() ([]byte, error) {
+ return json.Marshal(fmt.Sprintf("%s:%s", n.GetName(), n.GetVersion()))
+}
+
+func (n NameVersion) Compare(o NameVersion) int {
+ c := strings.Compare(n.name, o.name)
+ if c == 0 {
+ return semverutils.Compare(n.version, o.version)
+ }
+ return c
+}
+
+func (n NameVersion) String() string {
+ if n.version == "" {
+ return n.name
+ }
+ if n.name == "" {
+ return n.version
+ }
+ return n.name + ":" + n.version
+}
+
+func ParseNameVersion(s string) (NameVersion, error) {
+ a := strings.Split(s, ":")
+ if len(a) != 2 {
+ return NameVersion{}, errors.ErrInvalid("name:version", s)
+ }
+ return NewNameVersion(strings.TrimSpace(a[0]), strings.TrimSpace(a[1])), nil
+}
+
+func CompareNameVersion(a, b NameVersion) int {
+ d := strings.Compare(a.name, b.name)
+ if d == 0 {
+ d = strings.Compare(a.version, b.version)
+ }
+ return d
+}
diff --git a/pkg/common/utils.go b/api/utils/misc/utils.go
similarity index 100%
rename from pkg/common/utils.go
rename to api/utils/misc/utils.go
diff --git a/api/utils/misc/walk.go b/api/utils/misc/walk.go
new file mode 100644
index 000000000..6eeba3209
--- /dev/null
+++ b/api/utils/misc/walk.go
@@ -0,0 +1,52 @@
+package common
+
+import (
+ "github.com/mandelsoft/logging"
+
+ "ocm.software/ocm/api/utils"
+ ocmlog "ocm.software/ocm/api/utils/logging"
+)
+
+type NameVersionInfo[T any] map[NameVersion]T
+
+func (s NameVersionInfo[T]) Add(nv NameVersion, data ...T) bool {
+ if _, ok := s[nv]; !ok {
+ s[nv] = utils.Optional(data...)
+ return true
+ }
+ return false
+}
+
+func (s NameVersionInfo[T]) Contains(nv NameVersion) bool {
+ _, ok := s[nv]
+ return ok
+}
+
+type WalkingState[T any, C any] struct {
+ LogCtx logging.Context
+ Logger logging.Logger
+ Context C
+ Closure NameVersionInfo[T]
+ History History
+}
+
+func NewWalkingState[T any, C any](ctx C, lctx ...logging.Context) WalkingState[T, C] {
+ logctx := utils.OptionalDefaulted[logging.Context](ocmlog.Context(), lctx...)
+ return WalkingState[T, C]{Context: ctx, Closure: NameVersionInfo[T]{}, LogCtx: logctx, Logger: logctx.Logger()}
+}
+
+func (s *WalkingState[T, C]) Add(kind string, nv NameVersion) (bool, error) {
+ if err := s.History.Add(kind, nv); err != nil {
+ return false, err
+ }
+ return s.Closure.Add(nv), nil
+}
+
+func (s *WalkingState[T, C]) Contains(nv NameVersion) bool {
+ _, ok := s.Closure[nv]
+ return ok
+}
+
+func (s *WalkingState[T, C]) Get(nv NameVersion) T {
+ return s.Closure[nv]
+}
diff --git a/pkg/out/context.go b/api/utils/out/context.go
similarity index 100%
rename from pkg/out/context.go
rename to api/utils/out/context.go
diff --git a/pkg/utils/panics/panics.go b/api/utils/panics/panics.go
similarity index 97%
rename from pkg/utils/panics/panics.go
rename to api/utils/panics/panics.go
index 4555136ee..f193c82f5 100644
--- a/pkg/utils/panics/panics.go
+++ b/api/utils/panics/panics.go
@@ -7,7 +7,7 @@ import (
"github.com/mandelsoft/goutils/errors"
- "github.com/open-component-model/ocm/pkg/logging"
+ "ocm.software/ocm/api/utils/logging"
)
var ReallyCrash = true
diff --git a/pkg/utils/panics/panics_test.go b/api/utils/panics/panics_test.go
similarity index 95%
rename from pkg/utils/panics/panics_test.go
rename to api/utils/panics/panics_test.go
index d68dbb549..7844a39b1 100644
--- a/pkg/utils/panics/panics_test.go
+++ b/api/utils/panics/panics_test.go
@@ -6,7 +6,7 @@ import (
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
- "github.com/open-component-model/ocm/pkg/utils/panics"
+ "ocm.software/ocm/api/utils/panics"
)
func caller(topanic interface{}, outerr error, handlers ...panics.PanicHandler) (err error) {
diff --git a/pkg/utils/panics/suite_test.go b/api/utils/panics/suite_test.go
similarity index 100%
rename from pkg/utils/panics/suite_test.go
rename to api/utils/panics/suite_test.go
diff --git a/pkg/utils/path.go b/api/utils/path.go
similarity index 100%
rename from pkg/utils/path.go
rename to api/utils/path.go
diff --git a/pkg/refmgmt/doc.go b/api/utils/refmgmt/doc.go
similarity index 100%
rename from pkg/refmgmt/doc.go
rename to api/utils/refmgmt/doc.go
diff --git a/pkg/refmgmt/finalized/doc.go b/api/utils/refmgmt/finalized/doc.go
similarity index 100%
rename from pkg/refmgmt/finalized/doc.go
rename to api/utils/refmgmt/finalized/doc.go
diff --git a/pkg/refmgmt/finalized/finalized_test.go b/api/utils/refmgmt/finalized/finalized_test.go
similarity index 93%
rename from pkg/refmgmt/finalized/finalized_test.go
rename to api/utils/refmgmt/finalized/finalized_test.go
index bd8e3c418..5c3db515f 100644
--- a/pkg/refmgmt/finalized/finalized_test.go
+++ b/api/utils/refmgmt/finalized/finalized_test.go
@@ -7,9 +7,9 @@ import (
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
- "github.com/open-component-model/ocm/pkg/refmgmt"
- "github.com/open-component-model/ocm/pkg/refmgmt/finalized"
- "github.com/open-component-model/ocm/pkg/runtimefinalizer"
+ "ocm.software/ocm/api/utils/refmgmt"
+ "ocm.software/ocm/api/utils/refmgmt/finalized"
+ "ocm.software/ocm/api/utils/runtimefinalizer"
)
type Interface interface {
diff --git a/pkg/refmgmt/finalized/finalizedref.go b/api/utils/refmgmt/finalized/finalizedref.go
similarity index 89%
rename from pkg/refmgmt/finalized/finalizedref.go
rename to api/utils/refmgmt/finalized/finalizedref.go
index c9d32b8a4..dd4f85325 100644
--- a/pkg/refmgmt/finalized/finalizedref.go
+++ b/api/utils/refmgmt/finalized/finalizedref.go
@@ -3,8 +3,8 @@ package finalized
import (
"runtime"
- "github.com/open-component-model/ocm/pkg/refmgmt"
- "github.com/open-component-model/ocm/pkg/runtimefinalizer"
+ "ocm.software/ocm/api/utils/refmgmt"
+ "ocm.software/ocm/api/utils/runtimefinalizer"
)
type FinalizedRef struct {
diff --git a/pkg/refmgmt/finalized/suite_test.go b/api/utils/refmgmt/finalized/suite_test.go
similarity index 100%
rename from pkg/refmgmt/finalized/suite_test.go
rename to api/utils/refmgmt/finalized/suite_test.go
diff --git a/pkg/refmgmt/refcloser.go b/api/utils/refmgmt/refcloser.go
similarity index 100%
rename from pkg/refmgmt/refcloser.go
rename to api/utils/refmgmt/refcloser.go
diff --git a/api/utils/refmgmt/refmgmt.go b/api/utils/refmgmt/refmgmt.go
new file mode 100644
index 000000000..2fa99f505
--- /dev/null
+++ b/api/utils/refmgmt/refmgmt.go
@@ -0,0 +1,160 @@
+package refmgmt
+
+import (
+ "fmt"
+ "sync"
+
+ "github.com/mandelsoft/goutils/errors"
+
+ "ocm.software/ocm/api/utils/logging"
+)
+
+var ALLOC_REALM = logging.DefineSubRealm("reference counting", "refcnt")
+
+var AllocLog = logging.DynamicLogger(ALLOC_REALM)
+
+type Allocatable interface {
+ Ref() error
+ Unref() error
+}
+
+type CleanupHandler interface {
+ Cleanup()
+}
+
+type CleanupHandlerFunc func()
+
+func (f CleanupHandlerFunc) Cleanup() {
+ f()
+}
+
+type ExtendedAllocatable interface {
+ BeforeCleanup(f CleanupHandler)
+ Ref() error
+ Unref() error
+}
+
+type RefMgmt interface {
+ UnrefLast() error
+ ExtendedAllocatable
+ IsClosed() bool
+ RefCount() int
+
+ WithName(name string) RefMgmt
+}
+
+type refMgmt struct {
+ lock sync.Mutex
+ refcount int
+ closed bool
+ before []CleanupHandler
+ cleanup func() error
+ name string
+}
+
+func NewAllocatable(cleanup func() error, unused ...bool) RefMgmt {
+ n := 1
+ for _, b := range unused {
+ if b {
+ n = 0
+ }
+ }
+ return &refMgmt{refcount: n, cleanup: cleanup, name: "object"}
+}
+
+func (c *refMgmt) WithName(name string) RefMgmt {
+ c.name = name
+ return c
+}
+
+func (c *refMgmt) IsClosed() bool {
+ c.lock.Lock()
+ defer c.lock.Unlock()
+ return c.closed
+}
+
+func (c *refMgmt) Ref() error {
+ c.lock.Lock()
+ defer c.lock.Unlock()
+ if c.closed {
+ return ErrClosed
+ }
+ c.refcount++
+ AllocLog.Trace("ref", "name", c.name, "refcnt", c.refcount)
+ return nil
+}
+
+func (c *refMgmt) Unref() error {
+ c.lock.Lock()
+ defer c.lock.Unlock()
+ if c.closed {
+ return ErrClosed
+ }
+
+ var err error
+
+ c.refcount--
+ AllocLog.Trace("unref", "name", c.name, "refcnt", c.refcount)
+ if c.refcount <= 0 {
+ for _, f := range c.before {
+ f.Cleanup()
+ }
+ if c.cleanup != nil {
+ err = c.cleanup()
+ }
+ c.closed = true
+ }
+
+ if err != nil {
+ return fmt.Errorf("unable to unref %s: %w", c.name, err)
+ }
+
+ return nil
+}
+
+func (c *refMgmt) RefCount() int {
+ c.lock.Lock()
+ defer c.lock.Unlock()
+ return c.refcount
+}
+
+func (c *refMgmt) BeforeCleanup(f CleanupHandler) {
+ c.lock.Lock()
+ defer c.lock.Unlock()
+ c.before = append(c.before, f)
+}
+
+func (c *refMgmt) UnrefLast() error {
+ c.lock.Lock()
+ defer c.lock.Unlock()
+ if c.closed {
+ return ErrClosed
+ }
+
+ if c.refcount > 1 {
+ AllocLog.Trace("unref last failed", "name", c.name, "pending", c.refcount)
+ return errors.ErrStillInUseWrap(errors.Newf("%d reference(s) pending", c.refcount), c.name)
+ }
+
+ var err error
+
+ c.refcount--
+ AllocLog.Trace("unref last", "name", c.name, "refcnt", c.refcount)
+ if c.refcount <= 0 {
+ for _, f := range c.before {
+ f.Cleanup()
+ }
+ if c.cleanup != nil {
+ err = c.cleanup()
+ }
+
+ c.closed = true
+ }
+
+ if err != nil {
+ AllocLog.Trace("cleanup last failed", "name", c.name, "error", err.Error())
+ return errors.Wrapf(err, "unable to cleanup %s while unref last", c.name)
+ }
+
+ return nil
+}
diff --git a/pkg/refmgmt/resource/doc.go b/api/utils/refmgmt/resource/doc.go
similarity index 100%
rename from pkg/refmgmt/resource/doc.go
rename to api/utils/refmgmt/resource/doc.go
diff --git a/api/utils/refmgmt/resource/resource.go b/api/utils/refmgmt/resource/resource.go
new file mode 100644
index 000000000..069353f87
--- /dev/null
+++ b/api/utils/refmgmt/resource/resource.go
@@ -0,0 +1,275 @@
+package resource
+
+import (
+ "io"
+
+ "ocm.software/ocm/api/utils/accessio"
+ "ocm.software/ocm/api/utils/refmgmt"
+)
+
+type CloserView interface {
+ Close() error
+ IsClosed() bool
+ Execute(func() error) error
+ Allocatable() refmgmt.ExtendedAllocatable
+ refmgmt.LazyMode
+ refmgmt.RefCountProvider
+}
+
+var _ CloserView = refmgmt.CloserView(nil)
+
+var ErrClosed = accessio.ErrClosed
+
+// resourceViewInterface is a helper type used to implement parameter type
+// recursion for ResourceView[T ResourceView[T]], which is not allowed in Go.
+type resourceViewInterface[T any] interface {
+ io.Closer
+ IsClosed() bool
+ Dup[T]
+}
+
+// ResourceView is the view related part of a resource interface T.
+// T must incorporate ResourceView[T], which cannot directly be expressed
+// in go, but with the helper interface defining the API.
+type ResourceView[T resourceViewInterface[T]] interface {
+ resourceViewInterface[T]
+}
+
+// ResourceViewInt can be used to execute an operation on a non-closed
+// view.
+// Execute call a synchronized function on a non-closed view.
+type ResourceViewInt[T resourceViewInterface[T]] interface {
+ refmgmt.LazyMode
+ refmgmt.RefCountProvider
+ resourceViewInterface[T]
+
+ Execute(func() error) error
+ Allocatable() refmgmt.ExtendedAllocatable
+}
+
+type Dup[T any] interface {
+ Dup() (T, error)
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+// ViewManager is the interface of the reference manager, which
+// can be used to gain new views to a managed resource.
+type ViewManager[T any] interface {
+ RefCount() int
+ Allocatable() refmgmt.ExtendedAllocatable
+ View(main ...bool) (T, error)
+ IsClosed() bool
+}
+
+// ResourceViewCreator is a function which must be provided by the resource provider
+// to map an implementation to the resource interface T.
+// It must use NewView to create the view related part of a resource.
+type ResourceViewCreator[T any, I io.Closer] func(I, CloserView, ViewManager[T]) T
+
+type viewManager[T any, I ResourceImplementation[T]] struct {
+ refs refmgmt.ReferencableCloser
+ creator ResourceViewCreator[T, I]
+ impl I
+}
+
+// ResourceImplementation is the minimal interface for an implementation
+// a resource with managed views.
+type ResourceImplementation[T any] interface {
+ io.Closer
+ SetViewManager(m ViewManager[T])
+ ViewManager[T]
+}
+
+// NewResource creates a resource based on an implementation and a ResourceViewCreator.
+// function.
+func NewResource[T any, I ResourceImplementation[T]](impl I, c ResourceViewCreator[T, I], name string, main ...bool) T {
+ i := &viewManager[T, I]{
+ refs: refmgmt.NewRefCloser(impl, true).WithName(name),
+ creator: c,
+ impl: impl,
+ }
+ impl.SetViewManager(i)
+ t, _ := i.View(main...)
+ return t
+}
+
+func (i *viewManager[T, I]) RefCount() int {
+ return i.refs.RefCount()
+}
+
+func (i *viewManager[T, I]) Allocatable() refmgmt.ExtendedAllocatable {
+ return i.refs
+}
+
+func (i *viewManager[T, I]) View(main ...bool) (T, error) {
+ var _nil T
+
+ v, err := i.refs.View(main...)
+ if err != nil {
+ return _nil, err
+ }
+ return i.creator(i.impl, v, i), nil
+}
+
+func (i *viewManager[T, I]) IsClosed() bool {
+ return i.refs.IsClosed()
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+// noneRefCloser is used to compose a non-referencing
+// view, which does not forward the close operation
+// to the view manager. Its state directly reflects
+// the state of the view manager.
+type noneRefCloser[T io.Closer] struct {
+ mgr ViewManager[T]
+}
+
+var _ CloserView = (*noneRefCloser[io.Closer])(nil)
+
+func (n *noneRefCloser[T]) Close() error {
+ if n.mgr.IsClosed() {
+ return ErrClosed
+ }
+ return nil
+}
+
+func (n *noneRefCloser[T]) IsClosed() bool {
+ return n.mgr.IsClosed()
+}
+
+func (n *noneRefCloser[T]) Execute(f func() error) error {
+ v, err := n.mgr.View()
+ if err != nil {
+ return err
+ }
+ defer v.Close()
+ return f()
+}
+
+func (n *noneRefCloser[T]) Lazy() {
+}
+
+func (n *noneRefCloser[T]) RefCount() int {
+ return n.mgr.RefCount()
+}
+
+func (n *noneRefCloser[T]) Allocatable() refmgmt.ExtendedAllocatable {
+ return n.mgr.Allocatable()
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+type resourceView[T any] struct {
+ view CloserView
+ mgr ViewManager[T]
+}
+
+// NewView is to be called by a resource view creator to map
+// the given resource implementation to complete resource interface.
+// It should create an object with two local embedded fields:
+// - the returned ResourceView and the
+// - given resource implementation.
+func NewView[T resourceViewInterface[T]](v CloserView, d ViewManager[T]) ResourceViewInt[T] {
+ return &resourceView[T]{v, d}
+}
+
+// NewNonRefView provides a reference-less view directly for the reference manager.
+// It is valid as long as the reference manager is not closed with the last regular
+// reference.
+func NewNonRefView[T resourceViewInterface[T]](d ViewManager[T]) ResourceViewInt[T] {
+ return &resourceView[T]{&noneRefCloser[T]{d}, d}
+}
+
+func NoneRefCloserView[T io.Closer](d ViewManager[T]) CloserView {
+ return &noneRefCloser[T]{d}
+}
+
+func (v *resourceView[T]) IsClosed() bool {
+ return v.view.IsClosed()
+}
+
+func (v *resourceView[T]) Close() error {
+ return v.view.Close()
+}
+
+func (v *resourceView[T]) Execute(f func() error) error {
+ return v.view.Execute(f)
+}
+
+func (v *resourceView[T]) Allocatable() refmgmt.ExtendedAllocatable {
+ return v.view.Allocatable()
+}
+
+func (v *resourceView[T]) Dup() (t T, err error) {
+ err = v.Execute(func() error {
+ t, err = v.mgr.View()
+ return err
+ })
+ return t, err
+}
+
+func (v *resourceView[T]) Lazy() {
+ v.view.Lazy()
+}
+
+func (v *resourceView[T]) RefCount() int {
+ return v.view.RefCount()
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+type ResourceImplBase[T any] struct {
+ refs ViewManager[T]
+ closer []io.Closer
+}
+
+// NewResourceImplBase creates an implementation base for a resource T
+// referencing another resource M.
+func NewResourceImplBase[T any, M io.Closer](m ViewManager[M], closer ...io.Closer) (*ResourceImplBase[T], error) {
+ if m != nil {
+ ref, err := m.View()
+ if err != nil {
+ return nil, err
+ }
+ closer = append(closer, ref)
+ }
+ return &ResourceImplBase[T]{
+ closer: closer,
+ }, nil
+}
+
+func NewSimpleResourceImplBase[T any](closer ...io.Closer) *ResourceImplBase[T] {
+ return &ResourceImplBase[T]{
+ closer: closer,
+ }
+}
+
+func (b *ResourceImplBase[T]) SetViewManager(m ViewManager[T]) {
+ b.refs = m
+}
+
+func (b *ResourceImplBase[T]) RefCount() int {
+ return b.refs.RefCount()
+}
+
+func (b *ResourceImplBase[T]) Allocatable() refmgmt.ExtendedAllocatable {
+ return b.refs.Allocatable()
+}
+
+func (b *ResourceImplBase[T]) ViewManager() ViewManager[T] {
+ return b.refs
+}
+
+func (b *ResourceImplBase[T]) View(main ...bool) (T, error) {
+ return b.refs.View(main...)
+}
+
+func (b *ResourceImplBase[T]) IsClosed() bool {
+ return b.refs.IsClosed()
+}
+
+func (b *ResourceImplBase[T]) Close() error {
+ return accessio.Close(b.closer...)
+}
diff --git a/api/utils/refmgmt/resource/resource_test.go b/api/utils/refmgmt/resource/resource_test.go
new file mode 100644
index 000000000..be305bd21
--- /dev/null
+++ b/api/utils/refmgmt/resource/resource_test.go
@@ -0,0 +1,131 @@
+package resource_test
+
+import (
+ "fmt"
+
+ . "github.com/mandelsoft/goutils/testutils"
+ . "github.com/onsi/ginkgo/v2"
+ . "github.com/onsi/gomega"
+
+ "ocm.software/ocm/api/utils/refmgmt/resource"
+)
+
+// Resource is the intended resource interface.
+// It must incorporate the resource.ResourceView interface
+// providing the view related part of the interface.
+type Resource interface {
+ resource.ResourceView[Resource]
+
+ Name() string
+ Operation(err error) error
+}
+
+type (
+ // ResourceImpl implements io.Closer to finally release allocated resources
+ // and the additional non-view-related part of the resource interface.
+ ResourceImpl struct {
+ resource.ResourceImplBase[Resource]
+ name string
+ }
+ _resourceImpl = *ResourceImpl
+)
+
+var _ resource.ResourceImplementation[Resource] = (*ResourceImpl)(nil)
+
+func (r *ResourceImpl) Name() string {
+ return r.name
+}
+
+func (r *ResourceImpl) Operation(err error) error {
+ return err
+}
+
+// Close is called for the last closed view and
+// may handle the release of allocated sub resources.
+func (r *ResourceImpl) Close() error {
+ if r.name == "" {
+ return fmt.Errorf("oops")
+ }
+ r.name = ""
+ return nil
+}
+
+type _resourceView = resource.ResourceViewInt[Resource]
+
+// resourceView implementation the mapping of a ResourceImpl
+// to a fully-fledged Resource implementation including
+// the view-related part.
+type resourceView struct {
+ _resourceView
+ _resourceImpl
+}
+
+var _ Resource = (*resourceView)(nil)
+
+// Close must be implemented to resolve the two provided Close
+// methods to the one of the view-related part.
+func (r *resourceView) Close() error {
+ return r._resourceView.Close()
+}
+
+func (r *resourceView) Operation(err error) error {
+ return r.Execute(func() error { return r._resourceImpl.Operation(err) })
+}
+
+func resourceViewCreator(impl *ResourceImpl, v resource.CloserView, d resource.ViewManager[Resource]) Resource {
+ return &resourceView{
+ _resourceView: resource.NewView(v, d),
+ _resourceImpl: impl,
+ }
+}
+
+// New create a new Resource by creating a ResourceImpl
+// and adding the reference management by calling resource.NewResource,
+// which internally will call the resourceViewCreator function to create
+// the first view.
+func New(name string) Resource {
+ i := &ResourceImpl{name: name}
+ return resource.NewResource(i, resourceViewCreator, name)
+}
+
+var _ = Describe("ref test", func() {
+ It("handles main ref", func() {
+ r := New("alice")
+
+ Expect(r.IsClosed()).To(BeFalse())
+
+ MustBeSuccessful(r.Close())
+ Expect(r.IsClosed()).To(BeTrue())
+ Expect(r.Close()).To(Equal(resource.ErrClosed))
+ Expect(r.Name()).To(Equal(""))
+ })
+
+ It("handle last closed view", func() {
+ r := New("alice")
+ Expect(r.IsClosed()).To(BeFalse())
+ v := Must(r.Dup())
+ Expect(v.IsClosed()).To(BeFalse())
+
+ MustBeSuccessful(r.Close())
+ Expect(r.IsClosed()).To(BeTrue())
+ Expect(v.IsClosed()).To(BeFalse())
+
+ Expect(r.Close()).To(Equal(resource.ErrClosed))
+ Expect(r.Name()).To(Equal("alice"))
+
+ MustBeSuccessful(v.Close())
+ Expect(v.IsClosed()).To(BeTrue())
+ Expect(v.Close()).To(Equal(resource.ErrClosed))
+ Expect(v.Name()).To(Equal(""))
+ })
+
+ It("executes operation", func() {
+ r := New("alice")
+ Expect(r.IsClosed()).To(BeFalse())
+
+ Expect(r.Operation(nil)).To(Succeed())
+ Expect(r.Operation(fmt.Errorf("fail"))).To(MatchError("fail"))
+ MustBeSuccessful(r.Close())
+ Expect(r.Operation(nil)).To(Equal(resource.ErrClosed))
+ })
+})
diff --git a/pkg/refmgmt/resource/suite_test.go b/api/utils/refmgmt/resource/suite_test.go
similarity index 100%
rename from pkg/refmgmt/resource/suite_test.go
rename to api/utils/refmgmt/resource/suite_test.go
diff --git a/pkg/refmgmt/suite_test.go b/api/utils/refmgmt/suite_test.go
similarity index 100%
rename from pkg/refmgmt/suite_test.go
rename to api/utils/refmgmt/suite_test.go
diff --git a/pkg/refmgmt/view.go b/api/utils/refmgmt/view.go
similarity index 100%
rename from pkg/refmgmt/view.go
rename to api/utils/refmgmt/view.go
diff --git a/pkg/refmgmt/view_test.go b/api/utils/refmgmt/view_test.go
similarity index 97%
rename from pkg/refmgmt/view_test.go
rename to api/utils/refmgmt/view_test.go
index 15ff47e3a..2f7e0f1de 100644
--- a/pkg/refmgmt/view_test.go
+++ b/api/utils/refmgmt/view_test.go
@@ -9,7 +9,7 @@ import (
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
- refmgmt2 "github.com/open-component-model/ocm/pkg/refmgmt"
+ refmgmt2 "ocm.software/ocm/api/utils/refmgmt"
)
// Objectbase is the base interface for the
diff --git a/api/utils/registrations/info.go b/api/utils/registrations/info.go
new file mode 100644
index 000000000..617b9542b
--- /dev/null
+++ b/api/utils/registrations/info.go
@@ -0,0 +1,58 @@
+package registrations
+
+import (
+ "strings"
+
+ "github.com/mandelsoft/goutils/general"
+
+ "ocm.software/ocm/api/utils/listformat"
+)
+
+type HandlerInfos []HandlerInfo
+
+var _ listformat.ListElements = HandlerInfos(nil)
+
+func (h HandlerInfos) Size() int {
+ return len(h)
+}
+
+func (h HandlerInfos) Key(i int) string {
+ return h[i].Name
+}
+
+func (h HandlerInfos) Description(i int) string {
+ var desc string
+
+ if h[i].Node {
+ desc = "[" + general.Conditional(h[i].ShortDesc == "", "intermediate", strings.Trim(h[i].ShortDesc, "\n")) + "]"
+ } else {
+ desc = h[i].ShortDesc
+ }
+ return desc + general.Conditional(h[i].Description == "", "", "\n\n"+strings.Trim(h[i].Description, "\n"))
+}
+
+type HandlerInfo struct {
+ Name string
+ ShortDesc string
+ Description string
+ Node bool
+}
+
+func NewLeafHandlerInfo(short, desc string) HandlerInfos {
+ return HandlerInfos{
+ {
+ ShortDesc: short,
+ Description: desc,
+ },
+ }
+}
+
+func NewNodeHandlerInfo(short, desc string) HandlerInfos {
+ return HandlerInfos{
+ {
+ ShortDesc: short,
+ Description: desc,
+ Node: true,
+ },
+ }
+}
diff --git a/pkg/registrations/registrations.go b/api/utils/registrations/registrations.go
similarity index 99%
rename from pkg/registrations/registrations.go
rename to api/utils/registrations/registrations.go
index e920f6c07..7eecebe79 100644
--- a/pkg/registrations/registrations.go
+++ b/api/utils/registrations/registrations.go
@@ -15,7 +15,7 @@ import (
"github.com/mandelsoft/goutils/set"
"golang.org/x/exp/slices"
- "github.com/open-component-model/ocm/pkg/utils"
+ "ocm.software/ocm/api/utils"
)
type HandlerConfig interface{}
diff --git a/pkg/registrations/registrations_test.go b/api/utils/registrations/registrations_test.go
similarity index 98%
rename from pkg/registrations/registrations_test.go
rename to api/utils/registrations/registrations_test.go
index 983aff661..31aff80cf 100644
--- a/pkg/registrations/registrations_test.go
+++ b/api/utils/registrations/registrations_test.go
@@ -5,8 +5,8 @@ import (
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
- "github.com/open-component-model/ocm/pkg/registrations"
- "github.com/open-component-model/ocm/pkg/utils"
+ "ocm.software/ocm/api/utils"
+ "ocm.software/ocm/api/utils/registrations"
)
type Target interface{}
diff --git a/pkg/registrations/suite_test.go b/api/utils/registrations/suite_test.go
similarity index 100%
rename from pkg/registrations/suite_test.go
rename to api/utils/registrations/suite_test.go
diff --git a/api/utils/registrations/utils.go b/api/utils/registrations/utils.go
new file mode 100644
index 000000000..a1e3ddd7c
--- /dev/null
+++ b/api/utils/registrations/utils.go
@@ -0,0 +1,94 @@
+package registrations
+
+import (
+ "encoding/json"
+
+ "github.com/mandelsoft/goutils/errors"
+
+ "ocm.software/ocm/api/utils"
+ "ocm.software/ocm/api/utils/runtime"
+)
+
+type Decoder func(data []byte, unmarshaller runtime.Unmarshaler) (interface{}, error)
+
+func DecodeDefaultedConfig[T any](config interface{}, d ...Decoder) (*T, error) {
+ if config == nil {
+ var cfg T
+ return &cfg, nil
+ }
+ return DecodeConfig[T](config, d...)
+}
+
+func DecodeConfig[T any](config interface{}, d ...Decoder) (*T, error) {
+ var err error
+
+ if config == nil {
+ return nil, nil
+ }
+
+ var cfg *T
+ switch a := config.(type) {
+ case string:
+ cfg, err = decodeConfig[T]([]byte(a), d...)
+ case json.RawMessage:
+ cfg, err = decodeConfig[T](a, d...)
+ case []byte:
+ cfg, err = decodeConfig[T](a, d...)
+ case *T:
+ cfg = a
+ case T:
+ cfg = &a
+ default:
+ var data []byte
+ data, err = json.Marshal(a)
+ if err != nil {
+ return nil, err
+ }
+ cfg, err = decodeConfig[T](data, d...)
+ }
+ if err != nil {
+ return nil, errors.Wrapf(err, "cannot unmarshal config")
+ }
+ return cfg, nil
+}
+
+func decodeConfig[T any](data []byte, dec ...Decoder) (*T, error) {
+ if d := utils.Optional(dec...); d != nil {
+ r, err := d(data, runtime.DefaultYAMLEncoding)
+ if err != nil {
+ return nil, err
+ }
+ if eff, ok := r.(*T); ok {
+ return eff, nil
+ }
+ return nil, errors.Newf("invalid decoded type %T ", r)
+ }
+
+ var c T
+ err := runtime.DefaultYAMLEncoding.Unmarshal(data, &c)
+ if err != nil {
+ return nil, err
+ }
+ return &c, nil
+}
+
+func DecodeAnyConfig(config interface{}) (json.RawMessage, error) {
+ var attr json.RawMessage
+ switch a := config.(type) {
+ case json.RawMessage:
+ attr = a
+ case []byte:
+ err := runtime.DefaultYAMLEncoding.Unmarshal(a, &attr)
+ if err != nil {
+ return nil, errors.Wrapf(err, "invalid target specification")
+ }
+ attr = a
+ default:
+ data, err := json.Marshal(config)
+ if err != nil {
+ return nil, errors.Wrapf(err, "invalid target specification")
+ }
+ attr = data
+ }
+ return attr, nil
+}
diff --git a/pkg/runtime/README.md b/api/utils/runtime/README.md
similarity index 100%
rename from pkg/runtime/README.md
rename to api/utils/runtime/README.md
diff --git a/pkg/runtime/binary.go b/api/utils/runtime/binary.go
similarity index 100%
rename from pkg/runtime/binary.go
rename to api/utils/runtime/binary.go
diff --git a/pkg/runtime/convert.go b/api/utils/runtime/convert.go
similarity index 100%
rename from pkg/runtime/convert.go
rename to api/utils/runtime/convert.go
diff --git a/pkg/runtime/datatypes.go b/api/utils/runtime/datatypes.go
similarity index 100%
rename from pkg/runtime/datatypes.go
rename to api/utils/runtime/datatypes.go
diff --git a/api/utils/runtime/descriptivetype/options.go b/api/utils/runtime/descriptivetype/options.go
new file mode 100644
index 000000000..730b05a4b
--- /dev/null
+++ b/api/utils/runtime/descriptivetype/options.go
@@ -0,0 +1,65 @@
+package descriptivetype
+
+import (
+ "github.com/mandelsoft/goutils/optionutils"
+
+ "ocm.software/ocm/api/utils/runtime"
+)
+
+////////////////////////////////////////////////////////////////////////////////
+
+// TypeObjectTarget is used as target for option functions, it provides
+// setters for fields, which should not be modifiable for a final type object.
+type TypeObjectTarget[E runtime.VersionedTypedObject] struct {
+ target *TypedObjectTypeObject[E]
+}
+
+func NewTypeObjectTarget[E runtime.VersionedTypedObject](target *TypedObjectTypeObject[E]) *TypeObjectTarget[E] {
+ return &TypeObjectTarget[E]{target}
+}
+
+func (t *TypeObjectTarget[E]) SetDescription(value string) {
+ t.target.description = value
+}
+
+func (t *TypeObjectTarget[E]) SetFormat(value string) {
+ t.target.format = value
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// Descriptive Type Options
+
+type OptionTarget interface {
+ SetFormat(string)
+ SetDescription(string)
+}
+
+type Option = optionutils.Option[OptionTarget]
+
+////////////////////////////////////////////////////////////////////////////////
+
+type formatOption struct {
+ value string
+}
+
+func WithFormatSpec(value string) Option {
+ return formatOption{value}
+}
+
+func (o formatOption) ApplyTo(t OptionTarget) {
+ t.SetFormat(o.value)
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+type descriptionOption struct {
+ value string
+}
+
+func WithDescription(value string) Option {
+ return descriptionOption{value}
+}
+
+func (o descriptionOption) ApplyTo(t OptionTarget) {
+ t.SetDescription(o.value)
+}
diff --git a/api/utils/runtime/descriptivetype/type.go b/api/utils/runtime/descriptivetype/type.go
new file mode 100644
index 000000000..a5dada08a
--- /dev/null
+++ b/api/utils/runtime/descriptivetype/type.go
@@ -0,0 +1,180 @@
+package descriptivetype
+
+import (
+ "fmt"
+ "strings"
+
+ "ocm.software/ocm/api/utils"
+ "ocm.software/ocm/api/utils/runtime"
+)
+
+// DescriptionExtender provides an additional descrition for a type object
+// which is appended to the format description in the schmeme descrition
+// for the type in question.
+type DescriptionExtender[T any] func(t T) string
+
+// TypedObjectType is the appropriately extended type interface
+// based on runtime.VersionTypedObjectType providing support for a functional and
+// format description.
+type TypedObjectType[T runtime.VersionedTypedObject] interface {
+ runtime.VersionedTypedObjectType[T]
+
+ Description() string
+ Format() string
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+// TypeScheme is the appropriately extended scheme interface based on
+// runtime.TypeScheme. Based on the additional type info a complete
+// scheme description can be created calling the Describe method.
+type TypeScheme[T runtime.VersionedTypedObject, R TypedObjectType[T]] interface {
+ runtime.TypeScheme[T, R]
+
+ Describe() string
+}
+
+type _typeScheme[T runtime.VersionedTypedObject, R TypedObjectType[T]] interface {
+ runtime.TypeScheme[T, R] // for goland to be able to accept extender argument type
+}
+
+type typeScheme[T runtime.VersionedTypedObject, R TypedObjectType[T], S TypeScheme[T, R]] struct {
+ name string
+ extender DescriptionExtender[R]
+ _typeScheme[T, R]
+}
+
+func MustNewDefaultTypeScheme[T runtime.VersionedTypedObject, R TypedObjectType[T], S TypeScheme[T, R]](name string, extender DescriptionExtender[R], unknown runtime.Unstructured, acceptUnknown bool, defaultdecoder runtime.TypedObjectDecoder[T], base ...TypeScheme[T, R]) TypeScheme[T, R] {
+ scheme := runtime.MustNewDefaultTypeScheme[T, R](unknown, acceptUnknown, defaultdecoder, utils.Optional(base...))
+ return &typeScheme[T, R, S]{
+ name: name,
+ extender: extender,
+ _typeScheme: scheme,
+ }
+}
+
+// NewTypeScheme provides an TypeScheme implementation based on the interfaces
+// and the default runtime.TypeScheme implementation.
+func NewTypeScheme[T runtime.VersionedTypedObject, R TypedObjectType[T], S TypeScheme[T, R]](name string, extender DescriptionExtender[R], unknown runtime.Unstructured, acceptUnknown bool, base ...S) TypeScheme[T, R] {
+ scheme := runtime.MustNewDefaultTypeScheme[T, R](unknown, acceptUnknown, nil, utils.Optional(base...))
+ return &typeScheme[T, R, S]{
+ name: name,
+ extender: extender,
+ _typeScheme: scheme,
+ }
+}
+
+func (t *typeScheme[T, R, S]) KnownTypes() runtime.KnownTypes[T, R] {
+ return t._typeScheme.KnownTypes() // Goland
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+func (t *typeScheme[T, R, S]) Describe() string {
+ s := ""
+ type method struct {
+ desc string
+ versions map[string]string
+ more string
+ }
+
+ descs := map[string]*method{}
+
+ // gather info for kinds and versions
+ for _, n := range t.KnownTypeNames() {
+ kind, vers := runtime.KindVersion(n)
+
+ info := descs[kind]
+ if info == nil {
+ info = &method{versions: map[string]string{}}
+ descs[kind] = info
+ }
+
+ if vers == "" {
+ vers = "v1"
+ }
+ if _, ok := info.versions[vers]; !ok {
+ info.versions[vers] = ""
+ }
+
+ ty := t.GetType(n)
+
+ if t.extender != nil {
+ more := t.extender(ty)
+ if more != "" {
+ info.more = more
+ }
+ }
+ desc := ty.Description()
+ if desc != "" {
+ info.desc = desc
+ }
+
+ desc = ty.Format()
+ if desc != "" {
+ info.versions[vers] = desc
+ }
+ }
+
+ for _, tn := range utils.StringMapKeys(descs) {
+ info := descs[tn]
+ desc := strings.Trim(info.desc, "\n")
+ if desc != "" {
+ s = fmt.Sprintf("%s\n- %s %s\n\n%s\n\n", s, t.name, tn, utils.IndentLines(desc, " "))
+
+ format := ""
+ for _, f := range utils.StringMapKeys(info.versions) {
+ desc = strings.Trim(info.versions[f], "\n")
+ if desc != "" {
+ format = fmt.Sprintf("%s\n- Version %s\n\n%s\n", format, f, utils.IndentLines(desc, " "))
+ }
+ }
+ if format != "" {
+ s += fmt.Sprintf(" The following versions are supported:\n%s\n", strings.Trim(utils.IndentLines(format, " "), "\n"))
+ }
+ }
+ s += info.more
+ }
+ return s
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+type descriptiveTypeInfo interface {
+ Description() string
+ Format() string
+}
+
+type TypedObjectTypeObject[T runtime.VersionedTypedObject] struct {
+ runtime.VersionedTypedObjectType[T]
+ description string
+ format string
+ validator func(T) error
+}
+
+var _ descriptiveTypeInfo = (*TypedObjectTypeObject[runtime.VersionedTypedObject])(nil)
+
+func NewTypedObjectTypeObject[E runtime.VersionedTypedObject](vt runtime.VersionedTypedObjectType[E], opts ...Option) *TypedObjectTypeObject[E] {
+ t := NewTypeObjectTarget[E](&TypedObjectTypeObject[E]{
+ VersionedTypedObjectType: vt,
+ })
+ for _, o := range opts {
+ o.ApplyTo(t)
+ }
+ return t.target
+}
+
+func (t *TypedObjectTypeObject[T]) Description() string {
+ return t.description
+}
+
+func (t *TypedObjectTypeObject[T]) Format() string {
+ return t.format
+}
+
+func (t *TypedObjectTypeObject[T]) Validate(e T) error {
+ if t.validator == nil {
+ return nil
+ }
+ return t.validator(e)
+}
diff --git a/pkg/runtime/encoding.go b/api/utils/runtime/encoding.go
similarity index 100%
rename from pkg/runtime/encoding.go
rename to api/utils/runtime/encoding.go
diff --git a/pkg/runtime/multi.go b/api/utils/runtime/multi.go
similarity index 98%
rename from pkg/runtime/multi.go
rename to api/utils/runtime/multi.go
index b3ca29a7a..2caed54bd 100644
--- a/pkg/runtime/multi.go
+++ b/api/utils/runtime/multi.go
@@ -8,8 +8,8 @@ import (
"github.com/mandelsoft/goutils/errors"
"github.com/mandelsoft/goutils/set"
- "github.com/open-component-model/ocm/pkg/errkind"
- "github.com/open-component-model/ocm/pkg/utils"
+ "ocm.software/ocm/api/utils"
+ "ocm.software/ocm/api/utils/errkind"
)
type multiFormatVersion[T VersionedTypedObject] struct {
diff --git a/pkg/runtime/multi_test.go b/api/utils/runtime/multi_test.go
similarity index 96%
rename from pkg/runtime/multi_test.go
rename to api/utils/runtime/multi_test.go
index f47c969fd..46f4a435b 100644
--- a/pkg/runtime/multi_test.go
+++ b/api/utils/runtime/multi_test.go
@@ -5,7 +5,7 @@ import (
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
- "github.com/open-component-model/ocm/pkg/runtime"
+ "ocm.software/ocm/api/utils/runtime"
)
type TestSpecType = runtime.VersionedTypedObjectType[TestSpecRealm]
diff --git a/api/utils/runtime/object_test.go b/api/utils/runtime/object_test.go
new file mode 100644
index 000000000..a2fc4b226
--- /dev/null
+++ b/api/utils/runtime/object_test.go
@@ -0,0 +1,97 @@
+package runtime_test
+
+import (
+ . "github.com/onsi/ginkgo/v2"
+ . "github.com/onsi/gomega"
+
+ "ocm.software/ocm/api/utils/runtime"
+)
+
+var _ = Describe("*** basic types", func() {
+ Context("type name", func() {
+ It("one arg", func() {
+ t := runtime.TypeName("test")
+ Expect(t).To(Equal("test"))
+ })
+ It("two arg", func() {
+ t := runtime.TypeName("test", "v1")
+ Expect(t).To(Equal("test" + runtime.VersionSeparator + "v1"))
+ })
+ It("two arg empty", func() {
+ t := runtime.TypeName("test", "")
+ Expect(t).To(Equal("test"))
+ })
+ It("two arg", func() {
+ defer func() {
+ e := recover()
+ Expect(e).NotTo(BeNil())
+ }()
+ runtime.TypeName("test", "v1", "v3")
+ Fail("no panic")
+ })
+ })
+ Context("object type", func() {
+ It("gets the type", func() {
+ t := runtime.NewObjectType("test")
+ Expect(t.GetType()).To(Equal("test"))
+ })
+ It("sets the type", func() {
+ t := runtime.NewObjectType("test")
+ t.SetType("other")
+ Expect(t.GetType()).To(Equal("other"))
+ })
+ })
+
+ Context("versioned object type", func() {
+ It("get type and version of unversioned type", func() {
+ t := runtime.NewVersionedTypedObject("test", "")
+ Expect(t.GetType()).To(Equal("test"))
+ Expect(t.GetKind()).To(Equal("test"))
+ Expect(t.GetVersion()).To(Equal("v1"))
+ })
+ It("get type and version of versioned type", func() {
+ t := runtime.NewVersionedTypedObject("test", "v2")
+ Expect(t.GetType()).To(Equal(runtime.TypeName("test", "v2")))
+ Expect(t.GetKind()).To(Equal("test"))
+ Expect(t.GetVersion()).To(Equal("v2"))
+ })
+
+ It("set type", func() {
+ t := runtime.NewVersionedTypedObject("test", "v2")
+ t.SetType(runtime.TypeName("other", "v3"))
+ Expect(t.GetType()).To(Equal(runtime.TypeName("other", "v3")))
+ Expect(t.GetKind()).To(Equal("other"))
+ Expect(t.GetVersion()).To(Equal("v3"))
+ })
+
+ It("set kind on unversioned", func() {
+ t := runtime.NewVersionedTypedObject("test")
+ t.SetKind(runtime.TypeName("other"))
+ Expect(t.GetType()).To(Equal(runtime.TypeName("other")))
+ Expect(t.GetKind()).To(Equal("other"))
+ Expect(t.GetVersion()).To(Equal("v1"))
+ })
+ It("set version on unversioned", func() {
+ t := runtime.NewVersionedTypedObject("test")
+ t.SetVersion(runtime.TypeName("v3"))
+ Expect(t.GetType()).To(Equal(runtime.TypeName("test", "v3")))
+ Expect(t.GetKind()).To(Equal("test"))
+ Expect(t.GetVersion()).To(Equal("v3"))
+ })
+
+ It("set kind on versioned", func() {
+ t := runtime.NewVersionedTypedObject("test", "v2")
+ t.SetKind(runtime.TypeName("other"))
+ Expect(t.GetType()).To(Equal(runtime.TypeName("other", "v2")))
+ Expect(t.GetKind()).To(Equal("other"))
+ Expect(t.GetVersion()).To(Equal("v2"))
+ })
+ It("set version on unversioned", func() {
+ t := runtime.NewVersionedTypedObject("test", "v2")
+ t.SetVersion(runtime.TypeName("v3"))
+ Expect(t.GetType()).To(Equal(runtime.TypeName("test", "v3")))
+ Expect(t.GetKind()).To(Equal("test"))
+ Expect(t.GetVersion()).To(Equal("v3"))
+ })
+ })
+})
diff --git a/api/utils/runtime/scheme.go b/api/utils/runtime/scheme.go
new file mode 100644
index 000000000..095dcc7f9
--- /dev/null
+++ b/api/utils/runtime/scheme.go
@@ -0,0 +1,469 @@
+package runtime
+
+import (
+ "encoding/json"
+ "fmt"
+ "reflect"
+ "sort"
+ "sync"
+
+ "github.com/mandelsoft/goutils/errors"
+ "github.com/mandelsoft/goutils/general"
+ "github.com/mandelsoft/goutils/generics"
+ "github.com/modern-go/reflect2"
+
+ "ocm.software/ocm/api/utils"
+ "ocm.software/ocm/api/utils/errkind"
+)
+
+var (
+ typeTypedObject = reflect.TypeOf((*TypedObject)(nil)).Elem()
+ typeUnknown = reflect.TypeOf((*Unknown)(nil)).Elem()
+)
+
+type (
+ // TypedObjectDecoder is able to provide an effective typed object for some
+ // serilaized form. The technical deserialization is done by an Unmarshaler.
+ TypedObjectDecoder[T TypedObject] interface {
+ Decode(data []byte, unmarshaler Unmarshaler) (T, error)
+ }
+ _TypedObjectDecoder[T TypedObject] interface {
+ TypedObjectDecoder[T]
+ }
+)
+
+// TypedObjectEncoder is able to provide a versioned representation of
+// an effective TypedObject.
+type TypedObjectEncoder[T TypedObject] interface {
+ Encode(T, Marshaler) ([]byte, error)
+}
+
+type DirectDecoder[T TypedObject] struct {
+ proto reflect.Type
+}
+
+var _ TypedObjectDecoder[TypedObject] = &DirectDecoder[TypedObject]{}
+
+func MustNewDirectDecoder[T TypedObject](proto T) *DirectDecoder[T] {
+ d, err := NewDirectDecoder[T](proto)
+ if err != nil {
+ panic(err)
+ }
+ return d
+}
+
+func NewDirectDecoder[T TypedObject](proto T) (*DirectDecoder[T], error) {
+ t := MustProtoType(proto)
+ if !reflect.PtrTo(t).Implements(typeTypedObject) {
+ return nil, errors.Newf("object interface %T: must implement TypedObject", proto)
+ }
+ if t.Kind() != reflect.Struct {
+ return nil, errors.Newf("prototype %q must be a struct", t)
+ }
+ return &DirectDecoder[T]{
+ proto: t,
+ }, nil
+}
+
+func (d *DirectDecoder[T]) CreateInstance() T {
+ return reflect.New(d.proto).Interface().(T)
+}
+
+func (d *DirectDecoder[T]) Decode(data []byte, unmarshaler Unmarshaler) (T, error) {
+ var zero T
+ inst := d.CreateInstance()
+ err := unmarshaler.Unmarshal(data, inst)
+ if err != nil {
+ return zero, err
+ }
+
+ return inst, nil
+}
+
+func (d *DirectDecoder[T]) Encode(obj T, marshaler Marshaler) ([]byte, error) {
+ return marshaler.Marshal(obj)
+}
+
+// KnownTypes is a set of known type names mapped to appropriate object decoders.
+type KnownTypes[T TypedObject, R TypedObjectDecoder[T]] map[string]R
+
+// Copy provides a copy of the actually known types.
+func (t KnownTypes[T, R]) Copy() KnownTypes[T, R] {
+ n := KnownTypes[T, R]{}
+ for k, v := range t {
+ n[k] = v
+ }
+ return n
+}
+
+// TypeNames return a sorted list of known type names.
+func (t KnownTypes[T, R]) TypeNames() []string {
+ types := make([]string, 0, len(t))
+ for t := range t {
+ types = append(types, t)
+ }
+ sort.Strings(types)
+ return types
+}
+
+// Unknown is the interface to be implemented by
+// representations on an unknown, but nevertheless decoded specification
+// of a typed object.
+type Unknown interface {
+ IsUnknown() bool
+}
+
+func IsUnknown(o TypedObject) bool {
+ if reflect2.IsNil(o) {
+ return true
+ }
+ if u, ok := o.(Unknown); ok {
+ return u.IsUnknown()
+ }
+ return false
+}
+
+type (
+ // Scheme is the interface to describe a set of object types
+ // that implement a dedicated interface.
+ // As such it knows about the desired interface of the instances
+ // and can validate it. Additionally, it provides an implementation
+ // for generic unstructured objects that can be used to decode
+ // any serialized from of object candidates and provide the
+ // effective type.
+ Scheme[T TypedObject, R TypedObjectDecoder[T]] interface {
+ SchemeCommon
+ KnownTypesProvider[T, R]
+ TypedObjectEncoder[T]
+ TypedObjectDecoder[T]
+
+ BaseScheme() Scheme[T, R] // Go does not support an additional type parameter S Scheme[T,S] to return the correct type here
+
+ AddKnownTypes(scheme KnownTypesProvider[T, R])
+ RegisterByDecoder(typ string, decoder R) error
+
+ ValidateInterface(object T) error
+ CreateUnstructured() T
+ Convert(object TypedObject) (T, error)
+ GetDecoder(otype string) R
+ EnforceDecode(data []byte, unmarshaler Unmarshaler) (T, error)
+ }
+ _Scheme[T TypedObject, R TypedObjectDecoder[T]] interface { // cannot omit nesting, because Goland does not accept it
+ Scheme[T, R]
+ }
+)
+
+type KnownTypesProvider[T TypedObject, R TypedObjectDecoder[T]] interface {
+ KnownTypes() KnownTypes[T, R]
+}
+
+type SchemeCommon interface {
+ KnownTypeNames() []string
+}
+
+type defaultScheme[T TypedObject, R TypedObjectDecoder[T]] struct {
+ lock sync.RWMutex
+ base Scheme[T, R]
+ instance reflect.Type
+ unstructured reflect.Type
+ defaultdecoder TypedObjectDecoder[T]
+ acceptUnknown bool
+ types KnownTypes[T, R]
+}
+
+var _ Scheme[VersionedTypedObject, TypedObjectDecoder[VersionedTypedObject]] = (*defaultScheme[VersionedTypedObject, TypedObjectDecoder[VersionedTypedObject]])(nil)
+
+func MustNewDefaultScheme[T TypedObject, R TypedObjectDecoder[T]](protoUnstr Unstructured, acceptUnknown bool, defaultdecoder TypedObjectDecoder[T], base ...Scheme[T, R]) Scheme[T, R] {
+ return utils.Must(NewDefaultScheme[T](protoUnstr, acceptUnknown, defaultdecoder, base...))
+}
+
+func NewScheme[T TypedObject, R TypedObjectDecoder[T]](base ...Scheme[T, R]) Scheme[T, R] {
+ s, _ := NewDefaultScheme[T](nil, false, nil, base...)
+ return s
+}
+
+func NewDefaultScheme[T TypedObject, R TypedObjectDecoder[T]](protoUnstr Unstructured, acceptUnknown bool, defaultdecoder TypedObjectDecoder[T], base ...Scheme[T, R]) (Scheme[T, R], error) {
+ var err error
+
+ var protoIfce T
+ it := reflect.TypeOf(&protoIfce)
+ for it.Kind() == reflect.Ptr {
+ it = it.Elem()
+ }
+
+ var ut reflect.Type
+ if acceptUnknown {
+ ut, err = ProtoType(protoUnstr)
+ if err != nil {
+ return nil, errors.Wrapf(err, "unstructured prototype %T", protoUnstr)
+ }
+ if !reflect.PtrTo(ut).Implements(it) {
+ return nil, fmt.Errorf("unstructured type %T must implement %T to be acceptale as unknown result", protoUnstr, &protoIfce)
+ }
+ if !reflect.PtrTo(ut).Implements(typeUnknown) {
+ return nil, fmt.Errorf("unstructured type %T must implement Unknown to be acceptable as unknown result", protoUnstr)
+ }
+ }
+
+ return &defaultScheme[T, R]{
+ base: utils.Optional(base...),
+ instance: it,
+ unstructured: ut,
+ defaultdecoder: defaultdecoder,
+ types: KnownTypes[T, R]{},
+ acceptUnknown: acceptUnknown,
+ }, nil
+}
+
+func (d *defaultScheme[T, R]) BaseScheme() Scheme[T, R] {
+ return d.base
+}
+
+func (d *defaultScheme[T, R]) AddKnownTypes(s KnownTypesProvider[T, R]) {
+ d.lock.Lock()
+ defer d.lock.Unlock()
+ for k, v := range s.KnownTypes() {
+ d.types[k] = v
+ }
+}
+
+func (d *defaultScheme[T, R]) KnownTypes() KnownTypes[T, R] {
+ d.lock.RLock()
+ defer d.lock.RUnlock()
+ if d.base == nil {
+ return d.types.Copy()
+ }
+ kt := d.base.KnownTypes()
+ for n, t := range d.types {
+ kt[n] = t
+ }
+ return kt
+}
+
+// KnownTypeNames return a sorted list of known type names.
+func (d *defaultScheme[T, R]) KnownTypeNames() []string {
+ d.lock.RLock()
+ defer d.lock.RUnlock()
+
+ types := make([]string, 0, len(d.types))
+ for t := range d.types {
+ types = append(types, t)
+ }
+ if d.base != nil {
+ types = append(types, d.base.KnownTypeNames()...)
+ }
+ sort.Strings(types)
+ return types
+}
+
+func (d *defaultScheme[T, R]) RegisterByDecoder(typ string, decoder R) error {
+ if reflect2.IsNil(decoder) {
+ return errors.Newf("decoder must be given")
+ }
+ d.lock.Lock()
+ defer d.lock.Unlock()
+ d.types[typ] = decoder
+ return nil
+}
+
+func (d *defaultScheme[T, R]) ValidateInterface(object T) error {
+ t := reflect.TypeOf(object)
+ if !t.Implements(d.instance) {
+ return errors.Newf("object type %q does not implement required instance interface %q", t, d.instance)
+ }
+ return nil
+}
+
+func (d *defaultScheme[T, R]) GetDecoder(typ string) R {
+ d.lock.RLock()
+ defer d.lock.RUnlock()
+ decoder := d.types[typ]
+ if reflect2.IsNil(decoder) && d.base != nil {
+ decoder = d.base.GetDecoder(typ)
+ }
+ return decoder
+}
+
+func (d *defaultScheme[T, R]) CreateUnstructured() T {
+ var _nil T
+ if d.unstructured == nil {
+ return _nil
+ }
+ return reflect.New(d.unstructured).Interface().(T)
+}
+
+func (d *defaultScheme[T, R]) Encode(obj T, marshaler Marshaler) ([]byte, error) {
+ if marshaler == nil {
+ marshaler = DefaultYAMLEncoding
+ }
+ decoder := d.GetDecoder(obj.GetType())
+ if encoder, ok := generics.TryCast[TypedObjectEncoder[T]](decoder); ok {
+ return encoder.Encode(obj, marshaler)
+ }
+ return marshaler.Marshal(obj)
+}
+
+func (d *defaultScheme[T, R]) Decode(data []byte, unmarshal Unmarshaler) (T, error) {
+ var _nil T
+
+ var to TypedObject
+ un := d.CreateUnstructured()
+ if reflect2.IsNil(un) {
+ to = &UnstructuredTypedObject{}
+ } else {
+ to = un
+ }
+ if unmarshal == nil {
+ unmarshal = DefaultYAMLEncoding
+ }
+ err := unmarshal.Unmarshal(data, to)
+ if err != nil {
+ return _nil, errors.Wrapf(err, "cannot unmarshal unstructured")
+ }
+ if to.GetType() == "" {
+ return _nil, errors.Newf("no type found")
+ }
+ decoder := d.GetDecoder(to.GetType())
+ if reflect2.IsNil(decoder) {
+ if d.defaultdecoder != nil {
+ o, err := d.defaultdecoder.Decode(data, unmarshal)
+ if err == nil {
+ if !reflect2.IsNil(o) {
+ return o, nil
+ }
+ } else if !errors.IsErrUnknownKind(err, errkind.KIND_OBJECTTYPE) {
+ return _nil, err
+ }
+ }
+ if d.acceptUnknown {
+ return un, nil
+ }
+ return _nil, errors.ErrUnknown(errkind.KIND_OBJECTTYPE, to.GetType())
+ }
+ return decoder.Decode(data, unmarshal)
+}
+
+func (d *defaultScheme[T, R]) EnforceDecode(data []byte, unmarshal Unmarshaler) (T, error) {
+ var _nil T
+
+ un := d.CreateUnstructured()
+ if unmarshal == nil {
+ unmarshal = DefaultYAMLEncoding.Unmarshaler
+ }
+ err := unmarshal.Unmarshal(data, un)
+ if err != nil {
+ return _nil, errors.Wrapf(err, "cannot unmarshal unstructured")
+ }
+ if un.GetType() == "" {
+ if d.acceptUnknown {
+ return un, nil
+ }
+ return un, errors.Newf("no type found")
+ }
+ decoder := d.GetDecoder(un.GetType())
+ if reflect2.IsNil(decoder) {
+ if d.defaultdecoder != nil {
+ o, err := d.defaultdecoder.Decode(data, unmarshal)
+ if err == nil {
+ return o, nil
+ }
+ if !errors.IsErrUnknownKind(err, errkind.KIND_OBJECTTYPE) {
+ return un, err
+ }
+ }
+ if d.acceptUnknown {
+ return un, nil
+ }
+ return un, errors.ErrUnknown(errkind.KIND_OBJECTTYPE, un.GetType())
+ }
+ o, err := decoder.Decode(data, unmarshal)
+ if err != nil {
+ return un, err
+ }
+ return o, err
+}
+
+func (d *defaultScheme[T, R]) Convert(o TypedObject) (T, error) {
+ var _nil T
+
+ if o.GetType() == "" {
+ return _nil, errors.Newf("no type found")
+ }
+
+ if u, ok := o.(T); ok {
+ return u, nil
+ }
+
+ if u, ok := o.(Unstructured); ok {
+ raw, err := u.GetRaw()
+ if err != nil {
+ return _nil, err
+ }
+ return d.Decode(raw, DefaultJSONEncoding)
+ }
+
+ data, err := json.Marshal(o)
+ if err != nil {
+ return _nil, err
+ }
+ decoder := d.GetDecoder(o.GetType())
+ if reflect2.IsNil(decoder) {
+ if d.defaultdecoder != nil {
+ object, err := d.defaultdecoder.Decode(data, DefaultJSONEncoding)
+ if err == nil {
+ return object, nil
+ }
+ if !errors.IsErrUnknownKind(err, errkind.KIND_OBJECTTYPE) {
+ return _nil, err
+ }
+ }
+ return _nil, errors.ErrUnknown(errkind.KIND_OBJECTTYPE, o.GetType())
+ }
+ r, err := decoder.Decode(data, DefaultJSONEncoding)
+ if err != nil {
+ return _nil, err
+ }
+ if reflect.TypeOf(r) == reflect.TypeOf(o) {
+ return o.(T), nil
+ }
+ return r, nil
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+// TypeScheme is a scheme based on Types instead of decoders.
+type TypeScheme[T TypedObject, R TypedObjectType[T]] interface {
+ Scheme[T, R]
+
+ Register(typ R)
+ GetType(name string) R
+}
+
+type defaultTypeScheme[T TypedObject, R TypedObjectType[T]] struct {
+ _Scheme[T, R]
+}
+
+func MustNewDefaultTypeScheme[T TypedObject, R TypedObjectType[T]](protoUnstr Unstructured, acceptUnknown bool, defaultdecoder TypedObjectDecoder[T], base ...TypeScheme[T, R]) TypeScheme[T, R] {
+ return utils.Must(NewDefaultTypeScheme[T, R](protoUnstr, acceptUnknown, defaultdecoder, base...))
+}
+
+func NewTypeScheme[T TypedObject, R TypedObjectType[T]](base ...TypeScheme[T, R]) TypeScheme[T, R] {
+ s, _ := NewDefaultTypeScheme[T](nil, false, nil, base...)
+ return s
+}
+
+func NewDefaultTypeScheme[T TypedObject, R TypedObjectType[T]](protoUnstr Unstructured, acceptUnknown bool, defaultdecoder TypedObjectDecoder[T], base ...TypeScheme[T, R]) (TypeScheme[T, R], error) {
+ s, err := NewDefaultScheme[T](protoUnstr, acceptUnknown, defaultdecoder, generics.Cast[Scheme[T, R]](general.Optional(base...)))
+ if err != nil {
+ return nil, err
+ }
+ return &defaultTypeScheme[T, R]{s}, nil
+}
+
+func (s *defaultTypeScheme[T, R]) Register(t R) {
+ s.RegisterByDecoder(t.GetType(), t)
+}
+
+func (s *defaultTypeScheme[T, R]) GetType(name string) R {
+ return generics.Cast[R](s.GetDecoder(name))
+}
diff --git a/pkg/runtime/scheme_test.go b/api/utils/runtime/scheme_test.go
similarity index 95%
rename from pkg/runtime/scheme_test.go
rename to api/utils/runtime/scheme_test.go
index e275a4440..2f55fb955 100644
--- a/pkg/runtime/scheme_test.go
+++ b/api/utils/runtime/scheme_test.go
@@ -5,8 +5,8 @@ import (
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
- "github.com/open-component-model/ocm/pkg/runtime"
- "github.com/open-component-model/ocm/pkg/utils"
+ "ocm.software/ocm/api/utils"
+ "ocm.software/ocm/api/utils/runtime"
)
type TType runtime.TypedObjectDecoder[T]
diff --git a/pkg/runtime/suite_test.go b/api/utils/runtime/suite_test.go
similarity index 100%
rename from pkg/runtime/suite_test.go
rename to api/utils/runtime/suite_test.go
diff --git a/pkg/runtime/typedobject.go b/api/utils/runtime/typedobject.go
similarity index 100%
rename from pkg/runtime/typedobject.go
rename to api/utils/runtime/typedobject.go
diff --git a/pkg/runtime/unstructured.go b/api/utils/runtime/unstructured.go
similarity index 99%
rename from pkg/runtime/unstructured.go
rename to api/utils/runtime/unstructured.go
index 2e5020a8e..5587d98af 100644
--- a/pkg/runtime/unstructured.go
+++ b/api/utils/runtime/unstructured.go
@@ -10,7 +10,7 @@ import (
"github.com/modern-go/reflect2"
"github.com/sirupsen/logrus"
- "github.com/open-component-model/ocm/pkg/errkind"
+ "ocm.software/ocm/api/utils/errkind"
)
const ATTR_TYPE = "type"
diff --git a/pkg/runtime/unstructured_test.go b/api/utils/runtime/unstructured_test.go
similarity index 98%
rename from pkg/runtime/unstructured_test.go
rename to api/utils/runtime/unstructured_test.go
index d466a5418..ed85c6973 100644
--- a/pkg/runtime/unstructured_test.go
+++ b/api/utils/runtime/unstructured_test.go
@@ -9,8 +9,8 @@ import (
"github.com/mandelsoft/logging"
- ocmlog "github.com/open-component-model/ocm/pkg/logging"
- "github.com/open-component-model/ocm/pkg/runtime"
+ ocmlog "ocm.software/ocm/api/utils/logging"
+ "ocm.software/ocm/api/utils/runtime"
)
func InOut(log logging.Logger, in runtime.TypedObject, encoding runtime.Encoding) (runtime.TypedObject, string, error) {
diff --git a/pkg/runtime/unstructuredversioned.go b/api/utils/runtime/unstructuredversioned.go
similarity index 100%
rename from pkg/runtime/unstructuredversioned.go
rename to api/utils/runtime/unstructuredversioned.go
diff --git a/pkg/runtime/utils.go b/api/utils/runtime/utils.go
similarity index 100%
rename from pkg/runtime/utils.go
rename to api/utils/runtime/utils.go
diff --git a/pkg/runtime/validate.go b/api/utils/runtime/validate.go
similarity index 100%
rename from pkg/runtime/validate.go
rename to api/utils/runtime/validate.go
diff --git a/pkg/runtime/value.go b/api/utils/runtime/value.go
similarity index 100%
rename from pkg/runtime/value.go
rename to api/utils/runtime/value.go
diff --git a/api/utils/runtime/version_test.go b/api/utils/runtime/version_test.go
new file mode 100644
index 000000000..82d195c6c
--- /dev/null
+++ b/api/utils/runtime/version_test.go
@@ -0,0 +1,170 @@
+package runtime_test
+
+import (
+ "encoding/json"
+
+ . "github.com/mandelsoft/goutils/testutils"
+ . "github.com/onsi/ginkgo/v2"
+ . "github.com/onsi/gomega"
+
+ "ocm.software/ocm/api/utils/runtime"
+)
+
+const (
+ Type1 = "testType1"
+ Type1V1 = Type1 + "/v1"
+ Type1V2 = Type1 + "/v2"
+
+ Type2 = "testType2"
+ Type2V1 = Type2 + "/v1"
+)
+
+var versions runtime.Scheme[TestSpecRealm, TestType]
+
+func init() {
+ versions = runtime.MustNewDefaultScheme[TestSpecRealm, TestType](nil, false, nil)
+
+ versions.RegisterByDecoder(Type1, runtime.NewVersionedTypedObjectTypeByConverter[TestSpecRealm, *TestSpec1, *Spec1V1](Type1, &converterSpec1V1{}))
+ versions.RegisterByDecoder(Type1V1, runtime.NewVersionedTypedObjectTypeByConverter[TestSpecRealm, *TestSpec1, *Spec1V1](Type1V1, &converterSpec1V1{}))
+
+ versions.RegisterByDecoder(Type2, runtime.NewVersionedTypedObjectType[TestSpecRealm, *TestSpec2](Type2))
+ versions.RegisterByDecoder(Type2V1, runtime.NewVersionedTypedObjectType[TestSpecRealm, *TestSpec2](Type2V1))
+}
+
+type TestType runtime.TypedObjectDecoder[TestSpecRealm]
+
+// TestSpec is the realm.
+type TestSpecRealm interface {
+ runtime.VersionedTypedObject
+ TestFunction()
+}
+
+// TestSpec1 is a first implementation of the realm TestSpec.
+// It is used as internal version.
+type TestSpec1 struct {
+ runtime.InternalVersionedTypedObject[TestSpecRealm]
+ Field string `json:"field"`
+}
+
+func (a TestSpec1) MarshalJSON() ([]byte, error) {
+ return runtime.MarshalVersionedTypedObject(&a)
+}
+
+func (a *TestSpec2) TestFunction() {}
+
+func NewTestSpec1(field string) *TestSpec1 {
+ return &TestSpec1{
+ InternalVersionedTypedObject: runtime.NewInternalVersionedTypedObject[TestSpecRealm](versions, Type1),
+ Field: field,
+ }
+}
+
+// Spec1V1 is an old v1 version of a TestSpec1.
+type Spec1V1 struct {
+ runtime.ObjectVersionedType
+ OldField string `json:"oldField"`
+}
+
+type converterSpec1V1 struct{}
+
+var _ runtime.Converter[*TestSpec1, *Spec1V1] = (*converterSpec1V1)(nil)
+
+func (_ converterSpec1V1) ConvertFrom(in *TestSpec1) (*Spec1V1, error) {
+ return &Spec1V1{
+ ObjectVersionedType: runtime.NewVersionedObjectType(in.Type),
+ OldField: in.Field,
+ }, nil
+}
+
+func (_ converterSpec1V1) ConvertTo(in *Spec1V1) (*TestSpec1, error) {
+ return &TestSpec1{
+ InternalVersionedTypedObject: runtime.NewInternalVersionedTypedObject[TestSpecRealm](versions, in.Type),
+ Field: in.OldField,
+ }, nil
+}
+
+// Spec1V2 is an old v1 version of a TestSpec1.
+type Spec1V2 struct {
+ runtime.ObjectVersionedType
+ Field string `json:"field"`
+}
+
+type converterSpec1V2 struct{}
+
+var _ runtime.Converter[*TestSpec1, *Spec1V2] = (*converterSpec1V2)(nil)
+
+func (_ converterSpec1V2) ConvertFrom(in *TestSpec1) (*Spec1V2, error) {
+ return &Spec1V2{
+ ObjectVersionedType: runtime.NewVersionedObjectType(in.Type),
+ Field: in.Field,
+ }, nil
+}
+
+func (_ converterSpec1V2) ConvertTo(in *Spec1V2) (*TestSpec1, error) {
+ return &TestSpec1{
+ InternalVersionedTypedObject: runtime.NewInternalVersionedTypedObject[TestSpecRealm](versions, in.Type),
+ Field: in.Field,
+ }, nil
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+// TestSpec2 is a second implementation of the realm TestSpec.
+// It is used a internal version and v2.
+type TestSpec2 struct {
+ runtime.VersionedObjectType
+ Field string `json:"field"`
+}
+
+func (a *TestSpec1) TestFunction() {}
+
+func NewTestSpec2(field string) *TestSpec2 {
+ return &TestSpec2{
+ VersionedObjectType: runtime.VersionedObjectType{Type2},
+ Field: field,
+ }
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+type encoder interface {
+ getEncoder() int
+}
+
+type object struct{}
+
+func (_ *object) getEncoder() int {
+ return 1
+}
+
+var _ = Describe("versioned types", func() {
+ var versions runtime.Scheme[TestSpecRealm, TestType]
+
+ versions = runtime.MustNewDefaultScheme[TestSpecRealm, TestType](nil, false, nil)
+
+ versions.RegisterByDecoder(Type1, runtime.NewVersionedTypedObjectTypeByConverter[TestSpecRealm, *TestSpec1, *Spec1V1](Type1, &converterSpec1V1{}))
+ versions.RegisterByDecoder(Type1V1, runtime.NewVersionedTypedObjectTypeByConverter[TestSpecRealm, *TestSpec1, *Spec1V1](Type1V1, &converterSpec1V1{}))
+
+ versions.RegisterByDecoder(Type2, runtime.NewVersionedTypedObjectType[TestSpecRealm, *TestSpec2](Type2))
+ versions.RegisterByDecoder(Type2V1, runtime.NewVersionedTypedObjectType[TestSpecRealm, *TestSpec2](Type2V1))
+
+ It("marshals version for TestSpec1", func() {
+ s1 := NewTestSpec1("value")
+
+ data := Must(json.Marshal(s1))
+ Expect(string(data)).To(StringEqualWithContext(`{"type":"testType1","oldField":"value"}`))
+
+ spec := Must(versions.Decode(data, runtime.DefaultJSONEncoding))
+ Expect(spec).To(Equal(s1))
+ })
+
+ It("unmarshal version for TestSpec2", func() {
+ s1 := NewTestSpec2("value")
+
+ data := Must(json.Marshal(s1))
+ Expect(string(data)).To(StringEqualWithContext(`{"type":"testType2","field":"value"}`))
+
+ spec := Must(versions.Decode(data, runtime.DefaultJSONEncoding))
+ Expect(spec).To(Equal(s1))
+ })
+})
diff --git a/pkg/runtime/versionedtype.go b/api/utils/runtime/versionedtype.go
similarity index 99%
rename from pkg/runtime/versionedtype.go
rename to api/utils/runtime/versionedtype.go
index e04dd0b01..dce59ad28 100644
--- a/pkg/runtime/versionedtype.go
+++ b/api/utils/runtime/versionedtype.go
@@ -6,7 +6,7 @@ import (
"github.com/mandelsoft/goutils/errors"
"golang.org/x/exp/slices"
- "github.com/open-component-model/ocm/pkg/utils"
+ "ocm.software/ocm/api/utils"
)
const VersionSeparator = "/"
diff --git a/pkg/runtimefinalizer/object.go b/api/utils/runtimefinalizer/object.go
similarity index 100%
rename from pkg/runtimefinalizer/object.go
rename to api/utils/runtimefinalizer/object.go
diff --git a/api/utils/runtimefinalizer/object_test.go b/api/utils/runtimefinalizer/object_test.go
new file mode 100644
index 000000000..d1a2a6939
--- /dev/null
+++ b/api/utils/runtimefinalizer/object_test.go
@@ -0,0 +1,61 @@
+package runtimefinalizer_test
+
+import (
+ "fmt"
+ "runtime"
+ "time"
+
+ . "github.com/onsi/ginkgo/v2"
+ . "github.com/onsi/gomega"
+
+ "ocm.software/ocm/api/utils/runtimefinalizer"
+)
+
+type ObjectType struct {
+ kind string
+ id runtimefinalizer.ObjectIdentity
+ fi *runtimefinalizer.RuntimeFinalizer
+}
+
+func NewOType(kind string, r *runtimefinalizer.RuntimeFinalizationRecoder) *ObjectType {
+ id := runtimefinalizer.NewObjectIdentity(kind)
+ o := &ObjectType{
+ kind: kind,
+ id: id,
+ fi: runtimefinalizer.NewRuntimeFinalizer(id, r),
+ }
+ return o
+}
+
+func (o *ObjectType) Id() runtimefinalizer.ObjectIdentity {
+ return o.id
+}
+
+var _ = Describe("runtime finalizer", func() {
+ It("finalize with arbitrary method", func() {
+ r := &runtimefinalizer.RuntimeFinalizationRecoder{}
+
+ o1 := NewOType("test1", r)
+ o2 := NewOType("test1", r)
+
+ id1 := o1.Id()
+ id2 := o2.Id()
+
+ runtime.GC()
+ time.Sleep(time.Second)
+
+ fmt.Printf("still used (%s,%s)\n", o1.Id(), o2.Id())
+ Expect(len(r.Get())).To(Equal(0))
+
+ o1 = nil
+ runtime.GC()
+ time.Sleep(time.Second)
+ fmt.Printf("still used (%s)\n", o2.Id())
+ Expect(r.Get()).To(Equal([]runtimefinalizer.ObjectIdentity{id1}))
+
+ o2 = nil
+ runtime.GC()
+ time.Sleep(time.Second)
+ Expect(r.Get()).To(Equal([]runtimefinalizer.ObjectIdentity{id1, id2}))
+ })
+})
diff --git a/pkg/runtimefinalizer/suite_test.go b/api/utils/runtimefinalizer/suite_test.go
similarity index 100%
rename from pkg/runtimefinalizer/suite_test.go
rename to api/utils/runtimefinalizer/suite_test.go
diff --git a/pkg/utils/selector/selector.go b/api/utils/selector/selector.go
similarity index 100%
rename from pkg/utils/selector/selector.go
rename to api/utils/selector/selector.go
diff --git a/pkg/semverutils/sort.go b/api/utils/semverutils/sort.go
similarity index 100%
rename from pkg/semverutils/sort.go
rename to api/utils/semverutils/sort.go
diff --git a/pkg/semverutils/suite_test.go b/api/utils/semverutils/suite_test.go
similarity index 100%
rename from pkg/semverutils/suite_test.go
rename to api/utils/semverutils/suite_test.go
diff --git a/pkg/semverutils/utils.go b/api/utils/semverutils/utils.go
similarity index 100%
rename from pkg/semverutils/utils.go
rename to api/utils/semverutils/utils.go
diff --git a/pkg/semverutils/utils_test.go b/api/utils/semverutils/utils_test.go
similarity index 100%
rename from pkg/semverutils/utils_test.go
rename to api/utils/semverutils/utils_test.go
diff --git a/api/utils/spiff/options.go b/api/utils/spiff/options.go
new file mode 100644
index 000000000..fb39abafa
--- /dev/null
+++ b/api/utils/spiff/options.go
@@ -0,0 +1,166 @@
+package spiff
+
+import (
+ "fmt"
+
+ "github.com/mandelsoft/goutils/errors"
+ "github.com/mandelsoft/goutils/sliceutils"
+ "github.com/mandelsoft/spiff/spiffing"
+ "github.com/mandelsoft/vfs/pkg/cwdfs"
+ "github.com/mandelsoft/vfs/pkg/vfs"
+
+ "ocm.software/ocm/api/datacontext"
+ "ocm.software/ocm/api/datacontext/attrs/vfsattr"
+ "ocm.software/ocm/api/utils"
+)
+
+type Option interface {
+ ApplyToRequest(r *Request) error
+}
+
+type Options []Option
+
+func (o *Options) Add(opt Option) *Options {
+ if opt != nil {
+ *o = append(*o, opt)
+ }
+ return o
+}
+
+func (o Options) ApplyToRequest(r *Request) error {
+ for _, o := range o {
+ if o != nil {
+ err := o.ApplyToRequest(r)
+ if err != nil {
+ return err
+ }
+ }
+ }
+ return nil
+}
+
+func GetRequest(opts ...Option) (*Request, error) {
+ req := &Request{Mode: spiffing.MODE_DEFAULT}
+ err := Options(opts).ApplyToRequest(req)
+ if err != nil {
+ return nil, err
+ }
+ return req, nil
+}
+
+type OptionFunction func(r *Request) error
+
+func (f OptionFunction) ApplyToRequest(r *Request) error {
+ return f(r)
+}
+
+func FileSystem(fs vfs.FileSystem) OptionFunction {
+ return func(r *Request) error {
+ r.FileSystem = utils.FileSystem(fs)
+ return nil
+ }
+}
+
+func Context(ctx datacontext.Context) OptionFunction {
+ return FileSystem(vfsattr.Get(ctx))
+}
+
+func Values(values interface{}) OptionFunction {
+ return func(r *Request) error {
+ r.Values = values
+ return nil
+ }
+}
+
+func Functions(functions spiffing.Functions) OptionFunction {
+ return func(r *Request) error {
+ r.Functions = functions
+ return nil
+ }
+}
+
+func ValuesNode(values string) OptionFunction {
+ return func(r *Request) error {
+ r.ValuesNode = values
+ return nil
+ }
+}
+
+func StubData(name string, data []byte) OptionFunction {
+ return func(r *Request) error {
+ if len(data) > 0 {
+ r.Stubs = append(r.Stubs, spiffing.NewSourceData(name, data))
+ }
+ return nil
+ }
+}
+
+func TemplateData(name string, data []byte) OptionFunction {
+ return func(r *Request) error {
+ if len(data) == 0 {
+ return fmt.Errorf("no template data for " + name)
+ }
+ r.Template = spiffing.NewSourceData(name, data)
+ return nil
+ }
+}
+
+func StubFile(path string, fss ...vfs.FileSystem) OptionFunction {
+ return func(r *Request) error {
+ r.Stubs = append(r.Stubs, spiffing.NewSourceFile(path, utils.FileSystem(sliceutils.CopyAppend(fss, r.FileSystem)...)))
+ return nil
+ }
+}
+
+func TemplateFile(path string, fss ...vfs.FileSystem) OptionFunction {
+ return func(r *Request) error {
+ r.Template = spiffing.NewSourceFile(path, utils.FileSystem(sliceutils.CopyAppend(fss, r.FileSystem)...))
+ return nil
+ }
+}
+
+func WorkDir(path string) OptionFunction {
+ return func(r *Request) error {
+ fs, err := cwdfs.New(r.FileSystem, path)
+ if err != nil {
+ return errors.Wrapf(err, "cannot set working directory %s", path)
+ }
+ r.FileSystem = fs
+ return nil
+ }
+}
+
+func Mode(m int) OptionFunction {
+ return func(r *Request) error {
+ r.Mode = m
+ return nil
+ }
+}
+
+func Validated(schemedata []byte, opts ...Option) Option {
+ if schemedata == nil {
+ return Options(opts)
+ }
+ return OptionFunction(func(r *Request) error {
+ tmp := *r
+ tmp.Template = nil
+ tmp.Stubs = nil
+ err := Options(opts).ApplyToRequest(&tmp)
+ if err != nil {
+ return err
+ }
+ if tmp.Template != nil {
+ err = ValidateSourceByScheme(tmp.Template, schemedata)
+ if err != nil {
+ return errors.Wrapf(err, "template %s", tmp.Template.Name())
+ }
+ }
+ for _, s := range tmp.Stubs {
+ err = ValidateSourceByScheme(s, schemedata)
+ if err != nil {
+ return errors.Wrapf(err, "validating %s", s.Name())
+ }
+ }
+ return Options(opts).ApplyToRequest(r)
+ })
+}
diff --git a/pkg/spiff/spiff.go b/api/utils/spiff/spiff.go
similarity index 98%
rename from pkg/spiff/spiff.go
rename to api/utils/spiff/spiff.go
index 14821ee40..6199f13aa 100644
--- a/pkg/spiff/spiff.go
+++ b/api/utils/spiff/spiff.go
@@ -11,7 +11,7 @@ import (
"github.com/mandelsoft/vfs/pkg/vfs"
"github.com/modern-go/reflect2"
- "github.com/open-component-model/ocm/pkg/utils"
+ "ocm.software/ocm/api/utils"
)
type Request struct {
diff --git a/pkg/spiff/spiff_test.go b/api/utils/spiff/spiff_test.go
similarity index 89%
rename from pkg/spiff/spiff_test.go
rename to api/utils/spiff/spiff_test.go
index f4425644f..05d7ae42f 100644
--- a/pkg/spiff/spiff_test.go
+++ b/api/utils/spiff/spiff_test.go
@@ -7,7 +7,7 @@ import (
"github.com/mandelsoft/spiff/spiffing"
- "github.com/open-component-model/ocm/pkg/spiff"
+ "ocm.software/ocm/api/utils/spiff"
)
var _ = Describe("spiff", func() {
diff --git a/pkg/spiff/suite_test.go b/api/utils/spiff/suite_test.go
similarity index 100%
rename from pkg/spiff/suite_test.go
rename to api/utils/spiff/suite_test.go
diff --git a/pkg/spiff/validate.go b/api/utils/spiff/validate.go
similarity index 100%
rename from pkg/spiff/validate.go
rename to api/utils/spiff/validate.go
diff --git a/api/utils/subst/subst.go b/api/utils/subst/subst.go
new file mode 100644
index 000000000..55be2c96a
--- /dev/null
+++ b/api/utils/subst/subst.go
@@ -0,0 +1,201 @@
+package subst
+
+import (
+ "bytes"
+ "container/list"
+ "regexp"
+ "sync"
+
+ "github.com/mandelsoft/goutils/errors"
+ mlog "github.com/mandelsoft/logging"
+ "github.com/mandelsoft/vfs/pkg/vfs"
+ "github.com/mikefarah/yq/v4/pkg/yqlib"
+ glog "gopkg.in/op/go-logging.v1"
+ "gopkg.in/yaml.v3"
+
+ "ocm.software/ocm/api/utils"
+ ocmlog "ocm.software/ocm/api/utils/logging"
+ "ocm.software/ocm/api/utils/runtime"
+)
+
+type SubstitutionTarget interface {
+ SubstituteByData(path string, value []byte) error
+ SubstituteByValue(path string, value interface{}) error
+
+ Content() ([]byte, error)
+}
+
+func ParseFile(file string, fss ...vfs.FileSystem) (SubstitutionTarget, error) {
+ fs := utils.FileSystem(fss...)
+
+ data, err := utils.ReadFile(file, fs)
+ if err != nil {
+ return nil, errors.Wrapf(err, "cannot read file %q", file)
+ }
+ s, err := Parse(data)
+ if err != nil {
+ return nil, errors.Wrapf(err, "file %q", file)
+ }
+ return s, nil
+}
+
+func Parse(data []byte) (SubstitutionTarget, error) {
+ sync.OnceFunc(func() {
+ var lvl glog.Level
+ switch ocmlog.Context().GetDefaultLevel() {
+ case mlog.None:
+ fallthrough
+ case mlog.ErrorLevel:
+ lvl = glog.ERROR
+ case mlog.WarnLevel:
+ lvl = glog.WARNING
+ case mlog.InfoLevel:
+ lvl = glog.INFO
+ case mlog.DebugLevel:
+ fallthrough
+ case mlog.TraceLevel:
+ lvl = glog.DEBUG
+ }
+ glog.SetLevel(lvl, "yq-lib")
+ })()
+
+ var (
+ err error
+ fi fileinfo
+ )
+
+ fi.json = true
+ rdr := bytes.NewBuffer(data)
+ jsnDcdr := yqlib.NewJSONDecoder()
+
+ if err := jsnDcdr.Init(rdr); err != nil {
+ return nil, err
+ }
+
+ if fi.content, err = jsnDcdr.Decode(); err != nil {
+ fi.json = false
+ ymlPrfs := yqlib.NewDefaultYamlPreferences()
+ ymlDcdr := yqlib.NewYamlDecoder(ymlPrfs)
+ rdr = bytes.NewBuffer(data)
+ if err := ymlDcdr.Init(rdr); err != nil {
+ return nil, err
+ }
+ if fi.content, err = ymlDcdr.Decode(); err != nil {
+ return nil, err
+ }
+ }
+
+ fi.content.SetDocument(0)
+ fi.content.SetFilename("substitution-target")
+ fi.content.SetFileIndex(0)
+
+ return &fi, nil
+}
+
+type fileinfo struct {
+ content *yqlib.CandidateNode
+ json bool
+}
+
+func (f *fileinfo) Content() ([]byte, error) {
+ var enc yqlib.Encoder
+ if f.json {
+ prfs := yqlib.NewDefaultJsonPreferences()
+ prfs.ColorsEnabled = false
+ enc = yqlib.NewJSONEncoder(prfs)
+ } else {
+ prfs := yqlib.NewDefaultYamlPreferences()
+ enc = yqlib.NewYamlEncoder(prfs)
+ }
+
+ buf := bytes.NewBuffer([]byte{})
+ pw := yqlib.NewSinglePrinterWriter(buf)
+ p := yqlib.NewPrinter(enc, pw)
+ inptLst := list.New()
+ inptLst.PushBack(f.content)
+
+ if err := p.PrintResults(inptLst); err == nil {
+ return buf.Bytes(), nil
+ } else {
+ return nil, err
+ }
+}
+
+var sniffJson = regexp.MustCompile(`^\s*(\{|\[|")`)
+
+func (f *fileinfo) SubstituteByData(path string, value []byte) error {
+ var err error
+
+ if !f.json && sniffJson.Match(value) {
+ // yaml is generally a superset of json so we could just insert the json value
+ // into a yaml file and have a valid yaml.
+ // However having a yaml file that looks like a mix of yaml and json is off putting.
+ // So if the value looks like json and the target file is yaml we will first
+ // attempt to re-enode the value as yaml before inserting into the target document.
+ // However... we don't want to perform re-encoding for everything because if the
+ // value is actually yaml with some snippets in json style for readability
+ // purposes we don't want to unecessarily lose that styling. Hence the initial
+ // sniff test for json instead of always re-encoding.
+ var valueData interface{}
+ if err = runtime.DefaultJSONEncoding.Unmarshal(value, &valueData); err == nil {
+ if value, err = runtime.DefaultYAMLEncoding.Marshal(valueData); err != nil {
+ return err
+ }
+ }
+ }
+
+ m := &yaml.Node{}
+ if err = yaml.Unmarshal(value, m); err != nil {
+ return err
+ }
+
+ nd := &yqlib.CandidateNode{}
+ nd.SetDocument(0)
+ nd.SetFilename("value")
+ nd.SetFileIndex(0)
+
+ if err = nd.UnmarshalYAML(m.Content[0], map[string]*yqlib.CandidateNode{}); err != nil {
+ return err
+ }
+
+ return f.substituteByValue(path, nd)
+}
+
+func (f *fileinfo) SubstituteByValue(path string, value interface{}) error {
+ var mrshl func(interface{}) ([]byte, error)
+
+ if f.json {
+ mrshl = runtime.DefaultJSONEncoding.Marshal
+ } else {
+ mrshl = runtime.DefaultYAMLEncoding.Marshal
+ }
+
+ if bval, err := mrshl(value); err != nil {
+ return err
+ } else {
+ return f.SubstituteByData(path, bval)
+ }
+}
+
+func (f *fileinfo) substituteByValue(path string, value *yqlib.CandidateNode) error {
+ inptLst := list.New()
+ inptLst.PushBack(f.content)
+
+ vlLst := list.New()
+ vlLst.PushBack(value)
+
+ ctxt := yqlib.Context{MatchingNodes: inptLst}
+ ctxt.SetVariable("newValue", vlLst)
+
+ yqlib.InitExpressionParser()
+ expr := "." + path + " |= $newValue"
+
+ nd, err := yqlib.ExpressionParser.ParseExpression(expr)
+ if err != nil {
+ return err
+ }
+
+ ngvtr := yqlib.NewDataTreeNavigator()
+ _, err = ngvtr.GetMatchingNodes(ctxt, nd)
+ return err
+}
diff --git a/pkg/utils/subst/subst_test.go b/api/utils/subst/subst_test.go
similarity index 100%
rename from pkg/utils/subst/subst_test.go
rename to api/utils/subst/subst_test.go
diff --git a/pkg/utils/subst/suite_test.go b/api/utils/subst/suite_test.go
similarity index 100%
rename from pkg/utils/subst/suite_test.go
rename to api/utils/subst/suite_test.go
diff --git a/pkg/utils/suite_test.go b/api/utils/suite_test.go
similarity index 100%
rename from pkg/utils/suite_test.go
rename to api/utils/suite_test.go
diff --git a/pkg/utils/tarutils/compress.go b/api/utils/tarutils/compress.go
similarity index 100%
rename from pkg/utils/tarutils/compress.go
rename to api/utils/tarutils/compress.go
diff --git a/pkg/utils/tarutils/extract.go b/api/utils/tarutils/extract.go
similarity index 97%
rename from pkg/utils/tarutils/extract.go
rename to api/utils/tarutils/extract.go
index 4a6b300a2..cffea8c0d 100644
--- a/pkg/utils/tarutils/extract.go
+++ b/api/utils/tarutils/extract.go
@@ -9,8 +9,8 @@ import (
"github.com/mandelsoft/vfs/pkg/osfs"
"github.com/mandelsoft/vfs/pkg/vfs"
- "github.com/open-component-model/ocm/pkg/common/compression"
- "github.com/open-component-model/ocm/pkg/utils"
+ "ocm.software/ocm/api/utils"
+ "ocm.software/ocm/api/utils/compression"
)
// ExtractArchiveToFs wunpacks an archive to a filesystem.
diff --git a/api/utils/tarutils/list.go b/api/utils/tarutils/list.go
new file mode 100644
index 000000000..e02811456
--- /dev/null
+++ b/api/utils/tarutils/list.go
@@ -0,0 +1,53 @@
+package tarutils
+
+import (
+ "archive/tar"
+ "io"
+
+ "github.com/mandelsoft/goutils/errors"
+ "github.com/mandelsoft/vfs/pkg/osfs"
+ "github.com/mandelsoft/vfs/pkg/vfs"
+
+ "ocm.software/ocm/api/utils"
+ "ocm.software/ocm/api/utils/compression"
+)
+
+func ListArchiveContent(path string, fss ...vfs.FileSystem) ([]string, error) {
+ sfs := utils.OptionalDefaulted(osfs.New(), fss...)
+
+ f, err := sfs.Open(path)
+ if err != nil {
+ return nil, errors.Wrapf(err, "cannot open %s", path)
+ }
+ defer f.Close()
+ return ListArchiveContentFromReader(f)
+}
+
+func ListArchiveContentFromReader(r io.Reader) ([]string, error) {
+ in, _, err := compression.AutoDecompress(r)
+ if err != nil {
+ return nil, errors.Wrapf(err, "cannot determine compression")
+ }
+
+ var result []string
+
+ tr := tar.NewReader(in)
+ for {
+ header, err := tr.Next()
+ if err != nil {
+ if errors.Is(err, io.EOF) {
+ return result, nil
+ }
+ return nil, err
+ }
+
+ switch header.Typeflag {
+ case tar.TypeDir:
+ result = append(result, header.Name)
+ case tar.TypeSymlink, tar.TypeLink:
+ result = append(result, header.Name)
+ case tar.TypeReg:
+ result = append(result, header.Name)
+ }
+ }
+}
diff --git a/pkg/utils/tarutils/pack.go b/api/utils/tarutils/pack.go
similarity index 100%
rename from pkg/utils/tarutils/pack.go
rename to api/utils/tarutils/pack.go
diff --git a/pkg/utils/tarutils/pack_test.go b/api/utils/tarutils/pack_test.go
similarity index 96%
rename from pkg/utils/tarutils/pack_test.go
rename to api/utils/tarutils/pack_test.go
index 6acc25c54..15008f9d5 100644
--- a/pkg/utils/tarutils/pack_test.go
+++ b/api/utils/tarutils/pack_test.go
@@ -12,7 +12,7 @@ import (
"github.com/mandelsoft/goutils/errors"
"github.com/mandelsoft/vfs/pkg/osfs"
- "github.com/open-component-model/ocm/pkg/utils/tarutils"
+ "ocm.software/ocm/api/utils/tarutils"
)
var _ = Describe("tar utils mapping", func() {
diff --git a/pkg/utils/tarutils/suite_test.go b/api/utils/tarutils/suite_test.go
similarity index 100%
rename from pkg/utils/tarutils/suite_test.go
rename to api/utils/tarutils/suite_test.go
diff --git a/pkg/utils/tarutils/testdata/dir/dirlink b/api/utils/tarutils/testdata/dir/dirlink
similarity index 100%
rename from pkg/utils/tarutils/testdata/dir/dirlink
rename to api/utils/tarutils/testdata/dir/dirlink
diff --git a/pkg/utils/tarutils/testdata/dir/link b/api/utils/tarutils/testdata/dir/link
similarity index 100%
rename from pkg/utils/tarutils/testdata/dir/link
rename to api/utils/tarutils/testdata/dir/link
diff --git a/pkg/utils/tarutils/testdata/dir/regular b/api/utils/tarutils/testdata/dir/regular
similarity index 100%
rename from pkg/utils/tarutils/testdata/dir/regular
rename to api/utils/tarutils/testdata/dir/regular
diff --git a/pkg/utils/tarutils/testdata/dir/subdir/file b/api/utils/tarutils/testdata/dir/subdir/file
similarity index 100%
rename from pkg/utils/tarutils/testdata/dir/subdir/file
rename to api/utils/tarutils/testdata/dir/subdir/file
diff --git a/pkg/utils/tarutils/testdata/dir2/file2 b/api/utils/tarutils/testdata/dir2/file2
similarity index 100%
rename from pkg/utils/tarutils/testdata/dir2/file2
rename to api/utils/tarutils/testdata/dir2/file2
diff --git a/pkg/utils/tarutils/testdata/file b/api/utils/tarutils/testdata/file
similarity index 100%
rename from pkg/utils/tarutils/testdata/file
rename to api/utils/tarutils/testdata/file
diff --git a/pkg/utils/template/gotmpl.go b/api/utils/template/gotmpl.go
similarity index 100%
rename from pkg/utils/template/gotmpl.go
rename to api/utils/template/gotmpl.go
diff --git a/pkg/utils/template/merge.go b/api/utils/template/merge.go
similarity index 100%
rename from pkg/utils/template/merge.go
rename to api/utils/template/merge.go
diff --git a/pkg/utils/template/none.go b/api/utils/template/none.go
similarity index 100%
rename from pkg/utils/template/none.go
rename to api/utils/template/none.go
diff --git a/api/utils/template/registry.go b/api/utils/template/registry.go
new file mode 100644
index 000000000..44cee9731
--- /dev/null
+++ b/api/utils/template/registry.go
@@ -0,0 +1,114 @@
+package template
+
+import (
+ "fmt"
+ "strings"
+ "sync"
+
+ "github.com/mandelsoft/goutils/errors"
+ "github.com/mandelsoft/vfs/pkg/vfs"
+
+ "ocm.software/ocm/api/utils"
+)
+
+const KIND_TEMPLATER = "templater"
+
+type TemplaterFactory func(system vfs.FileSystem) Templater
+
+type Registry interface {
+ Register(name string, fac TemplaterFactory, desc string)
+ Create(name string, fs vfs.FileSystem) (Templater, error)
+ Describe(name string) (string, error)
+ KnownTypeNames() []string
+}
+
+type templaterInfo struct {
+ templater TemplaterFactory
+ description string
+}
+
+type registry struct {
+ lock sync.RWMutex
+ templaters map[string]templaterInfo
+}
+
+func NewRegistry() Registry {
+ return ®istry{
+ templaters: map[string]templaterInfo{},
+ }
+}
+
+func (r *registry) Register(name string, fac TemplaterFactory, desc string) {
+ r.lock.Lock()
+ defer r.lock.Unlock()
+
+ r.templaters[name] = templaterInfo{
+ templater: fac,
+ description: desc,
+ }
+}
+
+func (r *registry) Create(name string, fs vfs.FileSystem) (Templater, error) {
+ r.lock.RLock()
+ defer r.lock.RUnlock()
+
+ t, ok := r.templaters[name]
+ if !ok {
+ return nil, errors.ErrNotSupported(KIND_TEMPLATER, name)
+ }
+ return t.templater(fs), nil
+}
+
+func (r *registry) Describe(name string) (string, error) {
+ r.lock.RLock()
+ defer r.lock.RUnlock()
+
+ t, ok := r.templaters[name]
+ if !ok {
+ return "", errors.ErrNotSupported(KIND_TEMPLATER, name)
+ }
+ return t.description, nil
+}
+
+func (r *registry) KnownTypeNames() []string {
+ r.lock.RLock()
+ defer r.lock.RUnlock()
+
+ return utils.StringMapKeys(r.templaters)
+}
+
+func Usage(scheme Registry) string {
+ s := `
+There are several templaters that can be selected by the --templater option:
+`
+ for _, t := range scheme.KnownTypeNames() {
+ desc, err := scheme.Describe(t)
+ if err == nil {
+ var title string
+ idx := strings.Index(desc, "\n")
+ if idx >= 0 {
+ title = desc[:idx]
+ desc = desc[idx+1:]
+ }
+ if strings.TrimSpace(desc) == "" {
+ s = fmt.Sprintf("%s- %s %s\n\n", s, t, title)
+ } else {
+ s = fmt.Sprintf("%s- %s %s\n\n%s", s, t, title, utils.IndentLines(desc, " "))
+ }
+ if !strings.HasSuffix(s, "\n") {
+ s += "\n"
+ }
+ }
+ }
+ return s
+}
+
+var _registry = NewRegistry()
+
+func Register(name string, fac TemplaterFactory, desc string) {
+ _registry.Register(name, fac, desc)
+}
+
+func DefaultRegistry() Registry {
+ return _registry
+}
diff --git a/pkg/utils/template/spiff.go b/api/utils/template/spiff.go
similarity index 100%
rename from pkg/utils/template/spiff.go
rename to api/utils/template/spiff.go
diff --git a/pkg/utils/template/subst.go b/api/utils/template/subst.go
similarity index 100%
rename from pkg/utils/template/subst.go
rename to api/utils/template/subst.go
diff --git a/pkg/utils/template/template.go b/api/utils/template/template.go
similarity index 97%
rename from pkg/utils/template/template.go
rename to api/utils/template/template.go
index 069bf6daa..399e42b30 100644
--- a/pkg/utils/template/template.go
+++ b/api/utils/template/template.go
@@ -13,8 +13,8 @@ import (
"github.com/spf13/pflag"
"gopkg.in/yaml.v3"
- "github.com/open-component-model/ocm/pkg/runtime"
- utils2 "github.com/open-component-model/ocm/pkg/utils"
+ utils2 "ocm.software/ocm/api/utils"
+ "ocm.software/ocm/api/utils/runtime"
)
type Values map[string]interface{}
diff --git a/pkg/utils/template/template_test.go b/api/utils/template/template_test.go
similarity index 99%
rename from pkg/utils/template/template_test.go
rename to api/utils/template/template_test.go
index 5deca5edd..c84233a0b 100644
--- a/pkg/utils/template/template_test.go
+++ b/api/utils/template/template_test.go
@@ -10,7 +10,7 @@ import (
"github.com/mandelsoft/vfs/pkg/osfs"
"gopkg.in/yaml.v3"
- "github.com/open-component-model/ocm/pkg/utils/template"
+ "ocm.software/ocm/api/utils/template"
)
func TestConfig(t *testing.T) {
diff --git a/pkg/utils/template/testdata/env.values b/api/utils/template/testdata/env.values
similarity index 100%
rename from pkg/utils/template/testdata/env.values
rename to api/utils/template/testdata/env.values
diff --git a/pkg/testutils/doc.go b/api/utils/testutils/doc.go
similarity index 100%
rename from pkg/testutils/doc.go
rename to api/utils/testutils/doc.go
diff --git a/pkg/testutils/object.go b/api/utils/testutils/object.go
similarity index 100%
rename from pkg/testutils/object.go
rename to api/utils/testutils/object.go
diff --git a/pkg/testutils/package.go b/api/utils/testutils/package.go
similarity index 100%
rename from pkg/testutils/package.go
rename to api/utils/testutils/package.go
diff --git a/api/utils/testutils/package_test.go b/api/utils/testutils/package_test.go
new file mode 100644
index 000000000..13cd3a28b
--- /dev/null
+++ b/api/utils/testutils/package_test.go
@@ -0,0 +1,15 @@
+package testutils_test
+
+import (
+ . "github.com/onsi/ginkgo/v2"
+ . "github.com/onsi/gomega"
+
+ me "ocm.software/ocm/api/utils/testutils"
+)
+
+var _ = Describe("package tests", func() {
+ It("go module name", func() {
+ mod := me.Must(me.GetModuleName())
+ Expect(mod).To(Equal("ocm.software/ocm"))
+ })
+})
diff --git a/api/utils/testutils/signing_test.go b/api/utils/testutils/signing_test.go
new file mode 100644
index 000000000..ad88a136b
--- /dev/null
+++ b/api/utils/testutils/signing_test.go
@@ -0,0 +1,21 @@
+package testutils_test
+
+import (
+ . "github.com/onsi/ginkgo/v2"
+ . "github.com/onsi/gomega"
+
+ common "ocm.software/ocm/api/utils/misc"
+ "ocm.software/ocm/api/utils/testutils"
+)
+
+var _ = Describe("normalization", func() {
+ It("compares with substitution variables", func() {
+ exp := "A ${TEST}."
+ res := "A testcase."
+ vars := common.Properties{
+ "TEST": "testcase",
+ }
+ Expect(res).To(testutils.StringEqualTrimmedWithContext(exp, common.Properties{}, vars))
+ Expect(res).To(testutils.StringEqualTrimmedWithContext(exp, vars, common.Properties{}))
+ })
+})
diff --git a/pkg/testutils/string.go b/api/utils/testutils/string.go
similarity index 100%
rename from pkg/testutils/string.go
rename to api/utils/testutils/string.go
diff --git a/pkg/testutils/suite_test.go b/api/utils/testutils/suite_test.go
similarity index 100%
rename from pkg/testutils/suite_test.go
rename to api/utils/testutils/suite_test.go
diff --git a/pkg/testutils/tcp.go b/api/utils/testutils/tcp.go
similarity index 100%
rename from pkg/testutils/tcp.go
rename to api/utils/testutils/tcp.go
diff --git a/api/utils/testutils/utils.go b/api/utils/testutils/utils.go
new file mode 100644
index 000000000..5fab78670
--- /dev/null
+++ b/api/utils/testutils/utils.go
@@ -0,0 +1,157 @@
+package testutils
+
+import (
+ "encoding/json"
+ "fmt"
+ "io"
+
+ . "github.com/onsi/ginkgo/v2"
+ . "github.com/onsi/gomega"
+
+ "github.com/onsi/gomega/types"
+
+ "ocm.software/ocm/api/utils"
+ "ocm.software/ocm/api/utils/runtime"
+)
+
+func Close(c io.Closer, msg ...interface{}) {
+ DeferWithOffset(1, c.Close, msg...)
+}
+
+func Defer(f func() error, msg ...interface{}) {
+ DeferWithOffset(1, f, msg...)
+}
+
+func DeferWithOffset(o int, f func() error, msg ...interface{}) {
+ err := f()
+ if err != nil {
+ switch len(msg) {
+ case 0:
+ ExpectWithOffset(1+o, err).To(Succeed())
+ case 1:
+ Fail(fmt.Sprintf("%s: %s", msg[0], err), 1+o)
+ default:
+ Fail(fmt.Sprintf("%s: %s", fmt.Sprintf(msg[0].(string), msg[1:]...), err), 1+o)
+ }
+ }
+}
+
+func NotNil[T any](o T, extra ...interface{}) T {
+ ExpectWithOffset(1, o, extra...).NotTo(BeNil())
+ return o
+}
+
+func Must[T any](o T, err error) T {
+ ExpectWithOffset(1, err).To(Succeed())
+ return o
+}
+
+func Must2[T any, V any](a T, b V, err error) (T, V) {
+ ExpectWithOffset(1, err).To(Succeed())
+ return a, b
+}
+
+func Must3[T, U, V any](a T, b U, c V, err error) (T, U, V) {
+ ExpectWithOffset(1, err).To(Succeed())
+ return a, b, c
+}
+
+type result[T any] struct {
+ res T
+ err error
+}
+
+func (r result[T]) Must(offset ...int) T {
+ ExpectWithOffset(utils.Optional(offset...)+1, r.err).To(Succeed())
+ return r.res
+}
+
+func R[T any](o T, err error) result[T] {
+ return Calling(o, err)
+}
+
+func Calling[T any](o T, err error) result[T] {
+ return result[T]{o, err}
+}
+
+func MustWithOffset[T any](offset int, res result[T]) T {
+ ExpectWithOffset(offset+1, res.err).To(Succeed())
+ return res.res
+}
+
+func MustBeNonNil[T any](o T) T {
+ ExpectWithOffset(1, o).NotTo(BeNil())
+ return o
+}
+
+func MustBeSuccessful(actual ...interface{}) {
+ if actual[len(actual)-1] == nil {
+ return
+ }
+ err, ok := actual[len(actual)-1].(error)
+ if !ok {
+ Fail("no errors return", 1)
+ }
+ ExpectWithOffset(1, err).To(Succeed())
+}
+
+func MustBeSuccessfulWithOffset(offset int, err error) {
+ ExpectWithOffset(offset+1, err).To(Succeed())
+}
+
+func MustFailWithMessage(err error, msg string) {
+ ExpectWithOffset(1, err).To(HaveOccurred())
+ ExpectWithOffset(1, err.Error()).To(Equal(msg))
+}
+
+func ErrorFrom(args ...interface{}) error {
+ e, ok := args[len(args)-1].(error)
+ if !ok {
+ Fail("no errors return", 1)
+ }
+ return e
+}
+
+func ExpectError(values ...interface{}) types.Assertion {
+ return Expect(values[len(values)-1])
+}
+
+func AsString(actual interface{}) (string, error) {
+ s, ok := actual.(string)
+ if !ok {
+ b, ok := actual.([]byte)
+ if !ok {
+ return "", fmt.Errorf("Actual value is no string (or byte array), but a %T.", actual)
+ }
+ s = string(b)
+ }
+ return s, nil
+}
+
+func AsStructure(actual interface{}, substs ...Substitutions) (interface{}, error) {
+ var err error
+
+ s, ok := actual.(string)
+ if !ok {
+ b, ok := actual.([]byte)
+ if !ok {
+ b, err = json.Marshal(actual)
+ if err != nil {
+ return "", fmt.Errorf("Actual value (%T) is no string, byte array, or serializable object.", actual)
+ }
+ }
+ s = string(b)
+ }
+ if subst := MergeSubst(substs...); len(subst) != 0 {
+ s, err = eval(s, subst)
+ if err != nil {
+ return nil, err
+ }
+ }
+ var value interface{}
+ err = runtime.DefaultYAMLEncoding.Unmarshal([]byte(s), &value)
+ if err != nil {
+ return nil, err
+ }
+ return value, nil
+}
diff --git a/pkg/testutils/yaml.go b/api/utils/testutils/yaml.go
similarity index 96%
rename from pkg/testutils/yaml.go
rename to api/utils/testutils/yaml.go
index 8af97b75c..f4ab69bd2 100644
--- a/pkg/testutils/yaml.go
+++ b/api/utils/testutils/yaml.go
@@ -9,7 +9,7 @@ import (
"github.com/onsi/gomega/format"
"github.com/onsi/gomega/types"
- "github.com/open-component-model/ocm/pkg/runtime"
+ "ocm.software/ocm/api/utils/runtime"
)
// YAMLEqual compares two yaml structures.
diff --git a/pkg/utils/time.go b/api/utils/time.go
similarity index 100%
rename from pkg/utils/time.go
rename to api/utils/time.go
diff --git a/pkg/utils/unwrap.go b/api/utils/unwrap.go
similarity index 100%
rename from pkg/utils/unwrap.go
rename to api/utils/unwrap.go
diff --git a/pkg/utils/url.go b/api/utils/url.go
similarity index 100%
rename from pkg/utils/url.go
rename to api/utils/url.go
diff --git a/api/utils/utils.go b/api/utils/utils.go
new file mode 100644
index 000000000..b51a48bce
--- /dev/null
+++ b/api/utils/utils.go
@@ -0,0 +1,357 @@
+package utils
+
+import (
+ "archive/tar"
+ "bytes"
+ "compress/gzip"
+ crypto "crypto/rand"
+ "encoding/json"
+ "errors"
+ "fmt"
+ "io"
+ "math/big"
+ "math/rand"
+ "net/http"
+ "os"
+ "reflect"
+ "sort"
+ "strings"
+ "time"
+
+ "github.com/mandelsoft/vfs/pkg/vfs"
+ "github.com/modern-go/reflect2"
+ "github.com/spf13/cobra"
+ "golang.org/x/exp/maps"
+ "golang.org/x/exp/slices"
+ "sigs.k8s.io/yaml"
+
+ ocmlog "ocm.software/ocm/api/utils/logging"
+)
+
+// PrintPrettyYaml prints the given objects as yaml if enabled.
+func PrintPrettyYaml(obj interface{}, enabled bool) {
+ if !enabled {
+ return
+ }
+
+ data, err := yaml.Marshal(obj)
+ if err != nil {
+ //nolint: forbidigo // Intentional Println to not mess up potential output parsers.
+ fmt.Println(err)
+ return
+ }
+
+ //nolint: forbidigo // Intentional Println.
+ fmt.Println(string(data))
+}
+
+// GetFileType returns the mimetype of a file.
+func GetFileType(fs vfs.FileSystem, path string) (string, error) {
+ file, err := fs.Open(path)
+ if err != nil {
+ return "", err
+ }
+ defer file.Close()
+ // see http://golang.org/pkg/net/http/#DetectContentType for the 512 bytes
+ buf := make([]byte, 512)
+ _, err = file.Read(buf)
+ if err != nil {
+ return "", err
+ }
+ return http.DetectContentType(buf), nil
+}
+
+// CleanMarkdownUsageFunc removes Markdown tags from the long usage of the command.
+// With this func it is possible to generate the Markdown docs but still have readable commandline help func.
+// Note: currently only "" tags are removed.
+func CleanMarkdownUsageFunc(cmd *cobra.Command) {
+ defaultHelpFunc := cmd.HelpFunc()
+ cmd.SetHelpFunc(func(cmd *cobra.Command, s []string) {
+ cmd.Long = strings.ReplaceAll(cmd.Long, "", "")
+ cmd.Long = strings.ReplaceAll(cmd.Long, "
", "")
+ defaultHelpFunc(cmd, s)
+ })
+}
+
+// RawJSON converts an arbitrary value to json.RawMessage.
+func RawJSON(value interface{}) (*json.RawMessage, error) {
+ jsonval, err := json.Marshal(value)
+ if err != nil {
+ return nil, err
+ }
+ return (*json.RawMessage)(&jsonval), nil
+}
+
+// Gzip applies gzip compression to an arbitrary byte slice.
+func Gzip(data []byte, compressionLevel int) ([]byte, error) {
+ buf := bytes.NewBuffer([]byte{})
+ gzipWriter, err := gzip.NewWriterLevel(buf, compressionLevel)
+ if err != nil {
+ return nil, fmt.Errorf("unable to create gzip writer: %w", err)
+ }
+ defer gzipWriter.Close()
+
+ if _, err = gzipWriter.Write(data); err != nil {
+ return nil, fmt.Errorf("unable to write to stream: %w", err)
+ }
+
+ if err = gzipWriter.Close(); err != nil {
+ return nil, fmt.Errorf("unable to close writer: %w", err)
+ }
+
+ return buf.Bytes(), nil
+}
+
+var chars = []rune("abcdefghijklmnopqrstuvwxyz1234567890")
+
+// RandomString creates a new random string with the given length.
+func RandomString(n int) string {
+ b := make([]rune, n)
+ for i := range b {
+ var value int
+ if v, err := crypto.Int(crypto.Reader, big.NewInt(int64(len(chars)))); err == nil {
+ value = int(v.Int64())
+ } else {
+ // insecure fallback to provide a valid result
+ ocmlog.Logger().Error("failed to generate random number", "error", err.Error())
+ value = rand.Intn(len(chars)) //nolint: gosec // only used as fallback
+ }
+ b[i] = chars[value]
+ }
+ return string(b)
+}
+
+// SafeConvert converts a byte slice to string.
+// If the byte slice is nil, an empty string is returned.
+func SafeConvert(bytes []byte) string {
+ if bytes == nil {
+ return ""
+ }
+
+ return string(bytes)
+}
+
+const (
+ BYTE = 1.0 << (10 * iota)
+ KIBIBYTE
+ MEBIBYTE
+ GIBIBYTE
+)
+
+// BytesString converts bytes into a human-readable string.
+// This function is inspired by https://www.reddit.com/r/golang/comments/8micn7/review_bytes_to_human_readable_format/
+func BytesString(bytes uint64, accuracy int) string {
+ unit := ""
+ value := float32(bytes)
+
+ switch {
+ case bytes >= GIBIBYTE:
+ unit = "GiB"
+ value /= GIBIBYTE
+ case bytes >= MEBIBYTE:
+ unit = "MiB"
+ value /= MEBIBYTE
+ case bytes >= KIBIBYTE:
+ unit = "KiB"
+ value /= KIBIBYTE
+ case bytes >= BYTE:
+ unit = "bytes"
+ case bytes == 0:
+ return "0"
+ }
+
+ stringValue := strings.TrimSuffix(
+ fmt.Sprintf("%.2f", value), "."+strings.Repeat("0", accuracy),
+ )
+
+ return fmt.Sprintf("%s %s", stringValue, unit)
+}
+
+// WriteFileToTARArchive writes a new file with name=filename and content=contentReader to archiveWriter.
+func WriteFileToTARArchive(filename string, contentReader io.Reader, archiveWriter *tar.Writer) error {
+ if filename == "" {
+ return errors.New("filename must not be empty")
+ }
+
+ if contentReader == nil {
+ return errors.New("contentReader must not be nil")
+ }
+
+ if archiveWriter == nil {
+ return errors.New("archiveWriter must not be nil")
+ }
+
+ tempfile, err := os.CreateTemp("", "")
+ if err != nil {
+ return fmt.Errorf("unable to create tempfile: %w", err)
+ }
+ defer func() {
+ tempfile.Close()
+ os.Remove(tempfile.Name())
+ }()
+
+ fsize, err := io.Copy(tempfile, contentReader)
+ if err != nil {
+ return fmt.Errorf("unable to copy content to tempfile: %w", err)
+ }
+
+ if _, err := tempfile.Seek(0, io.SeekStart); err != nil {
+ return fmt.Errorf("unable to seek to beginning of tempfile: %w", err)
+ }
+
+ header := tar.Header{
+ Name: filename,
+ Size: fsize,
+ Mode: 0o600,
+ ModTime: time.Now(),
+ }
+
+ if err := archiveWriter.WriteHeader(&header); err != nil {
+ return fmt.Errorf("unable to write tar header: %w", err)
+ }
+
+ if _, err := io.Copy(archiveWriter, tempfile); err != nil {
+ return fmt.Errorf("unable to write file to tar archive: %w", err)
+ }
+
+ return nil
+}
+
+func IndentLines(orig string, gap string, skipfirst ...bool) string {
+ return JoinIndentLines(strings.Split(strings.TrimPrefix(orig, "\n"), "\n"), gap, skipfirst...)
+}
+
+func JoinIndentLines(orig []string, gap string, skipfirst ...bool) string {
+ if len(orig) == 0 {
+ return ""
+ }
+ skip := false
+ for _, b := range skipfirst {
+ skip = skip || b
+ }
+
+ s := ""
+ if !skip {
+ s = gap
+ }
+ return s + strings.Join(orig, "\n"+gap)
+}
+
+func StringMapKeys[K ~string, E any](m map[K]E) []K {
+ if m == nil {
+ return nil
+ }
+ keys := maps.Keys(m)
+ slices.Sort(keys)
+ return keys
+}
+
+type Comparable[K any] interface {
+ Compare(o K) int
+}
+
+func Sort[K Comparable[K]](a []K) {
+ sort.Slice(a, func(i, j int) bool { return a[i].Compare(a[j]) < 0 })
+}
+
+func MapKeys[K comparable, E any](m map[K]E) []K {
+ if m == nil {
+ return nil
+ }
+
+ keys := []K{}
+ for k := range m {
+ keys = append(keys, k)
+ }
+ return keys
+}
+
+type ComparableMapKey[K any] interface {
+ Comparable[K]
+ comparable
+}
+
+func SortedMapKeys[K ComparableMapKey[K], E any](m map[K]E) []K {
+ if m == nil {
+ return nil
+ }
+
+ keys := []K{}
+ for k := range m {
+ keys = append(keys, k)
+ }
+ Sort(keys)
+ return keys
+}
+
+// Optional returns the first optional non-zero element given as variadic argument,
+// if given, or the zero element as default.
+func Optional[T any](list ...T) T {
+ var zero T
+ for _, e := range list {
+ if !reflect.DeepEqual(e, zero) {
+ return e
+ }
+ }
+ return zero
+}
+
+// OptionalDefaulted returns the first optional non-nil element given as variadic
+// argument, or the given default element. For value types a given zero
+// argument is excepted, also.
+func OptionalDefaulted[T any](def T, list ...T) T {
+ for _, e := range list {
+ if !reflect2.IsNil(e) {
+ return e
+ }
+ }
+ return def
+}
+
+// OptionalDefaultedBool checks all args for true. If arg is given
+// the given default is returned.
+func OptionalDefaultedBool(def bool, list ...bool) bool {
+ if len(list) == 0 {
+ return def
+ }
+ for _, e := range list {
+ if e {
+ return e
+ }
+ }
+ return false
+}
+
+// GetOptionFlag returns the flag value used to set a bool option
+// based on optionally specified explicit value(s).
+// The default value is to enable the option (true).
+func GetOptionFlag(list ...bool) bool {
+ return OptionalDefaultedBool(true, list...)
+}
+
+func IsNil(o interface{}) bool {
+ return reflect2.IsNil(o)
+}
+
+// Must expect a result to be provided without error.
+func Must[T any](o T, err error) T {
+ if err != nil {
+ panic(fmt.Errorf("expected a %T, but got error %w", o, err))
+ }
+ return o
+}
+
+func IgnoreError(_ error) {
+}
+
+func BoolP[T ~bool](b T) *bool {
+ v := bool(b)
+ return &v
+}
+
+func AsBool(b *bool, def ...bool) bool {
+ if b == nil && len(def) > 0 {
+ return Optional(def...)
+ }
+ return b != nil && *b
+}
diff --git a/api/utils/utils_test.go b/api/utils/utils_test.go
new file mode 100644
index 000000000..19af6c8aa
--- /dev/null
+++ b/api/utils/utils_test.go
@@ -0,0 +1,79 @@
+package utils_test
+
+import (
+ "archive/tar"
+ "bytes"
+ "io"
+
+ . "github.com/onsi/ginkgo/v2"
+ . "github.com/onsi/gomega"
+
+ "ocm.software/ocm/api/utils"
+)
+
+var _ = Describe("utils", func() {
+ Context("WriteFileToTARArchive", func() {
+ It("should write file", func() {
+ fname := "testfile"
+ content := []byte("testcontent")
+
+ archiveBuf := bytes.NewBuffer([]byte{})
+ tw := tar.NewWriter(archiveBuf)
+
+ Expect(utils.WriteFileToTARArchive(fname, bytes.NewReader(content), tw)).To(Succeed())
+ Expect(tw.Close()).To(Succeed())
+
+ tr := tar.NewReader(archiveBuf)
+ fheader, err := tr.Next()
+ Expect(err).ToNot(HaveOccurred())
+ Expect(fheader.Name).To(Equal(fname))
+
+ actualContentBuf := bytes.NewBuffer([]byte{})
+ _, err = io.Copy(actualContentBuf, tr)
+ Expect(err).ToNot(HaveOccurred())
+ Expect(actualContentBuf.Bytes()).To(Equal(content))
+
+ _, err = tr.Next()
+ Expect(err).To(Equal(io.EOF))
+ })
+
+ It("should write empty file", func() {
+ fname := "testfile"
+
+ archiveBuf := bytes.NewBuffer([]byte{})
+ tw := tar.NewWriter(archiveBuf)
+
+ Expect(utils.WriteFileToTARArchive(fname, bytes.NewReader([]byte{}), tw)).To(Succeed())
+ Expect(tw.Close()).To(Succeed())
+
+ tr := tar.NewReader(archiveBuf)
+ fheader, err := tr.Next()
+ Expect(err).ToNot(HaveOccurred())
+ Expect(fheader.Name).To(Equal(fname))
+
+ actualContentBuf := bytes.NewBuffer([]byte{})
+ contentLenght, err := io.Copy(actualContentBuf, tr)
+ Expect(err).ToNot(HaveOccurred())
+ Expect(contentLenght).To(Equal(int64(0)))
+
+ _, err = tr.Next()
+ Expect(err).To(Equal(io.EOF))
+ })
+
+ It("should return error if filename is empty", func() {
+ tw := tar.NewWriter(bytes.NewBuffer([]byte{}))
+ contentReader := bytes.NewReader([]byte{})
+ Expect(utils.WriteFileToTARArchive("", contentReader, tw)).To(MatchError("filename must not be empty"))
+ })
+
+ It("should return error if contentReader is nil", func() {
+ tw := tar.NewWriter(bytes.NewBuffer([]byte{}))
+ Expect(utils.WriteFileToTARArchive("testfile", nil, tw)).To(MatchError("contentReader must not be nil"))
+ })
+
+ It("should return error if outArchive is nil", func() {
+ contentReader := bytes.NewReader([]byte{})
+ Expect(utils.WriteFileToTARArchive("testfile", contentReader, nil)).To(MatchError("archiveWriter must not be nil"))
+ })
+ })
+})
diff --git a/pkg/utils/validate.go b/api/utils/validate.go
similarity index 100%
rename from pkg/utils/validate.go
rename to api/utils/validate.go
diff --git a/pkg/version/generate/release_generate.go b/api/version/generate/release_generate.go
similarity index 100%
rename from pkg/version/generate/release_generate.go
rename to api/version/generate/release_generate.go
diff --git a/api/version/version.go b/api/version/version.go
new file mode 100644
index 000000000..74ea3d26f
--- /dev/null
+++ b/api/version/version.go
@@ -0,0 +1,116 @@
+package version
+
+import (
+ "fmt"
+ "runtime"
+ "strconv"
+ "strings"
+
+ "github.com/Masterminds/semver/v3"
+
+ "ocm.software/ocm"
+)
+
+var (
+ gitVersion = "0.0.0-dev"
+ gitCommit string
+ gitTreeState string
+ buildDate = "1970-01-01T00:00:00Z"
+)
+
+func init() {
+ if gitVersion == "0.0.0-dev" {
+ // gitVersion = strings.TrimSpace(string(MustAsset("../../VERSION")))
+ gitVersion = strings.TrimSpace(ocm.Version)
+ }
+}
+
+type Info struct {
+ Major string `json:"major"`
+ Minor string `json:"minor"`
+ Patch string `json:"patch"`
+ PreRelease string `json:"prerelease"`
+ Meta string `json:"meta"`
+ GitVersion string `json:"gitVersion"`
+ GitCommit string `json:"gitCommit"`
+ GitTreeState string `json:"gitTreeState"`
+ BuildDate string `json:"buildDate"`
+ GoVersion string `json:"goVersion"`
+ Compiler string `json:"compiler"`
+ Platform string `json:"platform"`
+}
+
+// String returns info as a human-friendly version string.
+func (info Info) String() string {
+ return info.GitVersion
+}
+
+// String returns info as a short semantic version string (0.8.15).
+func (info Info) SemVer() string {
+ return info.Major + "." + info.Minor + "." + info.Patch
+}
+
+// String returns current Release version.
+func Current() string {
+ return Get().SemVer()
+}
+
+// GetInterface returns the overall codebase version. It's for detecting
+// what code a binary was built from.
+// These variables typically come from -ldflags settings and in
+// their absence fallback to the settings in pkg/version/base.go.
+func Get() Info {
+ var (
+ gitMajor string
+ gitMinor string
+ gitPatch string = "0"
+ gitPre string
+ gitMeta string
+ )
+
+ v, err := semver.NewVersion(gitVersion)
+ if err == nil {
+ gitMajor = strconv.Itoa(int(v.Major()))
+ gitMinor = strconv.Itoa(int(v.Minor()))
+ gitPatch = strconv.Itoa(int(v.Patch()))
+ gitPre = v.Prerelease()
+ gitMeta = v.Metadata()
+ } else {
+ version := gitVersion
+ if i := strings.Index(version, "-"); i >= 0 {
+ gitPre = version[i+1:]
+ version = version[:i]
+ }
+ if i := strings.Index(version, "+"); i >= 0 {
+ gitMeta = version[i+1:]
+ version = version[:i]
+ }
+ if i := strings.Index(gitPre, "+"); i >= 0 {
+ gitMeta = gitPre[i+1:]
+ gitPre = gitPre[:i]
+ }
+ v := strings.Split(version, ".")
+ if len(v) >= 2 {
+ gitMajor = v[0]
+ gitMinor = v[1]
+ if len(v) >= 3 {
+ gitPatch = v[2]
+ }
+ }
+ }
+
+ return Info{
+ Major: gitMajor,
+ Minor: gitMinor,
+ Patch: gitPatch,
+ PreRelease: gitPre,
+ Meta: gitMeta,
+ GitVersion: gitVersion,
+ GitCommit: gitCommit,
+ GitTreeState: gitTreeState,
+ BuildDate: buildDate,
+ GoVersion: runtime.Version(),
+ Compiler: runtime.Compiler,
+ Platform: fmt.Sprintf("%s/%s", runtime.GOOS, runtime.GOARCH),
+ }
+}
diff --git a/cmds/cliplugin/cmds/check/cmd.go b/cmds/cliplugin/cmds/check/cmd.go
index a56de5975..d63969603 100644
--- a/cmds/cliplugin/cmds/check/cmd.go
+++ b/cmds/cliplugin/cmds/check/cmd.go
@@ -7,13 +7,13 @@ import (
"time"
// bind OCM configuration.
- _ "github.com/open-component-model/ocm/pkg/contexts/ocm/plugin/ppi/config"
+ _ "ocm.software/ocm/api/ocm/plugin/ppi/config"
"github.com/mandelsoft/goutils/errors"
"github.com/mandelsoft/logging"
"github.com/spf13/cobra"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
+ "ocm.software/ocm/api/ocm"
)
const Name = "check"
diff --git a/cmds/cliplugin/cmds/check/config.go b/cmds/cliplugin/cmds/check/config.go
index 7caed81da..457172713 100644
--- a/cmds/cliplugin/cmds/check/config.go
+++ b/cmds/cliplugin/cmds/check/config.go
@@ -1,8 +1,8 @@
package check
import (
- cfgcpi "github.com/open-component-model/ocm/pkg/contexts/config/cpi"
- "github.com/open-component-model/ocm/pkg/runtime"
+ cfgcpi "ocm.software/ocm/api/config/cpi"
+ "ocm.software/ocm/api/utils/runtime"
)
const (
diff --git a/cmds/cliplugin/cmds/cmd_test.go b/cmds/cliplugin/cmds/cmd_test.go
index 6799f19ba..50671fa3e 100644
--- a/cmds/cliplugin/cmds/cmd_test.go
+++ b/cmds/cliplugin/cmds/cmd_test.go
@@ -8,14 +8,14 @@ import (
. "github.com/mandelsoft/goutils/testutils"
. "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/contexts/ocm/plugin/testutils"
+ . "ocm.software/ocm/api/ocm/plugin/testutils"
+ . "ocm.software/ocm/cmds/ocm/testhelper"
"github.com/mandelsoft/logging/logrusl"
"github.com/mandelsoft/logging/utils"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/attrs/plugincacheattr"
- "github.com/open-component-model/ocm/pkg/version"
+ "ocm.software/ocm/api/ocm/extensions/attrs/plugincacheattr"
+ "ocm.software/ocm/api/version"
)
const KIND = "rhubarb"
diff --git a/cmds/cliplugin/main.go b/cmds/cliplugin/main.go
index 4a7f49006..8115bed27 100644
--- a/cmds/cliplugin/main.go
+++ b/cmds/cliplugin/main.go
@@ -4,13 +4,13 @@ import (
"os"
// enable mandelsoft plugin logging configuration.
- _ "github.com/open-component-model/ocm/pkg/contexts/ocm/plugin/ppi/logging"
+ _ "ocm.software/ocm/api/ocm/plugin/ppi/logging"
- "github.com/open-component-model/ocm/cmds/cliplugin/cmds/check"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/plugin/ppi"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/plugin/ppi/clicmd"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/plugin/ppi/cmds"
- "github.com/open-component-model/ocm/pkg/version"
+ "ocm.software/ocm/api/ocm/plugin/ppi"
+ "ocm.software/ocm/api/ocm/plugin/ppi/clicmd"
+ "ocm.software/ocm/api/ocm/plugin/ppi/cmds"
+ "ocm.software/ocm/api/version"
+ "ocm.software/ocm/cmds/cliplugin/cmds/check"
)
func main() {
diff --git a/cmds/demoplugin/accessmethods/demo.go b/cmds/demoplugin/accessmethods/demo.go
index 83c136c22..07067d092 100644
--- a/cmds/demoplugin/accessmethods/demo.go
+++ b/cmds/demoplugin/accessmethods/demo.go
@@ -9,15 +9,15 @@ import (
"github.com/mandelsoft/filepath/pkg/filepath"
"github.com/mandelsoft/goutils/errors"
- "github.com/open-component-model/ocm/cmds/demoplugin/common"
- "github.com/open-component-model/ocm/cmds/demoplugin/config"
- "github.com/open-component-model/ocm/pkg/cobrautils/flagsets"
- "github.com/open-component-model/ocm/pkg/contexts/credentials"
- "github.com/open-component-model/ocm/pkg/contexts/credentials/builtin/oci/identity"
- "github.com/open-component-model/ocm/pkg/contexts/credentials/cpi"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/options"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/plugin/ppi"
- "github.com/open-component-model/ocm/pkg/runtime"
+ "ocm.software/ocm/api/credentials"
+ "ocm.software/ocm/api/credentials/builtin/oci/identity"
+ "ocm.software/ocm/api/credentials/cpi"
+ "ocm.software/ocm/api/ocm/extensions/accessmethods/options"
+ "ocm.software/ocm/api/ocm/plugin/ppi"
+ "ocm.software/ocm/api/utils/cobrautils/flagsets"
+ "ocm.software/ocm/api/utils/runtime"
+ "ocm.software/ocm/cmds/demoplugin/common"
+ "ocm.software/ocm/cmds/demoplugin/config"
)
const (
diff --git a/cmds/demoplugin/main.go b/cmds/demoplugin/main.go
index a0866c2bf..435dc00e1 100644
--- a/cmds/demoplugin/main.go
+++ b/cmds/demoplugin/main.go
@@ -3,13 +3,13 @@ package main
import (
"os"
- "github.com/open-component-model/ocm/cmds/demoplugin/accessmethods"
- "github.com/open-component-model/ocm/cmds/demoplugin/config"
- "github.com/open-component-model/ocm/cmds/demoplugin/uploaders"
- "github.com/open-component-model/ocm/cmds/demoplugin/valuesets"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/plugin/ppi"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/plugin/ppi/cmds"
- "github.com/open-component-model/ocm/pkg/version"
+ "ocm.software/ocm/api/ocm/plugin/ppi"
+ "ocm.software/ocm/api/ocm/plugin/ppi/cmds"
+ "ocm.software/ocm/api/version"
+ "ocm.software/ocm/cmds/demoplugin/accessmethods"
+ "ocm.software/ocm/cmds/demoplugin/config"
+ "ocm.software/ocm/cmds/demoplugin/uploaders"
+ "ocm.software/ocm/cmds/demoplugin/valuesets"
)
func main() {
diff --git a/cmds/demoplugin/uploaders/demo.go b/cmds/demoplugin/uploaders/demo.go
index 5e7654c92..ed75ae2a3 100644
--- a/cmds/demoplugin/uploaders/demo.go
+++ b/cmds/demoplugin/uploaders/demo.go
@@ -9,14 +9,14 @@ import (
"github.com/mandelsoft/filepath/pkg/filepath"
"github.com/mandelsoft/goutils/errors"
- "github.com/open-component-model/ocm/cmds/demoplugin/accessmethods"
- "github.com/open-component-model/ocm/cmds/demoplugin/common"
- "github.com/open-component-model/ocm/cmds/demoplugin/config"
- "github.com/open-component-model/ocm/pkg/contexts/credentials"
- "github.com/open-component-model/ocm/pkg/contexts/credentials/builtin/oci/identity"
- "github.com/open-component-model/ocm/pkg/contexts/credentials/cpi"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/plugin/ppi"
- "github.com/open-component-model/ocm/pkg/runtime"
+ "ocm.software/ocm/api/credentials"
+ "ocm.software/ocm/api/credentials/builtin/oci/identity"
+ "ocm.software/ocm/api/credentials/cpi"
+ "ocm.software/ocm/api/ocm/plugin/ppi"
+ "ocm.software/ocm/api/utils/runtime"
+ "ocm.software/ocm/cmds/demoplugin/accessmethods"
+ "ocm.software/ocm/cmds/demoplugin/common"
+ "ocm.software/ocm/cmds/demoplugin/config"
)
const (
diff --git a/cmds/demoplugin/uploaders/writer.go b/cmds/demoplugin/uploaders/writer.go
index 465e73e1e..1d08ea9ec 100644
--- a/cmds/demoplugin/uploaders/writer.go
+++ b/cmds/demoplugin/uploaders/writer.go
@@ -6,11 +6,11 @@ import (
"github.com/mandelsoft/filepath/pkg/filepath"
"github.com/mandelsoft/goutils/errors"
- "github.com/open-component-model/ocm/cmds/demoplugin/accessmethods"
- "github.com/open-component-model/ocm/pkg/common"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/plugin/ppi"
- "github.com/open-component-model/ocm/pkg/iotools"
- "github.com/open-component-model/ocm/pkg/runtime"
+ "ocm.software/ocm/api/ocm/plugin/ppi"
+ "ocm.software/ocm/api/utils/iotools"
+ common "ocm.software/ocm/api/utils/misc"
+ "ocm.software/ocm/api/utils/runtime"
+ "ocm.software/ocm/cmds/demoplugin/accessmethods"
)
type writer = iotools.DigestWriter
diff --git a/cmds/demoplugin/valuesets/check.go b/cmds/demoplugin/valuesets/check.go
index f16b8129c..0e75372af 100644
--- a/cmds/demoplugin/valuesets/check.go
+++ b/cmds/demoplugin/valuesets/check.go
@@ -7,12 +7,12 @@ import (
"github.com/mandelsoft/goutils/errors"
"github.com/mandelsoft/goutils/set"
- "github.com/open-component-model/ocm/pkg/cobrautils/flagsets"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/options"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/plugin/descriptor"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/plugin/ppi"
- "github.com/open-component-model/ocm/pkg/runtime"
- "github.com/open-component-model/ocm/pkg/utils"
+ "ocm.software/ocm/api/ocm/extensions/accessmethods/options"
+ "ocm.software/ocm/api/ocm/plugin/descriptor"
+ "ocm.software/ocm/api/ocm/plugin/ppi"
+ "ocm.software/ocm/api/utils"
+ "ocm.software/ocm/api/utils/cobrautils/flagsets"
+ "ocm.software/ocm/api/utils/runtime"
)
const NAME = "check"
diff --git a/cmds/demoplugin/valuesets/check_test.go b/cmds/demoplugin/valuesets/check_test.go
index e4a414d8b..c43cc8bcd 100644
--- a/cmds/demoplugin/valuesets/check_test.go
+++ b/cmds/demoplugin/valuesets/check_test.go
@@ -6,17 +6,17 @@ import (
. "github.com/mandelsoft/goutils/testutils"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
- . "github.com/open-component-model/ocm/pkg/contexts/ocm/plugin/testutils"
- . "github.com/open-component-model/ocm/pkg/env"
- . "github.com/open-component-model/ocm/pkg/env/builder"
+ . "ocm.software/ocm/api/helper/builder"
+ . "ocm.software/ocm/api/helper/env"
+ . "ocm.software/ocm/api/ocm/plugin/testutils"
"github.com/spf13/pflag"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/attrs/plugincacheattr"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/labels/routingslip"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/registration"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/composition"
- "github.com/open-component-model/ocm/pkg/signing/handlers/rsa"
+ "ocm.software/ocm/api/ocm/extensions/attrs/plugincacheattr"
+ "ocm.software/ocm/api/ocm/extensions/labels/routingslip"
+ "ocm.software/ocm/api/ocm/extensions/repositories/composition"
+ "ocm.software/ocm/api/ocm/plugin/registration"
+ "ocm.software/ocm/api/tech/signing/handlers/rsa"
)
const (
diff --git a/cmds/ecrplugin/actions/action.go b/cmds/ecrplugin/actions/action.go
index 46f8b217d..ca4e0d4c2 100644
--- a/cmds/ecrplugin/actions/action.go
+++ b/cmds/ecrplugin/actions/action.go
@@ -12,10 +12,10 @@ import (
"github.com/aws/aws-sdk-go-v2/service/ecr/types"
"github.com/mandelsoft/goutils/errors"
- ocmcreds "github.com/open-component-model/ocm/pkg/contexts/credentials"
- "github.com/open-component-model/ocm/pkg/contexts/oci/actions/oci-repository-prepare"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/s3/identity"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/plugin/ppi"
+ ocmcreds "ocm.software/ocm/api/credentials"
+ "ocm.software/ocm/api/oci/extensions/actions/oci-repository-prepare"
+ "ocm.software/ocm/api/ocm/extensions/accessmethods/s3/identity"
+ "ocm.software/ocm/api/ocm/plugin/ppi"
)
type Action struct{}
diff --git a/cmds/ecrplugin/config/tweak.go b/cmds/ecrplugin/config/tweak.go
index 3c8a30f65..010dc43d5 100644
--- a/cmds/ecrplugin/config/tweak.go
+++ b/cmds/ecrplugin/config/tweak.go
@@ -1,7 +1,7 @@
package config
import (
- "github.com/open-component-model/ocm/pkg/contexts/ocm/plugin/ppi"
+ "ocm.software/ocm/api/ocm/plugin/ppi"
)
func TweakDescriptor(d ppi.Descriptor, cfg *Config) ppi.Descriptor {
diff --git a/cmds/ecrplugin/main.go b/cmds/ecrplugin/main.go
index 5334e2374..7e4ce1737 100644
--- a/cmds/ecrplugin/main.go
+++ b/cmds/ecrplugin/main.go
@@ -3,11 +3,11 @@ package main
import (
"os"
- "github.com/open-component-model/ocm/cmds/ecrplugin/actions"
- "github.com/open-component-model/ocm/cmds/ecrplugin/config"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/plugin/ppi"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/plugin/ppi/cmds"
- "github.com/open-component-model/ocm/pkg/version"
+ "ocm.software/ocm/api/ocm/plugin/ppi"
+ "ocm.software/ocm/api/ocm/plugin/ppi/cmds"
+ "ocm.software/ocm/api/version"
+ "ocm.software/ocm/cmds/ecrplugin/actions"
+ "ocm.software/ocm/cmds/ecrplugin/config"
)
func main() {
diff --git a/cmds/helminstaller/app/app.go b/cmds/helminstaller/app/app.go
index 77edd7c21..2c6af5e7e 100644
--- a/cmds/helminstaller/app/app.go
+++ b/cmds/helminstaller/app/app.go
@@ -3,10 +3,10 @@ package app
import (
"github.com/spf13/cobra"
- "github.com/open-component-model/ocm/cmds/helminstaller/app/driver"
- "github.com/open-component-model/ocm/cmds/helminstaller/app/driver/helm"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
- "github.com/open-component-model/ocm/pkg/toi/support"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/ocm/tools/toi/support"
+ "ocm.software/ocm/cmds/helminstaller/app/driver"
+ "ocm.software/ocm/cmds/helminstaller/app/driver/helm"
)
func NewCliCommand(ctx clictx.Context, d driver.Driver) *cobra.Command {
diff --git a/cmds/helminstaller/app/config.go b/cmds/helminstaller/app/config.go
index c7a0dbf90..b488725f6 100644
--- a/cmds/helminstaller/app/config.go
+++ b/cmds/helminstaller/app/config.go
@@ -5,8 +5,8 @@ import (
"github.com/mandelsoft/goutils/errors"
- v1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/utils/localize"
+ v1 "ocm.software/ocm/api/ocm/compdesc/meta/v1"
+ "ocm.software/ocm/api/ocm/ocmutils/localize"
)
type Config struct {
diff --git a/cmds/helminstaller/app/driver/helm/driver.go b/cmds/helminstaller/app/driver/helm/driver.go
index 2f1f66478..b41f70734 100644
--- a/cmds/helminstaller/app/driver/helm/driver.go
+++ b/cmds/helminstaller/app/driver/helm/driver.go
@@ -5,7 +5,7 @@ import (
"github.com/mandelsoft/logging"
- "github.com/open-component-model/ocm/cmds/helminstaller/app/driver"
+ "ocm.software/ocm/cmds/helminstaller/app/driver"
)
type Driver struct{}
diff --git a/cmds/helminstaller/app/execute.go b/cmds/helminstaller/app/execute.go
index 2819ca987..0e9e4748b 100644
--- a/cmds/helminstaller/app/execute.go
+++ b/cmds/helminstaller/app/execute.go
@@ -13,18 +13,18 @@ import (
"github.com/mandelsoft/vfs/pkg/projectionfs"
"github.com/mandelsoft/vfs/pkg/vfs"
- "github.com/open-component-model/ocm/cmds/helminstaller/app/driver"
- "github.com/open-component-model/ocm/pkg/common"
- "github.com/open-component-model/ocm/pkg/common/compression"
- v1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/download"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/resourcetypes"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/utils"
- "github.com/open-component-model/ocm/pkg/helm/loader"
- "github.com/open-component-model/ocm/pkg/out"
- "github.com/open-component-model/ocm/pkg/runtime"
- "github.com/open-component-model/ocm/pkg/toi/support"
- "github.com/open-component-model/ocm/pkg/utils/tarutils"
+ v1 "ocm.software/ocm/api/ocm/compdesc/meta/v1"
+ resourcetypes "ocm.software/ocm/api/ocm/extensions/artifacttypes"
+ "ocm.software/ocm/api/ocm/extensions/download"
+ utils "ocm.software/ocm/api/ocm/ocmutils"
+ "ocm.software/ocm/api/ocm/tools/toi/support"
+ "ocm.software/ocm/api/tech/helm/loader"
+ "ocm.software/ocm/api/utils/compression"
+ common "ocm.software/ocm/api/utils/misc"
+ "ocm.software/ocm/api/utils/out"
+ "ocm.software/ocm/api/utils/runtime"
+ "ocm.software/ocm/api/utils/tarutils"
+ "ocm.software/ocm/cmds/helminstaller/app/driver"
)
func Merge(values ...map[string]interface{}) map[string]interface{} {
diff --git a/cmds/helminstaller/app/executor.go b/cmds/helminstaller/app/executor.go
index e57479079..7cd9d670b 100644
--- a/cmds/helminstaller/app/executor.go
+++ b/cmds/helminstaller/app/executor.go
@@ -4,9 +4,9 @@ import (
"github.com/mandelsoft/goutils/errors"
"github.com/mandelsoft/vfs/pkg/osfs"
- "github.com/open-component-model/ocm/cmds/helminstaller/app/driver"
- "github.com/open-component-model/ocm/pkg/runtime"
- "github.com/open-component-model/ocm/pkg/toi/support"
+ "ocm.software/ocm/api/ocm/tools/toi/support"
+ "ocm.software/ocm/api/utils/runtime"
+ "ocm.software/ocm/cmds/helminstaller/app/driver"
)
func New(d driver.Driver) func(o *support.ExecutorOptions) error {
diff --git a/cmds/helminstaller/main.go b/cmds/helminstaller/main.go
index 47f4dd909..6a4a759bc 100644
--- a/cmds/helminstaller/main.go
+++ b/cmds/helminstaller/main.go
@@ -3,8 +3,8 @@ package main
import (
"os"
- "github.com/open-component-model/ocm/cmds/helminstaller/app"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/cmds/helminstaller/app"
)
func main() {
diff --git a/cmds/helminstaller/testhelper/env.go b/cmds/helminstaller/testhelper/env.go
index f91613618..e975072b8 100644
--- a/cmds/helminstaller/testhelper/env.go
+++ b/cmds/helminstaller/testhelper/env.go
@@ -5,17 +5,17 @@ import (
"github.com/mandelsoft/vfs/pkg/vfs"
- "github.com/open-component-model/ocm/cmds/helminstaller/app"
- "github.com/open-component-model/ocm/cmds/helminstaller/app/driver"
- "github.com/open-component-model/ocm/cmds/helminstaller/app/driver/helm"
- "github.com/open-component-model/ocm/pkg/common/accessio"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
- "github.com/open-component-model/ocm/pkg/contexts/config"
- "github.com/open-component-model/ocm/pkg/contexts/credentials"
- "github.com/open-component-model/ocm/pkg/contexts/oci"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
- "github.com/open-component-model/ocm/pkg/env"
- "github.com/open-component-model/ocm/pkg/env/builder"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/config"
+ "ocm.software/ocm/api/credentials"
+ "ocm.software/ocm/api/helper/builder"
+ "ocm.software/ocm/api/helper/env"
+ "ocm.software/ocm/api/oci"
+ "ocm.software/ocm/api/ocm"
+ "ocm.software/ocm/api/utils/accessio"
+ "ocm.software/ocm/cmds/helminstaller/app"
+ "ocm.software/ocm/cmds/helminstaller/app/driver"
+ "ocm.software/ocm/cmds/helminstaller/app/driver/helm"
)
type CLI struct {
diff --git a/cmds/ocm/app/README.md b/cmds/ocm/app/README.md
index ec4118045..1e0153b3d 100644
--- a/cmds/ocm/app/README.md
+++ b/cmds/ocm/app/README.md
@@ -6,7 +6,7 @@ The command line tool can be configured by a configuration file. If not
specified on the command line, the file `~/.ocmconfig` is read.
The configuration file is a yaml file following format by the
-[configuration context](../../../pkg/contexts/config/README.md).
+[configuration context](../../../api/config/README.md).
It consists of list of configuration specifications according to
the registered configurations types provided by the used library.
diff --git a/cmds/ocm/app/app.go b/cmds/ocm/app/app.go
index c32383889..d3dc0ccdb 100644
--- a/cmds/ocm/app/app.go
+++ b/cmds/ocm/app/app.go
@@ -7,71 +7,71 @@ import (
"strings"
"unicode"
- _ "github.com/open-component-model/ocm/pkg/contexts/clictx/config"
- _ "github.com/open-component-model/ocm/pkg/contexts/ocm/attrs"
+ _ "ocm.software/ocm/api/cli/config"
+ _ "ocm.software/ocm/api/ocm/extensions/attrs"
"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
"github.com/spf13/pflag"
- config2 "github.com/open-component-model/ocm/cmds/ocm/clippi/config"
- "github.com/open-component-model/ocm/cmds/ocm/commands/cachecmds"
- "github.com/open-component-model/ocm/cmds/ocm/commands/common/options/keyoption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/misccmds/action"
- creds "github.com/open-component-model/ocm/cmds/ocm/commands/misccmds/credentials"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocicmds"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/componentarchive"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/components"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/plugins"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/pubsub"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/references"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/resources"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/routingslips"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/sources"
- "github.com/open-component-model/ocm/cmds/ocm/commands/plugin"
- "github.com/open-component-model/ocm/cmds/ocm/commands/toicmds"
- "github.com/open-component-model/ocm/cmds/ocm/commands/verbs"
- "github.com/open-component-model/ocm/cmds/ocm/commands/verbs/add"
- "github.com/open-component-model/ocm/cmds/ocm/commands/verbs/bootstrap"
- "github.com/open-component-model/ocm/cmds/ocm/commands/verbs/check"
- "github.com/open-component-model/ocm/cmds/ocm/commands/verbs/clean"
- "github.com/open-component-model/ocm/cmds/ocm/commands/verbs/controller"
- "github.com/open-component-model/ocm/cmds/ocm/commands/verbs/create"
- "github.com/open-component-model/ocm/cmds/ocm/commands/verbs/describe"
- "github.com/open-component-model/ocm/cmds/ocm/commands/verbs/download"
- "github.com/open-component-model/ocm/cmds/ocm/commands/verbs/execute"
- "github.com/open-component-model/ocm/cmds/ocm/commands/verbs/get"
- "github.com/open-component-model/ocm/cmds/ocm/commands/verbs/hash"
- "github.com/open-component-model/ocm/cmds/ocm/commands/verbs/install"
- "github.com/open-component-model/ocm/cmds/ocm/commands/verbs/list"
- "github.com/open-component-model/ocm/cmds/ocm/commands/verbs/set"
- "github.com/open-component-model/ocm/cmds/ocm/commands/verbs/show"
- "github.com/open-component-model/ocm/cmds/ocm/commands/verbs/sign"
- "github.com/open-component-model/ocm/cmds/ocm/commands/verbs/transfer"
- "github.com/open-component-model/ocm/cmds/ocm/commands/verbs/verify"
- cmdutils "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/cmds/ocm/topics/common/attributes"
- topicconfig "github.com/open-component-model/ocm/cmds/ocm/topics/common/config"
- topiccredentials "github.com/open-component-model/ocm/cmds/ocm/topics/common/credentials"
- topiclogging "github.com/open-component-model/ocm/cmds/ocm/topics/common/logging"
- topicocirefs "github.com/open-component-model/ocm/cmds/ocm/topics/oci/refs"
- topicocmaccessmethods "github.com/open-component-model/ocm/cmds/ocm/topics/ocm/accessmethods"
- topicocmdownloaders "github.com/open-component-model/ocm/cmds/ocm/topics/ocm/downloadhandlers"
- topicocmlabels "github.com/open-component-model/ocm/cmds/ocm/topics/ocm/labels"
- topicocmpubsub "github.com/open-component-model/ocm/cmds/ocm/topics/ocm/pubsub"
- topicocmrefs "github.com/open-component-model/ocm/cmds/ocm/topics/ocm/refs"
- topicocmuploaders "github.com/open-component-model/ocm/cmds/ocm/topics/ocm/uploadhandlers"
- topicbootstrap "github.com/open-component-model/ocm/cmds/ocm/topics/toi/bootstrapping"
- "github.com/open-component-model/ocm/pkg/cobrautils"
- "github.com/open-component-model/ocm/pkg/cobrautils/logopts"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
- "github.com/open-component-model/ocm/pkg/contexts/datacontext/attrs/clicfgattr"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/attrs/plugincacheattr"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/registration"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/utils/defaultconfigregistry"
- "github.com/open-component-model/ocm/pkg/out"
- "github.com/open-component-model/ocm/pkg/version"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/datacontext/attrs/clicfgattr"
+ "ocm.software/ocm/api/ocm/extensions/attrs/plugincacheattr"
+ "ocm.software/ocm/api/ocm/ocmutils/defaultconfigregistry"
+ "ocm.software/ocm/api/ocm/plugin/registration"
+ "ocm.software/ocm/api/utils/cobrautils"
+ "ocm.software/ocm/api/utils/cobrautils/logopts"
+ "ocm.software/ocm/api/utils/out"
+ "ocm.software/ocm/api/version"
+ config2 "ocm.software/ocm/cmds/ocm/clippi/config"
+ "ocm.software/ocm/cmds/ocm/commands/cachecmds"
+ "ocm.software/ocm/cmds/ocm/commands/common/options/keyoption"
+ "ocm.software/ocm/cmds/ocm/commands/misccmds/action"
+ creds "ocm.software/ocm/cmds/ocm/commands/misccmds/credentials"
+ "ocm.software/ocm/cmds/ocm/commands/ocicmds"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/componentarchive"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/components"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/plugins"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/pubsub"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/references"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/resources"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/routingslips"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/sources"
+ "ocm.software/ocm/cmds/ocm/commands/plugin"
+ "ocm.software/ocm/cmds/ocm/commands/toicmds"
+ "ocm.software/ocm/cmds/ocm/commands/verbs"
+ "ocm.software/ocm/cmds/ocm/commands/verbs/add"
+ "ocm.software/ocm/cmds/ocm/commands/verbs/bootstrap"
+ "ocm.software/ocm/cmds/ocm/commands/verbs/check"
+ "ocm.software/ocm/cmds/ocm/commands/verbs/clean"
+ "ocm.software/ocm/cmds/ocm/commands/verbs/controller"
+ "ocm.software/ocm/cmds/ocm/commands/verbs/create"
+ "ocm.software/ocm/cmds/ocm/commands/verbs/describe"
+ "ocm.software/ocm/cmds/ocm/commands/verbs/download"
+ "ocm.software/ocm/cmds/ocm/commands/verbs/execute"
+ "ocm.software/ocm/cmds/ocm/commands/verbs/get"
+ "ocm.software/ocm/cmds/ocm/commands/verbs/hash"
+ "ocm.software/ocm/cmds/ocm/commands/verbs/install"
+ "ocm.software/ocm/cmds/ocm/commands/verbs/list"
+ "ocm.software/ocm/cmds/ocm/commands/verbs/set"
+ "ocm.software/ocm/cmds/ocm/commands/verbs/show"
+ "ocm.software/ocm/cmds/ocm/commands/verbs/sign"
+ "ocm.software/ocm/cmds/ocm/commands/verbs/transfer"
+ "ocm.software/ocm/cmds/ocm/commands/verbs/verify"
+ cmdutils "ocm.software/ocm/cmds/ocm/common/utils"
+ "ocm.software/ocm/cmds/ocm/topics/common/attributes"
+ topicconfig "ocm.software/ocm/cmds/ocm/topics/common/config"
+ topiccredentials "ocm.software/ocm/cmds/ocm/topics/common/credentials"
+ topiclogging "ocm.software/ocm/cmds/ocm/topics/common/logging"
+ topicocirefs "ocm.software/ocm/cmds/ocm/topics/oci/refs"
+ topicocmaccessmethods "ocm.software/ocm/cmds/ocm/topics/ocm/accessmethods"
+ topicocmdownloaders "ocm.software/ocm/cmds/ocm/topics/ocm/downloadhandlers"
+ topicocmlabels "ocm.software/ocm/cmds/ocm/topics/ocm/labels"
+ topicocmpubsub "ocm.software/ocm/cmds/ocm/topics/ocm/pubsub"
+ topicocmrefs "ocm.software/ocm/cmds/ocm/topics/ocm/refs"
+ topicocmuploaders "ocm.software/ocm/cmds/ocm/topics/ocm/uploadhandlers"
+ topicbootstrap "ocm.software/ocm/cmds/ocm/topics/toi/bootstrapping"
)
type CLIOptions struct {
diff --git a/cmds/ocm/app/app_test.go b/cmds/ocm/app/app_test.go
index 088c1b5cc..318972c6d 100644
--- a/cmds/ocm/app/app_test.go
+++ b/cmds/ocm/app/app_test.go
@@ -9,17 +9,17 @@ import (
. "github.com/mandelsoft/goutils/testutils"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
- . "github.com/open-component-model/ocm/cmds/ocm/testhelper"
+ . "ocm.software/ocm/cmds/ocm/testhelper"
"github.com/mandelsoft/logging"
"github.com/mandelsoft/vfs/pkg/vfs"
"github.com/spf13/cobra"
"github.com/tonglil/buflogr"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/attrs/mapocirepoattr"
- ocmlog "github.com/open-component-model/ocm/pkg/logging"
- "github.com/open-component-model/ocm/pkg/logging/testhelper"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/ocm/extensions/attrs/mapocirepoattr"
+ ocmlog "ocm.software/ocm/api/utils/logging"
+ "ocm.software/ocm/api/utils/logging/testhelper"
)
var realm = logging.NewRealm("test")
diff --git a/cmds/ocm/app/prepare.go b/cmds/ocm/app/prepare.go
index 4bbbc1b36..e995efa66 100644
--- a/cmds/ocm/app/prepare.go
+++ b/cmds/ocm/app/prepare.go
@@ -5,7 +5,7 @@ import (
"github.com/spf13/pflag"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
+ clictx "ocm.software/ocm/api/cli"
)
// Prepare pre-prepares CLI options by evaluation the main options
diff --git a/cmds/ocm/clippi/config/evaluated.go b/cmds/ocm/clippi/config/evaluated.go
index ba4dabeda..e8939308c 100644
--- a/cmds/ocm/clippi/config/evaluated.go
+++ b/cmds/ocm/clippi/config/evaluated.go
@@ -1,9 +1,9 @@
package config
import (
- "github.com/open-component-model/ocm/cmds/ocm/commands/common/options/keyoption"
- "github.com/open-component-model/ocm/pkg/cobrautils/logopts"
- "github.com/open-component-model/ocm/pkg/contexts/config"
+ "ocm.software/ocm/api/config"
+ "ocm.software/ocm/api/utils/cobrautils/logopts"
+ "ocm.software/ocm/cmds/ocm/commands/common/options/keyoption"
)
type EvaluatedOptions struct {
diff --git a/cmds/ocm/clippi/config/type.go b/cmds/ocm/clippi/config/type.go
index bfdeac596..ac31b7dce 100644
--- a/cmds/ocm/clippi/config/type.go
+++ b/cmds/ocm/clippi/config/type.go
@@ -6,25 +6,25 @@ import (
"github.com/mandelsoft/goutils/errors"
"github.com/spf13/pflag"
- "github.com/open-component-model/ocm/cmds/ocm/commands/common/options/keyoption"
- common2 "github.com/open-component-model/ocm/pkg/clisupport"
- "github.com/open-component-model/ocm/pkg/cobrautils/logopts"
- logdata "github.com/open-component-model/ocm/pkg/cobrautils/logopts/logging"
- "github.com/open-component-model/ocm/pkg/common"
- "github.com/open-component-model/ocm/pkg/contexts/config"
- config2 "github.com/open-component-model/ocm/pkg/contexts/config/config"
- cfgcpi "github.com/open-component-model/ocm/pkg/contexts/config/cpi"
- "github.com/open-component-model/ocm/pkg/contexts/credentials"
- "github.com/open-component-model/ocm/pkg/contexts/datacontext"
- "github.com/open-component-model/ocm/pkg/contexts/datacontext/attrs/vfsattr"
- datacfg "github.com/open-component-model/ocm/pkg/contexts/datacontext/config/attrs"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/attrs/signingattr"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/cpi"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/utils"
- "github.com/open-component-model/ocm/pkg/logging"
- "github.com/open-component-model/ocm/pkg/runtime"
- "github.com/open-component-model/ocm/pkg/signing"
+ "ocm.software/ocm/api/config"
+ cfgcpi "ocm.software/ocm/api/config/cpi"
+ config2 "ocm.software/ocm/api/config/extensions/config"
+ "ocm.software/ocm/api/credentials"
+ "ocm.software/ocm/api/datacontext"
+ "ocm.software/ocm/api/datacontext/attrs/vfsattr"
+ datacfg "ocm.software/ocm/api/datacontext/config/attrs"
+ "ocm.software/ocm/api/ocm"
+ "ocm.software/ocm/api/ocm/cpi"
+ "ocm.software/ocm/api/ocm/extensions/attrs/signingattr"
+ utils "ocm.software/ocm/api/ocm/ocmutils"
+ "ocm.software/ocm/api/tech/signing"
+ common2 "ocm.software/ocm/api/utils/clisupport"
+ "ocm.software/ocm/api/utils/cobrautils/logopts"
+ logdata "ocm.software/ocm/api/utils/cobrautils/logopts/logging"
+ "ocm.software/ocm/api/utils/logging"
+ common "ocm.software/ocm/api/utils/misc"
+ "ocm.software/ocm/api/utils/runtime"
+ "ocm.software/ocm/cmds/ocm/commands/common/options/keyoption"
)
const (
diff --git a/cmds/ocm/commands/cachecmds/clean/cmd.go b/cmds/ocm/commands/cachecmds/clean/cmd.go
index 6fefebc66..30f44265b 100644
--- a/cmds/ocm/commands/cachecmds/clean/cmd.go
+++ b/cmds/ocm/commands/cachecmds/clean/cmd.go
@@ -8,15 +8,15 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/pflag"
- "github.com/open-component-model/ocm/cmds/ocm/commands/cachecmds/names"
- "github.com/open-component-model/ocm/cmds/ocm/commands/verbs"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/common"
- "github.com/open-component-model/ocm/pkg/common/accessio"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
- "github.com/open-component-model/ocm/pkg/contexts/oci/attrs/cacheattr"
- "github.com/open-component-model/ocm/pkg/out"
- utils2 "github.com/open-component-model/ocm/pkg/utils"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/oci/extensions/attrs/cacheattr"
+ utils2 "ocm.software/ocm/api/utils"
+ "ocm.software/ocm/api/utils/accessio"
+ common "ocm.software/ocm/api/utils/misc"
+ "ocm.software/ocm/api/utils/out"
+ "ocm.software/ocm/cmds/ocm/commands/cachecmds/names"
+ "ocm.software/ocm/cmds/ocm/commands/verbs"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
var (
diff --git a/cmds/ocm/commands/cachecmds/cmd.go b/cmds/ocm/commands/cachecmds/cmd.go
index 53bc85722..0cd5e2609 100644
--- a/cmds/ocm/commands/cachecmds/cmd.go
+++ b/cmds/ocm/commands/cachecmds/cmd.go
@@ -3,10 +3,10 @@ package cachecmds
import (
"github.com/spf13/cobra"
- "github.com/open-component-model/ocm/cmds/ocm/commands/cachecmds/clean"
- "github.com/open-component-model/ocm/cmds/ocm/commands/cachecmds/describe"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/cmds/ocm/commands/cachecmds/clean"
+ "ocm.software/ocm/cmds/ocm/commands/cachecmds/describe"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
// NewCommand creates a new cache command.
diff --git a/cmds/ocm/commands/cachecmds/describe/cmd.go b/cmds/ocm/commands/cachecmds/describe/cmd.go
index 8d595bb0e..4a10cc37d 100644
--- a/cmds/ocm/commands/cachecmds/describe/cmd.go
+++ b/cmds/ocm/commands/cachecmds/describe/cmd.go
@@ -4,13 +4,13 @@ import (
"github.com/mandelsoft/goutils/errors"
"github.com/spf13/cobra"
- "github.com/open-component-model/ocm/cmds/ocm/commands/cachecmds/names"
- "github.com/open-component-model/ocm/cmds/ocm/commands/verbs"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/common/accessio"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
- "github.com/open-component-model/ocm/pkg/contexts/oci/attrs/cacheattr"
- "github.com/open-component-model/ocm/pkg/out"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/oci/extensions/attrs/cacheattr"
+ "ocm.software/ocm/api/utils/accessio"
+ "ocm.software/ocm/api/utils/out"
+ "ocm.software/ocm/cmds/ocm/commands/cachecmds/names"
+ "ocm.software/ocm/cmds/ocm/commands/verbs"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
var (
diff --git a/cmds/ocm/commands/common/elements/components/cmd.go b/cmds/ocm/commands/common/elements/components/cmd.go
index 577c6f3e3..42d178ea1 100644
--- a/cmds/ocm/commands/common/elements/components/cmd.go
+++ b/cmds/ocm/commands/common/elements/components/cmd.go
@@ -3,11 +3,11 @@ package components
import (
"github.com/spf13/cobra"
- ocmcomp "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/components"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/names"
- toicomp "github.com/open-component-model/ocm/cmds/ocm/commands/toicmds/package"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
+ clictx "ocm.software/ocm/api/cli"
+ ocmcomp "ocm.software/ocm/cmds/ocm/commands/ocmcmds/components"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/names"
+ toicomp "ocm.software/ocm/cmds/ocm/commands/toicmds/package"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
var Names = names.Components
diff --git a/cmds/ocm/commands/common/options/closureoption/option.go b/cmds/ocm/commands/common/options/closureoption/option.go
index ef148e4c9..9b6f23a06 100644
--- a/cmds/ocm/commands/common/options/closureoption/option.go
+++ b/cmds/ocm/commands/common/options/closureoption/option.go
@@ -6,14 +6,14 @@ import (
"github.com/modern-go/reflect2"
"github.com/spf13/pflag"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/options"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/output"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/processing"
- "github.com/open-component-model/ocm/pkg/cobrautils/flag"
- "github.com/open-component-model/ocm/pkg/common"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/transfer/transferhandler"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/transfer/transferhandler/standard"
- "github.com/open-component-model/ocm/pkg/utils"
+ "ocm.software/ocm/api/ocm/tools/transfer/transferhandler"
+ "ocm.software/ocm/api/ocm/tools/transfer/transferhandler/standard"
+ "ocm.software/ocm/api/utils"
+ "ocm.software/ocm/api/utils/cobrautils/flag"
+ common "ocm.software/ocm/api/utils/misc"
+ "ocm.software/ocm/cmds/ocm/common/options"
+ "ocm.software/ocm/cmds/ocm/common/output"
+ "ocm.software/ocm/cmds/ocm/common/processing"
)
func From(o options.OptionSetProvider) *Option {
diff --git a/cmds/ocm/commands/common/options/destoption/option.go b/cmds/ocm/commands/common/options/destoption/option.go
index 4f7ad402e..6ff96faf8 100644
--- a/cmds/ocm/commands/common/options/destoption/option.go
+++ b/cmds/ocm/commands/common/options/destoption/option.go
@@ -4,8 +4,8 @@ import (
"github.com/mandelsoft/vfs/pkg/vfs"
"github.com/spf13/pflag"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/options"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/cmds/ocm/common/options"
)
func From(o options.OptionSetProvider) *Option {
diff --git a/cmds/ocm/commands/common/options/failonerroroption/option.go b/cmds/ocm/commands/common/options/failonerroroption/option.go
index 5b322ada8..c49a766c9 100644
--- a/cmds/ocm/commands/common/options/failonerroroption/option.go
+++ b/cmds/ocm/commands/common/options/failonerroroption/option.go
@@ -4,7 +4,7 @@ import (
"github.com/mandelsoft/goutils/errors"
"github.com/spf13/pflag"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/options"
+ "ocm.software/ocm/cmds/ocm/common/options"
)
func From(o options.OptionSetProvider) *Option {
diff --git a/cmds/ocm/commands/common/options/formatoption/option.go b/cmds/ocm/commands/common/options/formatoption/option.go
index 8e552b32f..afb862242 100644
--- a/cmds/ocm/commands/common/options/formatoption/option.go
+++ b/cmds/ocm/commands/common/options/formatoption/option.go
@@ -8,10 +8,10 @@ import (
"github.com/mandelsoft/vfs/pkg/vfs"
"github.com/spf13/pflag"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/options"
- "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"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/utils/accessio"
+ "ocm.software/ocm/api/utils/accessobj"
+ "ocm.software/ocm/cmds/ocm/common/options"
)
func From(o options.OptionSetProvider) *Option {
diff --git a/cmds/ocm/commands/common/options/keyoption/config.go b/cmds/ocm/commands/common/options/keyoption/config.go
index 72ea17d46..d1ead6dda 100644
--- a/cmds/ocm/commands/common/options/keyoption/config.go
+++ b/cmds/ocm/commands/common/options/keyoption/config.go
@@ -9,12 +9,12 @@ import (
"github.com/mandelsoft/goutils/errors"
"github.com/spf13/pflag"
- "github.com/open-component-model/ocm/pkg/contexts/datacontext"
- "github.com/open-component-model/ocm/pkg/contexts/datacontext/attrs/vfsattr"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
- "github.com/open-component-model/ocm/pkg/signing"
- "github.com/open-component-model/ocm/pkg/signing/signutils"
- "github.com/open-component-model/ocm/pkg/utils"
+ "ocm.software/ocm/api/datacontext"
+ "ocm.software/ocm/api/datacontext/attrs/vfsattr"
+ "ocm.software/ocm/api/ocm"
+ "ocm.software/ocm/api/tech/signing"
+ "ocm.software/ocm/api/tech/signing/signutils"
+ "ocm.software/ocm/api/utils"
)
type ConfigFragment struct {
diff --git a/cmds/ocm/commands/common/options/keyoption/option.go b/cmds/ocm/commands/common/options/keyoption/option.go
index 28f3d6711..37c37e2f4 100644
--- a/cmds/ocm/commands/common/options/keyoption/option.go
+++ b/cmds/ocm/commands/common/options/keyoption/option.go
@@ -3,11 +3,11 @@ package keyoption
import (
"github.com/spf13/pflag"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/options"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
- ocmsign "github.com/open-component-model/ocm/pkg/contexts/ocm/signing"
- "github.com/open-component-model/ocm/pkg/signing"
- "github.com/open-component-model/ocm/pkg/signing/signutils"
+ "ocm.software/ocm/api/ocm"
+ ocmsign "ocm.software/ocm/api/ocm/tools/signing"
+ "ocm.software/ocm/api/tech/signing"
+ "ocm.software/ocm/api/tech/signing/signutils"
+ "ocm.software/ocm/cmds/ocm/common/options"
)
func From(o options.OptionSetProvider) *Option {
diff --git a/cmds/ocm/commands/controllercmds/common/log.go b/cmds/ocm/commands/controllercmds/common/log.go
index 7793b26cd..3e836a06b 100644
--- a/cmds/ocm/commands/controllercmds/common/log.go
+++ b/cmds/ocm/commands/controllercmds/common/log.go
@@ -3,7 +3,7 @@ package common
import (
"fmt"
- "github.com/open-component-model/ocm/pkg/out"
+ "ocm.software/ocm/api/utils/out"
)
func Outf(ctx out.Context, dryRun bool, msg string, args ...any) (int, error) {
diff --git a/cmds/ocm/commands/controllercmds/common/manifests.go b/cmds/ocm/commands/controllercmds/common/manifests.go
index c54bc5a7c..18eb435b6 100644
--- a/cmds/ocm/commands/controllercmds/common/manifests.go
+++ b/cmds/ocm/commands/controllercmds/common/manifests.go
@@ -9,8 +9,8 @@ import (
"github.com/fluxcd/pkg/ssa"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
- "github.com/open-component-model/ocm/pkg/out"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/utils/out"
)
func Install(ctx context.Context, octx clictx.Context, sm *ssa.ResourceManager, releaseURL, baseURL, manifest, filename, version string, dryRun bool) error {
diff --git a/cmds/ocm/commands/controllercmds/install/cmd.go b/cmds/ocm/commands/controllercmds/install/cmd.go
index 25427a1ba..e888beb4f 100644
--- a/cmds/ocm/commands/controllercmds/install/cmd.go
+++ b/cmds/ocm/commands/controllercmds/install/cmd.go
@@ -14,11 +14,11 @@ import (
"k8s.io/client-go/rest"
"sigs.k8s.io/controller-runtime/pkg/client"
- "github.com/open-component-model/ocm/cmds/ocm/commands/controllercmds/common"
- "github.com/open-component-model/ocm/cmds/ocm/commands/controllercmds/names"
- "github.com/open-component-model/ocm/cmds/ocm/commands/verbs"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/cmds/ocm/commands/controllercmds/common"
+ "ocm.software/ocm/cmds/ocm/commands/controllercmds/names"
+ "ocm.software/ocm/cmds/ocm/commands/verbs"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
var (
@@ -60,7 +60,7 @@ func (o *Command) ForName(name string) *cobra.Command {
func (o *Command) AddFlags(set *pflag.FlagSet) {
set.StringVarP(&o.Version, "version", "v", "latest", "the version of the controller to install")
- set.StringVarP(&o.BaseURL, "base-url", "u", "https://github.com/open-component-model/ocm-controller/releases", "the base url to the ocm-controller's release page")
+ set.StringVarP(&o.BaseURL, "base-url", "u", "https://ocm.software/ocm-controller/releases", "the base url to the ocm-controller's release page")
set.StringVarP(&o.ReleaseAPIURL, "release-api-url", "a", "https://api.github.com/repos/open-component-model/ocm-controller/releases", "the base url to the ocm-controller's API release page")
set.StringVar(&o.CertManagerBaseURL, "cert-manager-base-url", "https://github.com/cert-manager/cert-manager/releases", "the base url to the cert-manager's release page")
set.StringVar(&o.CertManagerReleaseAPIURL, "cert-manager-release-api-url", "https://api.github.com/repos/cert-manager/cert-manager/releases", "the base url to the cert-manager's API release page")
diff --git a/cmds/ocm/commands/controllercmds/install/cmd_test.go b/cmds/ocm/commands/controllercmds/install/cmd_test.go
index eb0f64a3b..e0362b2b6 100644
--- a/cmds/ocm/commands/controllercmds/install/cmd_test.go
+++ b/cmds/ocm/commands/controllercmds/install/cmd_test.go
@@ -11,7 +11,7 @@ import (
. "github.com/mandelsoft/goutils/testutils"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
- . "github.com/open-component-model/ocm/cmds/ocm/testhelper"
+ . "ocm.software/ocm/cmds/ocm/testhelper"
"github.com/mandelsoft/filepath/pkg/filepath"
)
diff --git a/cmds/ocm/commands/controllercmds/install/install_cert_manager.go b/cmds/ocm/commands/controllercmds/install/install_cert_manager.go
index 089ec79fc..c2afed126 100644
--- a/cmds/ocm/commands/controllercmds/install/install_cert_manager.go
+++ b/cmds/ocm/commands/controllercmds/install/install_cert_manager.go
@@ -10,7 +10,7 @@ import (
"github.com/fluxcd/pkg/ssa"
"github.com/mandelsoft/filepath/pkg/filepath"
- "github.com/open-component-model/ocm/cmds/ocm/commands/controllercmds/common"
+ "ocm.software/ocm/cmds/ocm/commands/controllercmds/common"
)
//go:embed issuer/registry_certificate.yaml
diff --git a/cmds/ocm/commands/controllercmds/uninstall/cmd.go b/cmds/ocm/commands/controllercmds/uninstall/cmd.go
index 47c06530c..4261b2277 100644
--- a/cmds/ocm/commands/controllercmds/uninstall/cmd.go
+++ b/cmds/ocm/commands/controllercmds/uninstall/cmd.go
@@ -10,12 +10,12 @@ import (
"github.com/spf13/pflag"
"k8s.io/cli-runtime/pkg/genericclioptions"
- "github.com/open-component-model/ocm/cmds/ocm/commands/controllercmds/common"
- "github.com/open-component-model/ocm/cmds/ocm/commands/controllercmds/names"
- "github.com/open-component-model/ocm/cmds/ocm/commands/verbs"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
- "github.com/open-component-model/ocm/pkg/out"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/utils/out"
+ "ocm.software/ocm/cmds/ocm/commands/controllercmds/common"
+ "ocm.software/ocm/cmds/ocm/commands/controllercmds/names"
+ "ocm.software/ocm/cmds/ocm/commands/verbs"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
var (
@@ -57,7 +57,7 @@ func (o *Command) ForName(name string) *cobra.Command {
// AddFlags for the known item to delete.
func (o *Command) AddFlags(set *pflag.FlagSet) {
set.StringVarP(&o.Version, "version", "v", "latest", "the version of the controller to install")
- set.StringVarP(&o.BaseURL, "base-url", "u", "https://github.com/open-component-model/ocm-controller/releases", "the base url to the ocm-controller's release page")
+ set.StringVarP(&o.BaseURL, "base-url", "u", "https://ocm.software/ocm-controller/releases", "the base url to the ocm-controller's release page")
set.StringVarP(&o.ReleaseAPIURL, "release-api-url", "a", "https://api.github.com/repos/open-component-model/ocm-controller/releases", "the base url to the ocm-controller's API release page")
set.StringVar(&o.CertManagerBaseURL, "cert-manager-base-url", "https://github.com/cert-manager/cert-manager/releases", "the base url to the cert-manager's release page")
set.StringVar(&o.CertManagerReleaseAPIURL, "cert-manager-release-api-url", "https://api.github.com/repos/cert-manager/cert-manager/releases", "the base url to the cert-manager's API release page")
diff --git a/cmds/ocm/commands/controllercmds/uninstall/cmd_test.go b/cmds/ocm/commands/controllercmds/uninstall/cmd_test.go
index 878655c51..f20036ecd 100644
--- a/cmds/ocm/commands/controllercmds/uninstall/cmd_test.go
+++ b/cmds/ocm/commands/controllercmds/uninstall/cmd_test.go
@@ -11,7 +11,7 @@ import (
. "github.com/mandelsoft/goutils/testutils"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
- . "github.com/open-component-model/ocm/cmds/ocm/testhelper"
+ . "ocm.software/ocm/cmds/ocm/testhelper"
"github.com/mandelsoft/filepath/pkg/filepath"
)
diff --git a/cmds/ocm/commands/controllercmds/uninstall/uninstall_cert_manager.go b/cmds/ocm/commands/controllercmds/uninstall/uninstall_cert_manager.go
index e0380e264..a06f0d463 100644
--- a/cmds/ocm/commands/controllercmds/uninstall/uninstall_cert_manager.go
+++ b/cmds/ocm/commands/controllercmds/uninstall/uninstall_cert_manager.go
@@ -10,8 +10,8 @@ import (
"github.com/fluxcd/pkg/ssa"
"github.com/mandelsoft/filepath/pkg/filepath"
- "github.com/open-component-model/ocm/cmds/ocm/commands/controllercmds/common"
- "github.com/open-component-model/ocm/pkg/out"
+ "ocm.software/ocm/api/utils/out"
+ "ocm.software/ocm/cmds/ocm/commands/controllercmds/common"
)
//go:embed issuer/registry_certificate.yaml
diff --git a/cmds/ocm/commands/misccmds/action/cmd.go b/cmds/ocm/commands/misccmds/action/cmd.go
index 2419e61cc..76e57304b 100644
--- a/cmds/ocm/commands/misccmds/action/cmd.go
+++ b/cmds/ocm/commands/misccmds/action/cmd.go
@@ -3,10 +3,10 @@ package action
import (
"github.com/spf13/cobra"
- "github.com/open-component-model/ocm/cmds/ocm/commands/misccmds/action/execute"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/names"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/cmds/ocm/commands/misccmds/action/execute"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/names"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
var Names = names.Action
diff --git a/cmds/ocm/commands/misccmds/action/execute/cmd.go b/cmds/ocm/commands/misccmds/action/execute/cmd.go
index 4e2b23e97..98cbb3f98 100644
--- a/cmds/ocm/commands/misccmds/action/execute/cmd.go
+++ b/cmds/ocm/commands/misccmds/action/execute/cmd.go
@@ -8,16 +8,16 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/pflag"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/names"
- "github.com/open-component-model/ocm/cmds/ocm/commands/verbs"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/common"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
- "github.com/open-component-model/ocm/pkg/contexts/credentials"
- "github.com/open-component-model/ocm/pkg/contexts/datacontext/action"
- "github.com/open-component-model/ocm/pkg/out"
- "github.com/open-component-model/ocm/pkg/runtime"
- utils2 "github.com/open-component-model/ocm/pkg/utils"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/credentials"
+ "ocm.software/ocm/api/datacontext/action"
+ utils2 "ocm.software/ocm/api/utils"
+ common "ocm.software/ocm/api/utils/misc"
+ "ocm.software/ocm/api/utils/out"
+ "ocm.software/ocm/api/utils/runtime"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/names"
+ "ocm.software/ocm/cmds/ocm/commands/verbs"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
var (
diff --git a/cmds/ocm/commands/misccmds/config/cmd.go b/cmds/ocm/commands/misccmds/config/cmd.go
index d50ff7b3e..2d925cfe6 100644
--- a/cmds/ocm/commands/misccmds/config/cmd.go
+++ b/cmds/ocm/commands/misccmds/config/cmd.go
@@ -3,10 +3,10 @@ package credentials
import (
"github.com/spf13/cobra"
- config "github.com/open-component-model/ocm/cmds/ocm/commands/misccmds/config/get"
- "github.com/open-component-model/ocm/cmds/ocm/commands/misccmds/names"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
+ clictx "ocm.software/ocm/api/cli"
+ config "ocm.software/ocm/cmds/ocm/commands/misccmds/config/get"
+ "ocm.software/ocm/cmds/ocm/commands/misccmds/names"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
var Names = names.Config
diff --git a/cmds/ocm/commands/misccmds/config/get/cmd.go b/cmds/ocm/commands/misccmds/config/get/cmd.go
index 94af2d854..625c04e94 100644
--- a/cmds/ocm/commands/misccmds/config/get/cmd.go
+++ b/cmds/ocm/commands/misccmds/config/get/cmd.go
@@ -6,14 +6,14 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/pflag"
- "github.com/open-component-model/ocm/cmds/ocm/commands/common/options/destoption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/misccmds/names"
- "github.com/open-component-model/ocm/cmds/ocm/commands/verbs"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/output"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
- "github.com/open-component-model/ocm/pkg/contexts/datacontext/attrs/clicfgattr"
- "github.com/open-component-model/ocm/pkg/out"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/datacontext/attrs/clicfgattr"
+ "ocm.software/ocm/api/utils/out"
+ "ocm.software/ocm/cmds/ocm/commands/common/options/destoption"
+ "ocm.software/ocm/cmds/ocm/commands/misccmds/names"
+ "ocm.software/ocm/cmds/ocm/commands/verbs"
+ "ocm.software/ocm/cmds/ocm/common/output"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
var (
diff --git a/cmds/ocm/commands/misccmds/config/get/cmd_test.go b/cmds/ocm/commands/misccmds/config/get/cmd_test.go
index 68da28556..c03d73f34 100644
--- a/cmds/ocm/commands/misccmds/config/get/cmd_test.go
+++ b/cmds/ocm/commands/misccmds/config/get/cmd_test.go
@@ -7,7 +7,7 @@ import (
. "github.com/mandelsoft/goutils/testutils"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
- . "github.com/open-component-model/ocm/cmds/ocm/testhelper"
+ . "ocm.software/ocm/cmds/ocm/testhelper"
"github.com/mandelsoft/vfs/pkg/vfs"
)
diff --git a/cmds/ocm/commands/misccmds/credentials/cmd.go b/cmds/ocm/commands/misccmds/credentials/cmd.go
index 29dbaa1e7..9ad20d7da 100644
--- a/cmds/ocm/commands/misccmds/credentials/cmd.go
+++ b/cmds/ocm/commands/misccmds/credentials/cmd.go
@@ -3,10 +3,10 @@ package credentials
import (
"github.com/spf13/cobra"
- credentials "github.com/open-component-model/ocm/cmds/ocm/commands/misccmds/credentials/get"
- "github.com/open-component-model/ocm/cmds/ocm/commands/misccmds/names"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
+ clictx "ocm.software/ocm/api/cli"
+ credentials "ocm.software/ocm/cmds/ocm/commands/misccmds/credentials/get"
+ "ocm.software/ocm/cmds/ocm/commands/misccmds/names"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
var Names = names.Credentials
diff --git a/cmds/ocm/commands/misccmds/credentials/get/cmd.go b/cmds/ocm/commands/misccmds/credentials/get/cmd.go
index a634692cb..881e0254d 100644
--- a/cmds/ocm/commands/misccmds/credentials/get/cmd.go
+++ b/cmds/ocm/commands/misccmds/credentials/get/cmd.go
@@ -8,14 +8,14 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/pflag"
- "github.com/open-component-model/ocm/cmds/ocm/commands/misccmds/names"
- "github.com/open-component-model/ocm/cmds/ocm/commands/verbs"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/output"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
- "github.com/open-component-model/ocm/pkg/contexts/credentials"
- "github.com/open-component-model/ocm/pkg/listformat"
- "github.com/open-component-model/ocm/pkg/out"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/credentials"
+ "ocm.software/ocm/api/utils/listformat"
+ "ocm.software/ocm/api/utils/out"
+ "ocm.software/ocm/cmds/ocm/commands/misccmds/names"
+ "ocm.software/ocm/cmds/ocm/commands/verbs"
+ "ocm.software/ocm/cmds/ocm/common/output"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
var (
diff --git a/cmds/ocm/commands/misccmds/credentials/get/cmd_test.go b/cmds/ocm/commands/misccmds/credentials/get/cmd_test.go
index 7f44b3666..74dd49640 100644
--- a/cmds/ocm/commands/misccmds/credentials/get/cmd_test.go
+++ b/cmds/ocm/commands/misccmds/credentials/get/cmd_test.go
@@ -6,11 +6,11 @@ import (
. "github.com/mandelsoft/goutils/testutils"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
- . "github.com/open-component-model/ocm/cmds/ocm/testhelper"
+ . "ocm.software/ocm/cmds/ocm/testhelper"
- "github.com/open-component-model/ocm/pkg/contexts/credentials"
- "github.com/open-component-model/ocm/pkg/contexts/credentials/builtin/oci/identity"
- "github.com/open-component-model/ocm/pkg/contexts/credentials/cpi"
+ "ocm.software/ocm/api/credentials"
+ "ocm.software/ocm/api/credentials/builtin/oci/identity"
+ "ocm.software/ocm/api/credentials/cpi"
)
var _ = Describe("Test Environment", func() {
diff --git a/cmds/ocm/commands/misccmds/hash/cmd.go b/cmds/ocm/commands/misccmds/hash/cmd.go
index f4aca12d3..31893730b 100644
--- a/cmds/ocm/commands/misccmds/hash/cmd.go
+++ b/cmds/ocm/commands/misccmds/hash/cmd.go
@@ -3,10 +3,10 @@ package credentials
import (
"github.com/spf13/cobra"
- "github.com/open-component-model/ocm/cmds/ocm/commands/misccmds/hash/sign"
- "github.com/open-component-model/ocm/cmds/ocm/commands/misccmds/names"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/cmds/ocm/commands/misccmds/hash/sign"
+ "ocm.software/ocm/cmds/ocm/commands/misccmds/names"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
var Names = names.Hash
diff --git a/cmds/ocm/commands/misccmds/hash/sign/cmd.go b/cmds/ocm/commands/misccmds/hash/sign/cmd.go
index d2ee64f48..86b1c65b5 100644
--- a/cmds/ocm/commands/misccmds/hash/sign/cmd.go
+++ b/cmds/ocm/commands/misccmds/hash/sign/cmd.go
@@ -10,17 +10,17 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/pflag"
- "github.com/open-component-model/ocm/cmds/ocm/commands/misccmds/names"
- "github.com/open-component-model/ocm/cmds/ocm/commands/verbs"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/attrs/signingattr"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc"
- "github.com/open-component-model/ocm/pkg/out"
- "github.com/open-component-model/ocm/pkg/signing"
- "github.com/open-component-model/ocm/pkg/signing/handlers/rsa"
- "github.com/open-component-model/ocm/pkg/signing/signutils"
- utils2 "github.com/open-component-model/ocm/pkg/utils"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/ocm/compdesc"
+ "ocm.software/ocm/api/ocm/extensions/attrs/signingattr"
+ "ocm.software/ocm/api/tech/signing"
+ "ocm.software/ocm/api/tech/signing/handlers/rsa"
+ "ocm.software/ocm/api/tech/signing/signutils"
+ utils2 "ocm.software/ocm/api/utils"
+ "ocm.software/ocm/api/utils/out"
+ "ocm.software/ocm/cmds/ocm/commands/misccmds/names"
+ "ocm.software/ocm/cmds/ocm/commands/verbs"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
var (
diff --git a/cmds/ocm/commands/misccmds/hash/sign/cmd_test.go b/cmds/ocm/commands/misccmds/hash/sign/cmd_test.go
index 07ece2ede..3291641fe 100644
--- a/cmds/ocm/commands/misccmds/hash/sign/cmd_test.go
+++ b/cmds/ocm/commands/misccmds/hash/sign/cmd_test.go
@@ -6,9 +6,9 @@ import (
. "github.com/mandelsoft/goutils/testutils"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
- . "github.com/open-component-model/ocm/cmds/ocm/testhelper"
+ . "ocm.software/ocm/cmds/ocm/testhelper"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/signing/signingtest"
+ "ocm.software/ocm/api/ocm/tools/signing/signingtest"
)
const ISSUER = "mandelsoft"
diff --git a/cmds/ocm/commands/misccmds/rsakeypair/cmd.go b/cmds/ocm/commands/misccmds/rsakeypair/cmd.go
index cbbfb0f29..c819fe2f7 100644
--- a/cmds/ocm/commands/misccmds/rsakeypair/cmd.go
+++ b/cmds/ocm/commands/misccmds/rsakeypair/cmd.go
@@ -14,20 +14,20 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/pflag"
- "github.com/open-component-model/ocm/cmds/ocm/commands/misccmds/names"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common"
- "github.com/open-component-model/ocm/cmds/ocm/commands/verbs"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/cobrautils/flag"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
- "github.com/open-component-model/ocm/pkg/contexts/datacontext/attrs/rootcertsattr"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/attrs/signingattr"
- "github.com/open-component-model/ocm/pkg/encrypt"
- "github.com/open-component-model/ocm/pkg/out"
- "github.com/open-component-model/ocm/pkg/signing"
- "github.com/open-component-model/ocm/pkg/signing/handlers/rsa"
- "github.com/open-component-model/ocm/pkg/signing/signutils"
- utils2 "github.com/open-component-model/ocm/pkg/utils"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/datacontext/attrs/rootcertsattr"
+ "ocm.software/ocm/api/ocm/extensions/attrs/signingattr"
+ "ocm.software/ocm/api/tech/signing"
+ "ocm.software/ocm/api/tech/signing/handlers/rsa"
+ "ocm.software/ocm/api/tech/signing/signutils"
+ utils2 "ocm.software/ocm/api/utils"
+ "ocm.software/ocm/api/utils/cobrautils/flag"
+ "ocm.software/ocm/api/utils/encrypt"
+ "ocm.software/ocm/api/utils/out"
+ "ocm.software/ocm/cmds/ocm/commands/misccmds/names"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common"
+ "ocm.software/ocm/cmds/ocm/commands/verbs"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
var (
diff --git a/cmds/ocm/commands/misccmds/rsakeypair/cmd_test.go b/cmds/ocm/commands/misccmds/rsakeypair/cmd_test.go
index abd3e64d3..064c5f4b4 100644
--- a/cmds/ocm/commands/misccmds/rsakeypair/cmd_test.go
+++ b/cmds/ocm/commands/misccmds/rsakeypair/cmd_test.go
@@ -8,16 +8,16 @@ import (
. "github.com/mandelsoft/goutils/testutils"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
- . "github.com/open-component-model/ocm/cmds/ocm/testhelper"
+ . "ocm.software/ocm/cmds/ocm/testhelper"
"github.com/opencontainers/go-digest"
- "github.com/open-component-model/ocm/pkg/contexts/credentials"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/attrs/signingattr"
- "github.com/open-component-model/ocm/pkg/encrypt"
- "github.com/open-component-model/ocm/pkg/signing"
- "github.com/open-component-model/ocm/pkg/signing/handlers/rsa"
- "github.com/open-component-model/ocm/pkg/signing/signutils"
+ "ocm.software/ocm/api/credentials"
+ "ocm.software/ocm/api/ocm/extensions/attrs/signingattr"
+ "ocm.software/ocm/api/tech/signing"
+ "ocm.software/ocm/api/tech/signing/handlers/rsa"
+ "ocm.software/ocm/api/tech/signing/signutils"
+ "ocm.software/ocm/api/utils/encrypt"
)
var ISSUER = &pkix.Name{CommonName: "mandelsoft"}
diff --git a/cmds/ocm/commands/ocicmds/artifacts/cmd.go b/cmds/ocm/commands/ocicmds/artifacts/cmd.go
index a1579d7dc..79fce2381 100644
--- a/cmds/ocm/commands/ocicmds/artifacts/cmd.go
+++ b/cmds/ocm/commands/ocicmds/artifacts/cmd.go
@@ -3,13 +3,13 @@ package artifacts
import (
"github.com/spf13/cobra"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocicmds/artifacts/describe"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocicmds/artifacts/download"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocicmds/artifacts/get"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocicmds/artifacts/transfer"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocicmds/names"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/cmds/ocm/commands/ocicmds/artifacts/describe"
+ "ocm.software/ocm/cmds/ocm/commands/ocicmds/artifacts/download"
+ "ocm.software/ocm/cmds/ocm/commands/ocicmds/artifacts/get"
+ "ocm.software/ocm/cmds/ocm/commands/ocicmds/artifacts/transfer"
+ "ocm.software/ocm/cmds/ocm/commands/ocicmds/names"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
var Names = names.Artifacts
diff --git a/cmds/ocm/commands/ocicmds/artifacts/describe/cmd.go b/cmds/ocm/commands/ocicmds/artifacts/describe/cmd.go
index 7627d4bc4..c063a910d 100644
--- a/cmds/ocm/commands/ocicmds/artifacts/describe/cmd.go
+++ b/cmds/ocm/commands/ocicmds/artifacts/describe/cmd.go
@@ -7,19 +7,19 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/pflag"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocicmds/common"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocicmds/common/handlers/artifacthdlr"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocicmds/common/options/repooption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocicmds/names"
- "github.com/open-component-model/ocm/cmds/ocm/commands/verbs"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/output"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/processing"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- common2 "github.com/open-component-model/ocm/pkg/common"
- "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/contexts/oci/ociutils"
- "github.com/open-component-model/ocm/pkg/out"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/oci"
+ "ocm.software/ocm/api/oci/ociutils"
+ common2 "ocm.software/ocm/api/utils/misc"
+ "ocm.software/ocm/api/utils/out"
+ "ocm.software/ocm/cmds/ocm/commands/ocicmds/common"
+ "ocm.software/ocm/cmds/ocm/commands/ocicmds/common/handlers/artifacthdlr"
+ "ocm.software/ocm/cmds/ocm/commands/ocicmds/common/options/repooption"
+ "ocm.software/ocm/cmds/ocm/commands/ocicmds/names"
+ "ocm.software/ocm/cmds/ocm/commands/verbs"
+ "ocm.software/ocm/cmds/ocm/common/output"
+ "ocm.software/ocm/cmds/ocm/common/processing"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
var (
diff --git a/cmds/ocm/commands/ocicmds/artifacts/download/cmd.go b/cmds/ocm/commands/ocicmds/artifacts/download/cmd.go
index d7e44c667..621ced55f 100644
--- a/cmds/ocm/commands/ocicmds/artifacts/download/cmd.go
+++ b/cmds/ocm/commands/ocicmds/artifacts/download/cmd.go
@@ -11,24 +11,24 @@ import (
"github.com/mandelsoft/vfs/pkg/vfs"
"github.com/spf13/cobra"
- "github.com/open-component-model/ocm/cmds/ocm/commands/common/options/destoption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/common/options/formatoption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocicmds/common"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocicmds/common/handlers/artifacthdlr"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocicmds/common/options/repooption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocicmds/names"
- "github.com/open-component-model/ocm/cmds/ocm/commands/verbs"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/output"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "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/common/compression"
- "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/contexts/oci/repositories/artifactset"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/download/handlers/dirtree"
- "github.com/open-component-model/ocm/pkg/out"
- "github.com/open-component-model/ocm/pkg/utils/tarutils"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/oci"
+ "ocm.software/ocm/api/oci/extensions/repositories/artifactset"
+ "ocm.software/ocm/api/ocm/extensions/download/handlers/dirtree"
+ "ocm.software/ocm/api/utils/accessio"
+ "ocm.software/ocm/api/utils/accessobj"
+ "ocm.software/ocm/api/utils/compression"
+ "ocm.software/ocm/api/utils/out"
+ "ocm.software/ocm/api/utils/tarutils"
+ "ocm.software/ocm/cmds/ocm/commands/common/options/destoption"
+ "ocm.software/ocm/cmds/ocm/commands/common/options/formatoption"
+ "ocm.software/ocm/cmds/ocm/commands/ocicmds/common"
+ "ocm.software/ocm/cmds/ocm/commands/ocicmds/common/handlers/artifacthdlr"
+ "ocm.software/ocm/cmds/ocm/commands/ocicmds/common/options/repooption"
+ "ocm.software/ocm/cmds/ocm/commands/ocicmds/names"
+ "ocm.software/ocm/cmds/ocm/commands/verbs"
+ "ocm.software/ocm/cmds/ocm/common/output"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
var (
diff --git a/cmds/ocm/commands/ocicmds/artifacts/download/cmd_test.go b/cmds/ocm/commands/ocicmds/artifacts/download/cmd_test.go
index 79c110c2d..299e53e6c 100644
--- a/cmds/ocm/commands/ocicmds/artifacts/download/cmd_test.go
+++ b/cmds/ocm/commands/ocicmds/artifacts/download/cmd_test.go
@@ -6,12 +6,12 @@ import (
. "github.com/mandelsoft/goutils/testutils"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
- . "github.com/open-component-model/ocm/cmds/ocm/testhelper"
+ . "ocm.software/ocm/cmds/ocm/testhelper"
- "github.com/open-component-model/ocm/pkg/common/accessio"
- "github.com/open-component-model/ocm/pkg/contexts/oci/grammar"
- "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/artifactset"
- "github.com/open-component-model/ocm/pkg/mime"
+ "ocm.software/ocm/api/oci/extensions/repositories/artifactset"
+ "ocm.software/ocm/api/oci/grammar"
+ "ocm.software/ocm/api/utils/accessio"
+ "ocm.software/ocm/api/utils/mime"
)
const (
diff --git a/cmds/ocm/commands/ocicmds/artifacts/download/option.go b/cmds/ocm/commands/ocicmds/artifacts/download/option.go
index 9b1a62b19..174e60727 100644
--- a/cmds/ocm/commands/ocicmds/artifacts/download/option.go
+++ b/cmds/ocm/commands/ocicmds/artifacts/download/option.go
@@ -3,7 +3,7 @@ package download
import (
"github.com/spf13/pflag"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/options"
+ "ocm.software/ocm/cmds/ocm/common/options"
)
func From(o options.OptionSetProvider) *Option {
diff --git a/cmds/ocm/commands/ocicmds/artifacts/get/cmd.go b/cmds/ocm/commands/ocicmds/artifacts/get/cmd.go
index 8e67c24b1..761da9e73 100644
--- a/cmds/ocm/commands/ocicmds/artifacts/get/cmd.go
+++ b/cmds/ocm/commands/ocicmds/artifacts/get/cmd.go
@@ -5,18 +5,18 @@ import (
"github.com/spf13/cobra"
- "github.com/open-component-model/ocm/cmds/ocm/commands/common/options/closureoption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocicmds/common"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocicmds/common/handlers/artifacthdlr"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocicmds/common/options/repooption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocicmds/names"
- "github.com/open-component-model/ocm/cmds/ocm/commands/verbs"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/options"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/output"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/processing"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
- "github.com/open-component-model/ocm/pkg/contexts/oci"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/oci"
+ "ocm.software/ocm/cmds/ocm/commands/common/options/closureoption"
+ "ocm.software/ocm/cmds/ocm/commands/ocicmds/common"
+ "ocm.software/ocm/cmds/ocm/commands/ocicmds/common/handlers/artifacthdlr"
+ "ocm.software/ocm/cmds/ocm/commands/ocicmds/common/options/repooption"
+ "ocm.software/ocm/cmds/ocm/commands/ocicmds/names"
+ "ocm.software/ocm/cmds/ocm/commands/verbs"
+ "ocm.software/ocm/cmds/ocm/common/options"
+ "ocm.software/ocm/cmds/ocm/common/output"
+ "ocm.software/ocm/cmds/ocm/common/processing"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
var (
diff --git a/cmds/ocm/commands/ocicmds/artifacts/get/cmd_test.go b/cmds/ocm/commands/ocicmds/artifacts/get/cmd_test.go
index cc8216f4b..8f1d3cdb2 100644
--- a/cmds/ocm/commands/ocicmds/artifacts/get/cmd_test.go
+++ b/cmds/ocm/commands/ocicmds/artifacts/get/cmd_test.go
@@ -6,12 +6,12 @@ import (
. "github.com/mandelsoft/goutils/testutils"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
- . "github.com/open-component-model/ocm/cmds/ocm/testhelper"
+ . "ocm.software/ocm/cmds/ocm/testhelper"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocicmds/common/handlers/artifacthdlr"
- "github.com/open-component-model/ocm/pkg/common/accessio"
- "github.com/open-component-model/ocm/pkg/contexts/oci/artdesc"
- "github.com/open-component-model/ocm/pkg/mime"
+ "ocm.software/ocm/api/oci/artdesc"
+ "ocm.software/ocm/api/utils/accessio"
+ "ocm.software/ocm/api/utils/mime"
+ "ocm.software/ocm/cmds/ocm/commands/ocicmds/common/handlers/artifacthdlr"
)
const (
diff --git a/cmds/ocm/commands/ocicmds/artifacts/get/options.go b/cmds/ocm/commands/ocicmds/artifacts/get/options.go
index dcf4964fa..1948b83dd 100644
--- a/cmds/ocm/commands/ocicmds/artifacts/get/options.go
+++ b/cmds/ocm/commands/ocicmds/artifacts/get/options.go
@@ -3,7 +3,7 @@ package get
import (
"github.com/spf13/pflag"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/options"
+ "ocm.software/ocm/cmds/ocm/common/options"
)
func AttachedFrom(o options.OptionSetProvider) *Attached {
diff --git a/cmds/ocm/commands/ocicmds/artifacts/transfer/cmd.go b/cmds/ocm/commands/ocicmds/artifacts/transfer/cmd.go
index 8b54aed92..2896d6c26 100644
--- a/cmds/ocm/commands/ocicmds/artifacts/transfer/cmd.go
+++ b/cmds/ocm/commands/ocicmds/artifacts/transfer/cmd.go
@@ -9,17 +9,17 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/pflag"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocicmds/common"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocicmds/common/handlers/artifacthdlr"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocicmds/common/options/repooption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocicmds/names"
- "github.com/open-component-model/ocm/cmds/ocm/commands/verbs"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "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/contexts/oci/repositories/ctf"
- "github.com/open-component-model/ocm/pkg/contexts/oci/transfer"
- "github.com/open-component-model/ocm/pkg/out"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/oci"
+ "ocm.software/ocm/api/oci/extensions/repositories/ctf"
+ "ocm.software/ocm/api/oci/tools/transfer"
+ "ocm.software/ocm/api/utils/out"
+ "ocm.software/ocm/cmds/ocm/commands/ocicmds/common"
+ "ocm.software/ocm/cmds/ocm/commands/ocicmds/common/handlers/artifacthdlr"
+ "ocm.software/ocm/cmds/ocm/commands/ocicmds/common/options/repooption"
+ "ocm.software/ocm/cmds/ocm/commands/ocicmds/names"
+ "ocm.software/ocm/cmds/ocm/commands/verbs"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
var (
diff --git a/cmds/ocm/commands/ocicmds/artifacts/transfer/cmd_test.go b/cmds/ocm/commands/ocicmds/artifacts/transfer/cmd_test.go
index ce2547755..0ca832ed7 100644
--- a/cmds/ocm/commands/ocicmds/artifacts/transfer/cmd_test.go
+++ b/cmds/ocm/commands/ocicmds/artifacts/transfer/cmd_test.go
@@ -6,11 +6,11 @@ import (
. "github.com/mandelsoft/goutils/testutils"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
- . "github.com/open-component-model/ocm/cmds/ocm/testhelper"
+ . "ocm.software/ocm/cmds/ocm/testhelper"
- "github.com/open-component-model/ocm/pkg/common/accessio"
- "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/ctf"
- "github.com/open-component-model/ocm/pkg/mime"
+ "ocm.software/ocm/api/oci/extensions/repositories/ctf"
+ "ocm.software/ocm/api/utils/accessio"
+ "ocm.software/ocm/api/utils/mime"
)
const (
diff --git a/cmds/ocm/commands/ocicmds/cmd.go b/cmds/ocm/commands/ocicmds/cmd.go
index 4ebb6afb8..d03434c58 100644
--- a/cmds/ocm/commands/ocicmds/cmd.go
+++ b/cmds/ocm/commands/ocicmds/cmd.go
@@ -3,12 +3,12 @@ package ocicmds
import (
"github.com/spf13/cobra"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocicmds/artifacts"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocicmds/ctf"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocicmds/tags"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- topicocirefs "github.com/open-component-model/ocm/cmds/ocm/topics/oci/refs"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/cmds/ocm/commands/ocicmds/artifacts"
+ "ocm.software/ocm/cmds/ocm/commands/ocicmds/ctf"
+ "ocm.software/ocm/cmds/ocm/commands/ocicmds/tags"
+ "ocm.software/ocm/cmds/ocm/common/utils"
+ topicocirefs "ocm.software/ocm/cmds/ocm/topics/oci/refs"
)
// NewCommand creates a new command.
diff --git a/cmds/ocm/commands/ocicmds/common/handlers/artifacthdlr/attached.go b/cmds/ocm/commands/ocicmds/common/handlers/artifacthdlr/attached.go
index 1479361e3..4597bfdf0 100644
--- a/cmds/ocm/commands/ocicmds/common/handlers/artifacthdlr/attached.go
+++ b/cmds/ocm/commands/ocicmds/common/handlers/artifacthdlr/attached.go
@@ -7,9 +7,9 @@ import (
"github.com/mandelsoft/logging"
"github.com/opencontainers/go-digest"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/output"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/processing"
- "github.com/open-component-model/ocm/pkg/common"
+ common "ocm.software/ocm/api/utils/misc"
+ "ocm.software/ocm/cmds/ocm/common/output"
+ "ocm.software/ocm/cmds/ocm/common/processing"
)
func Attachment(d digest.Digest, suffix string) string {
diff --git a/cmds/ocm/commands/ocicmds/common/handlers/artifacthdlr/clean.go b/cmds/ocm/commands/ocicmds/common/handlers/artifacthdlr/clean.go
index 77d7fa00f..1d10cafc5 100644
--- a/cmds/ocm/commands/ocicmds/common/handlers/artifacthdlr/clean.go
+++ b/cmds/ocm/commands/ocicmds/common/handlers/artifacthdlr/clean.go
@@ -3,10 +3,10 @@ package artifacthdlr
import (
"github.com/opencontainers/go-digest"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/data"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/output"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/processing"
- "github.com/open-component-model/ocm/pkg/common"
+ common "ocm.software/ocm/api/utils/misc"
+ "ocm.software/ocm/cmds/ocm/common/data"
+ "ocm.software/ocm/cmds/ocm/common/output"
+ "ocm.software/ocm/cmds/ocm/common/processing"
)
////////////////////////////////////////////////////////////////////////////////
diff --git a/cmds/ocm/commands/ocicmds/common/handlers/artifacthdlr/closure.go b/cmds/ocm/commands/ocicmds/common/handlers/artifacthdlr/closure.go
index 28f67009c..978515dbe 100644
--- a/cmds/ocm/commands/ocicmds/common/handlers/artifacthdlr/closure.go
+++ b/cmds/ocm/commands/ocicmds/common/handlers/artifacthdlr/closure.go
@@ -1,10 +1,10 @@
package artifacthdlr
import (
- "github.com/open-component-model/ocm/cmds/ocm/pkg/output"
- "github.com/open-component-model/ocm/pkg/common"
- "github.com/open-component-model/ocm/pkg/contexts/oci"
- "github.com/open-component-model/ocm/pkg/out"
+ "ocm.software/ocm/api/oci"
+ common "ocm.software/ocm/api/utils/misc"
+ "ocm.software/ocm/api/utils/out"
+ "ocm.software/ocm/cmds/ocm/common/output"
)
////////////////////////////////////////////////////////////////////////////////
diff --git a/cmds/ocm/commands/ocicmds/common/handlers/artifacthdlr/convert.go b/cmds/ocm/commands/ocicmds/common/handlers/artifacthdlr/convert.go
index 82cbe2b99..8c18ff3e1 100644
--- a/cmds/ocm/commands/ocicmds/common/handlers/artifacthdlr/convert.go
+++ b/cmds/ocm/commands/ocicmds/common/handlers/artifacthdlr/convert.go
@@ -1,7 +1,7 @@
package artifacthdlr
import (
- "github.com/open-component-model/ocm/cmds/ocm/pkg/data"
+ "ocm.software/ocm/cmds/ocm/common/data"
)
type Objects []*Object
diff --git a/cmds/ocm/commands/ocicmds/common/handlers/artifacthdlr/sort.go b/cmds/ocm/commands/ocicmds/common/handlers/artifacthdlr/sort.go
index 57fa2963d..924e2e407 100644
--- a/cmds/ocm/commands/ocicmds/common/handlers/artifacthdlr/sort.go
+++ b/cmds/ocm/commands/ocicmds/common/handlers/artifacthdlr/sort.go
@@ -3,8 +3,8 @@ package artifacthdlr
import (
"strings"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/processing"
- "github.com/open-component-model/ocm/pkg/common"
+ common "ocm.software/ocm/api/utils/misc"
+ "ocm.software/ocm/cmds/ocm/common/processing"
)
func Compare(a, b interface{}) int {
diff --git a/cmds/ocm/commands/ocicmds/common/handlers/artifacthdlr/typehandler.go b/cmds/ocm/commands/ocicmds/common/handlers/artifacthdlr/typehandler.go
index ae611292f..aa8aa3480 100644
--- a/cmds/ocm/commands/ocicmds/common/handlers/artifacthdlr/typehandler.go
+++ b/cmds/ocm/commands/ocicmds/common/handlers/artifacthdlr/typehandler.go
@@ -7,13 +7,13 @@ import (
"github.com/mandelsoft/goutils/errors"
"github.com/mandelsoft/logging"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/output"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/tree"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/common"
- "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/contexts/oci/artdesc"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/oci"
+ "ocm.software/ocm/api/oci/artdesc"
+ common "ocm.software/ocm/api/utils/misc"
+ "ocm.software/ocm/cmds/ocm/common/output"
+ "ocm.software/ocm/cmds/ocm/common/tree"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
func Elem(e interface{}) oci.ArtifactAccess {
diff --git a/cmds/ocm/commands/ocicmds/common/options/repooption/option.go b/cmds/ocm/commands/ocicmds/common/options/repooption/option.go
index 7cd49a5b7..c5f6e9305 100644
--- a/cmds/ocm/commands/ocicmds/common/options/repooption/option.go
+++ b/cmds/ocm/commands/ocicmds/common/options/repooption/option.go
@@ -3,11 +3,11 @@ package repooption
import (
"github.com/spf13/pflag"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/options"
- "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/listformat"
- "github.com/open-component-model/ocm/pkg/runtime"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/oci"
+ "ocm.software/ocm/api/utils/listformat"
+ "ocm.software/ocm/api/utils/runtime"
+ "ocm.software/ocm/cmds/ocm/common/options"
)
func From(o options.OptionSetProvider) *Option {
diff --git a/cmds/ocm/commands/ocicmds/common/utils.go b/cmds/ocm/commands/ocicmds/common/utils.go
index 11c4bbd3c..0bdb3d9a6 100644
--- a/cmds/ocm/commands/ocicmds/common/utils.go
+++ b/cmds/ocm/commands/ocicmds/common/utils.go
@@ -1,9 +1,9 @@
package common
import (
- "github.com/open-component-model/ocm/cmds/ocm/pkg/options"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
- "github.com/open-component-model/ocm/pkg/contexts/oci"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/oci"
+ "ocm.software/ocm/cmds/ocm/common/options"
)
type OptionCompleter interface {
diff --git a/cmds/ocm/commands/ocicmds/ctf/cmd.go b/cmds/ocm/commands/ocicmds/ctf/cmd.go
index b5c70431f..02546a724 100644
--- a/cmds/ocm/commands/ocicmds/ctf/cmd.go
+++ b/cmds/ocm/commands/ocicmds/ctf/cmd.go
@@ -3,10 +3,10 @@ package ctf
import (
"github.com/spf13/cobra"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocicmds/ctf/create"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocicmds/names"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/cmds/ocm/commands/ocicmds/ctf/create"
+ "ocm.software/ocm/cmds/ocm/commands/ocicmds/names"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
var Names = names.TransportArchive
diff --git a/cmds/ocm/commands/ocicmds/ctf/create/cmd.go b/cmds/ocm/commands/ocicmds/ctf/create/cmd.go
index 32a7d18e2..089140e2b 100644
--- a/cmds/ocm/commands/ocicmds/ctf/create/cmd.go
+++ b/cmds/ocm/commands/ocicmds/ctf/create/cmd.go
@@ -6,14 +6,14 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/pflag"
- "github.com/open-component-model/ocm/cmds/ocm/commands/common/options/formatoption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocicmds/names"
- "github.com/open-component-model/ocm/cmds/ocm/commands/verbs"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "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/contexts/oci/repositories/ctf"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/oci/extensions/repositories/ctf"
+ "ocm.software/ocm/api/utils/accessio"
+ "ocm.software/ocm/api/utils/accessobj"
+ "ocm.software/ocm/cmds/ocm/commands/common/options/formatoption"
+ "ocm.software/ocm/cmds/ocm/commands/ocicmds/names"
+ "ocm.software/ocm/cmds/ocm/commands/verbs"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
var (
diff --git a/cmds/ocm/commands/ocicmds/ctf/create/cmd_test.go b/cmds/ocm/commands/ocicmds/ctf/create/cmd_test.go
index b99e6ad5a..dfa1a1948 100644
--- a/cmds/ocm/commands/ocicmds/ctf/create/cmd_test.go
+++ b/cmds/ocm/commands/ocicmds/ctf/create/cmd_test.go
@@ -3,9 +3,9 @@ package create_test
import (
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
- . "github.com/open-component-model/ocm/cmds/ocm/testhelper"
+ . "ocm.software/ocm/cmds/ocm/testhelper"
- "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/ctf"
+ "ocm.software/ocm/api/oci/extensions/repositories/ctf"
)
const ARCH = "/tmp/ctf"
diff --git a/cmds/ocm/commands/ocicmds/tags/cmd.go b/cmds/ocm/commands/ocicmds/tags/cmd.go
index 77b26d800..0d74d9b72 100644
--- a/cmds/ocm/commands/ocicmds/tags/cmd.go
+++ b/cmds/ocm/commands/ocicmds/tags/cmd.go
@@ -3,10 +3,10 @@ package tags
import (
"github.com/spf13/cobra"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocicmds/names"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocicmds/tags/show"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/cmds/ocm/commands/ocicmds/names"
+ "ocm.software/ocm/cmds/ocm/commands/ocicmds/tags/show"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
var Names = names.Tags
diff --git a/cmds/ocm/commands/ocicmds/tags/show/cmd.go b/cmds/ocm/commands/ocicmds/tags/show/cmd.go
index 16a5180d1..db7c0f3e5 100644
--- a/cmds/ocm/commands/ocicmds/tags/show/cmd.go
+++ b/cmds/ocm/commands/ocicmds/tags/show/cmd.go
@@ -9,14 +9,14 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/pflag"
- ocmcommon "github.com/open-component-model/ocm/cmds/ocm/commands/ocicmds/common"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocicmds/common/options/repooption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocicmds/names"
- "github.com/open-component-model/ocm/cmds/ocm/commands/verbs"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "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"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/oci"
+ "ocm.software/ocm/api/utils/out"
+ ocmcommon "ocm.software/ocm/cmds/ocm/commands/ocicmds/common"
+ "ocm.software/ocm/cmds/ocm/commands/ocicmds/common/options/repooption"
+ "ocm.software/ocm/cmds/ocm/commands/ocicmds/names"
+ "ocm.software/ocm/cmds/ocm/commands/verbs"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
var (
diff --git a/cmds/ocm/commands/ocicmds/tags/show/cmd_test.go b/cmds/ocm/commands/ocicmds/tags/show/cmd_test.go
index b641b4f81..6b36dbeeb 100644
--- a/cmds/ocm/commands/ocicmds/tags/show/cmd_test.go
+++ b/cmds/ocm/commands/ocicmds/tags/show/cmd_test.go
@@ -6,10 +6,10 @@ import (
. "github.com/mandelsoft/goutils/testutils"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
- . "github.com/open-component-model/ocm/cmds/ocm/testhelper"
+ . "ocm.software/ocm/cmds/ocm/testhelper"
- "github.com/open-component-model/ocm/pkg/common/accessio"
- "github.com/open-component-model/ocm/pkg/mime"
+ "ocm.software/ocm/api/utils/accessio"
+ "ocm.software/ocm/api/utils/mime"
)
const (
diff --git a/cmds/ocm/commands/ocmcmds/cli/cmd.go b/cmds/ocm/commands/ocmcmds/cli/cmd.go
index aea68ce26..59b378741 100644
--- a/cmds/ocm/commands/ocmcmds/cli/cmd.go
+++ b/cmds/ocm/commands/ocmcmds/cli/cmd.go
@@ -3,10 +3,10 @@ package cli
import (
"github.com/spf13/cobra"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/cli/download"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/names"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/cli/download"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/names"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
var Names = names.Components
diff --git a/cmds/ocm/commands/ocmcmds/cli/download/cmd.go b/cmds/ocm/commands/ocmcmds/cli/download/cmd.go
index 4f952ae83..7f4b757c6 100644
--- a/cmds/ocm/commands/ocmcmds/cli/download/cmd.go
+++ b/cmds/ocm/commands/ocmcmds/cli/download/cmd.go
@@ -10,23 +10,23 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/pflag"
- "github.com/open-component-model/ocm/cmds/ocm/commands/common/options/destoption"
- ocmcommon "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/handlers/elemhdlr"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/repooption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/versionconstraintsoption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/names"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/resources/common"
- downloadcmd "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/resources/download"
- "github.com/open-component-model/ocm/cmds/ocm/commands/verbs"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/output"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
- v1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/extraid"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/resourcetypes"
- "github.com/open-component-model/ocm/pkg/out"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/ocm"
+ v1 "ocm.software/ocm/api/ocm/compdesc/meta/v1"
+ resourcetypes "ocm.software/ocm/api/ocm/extensions/artifacttypes"
+ "ocm.software/ocm/api/ocm/extraid"
+ "ocm.software/ocm/api/utils/out"
+ "ocm.software/ocm/cmds/ocm/commands/common/options/destoption"
+ ocmcommon "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/handlers/elemhdlr"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/repooption"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/versionconstraintsoption"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/names"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/resources/common"
+ downloadcmd "ocm.software/ocm/cmds/ocm/commands/ocmcmds/resources/download"
+ "ocm.software/ocm/cmds/ocm/commands/verbs"
+ "ocm.software/ocm/cmds/ocm/common/output"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
var (
diff --git a/cmds/ocm/commands/ocmcmds/cli/download/cmd_test.go b/cmds/ocm/commands/ocmcmds/cli/download/cmd_test.go
index df4218ffd..7b6ae3bb6 100644
--- a/cmds/ocm/commands/ocmcmds/cli/download/cmd_test.go
+++ b/cmds/ocm/commands/ocmcmds/cli/download/cmd_test.go
@@ -9,15 +9,15 @@ import (
. "github.com/mandelsoft/goutils/testutils"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
- . "github.com/open-component-model/ocm/cmds/ocm/testhelper"
+ . "ocm.software/ocm/cmds/ocm/testhelper"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/cli/download"
- "github.com/open-component-model/ocm/pkg/common/accessio"
- metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/extraid"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/resourcetypes"
- env2 "github.com/open-component-model/ocm/pkg/env"
- "github.com/open-component-model/ocm/pkg/mime"
+ env2 "ocm.software/ocm/api/helper/env"
+ metav1 "ocm.software/ocm/api/ocm/compdesc/meta/v1"
+ resourcetypes "ocm.software/ocm/api/ocm/extensions/artifacttypes"
+ "ocm.software/ocm/api/ocm/extraid"
+ "ocm.software/ocm/api/utils/accessio"
+ "ocm.software/ocm/api/utils/mime"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/cli/download"
)
const (
diff --git a/cmds/ocm/commands/ocmcmds/cmd.go b/cmds/ocm/commands/ocmcmds/cmd.go
index 813c2184e..76d662566 100644
--- a/cmds/ocm/commands/ocmcmds/cmd.go
+++ b/cmds/ocm/commands/ocmcmds/cmd.go
@@ -3,24 +3,24 @@ package ocmcmds
import (
"github.com/spf13/cobra"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/componentarchive"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/components"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/ctf"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/plugins"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/pubsub"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/references"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/resourceconfig"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/resources"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/routingslips"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/sourceconfig"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/sources"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/versions"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- topicocmaccessmethods "github.com/open-component-model/ocm/cmds/ocm/topics/ocm/accessmethods"
- topicocmdownloaders "github.com/open-component-model/ocm/cmds/ocm/topics/ocm/downloadhandlers"
- topicocmrefs "github.com/open-component-model/ocm/cmds/ocm/topics/ocm/refs"
- topicocmuploaders "github.com/open-component-model/ocm/cmds/ocm/topics/ocm/uploadhandlers"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/componentarchive"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/components"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/ctf"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/plugins"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/pubsub"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/references"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/resourceconfig"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/resources"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/routingslips"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/sourceconfig"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/sources"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/versions"
+ "ocm.software/ocm/cmds/ocm/common/utils"
+ topicocmaccessmethods "ocm.software/ocm/cmds/ocm/topics/ocm/accessmethods"
+ topicocmdownloaders "ocm.software/ocm/cmds/ocm/topics/ocm/downloadhandlers"
+ topicocmrefs "ocm.software/ocm/cmds/ocm/topics/ocm/refs"
+ topicocmuploaders "ocm.software/ocm/cmds/ocm/topics/ocm/uploadhandlers"
)
// NewCommand creates a new command.
diff --git a/cmds/ocm/commands/ocmcmds/common/addconfig.go b/cmds/ocm/commands/ocmcmds/common/addconfig.go
index 8f391b31e..cb4614986 100644
--- a/cmds/ocm/commands/ocmcmds/common/addconfig.go
+++ b/cmds/ocm/commands/ocmcmds/common/addconfig.go
@@ -10,14 +10,14 @@ import (
"github.com/spf13/pflag"
"sigs.k8s.io/yaml"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/addhdlrs"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/templateroption"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/options"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/common"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
- utils2 "github.com/open-component-model/ocm/pkg/utils"
+ clictx "ocm.software/ocm/api/cli"
+ utils2 "ocm.software/ocm/api/utils"
+ common "ocm.software/ocm/api/utils/misc"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/addhdlrs"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/templateroption"
+ "ocm.software/ocm/cmds/ocm/common/options"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
type ModifiedResourceSpecificationsFile struct {
diff --git a/cmds/ocm/commands/ocmcmds/common/addhdlrs/base.go b/cmds/ocm/commands/ocmcmds/common/addhdlrs/base.go
index 4f5726194..f772472ac 100644
--- a/cmds/ocm/commands/ocmcmds/common/addhdlrs/base.go
+++ b/cmds/ocm/commands/ocmcmds/common/addhdlrs/base.go
@@ -3,8 +3,8 @@ package addhdlrs
import (
"github.com/spf13/pflag"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/options"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
+ "ocm.software/ocm/api/ocm"
+ "ocm.software/ocm/cmds/ocm/common/options"
)
type ResourceSpecHandlerBase struct {
diff --git a/cmds/ocm/commands/ocmcmds/common/addhdlrs/comp/components.go b/cmds/ocm/commands/ocmcmds/common/addhdlrs/comp/components.go
index 29f513a0d..7f423468f 100644
--- a/cmds/ocm/commands/ocmcmds/common/addhdlrs/comp/components.go
+++ b/cmds/ocm/commands/ocmcmds/common/addhdlrs/comp/components.go
@@ -6,14 +6,14 @@ import (
"github.com/mandelsoft/goutils/set"
"github.com/mandelsoft/goutils/sliceutils"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/addhdlrs"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs"
- "github.com/open-component-model/ocm/pkg/common"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/transfer"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/transfer/transferhandler"
- "github.com/open-component-model/ocm/pkg/out"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/ocm"
+ "ocm.software/ocm/api/ocm/tools/transfer"
+ "ocm.software/ocm/api/ocm/tools/transfer/transferhandler"
+ common "ocm.software/ocm/api/utils/misc"
+ "ocm.software/ocm/api/utils/out"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/addhdlrs"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs"
)
func ProcessComponents(ctx clictx.Context, ictx inputs.Context, repo ocm.Repository, complete ocm.ComponentVersionResolver, thdlr transferhandler.TransferHandler, h *ResourceSpecHandler, elems []addhdlrs.Element) (err error) {
diff --git a/cmds/ocm/commands/ocmcmds/common/addhdlrs/comp/elements.go b/cmds/ocm/commands/ocmcmds/common/addhdlrs/comp/elements.go
index 7331225b9..f9dfd1156 100644
--- a/cmds/ocm/commands/ocmcmds/common/addhdlrs/comp/elements.go
+++ b/cmds/ocm/commands/ocmcmds/common/addhdlrs/comp/elements.go
@@ -8,21 +8,21 @@ import (
"github.com/mandelsoft/goutils/errors"
"github.com/spf13/pflag"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/addhdlrs"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/addhdlrs/refs"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/addhdlrs/rscs"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/addhdlrs/srcs"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/options"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/attrs/compatattr"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc"
- metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1"
- "github.com/open-component-model/ocm/pkg/errkind"
- "github.com/open-component-model/ocm/pkg/runtime"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/ocm"
+ "ocm.software/ocm/api/ocm/compdesc"
+ metav1 "ocm.software/ocm/api/ocm/compdesc/meta/v1"
+ "ocm.software/ocm/api/ocm/extensions/attrs/compatattr"
+ "ocm.software/ocm/api/utils/errkind"
+ "ocm.software/ocm/api/utils/runtime"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/addhdlrs"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/addhdlrs/refs"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/addhdlrs/rscs"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/addhdlrs/srcs"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs"
+ "ocm.software/ocm/cmds/ocm/common/options"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
const (
diff --git a/cmds/ocm/commands/ocmcmds/common/addhdlrs/interface.go b/cmds/ocm/commands/ocmcmds/common/addhdlrs/interface.go
index cf4cc2eca..8a969e6d0 100644
--- a/cmds/ocm/commands/ocmcmds/common/addhdlrs/interface.go
+++ b/cmds/ocm/commands/ocmcmds/common/addhdlrs/interface.go
@@ -7,10 +7,10 @@ import (
"github.com/mandelsoft/goutils/errors"
"github.com/mandelsoft/goutils/sliceutils"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
- metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/cpi"
+ clictx "ocm.software/ocm/api/cli"
+ metav1 "ocm.software/ocm/api/ocm/compdesc/meta/v1"
+ "ocm.software/ocm/api/ocm/cpi"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs"
)
// ResourceInput describe the source for the content of
diff --git a/cmds/ocm/commands/ocmcmds/common/addhdlrs/options.go b/cmds/ocm/commands/ocmcmds/common/addhdlrs/options.go
index 459ee221d..e9614db21 100644
--- a/cmds/ocm/commands/ocmcmds/common/addhdlrs/options.go
+++ b/cmds/ocm/commands/ocmcmds/common/addhdlrs/options.go
@@ -4,7 +4,7 @@ import (
"github.com/mandelsoft/goutils/generics"
"github.com/spf13/pflag"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
+ "ocm.software/ocm/api/ocm"
)
type Options struct {
diff --git a/cmds/ocm/commands/ocmcmds/common/addhdlrs/refs/elements.go b/cmds/ocm/commands/ocmcmds/common/addhdlrs/refs/elements.go
index 86ede5cd5..edea237dd 100644
--- a/cmds/ocm/commands/ocmcmds/common/addhdlrs/refs/elements.go
+++ b/cmds/ocm/commands/ocmcmds/common/addhdlrs/refs/elements.go
@@ -5,15 +5,15 @@ import (
"k8s.io/apimachinery/pkg/util/validation/field"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/addhdlrs"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/options"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc"
- metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1"
- compdescv2 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/versions/v2"
- "github.com/open-component-model/ocm/pkg/runtime"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/ocm"
+ "ocm.software/ocm/api/ocm/compdesc"
+ metav1 "ocm.software/ocm/api/ocm/compdesc/meta/v1"
+ compdescv2 "ocm.software/ocm/api/ocm/compdesc/versions/v2"
+ "ocm.software/ocm/api/utils/runtime"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/addhdlrs"
+ "ocm.software/ocm/cmds/ocm/common/options"
)
type ResourceSpecHandler struct {
diff --git a/cmds/ocm/commands/ocmcmds/common/addhdlrs/rscs/elements.go b/cmds/ocm/commands/ocmcmds/common/addhdlrs/rscs/elements.go
index aa1aaa732..1cd98d239 100644
--- a/cmds/ocm/commands/ocmcmds/common/addhdlrs/rscs/elements.go
+++ b/cmds/ocm/commands/ocmcmds/common/addhdlrs/rscs/elements.go
@@ -6,16 +6,16 @@ import (
"github.com/mandelsoft/goutils/errors"
"k8s.io/apimachinery/pkg/util/validation/field"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/addhdlrs"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/skipdigestoption"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/options"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc"
- metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1"
- compdescv2 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/versions/v2"
- "github.com/open-component-model/ocm/pkg/runtime"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/ocm"
+ "ocm.software/ocm/api/ocm/compdesc"
+ metav1 "ocm.software/ocm/api/ocm/compdesc/meta/v1"
+ compdescv2 "ocm.software/ocm/api/ocm/compdesc/versions/v2"
+ "ocm.software/ocm/api/utils/runtime"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/addhdlrs"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/skipdigestoption"
+ "ocm.software/ocm/cmds/ocm/common/options"
)
const (
diff --git a/cmds/ocm/commands/ocmcmds/common/addhdlrs/srcs/elements.go b/cmds/ocm/commands/ocmcmds/common/addhdlrs/srcs/elements.go
index ed082ab09..6ab83fca1 100644
--- a/cmds/ocm/commands/ocmcmds/common/addhdlrs/srcs/elements.go
+++ b/cmds/ocm/commands/ocmcmds/common/addhdlrs/srcs/elements.go
@@ -5,15 +5,15 @@ import (
"k8s.io/apimachinery/pkg/util/validation/field"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/addhdlrs"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/options"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc"
- metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1"
- compdescv2 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/versions/v2"
- "github.com/open-component-model/ocm/pkg/runtime"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/ocm"
+ "ocm.software/ocm/api/ocm/compdesc"
+ metav1 "ocm.software/ocm/api/ocm/compdesc/meta/v1"
+ compdescv2 "ocm.software/ocm/api/ocm/compdesc/versions/v2"
+ "ocm.software/ocm/api/utils/runtime"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/addhdlrs"
+ "ocm.software/ocm/cmds/ocm/common/options"
)
type ResourceSpecHandler struct {
diff --git a/cmds/ocm/commands/ocmcmds/common/addhdlrs/utils.go b/cmds/ocm/commands/ocmcmds/common/addhdlrs/utils.go
index 7833a3a07..c47f272ee 100644
--- a/cmds/ocm/commands/ocmcmds/common/addhdlrs/utils.go
+++ b/cmds/ocm/commands/ocmcmds/common/addhdlrs/utils.go
@@ -11,14 +11,14 @@ import (
"gopkg.in/yaml.v3"
"k8s.io/apimachinery/pkg/util/validation/field"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs"
- cliutils "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- common2 "github.com/open-component-model/ocm/pkg/common"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
- "github.com/open-component-model/ocm/pkg/errkind"
- "github.com/open-component-model/ocm/pkg/runtime"
- "github.com/open-component-model/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/utils/template"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/utils"
+ "ocm.software/ocm/api/utils/errkind"
+ common2 "ocm.software/ocm/api/utils/misc"
+ "ocm.software/ocm/api/utils/runtime"
+ "ocm.software/ocm/api/utils/template"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs"
+ cliutils "ocm.software/ocm/cmds/ocm/common/utils"
)
func ProcessDescriptions(ctx clictx.Context, printer common2.Printer, templ template.Options, h ElementSpecHandler, sources []ElementSource) ([]Element, inputs.Context, error) {
diff --git a/cmds/ocm/commands/ocmcmds/common/cmds/signing/cmd.go b/cmds/ocm/commands/ocmcmds/common/cmds/signing/cmd.go
index 3c215a3cd..7980618ac 100644
--- a/cmds/ocm/commands/ocmcmds/common/cmds/signing/cmd.go
+++ b/cmds/ocm/commands/ocmcmds/common/cmds/signing/cmd.go
@@ -6,20 +6,20 @@ import (
"github.com/mandelsoft/goutils/errors"
"github.com/spf13/cobra"
- ocmcommon "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/handlers/comphdlr"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/lookupoption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/repooption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/signoption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/versionconstraintsoption"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/output"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/common"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc"
- metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/signing"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/ocm"
+ "ocm.software/ocm/api/ocm/compdesc"
+ metav1 "ocm.software/ocm/api/ocm/compdesc/meta/v1"
+ "ocm.software/ocm/api/ocm/tools/signing"
+ common "ocm.software/ocm/api/utils/misc"
+ ocmcommon "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/handlers/comphdlr"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/lookupoption"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/repooption"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/signoption"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/versionconstraintsoption"
+ "ocm.software/ocm/cmds/ocm/common/output"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
type SignatureCommand struct {
diff --git a/cmds/ocm/commands/ocmcmds/common/handlers/comphdlr/closure.go b/cmds/ocm/commands/ocmcmds/common/handlers/comphdlr/closure.go
index 4560c93b8..25cf44f68 100644
--- a/cmds/ocm/commands/ocmcmds/common/handlers/comphdlr/closure.go
+++ b/cmds/ocm/commands/ocmcmds/common/handlers/comphdlr/closure.go
@@ -3,11 +3,11 @@ package comphdlr
import (
"github.com/mandelsoft/goutils/errors"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/lookupoption"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/output"
- "github.com/open-component-model/ocm/pkg/common"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
- "github.com/open-component-model/ocm/pkg/out"
+ "ocm.software/ocm/api/ocm"
+ common "ocm.software/ocm/api/utils/misc"
+ "ocm.software/ocm/api/utils/out"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/lookupoption"
+ "ocm.software/ocm/cmds/ocm/common/output"
)
////////////////////////////////////////////////////////////////////////////////
diff --git a/cmds/ocm/commands/ocmcmds/common/handlers/comphdlr/convert.go b/cmds/ocm/commands/ocmcmds/common/handlers/comphdlr/convert.go
index ffc82cdd7..e627f37c4 100644
--- a/cmds/ocm/commands/ocmcmds/common/handlers/comphdlr/convert.go
+++ b/cmds/ocm/commands/ocmcmds/common/handlers/comphdlr/convert.go
@@ -1,7 +1,7 @@
package comphdlr
import (
- "github.com/open-component-model/ocm/cmds/ocm/pkg/data"
+ "ocm.software/ocm/cmds/ocm/common/data"
)
type Objects []*Object
diff --git a/cmds/ocm/commands/ocmcmds/common/handlers/comphdlr/options.go b/cmds/ocm/commands/ocmcmds/common/handlers/comphdlr/options.go
index 5fd9674a7..e30f5c460 100644
--- a/cmds/ocm/commands/ocmcmds/common/handlers/comphdlr/options.go
+++ b/cmds/ocm/commands/ocmcmds/common/handlers/comphdlr/options.go
@@ -3,11 +3,11 @@ package comphdlr
import (
"github.com/Masterminds/semver/v3"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/lookupoption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/versionconstraintsoption"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/options"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
- "github.com/open-component-model/ocm/pkg/utils"
+ "ocm.software/ocm/api/ocm"
+ "ocm.software/ocm/api/utils"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/lookupoption"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/versionconstraintsoption"
+ "ocm.software/ocm/cmds/ocm/common/options"
)
type Option interface {
diff --git a/cmds/ocm/commands/ocmcmds/common/handlers/comphdlr/sort.go b/cmds/ocm/commands/ocmcmds/common/handlers/comphdlr/sort.go
index aad35bd61..7b6b0ab6b 100644
--- a/cmds/ocm/commands/ocmcmds/common/handlers/comphdlr/sort.go
+++ b/cmds/ocm/commands/ocmcmds/common/handlers/comphdlr/sort.go
@@ -3,8 +3,8 @@ package comphdlr
import (
"strings"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/processing"
- "github.com/open-component-model/ocm/pkg/semverutils"
+ "ocm.software/ocm/api/utils/semverutils"
+ "ocm.software/ocm/cmds/ocm/common/processing"
)
func Compare(a, b interface{}) int {
diff --git a/cmds/ocm/commands/ocmcmds/common/handlers/comphdlr/typehandler.go b/cmds/ocm/commands/ocmcmds/common/handlers/comphdlr/typehandler.go
index 340f0cb0f..3112ba5c9 100644
--- a/cmds/ocm/commands/ocmcmds/common/handlers/comphdlr/typehandler.go
+++ b/cmds/ocm/commands/ocmcmds/common/handlers/comphdlr/typehandler.go
@@ -8,15 +8,15 @@ import (
"github.com/Masterminds/semver/v3"
"github.com/mandelsoft/goutils/errors"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/output"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/tree"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/common"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc"
- metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1"
- "github.com/open-component-model/ocm/pkg/semverutils"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/ocm"
+ "ocm.software/ocm/api/ocm/compdesc"
+ metav1 "ocm.software/ocm/api/ocm/compdesc/meta/v1"
+ common "ocm.software/ocm/api/utils/misc"
+ "ocm.software/ocm/api/utils/semverutils"
+ "ocm.software/ocm/cmds/ocm/common/output"
+ "ocm.software/ocm/cmds/ocm/common/tree"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
func Elem(e interface{}) ocm.ComponentVersionAccess {
diff --git a/cmds/ocm/commands/ocmcmds/common/handlers/comphdlr/util.go b/cmds/ocm/commands/ocmcmds/common/handlers/comphdlr/util.go
index 21932a2ac..35bc0e894 100644
--- a/cmds/ocm/commands/ocmcmds/common/handlers/comphdlr/util.go
+++ b/cmds/ocm/commands/ocmcmds/common/handlers/comphdlr/util.go
@@ -3,11 +3,11 @@ package comphdlr
import (
"github.com/mandelsoft/goutils/errors"
- "github.com/open-component-model/ocm/cmds/ocm/commands/common/options/closureoption"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/output"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/ocm"
+ "ocm.software/ocm/cmds/ocm/commands/common/options/closureoption"
+ "ocm.software/ocm/cmds/ocm/common/output"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
func Evaluate(octx clictx.OCM, session ocm.Session, repobase ocm.Repository, compspecs []string, oopts *output.Options, opts ...Option) (Objects, error) {
diff --git a/cmds/ocm/commands/ocmcmds/common/handlers/elemhdlr/convert.go b/cmds/ocm/commands/ocmcmds/common/handlers/elemhdlr/convert.go
index 71151e96b..f3e1da631 100644
--- a/cmds/ocm/commands/ocmcmds/common/handlers/elemhdlr/convert.go
+++ b/cmds/ocm/commands/ocmcmds/common/handlers/elemhdlr/convert.go
@@ -1,7 +1,7 @@
package elemhdlr
import (
- "github.com/open-component-model/ocm/cmds/ocm/pkg/data"
+ "ocm.software/ocm/cmds/ocm/common/data"
)
type Objects []*Object
diff --git a/cmds/ocm/commands/ocmcmds/common/handlers/elemhdlr/options.go b/cmds/ocm/commands/ocmcmds/common/handlers/elemhdlr/options.go
index d13f50f46..4b2fd7917 100644
--- a/cmds/ocm/commands/ocmcmds/common/handlers/elemhdlr/options.go
+++ b/cmds/ocm/commands/ocmcmds/common/handlers/elemhdlr/options.go
@@ -3,11 +3,11 @@ package elemhdlr
import (
"github.com/Masterminds/semver/v3"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/handlers/comphdlr"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/lookupoption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/versionconstraintsoption"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/options"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
+ "ocm.software/ocm/api/ocm"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/handlers/comphdlr"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/lookupoption"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/versionconstraintsoption"
+ "ocm.software/ocm/cmds/ocm/common/options"
)
type Option interface {
diff --git a/cmds/ocm/commands/ocmcmds/common/handlers/elemhdlr/output.go b/cmds/ocm/commands/ocmcmds/common/handlers/elemhdlr/output.go
index 02e7c61e7..4656ad508 100644
--- a/cmds/ocm/commands/ocmcmds/common/handlers/elemhdlr/output.go
+++ b/cmds/ocm/commands/ocmcmds/common/handlers/elemhdlr/output.go
@@ -3,11 +3,11 @@ package elemhdlr
import (
"encoding/json"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/output"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/tree"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc"
- metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1"
- "github.com/open-component-model/ocm/pkg/runtime"
+ "ocm.software/ocm/api/ocm/compdesc"
+ metav1 "ocm.software/ocm/api/ocm/compdesc/meta/v1"
+ "ocm.software/ocm/api/utils/runtime"
+ "ocm.software/ocm/cmds/ocm/common/output"
+ "ocm.software/ocm/cmds/ocm/common/tree"
)
var MetaOutput = []string{"NAME", "VERSION", "IDENTITY"}
diff --git a/cmds/ocm/commands/ocmcmds/common/handlers/elemhdlr/sort.go b/cmds/ocm/commands/ocmcmds/common/handlers/elemhdlr/sort.go
index 8127338d8..8c27aebd8 100644
--- a/cmds/ocm/commands/ocmcmds/common/handlers/elemhdlr/sort.go
+++ b/cmds/ocm/commands/ocmcmds/common/handlers/elemhdlr/sort.go
@@ -1,7 +1,7 @@
package elemhdlr
import (
- "github.com/open-component-model/ocm/cmds/ocm/pkg/processing"
+ "ocm.software/ocm/cmds/ocm/common/processing"
)
func Compare(a, b interface{}) int {
diff --git a/cmds/ocm/commands/ocmcmds/common/handlers/elemhdlr/typehandler.go b/cmds/ocm/commands/ocmcmds/common/handlers/elemhdlr/typehandler.go
index f6dbbc42e..dd335e9ad 100644
--- a/cmds/ocm/commands/ocmcmds/common/handlers/elemhdlr/typehandler.go
+++ b/cmds/ocm/commands/ocmcmds/common/handlers/elemhdlr/typehandler.go
@@ -4,15 +4,15 @@ import (
"fmt"
"strings"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/handlers/comphdlr"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/output"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/tree"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/common"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc"
- metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/ocm"
+ "ocm.software/ocm/api/ocm/compdesc"
+ metav1 "ocm.software/ocm/api/ocm/compdesc/meta/v1"
+ common "ocm.software/ocm/api/utils/misc"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/handlers/comphdlr"
+ "ocm.software/ocm/cmds/ocm/common/output"
+ "ocm.software/ocm/cmds/ocm/common/tree"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
type Object struct {
diff --git a/cmds/ocm/commands/ocmcmds/common/handlers/pluginhdlr/typehandler.go b/cmds/ocm/commands/ocmcmds/common/handlers/pluginhdlr/typehandler.go
index 60ac67414..03bb04509 100644
--- a/cmds/ocm/commands/ocmcmds/common/handlers/pluginhdlr/typehandler.go
+++ b/cmds/ocm/commands/ocmcmds/common/handlers/pluginhdlr/typehandler.go
@@ -5,13 +5,13 @@ import (
"github.com/mandelsoft/goutils/errors"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/output"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/attrs/plugincacheattr"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/plugin"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/plugin/descriptor"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/plugin/plugins"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/ocm/extensions/attrs/plugincacheattr"
+ "ocm.software/ocm/api/ocm/plugin"
+ "ocm.software/ocm/api/ocm/plugin/descriptor"
+ "ocm.software/ocm/api/ocm/plugin/plugins"
+ "ocm.software/ocm/cmds/ocm/common/output"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
func Elem(e interface{}) plugin.Plugin {
diff --git a/cmds/ocm/commands/ocmcmds/common/handlers/vershdlr/options.go b/cmds/ocm/commands/ocmcmds/common/handlers/vershdlr/options.go
index d1d84a0a9..79f7355d9 100644
--- a/cmds/ocm/commands/ocmcmds/common/handlers/vershdlr/options.go
+++ b/cmds/ocm/commands/ocmcmds/common/handlers/vershdlr/options.go
@@ -3,11 +3,11 @@ package vershdlr
import (
"github.com/Masterminds/semver/v3"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/lookupoption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/versionconstraintsoption"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/options"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
- "github.com/open-component-model/ocm/pkg/utils"
+ "ocm.software/ocm/api/ocm"
+ "ocm.software/ocm/api/utils"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/lookupoption"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/versionconstraintsoption"
+ "ocm.software/ocm/cmds/ocm/common/options"
)
type Option interface {
diff --git a/cmds/ocm/commands/ocmcmds/common/handlers/vershdlr/sort.go b/cmds/ocm/commands/ocmcmds/common/handlers/vershdlr/sort.go
index 941e6aed4..d40d9fc48 100644
--- a/cmds/ocm/commands/ocmcmds/common/handlers/vershdlr/sort.go
+++ b/cmds/ocm/commands/ocmcmds/common/handlers/vershdlr/sort.go
@@ -3,8 +3,8 @@ package vershdlr
import (
"strings"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/processing"
- "github.com/open-component-model/ocm/pkg/semverutils"
+ "ocm.software/ocm/api/utils/semverutils"
+ "ocm.software/ocm/cmds/ocm/common/processing"
)
func Compare(a, b interface{}) int {
diff --git a/cmds/ocm/commands/ocmcmds/common/handlers/vershdlr/typehandler.go b/cmds/ocm/commands/ocmcmds/common/handlers/vershdlr/typehandler.go
index 83967edd1..5f61d4ff2 100644
--- a/cmds/ocm/commands/ocmcmds/common/handlers/vershdlr/typehandler.go
+++ b/cmds/ocm/commands/ocmcmds/common/handlers/vershdlr/typehandler.go
@@ -8,11 +8,11 @@ import (
"github.com/Masterminds/semver/v3"
"github.com/mandelsoft/goutils/errors"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/output"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
- "github.com/open-component-model/ocm/pkg/semverutils"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/ocm"
+ "ocm.software/ocm/api/utils/semverutils"
+ "ocm.software/ocm/cmds/ocm/common/output"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
func Elem(e interface{}) *Object {
diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/cpi/helper.go b/cmds/ocm/commands/ocmcmds/common/inputs/cpi/helper.go
index ae596e25e..2646ae99a 100644
--- a/cmds/ocm/commands/ocmcmds/common/inputs/cpi/helper.go
+++ b/cmds/ocm/commands/ocmcmds/common/inputs/cpi/helper.go
@@ -10,13 +10,13 @@ import (
"github.com/mandelsoft/vfs/pkg/vfs"
"k8s.io/apimachinery/pkg/util/validation/field"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/options"
- "github.com/open-component-model/ocm/pkg/blobaccess"
- "github.com/open-component-model/ocm/pkg/cobrautils/flagsets"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
- "github.com/open-component-model/ocm/pkg/mime"
- "github.com/open-component-model/ocm/pkg/runtime"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/utils/blobaccess"
+ "ocm.software/ocm/api/utils/cobrautils/flagsets"
+ "ocm.software/ocm/api/utils/mime"
+ "ocm.software/ocm/api/utils/runtime"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs/options"
)
type PathSpec struct {
diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/inputfields.go b/cmds/ocm/commands/ocmcmds/common/inputs/inputfields.go
index 1e94bd2b5..b3ae07ad6 100644
--- a/cmds/ocm/commands/ocmcmds/common/inputs/inputfields.go
+++ b/cmds/ocm/commands/ocmcmds/common/inputs/inputfields.go
@@ -4,8 +4,8 @@ import (
"fmt"
"strings"
- "github.com/open-component-model/ocm/pkg/cobrautils/flagsets"
- "github.com/open-component-model/ocm/pkg/utils"
+ "ocm.software/ocm/api/utils"
+ "ocm.software/ocm/api/utils/cobrautils/flagsets"
)
type FieldSetter func(opts flagsets.ConfigOptions, opt flagsets.ConfigOptionType, config flagsets.Config) error
diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/inputtype.go b/cmds/ocm/commands/ocmcmds/common/inputs/inputtype.go
index 1ea930581..39a233d97 100644
--- a/cmds/ocm/commands/ocmcmds/common/inputs/inputtype.go
+++ b/cmds/ocm/commands/ocmcmds/common/inputs/inputtype.go
@@ -10,13 +10,13 @@ import (
"github.com/modern-go/reflect2"
"k8s.io/apimachinery/pkg/util/validation/field"
- "github.com/open-component-model/ocm/pkg/blobaccess"
- "github.com/open-component-model/ocm/pkg/cobrautils/flagsets"
- "github.com/open-component-model/ocm/pkg/common"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
- "github.com/open-component-model/ocm/pkg/contexts/datacontext"
- "github.com/open-component-model/ocm/pkg/runtime"
- "github.com/open-component-model/ocm/pkg/utils"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/datacontext"
+ "ocm.software/ocm/api/utils"
+ "ocm.software/ocm/api/utils/blobaccess"
+ "ocm.software/ocm/api/utils/cobrautils/flagsets"
+ common "ocm.software/ocm/api/utils/misc"
+ "ocm.software/ocm/api/utils/runtime"
)
const KIND_INPUTTYPE = "input type"
@@ -255,7 +255,7 @@ func CreateRepositorySpec(t runtime.TypedObject) (InputSpec, error) {
////////////////////////////////////////////////////////////////////////////////
-const ATTR_INPUT_TYPES = "github.com/open-component-model/ocm/cmds/ocm/common/inputs"
+const ATTR_INPUT_TYPES = "ocm.software/ocm/cmds/ocm/common/inputs"
func For(ctx datacontext.Context) InputTypeScheme {
if ctx == nil {
diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/inputtype_test.go b/cmds/ocm/commands/ocmcmds/common/inputs/inputtype_test.go
index 5ffbf2554..a124ee0a3 100644
--- a/cmds/ocm/commands/ocmcmds/common/inputs/inputtype_test.go
+++ b/cmds/ocm/commands/ocmcmds/common/inputs/inputtype_test.go
@@ -6,9 +6,9 @@ import (
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/types/file"
- "github.com/open-component-model/ocm/pkg/mime"
+ "ocm.software/ocm/api/utils/mime"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs/types/file"
)
var _ = Describe("Blob Inputs", func() {
diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/options/standard.go b/cmds/ocm/commands/ocmcmds/common/inputs/options/standard.go
index 32115ce96..1d900ad8b 100644
--- a/cmds/ocm/commands/ocmcmds/common/inputs/options/standard.go
+++ b/cmds/ocm/commands/ocmcmds/common/inputs/options/standard.go
@@ -1,8 +1,8 @@
package options
import (
- "github.com/open-component-model/ocm/pkg/cobrautils/flagsets"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/options"
+ "ocm.software/ocm/api/ocm/extensions/accessmethods/options"
+ "ocm.software/ocm/api/utils/cobrautils/flagsets"
)
var (
diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/testutils/testutils.go b/cmds/ocm/commands/ocmcmds/common/inputs/testutils/testutils.go
index da70ac057..f8bc4b55d 100644
--- a/cmds/ocm/commands/ocmcmds/common/inputs/testutils/testutils.go
+++ b/cmds/ocm/commands/ocmcmds/common/inputs/testutils/testutils.go
@@ -8,9 +8,9 @@ import (
"github.com/mandelsoft/goutils/testutils"
"github.com/spf13/pflag"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs"
- "github.com/open-component-model/ocm/pkg/cobrautils/flagsets"
- "github.com/open-component-model/ocm/pkg/runtime"
+ "ocm.software/ocm/api/utils/cobrautils/flagsets"
+ "ocm.software/ocm/api/utils/runtime"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs"
)
type NameProvider interface {
diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/binary/cli.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/binary/cli.go
index b195b2810..e68a6d0b6 100644
--- a/cmds/ocm/commands/ocmcmds/common/inputs/types/binary/cli.go
+++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/binary/cli.go
@@ -1,9 +1,9 @@
package binary
import (
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/cpi"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/options"
- "github.com/open-component-model/ocm/pkg/cobrautils/flagsets"
+ "ocm.software/ocm/api/utils/cobrautils/flagsets"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs/cpi"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs/options"
)
func ConfigHandler() flagsets.ConfigOptionTypeSetHandler {
diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/binary/inputtype_test.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/binary/inputtype_test.go
index ee4e761fc..eb381a2de 100644
--- a/cmds/ocm/commands/ocmcmds/common/inputs/types/binary/inputtype_test.go
+++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/binary/inputtype_test.go
@@ -2,11 +2,11 @@ package binary
import (
. "github.com/onsi/ginkgo/v2"
- . "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/testutils"
+ . "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs/testutils"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/cpi"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/options"
- "github.com/open-component-model/ocm/pkg/runtime"
+ "ocm.software/ocm/api/utils/runtime"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs/cpi"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs/options"
)
var _ = Describe("Input Type", func() {
diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/binary/spec.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/binary/spec.go
index 2869075a2..48ed375fc 100644
--- a/cmds/ocm/commands/ocmcmds/common/inputs/types/binary/spec.go
+++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/binary/spec.go
@@ -3,10 +3,10 @@ package binary
import (
"k8s.io/apimachinery/pkg/util/validation/field"
- "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"
- "github.com/open-component-model/ocm/pkg/runtime"
+ "ocm.software/ocm/api/utils/blobaccess"
+ "ocm.software/ocm/api/utils/runtime"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs/cpi"
)
type Spec struct {
diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/binary/type.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/binary/type.go
index 10d4b76cd..abf4431cd 100644
--- a/cmds/ocm/commands/ocmcmds/common/inputs/types/binary/type.go
+++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/binary/type.go
@@ -1,8 +1,8 @@
package binary
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"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs/cpi"
)
const TYPE = "binary"
diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/directory/cli.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/directory/cli.go
index fe3b007bb..ae78d2fbb 100644
--- a/cmds/ocm/commands/ocmcmds/common/inputs/types/directory/cli.go
+++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/directory/cli.go
@@ -1,9 +1,9 @@
package directory
import (
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/cpi"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/options"
- "github.com/open-component-model/ocm/pkg/cobrautils/flagsets"
+ "ocm.software/ocm/api/utils/cobrautils/flagsets"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs/cpi"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs/options"
)
func ConfigHandler() flagsets.ConfigOptionTypeSetHandler {
diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/directory/inputtype_test.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/directory/inputtype_test.go
index 2840871e2..6679c7905 100644
--- a/cmds/ocm/commands/ocmcmds/common/inputs/types/directory/inputtype_test.go
+++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/directory/inputtype_test.go
@@ -2,10 +2,10 @@ package directory
import (
. "github.com/onsi/ginkgo/v2"
- . "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/testutils"
+ . "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs/testutils"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/cpi"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/options"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs/cpi"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs/options"
)
var _ = Describe("Input Type", func() {
diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/directory/spec.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/directory/spec.go
index d37eff103..be736935e 100644
--- a/cmds/ocm/commands/ocmcmds/common/inputs/types/directory/spec.go
+++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/directory/spec.go
@@ -5,11 +5,11 @@ import (
"k8s.io/apimachinery/pkg/util/validation/field"
- "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"
- "github.com/open-component-model/ocm/pkg/blobaccess/dirtree"
- "github.com/open-component-model/ocm/pkg/utils"
+ "ocm.software/ocm/api/utils"
+ "ocm.software/ocm/api/utils/blobaccess"
+ "ocm.software/ocm/api/utils/blobaccess/dirtree"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs/cpi"
)
type Spec struct {
diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/directory/type.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/directory/type.go
index 94b92fce4..9250ee957 100644
--- a/cmds/ocm/commands/ocmcmds/common/inputs/types/directory/type.go
+++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/directory/type.go
@@ -1,8 +1,8 @@
package directory
import (
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs"
- "github.com/open-component-model/ocm/pkg/mime"
+ "ocm.software/ocm/api/utils/mime"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs"
)
const TYPE = "dir"
diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/docker/cli.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/docker/cli.go
index fae0c599b..7fb90c479 100644
--- a/cmds/ocm/commands/ocmcmds/common/inputs/types/docker/cli.go
+++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/docker/cli.go
@@ -1,9 +1,9 @@
package docker
import (
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/cpi"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/options"
- "github.com/open-component-model/ocm/pkg/cobrautils/flagsets"
+ "ocm.software/ocm/api/utils/cobrautils/flagsets"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs/cpi"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs/options"
)
func ConfigHandler() flagsets.ConfigOptionTypeSetHandler {
diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/docker/spec.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/docker/spec.go
index 75e5c2899..42d7f391a 100644
--- a/cmds/ocm/commands/ocmcmds/common/inputs/types/docker/spec.go
+++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/docker/spec.go
@@ -3,13 +3,13 @@ package docker
import (
"k8s.io/apimachinery/pkg/util/validation/field"
- "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"
- ociartifact2 "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/types/ociartifact"
- "github.com/open-component-model/ocm/pkg/blobaccess"
- "github.com/open-component-model/ocm/pkg/blobaccess/dockerdaemon"
- "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/docker"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/ociartifact"
+ "ocm.software/ocm/api/oci/extensions/repositories/docker"
+ "ocm.software/ocm/api/ocm/extensions/accessmethods/ociartifact"
+ "ocm.software/ocm/api/utils/blobaccess"
+ "ocm.software/ocm/api/utils/blobaccess/dockerdaemon"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs/cpi"
+ ociartifact2 "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs/types/ociartifact"
)
type Spec struct {
diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/docker/type.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/docker/type.go
index 789b8282d..c5596be53 100644
--- a/cmds/ocm/commands/ocmcmds/common/inputs/types/docker/type.go
+++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/docker/type.go
@@ -1,8 +1,8 @@
package docker
import (
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs"
- "github.com/open-component-model/ocm/pkg/contexts/oci/annotations"
+ "ocm.software/ocm/api/oci/annotations"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs"
)
const TYPE = "docker"
diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/dockermulti/cli.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/dockermulti/cli.go
index ba884b6fb..6dba2ac6d 100644
--- a/cmds/ocm/commands/ocmcmds/common/inputs/types/dockermulti/cli.go
+++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/dockermulti/cli.go
@@ -1,8 +1,8 @@
package dockermulti
import (
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/options"
- "github.com/open-component-model/ocm/pkg/cobrautils/flagsets"
+ "ocm.software/ocm/api/utils/cobrautils/flagsets"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs/options"
)
func ConfigHandler() flagsets.ConfigOptionTypeSetHandler {
diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/dockermulti/spec.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/dockermulti/spec.go
index 65186a3de..2f93977b5 100644
--- a/cmds/ocm/commands/ocmcmds/common/inputs/types/dockermulti/spec.go
+++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/dockermulti/spec.go
@@ -5,13 +5,13 @@ import (
"k8s.io/apimachinery/pkg/util/validation/field"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs"
- ociartifact2 "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/types/ociartifact"
- "github.com/open-component-model/ocm/pkg/blobaccess"
- "github.com/open-component-model/ocm/pkg/blobaccess/dockermulti"
- "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/docker"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/ociartifact"
- "github.com/open-component-model/ocm/pkg/runtime"
+ "ocm.software/ocm/api/oci/extensions/repositories/docker"
+ "ocm.software/ocm/api/ocm/extensions/accessmethods/ociartifact"
+ "ocm.software/ocm/api/utils/blobaccess"
+ "ocm.software/ocm/api/utils/blobaccess/dockermulti"
+ "ocm.software/ocm/api/utils/runtime"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs"
+ ociartifact2 "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs/types/ociartifact"
)
type Spec struct {
diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/dockermulti/type.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/dockermulti/type.go
index 87e09c039..780a00d23 100644
--- a/cmds/ocm/commands/ocmcmds/common/inputs/types/dockermulti/type.go
+++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/dockermulti/type.go
@@ -1,8 +1,8 @@
package dockermulti
import (
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs"
- "github.com/open-component-model/ocm/pkg/contexts/oci/annotations"
+ "ocm.software/ocm/api/oci/annotations"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs"
)
const TYPE = "dockermulti"
diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/file/cli.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/file/cli.go
index 35715de76..e7ec97702 100644
--- a/cmds/ocm/commands/ocmcmds/common/inputs/types/file/cli.go
+++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/file/cli.go
@@ -1,8 +1,8 @@
package file
import (
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/cpi"
- "github.com/open-component-model/ocm/pkg/cobrautils/flagsets"
+ "ocm.software/ocm/api/utils/cobrautils/flagsets"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs/cpi"
)
func ConfigHandler() flagsets.ConfigOptionTypeSetHandler {
diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/file/spec.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/file/spec.go
index c1caefec9..aa31882e1 100644
--- a/cmds/ocm/commands/ocmcmds/common/inputs/types/file/spec.go
+++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/file/spec.go
@@ -3,9 +3,9 @@ package file
import (
"k8s.io/apimachinery/pkg/util/validation/field"
- "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"
+ "ocm.software/ocm/api/utils/blobaccess"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs/cpi"
)
type Spec struct {
diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/file/support.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/file/support.go
index 237cf4033..44dbdfffa 100644
--- a/cmds/ocm/commands/ocmcmds/common/inputs/types/file/support.go
+++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/file/support.go
@@ -9,10 +9,10 @@ import (
"github.com/mandelsoft/goutils/errors"
"k8s.io/apimachinery/pkg/util/validation/field"
- "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"
- "github.com/open-component-model/ocm/pkg/mime"
+ "ocm.software/ocm/api/utils/blobaccess"
+ "ocm.software/ocm/api/utils/mime"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs/cpi"
)
type FileProcessSpec struct {
diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/file/type.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/file/type.go
index ef38730c1..1193534fd 100644
--- a/cmds/ocm/commands/ocmcmds/common/inputs/types/file/type.go
+++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/file/type.go
@@ -1,7 +1,7 @@
package file
import (
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs"
)
const TYPE = "file"
diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/helm/cli.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/helm/cli.go
index cee174318..9d7d33633 100644
--- a/cmds/ocm/commands/ocmcmds/common/inputs/types/helm/cli.go
+++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/helm/cli.go
@@ -1,9 +1,9 @@
package helm
import (
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/cpi"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/options"
- "github.com/open-component-model/ocm/pkg/cobrautils/flagsets"
+ "ocm.software/ocm/api/utils/cobrautils/flagsets"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs/cpi"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs/options"
)
func ConfigHandler() flagsets.ConfigOptionTypeSetHandler {
diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/helm/spec.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/helm/spec.go
index 82bb85502..53b3c055a 100644
--- a/cmds/ocm/commands/ocmcmds/common/inputs/types/helm/spec.go
+++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/helm/spec.go
@@ -4,11 +4,11 @@ import (
"github.com/mandelsoft/goutils/errors"
"k8s.io/apimachinery/pkg/util/validation/field"
- "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"
- "github.com/open-component-model/ocm/pkg/blobaccess/helm"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/ociartifact"
+ "ocm.software/ocm/api/ocm/extensions/accessmethods/ociartifact"
+ "ocm.software/ocm/api/utils/blobaccess"
+ "ocm.software/ocm/api/utils/blobaccess/helm"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs/cpi"
)
type Spec struct {
diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/helm/type.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/helm/type.go
index ddb5cead7..785fb7746 100644
--- a/cmds/ocm/commands/ocmcmds/common/inputs/types/helm/type.go
+++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/helm/type.go
@@ -1,7 +1,7 @@
package helm
import (
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs"
)
const TYPE = "helm"
diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/init.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/init.go
index 8c42a5781..8e3230b35 100644
--- a/cmds/ocm/commands/ocmcmds/common/inputs/types/init.go
+++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/init.go
@@ -1,15 +1,15 @@
package handlers
import (
- _ "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/types/binary"
- _ "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/types/directory"
- _ "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/types/docker"
- _ "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/types/dockermulti"
- _ "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/types/file"
- _ "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/types/helm"
- _ "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/types/maven"
- _ "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/types/ociartifact"
- _ "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/types/spiff"
- _ "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/types/utf8"
- _ "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/types/wget"
+ _ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs/types/binary"
+ _ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs/types/directory"
+ _ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs/types/docker"
+ _ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs/types/dockermulti"
+ _ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs/types/file"
+ _ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs/types/helm"
+ _ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs/types/maven"
+ _ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs/types/ociartifact"
+ _ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs/types/spiff"
+ _ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs/types/utf8"
+ _ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs/types/wget"
)
diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/maven/cli.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/maven/cli.go
index 88b6fcbc6..ab7827ebd 100644
--- a/cmds/ocm/commands/ocmcmds/common/inputs/types/maven/cli.go
+++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/maven/cli.go
@@ -1,8 +1,8 @@
package maven
import (
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/options"
- "github.com/open-component-model/ocm/pkg/cobrautils/flagsets"
+ "ocm.software/ocm/api/utils/cobrautils/flagsets"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs/options"
)
func ConfigHandler() flagsets.ConfigOptionTypeSetHandler {
diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/maven/input_test.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/maven/input_test.go
index 98c07166b..6f58d66f4 100644
--- a/cmds/ocm/commands/ocmcmds/common/inputs/types/maven/input_test.go
+++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/maven/input_test.go
@@ -6,14 +6,14 @@ import (
. "github.com/mandelsoft/goutils/testutils"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
- . "github.com/open-component-model/ocm/cmds/ocm/testhelper"
+ . "ocm.software/ocm/cmds/ocm/testhelper"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/localblob"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/comparch"
- "github.com/open-component-model/ocm/pkg/maven/maventest"
- "github.com/open-component-model/ocm/pkg/mime"
- "github.com/open-component-model/ocm/pkg/utils/tarutils"
+ "ocm.software/ocm/api/ocm/compdesc"
+ "ocm.software/ocm/api/ocm/extensions/accessmethods/localblob"
+ "ocm.software/ocm/api/ocm/extensions/repositories/comparch"
+ "ocm.software/ocm/api/tech/maven/maventest"
+ "ocm.software/ocm/api/utils/mime"
+ "ocm.software/ocm/api/utils/tarutils"
)
const (
diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/maven/spec.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/maven/spec.go
index 7d3414444..4ffb28085 100644
--- a/cmds/ocm/commands/ocmcmds/common/inputs/types/maven/spec.go
+++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/maven/spec.go
@@ -5,12 +5,12 @@ import (
"k8s.io/apimachinery/pkg/util/validation/field"
- "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"
- mavenblob "github.com/open-component-model/ocm/pkg/blobaccess/maven"
- "github.com/open-component-model/ocm/pkg/contexts/datacontext/attrs/vfsattr"
- "github.com/open-component-model/ocm/pkg/maven"
+ "ocm.software/ocm/api/datacontext/attrs/vfsattr"
+ "ocm.software/ocm/api/tech/maven"
+ "ocm.software/ocm/api/utils/blobaccess"
+ mavenblob "ocm.software/ocm/api/utils/blobaccess/maven"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs/cpi"
)
type Spec struct {
diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/maven/type.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/maven/type.go
index 7c80db8e3..0c97f1c45 100644
--- a/cmds/ocm/commands/ocmcmds/common/inputs/types/maven/type.go
+++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/maven/type.go
@@ -1,7 +1,7 @@
package maven
import (
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs"
)
const TYPE = "maven"
diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/ociartifact/cli.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/ociartifact/cli.go
index 7e4733296..043fd1f1f 100644
--- a/cmds/ocm/commands/ocmcmds/common/inputs/types/ociartifact/cli.go
+++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/ociartifact/cli.go
@@ -1,9 +1,9 @@
package ociartifact
import (
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/cpi"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/options"
- "github.com/open-component-model/ocm/pkg/cobrautils/flagsets"
+ "ocm.software/ocm/api/utils/cobrautils/flagsets"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs/cpi"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs/options"
)
func ConfigHandler() flagsets.ConfigOptionTypeSetHandler {
diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/ociartifact/input_test.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/ociartifact/input_test.go
index 65e1f80a7..27d6350d1 100644
--- a/cmds/ocm/commands/ocmcmds/common/inputs/types/ociartifact/input_test.go
+++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/ociartifact/input_test.go
@@ -7,21 +7,21 @@ import (
. "github.com/mandelsoft/goutils/testutils"
. "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/contexts/oci/testhelper"
+ . "ocm.software/ocm/api/oci/testhelper"
+ . "ocm.software/ocm/cmds/ocm/testhelper"
"github.com/spf13/pflag"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/options"
- me "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/types/ociartifact"
- "github.com/open-component-model/ocm/pkg/cobrautils/flagsets"
- "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/oci"
- "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/artifactset"
- metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ctf"
+ "ocm.software/ocm/api/oci"
+ "ocm.software/ocm/api/oci/extensions/repositories/artifactset"
+ metav1 "ocm.software/ocm/api/ocm/compdesc/meta/v1"
+ "ocm.software/ocm/api/ocm/extensions/repositories/ctf"
+ "ocm.software/ocm/api/utils/accessio"
+ "ocm.software/ocm/api/utils/accessobj"
+ "ocm.software/ocm/api/utils/cobrautils/flagsets"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs/options"
+ me "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs/types/ociartifact"
)
const (
diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/ociartifact/spec.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/ociartifact/spec.go
index af1ff65a3..587109c81 100644
--- a/cmds/ocm/commands/ocmcmds/common/inputs/types/ociartifact/spec.go
+++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/ociartifact/spec.go
@@ -5,14 +5,14 @@ import (
"k8s.io/apimachinery/pkg/util/validation/field"
- "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"
- 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"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/ociartifact"
+ "ocm.software/ocm/api/oci/extensions/repositories/docker"
+ "ocm.software/ocm/api/oci/grammar"
+ "ocm.software/ocm/api/oci/tools/transfer/filters"
+ "ocm.software/ocm/api/ocm/extensions/accessmethods/ociartifact"
+ "ocm.software/ocm/api/utils/blobaccess"
+ ociartifactblob "ocm.software/ocm/api/utils/blobaccess/ociartifact"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs/cpi"
)
type Spec struct {
diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/ociartifact/type.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/ociartifact/type.go
index af0c0e3c7..4c5ae3473 100644
--- a/cmds/ocm/commands/ocmcmds/common/inputs/types/ociartifact/type.go
+++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/ociartifact/type.go
@@ -1,7 +1,7 @@
package ociartifact
import (
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs"
)
const (
diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/spiff/cli.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/spiff/cli.go
index 3e9a96ea9..f495e9f50 100644
--- a/cmds/ocm/commands/ocmcmds/common/inputs/types/spiff/cli.go
+++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/spiff/cli.go
@@ -1,9 +1,9 @@
package spiff
import (
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/cpi"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/options"
- "github.com/open-component-model/ocm/pkg/cobrautils/flagsets"
+ "ocm.software/ocm/api/utils/cobrautils/flagsets"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs/cpi"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs/options"
)
func ConfigHandler() flagsets.ConfigOptionTypeSetHandler {
diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/spiff/spec.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/spiff/spec.go
index 444b97a1c..d99ec7fbf 100644
--- a/cmds/ocm/commands/ocmcmds/common/inputs/types/spiff/spec.go
+++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/spiff/spec.go
@@ -9,11 +9,11 @@ import (
"github.com/mandelsoft/vfs/pkg/cwdfs"
"k8s.io/apimachinery/pkg/util/validation/field"
- "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/cmds/ocm/commands/ocmcmds/common/inputs/types/file"
- "github.com/open-component-model/ocm/pkg/blobaccess"
- "github.com/open-component-model/ocm/pkg/runtime"
+ "ocm.software/ocm/api/utils/blobaccess"
+ "ocm.software/ocm/api/utils/runtime"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs/cpi"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs/types/file"
)
type Spec struct {
diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/spiff/spiff_test.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/spiff/spiff_test.go
index f32af1955..b7d7b9934 100644
--- a/cmds/ocm/commands/ocmcmds/common/inputs/types/spiff/spiff_test.go
+++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/spiff/spiff_test.go
@@ -3,11 +3,11 @@ package spiff_test
import (
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
- . "github.com/open-component-model/ocm/cmds/ocm/testhelper"
+ . "ocm.software/ocm/cmds/ocm/testhelper"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/types/spiff"
- "github.com/open-component-model/ocm/pkg/common"
+ common "ocm.software/ocm/api/utils/misc"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs/types/spiff"
)
var _ = Describe("spiff processing", func() {
diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/spiff/type.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/spiff/type.go
index 40e860dff..20c08d0d4 100644
--- a/cmds/ocm/commands/ocmcmds/common/inputs/types/spiff/type.go
+++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/spiff/type.go
@@ -1,8 +1,8 @@
package spiff
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/types/file"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs/types/file"
)
const TYPE = "spiff"
diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/utf8/cli.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/utf8/cli.go
index 166a4c43d..ce350821f 100644
--- a/cmds/ocm/commands/ocmcmds/common/inputs/types/utf8/cli.go
+++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/utf8/cli.go
@@ -1,9 +1,9 @@
package utf8
import (
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/cpi"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/options"
- "github.com/open-component-model/ocm/pkg/cobrautils/flagsets"
+ "ocm.software/ocm/api/utils/cobrautils/flagsets"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs/cpi"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs/options"
)
func ConfigHandler() flagsets.ConfigOptionTypeSetHandler {
diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/utf8/inputtype_test.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/utf8/inputtype_test.go
index dbd585481..1afad536f 100644
--- a/cmds/ocm/commands/ocmcmds/common/inputs/types/utf8/inputtype_test.go
+++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/utf8/inputtype_test.go
@@ -4,12 +4,12 @@ import (
. "github.com/mandelsoft/goutils/testutils"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
- . "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/testutils"
+ . "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs/testutils"
- "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/cmds/ocm/commands/ocmcmds/common/inputs/options"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs/cpi"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs/options"
)
var _ = Describe("Input Type", func() {
diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/utf8/spec.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/utf8/spec.go
index 22a7b4977..00179e50d 100644
--- a/cmds/ocm/commands/ocmcmds/common/inputs/types/utf8/spec.go
+++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/utf8/spec.go
@@ -5,10 +5,10 @@ import (
"k8s.io/apimachinery/pkg/util/validation/field"
- "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"
- "github.com/open-component-model/ocm/pkg/runtime"
+ "ocm.software/ocm/api/utils/blobaccess"
+ "ocm.software/ocm/api/utils/runtime"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs/cpi"
)
type Spec struct {
diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/utf8/type.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/utf8/type.go
index 8606f59d5..ab2936c68 100644
--- a/cmds/ocm/commands/ocmcmds/common/inputs/types/utf8/type.go
+++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/utf8/type.go
@@ -1,8 +1,8 @@
package utf8
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"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs/cpi"
)
const TYPE = "utf8"
diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/wget/cli.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/wget/cli.go
index 21c6f72fd..e8e16f098 100644
--- a/cmds/ocm/commands/ocmcmds/common/inputs/types/wget/cli.go
+++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/wget/cli.go
@@ -1,8 +1,8 @@
package wget
import (
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/options"
- "github.com/open-component-model/ocm/pkg/cobrautils/flagsets"
+ "ocm.software/ocm/api/utils/cobrautils/flagsets"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs/options"
)
func ConfigHandler() flagsets.ConfigOptionTypeSetHandler {
diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/wget/input_test.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/wget/input_test.go
index 30bb607f0..6c20995db 100644
--- a/cmds/ocm/commands/ocmcmds/common/inputs/types/wget/input_test.go
+++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/wget/input_test.go
@@ -4,12 +4,12 @@ import (
"net/http"
. "github.com/onsi/ginkgo/v2"
- . "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/testutils"
+ . "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs/testutils"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/options"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/types/wget"
- "github.com/open-component-model/ocm/pkg/mime"
+ "ocm.software/ocm/api/utils/mime"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs/options"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs/types/wget"
)
var _ = Describe("Input Type", func() {
diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/wget/spec.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/wget/spec.go
index 2b58d1590..7b6f8b3c8 100644
--- a/cmds/ocm/commands/ocmcmds/common/inputs/types/wget/spec.go
+++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/wget/spec.go
@@ -5,10 +5,10 @@ import (
"k8s.io/apimachinery/pkg/util/validation/field"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs"
- "github.com/open-component-model/ocm/pkg/blobaccess"
- "github.com/open-component-model/ocm/pkg/blobaccess/wget"
- "github.com/open-component-model/ocm/pkg/runtime"
+ "ocm.software/ocm/api/utils/blobaccess"
+ "ocm.software/ocm/api/utils/blobaccess/wget"
+ "ocm.software/ocm/api/utils/runtime"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs"
)
type Spec struct {
diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/wget/type.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/wget/type.go
index b1b9236a0..9c966a12b 100644
--- a/cmds/ocm/commands/ocmcmds/common/inputs/types/wget/type.go
+++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/wget/type.go
@@ -1,8 +1,8 @@
package wget
import (
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs"
- "github.com/open-component-model/ocm/pkg/mime"
+ "ocm.software/ocm/api/utils/mime"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs"
)
const TYPE = "wget"
diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/utils.go b/cmds/ocm/commands/ocmcmds/common/inputs/utils.go
index b1ee922cf..2f30e164f 100644
--- a/cmds/ocm/commands/ocmcmds/common/inputs/utils.go
+++ b/cmds/ocm/commands/ocmcmds/common/inputs/utils.go
@@ -7,7 +7,7 @@ import (
"github.com/mandelsoft/goutils/errors"
"github.com/mandelsoft/vfs/pkg/vfs"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
+ clictx "ocm.software/ocm/api/cli"
)
func FileInfo(ctx clictx.Context, path string, inputFilePath string) (os.FileInfo, string, error) {
diff --git a/cmds/ocm/commands/ocmcmds/common/options/comppathopt/comppath_test.go b/cmds/ocm/commands/ocmcmds/common/options/comppathopt/comppath_test.go
index 7ad6e31b5..45db4a188 100644
--- a/cmds/ocm/commands/ocmcmds/common/options/comppathopt/comppath_test.go
+++ b/cmds/ocm/commands/ocmcmds/common/options/comppathopt/comppath_test.go
@@ -8,8 +8,8 @@ import (
"github.com/mandelsoft/goutils/errors"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/comppathopt"
- v1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1"
+ v1 "ocm.software/ocm/api/ocm/compdesc/meta/v1"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/comppathopt"
)
func TestConfig(t *testing.T) {
diff --git a/cmds/ocm/commands/ocmcmds/common/options/comppathopt/option.go b/cmds/ocm/commands/ocmcmds/common/options/comppathopt/option.go
index 67a113465..d25df13c3 100644
--- a/cmds/ocm/commands/ocmcmds/common/options/comppathopt/option.go
+++ b/cmds/ocm/commands/ocmcmds/common/options/comppathopt/option.go
@@ -3,9 +3,9 @@ package comppathopt
import (
"github.com/spf13/pflag"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/output"
- metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1"
+ metav1 "ocm.software/ocm/api/ocm/compdesc/meta/v1"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common"
+ "ocm.software/ocm/cmds/ocm/common/output"
)
func From(o *output.Options) *Option {
diff --git a/cmds/ocm/commands/ocmcmds/common/options/downloaderoption/option.go b/cmds/ocm/commands/ocmcmds/common/options/downloaderoption/option.go
index 4f8cb8353..e01327d29 100644
--- a/cmds/ocm/commands/ocmcmds/common/options/downloaderoption/option.go
+++ b/cmds/ocm/commands/ocmcmds/common/options/downloaderoption/option.go
@@ -1,13 +1,13 @@
package downloaderoption
import (
- _ "github.com/open-component-model/ocm/pkg/contexts/ocm/download/handlers"
+ _ "ocm.software/ocm/api/ocm/extensions/download/handlers"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/optutils"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/options"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/download"
- "github.com/open-component-model/ocm/pkg/listformat"
+ "ocm.software/ocm/api/ocm"
+ "ocm.software/ocm/api/ocm/extensions/download"
+ "ocm.software/ocm/api/utils/listformat"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/optutils"
+ "ocm.software/ocm/cmds/ocm/common/options"
)
type Registration = optutils.Registration
diff --git a/cmds/ocm/commands/ocmcmds/common/options/dryrunoption/option.go b/cmds/ocm/commands/ocmcmds/common/options/dryrunoption/option.go
index fc90ca944..0b7880617 100644
--- a/cmds/ocm/commands/ocmcmds/common/options/dryrunoption/option.go
+++ b/cmds/ocm/commands/ocmcmds/common/options/dryrunoption/option.go
@@ -5,7 +5,7 @@ import (
"github.com/spf13/pflag"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/options"
+ "ocm.software/ocm/cmds/ocm/common/options"
)
func From(o options.OptionSetProvider) *Option {
diff --git a/cmds/ocm/commands/ocmcmds/common/options/fileoption/option.go b/cmds/ocm/commands/ocmcmds/common/options/fileoption/option.go
index 082ae8cbe..69a089474 100644
--- a/cmds/ocm/commands/ocmcmds/common/options/fileoption/option.go
+++ b/cmds/ocm/commands/ocmcmds/common/options/fileoption/option.go
@@ -7,10 +7,10 @@ import (
"github.com/mandelsoft/vfs/pkg/vfs"
"github.com/spf13/pflag"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/options"
- "github.com/open-component-model/ocm/pkg/cobrautils/flag"
- "github.com/open-component-model/ocm/pkg/common/compression"
- "github.com/open-component-model/ocm/pkg/utils"
+ "ocm.software/ocm/api/utils"
+ "ocm.software/ocm/api/utils/cobrautils/flag"
+ "ocm.software/ocm/api/utils/compression"
+ "ocm.software/ocm/cmds/ocm/common/options"
)
func From(o options.OptionSetProvider) *Option {
diff --git a/cmds/ocm/commands/ocmcmds/common/options/hashoption/option.go b/cmds/ocm/commands/ocmcmds/common/options/hashoption/option.go
index f9bb38401..4eb900f44 100644
--- a/cmds/ocm/commands/ocmcmds/common/options/hashoption/option.go
+++ b/cmds/ocm/commands/ocmcmds/common/options/hashoption/option.go
@@ -4,15 +4,15 @@ import (
"github.com/mandelsoft/goutils/errors"
"github.com/spf13/pflag"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/options"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/attrs/signingattr"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/normalizations/jsonv1"
- ocmsign "github.com/open-component-model/ocm/pkg/contexts/ocm/signing"
- "github.com/open-component-model/ocm/pkg/listformat"
- "github.com/open-component-model/ocm/pkg/signing"
- "github.com/open-component-model/ocm/pkg/signing/hasher/sha256"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/ocm/compdesc"
+ "ocm.software/ocm/api/ocm/compdesc/normalizations/jsonv1"
+ "ocm.software/ocm/api/ocm/extensions/attrs/signingattr"
+ ocmsign "ocm.software/ocm/api/ocm/tools/signing"
+ "ocm.software/ocm/api/tech/signing"
+ "ocm.software/ocm/api/tech/signing/hasher/sha256"
+ "ocm.software/ocm/api/utils/listformat"
+ "ocm.software/ocm/cmds/ocm/common/options"
)
func From(o options.OptionSetProvider) *Option {
diff --git a/cmds/ocm/commands/ocmcmds/common/options/keepglobaloption/option.go b/cmds/ocm/commands/ocmcmds/common/options/keepglobaloption/option.go
index b2f4ea019..ecc39ab01 100644
--- a/cmds/ocm/commands/ocmcmds/common/options/keepglobaloption/option.go
+++ b/cmds/ocm/commands/ocmcmds/common/options/keepglobaloption/option.go
@@ -3,9 +3,9 @@ package keepglobaloption
import (
"github.com/spf13/pflag"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/options"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/transfer/transferhandler"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/transfer/transferhandler/standard"
+ "ocm.software/ocm/api/ocm/tools/transfer/transferhandler"
+ "ocm.software/ocm/api/ocm/tools/transfer/transferhandler/standard"
+ "ocm.software/ocm/cmds/ocm/common/options"
)
func From(o options.OptionSetProvider) *Option {
diff --git a/cmds/ocm/commands/ocmcmds/common/options/lookupoption/option.go b/cmds/ocm/commands/ocmcmds/common/options/lookupoption/option.go
index 38fb8738f..5a106b871 100644
--- a/cmds/ocm/commands/ocmcmds/common/options/lookupoption/option.go
+++ b/cmds/ocm/commands/ocmcmds/common/options/lookupoption/option.go
@@ -3,11 +3,11 @@ package lookupoption
import (
"github.com/spf13/pflag"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/options"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/transfer/transferhandler"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/transfer/transferhandler/standard"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/ocm"
+ "ocm.software/ocm/api/ocm/tools/transfer/transferhandler"
+ "ocm.software/ocm/api/ocm/tools/transfer/transferhandler/standard"
+ "ocm.software/ocm/cmds/ocm/common/options"
)
func From(o options.OptionSetProvider) *Option {
diff --git a/cmds/ocm/commands/ocmcmds/common/options/omitaccesstypeoption/option.go b/cmds/ocm/commands/ocmcmds/common/options/omitaccesstypeoption/option.go
index 8329e58d7..b08846420 100644
--- a/cmds/ocm/commands/ocmcmds/common/options/omitaccesstypeoption/option.go
+++ b/cmds/ocm/commands/ocmcmds/common/options/omitaccesstypeoption/option.go
@@ -3,9 +3,9 @@ package omitaccesstypeoption
import (
"github.com/spf13/pflag"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/options"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/transfer/transferhandler"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/transfer/transferhandler/standard"
+ "ocm.software/ocm/api/ocm/tools/transfer/transferhandler"
+ "ocm.software/ocm/api/ocm/tools/transfer/transferhandler/standard"
+ "ocm.software/ocm/cmds/ocm/common/options"
)
func From(o options.OptionSetProvider) *Option {
diff --git a/cmds/ocm/commands/ocmcmds/common/options/optutils/reg_test.go b/cmds/ocm/commands/ocmcmds/common/options/optutils/reg_test.go
index 34f6dfd13..edca672cd 100644
--- a/cmds/ocm/commands/ocmcmds/common/options/optutils/reg_test.go
+++ b/cmds/ocm/commands/ocmcmds/common/options/optutils/reg_test.go
@@ -9,9 +9,9 @@ import (
"github.com/spf13/pflag"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/optutils"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
- "github.com/open-component-model/ocm/pkg/env"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/helper/env"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/optutils"
)
var _ = Describe("registration options", func() {
diff --git a/cmds/ocm/commands/ocmcmds/common/options/optutils/registration.go b/cmds/ocm/commands/ocmcmds/common/options/optutils/registration.go
index ce1566e96..aaa704041 100644
--- a/cmds/ocm/commands/ocmcmds/common/options/optutils/registration.go
+++ b/cmds/ocm/commands/ocmcmds/common/options/optutils/registration.go
@@ -9,9 +9,9 @@ import (
"github.com/spf13/pflag"
"sigs.k8s.io/yaml"
- "github.com/open-component-model/ocm/pkg/cobrautils/flag"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
- "github.com/open-component-model/ocm/pkg/utils"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/utils"
+ "ocm.software/ocm/api/utils/cobrautils/flag"
)
type Registration struct {
diff --git a/cmds/ocm/commands/ocmcmds/common/options/overwriteoption/option.go b/cmds/ocm/commands/ocmcmds/common/options/overwriteoption/option.go
index 3bdf0c67c..a930ad6d2 100644
--- a/cmds/ocm/commands/ocmcmds/common/options/overwriteoption/option.go
+++ b/cmds/ocm/commands/ocmcmds/common/options/overwriteoption/option.go
@@ -3,10 +3,10 @@ package overwriteoption
import (
"github.com/spf13/pflag"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/options"
- "github.com/open-component-model/ocm/pkg/cobrautils/flag"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/transfer/transferhandler"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/transfer/transferhandler/standard"
+ "ocm.software/ocm/api/ocm/tools/transfer/transferhandler"
+ "ocm.software/ocm/api/ocm/tools/transfer/transferhandler/standard"
+ "ocm.software/ocm/api/utils/cobrautils/flag"
+ "ocm.software/ocm/cmds/ocm/common/options"
)
func From(o options.OptionSetProvider) *Option {
diff --git a/cmds/ocm/commands/ocmcmds/common/options/repooption/option.go b/cmds/ocm/commands/ocmcmds/common/options/repooption/option.go
index f92239878..51134b6c7 100644
--- a/cmds/ocm/commands/ocmcmds/common/options/repooption/option.go
+++ b/cmds/ocm/commands/ocmcmds/common/options/repooption/option.go
@@ -3,14 +3,14 @@ package repooption
import (
"github.com/spf13/pflag"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/options"
- "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/contexts/ocm"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/genericocireg"
- "github.com/open-component-model/ocm/pkg/listformat"
- "github.com/open-component-model/ocm/pkg/runtime"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/oci"
+ "ocm.software/ocm/api/ocm"
+ "ocm.software/ocm/api/ocm/extensions/repositories/genericocireg"
+ "ocm.software/ocm/api/utils/listformat"
+ "ocm.software/ocm/api/utils/runtime"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common"
+ "ocm.software/ocm/cmds/ocm/common/options"
)
func From(o options.OptionSetProvider) *Option {
diff --git a/cmds/ocm/commands/ocmcmds/common/options/rscbyvalueoption/option.go b/cmds/ocm/commands/ocmcmds/common/options/rscbyvalueoption/option.go
index 1d259f33a..fa7b20a82 100644
--- a/cmds/ocm/commands/ocmcmds/common/options/rscbyvalueoption/option.go
+++ b/cmds/ocm/commands/ocmcmds/common/options/rscbyvalueoption/option.go
@@ -3,10 +3,10 @@ package rscbyvalueoption
import (
"github.com/spf13/pflag"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/options"
- "github.com/open-component-model/ocm/pkg/cobrautils/flag"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/transfer/transferhandler"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/transfer/transferhandler/standard"
+ "ocm.software/ocm/api/ocm/tools/transfer/transferhandler"
+ "ocm.software/ocm/api/ocm/tools/transfer/transferhandler/standard"
+ "ocm.software/ocm/api/utils/cobrautils/flag"
+ "ocm.software/ocm/cmds/ocm/common/options"
)
func From(o options.OptionSetProvider) *Option {
diff --git a/cmds/ocm/commands/ocmcmds/common/options/schemaoption/option.go b/cmds/ocm/commands/ocmcmds/common/options/schemaoption/option.go
index 5e463f005..2ee7bf480 100644
--- a/cmds/ocm/commands/ocmcmds/common/options/schemaoption/option.go
+++ b/cmds/ocm/commands/ocmcmds/common/options/schemaoption/option.go
@@ -4,12 +4,12 @@ import (
"github.com/mandelsoft/goutils/errors"
"github.com/spf13/pflag"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/options"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc"
- metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1"
- "github.com/open-component-model/ocm/pkg/errkind"
- "github.com/open-component-model/ocm/pkg/listformat"
- utils2 "github.com/open-component-model/ocm/pkg/utils"
+ "ocm.software/ocm/api/ocm/compdesc"
+ metav1 "ocm.software/ocm/api/ocm/compdesc/meta/v1"
+ utils2 "ocm.software/ocm/api/utils"
+ "ocm.software/ocm/api/utils/errkind"
+ "ocm.software/ocm/api/utils/listformat"
+ "ocm.software/ocm/cmds/ocm/common/options"
)
func From(o options.OptionSetProvider) *Option {
diff --git a/cmds/ocm/commands/ocmcmds/common/options/scriptoption/config.go b/cmds/ocm/commands/ocmcmds/common/options/scriptoption/config.go
index b85962310..819d0b725 100644
--- a/cmds/ocm/commands/ocmcmds/common/options/scriptoption/config.go
+++ b/cmds/ocm/commands/ocmcmds/common/options/scriptoption/config.go
@@ -6,9 +6,9 @@ import (
"github.com/mandelsoft/goutils/errors"
"github.com/mandelsoft/vfs/pkg/vfs"
- cfgcpi "github.com/open-component-model/ocm/pkg/contexts/config/cpi"
- "github.com/open-component-model/ocm/pkg/runtime"
- "github.com/open-component-model/ocm/pkg/utils"
+ cfgcpi "ocm.software/ocm/api/config/cpi"
+ "ocm.software/ocm/api/utils"
+ "ocm.software/ocm/api/utils/runtime"
)
const (
diff --git a/cmds/ocm/commands/ocmcmds/common/options/scriptoption/option.go b/cmds/ocm/commands/ocmcmds/common/options/scriptoption/option.go
index a6d493e31..ff8acf3c7 100644
--- a/cmds/ocm/commands/ocmcmds/common/options/scriptoption/option.go
+++ b/cmds/ocm/commands/ocmcmds/common/options/scriptoption/option.go
@@ -5,12 +5,12 @@ import (
"github.com/mandelsoft/vfs/pkg/vfs"
"github.com/spf13/pflag"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/options"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
- cfgcpi "github.com/open-component-model/ocm/pkg/contexts/config/cpi"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/transfer/transferhandler"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/transfer/transferhandler/spiff"
- "github.com/open-component-model/ocm/pkg/utils"
+ clictx "ocm.software/ocm/api/cli"
+ cfgcpi "ocm.software/ocm/api/config/cpi"
+ "ocm.software/ocm/api/ocm/tools/transfer/transferhandler"
+ "ocm.software/ocm/api/ocm/tools/transfer/transferhandler/spiff"
+ "ocm.software/ocm/api/utils"
+ "ocm.software/ocm/cmds/ocm/common/options"
)
func From(o options.OptionSetProvider) *Option {
diff --git a/cmds/ocm/commands/ocmcmds/common/options/signoption/option.go b/cmds/ocm/commands/ocmcmds/common/options/signoption/option.go
index 131f1a900..6e27d1d0d 100644
--- a/cmds/ocm/commands/ocmcmds/common/options/signoption/option.go
+++ b/cmds/ocm/commands/ocmcmds/common/options/signoption/option.go
@@ -7,19 +7,19 @@ import (
"github.com/mandelsoft/goutils/errors"
"github.com/spf13/pflag"
- "github.com/open-component-model/ocm/cmds/ocm/commands/common/options/keyoption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/hashoption"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/options"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/attrs/signingattr"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/normalizations/jsonv1"
- ocmsign "github.com/open-component-model/ocm/pkg/contexts/ocm/signing"
- "github.com/open-component-model/ocm/pkg/listformat"
- "github.com/open-component-model/ocm/pkg/signing"
- "github.com/open-component-model/ocm/pkg/signing/handlers/rsa"
- "github.com/open-component-model/ocm/pkg/signing/hasher/sha256"
- "github.com/open-component-model/ocm/pkg/signing/signutils"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/ocm/compdesc"
+ "ocm.software/ocm/api/ocm/compdesc/normalizations/jsonv1"
+ "ocm.software/ocm/api/ocm/extensions/attrs/signingattr"
+ ocmsign "ocm.software/ocm/api/ocm/tools/signing"
+ "ocm.software/ocm/api/tech/signing"
+ "ocm.software/ocm/api/tech/signing/handlers/rsa"
+ "ocm.software/ocm/api/tech/signing/hasher/sha256"
+ "ocm.software/ocm/api/tech/signing/signutils"
+ "ocm.software/ocm/api/utils/listformat"
+ "ocm.software/ocm/cmds/ocm/commands/common/options/keyoption"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/hashoption"
+ "ocm.software/ocm/cmds/ocm/common/options"
)
func From(o options.OptionSetProvider) *Option {
diff --git a/cmds/ocm/commands/ocmcmds/common/options/skipdigestoption/option.go b/cmds/ocm/commands/ocmcmds/common/options/skipdigestoption/option.go
index e6052a34b..0eb27e72d 100644
--- a/cmds/ocm/commands/ocmcmds/common/options/skipdigestoption/option.go
+++ b/cmds/ocm/commands/ocmcmds/common/options/skipdigestoption/option.go
@@ -3,9 +3,9 @@ package skipdigestoption
import (
"github.com/spf13/pflag"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/options"
- "github.com/open-component-model/ocm/pkg/cobrautils/flag"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
+ "ocm.software/ocm/api/ocm"
+ "ocm.software/ocm/api/utils/cobrautils/flag"
+ "ocm.software/ocm/cmds/ocm/common/options"
)
func From(o options.OptionSetProvider) *Option {
diff --git a/cmds/ocm/commands/ocmcmds/common/options/skipupdateoption/option.go b/cmds/ocm/commands/ocmcmds/common/options/skipupdateoption/option.go
index 39fece1c6..cf16b1710 100644
--- a/cmds/ocm/commands/ocmcmds/common/options/skipupdateoption/option.go
+++ b/cmds/ocm/commands/ocmcmds/common/options/skipupdateoption/option.go
@@ -3,10 +3,10 @@ package skipupdateoption
import (
"github.com/spf13/pflag"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/options"
- "github.com/open-component-model/ocm/pkg/cobrautils/flag"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/transfer/transferhandler"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/transfer/transferhandler/standard"
+ "ocm.software/ocm/api/ocm/tools/transfer/transferhandler"
+ "ocm.software/ocm/api/ocm/tools/transfer/transferhandler/standard"
+ "ocm.software/ocm/api/utils/cobrautils/flag"
+ "ocm.software/ocm/cmds/ocm/common/options"
)
func From(o options.OptionSetProvider) *Option {
diff --git a/cmds/ocm/commands/ocmcmds/common/options/srcbyvalueoption/option.go b/cmds/ocm/commands/ocmcmds/common/options/srcbyvalueoption/option.go
index e6f3fd8fd..25e5f0af2 100644
--- a/cmds/ocm/commands/ocmcmds/common/options/srcbyvalueoption/option.go
+++ b/cmds/ocm/commands/ocmcmds/common/options/srcbyvalueoption/option.go
@@ -3,10 +3,10 @@ package srcbyvalueoption
import (
"github.com/spf13/pflag"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/options"
- "github.com/open-component-model/ocm/pkg/cobrautils/flag"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/transfer/transferhandler"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/transfer/transferhandler/standard"
+ "ocm.software/ocm/api/ocm/tools/transfer/transferhandler"
+ "ocm.software/ocm/api/ocm/tools/transfer/transferhandler/standard"
+ "ocm.software/ocm/api/utils/cobrautils/flag"
+ "ocm.software/ocm/cmds/ocm/common/options"
)
func From(o options.OptionSetProvider) *Option {
diff --git a/cmds/ocm/commands/ocmcmds/common/options/stoponexistingoption/option.go b/cmds/ocm/commands/ocmcmds/common/options/stoponexistingoption/option.go
index 9a55a3666..34363f414 100644
--- a/cmds/ocm/commands/ocmcmds/common/options/stoponexistingoption/option.go
+++ b/cmds/ocm/commands/ocmcmds/common/options/stoponexistingoption/option.go
@@ -3,10 +3,10 @@ package stoponexistingoption
import (
"github.com/spf13/pflag"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/options"
- "github.com/open-component-model/ocm/pkg/cobrautils/flag"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/transfer/transferhandler"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/transfer/transferhandler/standard"
+ "ocm.software/ocm/api/ocm/tools/transfer/transferhandler"
+ "ocm.software/ocm/api/ocm/tools/transfer/transferhandler/standard"
+ "ocm.software/ocm/api/utils/cobrautils/flag"
+ "ocm.software/ocm/cmds/ocm/common/options"
)
func From(o options.OptionSetProvider) *Option {
diff --git a/cmds/ocm/commands/ocmcmds/common/options/templateroption/option.go b/cmds/ocm/commands/ocmcmds/common/options/templateroption/option.go
index efe98c4ca..376dddddb 100644
--- a/cmds/ocm/commands/ocmcmds/common/options/templateroption/option.go
+++ b/cmds/ocm/commands/ocmcmds/common/options/templateroption/option.go
@@ -1,9 +1,9 @@
package templateroption
import (
- "github.com/open-component-model/ocm/cmds/ocm/pkg/options"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
- "github.com/open-component-model/ocm/pkg/utils/template"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/utils/template"
+ "ocm.software/ocm/cmds/ocm/common/options"
)
func From(o options.OptionSetProvider) *Option {
diff --git a/cmds/ocm/commands/ocmcmds/common/options/uploaderoption/option.go b/cmds/ocm/commands/ocmcmds/common/options/uploaderoption/option.go
index be11fc982..7c716bc7f 100644
--- a/cmds/ocm/commands/ocmcmds/common/options/uploaderoption/option.go
+++ b/cmds/ocm/commands/ocmcmds/common/options/uploaderoption/option.go
@@ -1,11 +1,11 @@
package uploaderoption
import (
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/optutils"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/options"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/blobhandler"
- "github.com/open-component-model/ocm/pkg/listformat"
+ "ocm.software/ocm/api/ocm"
+ "ocm.software/ocm/api/ocm/extensions/blobhandler"
+ "ocm.software/ocm/api/utils/listformat"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/optutils"
+ "ocm.software/ocm/cmds/ocm/common/options"
)
type Registration = optutils.Registration
diff --git a/cmds/ocm/commands/ocmcmds/common/options/uploaderoption/uploader_test.go b/cmds/ocm/commands/ocmcmds/common/options/uploaderoption/uploader_test.go
index 72885ff35..8dbd4404e 100644
--- a/cmds/ocm/commands/ocmcmds/common/options/uploaderoption/uploader_test.go
+++ b/cmds/ocm/commands/ocmcmds/common/options/uploaderoption/uploader_test.go
@@ -9,8 +9,8 @@ import (
"github.com/spf13/pflag"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/optutils"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/optutils"
)
var _ = Describe("uploader option", func() {
diff --git a/cmds/ocm/commands/ocmcmds/common/options/versionconstraintsoption/option.go b/cmds/ocm/commands/ocmcmds/common/options/versionconstraintsoption/option.go
index 183ef8243..fb8d140a3 100644
--- a/cmds/ocm/commands/ocmcmds/common/options/versionconstraintsoption/option.go
+++ b/cmds/ocm/commands/ocmcmds/common/options/versionconstraintsoption/option.go
@@ -4,9 +4,9 @@ import (
"github.com/Masterminds/semver/v3"
"github.com/spf13/pflag"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/options"
- "github.com/open-component-model/ocm/pkg/cobrautils/flag"
- "github.com/open-component-model/ocm/pkg/utils"
+ "ocm.software/ocm/api/utils"
+ "ocm.software/ocm/api/utils/cobrautils/flag"
+ "ocm.software/ocm/cmds/ocm/common/options"
)
func From(o options.OptionSetProvider) *Option {
diff --git a/cmds/ocm/commands/ocmcmds/common/resources.go b/cmds/ocm/commands/ocmcmds/common/resources.go
index db8b5697b..404720cd8 100644
--- a/cmds/ocm/commands/ocmcmds/common/resources.go
+++ b/cmds/ocm/commands/ocmcmds/common/resources.go
@@ -4,7 +4,7 @@ import (
"encoding/json"
"fmt"
- _ "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/types"
+ _ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs/types"
"github.com/mandelsoft/goutils/errors"
"github.com/mandelsoft/goutils/sliceutils"
@@ -13,26 +13,26 @@ import (
"golang.org/x/text/cases"
"golang.org/x/text/language"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/addhdlrs"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/dryrunoption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/fileoption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/templateroption"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/options"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/cobrautils/flagsets"
- "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"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/localblob"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc"
- v1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/comparch"
- "github.com/open-component-model/ocm/pkg/logging"
- "github.com/open-component-model/ocm/pkg/mime"
- utils2 "github.com/open-component-model/ocm/pkg/utils"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/ocm"
+ "ocm.software/ocm/api/ocm/compdesc"
+ v1 "ocm.software/ocm/api/ocm/compdesc/meta/v1"
+ "ocm.software/ocm/api/ocm/extensions/accessmethods/localblob"
+ "ocm.software/ocm/api/ocm/extensions/repositories/comparch"
+ utils2 "ocm.software/ocm/api/utils"
+ "ocm.software/ocm/api/utils/accessio"
+ "ocm.software/ocm/api/utils/accessobj"
+ "ocm.software/ocm/api/utils/cobrautils/flagsets"
+ "ocm.software/ocm/api/utils/logging"
+ "ocm.software/ocm/api/utils/mime"
+ common "ocm.software/ocm/api/utils/misc"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/addhdlrs"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/dryrunoption"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/fileoption"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/templateroption"
+ "ocm.software/ocm/cmds/ocm/common/options"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
const ComponentVersionTag = ""
diff --git a/cmds/ocm/commands/ocmcmds/common/resources_test.go b/cmds/ocm/commands/ocmcmds/common/resources_test.go
index 015146532..8f22b6821 100644
--- a/cmds/ocm/commands/ocmcmds/common/resources_test.go
+++ b/cmds/ocm/commands/ocmcmds/common/resources_test.go
@@ -4,7 +4,7 @@ import (
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/addhdlrs"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/addhdlrs"
)
var _ = Describe("Blob Inputs", func() {
diff --git a/cmds/ocm/commands/ocmcmds/common/utils.go b/cmds/ocm/commands/ocmcmds/common/utils.go
index 5985d9468..5537d634b 100644
--- a/cmds/ocm/commands/ocmcmds/common/utils.go
+++ b/cmds/ocm/commands/ocmcmds/common/utils.go
@@ -6,12 +6,12 @@ import (
"github.com/mandelsoft/goutils/errors"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/options"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc"
- metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1"
- utils2 "github.com/open-component-model/ocm/pkg/utils"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/ocm"
+ "ocm.software/ocm/api/ocm/compdesc"
+ metav1 "ocm.software/ocm/api/ocm/compdesc/meta/v1"
+ utils2 "ocm.software/ocm/api/utils"
+ "ocm.software/ocm/cmds/ocm/common/options"
)
func ConsumeIdentities(pattern bool, args []string, stop ...string) ([]metav1.Identity, []string, error) {
diff --git a/cmds/ocm/commands/ocmcmds/componentarchive/cmd.go b/cmds/ocm/commands/ocmcmds/componentarchive/cmd.go
index 0d055b37c..a053aa71e 100644
--- a/cmds/ocm/commands/ocmcmds/componentarchive/cmd.go
+++ b/cmds/ocm/commands/ocmcmds/componentarchive/cmd.go
@@ -3,11 +3,11 @@ package componentarchive
import (
"github.com/spf13/cobra"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/componentarchive/create"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/componentarchive/transfer"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/names"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/componentarchive/create"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/componentarchive/transfer"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/names"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
var Names = names.ComponentArchive
diff --git a/cmds/ocm/commands/ocmcmds/componentarchive/create/cmd.go b/cmds/ocm/commands/ocmcmds/componentarchive/create/cmd.go
index 8f0c5e8ce..accfe0b1d 100644
--- a/cmds/ocm/commands/ocmcmds/componentarchive/create/cmd.go
+++ b/cmds/ocm/commands/ocmcmds/componentarchive/create/cmd.go
@@ -9,20 +9,20 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/pflag"
- "github.com/open-component-model/ocm/cmds/ocm/commands/common/options/formatoption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/fileoption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/schemaoption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/names"
- "github.com/open-component-model/ocm/cmds/ocm/commands/verbs"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/clisupport"
- "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/contexts/ocm/attrs/compatattr"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc"
- metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/comparch"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/ocm/compdesc"
+ metav1 "ocm.software/ocm/api/ocm/compdesc/meta/v1"
+ "ocm.software/ocm/api/ocm/extensions/attrs/compatattr"
+ "ocm.software/ocm/api/ocm/extensions/repositories/comparch"
+ "ocm.software/ocm/api/utils/accessio"
+ "ocm.software/ocm/api/utils/accessobj"
+ "ocm.software/ocm/api/utils/clisupport"
+ "ocm.software/ocm/cmds/ocm/commands/common/options/formatoption"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/fileoption"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/schemaoption"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/names"
+ "ocm.software/ocm/cmds/ocm/commands/verbs"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
var (
diff --git a/cmds/ocm/commands/ocmcmds/componentarchive/create/cmd_test.go b/cmds/ocm/commands/ocmcmds/componentarchive/create/cmd_test.go
index 25e10efb1..3dc5cb858 100644
--- a/cmds/ocm/commands/ocmcmds/componentarchive/create/cmd_test.go
+++ b/cmds/ocm/commands/ocmcmds/componentarchive/create/cmd_test.go
@@ -3,12 +3,12 @@ package create_test
import (
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
- . "github.com/open-component-model/ocm/cmds/ocm/testhelper"
+ . "ocm.software/ocm/cmds/ocm/testhelper"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc"
- metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1"
- compdescv3 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/versions/ocm.software/v3alpha1"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/comparch"
+ "ocm.software/ocm/api/ocm/compdesc"
+ metav1 "ocm.software/ocm/api/ocm/compdesc/meta/v1"
+ compdescv3 "ocm.software/ocm/api/ocm/compdesc/versions/ocm.software/v3alpha1"
+ "ocm.software/ocm/api/ocm/extensions/repositories/comparch"
)
var _ = Describe("Test Environment", func() {
diff --git a/cmds/ocm/commands/ocmcmds/componentarchive/transfer/cmd.go b/cmds/ocm/commands/ocmcmds/componentarchive/transfer/cmd.go
index c5604bc0e..a2944b349 100644
--- a/cmds/ocm/commands/ocmcmds/componentarchive/transfer/cmd.go
+++ b/cmds/ocm/commands/ocmcmds/componentarchive/transfer/cmd.go
@@ -3,25 +3,25 @@ package transfer
import (
"github.com/spf13/cobra"
- "github.com/open-component-model/ocm/cmds/ocm/commands/common/options/formatoption"
- ocmcommon "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/lookupoption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/overwriteoption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/rscbyvalueoption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/skipupdateoption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/srcbyvalueoption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/names"
- "github.com/open-component-model/ocm/cmds/ocm/commands/verbs"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/options"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/common"
- "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/contexts/ocm"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/comparch"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/transfer"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/transfer/transferhandler"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/transfer/transferhandler/standard"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/ocm"
+ "ocm.software/ocm/api/ocm/extensions/repositories/comparch"
+ "ocm.software/ocm/api/ocm/tools/transfer"
+ "ocm.software/ocm/api/ocm/tools/transfer/transferhandler"
+ "ocm.software/ocm/api/ocm/tools/transfer/transferhandler/standard"
+ "ocm.software/ocm/api/utils/accessobj"
+ common "ocm.software/ocm/api/utils/misc"
+ "ocm.software/ocm/cmds/ocm/commands/common/options/formatoption"
+ ocmcommon "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/lookupoption"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/overwriteoption"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/rscbyvalueoption"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/skipupdateoption"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/srcbyvalueoption"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/names"
+ "ocm.software/ocm/cmds/ocm/commands/verbs"
+ "ocm.software/ocm/cmds/ocm/common/options"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
var (
diff --git a/cmds/ocm/commands/ocmcmds/components/add/cmd.go b/cmds/ocm/commands/ocmcmds/components/add/cmd.go
index 9f70c383a..c6a62bb69 100644
--- a/cmds/ocm/commands/ocmcmds/components/add/cmd.go
+++ b/cmds/ocm/commands/ocmcmds/components/add/cmd.go
@@ -9,29 +9,29 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/pflag"
- "github.com/open-component-model/ocm/cmds/ocm/commands/common/options/formatoption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/addhdlrs"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/addhdlrs/comp"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/dryrunoption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/fileoption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/lookupoption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/rscbyvalueoption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/schemaoption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/templateroption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/uploaderoption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/names"
- "github.com/open-component-model/ocm/cmds/ocm/commands/verbs"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- topicocmlabels "github.com/open-component-model/ocm/cmds/ocm/topics/ocm/labels"
- common2 "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"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ctf"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/transfer/transferhandler/standard"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/ocm"
+ "ocm.software/ocm/api/ocm/compdesc"
+ "ocm.software/ocm/api/ocm/extensions/repositories/ctf"
+ "ocm.software/ocm/api/ocm/tools/transfer/transferhandler/standard"
+ "ocm.software/ocm/api/utils/accessio"
+ "ocm.software/ocm/api/utils/accessobj"
+ common2 "ocm.software/ocm/api/utils/misc"
+ "ocm.software/ocm/cmds/ocm/commands/common/options/formatoption"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/addhdlrs"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/addhdlrs/comp"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/dryrunoption"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/fileoption"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/lookupoption"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/rscbyvalueoption"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/schemaoption"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/templateroption"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/uploaderoption"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/names"
+ "ocm.software/ocm/cmds/ocm/commands/verbs"
+ "ocm.software/ocm/cmds/ocm/common/utils"
+ topicocmlabels "ocm.software/ocm/cmds/ocm/topics/ocm/labels"
)
var (
diff --git a/cmds/ocm/commands/ocmcmds/components/add/cmd_test.go b/cmds/ocm/commands/ocmcmds/components/add/cmd_test.go
index f22681e75..22435d1af 100644
--- a/cmds/ocm/commands/ocmcmds/components/add/cmd_test.go
+++ b/cmds/ocm/commands/ocmcmds/components/add/cmd_test.go
@@ -4,23 +4,23 @@ import (
. "github.com/mandelsoft/goutils/testutils"
. "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/contexts/oci/testhelper"
-
- "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/oci"
- "github.com/open-component-model/ocm/pkg/contexts/oci/artdesc"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/localblob"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/ociartifact"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc"
- metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ctf"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/resourcetypes"
- ocmutils "github.com/open-component-model/ocm/pkg/contexts/ocm/utils"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/valuemergehandler/handlers/defaultmerge"
- "github.com/open-component-model/ocm/pkg/mime"
+ . "ocm.software/ocm/api/oci/testhelper"
+ . "ocm.software/ocm/cmds/ocm/testhelper"
+
+ "ocm.software/ocm/api/oci"
+ "ocm.software/ocm/api/oci/artdesc"
+ "ocm.software/ocm/api/ocm"
+ "ocm.software/ocm/api/ocm/compdesc"
+ metav1 "ocm.software/ocm/api/ocm/compdesc/meta/v1"
+ "ocm.software/ocm/api/ocm/extensions/accessmethods/localblob"
+ "ocm.software/ocm/api/ocm/extensions/accessmethods/ociartifact"
+ resourcetypes "ocm.software/ocm/api/ocm/extensions/artifacttypes"
+ "ocm.software/ocm/api/ocm/extensions/repositories/ctf"
+ ocmutils "ocm.software/ocm/api/ocm/ocmutils"
+ "ocm.software/ocm/api/ocm/valuemergehandler/handlers/defaultmerge"
+ "ocm.software/ocm/api/utils/accessio"
+ "ocm.software/ocm/api/utils/accessobj"
+ "ocm.software/ocm/api/utils/mime"
)
const (
diff --git a/cmds/ocm/commands/ocmcmds/components/check/cmd.go b/cmds/ocm/commands/ocmcmds/components/check/cmd.go
index 3fed9536b..73e7b7152 100644
--- a/cmds/ocm/commands/ocmcmds/components/check/cmd.go
+++ b/cmds/ocm/commands/ocmcmds/components/check/cmd.go
@@ -7,20 +7,20 @@ import (
"github.com/spf13/cobra"
"k8s.io/apimachinery/pkg/util/json"
- "github.com/open-component-model/ocm/cmds/ocm/commands/common/options/failonerroroption"
- ocmcommon "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/handlers/comphdlr"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/repooption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/names"
- "github.com/open-component-model/ocm/cmds/ocm/commands/verbs"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/output"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/processing"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/common"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/utils/check"
- utils2 "github.com/open-component-model/ocm/pkg/utils"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/ocm"
+ "ocm.software/ocm/api/ocm/ocmutils/check"
+ utils2 "ocm.software/ocm/api/utils"
+ common "ocm.software/ocm/api/utils/misc"
+ "ocm.software/ocm/cmds/ocm/commands/common/options/failonerroroption"
+ ocmcommon "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/handlers/comphdlr"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/repooption"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/names"
+ "ocm.software/ocm/cmds/ocm/commands/verbs"
+ "ocm.software/ocm/cmds/ocm/common/output"
+ "ocm.software/ocm/cmds/ocm/common/processing"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
var (
diff --git a/cmds/ocm/commands/ocmcmds/components/check/cmd_test.go b/cmds/ocm/commands/ocmcmds/components/check/cmd_test.go
index 8de3772eb..e2afb691b 100644
--- a/cmds/ocm/commands/ocmcmds/components/check/cmd_test.go
+++ b/cmds/ocm/commands/ocmcmds/components/check/cmd_test.go
@@ -6,13 +6,13 @@ import (
. "github.com/mandelsoft/goutils/testutils"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
- . "github.com/open-component-model/ocm/cmds/ocm/testhelper"
+ . "ocm.software/ocm/cmds/ocm/testhelper"
- "github.com/open-component-model/ocm/pkg/common/accessio"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/ociartifact"
- v1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/resourcetypes"
+ "ocm.software/ocm/api/ocm"
+ v1 "ocm.software/ocm/api/ocm/compdesc/meta/v1"
+ "ocm.software/ocm/api/ocm/extensions/accessmethods/ociartifact"
+ resourcetypes "ocm.software/ocm/api/ocm/extensions/artifacttypes"
+ "ocm.software/ocm/api/utils/accessio"
)
const (
diff --git a/cmds/ocm/commands/ocmcmds/components/check/options.go b/cmds/ocm/commands/ocmcmds/components/check/options.go
index 83c6260be..b8d19e0f3 100644
--- a/cmds/ocm/commands/ocmcmds/components/check/options.go
+++ b/cmds/ocm/commands/ocmcmds/components/check/options.go
@@ -4,8 +4,8 @@ import (
"github.com/mandelsoft/goutils/optionutils"
"github.com/spf13/pflag"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/options"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/utils/check"
+ "ocm.software/ocm/api/ocm/ocmutils/check"
+ "ocm.software/ocm/cmds/ocm/common/options"
)
func From(o options.OptionSetProvider) *Option {
diff --git a/cmds/ocm/commands/ocmcmds/components/cmd.go b/cmds/ocm/commands/ocmcmds/components/cmd.go
index 597cc1f09..b1406855f 100644
--- a/cmds/ocm/commands/ocmcmds/components/cmd.go
+++ b/cmds/ocm/commands/ocmcmds/components/cmd.go
@@ -3,18 +3,18 @@ package components
import (
"github.com/spf13/cobra"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/components/add"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/components/check"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/components/download"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/components/get"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/components/hash"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/components/list"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/components/sign"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/components/transfer"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/components/verify"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/names"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/components/add"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/components/check"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/components/download"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/components/get"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/components/hash"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/components/list"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/components/sign"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/components/transfer"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/components/verify"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/names"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
var Names = names.Components
diff --git a/cmds/ocm/commands/ocmcmds/components/download/cmd.go b/cmds/ocm/commands/ocmcmds/components/download/cmd.go
index ce7ddbbfd..1254cf7b5 100644
--- a/cmds/ocm/commands/ocmcmds/components/download/cmd.go
+++ b/cmds/ocm/commands/ocmcmds/components/download/cmd.go
@@ -7,23 +7,23 @@ import (
"github.com/mandelsoft/goutils/errors"
"github.com/spf13/cobra"
- "github.com/open-component-model/ocm/cmds/ocm/commands/common/options/destoption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/common/options/formatoption"
- ocmcommon "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/handlers/comphdlr"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/repooption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/names"
- "github.com/open-component-model/ocm/cmds/ocm/commands/verbs"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/output"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "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"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/comparch"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/transfer"
- "github.com/open-component-model/ocm/pkg/out"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/ocm"
+ "ocm.software/ocm/api/ocm/extensions/repositories/comparch"
+ "ocm.software/ocm/api/ocm/tools/transfer"
+ "ocm.software/ocm/api/utils/accessio"
+ "ocm.software/ocm/api/utils/accessobj"
+ common "ocm.software/ocm/api/utils/misc"
+ "ocm.software/ocm/api/utils/out"
+ "ocm.software/ocm/cmds/ocm/commands/common/options/destoption"
+ "ocm.software/ocm/cmds/ocm/commands/common/options/formatoption"
+ ocmcommon "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/handlers/comphdlr"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/repooption"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/names"
+ "ocm.software/ocm/cmds/ocm/commands/verbs"
+ "ocm.software/ocm/cmds/ocm/common/output"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
var (
diff --git a/cmds/ocm/commands/ocmcmds/components/download/cmd_test.go b/cmds/ocm/commands/ocmcmds/components/download/cmd_test.go
index 6a971168c..285cff04a 100644
--- a/cmds/ocm/commands/ocmcmds/components/download/cmd_test.go
+++ b/cmds/ocm/commands/ocmcmds/components/download/cmd_test.go
@@ -6,17 +6,17 @@ import (
. "github.com/mandelsoft/goutils/testutils"
. "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/contexts/ocm/testhelper"
+ . "ocm.software/ocm/api/ocm/testhelper"
+ . "ocm.software/ocm/cmds/ocm/testhelper"
"github.com/mandelsoft/vfs/pkg/vfs"
- "github.com/open-component-model/ocm/pkg/common/accessio"
- metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/grammar"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/comparch"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/resourcetypes"
- "github.com/open-component-model/ocm/pkg/mime"
+ metav1 "ocm.software/ocm/api/ocm/compdesc/meta/v1"
+ resourcetypes "ocm.software/ocm/api/ocm/extensions/artifacttypes"
+ "ocm.software/ocm/api/ocm/extensions/repositories/comparch"
+ "ocm.software/ocm/api/ocm/grammar"
+ "ocm.software/ocm/api/utils/accessio"
+ "ocm.software/ocm/api/utils/mime"
)
const (
diff --git a/cmds/ocm/commands/ocmcmds/components/get/cmd.go b/cmds/ocm/commands/ocmcmds/components/get/cmd.go
index 09fbed63b..8b95482fa 100644
--- a/cmds/ocm/commands/ocmcmds/components/get/cmd.go
+++ b/cmds/ocm/commands/ocmcmds/components/get/cmd.go
@@ -5,23 +5,23 @@ import (
"github.com/spf13/cobra"
- "github.com/open-component-model/ocm/cmds/ocm/commands/common/options/closureoption"
- ocmcommon "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/handlers/comphdlr"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/lookupoption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/repooption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/schemaoption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/versionconstraintsoption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/names"
- "github.com/open-component-model/ocm/cmds/ocm/commands/verbs"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/options"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/output"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/processing"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc"
- compdescv2 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/versions/v2"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/ocm"
+ "ocm.software/ocm/api/ocm/compdesc"
+ compdescv2 "ocm.software/ocm/api/ocm/compdesc/versions/v2"
+ "ocm.software/ocm/cmds/ocm/commands/common/options/closureoption"
+ ocmcommon "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/handlers/comphdlr"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/lookupoption"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/repooption"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/schemaoption"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/versionconstraintsoption"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/names"
+ "ocm.software/ocm/cmds/ocm/commands/verbs"
+ "ocm.software/ocm/cmds/ocm/common/options"
+ "ocm.software/ocm/cmds/ocm/common/output"
+ "ocm.software/ocm/cmds/ocm/common/processing"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
var (
diff --git a/cmds/ocm/commands/ocmcmds/components/get/cmd_test.go b/cmds/ocm/commands/ocmcmds/components/get/cmd_test.go
index c47627e93..9ac4a9901 100644
--- a/cmds/ocm/commands/ocmcmds/components/get/cmd_test.go
+++ b/cmds/ocm/commands/ocmcmds/components/get/cmd_test.go
@@ -7,10 +7,10 @@ import (
. "github.com/mandelsoft/goutils/testutils"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
- . "github.com/open-component-model/ocm/cmds/ocm/testhelper"
+ . "ocm.software/ocm/cmds/ocm/testhelper"
- "github.com/open-component-model/ocm/pkg/common/accessio"
- compdescv3 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/versions/ocm.software/v3alpha1"
+ compdescv3 "ocm.software/ocm/api/ocm/compdesc/versions/ocm.software/v3alpha1"
+ "ocm.software/ocm/api/utils/accessio"
)
const (
diff --git a/cmds/ocm/commands/ocmcmds/components/hash/cmd.go b/cmds/ocm/commands/ocmcmds/components/hash/cmd.go
index 902359e76..7a2c5a829 100644
--- a/cmds/ocm/commands/ocmcmds/components/hash/cmd.go
+++ b/cmds/ocm/commands/ocmcmds/components/hash/cmd.go
@@ -8,22 +8,22 @@ import (
"github.com/mandelsoft/vfs/pkg/vfs"
"github.com/spf13/cobra"
- "github.com/open-component-model/ocm/cmds/ocm/commands/common/options/closureoption"
- ocmcommon "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/handlers/comphdlr"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/hashoption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/lookupoption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/repooption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/versionconstraintsoption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/names"
- "github.com/open-component-model/ocm/cmds/ocm/commands/verbs"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/output"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/processing"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/common"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/ocm"
+ "ocm.software/ocm/api/ocm/compdesc"
+ common "ocm.software/ocm/api/utils/misc"
+ "ocm.software/ocm/cmds/ocm/commands/common/options/closureoption"
+ ocmcommon "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/handlers/comphdlr"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/hashoption"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/lookupoption"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/repooption"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/versionconstraintsoption"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/names"
+ "ocm.software/ocm/cmds/ocm/commands/verbs"
+ "ocm.software/ocm/cmds/ocm/common/output"
+ "ocm.software/ocm/cmds/ocm/common/processing"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
var (
diff --git a/cmds/ocm/commands/ocmcmds/components/hash/cmd_test.go b/cmds/ocm/commands/ocmcmds/components/hash/cmd_test.go
index 45e037a7e..baa23fd4c 100644
--- a/cmds/ocm/commands/ocmcmds/components/hash/cmd_test.go
+++ b/cmds/ocm/commands/ocmcmds/components/hash/cmd_test.go
@@ -6,13 +6,13 @@ import (
. "github.com/mandelsoft/goutils/testutils"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
- . "github.com/open-component-model/ocm/cmds/ocm/testhelper"
+ . "ocm.software/ocm/cmds/ocm/testhelper"
- "github.com/open-component-model/ocm/pkg/common/accessio"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc"
- metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/resourcetypes"
- "github.com/open-component-model/ocm/pkg/mime"
+ "ocm.software/ocm/api/ocm/compdesc"
+ metav1 "ocm.software/ocm/api/ocm/compdesc/meta/v1"
+ resourcetypes "ocm.software/ocm/api/ocm/extensions/artifacttypes"
+ "ocm.software/ocm/api/utils/accessio"
+ "ocm.software/ocm/api/utils/mime"
)
const (
diff --git a/cmds/ocm/commands/ocmcmds/components/hash/options.go b/cmds/ocm/commands/ocmcmds/components/hash/options.go
index edc82961b..d3165c732 100644
--- a/cmds/ocm/commands/ocmcmds/components/hash/options.go
+++ b/cmds/ocm/commands/ocmcmds/components/hash/options.go
@@ -3,13 +3,13 @@ package hash
import (
"github.com/spf13/pflag"
- signingcmd "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/cmds/signing"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/hashoption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/lookupoption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/repooption"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/options"
- "github.com/open-component-model/ocm/pkg/common"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/signing"
+ "ocm.software/ocm/api/ocm/tools/signing"
+ common "ocm.software/ocm/api/utils/misc"
+ signingcmd "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/cmds/signing"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/hashoption"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/lookupoption"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/repooption"
+ "ocm.software/ocm/cmds/ocm/common/options"
)
func From(o options.OptionSetProvider) *Option {
diff --git a/cmds/ocm/commands/ocmcmds/components/list/cmd.go b/cmds/ocm/commands/ocmcmds/components/list/cmd.go
index 3d3b20652..647284454 100644
--- a/cmds/ocm/commands/ocmcmds/components/list/cmd.go
+++ b/cmds/ocm/commands/ocmcmds/components/list/cmd.go
@@ -5,19 +5,19 @@ import (
"github.com/spf13/cobra"
- ocmcommon "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/handlers/vershdlr"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/lookupoption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/repooption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/schemaoption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/versionconstraintsoption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/names"
- "github.com/open-component-model/ocm/cmds/ocm/commands/verbs"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/output"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/processing"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/ocm"
+ ocmcommon "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/handlers/vershdlr"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/lookupoption"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/repooption"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/schemaoption"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/versionconstraintsoption"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/names"
+ "ocm.software/ocm/cmds/ocm/commands/verbs"
+ "ocm.software/ocm/cmds/ocm/common/output"
+ "ocm.software/ocm/cmds/ocm/common/processing"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
var (
diff --git a/cmds/ocm/commands/ocmcmds/components/list/cmd_test.go b/cmds/ocm/commands/ocmcmds/components/list/cmd_test.go
index 09fc29368..d5a453deb 100644
--- a/cmds/ocm/commands/ocmcmds/components/list/cmd_test.go
+++ b/cmds/ocm/commands/ocmcmds/components/list/cmd_test.go
@@ -7,9 +7,9 @@ import (
. "github.com/mandelsoft/goutils/testutils"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
- . "github.com/open-component-model/ocm/cmds/ocm/testhelper"
+ . "ocm.software/ocm/cmds/ocm/testhelper"
- "github.com/open-component-model/ocm/pkg/common/accessio"
+ "ocm.software/ocm/api/utils/accessio"
)
const (
diff --git a/cmds/ocm/commands/ocmcmds/components/sign/cmd.go b/cmds/ocm/commands/ocmcmds/components/sign/cmd.go
index e38503bd3..682bf5a58 100644
--- a/cmds/ocm/commands/ocmcmds/components/sign/cmd.go
+++ b/cmds/ocm/commands/ocmcmds/components/sign/cmd.go
@@ -3,11 +3,11 @@ package sign
import (
"github.com/spf13/cobra"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/cmds/signing"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/names"
- "github.com/open-component-model/ocm/cmds/ocm/commands/verbs"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/cmds/signing"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/names"
+ "ocm.software/ocm/cmds/ocm/commands/verbs"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
var (
diff --git a/cmds/ocm/commands/ocmcmds/components/sign/cmd_test.go b/cmds/ocm/commands/ocmcmds/components/sign/cmd_test.go
index e8fdad0b6..df586218a 100644
--- a/cmds/ocm/commands/ocmcmds/components/sign/cmd_test.go
+++ b/cmds/ocm/commands/ocmcmds/components/sign/cmd_test.go
@@ -7,23 +7,23 @@ import (
. "github.com/mandelsoft/goutils/testutils"
. "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/contexts/oci/testhelper"
- . "github.com/open-component-model/ocm/pkg/contexts/ocm/testhelper"
+ . "ocm.software/ocm/api/oci/testhelper"
+ . "ocm.software/ocm/api/ocm/testhelper"
+ . "ocm.software/ocm/cmds/ocm/testhelper"
"github.com/mandelsoft/vfs/pkg/vfs"
- "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/datacontext"
- "github.com/open-component-model/ocm/pkg/contexts/oci"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/ociartifact"
- metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ctf"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/resourcetypes"
- "github.com/open-component-model/ocm/pkg/mime"
- "github.com/open-component-model/ocm/pkg/signing/handlers/rsa"
- "github.com/open-component-model/ocm/pkg/signing/signutils"
+ "ocm.software/ocm/api/datacontext"
+ "ocm.software/ocm/api/oci"
+ metav1 "ocm.software/ocm/api/ocm/compdesc/meta/v1"
+ "ocm.software/ocm/api/ocm/extensions/accessmethods/ociartifact"
+ resourcetypes "ocm.software/ocm/api/ocm/extensions/artifacttypes"
+ "ocm.software/ocm/api/ocm/extensions/repositories/ctf"
+ "ocm.software/ocm/api/tech/signing/handlers/rsa"
+ "ocm.software/ocm/api/tech/signing/signutils"
+ "ocm.software/ocm/api/utils/accessio"
+ "ocm.software/ocm/api/utils/accessobj"
+ "ocm.software/ocm/api/utils/mime"
)
const (
diff --git a/cmds/ocm/commands/ocmcmds/components/transfer/cmd.go b/cmds/ocm/commands/ocmcmds/components/transfer/cmd.go
index 30aa49688..805760dc0 100644
--- a/cmds/ocm/commands/ocmcmds/components/transfer/cmd.go
+++ b/cmds/ocm/commands/ocmcmds/components/transfer/cmd.go
@@ -10,33 +10,33 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/pflag"
- "github.com/open-component-model/ocm/cmds/ocm/commands/common/options/closureoption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/common/options/formatoption"
- ocmcommon "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/handlers/comphdlr"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/lookupoption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/omitaccesstypeoption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/overwriteoption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/repooption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/rscbyvalueoption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/scriptoption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/skipupdateoption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/srcbyvalueoption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/stoponexistingoption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/uploaderoption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/versionconstraintsoption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/names"
- "github.com/open-component-model/ocm/cmds/ocm/commands/verbs"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/options"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/output"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/common"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/transfer"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/transfer/transferhandler"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/transfer/transferhandler/spiff"
- "github.com/open-component-model/ocm/pkg/out"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/ocm"
+ "ocm.software/ocm/api/ocm/tools/transfer"
+ "ocm.software/ocm/api/ocm/tools/transfer/transferhandler"
+ "ocm.software/ocm/api/ocm/tools/transfer/transferhandler/spiff"
+ common "ocm.software/ocm/api/utils/misc"
+ "ocm.software/ocm/api/utils/out"
+ "ocm.software/ocm/cmds/ocm/commands/common/options/closureoption"
+ "ocm.software/ocm/cmds/ocm/commands/common/options/formatoption"
+ ocmcommon "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/handlers/comphdlr"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/lookupoption"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/omitaccesstypeoption"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/overwriteoption"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/repooption"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/rscbyvalueoption"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/scriptoption"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/skipupdateoption"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/srcbyvalueoption"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/stoponexistingoption"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/uploaderoption"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/versionconstraintsoption"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/names"
+ "ocm.software/ocm/cmds/ocm/commands/verbs"
+ "ocm.software/ocm/cmds/ocm/common/options"
+ "ocm.software/ocm/cmds/ocm/common/output"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
var (
diff --git a/cmds/ocm/commands/ocmcmds/components/transfer/cmd_test.go b/cmds/ocm/commands/ocmcmds/components/transfer/cmd_test.go
index 835f12c97..51948a7ad 100644
--- a/cmds/ocm/commands/ocmcmds/components/transfer/cmd_test.go
+++ b/cmds/ocm/commands/ocmcmds/components/transfer/cmd_test.go
@@ -7,27 +7,27 @@ import (
. "github.com/mandelsoft/goutils/testutils"
. "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/contexts/oci/testhelper"
+ . "ocm.software/ocm/api/oci/testhelper"
+ . "ocm.software/ocm/cmds/ocm/testhelper"
"github.com/spf13/cobra"
- "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/contexts/config/config"
- "github.com/open-component-model/ocm/pkg/contexts/oci"
- "github.com/open-component-model/ocm/pkg/contexts/oci/artdesc"
- "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/artifactset"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/ociartifact"
- metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1"
- ctfocm "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ctf"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/resourcetypes"
- handlercfg "github.com/open-component-model/ocm/pkg/contexts/ocm/transfer/transferhandler/config"
- ocmutils "github.com/open-component-model/ocm/pkg/contexts/ocm/utils"
- "github.com/open-component-model/ocm/pkg/mime"
- "github.com/open-component-model/ocm/pkg/utils"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/config/extensions/config"
+ "ocm.software/ocm/api/oci"
+ "ocm.software/ocm/api/oci/artdesc"
+ "ocm.software/ocm/api/oci/extensions/repositories/artifactset"
+ "ocm.software/ocm/api/ocm"
+ metav1 "ocm.software/ocm/api/ocm/compdesc/meta/v1"
+ "ocm.software/ocm/api/ocm/extensions/accessmethods/ociartifact"
+ resourcetypes "ocm.software/ocm/api/ocm/extensions/artifacttypes"
+ ctfocm "ocm.software/ocm/api/ocm/extensions/repositories/ctf"
+ ocmutils "ocm.software/ocm/api/ocm/ocmutils"
+ handlercfg "ocm.software/ocm/api/ocm/tools/transfer/transferhandler/config"
+ "ocm.software/ocm/api/utils"
+ "ocm.software/ocm/api/utils/accessio"
+ "ocm.software/ocm/api/utils/accessobj"
+ "ocm.software/ocm/api/utils/mime"
)
const (
diff --git a/cmds/ocm/commands/ocmcmds/components/transfer/disableupload_test.go b/cmds/ocm/commands/ocmcmds/components/transfer/disableupload_test.go
index 7bb791b0c..3a13c5fc9 100644
--- a/cmds/ocm/commands/ocmcmds/components/transfer/disableupload_test.go
+++ b/cmds/ocm/commands/ocmcmds/components/transfer/disableupload_test.go
@@ -6,22 +6,22 @@ import (
. "github.com/mandelsoft/goutils/testutils"
. "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/contexts/oci/testhelper"
-
- "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/oci"
- "github.com/open-component-model/ocm/pkg/contexts/oci/artdesc"
- ocictf "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/ctf"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/localblob"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/ociartifact"
- storagecontext "github.com/open-component-model/ocm/pkg/contexts/ocm/blobhandler/handlers/oci"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/blobhandler/handlers/oci/ocirepo"
- metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/cpi"
- ctfocm "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ctf"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/resourcetypes"
+ . "ocm.software/ocm/api/oci/testhelper"
+ . "ocm.software/ocm/cmds/ocm/testhelper"
+
+ "ocm.software/ocm/api/oci"
+ "ocm.software/ocm/api/oci/artdesc"
+ ocictf "ocm.software/ocm/api/oci/extensions/repositories/ctf"
+ metav1 "ocm.software/ocm/api/ocm/compdesc/meta/v1"
+ "ocm.software/ocm/api/ocm/cpi"
+ "ocm.software/ocm/api/ocm/extensions/accessmethods/localblob"
+ "ocm.software/ocm/api/ocm/extensions/accessmethods/ociartifact"
+ resourcetypes "ocm.software/ocm/api/ocm/extensions/artifacttypes"
+ storagecontext "ocm.software/ocm/api/ocm/extensions/blobhandler/handlers/oci"
+ "ocm.software/ocm/api/ocm/extensions/blobhandler/handlers/oci/ocirepo"
+ ctfocm "ocm.software/ocm/api/ocm/extensions/repositories/ctf"
+ "ocm.software/ocm/api/utils/accessio"
+ "ocm.software/ocm/api/utils/accessobj"
)
const BASEURL = "baseurl.io"
diff --git a/cmds/ocm/commands/ocmcmds/components/transfer/upload_test.go b/cmds/ocm/commands/ocmcmds/components/transfer/upload_test.go
index 53224d6c1..181793344 100644
--- a/cmds/ocm/commands/ocmcmds/components/transfer/upload_test.go
+++ b/cmds/ocm/commands/ocmcmds/components/transfer/upload_test.go
@@ -8,23 +8,23 @@ import (
. "github.com/mandelsoft/goutils/testutils"
. "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/contexts/oci/testhelper"
-
- "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/oci"
- "github.com/open-component-model/ocm/pkg/contexts/oci/grammar"
- ctfoci "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/ctf"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/ociartifact"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/attrs/ociuploadattr"
- v1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/comparch"
- ctfocm "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ctf"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/resourcetypes"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/transfer"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/transfer/transferhandler/standard"
- "github.com/open-component-model/ocm/pkg/mime"
+ . "ocm.software/ocm/api/oci/testhelper"
+ . "ocm.software/ocm/cmds/ocm/testhelper"
+
+ "ocm.software/ocm/api/oci"
+ ctfoci "ocm.software/ocm/api/oci/extensions/repositories/ctf"
+ "ocm.software/ocm/api/oci/grammar"
+ v1 "ocm.software/ocm/api/ocm/compdesc/meta/v1"
+ "ocm.software/ocm/api/ocm/extensions/accessmethods/ociartifact"
+ resourcetypes "ocm.software/ocm/api/ocm/extensions/artifacttypes"
+ "ocm.software/ocm/api/ocm/extensions/attrs/ociuploadattr"
+ "ocm.software/ocm/api/ocm/extensions/repositories/comparch"
+ ctfocm "ocm.software/ocm/api/ocm/extensions/repositories/ctf"
+ "ocm.software/ocm/api/ocm/tools/transfer"
+ "ocm.software/ocm/api/ocm/tools/transfer/transferhandler/standard"
+ "ocm.software/ocm/api/utils/accessio"
+ "ocm.software/ocm/api/utils/accessobj"
+ "ocm.software/ocm/api/utils/mime"
)
const (
diff --git a/cmds/ocm/commands/ocmcmds/components/verify/cmd.go b/cmds/ocm/commands/ocmcmds/components/verify/cmd.go
index 048452a19..c161a091c 100644
--- a/cmds/ocm/commands/ocmcmds/components/verify/cmd.go
+++ b/cmds/ocm/commands/ocmcmds/components/verify/cmd.go
@@ -3,11 +3,11 @@ package verify
import (
"github.com/spf13/cobra"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/cmds/signing"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/names"
- "github.com/open-component-model/ocm/cmds/ocm/commands/verbs"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/cmds/signing"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/names"
+ "ocm.software/ocm/cmds/ocm/commands/verbs"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
var (
diff --git a/cmds/ocm/commands/ocmcmds/components/verify/cmd_test.go b/cmds/ocm/commands/ocmcmds/components/verify/cmd_test.go
index 7e483b8a3..14e1dd409 100644
--- a/cmds/ocm/commands/ocmcmds/components/verify/cmd_test.go
+++ b/cmds/ocm/commands/ocmcmds/components/verify/cmd_test.go
@@ -7,25 +7,25 @@ import (
. "github.com/mandelsoft/goutils/testutils"
. "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/contexts/oci/testhelper"
- . "github.com/open-component-model/ocm/pkg/contexts/ocm/signing"
+ . "ocm.software/ocm/api/oci/testhelper"
+ . "ocm.software/ocm/api/ocm/tools/signing"
+ . "ocm.software/ocm/cmds/ocm/testhelper"
"github.com/mandelsoft/logging"
"github.com/mandelsoft/vfs/pkg/vfs"
- "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/datacontext"
- "github.com/open-component-model/ocm/pkg/contexts/oci"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/ociartifact"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/attrs/signingattr"
- metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ctf"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/resourcetypes"
- "github.com/open-component-model/ocm/pkg/mime"
- "github.com/open-component-model/ocm/pkg/signing/handlers/rsa"
+ "ocm.software/ocm/api/datacontext"
+ "ocm.software/ocm/api/oci"
+ "ocm.software/ocm/api/ocm"
+ metav1 "ocm.software/ocm/api/ocm/compdesc/meta/v1"
+ "ocm.software/ocm/api/ocm/extensions/accessmethods/ociartifact"
+ resourcetypes "ocm.software/ocm/api/ocm/extensions/artifacttypes"
+ "ocm.software/ocm/api/ocm/extensions/attrs/signingattr"
+ "ocm.software/ocm/api/ocm/extensions/repositories/ctf"
+ "ocm.software/ocm/api/tech/signing/handlers/rsa"
+ "ocm.software/ocm/api/utils/accessio"
+ "ocm.software/ocm/api/utils/accessobj"
+ "ocm.software/ocm/api/utils/mime"
)
const (
diff --git a/cmds/ocm/commands/ocmcmds/ctf/cmd.go b/cmds/ocm/commands/ocmcmds/ctf/cmd.go
index 657963d9a..c2c66daea 100644
--- a/cmds/ocm/commands/ocmcmds/ctf/cmd.go
+++ b/cmds/ocm/commands/ocmcmds/ctf/cmd.go
@@ -3,10 +3,10 @@ package ctf
import (
"github.com/spf13/cobra"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/ctf/transfer"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/names"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/ctf/transfer"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/names"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
var Names = names.CommonTransportArchive
diff --git a/cmds/ocm/commands/ocmcmds/ctf/transfer/cmd.go b/cmds/ocm/commands/ocmcmds/ctf/transfer/cmd.go
index d57aefdae..269183828 100644
--- a/cmds/ocm/commands/ocmcmds/ctf/transfer/cmd.go
+++ b/cmds/ocm/commands/ocmcmds/ctf/transfer/cmd.go
@@ -4,30 +4,30 @@ import (
"github.com/mandelsoft/goutils/errors"
"github.com/spf13/cobra"
- "github.com/open-component-model/ocm/cmds/ocm/commands/common/options/closureoption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/common/options/formatoption"
- ocmcommon "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/lookupoption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/omitaccesstypeoption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/overwriteoption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/rscbyvalueoption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/scriptoption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/skipupdateoption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/srcbyvalueoption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/stoponexistingoption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/uploaderoption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/names"
- "github.com/open-component-model/ocm/cmds/ocm/commands/verbs"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/options"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/common"
- "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/contexts/ocm"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ctf"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/transfer"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/transfer/transferhandler"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/transfer/transferhandler/spiff"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/ocm"
+ "ocm.software/ocm/api/ocm/extensions/repositories/ctf"
+ "ocm.software/ocm/api/ocm/tools/transfer"
+ "ocm.software/ocm/api/ocm/tools/transfer/transferhandler"
+ "ocm.software/ocm/api/ocm/tools/transfer/transferhandler/spiff"
+ "ocm.software/ocm/api/utils/accessobj"
+ common "ocm.software/ocm/api/utils/misc"
+ "ocm.software/ocm/cmds/ocm/commands/common/options/closureoption"
+ "ocm.software/ocm/cmds/ocm/commands/common/options/formatoption"
+ ocmcommon "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/lookupoption"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/omitaccesstypeoption"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/overwriteoption"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/rscbyvalueoption"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/scriptoption"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/skipupdateoption"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/srcbyvalueoption"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/stoponexistingoption"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/uploaderoption"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/names"
+ "ocm.software/ocm/cmds/ocm/commands/verbs"
+ "ocm.software/ocm/cmds/ocm/common/options"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
var (
diff --git a/cmds/ocm/commands/ocmcmds/ctf/transfer/cmd_test.go b/cmds/ocm/commands/ocmcmds/ctf/transfer/cmd_test.go
index 0075c3b0d..6fbb4906d 100644
--- a/cmds/ocm/commands/ocmcmds/ctf/transfer/cmd_test.go
+++ b/cmds/ocm/commands/ocmcmds/ctf/transfer/cmd_test.go
@@ -7,18 +7,18 @@ import (
. "github.com/mandelsoft/goutils/testutils"
. "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/contexts/oci/testhelper"
-
- "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/oci"
- "github.com/open-component-model/ocm/pkg/contexts/oci/artdesc"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/ociartifact"
- metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1"
- ctfocm "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ctf"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/resourcetypes"
- "github.com/open-component-model/ocm/pkg/mime"
+ . "ocm.software/ocm/api/oci/testhelper"
+ . "ocm.software/ocm/cmds/ocm/testhelper"
+
+ "ocm.software/ocm/api/oci"
+ "ocm.software/ocm/api/oci/artdesc"
+ metav1 "ocm.software/ocm/api/ocm/compdesc/meta/v1"
+ "ocm.software/ocm/api/ocm/extensions/accessmethods/ociartifact"
+ resourcetypes "ocm.software/ocm/api/ocm/extensions/artifacttypes"
+ ctfocm "ocm.software/ocm/api/ocm/extensions/repositories/ctf"
+ "ocm.software/ocm/api/utils/accessio"
+ "ocm.software/ocm/api/utils/accessobj"
+ "ocm.software/ocm/api/utils/mime"
)
const (
diff --git a/cmds/ocm/commands/ocmcmds/init.go b/cmds/ocm/commands/ocmcmds/init.go
index aa571e56c..d4919614f 100644
--- a/cmds/ocm/commands/ocmcmds/init.go
+++ b/cmds/ocm/commands/ocmcmds/init.go
@@ -1,5 +1,5 @@
package ocmcmds
import (
- _ "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/types"
+ _ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs/types"
)
diff --git a/cmds/ocm/commands/ocmcmds/plugins/cmd.go b/cmds/ocm/commands/ocmcmds/plugins/cmd.go
index e7b3bb929..5b7a8e823 100644
--- a/cmds/ocm/commands/ocmcmds/plugins/cmd.go
+++ b/cmds/ocm/commands/ocmcmds/plugins/cmd.go
@@ -3,12 +3,12 @@ package plugins
import (
"github.com/spf13/cobra"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/names"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/plugins/describe"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/plugins/get"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/plugins/install"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/names"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/plugins/describe"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/plugins/get"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/plugins/install"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
var Names = names.Plugins
diff --git a/cmds/ocm/commands/ocmcmds/plugins/describe/cmd.go b/cmds/ocm/commands/ocmcmds/plugins/describe/cmd.go
index ea568cf15..e65d06c0e 100644
--- a/cmds/ocm/commands/ocmcmds/plugins/describe/cmd.go
+++ b/cmds/ocm/commands/ocmcmds/plugins/describe/cmd.go
@@ -5,13 +5,13 @@ import (
"github.com/spf13/cobra"
- handler "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/handlers/pluginhdlr"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/names"
- "github.com/open-component-model/ocm/cmds/ocm/commands/verbs"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/cobrautils"
- "github.com/open-component-model/ocm/pkg/common"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/utils/cobrautils"
+ common "ocm.software/ocm/api/utils/misc"
+ handler "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/handlers/pluginhdlr"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/names"
+ "ocm.software/ocm/cmds/ocm/commands/verbs"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
var (
diff --git a/cmds/ocm/commands/ocmcmds/plugins/describe/cmd_test.go b/cmds/ocm/commands/ocmcmds/plugins/describe/cmd_test.go
index 28e6c866e..3c7dd03c4 100644
--- a/cmds/ocm/commands/ocmcmds/plugins/describe/cmd_test.go
+++ b/cmds/ocm/commands/ocmcmds/plugins/describe/cmd_test.go
@@ -8,8 +8,8 @@ import (
. "github.com/mandelsoft/goutils/testutils"
. "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/contexts/ocm/plugin/testutils"
+ . "ocm.software/ocm/api/ocm/plugin/testutils"
+ . "ocm.software/ocm/cmds/ocm/testhelper"
)
const PLUGINS = "/testdata"
diff --git a/cmds/ocm/commands/ocmcmds/plugins/describe/describe.go b/cmds/ocm/commands/ocmcmds/plugins/describe/describe.go
index 8bd6969f7..bc667eac5 100644
--- a/cmds/ocm/commands/ocmcmds/plugins/describe/describe.go
+++ b/cmds/ocm/commands/ocmcmds/plugins/describe/describe.go
@@ -3,9 +3,9 @@ package describe
import (
"encoding/json"
- "github.com/open-component-model/ocm/pkg/common"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/plugin"
- plugincommon "github.com/open-component-model/ocm/pkg/contexts/ocm/plugin/common"
+ "ocm.software/ocm/api/ocm/plugin"
+ plugincommon "ocm.software/ocm/api/ocm/plugin/common"
+ common "ocm.software/ocm/api/utils/misc"
)
func DescribePlugin(p plugin.Plugin, out common.Printer) {
diff --git a/cmds/ocm/commands/ocmcmds/plugins/get/cmd.go b/cmds/ocm/commands/ocmcmds/plugins/get/cmd.go
index 18da58a2a..8f8edee00 100644
--- a/cmds/ocm/commands/ocmcmds/plugins/get/cmd.go
+++ b/cmds/ocm/commands/ocmcmds/plugins/get/cmd.go
@@ -8,16 +8,16 @@ import (
"github.com/mandelsoft/goutils/set"
"github.com/spf13/cobra"
- handler "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/handlers/pluginhdlr"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/names"
- "github.com/open-component-model/ocm/cmds/ocm/commands/verbs"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/output"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/processing"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/plugin"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/plugin/common"
- utils2 "github.com/open-component-model/ocm/pkg/utils"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/ocm/plugin"
+ "ocm.software/ocm/api/ocm/plugin/common"
+ utils2 "ocm.software/ocm/api/utils"
+ handler "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/handlers/pluginhdlr"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/names"
+ "ocm.software/ocm/cmds/ocm/commands/verbs"
+ "ocm.software/ocm/cmds/ocm/common/output"
+ "ocm.software/ocm/cmds/ocm/common/processing"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
var (
diff --git a/cmds/ocm/commands/ocmcmds/plugins/get/cmd_test.go b/cmds/ocm/commands/ocmcmds/plugins/get/cmd_test.go
index 4ffb886a3..92af1c7f9 100644
--- a/cmds/ocm/commands/ocmcmds/plugins/get/cmd_test.go
+++ b/cmds/ocm/commands/ocmcmds/plugins/get/cmd_test.go
@@ -8,8 +8,8 @@ import (
. "github.com/mandelsoft/goutils/testutils"
. "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/contexts/ocm/plugin/testutils"
+ . "ocm.software/ocm/api/ocm/plugin/testutils"
+ . "ocm.software/ocm/cmds/ocm/testhelper"
)
const PLUGINS = "/testdata"
diff --git a/cmds/ocm/commands/ocmcmds/plugins/install/cmd.go b/cmds/ocm/commands/ocmcmds/plugins/install/cmd.go
index d39692ef1..51403dba7 100644
--- a/cmds/ocm/commands/ocmcmds/plugins/install/cmd.go
+++ b/cmds/ocm/commands/ocmcmds/plugins/install/cmd.go
@@ -7,19 +7,19 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/pflag"
- ocmcommon "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/handlers/pluginhdlr"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/repooption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/names"
- "github.com/open-component-model/ocm/cmds/ocm/commands/verbs"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/cobrautils/flag"
- "github.com/open-component-model/ocm/pkg/common"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/attrs/plugincacheattr"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/plugin/cache"
- "github.com/open-component-model/ocm/pkg/out"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/ocm"
+ "ocm.software/ocm/api/ocm/extensions/attrs/plugincacheattr"
+ "ocm.software/ocm/api/ocm/plugin/cache"
+ "ocm.software/ocm/api/utils/cobrautils/flag"
+ common "ocm.software/ocm/api/utils/misc"
+ "ocm.software/ocm/api/utils/out"
+ ocmcommon "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/handlers/pluginhdlr"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/repooption"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/names"
+ "ocm.software/ocm/cmds/ocm/commands/verbs"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
var (
diff --git a/cmds/ocm/commands/ocmcmds/plugins/tests/accessmethods/cmd_test.go b/cmds/ocm/commands/ocmcmds/plugins/tests/accessmethods/cmd_test.go
index d6f3c973b..bd316ea2d 100644
--- a/cmds/ocm/commands/ocmcmds/plugins/tests/accessmethods/cmd_test.go
+++ b/cmds/ocm/commands/ocmcmds/plugins/tests/accessmethods/cmd_test.go
@@ -6,16 +6,16 @@ import (
. "github.com/mandelsoft/goutils/testutils"
. "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/contexts/ocm/plugin/testutils"
+ . "ocm.software/ocm/api/ocm/plugin/testutils"
+ . "ocm.software/ocm/cmds/ocm/testhelper"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc"
- metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/cpi"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/plugin/plugins"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/registration"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/comparch"
+ "ocm.software/ocm/api/ocm"
+ "ocm.software/ocm/api/ocm/compdesc"
+ metav1 "ocm.software/ocm/api/ocm/compdesc/meta/v1"
+ "ocm.software/ocm/api/ocm/cpi"
+ "ocm.software/ocm/api/ocm/extensions/repositories/comparch"
+ "ocm.software/ocm/api/ocm/plugin/plugins"
+ "ocm.software/ocm/api/ocm/plugin/registration"
)
const (
diff --git a/cmds/ocm/commands/ocmcmds/plugins/tests/routingslips/cmd_test.go b/cmds/ocm/commands/ocmcmds/plugins/tests/routingslips/cmd_test.go
index 4d8ac3574..ae99f10e9 100644
--- a/cmds/ocm/commands/ocmcmds/plugins/tests/routingslips/cmd_test.go
+++ b/cmds/ocm/commands/ocmcmds/plugins/tests/routingslips/cmd_test.go
@@ -6,15 +6,15 @@ import (
. "github.com/mandelsoft/goutils/testutils"
. "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/contexts/ocm/plugin/testutils"
+ . "ocm.software/ocm/api/ocm/plugin/testutils"
+ . "ocm.software/ocm/cmds/ocm/testhelper"
- "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/attrs/plugincacheattr"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/labels/routingslip"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/registration"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ctf"
+ "ocm.software/ocm/api/ocm/extensions/attrs/plugincacheattr"
+ "ocm.software/ocm/api/ocm/extensions/labels/routingslip"
+ "ocm.software/ocm/api/ocm/extensions/repositories/ctf"
+ "ocm.software/ocm/api/ocm/plugin/registration"
+ "ocm.software/ocm/api/utils/accessio"
+ "ocm.software/ocm/api/utils/accessobj"
)
const (
diff --git a/cmds/ocm/commands/ocmcmds/pubsub/cmd.go b/cmds/ocm/commands/ocmcmds/pubsub/cmd.go
index 478e40da3..2beb43c93 100644
--- a/cmds/ocm/commands/ocmcmds/pubsub/cmd.go
+++ b/cmds/ocm/commands/ocmcmds/pubsub/cmd.go
@@ -3,11 +3,11 @@ package pubsub
import (
"github.com/spf13/cobra"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/names"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/pubsub/get"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/pubsub/set"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/names"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/pubsub/get"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/pubsub/set"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
var Names = names.PubSub
diff --git a/cmds/ocm/commands/ocmcmds/pubsub/get/cmd.go b/cmds/ocm/commands/ocmcmds/pubsub/get/cmd.go
index c314bb608..94c36e614 100644
--- a/cmds/ocm/commands/ocmcmds/pubsub/get/cmd.go
+++ b/cmds/ocm/commands/ocmcmds/pubsub/get/cmd.go
@@ -6,15 +6,15 @@ import (
"github.com/mandelsoft/goutils/sliceutils"
"github.com/spf13/cobra"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/names"
- "github.com/open-component-model/ocm/cmds/ocm/commands/verbs"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/output"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/processing"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/cpi"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/pubsub"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/ocm"
+ "ocm.software/ocm/api/ocm/cpi"
+ "ocm.software/ocm/api/ocm/extensions/pubsub"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/names"
+ "ocm.software/ocm/cmds/ocm/commands/verbs"
+ "ocm.software/ocm/cmds/ocm/common/output"
+ "ocm.software/ocm/cmds/ocm/common/processing"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
var (
diff --git a/cmds/ocm/commands/ocmcmds/pubsub/get/cmd_test.go b/cmds/ocm/commands/ocmcmds/pubsub/get/cmd_test.go
index 7f55a5fc2..7dab7842a 100644
--- a/cmds/ocm/commands/ocmcmds/pubsub/get/cmd_test.go
+++ b/cmds/ocm/commands/ocmcmds/pubsub/get/cmd_test.go
@@ -7,14 +7,14 @@ import (
. "github.com/mandelsoft/goutils/testutils"
. "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/common/accessio"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/pubsub"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/pubsub/providers/ocireg"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ctf"
- "github.com/open-component-model/ocm/pkg/runtime"
+ . "ocm.software/ocm/cmds/ocm/testhelper"
+
+ "ocm.software/ocm/api/ocm"
+ "ocm.software/ocm/api/ocm/extensions/pubsub"
+ "ocm.software/ocm/api/ocm/extensions/pubsub/providers/ocireg"
+ "ocm.software/ocm/api/ocm/extensions/repositories/ctf"
+ "ocm.software/ocm/api/utils/accessio"
+ "ocm.software/ocm/api/utils/runtime"
)
const (
diff --git a/cmds/ocm/commands/ocmcmds/pubsub/set/cmd.go b/cmds/ocm/commands/ocmcmds/pubsub/set/cmd.go
index ae958e84a..e49f68323 100644
--- a/cmds/ocm/commands/ocmcmds/pubsub/set/cmd.go
+++ b/cmds/ocm/commands/ocmcmds/pubsub/set/cmd.go
@@ -6,15 +6,15 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/pflag"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/names"
- "github.com/open-component-model/ocm/cmds/ocm/commands/verbs"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/cpi"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/pubsub"
- "github.com/open-component-model/ocm/pkg/out"
- utils2 "github.com/open-component-model/ocm/pkg/utils"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/ocm"
+ "ocm.software/ocm/api/ocm/cpi"
+ "ocm.software/ocm/api/ocm/extensions/pubsub"
+ utils2 "ocm.software/ocm/api/utils"
+ "ocm.software/ocm/api/utils/out"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/names"
+ "ocm.software/ocm/cmds/ocm/commands/verbs"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
var (
diff --git a/cmds/ocm/commands/ocmcmds/pubsub/set/cmd_test.go b/cmds/ocm/commands/ocmcmds/pubsub/set/cmd_test.go
index 1c27c943f..3c7a71b7d 100644
--- a/cmds/ocm/commands/ocmcmds/pubsub/set/cmd_test.go
+++ b/cmds/ocm/commands/ocmcmds/pubsub/set/cmd_test.go
@@ -8,14 +8,14 @@ import (
. "github.com/mandelsoft/goutils/testutils"
. "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/common/accessio"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/pubsub"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/pubsub/providers/ocireg"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ctf"
- "github.com/open-component-model/ocm/pkg/runtime"
+ . "ocm.software/ocm/cmds/ocm/testhelper"
+
+ "ocm.software/ocm/api/ocm"
+ "ocm.software/ocm/api/ocm/extensions/pubsub"
+ "ocm.software/ocm/api/ocm/extensions/pubsub/providers/ocireg"
+ "ocm.software/ocm/api/ocm/extensions/repositories/ctf"
+ "ocm.software/ocm/api/utils/accessio"
+ "ocm.software/ocm/api/utils/runtime"
)
const ARCH = "ctf"
diff --git a/cmds/ocm/commands/ocmcmds/references/add/cmd.go b/cmds/ocm/commands/ocmcmds/references/add/cmd.go
index 77f2952c9..89e44388f 100644
--- a/cmds/ocm/commands/ocmcmds/references/add/cmd.go
+++ b/cmds/ocm/commands/ocmcmds/references/add/cmd.go
@@ -3,14 +3,14 @@ package add
import (
"github.com/spf13/cobra"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/addhdlrs"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/addhdlrs/refs"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/names"
- "github.com/open-component-model/ocm/cmds/ocm/commands/verbs"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
- "github.com/open-component-model/ocm/pkg/utils/template"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/utils/template"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/addhdlrs"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/addhdlrs/refs"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/names"
+ "ocm.software/ocm/cmds/ocm/commands/verbs"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
var (
diff --git a/cmds/ocm/commands/ocmcmds/references/add/cmd_test.go b/cmds/ocm/commands/ocmcmds/references/add/cmd_test.go
index 45bd0774b..cde4c0db6 100644
--- a/cmds/ocm/commands/ocmcmds/references/add/cmd_test.go
+++ b/cmds/ocm/commands/ocmcmds/references/add/cmd_test.go
@@ -5,13 +5,13 @@ import (
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
- . "github.com/open-component-model/ocm/cmds/ocm/testhelper"
+ . "ocm.software/ocm/cmds/ocm/testhelper"
"github.com/mandelsoft/goutils/testutils"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc"
- metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/comparch"
+ "ocm.software/ocm/api/ocm/compdesc"
+ metav1 "ocm.software/ocm/api/ocm/compdesc/meta/v1"
+ "ocm.software/ocm/api/ocm/extensions/repositories/comparch"
)
const (
diff --git a/cmds/ocm/commands/ocmcmds/references/add/provider.go b/cmds/ocm/commands/ocmcmds/references/add/provider.go
index a0a948c58..f1fd431dc 100644
--- a/cmds/ocm/commands/ocmcmds/references/add/provider.go
+++ b/cmds/ocm/commands/ocmcmds/references/add/provider.go
@@ -3,9 +3,9 @@ package add
import (
"encoding/json"
- ocmcomm "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/addhdlrs"
- "github.com/open-component-model/ocm/pkg/cobrautils/flagsets"
+ "ocm.software/ocm/api/utils/cobrautils/flagsets"
+ ocmcomm "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/addhdlrs"
)
type ReferenceResourceSpecificationProvider struct {
diff --git a/cmds/ocm/commands/ocmcmds/references/cmd.go b/cmds/ocm/commands/ocmcmds/references/cmd.go
index 798a0503b..c04fd090c 100644
--- a/cmds/ocm/commands/ocmcmds/references/cmd.go
+++ b/cmds/ocm/commands/ocmcmds/references/cmd.go
@@ -3,11 +3,11 @@ package references
import (
"github.com/spf13/cobra"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/names"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/references/add"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/references/get"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/names"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/references/add"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/references/get"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
var Names = names.References
diff --git a/cmds/ocm/commands/ocmcmds/references/common/typehandler.go b/cmds/ocm/commands/ocmcmds/references/common/typehandler.go
index 1d603f50c..5bb267644 100644
--- a/cmds/ocm/commands/ocmcmds/references/common/typehandler.go
+++ b/cmds/ocm/commands/ocmcmds/references/common/typehandler.go
@@ -1,12 +1,12 @@
package common
import (
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/handlers/elemhdlr"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/output"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/ocm"
+ "ocm.software/ocm/api/ocm/compdesc"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/handlers/elemhdlr"
+ "ocm.software/ocm/cmds/ocm/common/output"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
func Elem(e interface{}) *compdesc.ComponentReference {
diff --git a/cmds/ocm/commands/ocmcmds/references/get/cmd.go b/cmds/ocm/commands/ocmcmds/references/get/cmd.go
index 3f61c030b..ce56a5f10 100644
--- a/cmds/ocm/commands/ocmcmds/references/get/cmd.go
+++ b/cmds/ocm/commands/ocmcmds/references/get/cmd.go
@@ -3,22 +3,22 @@ package get
import (
"github.com/spf13/cobra"
- "github.com/open-component-model/ocm/cmds/ocm/commands/common/options/closureoption"
- ocmcommon "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/handlers/elemhdlr"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/lookupoption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/repooption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/versionconstraintsoption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/names"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/references/common"
- "github.com/open-component-model/ocm/cmds/ocm/commands/verbs"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/data"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/output"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/processing"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
- metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/ocm"
+ metav1 "ocm.software/ocm/api/ocm/compdesc/meta/v1"
+ "ocm.software/ocm/cmds/ocm/commands/common/options/closureoption"
+ ocmcommon "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/handlers/elemhdlr"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/lookupoption"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/repooption"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/versionconstraintsoption"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/names"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/references/common"
+ "ocm.software/ocm/cmds/ocm/commands/verbs"
+ "ocm.software/ocm/cmds/ocm/common/data"
+ "ocm.software/ocm/cmds/ocm/common/output"
+ "ocm.software/ocm/cmds/ocm/common/processing"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
var (
diff --git a/cmds/ocm/commands/ocmcmds/references/get/cmd_test.go b/cmds/ocm/commands/ocmcmds/references/get/cmd_test.go
index 873347e84..d35fdf631 100644
--- a/cmds/ocm/commands/ocmcmds/references/get/cmd_test.go
+++ b/cmds/ocm/commands/ocmcmds/references/get/cmd_test.go
@@ -6,9 +6,9 @@ import (
. "github.com/mandelsoft/goutils/testutils"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
- . "github.com/open-component-model/ocm/cmds/ocm/testhelper"
+ . "ocm.software/ocm/cmds/ocm/testhelper"
- "github.com/open-component-model/ocm/pkg/common/accessio"
+ "ocm.software/ocm/api/utils/accessio"
)
const (
diff --git a/cmds/ocm/commands/ocmcmds/resourceconfig/add/cmd.go b/cmds/ocm/commands/ocmcmds/resourceconfig/add/cmd.go
index 826cc8278..f4d32c2f1 100644
--- a/cmds/ocm/commands/ocmcmds/resourceconfig/add/cmd.go
+++ b/cmds/ocm/commands/ocmcmds/resourceconfig/add/cmd.go
@@ -3,16 +3,16 @@ package add
import (
"github.com/spf13/cobra"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/addhdlrs/rscs"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/names"
- rscadd "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/resources/add"
- "github.com/open-component-model/ocm/cmds/ocm/commands/verbs"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
- "github.com/open-component-model/ocm/pkg/utils/template"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/ocm"
+ "ocm.software/ocm/api/utils/template"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/addhdlrs/rscs"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/names"
+ rscadd "ocm.software/ocm/cmds/ocm/commands/ocmcmds/resources/add"
+ "ocm.software/ocm/cmds/ocm/commands/verbs"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
var (
diff --git a/cmds/ocm/commands/ocmcmds/resourceconfig/add/cmd_test.go b/cmds/ocm/commands/ocmcmds/resourceconfig/add/cmd_test.go
index b3b7b812d..2262dfa41 100644
--- a/cmds/ocm/commands/ocmcmds/resourceconfig/add/cmd_test.go
+++ b/cmds/ocm/commands/ocmcmds/resourceconfig/add/cmd_test.go
@@ -3,7 +3,7 @@ package add_test
import (
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
- . "github.com/open-component-model/ocm/cmds/ocm/testhelper"
+ . "ocm.software/ocm/cmds/ocm/testhelper"
"github.com/mandelsoft/goutils/testutils"
)
diff --git a/cmds/ocm/commands/ocmcmds/resourceconfig/cmd.go b/cmds/ocm/commands/ocmcmds/resourceconfig/cmd.go
index 9aff8887e..6eb6266a1 100644
--- a/cmds/ocm/commands/ocmcmds/resourceconfig/cmd.go
+++ b/cmds/ocm/commands/ocmcmds/resourceconfig/cmd.go
@@ -3,10 +3,10 @@ package resourceconfig
import (
"github.com/spf13/cobra"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/names"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/resourceconfig/add"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/names"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/resourceconfig/add"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
var Names = names.ResourceConfig
diff --git a/cmds/ocm/commands/ocmcmds/resources/add/cmd.go b/cmds/ocm/commands/ocmcmds/resources/add/cmd.go
index 67f6d4b27..ffc430a9a 100644
--- a/cmds/ocm/commands/ocmcmds/resources/add/cmd.go
+++ b/cmds/ocm/commands/ocmcmds/resources/add/cmd.go
@@ -3,16 +3,16 @@ package add
import (
"github.com/spf13/cobra"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/addhdlrs"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/addhdlrs/rscs"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/names"
- "github.com/open-component-model/ocm/cmds/ocm/commands/verbs"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
- "github.com/open-component-model/ocm/pkg/utils/template"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/ocm"
+ "ocm.software/ocm/api/utils/template"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/addhdlrs"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/addhdlrs/rscs"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/names"
+ "ocm.software/ocm/cmds/ocm/commands/verbs"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
var (
diff --git a/cmds/ocm/commands/ocmcmds/resources/add/cmd_test.go b/cmds/ocm/commands/ocmcmds/resources/add/cmd_test.go
index 4d54b08c1..bc3284214 100644
--- a/cmds/ocm/commands/ocmcmds/resources/add/cmd_test.go
+++ b/cmds/ocm/commands/ocmcmds/resources/add/cmd_test.go
@@ -8,26 +8,26 @@ import (
. "github.com/mandelsoft/goutils/testutils"
. "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/contexts/oci/testhelper"
+ . "ocm.software/ocm/api/oci/testhelper"
+ . "ocm.software/ocm/cmds/ocm/testhelper"
"github.com/mandelsoft/vfs/pkg/vfs"
"github.com/opencontainers/go-digest"
"helm.sh/helm/v3/pkg/chart/loader"
- "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"
- "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/artifactset"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/localblob"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/ociartifact"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/options"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc"
- metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/comparch"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/resourcetypes"
- "github.com/open-component-model/ocm/pkg/mime"
+ "ocm.software/ocm/api/oci/extensions/repositories/artifactset"
+ "ocm.software/ocm/api/ocm/compdesc"
+ metav1 "ocm.software/ocm/api/ocm/compdesc/meta/v1"
+ "ocm.software/ocm/api/ocm/extensions/accessmethods/localblob"
+ "ocm.software/ocm/api/ocm/extensions/accessmethods/ociartifact"
+ "ocm.software/ocm/api/ocm/extensions/accessmethods/options"
+ resourcetypes "ocm.software/ocm/api/ocm/extensions/artifacttypes"
+ "ocm.software/ocm/api/ocm/extensions/repositories/comparch"
+ "ocm.software/ocm/api/utils/accessio"
+ "ocm.software/ocm/api/utils/accessobj"
+ "ocm.software/ocm/api/utils/blobaccess"
+ "ocm.software/ocm/api/utils/mime"
+ common "ocm.software/ocm/api/utils/misc"
)
const (
diff --git a/cmds/ocm/commands/ocmcmds/resources/add/provider.go b/cmds/ocm/commands/ocmcmds/resources/add/provider.go
index 5224a9bee..c0d12405c 100644
--- a/cmds/ocm/commands/ocmcmds/resources/add/provider.go
+++ b/cmds/ocm/commands/ocmcmds/resources/add/provider.go
@@ -1,10 +1,10 @@
package add
import (
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common"
- "github.com/open-component-model/ocm/pkg/cobrautils/flagsets"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
- metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1"
+ clictx "ocm.software/ocm/api/cli"
+ metav1 "ocm.software/ocm/api/ocm/compdesc/meta/v1"
+ "ocm.software/ocm/api/utils/cobrautils/flagsets"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common"
)
type ResourceSpecificationsProvider struct {
diff --git a/cmds/ocm/commands/ocmcmds/resources/cmd.go b/cmds/ocm/commands/ocmcmds/resources/cmd.go
index eab7809ec..07b3cc3dd 100644
--- a/cmds/ocm/commands/ocmcmds/resources/cmd.go
+++ b/cmds/ocm/commands/ocmcmds/resources/cmd.go
@@ -3,12 +3,12 @@ package resources
import (
"github.com/spf13/cobra"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/names"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/resources/add"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/resources/download"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/resources/get"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/names"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/resources/add"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/resources/download"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/resources/get"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
var Names = names.Resources
diff --git a/cmds/ocm/commands/ocmcmds/resources/common/typehandler.go b/cmds/ocm/commands/ocmcmds/resources/common/typehandler.go
index 3e57e12e3..648463d3c 100644
--- a/cmds/ocm/commands/ocmcmds/resources/common/typehandler.go
+++ b/cmds/ocm/commands/ocmcmds/resources/common/typehandler.go
@@ -1,12 +1,12 @@
package common
import (
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/handlers/elemhdlr"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/output"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/ocm"
+ "ocm.software/ocm/api/ocm/compdesc"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/handlers/elemhdlr"
+ "ocm.software/ocm/cmds/ocm/common/output"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
func Elem(e interface{}) *compdesc.Resource {
diff --git a/cmds/ocm/commands/ocmcmds/resources/download/action.go b/cmds/ocm/commands/ocmcmds/resources/download/action.go
index 98f1464e4..27d36e72a 100644
--- a/cmds/ocm/commands/ocmcmds/resources/download/action.go
+++ b/cmds/ocm/commands/ocmcmds/resources/download/action.go
@@ -9,16 +9,16 @@ import (
"github.com/mandelsoft/goutils/errors"
"github.com/mandelsoft/vfs/pkg/vfs"
- "github.com/open-component-model/ocm/cmds/ocm/commands/common/options/destoption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/handlers/elemhdlr"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/resources/common"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/options"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/output"
- common2 "github.com/open-component-model/ocm/pkg/common"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
- v1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/download"
- "github.com/open-component-model/ocm/pkg/out"
+ "ocm.software/ocm/api/ocm"
+ v1 "ocm.software/ocm/api/ocm/compdesc/meta/v1"
+ "ocm.software/ocm/api/ocm/extensions/download"
+ common2 "ocm.software/ocm/api/utils/misc"
+ "ocm.software/ocm/api/utils/out"
+ "ocm.software/ocm/cmds/ocm/commands/common/options/destoption"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/handlers/elemhdlr"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/resources/common"
+ "ocm.software/ocm/cmds/ocm/common/options"
+ "ocm.software/ocm/cmds/ocm/common/output"
)
////////////////////////////////////////////////////////////////////////////////
diff --git a/cmds/ocm/commands/ocmcmds/resources/download/cmd.go b/cmds/ocm/commands/ocmcmds/resources/download/cmd.go
index 38272f7a9..40cad63a8 100644
--- a/cmds/ocm/commands/ocmcmds/resources/download/cmd.go
+++ b/cmds/ocm/commands/ocmcmds/resources/download/cmd.go
@@ -6,24 +6,24 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/pflag"
- "github.com/open-component-model/ocm/cmds/ocm/commands/common/options/closureoption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/common/options/destoption"
- ocmcommon "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/handlers/elemhdlr"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/downloaderoption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/lookupoption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/repooption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/versionconstraintsoption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/names"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/resources/common"
- "github.com/open-component-model/ocm/cmds/ocm/commands/verbs"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/output"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
- v1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/extraid"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/resourcetypes"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/ocm"
+ v1 "ocm.software/ocm/api/ocm/compdesc/meta/v1"
+ resourcetypes "ocm.software/ocm/api/ocm/extensions/artifacttypes"
+ "ocm.software/ocm/api/ocm/extraid"
+ "ocm.software/ocm/cmds/ocm/commands/common/options/closureoption"
+ "ocm.software/ocm/cmds/ocm/commands/common/options/destoption"
+ ocmcommon "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/handlers/elemhdlr"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/downloaderoption"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/lookupoption"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/repooption"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/versionconstraintsoption"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/names"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/resources/common"
+ "ocm.software/ocm/cmds/ocm/commands/verbs"
+ "ocm.software/ocm/cmds/ocm/common/output"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
var (
diff --git a/cmds/ocm/commands/ocmcmds/resources/download/cmd_test.go b/cmds/ocm/commands/ocmcmds/resources/download/cmd_test.go
index c522a5429..f7ed44fe2 100644
--- a/cmds/ocm/commands/ocmcmds/resources/download/cmd_test.go
+++ b/cmds/ocm/commands/ocmcmds/resources/download/cmd_test.go
@@ -6,13 +6,13 @@ import (
. "github.com/mandelsoft/goutils/testutils"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
- . "github.com/open-component-model/ocm/cmds/ocm/testhelper"
+ . "ocm.software/ocm/cmds/ocm/testhelper"
"github.com/mandelsoft/vfs/pkg/vfs"
- "github.com/open-component-model/ocm/pkg/common/accessio"
- metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1"
- "github.com/open-component-model/ocm/pkg/mime"
+ metav1 "ocm.software/ocm/api/ocm/compdesc/meta/v1"
+ "ocm.software/ocm/api/utils/accessio"
+ "ocm.software/ocm/api/utils/mime"
)
const (
diff --git a/cmds/ocm/commands/ocmcmds/resources/download/dirtree_test.go b/cmds/ocm/commands/ocmcmds/resources/download/dirtree_test.go
index ab764316d..64df2827f 100644
--- a/cmds/ocm/commands/ocmcmds/resources/download/dirtree_test.go
+++ b/cmds/ocm/commands/ocmcmds/resources/download/dirtree_test.go
@@ -7,18 +7,18 @@ import (
. "github.com/mandelsoft/goutils/testutils"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
- . "github.com/open-component-model/ocm/cmds/ocm/testhelper"
+ . "ocm.software/ocm/cmds/ocm/testhelper"
"github.com/mandelsoft/vfs/pkg/projectionfs"
"github.com/mandelsoft/vfs/pkg/vfs"
ociv1 "github.com/opencontainers/image-spec/specs-go/v1"
- "github.com/open-component-model/ocm/pkg/common/accessio"
- "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/artifactset"
- metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/resourcetypes"
- env2 "github.com/open-component-model/ocm/pkg/env"
- "github.com/open-component-model/ocm/pkg/utils/tarutils"
+ env2 "ocm.software/ocm/api/helper/env"
+ "ocm.software/ocm/api/oci/extensions/repositories/artifactset"
+ metav1 "ocm.software/ocm/api/ocm/compdesc/meta/v1"
+ resourcetypes "ocm.software/ocm/api/ocm/extensions/artifacttypes"
+ "ocm.software/ocm/api/utils/accessio"
+ "ocm.software/ocm/api/utils/tarutils"
)
const (
diff --git a/cmds/ocm/commands/ocmcmds/resources/download/options.go b/cmds/ocm/commands/ocmcmds/resources/download/options.go
index a23a78f64..f411d4b4c 100644
--- a/cmds/ocm/commands/ocmcmds/resources/download/options.go
+++ b/cmds/ocm/commands/ocmcmds/resources/download/options.go
@@ -3,8 +3,8 @@ package download
import (
"github.com/spf13/pflag"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/output"
- "github.com/open-component-model/ocm/pkg/utils"
+ "ocm.software/ocm/api/utils"
+ "ocm.software/ocm/cmds/ocm/common/output"
)
func From(o *output.Options) *Option {
diff --git a/cmds/ocm/commands/ocmcmds/resources/get/cmd.go b/cmds/ocm/commands/ocmcmds/resources/get/cmd.go
index f5985d271..40265a6fc 100644
--- a/cmds/ocm/commands/ocmcmds/resources/get/cmd.go
+++ b/cmds/ocm/commands/ocmcmds/resources/get/cmd.go
@@ -4,21 +4,21 @@ import (
"github.com/mandelsoft/goutils/sliceutils"
"github.com/spf13/cobra"
- "github.com/open-component-model/ocm/cmds/ocm/commands/common/options/closureoption"
- ocmcommon "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/handlers/elemhdlr"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/lookupoption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/repooption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/versionconstraintsoption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/names"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/resources/common"
- "github.com/open-component-model/ocm/cmds/ocm/commands/verbs"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/output"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/processing"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
- metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/ocm"
+ metav1 "ocm.software/ocm/api/ocm/compdesc/meta/v1"
+ "ocm.software/ocm/cmds/ocm/commands/common/options/closureoption"
+ ocmcommon "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/handlers/elemhdlr"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/lookupoption"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/repooption"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/versionconstraintsoption"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/names"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/resources/common"
+ "ocm.software/ocm/cmds/ocm/commands/verbs"
+ "ocm.software/ocm/cmds/ocm/common/output"
+ "ocm.software/ocm/cmds/ocm/common/processing"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
var (
diff --git a/cmds/ocm/commands/ocmcmds/resources/get/cmd_test.go b/cmds/ocm/commands/ocmcmds/resources/get/cmd_test.go
index cceb039c7..3714de7cf 100644
--- a/cmds/ocm/commands/ocmcmds/resources/get/cmd_test.go
+++ b/cmds/ocm/commands/ocmcmds/resources/get/cmd_test.go
@@ -6,11 +6,11 @@ import (
. "github.com/mandelsoft/goutils/testutils"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
- . "github.com/open-component-model/ocm/cmds/ocm/testhelper"
+ . "ocm.software/ocm/cmds/ocm/testhelper"
- "github.com/open-component-model/ocm/pkg/common/accessio"
- metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1"
- "github.com/open-component-model/ocm/pkg/mime"
+ metav1 "ocm.software/ocm/api/ocm/compdesc/meta/v1"
+ "ocm.software/ocm/api/utils/accessio"
+ "ocm.software/ocm/api/utils/mime"
)
const (
diff --git a/cmds/ocm/commands/ocmcmds/resources/get/deep_test.go b/cmds/ocm/commands/ocmcmds/resources/get/deep_test.go
index 5074fbf3e..9ceef72e0 100644
--- a/cmds/ocm/commands/ocmcmds/resources/get/deep_test.go
+++ b/cmds/ocm/commands/ocmcmds/resources/get/deep_test.go
@@ -6,11 +6,11 @@ import (
. "github.com/mandelsoft/goutils/testutils"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
- . "github.com/open-component-model/ocm/cmds/ocm/testhelper"
+ . "ocm.software/ocm/cmds/ocm/testhelper"
- "github.com/open-component-model/ocm/pkg/common/accessio"
- metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1"
- "github.com/open-component-model/ocm/pkg/mime"
+ metav1 "ocm.software/ocm/api/ocm/compdesc/meta/v1"
+ "ocm.software/ocm/api/utils/accessio"
+ "ocm.software/ocm/api/utils/mime"
)
const (
diff --git a/cmds/ocm/commands/ocmcmds/routingslips/add/cmd.go b/cmds/ocm/commands/ocmcmds/routingslips/add/cmd.go
index 3ea5aa42c..21ecf271d 100644
--- a/cmds/ocm/commands/ocmcmds/routingslips/add/cmd.go
+++ b/cmds/ocm/commands/ocmcmds/routingslips/add/cmd.go
@@ -9,21 +9,21 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/pflag"
- ocmcommon "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/handlers/comphdlr"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/lookupoption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/repooption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/names"
- "github.com/open-component-model/ocm/cmds/ocm/commands/verbs"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/output"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/cobrautils/flagsets"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/labels/routingslip"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/labels/routingslip/spi"
- "github.com/open-component-model/ocm/pkg/runtime"
- "github.com/open-component-model/ocm/pkg/signing/handlers/rsa"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/ocm"
+ "ocm.software/ocm/api/ocm/extensions/labels/routingslip"
+ "ocm.software/ocm/api/ocm/extensions/labels/routingslip/spi"
+ "ocm.software/ocm/api/tech/signing/handlers/rsa"
+ "ocm.software/ocm/api/utils/cobrautils/flagsets"
+ "ocm.software/ocm/api/utils/runtime"
+ ocmcommon "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/handlers/comphdlr"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/lookupoption"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/repooption"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/names"
+ "ocm.software/ocm/cmds/ocm/commands/verbs"
+ "ocm.software/ocm/cmds/ocm/common/output"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
const (
diff --git a/cmds/ocm/commands/ocmcmds/routingslips/add/cmd_test.go b/cmds/ocm/commands/ocmcmds/routingslips/add/cmd_test.go
index 4c3e28583..5fbaa6e0c 100644
--- a/cmds/ocm/commands/ocmcmds/routingslips/add/cmd_test.go
+++ b/cmds/ocm/commands/ocmcmds/routingslips/add/cmd_test.go
@@ -6,13 +6,13 @@ import (
. "github.com/mandelsoft/goutils/testutils"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
- . "github.com/open-component-model/ocm/cmds/ocm/testhelper"
+ . "ocm.software/ocm/cmds/ocm/testhelper"
- "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/labels/routingslip"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/labels/routingslip/types/comment"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ctf"
+ "ocm.software/ocm/api/ocm/extensions/labels/routingslip"
+ "ocm.software/ocm/api/ocm/extensions/labels/routingslip/types/comment"
+ "ocm.software/ocm/api/ocm/extensions/repositories/ctf"
+ "ocm.software/ocm/api/utils/accessio"
+ "ocm.software/ocm/api/utils/accessobj"
)
const (
diff --git a/cmds/ocm/commands/ocmcmds/routingslips/cmd.go b/cmds/ocm/commands/ocmcmds/routingslips/cmd.go
index 3af64eca3..fdf4b8d67 100644
--- a/cmds/ocm/commands/ocmcmds/routingslips/cmd.go
+++ b/cmds/ocm/commands/ocmcmds/routingslips/cmd.go
@@ -3,11 +3,11 @@ package routingslips
import (
"github.com/spf13/cobra"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/names"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/routingslips/add"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/routingslips/get"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/names"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/routingslips/add"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/routingslips/get"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
var Names = names.RoutingSlips
diff --git a/cmds/ocm/commands/ocmcmds/routingslips/common/options.go b/cmds/ocm/commands/ocmcmds/routingslips/common/options.go
index f6d1039f2..a3f3ee1c9 100644
--- a/cmds/ocm/commands/ocmcmds/routingslips/common/options.go
+++ b/cmds/ocm/commands/ocmcmds/routingslips/common/options.go
@@ -3,12 +3,12 @@ package common
import (
"github.com/Masterminds/semver/v3"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/handlers/comphdlr"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/lookupoption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/versionconstraintsoption"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/options"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
- "github.com/open-component-model/ocm/pkg/utils"
+ "ocm.software/ocm/api/ocm"
+ "ocm.software/ocm/api/utils"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/handlers/comphdlr"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/lookupoption"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/versionconstraintsoption"
+ "ocm.software/ocm/cmds/ocm/common/options"
)
type Option interface {
diff --git a/cmds/ocm/commands/ocmcmds/routingslips/common/typehandler.go b/cmds/ocm/commands/ocmcmds/routingslips/common/typehandler.go
index 27f73da58..dfaa6fc60 100644
--- a/cmds/ocm/commands/ocmcmds/routingslips/common/typehandler.go
+++ b/cmds/ocm/commands/ocmcmds/routingslips/common/typehandler.go
@@ -5,13 +5,13 @@ import (
"github.com/mandelsoft/goutils/errors"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/handlers/comphdlr"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/output"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/labels/routingslip"
- utils2 "github.com/open-component-model/ocm/pkg/utils"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/ocm"
+ "ocm.software/ocm/api/ocm/extensions/labels/routingslip"
+ utils2 "ocm.software/ocm/api/utils"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/handlers/comphdlr"
+ "ocm.software/ocm/cmds/ocm/common/output"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
type Object struct {
diff --git a/cmds/ocm/commands/ocmcmds/routingslips/get/cmd.go b/cmds/ocm/commands/ocmcmds/routingslips/get/cmd.go
index 8ddfb92a8..d4e0979a1 100644
--- a/cmds/ocm/commands/ocmcmds/routingslips/get/cmd.go
+++ b/cmds/ocm/commands/ocmcmds/routingslips/get/cmd.go
@@ -6,19 +6,19 @@ import (
"github.com/spf13/cobra"
- "github.com/open-component-model/ocm/cmds/ocm/commands/common/options/failonerroroption"
- ocmcommon "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/lookupoption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/repooption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/versionconstraintsoption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/names"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/routingslips/common"
- "github.com/open-component-model/ocm/cmds/ocm/commands/verbs"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/output"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- common2 "github.com/open-component-model/ocm/pkg/common"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/ocm"
+ common2 "ocm.software/ocm/api/utils/misc"
+ "ocm.software/ocm/cmds/ocm/commands/common/options/failonerroroption"
+ ocmcommon "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/lookupoption"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/repooption"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/versionconstraintsoption"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/names"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/routingslips/common"
+ "ocm.software/ocm/cmds/ocm/commands/verbs"
+ "ocm.software/ocm/cmds/ocm/common/output"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
var (
diff --git a/cmds/ocm/commands/ocmcmds/routingslips/get/cmd_test.go b/cmds/ocm/commands/ocmcmds/routingslips/get/cmd_test.go
index 1c8fecc15..511e04ef2 100644
--- a/cmds/ocm/commands/ocmcmds/routingslips/get/cmd_test.go
+++ b/cmds/ocm/commands/ocmcmds/routingslips/get/cmd_test.go
@@ -7,16 +7,16 @@ import (
. "github.com/mandelsoft/goutils/testutils"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
- . "github.com/open-component-model/ocm/cmds/ocm/testhelper"
+ . "ocm.software/ocm/cmds/ocm/testhelper"
"github.com/mandelsoft/goutils/finalizer"
- "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/labels/routingslip"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/labels/routingslip/types/comment"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ctf"
- "github.com/open-component-model/ocm/pkg/signing/handlers/rsa"
+ "ocm.software/ocm/api/ocm/extensions/labels/routingslip"
+ "ocm.software/ocm/api/ocm/extensions/labels/routingslip/types/comment"
+ "ocm.software/ocm/api/ocm/extensions/repositories/ctf"
+ "ocm.software/ocm/api/tech/signing/handlers/rsa"
+ "ocm.software/ocm/api/utils/accessio"
+ "ocm.software/ocm/api/utils/accessobj"
)
const (
diff --git a/cmds/ocm/commands/ocmcmds/routingslips/get/options.go b/cmds/ocm/commands/ocmcmds/routingslips/get/options.go
index 2741cdc2d..22f49f0a9 100644
--- a/cmds/ocm/commands/ocmcmds/routingslips/get/options.go
+++ b/cmds/ocm/commands/ocmcmds/routingslips/get/options.go
@@ -3,7 +3,7 @@ package get
import (
"github.com/spf13/pflag"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/options"
+ "ocm.software/ocm/cmds/ocm/common/options"
)
func From(o options.OptionSetProvider) *Option {
diff --git a/cmds/ocm/commands/ocmcmds/sourceconfig/add/cmd.go b/cmds/ocm/commands/ocmcmds/sourceconfig/add/cmd.go
index 6dad2388b..5ff6aefe8 100644
--- a/cmds/ocm/commands/ocmcmds/sourceconfig/add/cmd.go
+++ b/cmds/ocm/commands/ocmcmds/sourceconfig/add/cmd.go
@@ -3,16 +3,16 @@ package add
import (
"github.com/spf13/cobra"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common"
- rscadd "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/addhdlrs/srcs"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/names"
- "github.com/open-component-model/ocm/cmds/ocm/commands/verbs"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/resourcetypes"
- "github.com/open-component-model/ocm/pkg/utils/template"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/ocm"
+ resourcetypes "ocm.software/ocm/api/ocm/extensions/artifacttypes"
+ "ocm.software/ocm/api/utils/template"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common"
+ rscadd "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/addhdlrs/srcs"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/names"
+ "ocm.software/ocm/cmds/ocm/commands/verbs"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
var (
@@ -40,7 +40,7 @@ func (o *Command) ForName(name string) *cobra.Command {
Args: cobra.MinimumNArgs(1),
Short: "add a source specification to a source config file",
Example: `
-$ ocm add source-config sources.yaml --name sources --type filesystem --access '{ "type": "gitHub", "repoUrl": "github.com/open-component-model/ocm", "commit": "xyz" }'
+$ ocm add source-config sources.yaml --name sources --type filesystem --access '{ "type": "gitHub", "repoUrl": "ocm.software/ocm", "commit": "xyz" }'
`,
}
}
diff --git a/cmds/ocm/commands/ocmcmds/sourceconfig/add/cmd_test.go b/cmds/ocm/commands/ocmcmds/sourceconfig/add/cmd_test.go
index 18b3d3088..89189d449 100644
--- a/cmds/ocm/commands/ocmcmds/sourceconfig/add/cmd_test.go
+++ b/cmds/ocm/commands/ocmcmds/sourceconfig/add/cmd_test.go
@@ -3,7 +3,7 @@ package add_test
import (
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
- . "github.com/open-component-model/ocm/cmds/ocm/testhelper"
+ . "ocm.software/ocm/cmds/ocm/testhelper"
"github.com/mandelsoft/goutils/testutils"
)
diff --git a/cmds/ocm/commands/ocmcmds/sourceconfig/cmd.go b/cmds/ocm/commands/ocmcmds/sourceconfig/cmd.go
index c89bbf405..dc5b490df 100644
--- a/cmds/ocm/commands/ocmcmds/sourceconfig/cmd.go
+++ b/cmds/ocm/commands/ocmcmds/sourceconfig/cmd.go
@@ -3,10 +3,10 @@ package sourceconfig
import (
"github.com/spf13/cobra"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/names"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/sourceconfig/add"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/names"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/sourceconfig/add"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
var Names = names.SourceConfig
diff --git a/cmds/ocm/commands/ocmcmds/sources/add/cmd.go b/cmds/ocm/commands/ocmcmds/sources/add/cmd.go
index db1874e13..6514c0062 100644
--- a/cmds/ocm/commands/ocmcmds/sources/add/cmd.go
+++ b/cmds/ocm/commands/ocmcmds/sources/add/cmd.go
@@ -3,16 +3,16 @@ package add
import (
"github.com/spf13/cobra"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/addhdlrs"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/addhdlrs/srcs"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/names"
- "github.com/open-component-model/ocm/cmds/ocm/commands/verbs"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
- "github.com/open-component-model/ocm/pkg/utils/template"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/ocm"
+ "ocm.software/ocm/api/utils/template"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/addhdlrs"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/addhdlrs/srcs"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/names"
+ "ocm.software/ocm/cmds/ocm/commands/verbs"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
var (
diff --git a/cmds/ocm/commands/ocmcmds/sources/add/cmd_test.go b/cmds/ocm/commands/ocmcmds/sources/add/cmd_test.go
index 334eb82ae..d0a8d8ccf 100644
--- a/cmds/ocm/commands/ocmcmds/sources/add/cmd_test.go
+++ b/cmds/ocm/commands/ocmcmds/sources/add/cmd_test.go
@@ -8,15 +8,15 @@ 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"
- metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/comparch"
- "github.com/open-component-model/ocm/pkg/mime"
+ . "ocm.software/ocm/cmds/ocm/testhelper"
+
+ "ocm.software/ocm/api/ocm/compdesc"
+ metav1 "ocm.software/ocm/api/ocm/compdesc/meta/v1"
+ "ocm.software/ocm/api/ocm/extensions/accessmethods/localblob"
+ "ocm.software/ocm/api/ocm/extensions/repositories/comparch"
+ "ocm.software/ocm/api/utils/blobaccess"
+ "ocm.software/ocm/api/utils/mime"
+ common "ocm.software/ocm/api/utils/misc"
)
const (
diff --git a/cmds/ocm/commands/ocmcmds/sources/cmd.go b/cmds/ocm/commands/ocmcmds/sources/cmd.go
index 19378385e..84535d614 100644
--- a/cmds/ocm/commands/ocmcmds/sources/cmd.go
+++ b/cmds/ocm/commands/ocmcmds/sources/cmd.go
@@ -3,11 +3,11 @@ package sources
import (
"github.com/spf13/cobra"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/names"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/sources/add"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/sources/get"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/names"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/sources/add"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/sources/get"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
var Names = names.Sources
diff --git a/cmds/ocm/commands/ocmcmds/sources/common/typehandler.go b/cmds/ocm/commands/ocmcmds/sources/common/typehandler.go
index 60f75806f..1442c6dbb 100644
--- a/cmds/ocm/commands/ocmcmds/sources/common/typehandler.go
+++ b/cmds/ocm/commands/ocmcmds/sources/common/typehandler.go
@@ -1,12 +1,12 @@
package common
import (
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/handlers/elemhdlr"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/output"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/ocm"
+ "ocm.software/ocm/api/ocm/compdesc"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/handlers/elemhdlr"
+ "ocm.software/ocm/cmds/ocm/common/output"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
func Elem(e interface{}) *compdesc.Source {
diff --git a/cmds/ocm/commands/ocmcmds/sources/get/cmd.go b/cmds/ocm/commands/ocmcmds/sources/get/cmd.go
index b0ce07a93..fa527f73a 100644
--- a/cmds/ocm/commands/ocmcmds/sources/get/cmd.go
+++ b/cmds/ocm/commands/ocmcmds/sources/get/cmd.go
@@ -4,21 +4,21 @@ import (
"github.com/mandelsoft/goutils/sliceutils"
"github.com/spf13/cobra"
- "github.com/open-component-model/ocm/cmds/ocm/commands/common/options/closureoption"
- ocmcommon "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/handlers/elemhdlr"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/lookupoption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/repooption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/versionconstraintsoption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/names"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/sources/common"
- "github.com/open-component-model/ocm/cmds/ocm/commands/verbs"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/output"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/processing"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
- metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/ocm"
+ metav1 "ocm.software/ocm/api/ocm/compdesc/meta/v1"
+ "ocm.software/ocm/cmds/ocm/commands/common/options/closureoption"
+ ocmcommon "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/handlers/elemhdlr"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/lookupoption"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/repooption"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/versionconstraintsoption"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/names"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/sources/common"
+ "ocm.software/ocm/cmds/ocm/commands/verbs"
+ "ocm.software/ocm/cmds/ocm/common/output"
+ "ocm.software/ocm/cmds/ocm/common/processing"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
var (
diff --git a/cmds/ocm/commands/ocmcmds/sources/get/cmd_test.go b/cmds/ocm/commands/ocmcmds/sources/get/cmd_test.go
index a092ab1fc..131846460 100644
--- a/cmds/ocm/commands/ocmcmds/sources/get/cmd_test.go
+++ b/cmds/ocm/commands/ocmcmds/sources/get/cmd_test.go
@@ -6,10 +6,10 @@ import (
. "github.com/mandelsoft/goutils/testutils"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
- . "github.com/open-component-model/ocm/cmds/ocm/testhelper"
+ . "ocm.software/ocm/cmds/ocm/testhelper"
- "github.com/open-component-model/ocm/pkg/common/accessio"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
+ "ocm.software/ocm/api/ocm"
+ "ocm.software/ocm/api/utils/accessio"
)
const (
diff --git a/cmds/ocm/commands/ocmcmds/versions/cmd.go b/cmds/ocm/commands/ocmcmds/versions/cmd.go
index b40031b0d..357851bdf 100644
--- a/cmds/ocm/commands/ocmcmds/versions/cmd.go
+++ b/cmds/ocm/commands/ocmcmds/versions/cmd.go
@@ -3,10 +3,10 @@ package versions
import (
"github.com/spf13/cobra"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/names"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/versions/show"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/names"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/versions/show"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
var Names = names.Versions
diff --git a/cmds/ocm/commands/ocmcmds/versions/show/cmd.go b/cmds/ocm/commands/ocmcmds/versions/show/cmd.go
index 0045375c0..c0322d732 100644
--- a/cmds/ocm/commands/ocmcmds/versions/show/cmd.go
+++ b/cmds/ocm/commands/ocmcmds/versions/show/cmd.go
@@ -6,15 +6,15 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/pflag"
- ocmcommon "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/repooption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/names"
- "github.com/open-component-model/ocm/cmds/ocm/commands/verbs"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
- "github.com/open-component-model/ocm/pkg/out"
- "github.com/open-component-model/ocm/pkg/semverutils"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/ocm"
+ "ocm.software/ocm/api/utils/out"
+ "ocm.software/ocm/api/utils/semverutils"
+ ocmcommon "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/repooption"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/names"
+ "ocm.software/ocm/cmds/ocm/commands/verbs"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
var (
diff --git a/cmds/ocm/commands/ocmcmds/versions/show/cmd_test.go b/cmds/ocm/commands/ocmcmds/versions/show/cmd_test.go
index 3218e5b6f..de16920f8 100644
--- a/cmds/ocm/commands/ocmcmds/versions/show/cmd_test.go
+++ b/cmds/ocm/commands/ocmcmds/versions/show/cmd_test.go
@@ -6,9 +6,9 @@ import (
. "github.com/mandelsoft/goutils/testutils"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
- . "github.com/open-component-model/ocm/cmds/ocm/testhelper"
+ . "ocm.software/ocm/cmds/ocm/testhelper"
- "github.com/open-component-model/ocm/pkg/common/accessio"
+ "ocm.software/ocm/api/utils/accessio"
)
const (
diff --git a/cmds/ocm/commands/plugin/cmd.go b/cmds/ocm/commands/plugin/cmd.go
index c226f221c..ceef4c19a 100644
--- a/cmds/ocm/commands/plugin/cmd.go
+++ b/cmds/ocm/commands/plugin/cmd.go
@@ -7,9 +7,9 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/pflag"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/plugin"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/ocm/plugin"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
type Command struct {
diff --git a/cmds/ocm/commands/toicmds/cmd.go b/cmds/ocm/commands/toicmds/cmd.go
index 33a3ee21c..9b3ec0e88 100644
--- a/cmds/ocm/commands/toicmds/cmd.go
+++ b/cmds/ocm/commands/toicmds/cmd.go
@@ -3,14 +3,14 @@ package toicmds
import (
"github.com/spf13/cobra"
- "github.com/open-component-model/ocm/cmds/ocm/commands/toicmds/config"
- _package "github.com/open-component-model/ocm/cmds/ocm/commands/toicmds/package"
- "github.com/open-component-model/ocm/cmds/ocm/commands/toicmds/verbs/bootstrap"
- "github.com/open-component-model/ocm/cmds/ocm/commands/toicmds/verbs/describe"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- topicocmrefs "github.com/open-component-model/ocm/cmds/ocm/topics/ocm/refs"
- topicbootstrap "github.com/open-component-model/ocm/cmds/ocm/topics/toi/bootstrapping"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/cmds/ocm/commands/toicmds/config"
+ _package "ocm.software/ocm/cmds/ocm/commands/toicmds/package"
+ "ocm.software/ocm/cmds/ocm/commands/toicmds/verbs/bootstrap"
+ "ocm.software/ocm/cmds/ocm/commands/toicmds/verbs/describe"
+ "ocm.software/ocm/cmds/ocm/common/utils"
+ topicocmrefs "ocm.software/ocm/cmds/ocm/topics/ocm/refs"
+ topicbootstrap "ocm.software/ocm/cmds/ocm/topics/toi/bootstrapping"
)
// NewCommand creates a new command.
diff --git a/cmds/ocm/commands/toicmds/config/bootstrap/cmd.go b/cmds/ocm/commands/toicmds/config/bootstrap/cmd.go
index bd1648533..db629eee5 100644
--- a/cmds/ocm/commands/toicmds/config/bootstrap/cmd.go
+++ b/cmds/ocm/commands/toicmds/config/bootstrap/cmd.go
@@ -10,29 +10,29 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/pflag"
- ocmcommon "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/handlers/comphdlr"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/lookupoption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/repooption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/toicmds/names"
- "github.com/open-component-model/ocm/cmds/ocm/commands/toicmds/package/bootstrap"
- "github.com/open-component-model/ocm/cmds/ocm/commands/verbs"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/output"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- topicbootstrap "github.com/open-component-model/ocm/cmds/ocm/topics/toi/bootstrapping"
- "github.com/open-component-model/ocm/pkg/common"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
- "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/ocireg"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/attrs/ociuploadattr"
- metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/download"
- utils2 "github.com/open-component-model/ocm/pkg/contexts/ocm/utils"
- "github.com/open-component-model/ocm/pkg/out"
- "github.com/open-component-model/ocm/pkg/runtime"
- "github.com/open-component-model/ocm/pkg/toi"
- "github.com/open-component-model/ocm/pkg/toi/install"
- utils3 "github.com/open-component-model/ocm/pkg/utils"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/oci/extensions/repositories/ocireg"
+ "ocm.software/ocm/api/ocm"
+ metav1 "ocm.software/ocm/api/ocm/compdesc/meta/v1"
+ "ocm.software/ocm/api/ocm/extensions/attrs/ociuploadattr"
+ "ocm.software/ocm/api/ocm/extensions/download"
+ utils2 "ocm.software/ocm/api/ocm/ocmutils"
+ "ocm.software/ocm/api/ocm/tools/toi"
+ "ocm.software/ocm/api/ocm/tools/toi/install"
+ utils3 "ocm.software/ocm/api/utils"
+ common "ocm.software/ocm/api/utils/misc"
+ "ocm.software/ocm/api/utils/out"
+ "ocm.software/ocm/api/utils/runtime"
+ ocmcommon "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/handlers/comphdlr"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/lookupoption"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/repooption"
+ "ocm.software/ocm/cmds/ocm/commands/toicmds/names"
+ "ocm.software/ocm/cmds/ocm/commands/toicmds/package/bootstrap"
+ "ocm.software/ocm/cmds/ocm/commands/verbs"
+ "ocm.software/ocm/cmds/ocm/common/output"
+ "ocm.software/ocm/cmds/ocm/common/utils"
+ topicbootstrap "ocm.software/ocm/cmds/ocm/topics/toi/bootstrapping"
)
const (
diff --git a/cmds/ocm/commands/toicmds/config/bootstrap/cmd_test.go b/cmds/ocm/commands/toicmds/config/bootstrap/cmd_test.go
index 678ae4c39..c64e87df6 100644
--- a/cmds/ocm/commands/toicmds/config/bootstrap/cmd_test.go
+++ b/cmds/ocm/commands/toicmds/config/bootstrap/cmd_test.go
@@ -6,15 +6,15 @@ import (
. "github.com/mandelsoft/goutils/testutils"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
- . "github.com/open-component-model/ocm/cmds/ocm/testhelper"
+ . "ocm.software/ocm/cmds/ocm/testhelper"
"github.com/mandelsoft/vfs/pkg/vfs"
- "github.com/open-component-model/ocm/cmds/ocm/commands/toicmds/config/bootstrap"
- "github.com/open-component-model/ocm/pkg/common/accessio"
- v1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1"
- "github.com/open-component-model/ocm/pkg/mime"
- "github.com/open-component-model/ocm/pkg/toi"
+ v1 "ocm.software/ocm/api/ocm/compdesc/meta/v1"
+ "ocm.software/ocm/api/ocm/tools/toi"
+ "ocm.software/ocm/api/utils/accessio"
+ "ocm.software/ocm/api/utils/mime"
+ "ocm.software/ocm/cmds/ocm/commands/toicmds/config/bootstrap"
)
const (
diff --git a/cmds/ocm/commands/toicmds/config/cmd.go b/cmds/ocm/commands/toicmds/config/cmd.go
index cb3d17403..11294ba0b 100644
--- a/cmds/ocm/commands/toicmds/config/cmd.go
+++ b/cmds/ocm/commands/toicmds/config/cmd.go
@@ -3,10 +3,10 @@ package config
import (
"github.com/spf13/cobra"
- "github.com/open-component-model/ocm/cmds/ocm/commands/toicmds/config/bootstrap"
- "github.com/open-component-model/ocm/cmds/ocm/commands/toicmds/names"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/cmds/ocm/commands/toicmds/config/bootstrap"
+ "ocm.software/ocm/cmds/ocm/commands/toicmds/names"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
var Names = names.Configuration
diff --git a/cmds/ocm/commands/toicmds/names/names.go b/cmds/ocm/commands/toicmds/names/names.go
index 4995b9975..b45274986 100644
--- a/cmds/ocm/commands/toicmds/names/names.go
+++ b/cmds/ocm/commands/toicmds/names/names.go
@@ -1,7 +1,7 @@
package names
import (
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/names"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/names"
)
var (
diff --git a/cmds/ocm/commands/toicmds/package/bootstrap/cmd.go b/cmds/ocm/commands/toicmds/package/bootstrap/cmd.go
index 601b16175..e77d0d67c 100644
--- a/cmds/ocm/commands/toicmds/package/bootstrap/cmd.go
+++ b/cmds/ocm/commands/toicmds/package/bootstrap/cmd.go
@@ -8,30 +8,30 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/pflag"
- ocmcommon "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/handlers/comphdlr"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/lookupoption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/repooption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/toicmds/names"
- "github.com/open-component-model/ocm/cmds/ocm/commands/verbs"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/output"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- topicbootstrap "github.com/open-component-model/ocm/cmds/ocm/topics/toi/bootstrapping"
- "github.com/open-component-model/ocm/pkg/blobaccess"
- "github.com/open-component-model/ocm/pkg/common"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
- "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/ocireg"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
- v1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1"
- "github.com/open-component-model/ocm/pkg/listformat"
- "github.com/open-component-model/ocm/pkg/out"
- "github.com/open-component-model/ocm/pkg/runtime"
- "github.com/open-component-model/ocm/pkg/toi"
- defaultd "github.com/open-component-model/ocm/pkg/toi/drivers/default"
- "github.com/open-component-model/ocm/pkg/toi/drivers/docker"
- "github.com/open-component-model/ocm/pkg/toi/drivers/filesystem"
- "github.com/open-component-model/ocm/pkg/toi/install"
- utils2 "github.com/open-component-model/ocm/pkg/utils"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/oci/extensions/repositories/ocireg"
+ "ocm.software/ocm/api/ocm"
+ v1 "ocm.software/ocm/api/ocm/compdesc/meta/v1"
+ "ocm.software/ocm/api/ocm/tools/toi"
+ defaultd "ocm.software/ocm/api/ocm/tools/toi/drivers/default"
+ "ocm.software/ocm/api/ocm/tools/toi/drivers/docker"
+ "ocm.software/ocm/api/ocm/tools/toi/drivers/filesystem"
+ "ocm.software/ocm/api/ocm/tools/toi/install"
+ utils2 "ocm.software/ocm/api/utils"
+ "ocm.software/ocm/api/utils/blobaccess"
+ "ocm.software/ocm/api/utils/listformat"
+ common "ocm.software/ocm/api/utils/misc"
+ "ocm.software/ocm/api/utils/out"
+ "ocm.software/ocm/api/utils/runtime"
+ ocmcommon "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/handlers/comphdlr"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/lookupoption"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/repooption"
+ "ocm.software/ocm/cmds/ocm/commands/toicmds/names"
+ "ocm.software/ocm/cmds/ocm/commands/verbs"
+ "ocm.software/ocm/cmds/ocm/common/output"
+ "ocm.software/ocm/cmds/ocm/common/utils"
+ topicbootstrap "ocm.software/ocm/cmds/ocm/topics/toi/bootstrapping"
)
const (
diff --git a/cmds/ocm/commands/toicmds/package/cmd.go b/cmds/ocm/commands/toicmds/package/cmd.go
index 4e3864065..d60808384 100644
--- a/cmds/ocm/commands/toicmds/package/cmd.go
+++ b/cmds/ocm/commands/toicmds/package/cmd.go
@@ -3,10 +3,10 @@ package _package
import (
"github.com/spf13/cobra"
- "github.com/open-component-model/ocm/cmds/ocm/commands/toicmds/names"
- "github.com/open-component-model/ocm/cmds/ocm/commands/toicmds/package/bootstrap"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/cmds/ocm/commands/toicmds/names"
+ "ocm.software/ocm/cmds/ocm/commands/toicmds/package/bootstrap"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
var Names = names.Package
diff --git a/cmds/ocm/commands/toicmds/package/describe/cmd.go b/cmds/ocm/commands/toicmds/package/describe/cmd.go
index cccf87782..057d48752 100644
--- a/cmds/ocm/commands/toicmds/package/describe/cmd.go
+++ b/cmds/ocm/commands/toicmds/package/describe/cmd.go
@@ -7,27 +7,27 @@ import (
"github.com/mandelsoft/goutils/errors"
"github.com/spf13/cobra"
- ocmcommon "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/handlers/comphdlr"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/lookupoption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/repooption"
- "github.com/open-component-model/ocm/cmds/ocm/commands/toicmds/names"
- "github.com/open-component-model/ocm/cmds/ocm/commands/toicmds/package/bootstrap"
- "github.com/open-component-model/ocm/cmds/ocm/commands/verbs"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/output"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- topicbootstrap "github.com/open-component-model/ocm/cmds/ocm/topics/toi/bootstrapping"
- "github.com/open-component-model/ocm/pkg/common"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
- "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/ocireg"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/attrs/ociuploadattr"
- metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1"
- utils2 "github.com/open-component-model/ocm/pkg/contexts/ocm/utils"
- "github.com/open-component-model/ocm/pkg/out"
- "github.com/open-component-model/ocm/pkg/toi"
- "github.com/open-component-model/ocm/pkg/toi/install"
- utils3 "github.com/open-component-model/ocm/pkg/utils"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/oci/extensions/repositories/ocireg"
+ "ocm.software/ocm/api/ocm"
+ metav1 "ocm.software/ocm/api/ocm/compdesc/meta/v1"
+ "ocm.software/ocm/api/ocm/extensions/attrs/ociuploadattr"
+ utils2 "ocm.software/ocm/api/ocm/ocmutils"
+ "ocm.software/ocm/api/ocm/tools/toi"
+ "ocm.software/ocm/api/ocm/tools/toi/install"
+ utils3 "ocm.software/ocm/api/utils"
+ common "ocm.software/ocm/api/utils/misc"
+ "ocm.software/ocm/api/utils/out"
+ ocmcommon "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/handlers/comphdlr"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/lookupoption"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/repooption"
+ "ocm.software/ocm/cmds/ocm/commands/toicmds/names"
+ "ocm.software/ocm/cmds/ocm/commands/toicmds/package/bootstrap"
+ "ocm.software/ocm/cmds/ocm/commands/verbs"
+ "ocm.software/ocm/cmds/ocm/common/output"
+ "ocm.software/ocm/cmds/ocm/common/utils"
+ topicbootstrap "ocm.software/ocm/cmds/ocm/topics/toi/bootstrapping"
)
const (
diff --git a/cmds/ocm/commands/toicmds/verbs/bootstrap/cmd.go b/cmds/ocm/commands/toicmds/verbs/bootstrap/cmd.go
index 392e56a58..857b07160 100644
--- a/cmds/ocm/commands/toicmds/verbs/bootstrap/cmd.go
+++ b/cmds/ocm/commands/toicmds/verbs/bootstrap/cmd.go
@@ -3,10 +3,10 @@ package bootstrap
import (
"github.com/spf13/cobra"
- components "github.com/open-component-model/ocm/cmds/ocm/commands/toicmds/package/bootstrap"
- "github.com/open-component-model/ocm/cmds/ocm/commands/verbs"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
+ clictx "ocm.software/ocm/api/cli"
+ components "ocm.software/ocm/cmds/ocm/commands/toicmds/package/bootstrap"
+ "ocm.software/ocm/cmds/ocm/commands/verbs"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
// NewCommand creates a new command.
diff --git a/cmds/ocm/commands/toicmds/verbs/describe/cmd.go b/cmds/ocm/commands/toicmds/verbs/describe/cmd.go
index baa8d8be9..e4720aace 100644
--- a/cmds/ocm/commands/toicmds/verbs/describe/cmd.go
+++ b/cmds/ocm/commands/toicmds/verbs/describe/cmd.go
@@ -3,10 +3,10 @@ package describe
import (
"github.com/spf13/cobra"
- _package "github.com/open-component-model/ocm/cmds/ocm/commands/toicmds/package/describe"
- "github.com/open-component-model/ocm/cmds/ocm/commands/verbs"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
+ clictx "ocm.software/ocm/api/cli"
+ _package "ocm.software/ocm/cmds/ocm/commands/toicmds/package/describe"
+ "ocm.software/ocm/cmds/ocm/commands/verbs"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
// NewCommand creates a new command.
diff --git a/cmds/ocm/commands/verbs/add/cmd.go b/cmds/ocm/commands/verbs/add/cmd.go
index edb914aff..cbf3ec1ca 100644
--- a/cmds/ocm/commands/verbs/add/cmd.go
+++ b/cmds/ocm/commands/verbs/add/cmd.go
@@ -3,16 +3,16 @@ package add
import (
"github.com/spf13/cobra"
- components "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/components/add"
- references "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/references/add"
- resourceconfig "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/resourceconfig/add"
- resources "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/resources/add"
- routingslips "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/routingslips/add"
- sourceconfig "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/sourceconfig/add"
- sources "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/sources/add"
- "github.com/open-component-model/ocm/cmds/ocm/commands/verbs"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
+ clictx "ocm.software/ocm/api/cli"
+ components "ocm.software/ocm/cmds/ocm/commands/ocmcmds/components/add"
+ references "ocm.software/ocm/cmds/ocm/commands/ocmcmds/references/add"
+ resourceconfig "ocm.software/ocm/cmds/ocm/commands/ocmcmds/resourceconfig/add"
+ resources "ocm.software/ocm/cmds/ocm/commands/ocmcmds/resources/add"
+ routingslips "ocm.software/ocm/cmds/ocm/commands/ocmcmds/routingslips/add"
+ sourceconfig "ocm.software/ocm/cmds/ocm/commands/ocmcmds/sourceconfig/add"
+ sources "ocm.software/ocm/cmds/ocm/commands/ocmcmds/sources/add"
+ "ocm.software/ocm/cmds/ocm/commands/verbs"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
// NewCommand creates a new command.
diff --git a/cmds/ocm/commands/verbs/bootstrap/cmd.go b/cmds/ocm/commands/verbs/bootstrap/cmd.go
index cc03afb76..324d11301 100644
--- a/cmds/ocm/commands/verbs/bootstrap/cmd.go
+++ b/cmds/ocm/commands/verbs/bootstrap/cmd.go
@@ -3,11 +3,11 @@ package bootstrap
import (
"github.com/spf13/cobra"
- config "github.com/open-component-model/ocm/cmds/ocm/commands/toicmds/config/bootstrap"
- _package "github.com/open-component-model/ocm/cmds/ocm/commands/toicmds/package/bootstrap"
- "github.com/open-component-model/ocm/cmds/ocm/commands/verbs"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
+ clictx "ocm.software/ocm/api/cli"
+ config "ocm.software/ocm/cmds/ocm/commands/toicmds/config/bootstrap"
+ _package "ocm.software/ocm/cmds/ocm/commands/toicmds/package/bootstrap"
+ "ocm.software/ocm/cmds/ocm/commands/verbs"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
// NewCommand creates a new command.
diff --git a/cmds/ocm/commands/verbs/check/cmd.go b/cmds/ocm/commands/verbs/check/cmd.go
index ca7066080..44e5978a8 100644
--- a/cmds/ocm/commands/verbs/check/cmd.go
+++ b/cmds/ocm/commands/verbs/check/cmd.go
@@ -3,10 +3,10 @@ package check
import (
"github.com/spf13/cobra"
- components "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/components/check"
- "github.com/open-component-model/ocm/cmds/ocm/commands/verbs"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
+ clictx "ocm.software/ocm/api/cli"
+ components "ocm.software/ocm/cmds/ocm/commands/ocmcmds/components/check"
+ "ocm.software/ocm/cmds/ocm/commands/verbs"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
// NewCommand creates a new command.
diff --git a/cmds/ocm/commands/verbs/clean/cmd.go b/cmds/ocm/commands/verbs/clean/cmd.go
index ffcb81568..72338b0cf 100644
--- a/cmds/ocm/commands/verbs/clean/cmd.go
+++ b/cmds/ocm/commands/verbs/clean/cmd.go
@@ -3,10 +3,10 @@ package clean
import (
"github.com/spf13/cobra"
- cache "github.com/open-component-model/ocm/cmds/ocm/commands/cachecmds/clean"
- "github.com/open-component-model/ocm/cmds/ocm/commands/verbs"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
+ clictx "ocm.software/ocm/api/cli"
+ cache "ocm.software/ocm/cmds/ocm/commands/cachecmds/clean"
+ "ocm.software/ocm/cmds/ocm/commands/verbs"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
// NewCommand creates a new command.
diff --git a/cmds/ocm/commands/verbs/controller/cmd.go b/cmds/ocm/commands/verbs/controller/cmd.go
index a79e2741f..c8b798554 100644
--- a/cmds/ocm/commands/verbs/controller/cmd.go
+++ b/cmds/ocm/commands/verbs/controller/cmd.go
@@ -3,11 +3,11 @@ package controller
import (
"github.com/spf13/cobra"
- "github.com/open-component-model/ocm/cmds/ocm/commands/controllercmds/install"
- "github.com/open-component-model/ocm/cmds/ocm/commands/controllercmds/names"
- "github.com/open-component-model/ocm/cmds/ocm/commands/controllercmds/uninstall"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/cmds/ocm/commands/controllercmds/install"
+ "ocm.software/ocm/cmds/ocm/commands/controllercmds/names"
+ "ocm.software/ocm/cmds/ocm/commands/controllercmds/uninstall"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
// NewCommand creates a new command.
diff --git a/cmds/ocm/commands/verbs/create/cmd.go b/cmds/ocm/commands/verbs/create/cmd.go
index 0cd77a58d..b48be9930 100644
--- a/cmds/ocm/commands/verbs/create/cmd.go
+++ b/cmds/ocm/commands/verbs/create/cmd.go
@@ -3,12 +3,12 @@ package create
import (
"github.com/spf13/cobra"
- rsakeypair "github.com/open-component-model/ocm/cmds/ocm/commands/misccmds/rsakeypair"
- ctf "github.com/open-component-model/ocm/cmds/ocm/commands/ocicmds/ctf/create"
- comparch "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/componentarchive/create"
- "github.com/open-component-model/ocm/cmds/ocm/commands/verbs"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
+ clictx "ocm.software/ocm/api/cli"
+ rsakeypair "ocm.software/ocm/cmds/ocm/commands/misccmds/rsakeypair"
+ ctf "ocm.software/ocm/cmds/ocm/commands/ocicmds/ctf/create"
+ comparch "ocm.software/ocm/cmds/ocm/commands/ocmcmds/componentarchive/create"
+ "ocm.software/ocm/cmds/ocm/commands/verbs"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
// NewCommand creates a new command.
diff --git a/cmds/ocm/commands/verbs/describe/cmd.go b/cmds/ocm/commands/verbs/describe/cmd.go
index e3d27ad9f..b181ad5f5 100644
--- a/cmds/ocm/commands/verbs/describe/cmd.go
+++ b/cmds/ocm/commands/verbs/describe/cmd.go
@@ -3,13 +3,13 @@ package describe
import (
"github.com/spf13/cobra"
- cache "github.com/open-component-model/ocm/cmds/ocm/commands/cachecmds/describe"
- resources "github.com/open-component-model/ocm/cmds/ocm/commands/ocicmds/artifacts/describe"
- plugins "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/plugins/describe"
- _package "github.com/open-component-model/ocm/cmds/ocm/commands/toicmds/package/describe"
- "github.com/open-component-model/ocm/cmds/ocm/commands/verbs"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
+ clictx "ocm.software/ocm/api/cli"
+ cache "ocm.software/ocm/cmds/ocm/commands/cachecmds/describe"
+ resources "ocm.software/ocm/cmds/ocm/commands/ocicmds/artifacts/describe"
+ plugins "ocm.software/ocm/cmds/ocm/commands/ocmcmds/plugins/describe"
+ _package "ocm.software/ocm/cmds/ocm/commands/toicmds/package/describe"
+ "ocm.software/ocm/cmds/ocm/commands/verbs"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
// NewCommand creates a new command.
diff --git a/cmds/ocm/commands/verbs/download/cmd.go b/cmds/ocm/commands/verbs/download/cmd.go
index e8803b576..615b35581 100644
--- a/cmds/ocm/commands/verbs/download/cmd.go
+++ b/cmds/ocm/commands/verbs/download/cmd.go
@@ -3,13 +3,13 @@ package download
import (
"github.com/spf13/cobra"
- artifacts "github.com/open-component-model/ocm/cmds/ocm/commands/ocicmds/artifacts/download"
- cli "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/cli/download"
- components "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/components/download"
- resources "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/resources/download"
- "github.com/open-component-model/ocm/cmds/ocm/commands/verbs"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
+ clictx "ocm.software/ocm/api/cli"
+ artifacts "ocm.software/ocm/cmds/ocm/commands/ocicmds/artifacts/download"
+ cli "ocm.software/ocm/cmds/ocm/commands/ocmcmds/cli/download"
+ components "ocm.software/ocm/cmds/ocm/commands/ocmcmds/components/download"
+ resources "ocm.software/ocm/cmds/ocm/commands/ocmcmds/resources/download"
+ "ocm.software/ocm/cmds/ocm/commands/verbs"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
// NewCommand creates a new command.
diff --git a/cmds/ocm/commands/verbs/execute/cmd.go b/cmds/ocm/commands/verbs/execute/cmd.go
index 059aac275..2f6e3c752 100644
--- a/cmds/ocm/commands/verbs/execute/cmd.go
+++ b/cmds/ocm/commands/verbs/execute/cmd.go
@@ -3,10 +3,10 @@ package execute
import (
"github.com/spf13/cobra"
- action "github.com/open-component-model/ocm/cmds/ocm/commands/misccmds/action/execute"
- "github.com/open-component-model/ocm/cmds/ocm/commands/verbs"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
+ clictx "ocm.software/ocm/api/cli"
+ action "ocm.software/ocm/cmds/ocm/commands/misccmds/action/execute"
+ "ocm.software/ocm/cmds/ocm/commands/verbs"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
// NewCommand creates a new command.
diff --git a/cmds/ocm/commands/verbs/get/cmd.go b/cmds/ocm/commands/verbs/get/cmd.go
index 085dcf266..abe0f39d3 100644
--- a/cmds/ocm/commands/verbs/get/cmd.go
+++ b/cmds/ocm/commands/verbs/get/cmd.go
@@ -3,19 +3,19 @@ package get
import (
"github.com/spf13/cobra"
- config "github.com/open-component-model/ocm/cmds/ocm/commands/misccmds/config/get"
- credentials "github.com/open-component-model/ocm/cmds/ocm/commands/misccmds/credentials/get"
- artifacts "github.com/open-component-model/ocm/cmds/ocm/commands/ocicmds/artifacts/get"
- components "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/components/get"
- plugins "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/plugins/get"
- pubsub "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/pubsub/get"
- references "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/references/get"
- resources "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/resources/get"
- routingslips "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/routingslips/get"
- sources "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/sources/get"
- "github.com/open-component-model/ocm/cmds/ocm/commands/verbs"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
+ clictx "ocm.software/ocm/api/cli"
+ config "ocm.software/ocm/cmds/ocm/commands/misccmds/config/get"
+ credentials "ocm.software/ocm/cmds/ocm/commands/misccmds/credentials/get"
+ artifacts "ocm.software/ocm/cmds/ocm/commands/ocicmds/artifacts/get"
+ components "ocm.software/ocm/cmds/ocm/commands/ocmcmds/components/get"
+ plugins "ocm.software/ocm/cmds/ocm/commands/ocmcmds/plugins/get"
+ pubsub "ocm.software/ocm/cmds/ocm/commands/ocmcmds/pubsub/get"
+ references "ocm.software/ocm/cmds/ocm/commands/ocmcmds/references/get"
+ resources "ocm.software/ocm/cmds/ocm/commands/ocmcmds/resources/get"
+ routingslips "ocm.software/ocm/cmds/ocm/commands/ocmcmds/routingslips/get"
+ sources "ocm.software/ocm/cmds/ocm/commands/ocmcmds/sources/get"
+ "ocm.software/ocm/cmds/ocm/commands/verbs"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
// NewCommand creates a new command.
diff --git a/cmds/ocm/commands/verbs/hash/cmd.go b/cmds/ocm/commands/verbs/hash/cmd.go
index ce3e1a14b..d3e53ece5 100644
--- a/cmds/ocm/commands/verbs/hash/cmd.go
+++ b/cmds/ocm/commands/verbs/hash/cmd.go
@@ -3,10 +3,10 @@ package hash
import (
"github.com/spf13/cobra"
- components "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/components/hash"
- "github.com/open-component-model/ocm/cmds/ocm/commands/verbs"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
+ clictx "ocm.software/ocm/api/cli"
+ components "ocm.software/ocm/cmds/ocm/commands/ocmcmds/components/hash"
+ "ocm.software/ocm/cmds/ocm/commands/verbs"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
// NewCommand creates a new command.
diff --git a/cmds/ocm/commands/verbs/install/cmd.go b/cmds/ocm/commands/verbs/install/cmd.go
index 8a33b8231..ea1ca8661 100644
--- a/cmds/ocm/commands/verbs/install/cmd.go
+++ b/cmds/ocm/commands/verbs/install/cmd.go
@@ -3,10 +3,10 @@ package install
import (
"github.com/spf13/cobra"
- plugins "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/plugins/install"
- "github.com/open-component-model/ocm/cmds/ocm/commands/verbs"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
+ clictx "ocm.software/ocm/api/cli"
+ plugins "ocm.software/ocm/cmds/ocm/commands/ocmcmds/plugins/install"
+ "ocm.software/ocm/cmds/ocm/commands/verbs"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
// NewCommand creates a new command.
diff --git a/cmds/ocm/commands/verbs/list/cmd.go b/cmds/ocm/commands/verbs/list/cmd.go
index 465ec1a71..430c642de 100644
--- a/cmds/ocm/commands/verbs/list/cmd.go
+++ b/cmds/ocm/commands/verbs/list/cmd.go
@@ -3,10 +3,10 @@ package list
import (
"github.com/spf13/cobra"
- components "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/components/list"
- "github.com/open-component-model/ocm/cmds/ocm/commands/verbs"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
+ clictx "ocm.software/ocm/api/cli"
+ components "ocm.software/ocm/cmds/ocm/commands/ocmcmds/components/list"
+ "ocm.software/ocm/cmds/ocm/commands/verbs"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
// NewCommand creates a new command.
diff --git a/cmds/ocm/commands/verbs/set/cmd.go b/cmds/ocm/commands/verbs/set/cmd.go
index 9349e3571..7a472a76c 100644
--- a/cmds/ocm/commands/verbs/set/cmd.go
+++ b/cmds/ocm/commands/verbs/set/cmd.go
@@ -3,10 +3,10 @@ package set
import (
"github.com/spf13/cobra"
- pubsub "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/pubsub/set"
- "github.com/open-component-model/ocm/cmds/ocm/commands/verbs"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
+ clictx "ocm.software/ocm/api/cli"
+ pubsub "ocm.software/ocm/cmds/ocm/commands/ocmcmds/pubsub/set"
+ "ocm.software/ocm/cmds/ocm/commands/verbs"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
// NewCommand creates a new set command.
diff --git a/cmds/ocm/commands/verbs/show/cmd.go b/cmds/ocm/commands/verbs/show/cmd.go
index 68269c549..61c7a7f85 100644
--- a/cmds/ocm/commands/verbs/show/cmd.go
+++ b/cmds/ocm/commands/verbs/show/cmd.go
@@ -3,11 +3,11 @@ package show
import (
"github.com/spf13/cobra"
- tags "github.com/open-component-model/ocm/cmds/ocm/commands/ocicmds/tags/show"
- versions "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/versions/show"
- "github.com/open-component-model/ocm/cmds/ocm/commands/verbs"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
+ clictx "ocm.software/ocm/api/cli"
+ tags "ocm.software/ocm/cmds/ocm/commands/ocicmds/tags/show"
+ versions "ocm.software/ocm/cmds/ocm/commands/ocmcmds/versions/show"
+ "ocm.software/ocm/cmds/ocm/commands/verbs"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
// NewCommand creates a new command.
diff --git a/cmds/ocm/commands/verbs/sign/cmd.go b/cmds/ocm/commands/verbs/sign/cmd.go
index 0dcfb1c2b..73d1e9fa6 100644
--- a/cmds/ocm/commands/verbs/sign/cmd.go
+++ b/cmds/ocm/commands/verbs/sign/cmd.go
@@ -3,11 +3,11 @@ package sign
import (
"github.com/spf13/cobra"
- "github.com/open-component-model/ocm/cmds/ocm/commands/misccmds/hash/sign"
- components "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/components/sign"
- "github.com/open-component-model/ocm/cmds/ocm/commands/verbs"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/cmds/ocm/commands/misccmds/hash/sign"
+ components "ocm.software/ocm/cmds/ocm/commands/ocmcmds/components/sign"
+ "ocm.software/ocm/cmds/ocm/commands/verbs"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
// NewCommand creates a new command.
diff --git a/cmds/ocm/commands/verbs/transfer/cmd.go b/cmds/ocm/commands/verbs/transfer/cmd.go
index e65a56548..9124c789e 100644
--- a/cmds/ocm/commands/verbs/transfer/cmd.go
+++ b/cmds/ocm/commands/verbs/transfer/cmd.go
@@ -3,13 +3,13 @@ package transfer
import (
"github.com/spf13/cobra"
- artifacts "github.com/open-component-model/ocm/cmds/ocm/commands/ocicmds/artifacts/transfer"
- comparch "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/componentarchive/transfer"
- components "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/components/transfer"
- ctf "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/ctf/transfer"
- "github.com/open-component-model/ocm/cmds/ocm/commands/verbs"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
+ clictx "ocm.software/ocm/api/cli"
+ artifacts "ocm.software/ocm/cmds/ocm/commands/ocicmds/artifacts/transfer"
+ comparch "ocm.software/ocm/cmds/ocm/commands/ocmcmds/componentarchive/transfer"
+ components "ocm.software/ocm/cmds/ocm/commands/ocmcmds/components/transfer"
+ ctf "ocm.software/ocm/cmds/ocm/commands/ocmcmds/ctf/transfer"
+ "ocm.software/ocm/cmds/ocm/commands/verbs"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
// NewCommand creates a new command.
diff --git a/cmds/ocm/commands/verbs/verb.go b/cmds/ocm/commands/verbs/verb.go
index 50f5310c7..ace364713 100644
--- a/cmds/ocm/commands/verbs/verb.go
+++ b/cmds/ocm/commands/verbs/verb.go
@@ -3,8 +3,8 @@ package verbs
import (
"github.com/spf13/cobra"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
// NewCommand creates a new command.
diff --git a/cmds/ocm/commands/verbs/verify/cmd.go b/cmds/ocm/commands/verbs/verify/cmd.go
index 3e314da43..603bc5a77 100644
--- a/cmds/ocm/commands/verbs/verify/cmd.go
+++ b/cmds/ocm/commands/verbs/verify/cmd.go
@@ -3,10 +3,10 @@ package verify
import (
"github.com/spf13/cobra"
- components "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/components/verify"
- "github.com/open-component-model/ocm/cmds/ocm/commands/verbs"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
+ clictx "ocm.software/ocm/api/cli"
+ components "ocm.software/ocm/cmds/ocm/commands/ocmcmds/components/verify"
+ "ocm.software/ocm/cmds/ocm/commands/verbs"
+ "ocm.software/ocm/cmds/ocm/common/utils"
)
// NewCommand creates a new command.
diff --git a/cmds/ocm/pkg/data/convert.go b/cmds/ocm/common/data/convert.go
similarity index 100%
rename from cmds/ocm/pkg/data/convert.go
rename to cmds/ocm/common/data/convert.go
diff --git a/cmds/ocm/pkg/data/dll.go b/cmds/ocm/common/data/dll.go
similarity index 100%
rename from cmds/ocm/pkg/data/dll.go
rename to cmds/ocm/common/data/dll.go
diff --git a/cmds/ocm/pkg/data/dll_test.go b/cmds/ocm/common/data/dll_test.go
similarity index 100%
rename from cmds/ocm/pkg/data/dll_test.go
rename to cmds/ocm/common/data/dll_test.go
diff --git a/cmds/ocm/pkg/data/indexed.go b/cmds/ocm/common/data/indexed.go
similarity index 100%
rename from cmds/ocm/pkg/data/indexed.go
rename to cmds/ocm/common/data/indexed.go
diff --git a/cmds/ocm/pkg/data/indexed_test.go b/cmds/ocm/common/data/indexed_test.go
similarity index 100%
rename from cmds/ocm/pkg/data/indexed_test.go
rename to cmds/ocm/common/data/indexed_test.go
diff --git a/cmds/ocm/pkg/data/iterator.go b/cmds/ocm/common/data/iterator.go
similarity index 100%
rename from cmds/ocm/pkg/data/iterator.go
rename to cmds/ocm/common/data/iterator.go
diff --git a/cmds/ocm/pkg/data/list.go b/cmds/ocm/common/data/list.go
similarity index 100%
rename from cmds/ocm/pkg/data/list.go
rename to cmds/ocm/common/data/list.go
diff --git a/cmds/ocm/pkg/data/list_test.go b/cmds/ocm/common/data/list_test.go
similarity index 100%
rename from cmds/ocm/pkg/data/list_test.go
rename to cmds/ocm/common/data/list_test.go
diff --git a/cmds/ocm/pkg/data/sort.go b/cmds/ocm/common/data/sort.go
similarity index 100%
rename from cmds/ocm/pkg/data/sort.go
rename to cmds/ocm/common/data/sort.go
diff --git a/cmds/ocm/pkg/data/suite_test.go b/cmds/ocm/common/data/suite_test.go
similarity index 100%
rename from cmds/ocm/pkg/data/suite_test.go
rename to cmds/ocm/common/data/suite_test.go
diff --git a/cmds/ocm/pkg/options/interfaces.go b/cmds/ocm/common/options/interfaces.go
similarity index 97%
rename from cmds/ocm/pkg/options/interfaces.go
rename to cmds/ocm/common/options/interfaces.go
index 368918510..e48cbad36 100644
--- a/cmds/ocm/pkg/options/interfaces.go
+++ b/cmds/ocm/common/options/interfaces.go
@@ -6,8 +6,8 @@ import (
"github.com/mandelsoft/goutils/generics"
"github.com/spf13/pflag"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
- "github.com/open-component-model/ocm/pkg/out"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/utils/out"
)
type OptionsProcessor func(Options) error
diff --git a/cmds/ocm/common/options/options_test.go b/cmds/ocm/common/options/options_test.go
new file mode 100644
index 000000000..df4f785a5
--- /dev/null
+++ b/cmds/ocm/common/options/options_test.go
@@ -0,0 +1,56 @@
+package options_test
+
+import (
+ . "github.com/onsi/ginkgo/v2"
+ . "github.com/onsi/gomega"
+
+ "github.com/spf13/pflag"
+
+ "ocm.software/ocm/cmds/ocm/common/options"
+)
+
+type TestOption struct {
+ Flag bool
+}
+
+func (t *TestOption) AddFlags(fs *pflag.FlagSet) {
+ fs.BoolVarP(&t.Flag, "flag", "f", false, "test flag")
+}
+
+var _ options.Options = (*TestOption)(nil)
+
+var _ = Describe("options", func() {
+ It("skips unknown option", func() {
+ set := options.OptionSet{}
+
+ var opt *TestOption
+ Expect(set.Get(&opt)).To(BeFalse())
+ })
+
+ It("assigns options pointer from set", func() {
+ inst := &TestOption{}
+ set := options.OptionSet{inst}
+ set.Options(inst).(*TestOption).Flag = true
+
+ var opt *TestOption
+ Expect(set.Get(&opt)).To(BeTrue())
+ Expect(opt.Flag).To(BeTrue())
+ Expect(opt).To(BeIdenticalTo(inst))
+
+ Expect(set.Get(&set)).To(BeFalse())
+ })
+
+ It("assigns options value from set", func() {
+ inst := &TestOption{}
+ set := options.OptionSet{inst}
+
+ set.Options(inst).(*TestOption).Flag = true
+
+ var opt TestOption
+ Expect(set.Get(&opt)).To(BeTrue())
+ Expect(opt.Flag).To(BeTrue())
+
+ opt.Flag = false
+ Expect(inst.Flag).To(BeTrue())
+ })
+})
diff --git a/cmds/ocm/pkg/options/suite_test.go b/cmds/ocm/common/options/suite_test.go
similarity index 100%
rename from cmds/ocm/pkg/options/suite_test.go
rename to cmds/ocm/common/options/suite_test.go
diff --git a/cmds/ocm/pkg/output/attroutput.go b/cmds/ocm/common/output/attroutput.go
similarity index 89%
rename from cmds/ocm/pkg/output/attroutput.go
rename to cmds/ocm/common/output/attroutput.go
index 356ea84a5..9f30d9e50 100644
--- a/cmds/ocm/pkg/output/attroutput.go
+++ b/cmds/ocm/common/output/attroutput.go
@@ -1,8 +1,8 @@
package output
import (
- . "github.com/open-component-model/ocm/cmds/ocm/pkg/processing"
- . "github.com/open-component-model/ocm/pkg/out"
+ . "ocm.software/ocm/api/utils/out"
+ . "ocm.software/ocm/cmds/ocm/common/processing"
"github.com/mandelsoft/goutils/errors"
)
diff --git a/cmds/ocm/pkg/output/attrset.go b/cmds/ocm/common/output/attrset.go
similarity index 93%
rename from cmds/ocm/pkg/output/attrset.go
rename to cmds/ocm/common/output/attrset.go
index f38d31691..cc789281d 100644
--- a/cmds/ocm/pkg/output/attrset.go
+++ b/cmds/ocm/common/output/attrset.go
@@ -3,7 +3,7 @@ package output
import (
"fmt"
- "github.com/open-component-model/ocm/pkg/out"
+ "ocm.software/ocm/api/utils/out"
)
type AttributeSet struct {
diff --git a/cmds/ocm/common/output/chain.go b/cmds/ocm/common/output/chain.go
new file mode 100644
index 000000000..04c2d33db
--- /dev/null
+++ b/cmds/ocm/common/output/chain.go
@@ -0,0 +1,17 @@
+package output
+
+import (
+ "ocm.software/ocm/cmds/ocm/common/processing"
+)
+
+type ChainFunction func(opts *Options) processing.ProcessChain
+
+func ComposeChain(funcs ...ChainFunction) ChainFunction {
+ return func(opts *Options) processing.ProcessChain {
+ var chain processing.ProcessChain
+ for _, f := range funcs {
+ chain = processing.Append(chain, f(opts))
+ }
+ return chain
+ }
+}
diff --git a/cmds/ocm/pkg/output/complexoutput.go b/cmds/ocm/common/output/complexoutput.go
similarity index 90%
rename from cmds/ocm/pkg/output/complexoutput.go
rename to cmds/ocm/common/output/complexoutput.go
index b44f9f8e1..ac1424013 100644
--- a/cmds/ocm/pkg/output/complexoutput.go
+++ b/cmds/ocm/common/output/complexoutput.go
@@ -3,13 +3,13 @@ package output
import (
"fmt"
- . "github.com/open-component-model/ocm/cmds/ocm/pkg/processing"
- . "github.com/open-component-model/ocm/pkg/out"
+ . "ocm.software/ocm/api/utils/out"
+ . "ocm.software/ocm/cmds/ocm/common/processing"
"sigs.k8s.io/yaml"
- "github.com/open-component-model/ocm/pkg/runtime"
- "github.com/open-component-model/ocm/pkg/utils"
+ "ocm.software/ocm/api/utils"
+ "ocm.software/ocm/api/utils/runtime"
)
type ComplexProcessingOutput struct {
diff --git a/cmds/ocm/pkg/output/elementoutput.go b/cmds/ocm/common/output/elementoutput.go
similarity index 91%
rename from cmds/ocm/pkg/output/elementoutput.go
rename to cmds/ocm/common/output/elementoutput.go
index 9f1a25de0..a505b0661 100644
--- a/cmds/ocm/pkg/output/elementoutput.go
+++ b/cmds/ocm/common/output/elementoutput.go
@@ -4,12 +4,12 @@ import (
"fmt"
"io"
- . "github.com/open-component-model/ocm/cmds/ocm/pkg/processing"
- . "github.com/open-component-model/ocm/pkg/out"
+ . "ocm.software/ocm/api/utils/out"
+ . "ocm.software/ocm/cmds/ocm/common/processing"
"github.com/mandelsoft/logging"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/data"
+ "ocm.software/ocm/cmds/ocm/common/data"
)
type DestinationOutput struct {
diff --git a/cmds/ocm/pkg/output/funcoutput.go b/cmds/ocm/common/output/funcoutput.go
similarity index 86%
rename from cmds/ocm/pkg/output/funcoutput.go
rename to cmds/ocm/common/output/funcoutput.go
index a952f1435..5ad97c00d 100644
--- a/cmds/ocm/pkg/output/funcoutput.go
+++ b/cmds/ocm/common/output/funcoutput.go
@@ -1,8 +1,8 @@
package output
import (
- . "github.com/open-component-model/ocm/cmds/ocm/pkg/processing"
- . "github.com/open-component-model/ocm/pkg/out"
+ . "ocm.software/ocm/api/utils/out"
+ . "ocm.software/ocm/cmds/ocm/common/processing"
)
type OutputFunction func(Context, interface{})
diff --git a/cmds/ocm/common/output/options.go b/cmds/ocm/common/output/options.go
new file mode 100644
index 000000000..030989235
--- /dev/null
+++ b/cmds/ocm/common/output/options.go
@@ -0,0 +1,198 @@
+package output
+
+import (
+ "fmt"
+ "strings"
+
+ "github.com/mandelsoft/goutils/errors"
+ "github.com/mandelsoft/goutils/sliceutils"
+ "github.com/mandelsoft/logging"
+ "github.com/spf13/pflag"
+
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/utils"
+ "ocm.software/ocm/api/utils/listformat"
+ "ocm.software/ocm/cmds/ocm/common/options"
+ "ocm.software/ocm/cmds/ocm/common/processing"
+)
+
+func From(o options.OptionSetProvider) *Options {
+ var opts *Options
+ if me, ok := o.(*Options); ok {
+ return me
+ }
+ o.AsOptionSet().Get(&opts)
+ return opts
+}
+
+func Selected(mode string) func(o options.OptionSetProvider) bool {
+ return func(o options.OptionSetProvider) bool {
+ return From(o).OutputMode == mode
+ }
+}
+
+// StatusCheckFunction manipulates the processing status error according to
+// the state of the given entry.
+type StatusCheckFunction func(opts *Options, e interface{}, old error) error
+
+type Options struct {
+ options.OptionSet
+
+ allColumns bool
+
+ Outputs Outputs
+ OutputMode string
+ Output Output
+ Sort []string
+ StatusCheck StatusCheckFunction
+ OptimizedColumns int
+ FixedColums int
+ Context clictx.Context // this context could be ocm context.
+ Logging logging.Context
+}
+
+func OutputOptions(outputs Outputs, opts ...options.Options) *Options {
+ return &Options{
+ Outputs: outputs,
+ OptionSet: opts,
+ }
+}
+
+func (o *Options) OptimizeColumns(n int) *Options {
+ o.OptimizedColumns = n
+ return o
+}
+
+// WithStatusCheck provides the possibility to check every entry to
+// influence the final out status.
+func (o *Options) WithStatusCheck(f StatusCheckFunction) *Options {
+ o.StatusCheck = f
+ return o
+}
+
+func (o *Options) AdaptChain(errvar *error, chain processing.ProcessChain) processing.ProcessChain {
+ if o.StatusCheck != nil {
+ chain = processing.Map(func(e interface{}) interface{} {
+ *errvar = o.StatusCheck(o, e, *errvar)
+ return e
+ }).Append(chain)
+ }
+ return chain
+}
+
+func (o *Options) LogContext() logging.Context {
+ if o.Logging != nil {
+ return o.Logging
+ }
+ return logging.DefaultContext()
+}
+
+func (o *Options) Options(proto options.Options) interface{} {
+ return o.OptionSet.Options(proto)
+}
+
+func (o *Options) Get(proto interface{}) bool {
+ return o.OptionSet.Get(proto)
+}
+
+func (o *Options) UseColumnOptimization() bool {
+ return o.OptimizedColumns > 0 && !o.allColumns
+}
+
+func (o *Options) AddFlags(fs *pflag.FlagSet) {
+ s := ""
+ if len(o.Outputs) > 1 {
+ list := utils.StringMapKeys(o.Outputs)
+ sep := ""
+ for _, o := range list {
+ if o != "" {
+ s = fmt.Sprintf("%s%s%s", s, sep, o)
+ sep = ", "
+ }
+ }
+ fs.StringVarP(&o.OutputMode, "output", "o", "", fmt.Sprintf("output mode (%s)", s))
+ }
+
+ // TODO: not the best solution to instantiate all possible outputs to figure out, whether sort fields
+ // are available or not
+ for _, out := range o.Outputs {
+ if _, ok := out(o).(SortFields); ok {
+ fs.StringArrayVarP(&o.Sort, "sort", "s", nil, "sort fields")
+ break
+ }
+ }
+
+ if o.OptimizedColumns > 0 {
+ fs.BoolVarP(&o.allColumns, "all-columns", "", false, "show all table columns")
+ }
+ o.OptionSet.AddFlags(fs)
+}
+
+func (o *Options) Configure(ctx clictx.Context) error {
+ o.Context = ctx
+
+ // process sub options first, to assure that output options are available for output
+ // mode creation
+ err := o.OptionSet.ProcessOnOptions(options.CompleteOptionsWithCLIContext(ctx))
+ if err != nil {
+ return err
+ }
+
+ if f := o.Outputs[o.OutputMode]; f == nil {
+ return errors.ErrInvalid("output mode", o.OutputMode)
+ } else {
+ o.Output = f(o)
+ }
+
+ var avail sliceutils.OrderedSlice[string]
+
+ var fields []string
+
+ if s, ok := o.Output.(SortFields); ok {
+ avail = s.GetSortFields()
+ }
+ for _, f := range o.Sort {
+ split := strings.Split(f, ",")
+ for _, s := range split {
+ s = strings.TrimSpace(s)
+ if s != "" {
+ if avail.Contains(s) {
+ fields = append(fields, s)
+ } else {
+ return errors.ErrInvalid("sort field", s)
+ }
+ }
+ }
+ }
+ o.Sort = fields
+ return nil
+}
+
+func (o *Options) CompleteAll(ctx clictx.Context) error {
+ err := o.Configure(ctx)
+ if err == nil {
+ err = o.OptionSet.ProcessOnOptions(options.CompleteOptionsWithCLIContext(ctx))
+ }
+ if err != nil {
+ return err
+ }
+ return err
+}
+
+func (o *Options) Usage() string {
+ s := o.OptionSet.Usage()
+
+ if len(o.Outputs) > 1 {
+ s += `
+With the option --output the output mode can be selected.
+The following modes are supported:
+` + listformat.FormatList(o.OutputMode, utils.StringMapKeys(o.Outputs)...)
+ }
+ return s
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+func OutputModeCondition(opts *Options, mode string) options.Condition {
+ return options.Flag(opts.OutputMode == mode)
+}
diff --git a/cmds/ocm/pkg/output/output.go b/cmds/ocm/common/output/output.go
similarity index 98%
rename from cmds/ocm/pkg/output/output.go
rename to cmds/ocm/common/output/output.go
index 831e72fd9..524741ec6 100644
--- a/cmds/ocm/pkg/output/output.go
+++ b/cmds/ocm/common/output/output.go
@@ -6,12 +6,12 @@ import (
"fmt"
"io"
- . "github.com/open-component-model/ocm/pkg/out"
+ . "ocm.software/ocm/api/utils/out"
"github.com/mandelsoft/goutils/errors"
"sigs.k8s.io/yaml"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/processing"
+ "ocm.software/ocm/cmds/ocm/common/processing"
)
type Object = interface{}
diff --git a/cmds/ocm/pkg/output/select.go b/cmds/ocm/common/output/select.go
similarity index 100%
rename from cmds/ocm/pkg/output/select.go
rename to cmds/ocm/common/output/select.go
diff --git a/cmds/ocm/pkg/output/singleelemoutput.go b/cmds/ocm/common/output/singleelemoutput.go
similarity index 100%
rename from cmds/ocm/pkg/output/singleelemoutput.go
rename to cmds/ocm/common/output/singleelemoutput.go
diff --git a/cmds/ocm/pkg/output/sort_test.go b/cmds/ocm/common/output/sort_test.go
similarity index 96%
rename from cmds/ocm/pkg/output/sort_test.go
rename to cmds/ocm/common/output/sort_test.go
index fb01f8b23..a265552ee 100644
--- a/cmds/ocm/pkg/output/sort_test.go
+++ b/cmds/ocm/common/output/sort_test.go
@@ -4,7 +4,7 @@ import (
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/data"
+ "ocm.software/ocm/cmds/ocm/common/data"
)
var _ = Describe("sort", func() {
diff --git a/cmds/ocm/pkg/output/stringoutput.go b/cmds/ocm/common/output/stringoutput.go
similarity index 91%
rename from cmds/ocm/pkg/output/stringoutput.go
rename to cmds/ocm/common/output/stringoutput.go
index ee50e1a5e..df509efa2 100644
--- a/cmds/ocm/pkg/output/stringoutput.go
+++ b/cmds/ocm/common/output/stringoutput.go
@@ -3,9 +3,9 @@ package output
import (
"strings"
- . "github.com/open-component-model/ocm/pkg/out"
+ . "ocm.software/ocm/api/utils/out"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/processing"
+ "ocm.software/ocm/cmds/ocm/common/processing"
)
type StringOutput struct {
diff --git a/cmds/ocm/pkg/output/suite_test.go b/cmds/ocm/common/output/suite_test.go
similarity index 100%
rename from cmds/ocm/pkg/output/suite_test.go
rename to cmds/ocm/common/output/suite_test.go
diff --git a/cmds/ocm/pkg/output/table.go b/cmds/ocm/common/output/table.go
similarity index 97%
rename from cmds/ocm/pkg/output/table.go
rename to cmds/ocm/common/output/table.go
index 2641b3a29..becef4389 100644
--- a/cmds/ocm/pkg/output/table.go
+++ b/cmds/ocm/common/output/table.go
@@ -4,7 +4,7 @@ import (
"fmt"
"strings"
- . "github.com/open-component-model/ocm/pkg/out"
+ . "ocm.software/ocm/api/utils/out"
)
func FormatTable(ctx Context, gap string, data [][]string) {
diff --git a/cmds/ocm/pkg/output/tableoutput.go b/cmds/ocm/common/output/tableoutput.go
similarity index 93%
rename from cmds/ocm/pkg/output/tableoutput.go
rename to cmds/ocm/common/output/tableoutput.go
index 42e0ebf87..c8cd1881b 100644
--- a/cmds/ocm/pkg/output/tableoutput.go
+++ b/cmds/ocm/common/output/tableoutput.go
@@ -3,14 +3,14 @@ package output
import (
"strings"
- . "github.com/open-component-model/ocm/cmds/ocm/pkg/processing"
+ . "ocm.software/ocm/cmds/ocm/common/processing"
"github.com/mandelsoft/goutils/errors"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/data"
- "github.com/open-component-model/ocm/pkg/out"
- "github.com/open-component-model/ocm/pkg/semverutils"
- "github.com/open-component-model/ocm/pkg/utils"
+ "ocm.software/ocm/api/utils"
+ "ocm.software/ocm/api/utils/out"
+ "ocm.software/ocm/api/utils/semverutils"
+ "ocm.software/ocm/cmds/ocm/common/data"
)
type SortFields interface {
diff --git a/cmds/ocm/pkg/output/treeoutput.go b/cmds/ocm/common/output/treeoutput.go
similarity index 92%
rename from cmds/ocm/pkg/output/treeoutput.go
rename to cmds/ocm/common/output/treeoutput.go
index 02656b8a9..86721e8c3 100644
--- a/cmds/ocm/pkg/output/treeoutput.go
+++ b/cmds/ocm/common/output/treeoutput.go
@@ -1,9 +1,9 @@
package output
import (
- "github.com/open-component-model/ocm/cmds/ocm/pkg/data"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/processing"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/tree"
+ "ocm.software/ocm/cmds/ocm/common/data"
+ "ocm.software/ocm/cmds/ocm/common/processing"
+ "ocm.software/ocm/cmds/ocm/common/tree"
)
type TreeOutputOption interface {
diff --git a/cmds/ocm/pkg/output/utils.go b/cmds/ocm/common/output/utils.go
similarity index 100%
rename from cmds/ocm/pkg/output/utils.go
rename to cmds/ocm/common/output/utils.go
diff --git a/cmds/ocm/pkg/processing/buffer.go b/cmds/ocm/common/processing/buffer.go
similarity index 98%
rename from cmds/ocm/pkg/processing/buffer.go
rename to cmds/ocm/common/processing/buffer.go
index 95ef0709c..76451be38 100644
--- a/cmds/ocm/pkg/processing/buffer.go
+++ b/cmds/ocm/common/processing/buffer.go
@@ -7,8 +7,8 @@ import (
"github.com/containerd/containerd/pkg/atomic"
"github.com/mandelsoft/logging"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/data"
- "github.com/open-component-model/ocm/pkg/utils/panics"
+ "ocm.software/ocm/api/utils/panics"
+ "ocm.software/ocm/cmds/ocm/common/data"
)
type Index = IndexArray
diff --git a/cmds/ocm/pkg/processing/buffer_test.go b/cmds/ocm/common/processing/buffer_test.go
similarity index 98%
rename from cmds/ocm/pkg/processing/buffer_test.go
rename to cmds/ocm/common/processing/buffer_test.go
index 9ae9d131b..490605e08 100644
--- a/cmds/ocm/pkg/processing/buffer_test.go
+++ b/cmds/ocm/common/processing/buffer_test.go
@@ -8,8 +8,8 @@ import (
"github.com/mandelsoft/logging"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/data"
- ocmlog "github.com/open-component-model/ocm/pkg/logging"
+ ocmlog "ocm.software/ocm/api/utils/logging"
+ "ocm.software/ocm/cmds/ocm/common/data"
)
type Result struct {
diff --git a/cmds/ocm/common/processing/chain.go b/cmds/ocm/common/processing/chain.go
new file mode 100644
index 000000000..d78c73ab2
--- /dev/null
+++ b/cmds/ocm/common/processing/chain.go
@@ -0,0 +1,196 @@
+package processing
+
+import (
+ "github.com/mandelsoft/logging"
+
+ "ocm.software/ocm/cmds/ocm/common/data"
+ "ocm.software/ocm/cmds/ocm/common/options"
+)
+
+// ProcessChain is a data structure holding a chain definition, which is
+// a chain of step creation functions used to instantiate the chain
+// for a dedicated input processing.
+// The instantiation is initiated by calling the Process
+// method on a chain.
+type ProcessChain interface {
+ Transform(t TransformFunction) ProcessChain
+ Explode(m ExplodeFunction) ProcessChain
+ Map(m MappingFunction) ProcessChain
+ Filter(f FilterFunction) ProcessChain
+ Sort(c CompareFunction) ProcessChain
+ WithPool(p ProcessorPool) ProcessChain
+ Unordered() ProcessChain
+ Parallel(n int) ProcessChain
+ Append(p ProcessChain) ProcessChain
+
+ Process(data data.Iterable) ProcessingResult
+}
+
+type stepCreator func(ProcessingResult) ProcessingResult
+
+type _ProcessChain struct {
+ parent *_ProcessChain
+ creator stepCreator
+ log logging.Context
+}
+
+var _ ProcessChain = &_ProcessChain{}
+
+func Chain(log logging.Context) ProcessChain {
+ return (&_ProcessChain{}).new(log, nil, nil)
+}
+
+func (this *_ProcessChain) new(log logging.Context, p *_ProcessChain, creator stepCreator) *_ProcessChain {
+ if p != nil {
+ if log == nil {
+ log = p.log
+ }
+ if p.creator != nil {
+ this.parent = p
+ } else if p.parent != nil {
+ this.parent = p.parent
+ }
+ }
+ if log == nil {
+ log = logging.DefaultContext()
+ }
+ if this.parent != nil && creator == nil {
+ return this.parent
+ }
+ this.creator = creator
+ this.log = log
+ return this
+}
+
+func (this *_ProcessChain) Transform(t TransformFunction) ProcessChain {
+ if t == nil {
+ return this
+ }
+ return (&_ProcessChain{}).new(this.log, this, chainTransform(t))
+}
+
+func (this *_ProcessChain) Explode(e ExplodeFunction) ProcessChain {
+ if e == nil {
+ return this
+ }
+ return (&_ProcessChain{}).new(this.log, this, chainExplode(e))
+}
+
+func (this *_ProcessChain) Map(m MappingFunction) ProcessChain {
+ if m == nil {
+ return this
+ }
+ return (&_ProcessChain{}).new(this.log, this, chainMap(m))
+}
+
+func (this *_ProcessChain) Filter(f FilterFunction) ProcessChain {
+ if f == nil {
+ return this
+ }
+ return (&_ProcessChain{}).new(this.log, this, chainFilter(f))
+}
+
+func (this *_ProcessChain) Sort(c CompareFunction) ProcessChain {
+ if c == nil {
+ return this
+ }
+ return (&_ProcessChain{}).new(this.log, this, chainSort(c))
+}
+
+func (this *_ProcessChain) WithPool(p ProcessorPool) ProcessChain {
+ return (&_ProcessChain{}).new(this.log, this, chainWithPool(p))
+}
+
+func (this *_ProcessChain) Unordered() ProcessChain {
+ return (&_ProcessChain{}).new(this.log, this, chainUnordered)
+}
+
+func (this *_ProcessChain) Parallel(n int) ProcessChain {
+ return (&_ProcessChain{}).new(this.log, this, chainParallel(n))
+}
+
+func (this *_ProcessChain) Append(p ProcessChain) ProcessChain {
+ if p == nil {
+ return this
+ }
+ return (&_ProcessChain{}).new(this.log, this, chainApply(p))
+}
+
+// Process instantiates a processing chain for a dedicated input
+// It builds a dedicated execution structure
+// based on the chain functioned stored along the chain definition.
+func (this *_ProcessChain) Process(data data.Iterable) ProcessingResult {
+ p, ok := data.(ProcessingResult)
+ if this.parent != nil {
+ p = this.parent.Process(data)
+ } else if !ok {
+ p = Process(this.log, data)
+ }
+ return this.step(p)
+}
+
+func (this *_ProcessChain) step(p ProcessingResult) ProcessingResult {
+ if this.creator == nil {
+ return p
+ }
+ return this.creator(p)
+}
+
+func chainTransform(t TransformFunction) stepCreator {
+ return func(p ProcessingResult) ProcessingResult { return p.Transform(t) }
+}
+
+func chainExplode(e ExplodeFunction) stepCreator {
+ return func(p ProcessingResult) ProcessingResult { return p.Explode(e) }
+}
+
+func chainMap(m MappingFunction) stepCreator {
+ return func(p ProcessingResult) ProcessingResult { return p.Map(m) }
+}
+
+func chainFilter(f FilterFunction) stepCreator {
+ return func(p ProcessingResult) ProcessingResult { return p.Filter(f) }
+}
+
+func chainSort(c CompareFunction) stepCreator {
+ return func(p ProcessingResult) ProcessingResult { return p.Sort(c) }
+}
+
+func chainWithPool(pool ProcessorPool) stepCreator {
+ return func(p ProcessingResult) ProcessingResult { return p.WithPool(pool) }
+}
+
+func chainParallel(n int) stepCreator {
+ return func(p ProcessingResult) ProcessingResult { return p.Parallel(n) }
+}
+func chainUnordered(p ProcessingResult) ProcessingResult { return p.Unordered() }
+
+func chainApply(c ProcessChain) stepCreator {
+ return func(p ProcessingResult) ProcessingResult {
+ return p.Apply(c)
+ }
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+var initial = Chain(logging.DefaultContext())
+
+func Transform(t TransformFunction) ProcessChain { return initial.Transform(t) }
+func Explode(e ExplodeFunction) ProcessChain { return initial.Explode(e) }
+func Map(m MappingFunction) ProcessChain { return initial.Map(m) }
+func Filter(f FilterFunction) ProcessChain { return initial.Filter(f) }
+func Sort(c CompareFunction) ProcessChain { return initial.Sort(c) }
+func WithPool(pool ProcessorPool) ProcessChain { return initial.WithPool(pool) }
+func Parallel(n int) ProcessChain { return initial.Parallel(n) }
+func Unordered() ProcessChain { return initial.Unordered() }
+func Append(chain, add ProcessChain, conditions ...options.Condition) ProcessChain {
+ if add != nil {
+ if options.And(conditions...).IsTrue() {
+ if chain == nil {
+ return add
+ }
+ return chain.Append(add)
+ }
+ }
+ return chain
+}
diff --git a/cmds/ocm/common/processing/logging.go b/cmds/ocm/common/processing/logging.go
new file mode 100644
index 000000000..40ebf789d
--- /dev/null
+++ b/cmds/ocm/common/processing/logging.go
@@ -0,0 +1,7 @@
+package processing
+
+import (
+ ocmlog "ocm.software/ocm/api/utils/logging"
+)
+
+var REALM = ocmlog.DefineSubRealm("output processing chains", "processing")
diff --git a/cmds/ocm/pkg/processing/operation.go b/cmds/ocm/common/processing/operation.go
similarity index 100%
rename from cmds/ocm/pkg/processing/operation.go
rename to cmds/ocm/common/processing/operation.go
diff --git a/cmds/ocm/pkg/processing/parallel.go b/cmds/ocm/common/processing/parallel.go
similarity index 98%
rename from cmds/ocm/pkg/processing/parallel.go
rename to cmds/ocm/common/processing/parallel.go
index 8b2a2b814..5866be13a 100644
--- a/cmds/ocm/pkg/processing/parallel.go
+++ b/cmds/ocm/common/processing/parallel.go
@@ -5,7 +5,7 @@ import (
"github.com/mandelsoft/logging"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/data"
+ "ocm.software/ocm/cmds/ocm/common/data"
)
type _ParallelProcessing struct {
diff --git a/cmds/ocm/pkg/processing/pool.go b/cmds/ocm/common/processing/pool.go
similarity index 100%
rename from cmds/ocm/pkg/processing/pool.go
rename to cmds/ocm/common/processing/pool.go
diff --git a/cmds/ocm/pkg/processing/processing.go b/cmds/ocm/common/processing/processing.go
similarity index 97%
rename from cmds/ocm/pkg/processing/processing.go
rename to cmds/ocm/common/processing/processing.go
index a01e44bfb..61fb794fe 100644
--- a/cmds/ocm/pkg/processing/processing.go
+++ b/cmds/ocm/common/processing/processing.go
@@ -3,7 +3,7 @@ package processing
import (
"github.com/mandelsoft/logging"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/data"
+ "ocm.software/ocm/cmds/ocm/common/data"
)
type IncrementalProcessingSource interface {
diff --git a/cmds/ocm/pkg/processing/processing_test.go b/cmds/ocm/common/processing/processing_test.go
similarity index 97%
rename from cmds/ocm/pkg/processing/processing_test.go
rename to cmds/ocm/common/processing/processing_test.go
index 1b308d9e0..cdf325964 100644
--- a/cmds/ocm/pkg/processing/processing_test.go
+++ b/cmds/ocm/common/processing/processing_test.go
@@ -10,8 +10,8 @@ import (
"github.com/mandelsoft/goutils/testutils"
"github.com/mandelsoft/logging"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/data"
- ocmlog "github.com/open-component-model/ocm/pkg/logging"
+ ocmlog "ocm.software/ocm/api/utils/logging"
+ "ocm.software/ocm/cmds/ocm/common/data"
)
var AddOne = func(logger logging.Logger) func(e interface{}) interface{} {
diff --git a/cmds/ocm/pkg/processing/sequential.go b/cmds/ocm/common/processing/sequential.go
similarity index 98%
rename from cmds/ocm/pkg/processing/sequential.go
rename to cmds/ocm/common/processing/sequential.go
index 8114dedfc..7140c33b9 100644
--- a/cmds/ocm/pkg/processing/sequential.go
+++ b/cmds/ocm/common/processing/sequential.go
@@ -5,7 +5,7 @@ import (
"github.com/mandelsoft/logging"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/data"
+ "ocm.software/ocm/cmds/ocm/common/data"
)
type _SynchronousProcessing struct {
diff --git a/cmds/ocm/pkg/processing/suite_test.go b/cmds/ocm/common/processing/suite_test.go
similarity index 100%
rename from cmds/ocm/pkg/processing/suite_test.go
rename to cmds/ocm/common/processing/suite_test.go
diff --git a/cmds/ocm/pkg/processing/utils.go b/cmds/ocm/common/processing/utils.go
similarity index 100%
rename from cmds/ocm/pkg/processing/utils.go
rename to cmds/ocm/common/processing/utils.go
diff --git a/cmds/ocm/common/tree/convert.go b/cmds/ocm/common/tree/convert.go
new file mode 100644
index 000000000..4c457c131
--- /dev/null
+++ b/cmds/ocm/common/tree/convert.go
@@ -0,0 +1,54 @@
+package tree
+
+import (
+ "ocm.software/ocm/cmds/ocm/common/data"
+)
+
+type Objects []Object
+
+func ObjectSlice(s data.Iterable) Objects {
+ var a Objects
+ i := s.Iterator()
+ for i.HasNext() {
+ a = append(a, i.Next().(Object))
+ }
+ return a
+}
+
+var (
+ _ data.IndexedAccess = Objects{}
+ _ data.Iterable = Objects{}
+)
+
+func (o Objects) Len() int {
+ return len(o)
+}
+
+func (o Objects) Get(i int) interface{} {
+ return o[i]
+}
+
+func (o Objects) Iterator() data.Iterator {
+ return data.NewIndexedIterator(o)
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+type TreeObjects []*TreeObject
+
+var (
+ _ data.IndexedAccess = TreeObjects{}
+ _ data.Iterable = TreeObjects{}
+)
+
+func (o TreeObjects) Len() int {
+ return len(o)
+}
+
+func (o TreeObjects) Get(i int) interface{} {
+ return o[i]
+}
+
+func (o TreeObjects) Iterator() data.Iterator {
+ return data.NewIndexedIterator(o)
+}
diff --git a/cmds/ocm/pkg/tree/suite_test.go b/cmds/ocm/common/tree/suite_test.go
similarity index 100%
rename from cmds/ocm/pkg/tree/suite_test.go
rename to cmds/ocm/common/tree/suite_test.go
diff --git a/cmds/ocm/pkg/tree/tree.go b/cmds/ocm/common/tree/tree.go
similarity index 97%
rename from cmds/ocm/pkg/tree/tree.go
rename to cmds/ocm/common/tree/tree.go
index 120455994..8e4026f11 100644
--- a/cmds/ocm/pkg/tree/tree.go
+++ b/cmds/ocm/common/tree/tree.go
@@ -4,8 +4,8 @@ import (
"fmt"
"strings"
- "github.com/open-component-model/ocm/pkg/common"
- "github.com/open-component-model/ocm/pkg/utils"
+ "ocm.software/ocm/api/utils"
+ common "ocm.software/ocm/api/utils/misc"
)
type Object interface {
diff --git a/cmds/ocm/pkg/tree/tree_test.go b/cmds/ocm/common/tree/tree_test.go
similarity index 97%
rename from cmds/ocm/pkg/tree/tree_test.go
rename to cmds/ocm/common/tree/tree_test.go
index f7977f19c..99fbfc675 100644
--- a/cmds/ocm/pkg/tree/tree_test.go
+++ b/cmds/ocm/common/tree/tree_test.go
@@ -6,8 +6,8 @@ import (
. "github.com/onsi/ginkgo/v2"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/tree"
- "github.com/open-component-model/ocm/pkg/common"
+ common "ocm.software/ocm/api/utils/misc"
+ "ocm.software/ocm/cmds/ocm/common/tree"
)
type Elem struct {
diff --git a/cmds/ocm/pkg/utils/command.go b/cmds/ocm/common/utils/command.go
similarity index 97%
rename from cmds/ocm/pkg/utils/command.go
rename to cmds/ocm/common/utils/command.go
index 212cd13c7..97ccc0b34 100644
--- a/cmds/ocm/pkg/utils/command.go
+++ b/cmds/ocm/common/utils/command.go
@@ -8,9 +8,9 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/pflag"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/options"
- "github.com/open-component-model/ocm/pkg/cobrautils"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/utils/cobrautils"
+ "ocm.software/ocm/cmds/ocm/common/options"
)
// OCMCommand is a command pattern, that can be instantiated for a dediated
diff --git a/cmds/ocm/pkg/utils/fileutils.go b/cmds/ocm/common/utils/fileutils.go
similarity index 94%
rename from cmds/ocm/pkg/utils/fileutils.go
rename to cmds/ocm/common/utils/fileutils.go
index 17c85a605..0b605bf7d 100644
--- a/cmds/ocm/pkg/utils/fileutils.go
+++ b/cmds/ocm/common/utils/fileutils.go
@@ -5,7 +5,7 @@ import (
"github.com/mandelsoft/vfs/pkg/vfs"
- "github.com/open-component-model/ocm/pkg/utils"
+ "ocm.software/ocm/api/utils"
)
// IsExecutable returns true if a given file is executable.
diff --git a/cmds/ocm/pkg/utils/handling.go b/cmds/ocm/common/utils/handling.go
similarity index 97%
rename from cmds/ocm/pkg/utils/handling.go
rename to cmds/ocm/common/utils/handling.go
index 90b554d3b..1d65e8ced 100644
--- a/cmds/ocm/pkg/utils/handling.go
+++ b/cmds/ocm/common/utils/handling.go
@@ -8,7 +8,7 @@ import (
"github.com/mandelsoft/goutils/errors"
"github.com/mandelsoft/goutils/transformer"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/output"
+ "ocm.software/ocm/cmds/ocm/common/output"
)
type ElemSpec interface {
diff --git a/cmds/ocm/pkg/utils/plural.go b/cmds/ocm/common/utils/plural.go
similarity index 100%
rename from cmds/ocm/pkg/utils/plural.go
rename to cmds/ocm/common/utils/plural.go
diff --git a/cmds/ocm/pkg/utils/validate.go b/cmds/ocm/common/utils/validate.go
similarity index 100%
rename from cmds/ocm/pkg/utils/validate.go
rename to cmds/ocm/common/utils/validate.go
diff --git a/cmds/ocm/coretests/maven/cmd_test.go b/cmds/ocm/coretests/maven/cmd_test.go
index 2929697d2..bc9071b54 100644
--- a/cmds/ocm/coretests/maven/cmd_test.go
+++ b/cmds/ocm/coretests/maven/cmd_test.go
@@ -7,14 +7,14 @@ import (
. "github.com/mandelsoft/goutils/testutils"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
- . "github.com/open-component-model/ocm/cmds/ocm/testhelper"
+ . "ocm.software/ocm/cmds/ocm/testhelper"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/localblob"
- mavenacc "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/maven"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ctf"
- "github.com/open-component-model/ocm/pkg/maven"
- "github.com/open-component-model/ocm/pkg/maven/maventest"
+ "ocm.software/ocm/api/ocm"
+ "ocm.software/ocm/api/ocm/extensions/accessmethods/localblob"
+ mavenacc "ocm.software/ocm/api/ocm/extensions/accessmethods/maven"
+ "ocm.software/ocm/api/ocm/extensions/repositories/ctf"
+ "ocm.software/ocm/api/tech/maven"
+ "ocm.software/ocm/api/tech/maven/maventest"
)
const (
diff --git a/cmds/ocm/main.go b/cmds/ocm/main.go
index 2514bc96c..f092f7a18 100644
--- a/cmds/ocm/main.go
+++ b/cmds/ocm/main.go
@@ -4,8 +4,8 @@ import (
"fmt"
"os"
- "github.com/open-component-model/ocm/cmds/ocm/app"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/cmds/ocm/app"
)
func main() {
diff --git a/cmds/ocm/ocm_test.go b/cmds/ocm/ocm_test.go
index 77602644e..e9454baf0 100644
--- a/cmds/ocm/ocm_test.go
+++ b/cmds/ocm/ocm_test.go
@@ -6,10 +6,10 @@ import (
. "github.com/mandelsoft/goutils/testutils"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
- . "github.com/open-component-model/ocm/cmds/ocm/testhelper"
+ . "ocm.software/ocm/cmds/ocm/testhelper"
- "github.com/open-component-model/ocm/pkg/common/accessio"
- "github.com/open-component-model/ocm/pkg/contexts/oci/attrs/cacheattr"
+ "ocm.software/ocm/api/oci/extensions/attrs/cacheattr"
+ "ocm.software/ocm/api/utils/accessio"
)
var _ = Describe("OCM command line test Environment", func() {
diff --git a/cmds/ocm/pkg/options/options_test.go b/cmds/ocm/pkg/options/options_test.go
deleted file mode 100644
index 92914958f..000000000
--- a/cmds/ocm/pkg/options/options_test.go
+++ /dev/null
@@ -1,56 +0,0 @@
-package options_test
-
-import (
- . "github.com/onsi/ginkgo/v2"
- . "github.com/onsi/gomega"
-
- "github.com/spf13/pflag"
-
- "github.com/open-component-model/ocm/cmds/ocm/pkg/options"
-)
-
-type TestOption struct {
- Flag bool
-}
-
-func (t *TestOption) AddFlags(fs *pflag.FlagSet) {
- fs.BoolVarP(&t.Flag, "flag", "f", false, "test flag")
-}
-
-var _ options.Options = (*TestOption)(nil)
-
-var _ = Describe("options", func() {
- It("skips unknown option", func() {
- set := options.OptionSet{}
-
- var opt *TestOption
- Expect(set.Get(&opt)).To(BeFalse())
- })
-
- It("assigns options pointer from set", func() {
- inst := &TestOption{}
- set := options.OptionSet{inst}
- set.Options(inst).(*TestOption).Flag = true
-
- var opt *TestOption
- Expect(set.Get(&opt)).To(BeTrue())
- Expect(opt.Flag).To(BeTrue())
- Expect(opt).To(BeIdenticalTo(inst))
-
- Expect(set.Get(&set)).To(BeFalse())
- })
-
- It("assigns options value from set", func() {
- inst := &TestOption{}
- set := options.OptionSet{inst}
-
- set.Options(inst).(*TestOption).Flag = true
-
- var opt TestOption
- Expect(set.Get(&opt)).To(BeTrue())
- Expect(opt.Flag).To(BeTrue())
-
- opt.Flag = false
- Expect(inst.Flag).To(BeTrue())
- })
-})
diff --git a/cmds/ocm/pkg/output/chain.go b/cmds/ocm/pkg/output/chain.go
deleted file mode 100644
index bcbca994a..000000000
--- a/cmds/ocm/pkg/output/chain.go
+++ /dev/null
@@ -1,17 +0,0 @@
-package output
-
-import (
- "github.com/open-component-model/ocm/cmds/ocm/pkg/processing"
-)
-
-type ChainFunction func(opts *Options) processing.ProcessChain
-
-func ComposeChain(funcs ...ChainFunction) ChainFunction {
- return func(opts *Options) processing.ProcessChain {
- var chain processing.ProcessChain
- for _, f := range funcs {
- chain = processing.Append(chain, f(opts))
- }
- return chain
- }
-}
diff --git a/cmds/ocm/pkg/output/options.go b/cmds/ocm/pkg/output/options.go
deleted file mode 100644
index c68e7db67..000000000
--- a/cmds/ocm/pkg/output/options.go
+++ /dev/null
@@ -1,198 +0,0 @@
-package output
-
-import (
- "fmt"
- "strings"
-
- "github.com/mandelsoft/goutils/errors"
- "github.com/mandelsoft/goutils/sliceutils"
- "github.com/mandelsoft/logging"
- "github.com/spf13/pflag"
-
- "github.com/open-component-model/ocm/cmds/ocm/pkg/options"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/processing"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
- "github.com/open-component-model/ocm/pkg/listformat"
- "github.com/open-component-model/ocm/pkg/utils"
-)
-
-func From(o options.OptionSetProvider) *Options {
- var opts *Options
- if me, ok := o.(*Options); ok {
- return me
- }
- o.AsOptionSet().Get(&opts)
- return opts
-}
-
-func Selected(mode string) func(o options.OptionSetProvider) bool {
- return func(o options.OptionSetProvider) bool {
- return From(o).OutputMode == mode
- }
-}
-
-// StatusCheckFunction manipulates the processing status error according to
-// the state of the given entry.
-type StatusCheckFunction func(opts *Options, e interface{}, old error) error
-
-type Options struct {
- options.OptionSet
-
- allColumns bool
-
- Outputs Outputs
- OutputMode string
- Output Output
- Sort []string
- StatusCheck StatusCheckFunction
- OptimizedColumns int
- FixedColums int
- Context clictx.Context // this context could be ocm context.
- Logging logging.Context
-}
-
-func OutputOptions(outputs Outputs, opts ...options.Options) *Options {
- return &Options{
- Outputs: outputs,
- OptionSet: opts,
- }
-}
-
-func (o *Options) OptimizeColumns(n int) *Options {
- o.OptimizedColumns = n
- return o
-}
-
-// WithStatusCheck provides the possibility to check every entry to
-// influence the final out status.
-func (o *Options) WithStatusCheck(f StatusCheckFunction) *Options {
- o.StatusCheck = f
- return o
-}
-
-func (o *Options) AdaptChain(errvar *error, chain processing.ProcessChain) processing.ProcessChain {
- if o.StatusCheck != nil {
- chain = processing.Map(func(e interface{}) interface{} {
- *errvar = o.StatusCheck(o, e, *errvar)
- return e
- }).Append(chain)
- }
- return chain
-}
-
-func (o *Options) LogContext() logging.Context {
- if o.Logging != nil {
- return o.Logging
- }
- return logging.DefaultContext()
-}
-
-func (o *Options) Options(proto options.Options) interface{} {
- return o.OptionSet.Options(proto)
-}
-
-func (o *Options) Get(proto interface{}) bool {
- return o.OptionSet.Get(proto)
-}
-
-func (o *Options) UseColumnOptimization() bool {
- return o.OptimizedColumns > 0 && !o.allColumns
-}
-
-func (o *Options) AddFlags(fs *pflag.FlagSet) {
- s := ""
- if len(o.Outputs) > 1 {
- list := utils.StringMapKeys(o.Outputs)
- sep := ""
- for _, o := range list {
- if o != "" {
- s = fmt.Sprintf("%s%s%s", s, sep, o)
- sep = ", "
- }
- }
- fs.StringVarP(&o.OutputMode, "output", "o", "", fmt.Sprintf("output mode (%s)", s))
- }
-
- // TODO: not the best solution to instantiate all possible outputs to figure out, whether sort fields
- // are available or not
- for _, out := range o.Outputs {
- if _, ok := out(o).(SortFields); ok {
- fs.StringArrayVarP(&o.Sort, "sort", "s", nil, "sort fields")
- break
- }
- }
-
- if o.OptimizedColumns > 0 {
- fs.BoolVarP(&o.allColumns, "all-columns", "", false, "show all table columns")
- }
- o.OptionSet.AddFlags(fs)
-}
-
-func (o *Options) Configure(ctx clictx.Context) error {
- o.Context = ctx
-
- // process sub options first, to assure that output options are available for output
- // mode creation
- err := o.OptionSet.ProcessOnOptions(options.CompleteOptionsWithCLIContext(ctx))
- if err != nil {
- return err
- }
-
- if f := o.Outputs[o.OutputMode]; f == nil {
- return errors.ErrInvalid("output mode", o.OutputMode)
- } else {
- o.Output = f(o)
- }
-
- var avail sliceutils.OrderedSlice[string]
-
- var fields []string
-
- if s, ok := o.Output.(SortFields); ok {
- avail = s.GetSortFields()
- }
- for _, f := range o.Sort {
- split := strings.Split(f, ",")
- for _, s := range split {
- s = strings.TrimSpace(s)
- if s != "" {
- if avail.Contains(s) {
- fields = append(fields, s)
- } else {
- return errors.ErrInvalid("sort field", s)
- }
- }
- }
- }
- o.Sort = fields
- return nil
-}
-
-func (o *Options) CompleteAll(ctx clictx.Context) error {
- err := o.Configure(ctx)
- if err == nil {
- err = o.OptionSet.ProcessOnOptions(options.CompleteOptionsWithCLIContext(ctx))
- }
- if err != nil {
- return err
- }
- return err
-}
-
-func (o *Options) Usage() string {
- s := o.OptionSet.Usage()
-
- if len(o.Outputs) > 1 {
- s += `
-With the option --output the output mode can be selected.
-The following modes are supported:
-` + listformat.FormatList(o.OutputMode, utils.StringMapKeys(o.Outputs)...)
- }
- return s
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-func OutputModeCondition(opts *Options, mode string) options.Condition {
- return options.Flag(opts.OutputMode == mode)
-}
diff --git a/cmds/ocm/pkg/processing/chain.go b/cmds/ocm/pkg/processing/chain.go
deleted file mode 100644
index 5e1fa8653..000000000
--- a/cmds/ocm/pkg/processing/chain.go
+++ /dev/null
@@ -1,196 +0,0 @@
-package processing
-
-import (
- "github.com/mandelsoft/logging"
-
- "github.com/open-component-model/ocm/cmds/ocm/pkg/data"
- "github.com/open-component-model/ocm/cmds/ocm/pkg/options"
-)
-
-// ProcessChain is a data structure holding a chain definition, which is
-// a chain of step creation functions used to instantiate the chain
-// for a dedicated input processing.
-// The instantiation is initiated by calling the Process
-// method on a chain.
-type ProcessChain interface {
- Transform(t TransformFunction) ProcessChain
- Explode(m ExplodeFunction) ProcessChain
- Map(m MappingFunction) ProcessChain
- Filter(f FilterFunction) ProcessChain
- Sort(c CompareFunction) ProcessChain
- WithPool(p ProcessorPool) ProcessChain
- Unordered() ProcessChain
- Parallel(n int) ProcessChain
- Append(p ProcessChain) ProcessChain
-
- Process(data data.Iterable) ProcessingResult
-}
-
-type stepCreator func(ProcessingResult) ProcessingResult
-
-type _ProcessChain struct {
- parent *_ProcessChain
- creator stepCreator
- log logging.Context
-}
-
-var _ ProcessChain = &_ProcessChain{}
-
-func Chain(log logging.Context) ProcessChain {
- return (&_ProcessChain{}).new(log, nil, nil)
-}
-
-func (this *_ProcessChain) new(log logging.Context, p *_ProcessChain, creator stepCreator) *_ProcessChain {
- if p != nil {
- if log == nil {
- log = p.log
- }
- if p.creator != nil {
- this.parent = p
- } else if p.parent != nil {
- this.parent = p.parent
- }
- }
- if log == nil {
- log = logging.DefaultContext()
- }
- if this.parent != nil && creator == nil {
- return this.parent
- }
- this.creator = creator
- this.log = log
- return this
-}
-
-func (this *_ProcessChain) Transform(t TransformFunction) ProcessChain {
- if t == nil {
- return this
- }
- return (&_ProcessChain{}).new(this.log, this, chainTransform(t))
-}
-
-func (this *_ProcessChain) Explode(e ExplodeFunction) ProcessChain {
- if e == nil {
- return this
- }
- return (&_ProcessChain{}).new(this.log, this, chainExplode(e))
-}
-
-func (this *_ProcessChain) Map(m MappingFunction) ProcessChain {
- if m == nil {
- return this
- }
- return (&_ProcessChain{}).new(this.log, this, chainMap(m))
-}
-
-func (this *_ProcessChain) Filter(f FilterFunction) ProcessChain {
- if f == nil {
- return this
- }
- return (&_ProcessChain{}).new(this.log, this, chainFilter(f))
-}
-
-func (this *_ProcessChain) Sort(c CompareFunction) ProcessChain {
- if c == nil {
- return this
- }
- return (&_ProcessChain{}).new(this.log, this, chainSort(c))
-}
-
-func (this *_ProcessChain) WithPool(p ProcessorPool) ProcessChain {
- return (&_ProcessChain{}).new(this.log, this, chainWithPool(p))
-}
-
-func (this *_ProcessChain) Unordered() ProcessChain {
- return (&_ProcessChain{}).new(this.log, this, chainUnordered)
-}
-
-func (this *_ProcessChain) Parallel(n int) ProcessChain {
- return (&_ProcessChain{}).new(this.log, this, chainParallel(n))
-}
-
-func (this *_ProcessChain) Append(p ProcessChain) ProcessChain {
- if p == nil {
- return this
- }
- return (&_ProcessChain{}).new(this.log, this, chainApply(p))
-}
-
-// Process instantiates a processing chain for a dedicated input
-// It builds a dedicated execution structure
-// based on the chain functioned stored along the chain definition.
-func (this *_ProcessChain) Process(data data.Iterable) ProcessingResult {
- p, ok := data.(ProcessingResult)
- if this.parent != nil {
- p = this.parent.Process(data)
- } else if !ok {
- p = Process(this.log, data)
- }
- return this.step(p)
-}
-
-func (this *_ProcessChain) step(p ProcessingResult) ProcessingResult {
- if this.creator == nil {
- return p
- }
- return this.creator(p)
-}
-
-func chainTransform(t TransformFunction) stepCreator {
- return func(p ProcessingResult) ProcessingResult { return p.Transform(t) }
-}
-
-func chainExplode(e ExplodeFunction) stepCreator {
- return func(p ProcessingResult) ProcessingResult { return p.Explode(e) }
-}
-
-func chainMap(m MappingFunction) stepCreator {
- return func(p ProcessingResult) ProcessingResult { return p.Map(m) }
-}
-
-func chainFilter(f FilterFunction) stepCreator {
- return func(p ProcessingResult) ProcessingResult { return p.Filter(f) }
-}
-
-func chainSort(c CompareFunction) stepCreator {
- return func(p ProcessingResult) ProcessingResult { return p.Sort(c) }
-}
-
-func chainWithPool(pool ProcessorPool) stepCreator {
- return func(p ProcessingResult) ProcessingResult { return p.WithPool(pool) }
-}
-
-func chainParallel(n int) stepCreator {
- return func(p ProcessingResult) ProcessingResult { return p.Parallel(n) }
-}
-func chainUnordered(p ProcessingResult) ProcessingResult { return p.Unordered() }
-
-func chainApply(c ProcessChain) stepCreator {
- return func(p ProcessingResult) ProcessingResult {
- return p.Apply(c)
- }
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-var initial = Chain(logging.DefaultContext())
-
-func Transform(t TransformFunction) ProcessChain { return initial.Transform(t) }
-func Explode(e ExplodeFunction) ProcessChain { return initial.Explode(e) }
-func Map(m MappingFunction) ProcessChain { return initial.Map(m) }
-func Filter(f FilterFunction) ProcessChain { return initial.Filter(f) }
-func Sort(c CompareFunction) ProcessChain { return initial.Sort(c) }
-func WithPool(pool ProcessorPool) ProcessChain { return initial.WithPool(pool) }
-func Parallel(n int) ProcessChain { return initial.Parallel(n) }
-func Unordered() ProcessChain { return initial.Unordered() }
-func Append(chain, add ProcessChain, conditions ...options.Condition) ProcessChain {
- if add != nil {
- if options.And(conditions...).IsTrue() {
- if chain == nil {
- return add
- }
- return chain.Append(add)
- }
- }
- return chain
-}
diff --git a/cmds/ocm/pkg/processing/logging.go b/cmds/ocm/pkg/processing/logging.go
deleted file mode 100644
index efdc63ee2..000000000
--- a/cmds/ocm/pkg/processing/logging.go
+++ /dev/null
@@ -1,7 +0,0 @@
-package processing
-
-import (
- ocmlog "github.com/open-component-model/ocm/pkg/logging"
-)
-
-var REALM = ocmlog.DefineSubRealm("output processing chains", "processing")
diff --git a/cmds/ocm/pkg/tree/convert.go b/cmds/ocm/pkg/tree/convert.go
deleted file mode 100644
index 6c8e9a3dd..000000000
--- a/cmds/ocm/pkg/tree/convert.go
+++ /dev/null
@@ -1,54 +0,0 @@
-package tree
-
-import (
- "github.com/open-component-model/ocm/cmds/ocm/pkg/data"
-)
-
-type Objects []Object
-
-func ObjectSlice(s data.Iterable) Objects {
- var a Objects
- i := s.Iterator()
- for i.HasNext() {
- a = append(a, i.Next().(Object))
- }
- return a
-}
-
-var (
- _ data.IndexedAccess = Objects{}
- _ data.Iterable = Objects{}
-)
-
-func (o Objects) Len() int {
- return len(o)
-}
-
-func (o Objects) Get(i int) interface{} {
- return o[i]
-}
-
-func (o Objects) Iterator() data.Iterator {
- return data.NewIndexedIterator(o)
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-type TreeObjects []*TreeObject
-
-var (
- _ data.IndexedAccess = TreeObjects{}
- _ data.Iterable = TreeObjects{}
-)
-
-func (o TreeObjects) Len() int {
- return len(o)
-}
-
-func (o TreeObjects) Get(i int) interface{} {
- return o[i]
-}
-
-func (o TreeObjects) Iterator() data.Iterator {
- return data.NewIndexedIterator(o)
-}
diff --git a/cmds/ocm/testhelper/env.go b/cmds/ocm/testhelper/env.go
index 1becc71cc..d30964bdb 100644
--- a/cmds/ocm/testhelper/env.go
+++ b/cmds/ocm/testhelper/env.go
@@ -6,16 +6,16 @@ import (
"github.com/mandelsoft/vfs/pkg/vfs"
"github.com/spf13/cobra"
- "github.com/open-component-model/ocm/cmds/ocm/app"
- "github.com/open-component-model/ocm/pkg/common/accessio"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
- "github.com/open-component-model/ocm/pkg/contexts/config"
- "github.com/open-component-model/ocm/pkg/contexts/credentials"
- "github.com/open-component-model/ocm/pkg/contexts/datacontext"
- "github.com/open-component-model/ocm/pkg/contexts/oci"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
- "github.com/open-component-model/ocm/pkg/env"
- "github.com/open-component-model/ocm/pkg/env/builder"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/config"
+ "ocm.software/ocm/api/credentials"
+ "ocm.software/ocm/api/datacontext"
+ "ocm.software/ocm/api/helper/builder"
+ "ocm.software/ocm/api/helper/env"
+ "ocm.software/ocm/api/oci"
+ "ocm.software/ocm/api/ocm"
+ "ocm.software/ocm/api/utils/accessio"
+ "ocm.software/ocm/cmds/ocm/app"
)
type CLI struct {
diff --git a/cmds/ocm/testhelper/forward.go b/cmds/ocm/testhelper/forward.go
index 4ab63e22b..b869eede2 100644
--- a/cmds/ocm/testhelper/forward.go
+++ b/cmds/ocm/testhelper/forward.go
@@ -1,7 +1,7 @@
package testhelper
import (
- "github.com/open-component-model/ocm/pkg/env"
+ "ocm.software/ocm/api/helper/env"
)
var (
diff --git a/cmds/ocm/topics/common/attributes/topic.go b/cmds/ocm/topics/common/attributes/topic.go
index 02593673b..6fc57bf28 100644
--- a/cmds/ocm/topics/common/attributes/topic.go
+++ b/cmds/ocm/topics/common/attributes/topic.go
@@ -6,8 +6,8 @@ import (
"github.com/spf13/cobra"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
- "github.com/open-component-model/ocm/pkg/contexts/datacontext"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/datacontext"
)
func New(ctx clictx.Context) *cobra.Command {
diff --git a/cmds/ocm/topics/common/config/topic.go b/cmds/ocm/topics/common/config/topic.go
index c246b7062..de40ea6d7 100644
--- a/cmds/ocm/topics/common/config/topic.go
+++ b/cmds/ocm/topics/common/config/topic.go
@@ -3,7 +3,7 @@ package topicconfig
import (
"github.com/spf13/cobra"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
+ clictx "ocm.software/ocm/api/cli"
)
func New(ctx clictx.Context) *cobra.Command {
diff --git a/cmds/ocm/topics/common/credentials/topic.go b/cmds/ocm/topics/common/credentials/topic.go
index 1b9136e87..26cb06fd1 100644
--- a/cmds/ocm/topics/common/credentials/topic.go
+++ b/cmds/ocm/topics/common/credentials/topic.go
@@ -3,9 +3,9 @@ package attributes
import (
"github.com/spf13/cobra"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
- "github.com/open-component-model/ocm/pkg/contexts/credentials"
- "github.com/open-component-model/ocm/pkg/listformat"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/credentials"
+ "ocm.software/ocm/api/utils/listformat"
)
func New(ctx clictx.Context) *cobra.Command {
diff --git a/cmds/ocm/topics/common/logging/topic.go b/cmds/ocm/topics/common/logging/topic.go
index 6ef01a8cd..a56af507e 100644
--- a/cmds/ocm/topics/common/logging/topic.go
+++ b/cmds/ocm/topics/common/logging/topic.go
@@ -7,10 +7,10 @@ import (
"github.com/mandelsoft/logging"
"github.com/spf13/cobra"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
- "github.com/open-component-model/ocm/pkg/contexts/datacontext"
- logcfg "github.com/open-component-model/ocm/pkg/contexts/datacontext/config/logging"
- utils2 "github.com/open-component-model/ocm/pkg/listformat"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/datacontext"
+ logcfg "ocm.software/ocm/api/datacontext/config/logging"
+ utils2 "ocm.software/ocm/api/utils/listformat"
)
func New(ctx clictx.Context) *cobra.Command {
diff --git a/cmds/ocm/topics/oci/refs/topic.go b/cmds/ocm/topics/oci/refs/topic.go
index 10452fc76..50709ed18 100644
--- a/cmds/ocm/topics/oci/refs/topic.go
+++ b/cmds/ocm/topics/oci/refs/topic.go
@@ -5,8 +5,8 @@ import (
"github.com/spf13/cobra"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
- "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/ctf"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/oci/extensions/repositories/ctf"
)
func New(ctx clictx.Context) *cobra.Command {
diff --git a/cmds/ocm/topics/ocm/accessmethods/topic.go b/cmds/ocm/topics/ocm/accessmethods/topic.go
index 7d3d95867..f3fa0ad87 100644
--- a/cmds/ocm/topics/ocm/accessmethods/topic.go
+++ b/cmds/ocm/topics/ocm/accessmethods/topic.go
@@ -3,8 +3,8 @@ package topicocmaccessmethods
import (
"github.com/spf13/cobra"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/ocm"
)
func New(ctx clictx.Context) *cobra.Command {
diff --git a/cmds/ocm/topics/ocm/downloadhandlers/topic.go b/cmds/ocm/topics/ocm/downloadhandlers/topic.go
index 9ea165bb3..cd0652dfa 100644
--- a/cmds/ocm/topics/ocm/downloadhandlers/topic.go
+++ b/cmds/ocm/topics/ocm/downloadhandlers/topic.go
@@ -3,8 +3,8 @@ package topicocmaccessmethods
import (
"github.com/spf13/cobra"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/downloaderoption"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/downloaderoption"
)
func New(ctx clictx.Context) *cobra.Command {
diff --git a/cmds/ocm/topics/ocm/labels/topic.go b/cmds/ocm/topics/ocm/labels/topic.go
index 1cc967238..fda7563e7 100644
--- a/cmds/ocm/topics/ocm/labels/topic.go
+++ b/cmds/ocm/topics/ocm/labels/topic.go
@@ -3,8 +3,8 @@ package topicocmlabels
import (
"github.com/spf13/cobra"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/valuemergehandler"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/ocm/valuemergehandler"
)
func New(ctx clictx.Context) *cobra.Command {
diff --git a/cmds/ocm/topics/ocm/pubsub/topic.go b/cmds/ocm/topics/ocm/pubsub/topic.go
index cd7fc6db3..06ddb2470 100644
--- a/cmds/ocm/topics/ocm/pubsub/topic.go
+++ b/cmds/ocm/topics/ocm/pubsub/topic.go
@@ -3,8 +3,8 @@ package topicocmpubsub
import (
"github.com/spf13/cobra"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/pubsub"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/api/ocm/extensions/pubsub"
)
func New(ctx clictx.Context) *cobra.Command {
diff --git a/cmds/ocm/topics/ocm/refs/topic.go b/cmds/ocm/topics/ocm/refs/topic.go
index ea76985b1..8dbe2e429 100644
--- a/cmds/ocm/topics/ocm/refs/topic.go
+++ b/cmds/ocm/topics/ocm/refs/topic.go
@@ -3,8 +3,8 @@ package topicocmrefs
import (
"github.com/spf13/cobra"
- topicocirefs "github.com/open-component-model/ocm/cmds/ocm/topics/oci/refs"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
+ clictx "ocm.software/ocm/api/cli"
+ topicocirefs "ocm.software/ocm/cmds/ocm/topics/oci/refs"
)
func New(ctx clictx.Context) *cobra.Command {
diff --git a/cmds/ocm/topics/ocm/uploadhandlers/topic.go b/cmds/ocm/topics/ocm/uploadhandlers/topic.go
index a706957b4..dedf6ce4e 100644
--- a/cmds/ocm/topics/ocm/uploadhandlers/topic.go
+++ b/cmds/ocm/topics/ocm/uploadhandlers/topic.go
@@ -3,8 +3,8 @@ package topicocmaccessmethods
import (
"github.com/spf13/cobra"
- "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/uploaderoption"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
+ clictx "ocm.software/ocm/api/cli"
+ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/options/uploaderoption"
)
func New(ctx clictx.Context) *cobra.Command {
diff --git a/cmds/ocm/topics/toi/bootstrapping/topic.go b/cmds/ocm/topics/toi/bootstrapping/topic.go
index ae402b7c5..3bb896da6 100644
--- a/cmds/ocm/topics/toi/bootstrapping/topic.go
+++ b/cmds/ocm/topics/toi/bootstrapping/topic.go
@@ -3,10 +3,10 @@ package bootstapping
import (
"github.com/spf13/cobra"
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/resourcetypes"
- "github.com/open-component-model/ocm/pkg/mime"
- "github.com/open-component-model/ocm/pkg/toi"
+ clictx "ocm.software/ocm/api/cli"
+ resourcetypes "ocm.software/ocm/api/ocm/extensions/artifacttypes"
+ "ocm.software/ocm/api/ocm/tools/toi"
+ "ocm.software/ocm/api/utils/mime"
)
func New(ctx clictx.Context, name string) *cobra.Command {
diff --git a/cmds/subcmdplugin/cmds/cmd_test.go b/cmds/subcmdplugin/cmds/cmd_test.go
index 54dac71e6..240349caa 100644
--- a/cmds/subcmdplugin/cmds/cmd_test.go
+++ b/cmds/subcmdplugin/cmds/cmd_test.go
@@ -8,10 +8,10 @@ import (
. "github.com/mandelsoft/goutils/testutils"
. "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/contexts/ocm/plugin/testutils"
+ . "ocm.software/ocm/api/ocm/plugin/testutils"
+ . "ocm.software/ocm/cmds/ocm/testhelper"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/attrs/plugincacheattr"
+ "ocm.software/ocm/api/ocm/extensions/attrs/plugincacheattr"
)
var _ = Describe("subcmdplugin", func() {
diff --git a/cmds/subcmdplugin/cmds/demo/cmd.go b/cmds/subcmdplugin/cmds/demo/cmd.go
index aa96ac8ba..78a142f76 100644
--- a/cmds/subcmdplugin/cmds/demo/cmd.go
+++ b/cmds/subcmdplugin/cmds/demo/cmd.go
@@ -6,7 +6,7 @@ import (
"strings"
// bind OCM configuration.
- _ "github.com/open-component-model/ocm/pkg/contexts/ocm/plugin/ppi/config"
+ _ "ocm.software/ocm/api/ocm/plugin/ppi/config"
"github.com/spf13/cobra"
)
diff --git a/cmds/subcmdplugin/cmds/group/cmd.go b/cmds/subcmdplugin/cmds/group/cmd.go
index 7f53d1ea0..cdffc32e3 100644
--- a/cmds/subcmdplugin/cmds/group/cmd.go
+++ b/cmds/subcmdplugin/cmds/group/cmd.go
@@ -3,7 +3,7 @@ package group
import (
"github.com/spf13/cobra"
- "github.com/open-component-model/ocm/cmds/subcmdplugin/cmds/demo"
+ "ocm.software/ocm/cmds/subcmdplugin/cmds/demo"
)
const Name = "group"
diff --git a/cmds/subcmdplugin/main.go b/cmds/subcmdplugin/main.go
index 07e0d504a..842f17752 100644
--- a/cmds/subcmdplugin/main.go
+++ b/cmds/subcmdplugin/main.go
@@ -4,13 +4,13 @@ import (
"os"
// enable mandelsoft plugin logging configuration.
- _ "github.com/open-component-model/ocm/pkg/contexts/ocm/plugin/ppi/logging"
+ _ "ocm.software/ocm/api/ocm/plugin/ppi/logging"
- "github.com/open-component-model/ocm/cmds/subcmdplugin/cmds/group"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/plugin/ppi"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/plugin/ppi/clicmd"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/plugin/ppi/cmds"
- "github.com/open-component-model/ocm/pkg/version"
+ "ocm.software/ocm/api/ocm/plugin/ppi"
+ "ocm.software/ocm/api/ocm/plugin/ppi/clicmd"
+ "ocm.software/ocm/api/ocm/plugin/ppi/cmds"
+ "ocm.software/ocm/api/version"
+ "ocm.software/ocm/cmds/subcmdplugin/cmds/group"
)
func main() {
diff --git a/components/demoplugin/Makefile b/components/demoplugin/Makefile
index 12532b0b9..b10d4e36d 100644
--- a/components/demoplugin/Makefile
+++ b/components/demoplugin/Makefile
@@ -6,7 +6,7 @@ OCMREPO ?= ghcr.io/$(GITHUBORG)/ocm
PLATFORMS = linux/amd64 linux/arm64
REPO_ROOT := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))/../..
-VERSION = $(shell go run ../../pkg/version/generate/release_generate.go print-rc-version $(CANDIDATE))
+VERSION = $(shell go run ../../api/version/generate/release_generate.go print-rc-version $(CANDIDATE))
COMMIT = $(shell git rev-parse HEAD)
EFFECTIVE_VERSION = $(VERSION)+$(COMMIT)
GIT_TREE_STATE := $(shell [ -z "$$(git status --porcelain 2>/dev/null)" ] && echo clean || echo dirty)
@@ -21,10 +21,10 @@ GEN = $(REPO_ROOT)/gen/$(NAME)
NOW := $(shell date -u +%FT%T%z)
BUILD_FLAGS := "-s -w \
- -X github.com/open-component-model/ocm/pkg/version.gitVersion=$(EFFECTIVE_VERSION) \
- -X github.com/open-component-model/ocm/pkg/version.gitTreeState=$(GIT_TREE_STATE) \
- -X github.com/open-component-model/ocm/pkg/version.gitCommit=$(COMMIT) \
- -X github.com/open-component-model/ocm/pkg/version.buildDate=$(NOW)"
+ -X ocm.software/ocm/api/version.gitVersion=$(EFFECTIVE_VERSION) \
+ -X ocm.software/ocm/api/version.gitTreeState=$(GIT_TREE_STATE) \
+ -X ocm.software/ocm/api/version.gitCommit=$(COMMIT) \
+ -X ocm.software/ocm/api/version.buildDate=$(NOW)"
.PHONY: build
diff --git a/components/ecrplugin/Makefile b/components/ecrplugin/Makefile
index cb4dc4cb3..3f037f8f2 100644
--- a/components/ecrplugin/Makefile
+++ b/components/ecrplugin/Makefile
@@ -7,7 +7,7 @@ PLATFORMS = linux/amd64 linux/arm64 darwin/amd64 darwin/arm64
REPO_ROOT := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))/../..
-VERSION = $(shell go run ../../pkg/version/generate/release_generate.go print-rc-version $(CANDIDATE))
+VERSION = $(shell go run ../../api/version/generate/release_generate.go print-rc-version $(CANDIDATE))
COMMIT = $(shell git rev-parse HEAD)
EFFECTIVE_VERSION = $(VERSION)+$(COMMIT)
GIT_TREE_STATE := $(shell [ -z "$$(git status --porcelain 2>/dev/null)" ] && echo clean || echo dirty)
@@ -22,10 +22,10 @@ GEN = $(REPO_ROOT)/gen/$(NAME)
NOW := $(shell date -u +%FT%T%z)
BUILD_FLAGS := "-s -w \
- -X github.com/open-component-model/ocm/pkg/version.gitVersion=$(EFFECTIVE_VERSION) \
- -X github.com/open-component-model/ocm/pkg/version.gitTreeState=$(GIT_TREE_STATE) \
- -X github.com/open-component-model/ocm/pkg/version.gitCommit=$(COMMIT) \
- -X github.com/open-component-model/ocm/pkg/version.buildDate=$(NOW)"
+ -X ocm.software/ocm/api/version.gitVersion=$(EFFECTIVE_VERSION) \
+ -X ocm.software/ocm/api/version.gitTreeState=$(GIT_TREE_STATE) \
+ -X ocm.software/ocm/api/version.gitCommit=$(COMMIT) \
+ -X ocm.software/ocm/api/version.buildDate=$(NOW)"
.PHONY: build
diff --git a/components/helmdemo/Makefile b/components/helmdemo/Makefile
index 7c246ea78..626833154 100644
--- a/components/helmdemo/Makefile
+++ b/components/helmdemo/Makefile
@@ -7,7 +7,7 @@ OCMREPO ?= ghcr.io/$(GITHUBORG)/ocm
HELMINSTCOMP = $(PROVIDER)/toi/installers/helminstaller
REPO_ROOT := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))/../..
-VERSION = $(shell go run ../../pkg/version/generate/release_generate.go print-rc-version $(CANDIDATE))
+VERSION = $(shell go run ../../api/version/generate/release_generate.go print-rc-version $(CANDIDATE))
COMMIT = $(shell git rev-parse HEAD)
EFFECTIVE_VERSION = $(VERSION)-$(COMMIT)
HELMINSTVERSION ?= $(VERSION)
diff --git a/components/helminstaller/Dockerfile b/components/helminstaller/Dockerfile
index df0112adb..7356447b3 100644
--- a/components/helminstaller/Dockerfile
+++ b/components/helminstaller/Dockerfile
@@ -2,19 +2,19 @@ FROM --platform=$BUILDPLATFORM golang:1.22 AS builder
ARG COMMIT EFFECTIVE_VERSION GIT_TREE_STATE
ARG TARGETOS TARGETARCH
-WORKDIR /go/src/github.com/open-component-model/ocm/
+WORKDIR /go/src/ocm.software/ocm/
COPY go.* *.go VERSION ./
-COPY pkg pkg
+COPY api api
COPY cmds cmds
COPY hack/generate-docs hack/generate-docs
-#COPY go/pkg pkg
+#COPY go/api api
RUN --mount=type=cache,target=/root/.cache/go-build go get -d ./...
RUN --mount=type=cache,target=/root/.cache/go-build CGO_ENABLED=0 GOOS=$TARGETOS GOARCH=$TARGETARCH \
go build -o /main -ldflags "-s -w \
- -X github.com/open-component-model/ocm/pkg/version.gitVersion=$EFFECTIVE_VERSION \
- -X github.com/open-component-model/ocm/pkg/version.gitTreeState=$GIT_TREE_STATE \
- -X github.com/open-component-model/ocm/pkg/version.gitCommit=$COMMIT \
- -X github.com/open-component-model/ocm/pkg/version.buildDate=$(date -u +%FT%T%z)" \
+ -X ocm.software/ocm/api/version.gitVersion=$EFFECTIVE_VERSION \
+ -X ocm.software/ocm/api/version.gitTreeState=$GIT_TREE_STATE \
+ -X ocm.software/ocm/api/version.gitCommit=$COMMIT \
+ -X ocm.software/ocm/api/version.buildDate=$(date -u +%FT%T%z)" \
./cmds/helminstaller
###################################################################################
diff --git a/components/helminstaller/Makefile b/components/helminstaller/Makefile
index a58c11f33..ccc438c2f 100644
--- a/components/helminstaller/Makefile
+++ b/components/helminstaller/Makefile
@@ -8,7 +8,7 @@ MULTI ?= true
PLATFORMS ?= linux/amd64 linux/arm64
REPO_ROOT := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))/../..
-VERSION := $(shell go run ../../pkg/version/generate/release_generate.go print-rc-version $(CANDIDATE))
+VERSION := $(shell go run ../../api/version/generate/release_generate.go print-rc-version $(CANDIDATE))
COMMIT := $(shell git rev-parse --verify HEAD)
EFFECTIVE_VERSION := $(VERSION)-$(COMMIT)
GIT_TREE_STATE := $(shell [ -z "$$(git status --porcelain 2>/dev/null)" ] && echo clean || echo dirty)
diff --git a/components/ocmcli/Makefile b/components/ocmcli/Makefile
index 30db9447f..66979a20b 100644
--- a/components/ocmcli/Makefile
+++ b/components/ocmcli/Makefile
@@ -11,7 +11,7 @@ PLATFORMS = $(IMAGE_PLATFORMS) darwin/arm64 darwin/amd64 windows/amd64
REPO_ROOT := $(dir $(realpath $(lastword $(MAKEFILE_LIST))))../..
GIT_TREE_STATE = $(shell [ -z "$$(git status --porcelain 2>/dev/null)" ] && echo clean || echo dirty)
-VERSION = $(shell go run ../../pkg/version/generate/release_generate.go print-rc-version $(CANDIDATE))
+VERSION = $(shell go run ../../api/version/generate/release_generate.go print-rc-version $(CANDIDATE))
COMMIT = $(shell git rev-parse HEAD)
EFFECTIVE_VERSION = $(VERSION)+$(COMMIT)
PLATFORM_OS := $(shell go env GOOS)
@@ -33,10 +33,10 @@ GEN = $(REPO_ROOT)/gen/$(shell basename $(realpath .))
NOW := $(shell date -u +%FT%T%z)
BUILD_FLAGS := "-s -w \
- -X github.com/open-component-model/ocm/pkg/version.gitVersion=$(EFFECTIVE_VERSION) \
- -X github.com/open-component-model/ocm/pkg/version.gitTreeState=$(GIT_TREE_STATE) \
- -X github.com/open-component-model/ocm/pkg/version.gitCommit=$(COMMIT) \
- -X github.com/open-component-model/ocm/pkg/version.buildDate=$(NOW)"
+ -X ocm.software/ocm/api/version.gitVersion=$(EFFECTIVE_VERSION) \
+ -X ocm.software/ocm/api/version.gitTreeState=$(GIT_TREE_STATE) \
+ -X ocm.software/ocm/api/version.gitCommit=$(COMMIT) \
+ -X ocm.software/ocm/api/version.buildDate=$(NOW)"
ALPINE_LATEST_VER=$(shell curl -s https://registry.hub.docker.com/v2/repositories/library/alpine/tags | jq '.results[1].name' | xargs)
diff --git a/components/subchartsdemo/Makefile b/components/subchartsdemo/Makefile
index fcea0b120..67a3af7da 100644
--- a/components/subchartsdemo/Makefile
+++ b/components/subchartsdemo/Makefile
@@ -12,7 +12,7 @@ PODINFO_VERSION = 6.3.5
PODINFO_CHART_VERSION = 6.3.5
REPO_ROOT := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))/../..
-VERSION = $(shell go run $(REPO_ROOT)/pkg/version/generate/release_generate.go print-rc-version $(CANDIDATE))
+VERSION = $(shell go run $(REPO_ROOT)/api/version/generate/release_generate.go print-rc-version $(CANDIDATE))
COMMIT = $(shell git rev-parse HEAD)
EFFECTIVE_VERSION = $(VERSION)-$(COMMIT)
HELMINSTVERSION ?= $(VERSION)
diff --git a/docs/command-plugins.md b/docs/command-plugins.md
index 941de2fb1..1ba2bb3dc 100644
--- a/docs/command-plugins.md
+++ b/docs/command-plugins.md
@@ -112,7 +112,7 @@ for an automated configuration:
```
import (
// enable mandelsoft plugin logging configuration.
- _ "github.com/open-component-model/ocm/pkg/contexts/ocm/plugin/ppi/config"
+ _ "ocm.software/ocm/pkg/contexts/ocm/plugin/ppi/config"
)
```
@@ -142,7 +142,7 @@ be implemented directly with an anonymous import of
```
import (
// enable mandelsoft plugin logging configuration.
- _ "github.com/open-component-model/ocm/pkg/contexts/ocm/plugin/ppi/logging"
+ _ "ocm.software/ocm/pkg/contexts/ocm/plugin/ppi/logging"
)
```
The plugin code is then configured with the logging configuration of the OCM CLI and the mandelsoft logging frame work
diff --git a/docs/reference/ocm_add_componentversions.md b/docs/reference/ocm_add_componentversions.md
index 5cdca2c38..18174e6ae 100644
--- a/docs/reference/ocm_add_componentversions.md
+++ b/docs/reference/ocm_add_componentversions.md
@@ -185,27 +185,27 @@ The uploader name may be a path expression with the following possibilities:
Alternatively, a single string value can be given representing an OCI repository
reference.
- - ocm/npmPackage: uploading npm artifacts
+ - ocm/mavenPackage: uploading maven artifacts
- The ocm/npmPackage uploader is able to upload npm artifacts
- as artifact archive according to the npm package spec.
+ The ocm/mavenPackage uploader is able to upload maven artifacts (whole GAV only!)
+ as artifact archive according to the maven artifact spec.
If registered the default mime type is: application/x-tgz
It accepts a plain string for the URL or a config with the following field:
- 'url': the URL of the npm repository.
+ 'url': the URL of the maven repository.
- plugin: [downloaders provided by plugins]
sub namespace of the form <plugin name>/<handler>
- - ocm/mavenPackage: uploading maven artifacts
+ - ocm/npmPackage: uploading npm artifacts
- The ocm/mavenPackage uploader is able to upload maven artifacts (whole GAV only!)
- as artifact archive according to the maven artifact spec.
+ The ocm/npmPackage uploader is able to upload npm artifacts
+ as artifact archive according to the npm package spec.
If registered the default mime type is: application/x-tgz
It accepts a plain string for the URL or a config with the following field:
- 'url': the URL of the maven repository.
+ 'url': the URL of the npm repository.
diff --git a/docs/reference/ocm_add_source-configuration.md b/docs/reference/ocm_add_source-configuration.md
index 72242aec4..9626b9a72 100644
--- a/docs/reference/ocm_add_source-configuration.md
+++ b/docs/reference/ocm_add_source-configuration.md
@@ -976,7 +976,7 @@ There are several templaters that can be selected by the --templaterocm/npmPackage: uploading npm artifacts
+ - ocm/mavenPackage: uploading maven artifacts
- The ocm/npmPackage uploader is able to upload npm artifacts
- as artifact archive according to the npm package spec.
+ The ocm/mavenPackage uploader is able to upload maven artifacts (whole GAV only!)
+ as artifact archive according to the maven artifact spec.
If registered the default mime type is: application/x-tgz
It accepts a plain string for the URL or a config with the following field:
- 'url': the URL of the npm repository.
+ 'url': the URL of the maven repository.
- plugin: [downloaders provided by plugins]
sub namespace of the form <plugin name>/<handler>
- - ocm/mavenPackage: uploading maven artifacts
+ - ocm/npmPackage: uploading npm artifacts
- The ocm/mavenPackage uploader is able to upload maven artifacts (whole GAV only!)
- as artifact archive according to the maven artifact spec.
+ The ocm/npmPackage uploader is able to upload npm artifacts
+ as artifact archive according to the npm package spec.
If registered the default mime type is: application/x-tgz
It accepts a plain string for the URL or a config with the following field:
- 'url': the URL of the maven repository.
+ 'url': the URL of the npm repository.
diff --git a/docs/reference/ocm_transfer_commontransportarchive.md b/docs/reference/ocm_transfer_commontransportarchive.md
index a4aea932d..9fcdaa3bb 100644
--- a/docs/reference/ocm_transfer_commontransportarchive.md
+++ b/docs/reference/ocm_transfer_commontransportarchive.md
@@ -135,27 +135,27 @@ The uploader name may be a path expression with the following possibilities:
Alternatively, a single string value can be given representing an OCI repository
reference.
- - ocm/npmPackage: uploading npm artifacts
+ - ocm/mavenPackage: uploading maven artifacts
- The ocm/npmPackage uploader is able to upload npm artifacts
- as artifact archive according to the npm package spec.
+ The ocm/mavenPackage uploader is able to upload maven artifacts (whole GAV only!)
+ as artifact archive according to the maven artifact spec.
If registered the default mime type is: application/x-tgz
It accepts a plain string for the URL or a config with the following field:
- 'url': the URL of the npm repository.
+ 'url': the URL of the maven repository.
- plugin: [downloaders provided by plugins]
sub namespace of the form <plugin name>/<handler>
- - ocm/mavenPackage: uploading maven artifacts
+ - ocm/npmPackage: uploading npm artifacts
- The ocm/mavenPackage uploader is able to upload maven artifacts (whole GAV only!)
- as artifact archive according to the maven artifact spec.
+ The ocm/npmPackage uploader is able to upload npm artifacts
+ as artifact archive according to the npm package spec.
If registered the default mime type is: application/x-tgz
It accepts a plain string for the URL or a config with the following field:
- 'url': the URL of the maven repository.
+ 'url': the URL of the npm repository.
diff --git a/docs/reference/ocm_transfer_componentversions.md b/docs/reference/ocm_transfer_componentversions.md
index a50e22919..4c7541e25 100644
--- a/docs/reference/ocm_transfer_componentversions.md
+++ b/docs/reference/ocm_transfer_componentversions.md
@@ -192,27 +192,27 @@ The uploader name may be a path expression with the following possibilities:
Alternatively, a single string value can be given representing an OCI repository
reference.
- - ocm/npmPackage: uploading npm artifacts
+ - ocm/mavenPackage: uploading maven artifacts
- The ocm/npmPackage uploader is able to upload npm artifacts
- as artifact archive according to the npm package spec.
+ The ocm/mavenPackage uploader is able to upload maven artifacts (whole GAV only!)
+ as artifact archive according to the maven artifact spec.
If registered the default mime type is: application/x-tgz
It accepts a plain string for the URL or a config with the following field:
- 'url': the URL of the npm repository.
+ 'url': the URL of the maven repository.
- plugin: [downloaders provided by plugins]
sub namespace of the form <plugin name>/<handler>
- - ocm/mavenPackage: uploading maven artifacts
+ - ocm/npmPackage: uploading npm artifacts
- The ocm/mavenPackage uploader is able to upload maven artifacts (whole GAV only!)
- as artifact archive according to the maven artifact spec.
+ The ocm/npmPackage uploader is able to upload npm artifacts
+ as artifact archive according to the npm package spec.
If registered the default mime type is: application/x-tgz
It accepts a plain string for the URL or a config with the following field:
- 'url': the URL of the maven repository.
+ 'url': the URL of the npm repository.
diff --git a/docs/releasenotes/v0.12.0.md b/docs/releasenotes/v0.12.0.md
index dbdd6ddad..d4f0f0b4e 100644
--- a/docs/releasenotes/v0.12.0.md
+++ b/docs/releasenotes/v0.12.0.md
@@ -13,7 +13,7 @@ Release v0.12.0
- enhance the auto update of the flake vendor hash (#826)
- Bump the go group with 7 updates (#825)
- Update README.md (#822)
-- fix https://github.com/open-component-model/ocm-project/issues/196 (#819)
+- fix https://ocm.software/ocm-project/issues/196 (#819)
- Bump the go group with 8 updates (#816)
- Fix make cmds (#810)
- Adjust action (#813)
diff --git a/examples/lib/README.md b/examples/lib/README.md
index a1589d7cd..ae4dcd7a5 100644
--- a/examples/lib/README.md
+++ b/examples/lib/README.md
@@ -26,7 +26,7 @@ For working with [OCM repositories](../../docs/ocm/model.md#repositories) an app
context, which can be used to retrieve OCM repositories, can be accessed with:
```go
-import "github.com/open-component-model/ocm/pkg/contexts/ocm"
+import "ocm.software/ocm/api/ocm"
func MyFirstOCMApplication() {
@@ -49,9 +49,9 @@ provide access to hosted components and component versions.
To access a repository, a [repository specification](../../docs/formats/repositories/README.md)
is required. Every repository type extension supported by this library
-uses its own package under `github.com/open-component-model/ocm/pkg/contexts/ocm/repositories`.
+uses its own package under `ocm.software/ocm/api/ocm/extensions/repositories`.
To access an OCM repository based on an OCI registry the package
-`github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ocireg`
+`ocm.software/ocm/api/ocm/extensions/repositories/ocireg`
contains the appropriate language binding for the OCI registry mappings.
Those packages typically have the method `NewRepositorySpec` to create
diff --git a/examples/lib/comparison-scenario/00-consumer.go b/examples/lib/comparison-scenario/00-consumer.go
index db4a1d547..a4c667827 100644
--- a/examples/lib/comparison-scenario/00-consumer.go
+++ b/examples/lib/comparison-scenario/00-consumer.go
@@ -7,17 +7,17 @@ import (
"github.com/mandelsoft/goutils/errors"
"github.com/mandelsoft/vfs/pkg/memoryfs"
- "github.com/open-component-model/ocm/examples/lib/helper"
- "github.com/open-component-model/ocm/pkg/common"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
- metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/download"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ocireg"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/signing"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/transfer"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/transfer/transferhandler/standard"
- ocmutils "github.com/open-component-model/ocm/pkg/contexts/ocm/utils"
- "github.com/open-component-model/ocm/pkg/utils/tarutils"
+ "ocm.software/ocm/api/ocm"
+ metav1 "ocm.software/ocm/api/ocm/compdesc/meta/v1"
+ "ocm.software/ocm/api/ocm/extensions/download"
+ "ocm.software/ocm/api/ocm/extensions/repositories/ocireg"
+ ocmutils "ocm.software/ocm/api/ocm/ocmutils"
+ "ocm.software/ocm/api/ocm/tools/signing"
+ "ocm.software/ocm/api/ocm/tools/transfer"
+ "ocm.software/ocm/api/ocm/tools/transfer/transferhandler/standard"
+ common "ocm.software/ocm/api/utils/misc"
+ "ocm.software/ocm/api/utils/tarutils"
+ "ocm.software/ocm/examples/lib/helper"
)
func TransportTo(target ocm.Repository, src string) error {
diff --git a/examples/lib/comparison-scenario/00-provider.go b/examples/lib/comparison-scenario/00-provider.go
index 519338830..31d1babbb 100644
--- a/examples/lib/comparison-scenario/00-provider.go
+++ b/examples/lib/comparison-scenario/00-provider.go
@@ -5,11 +5,11 @@ import (
"github.com/mandelsoft/goutils/errors"
- "github.com/open-component-model/ocm/examples/lib/helper"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ocireg"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/signing"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/utils"
+ "ocm.software/ocm/api/ocm"
+ "ocm.software/ocm/api/ocm/extensions/repositories/ocireg"
+ utils "ocm.software/ocm/api/ocm/ocmutils"
+ "ocm.software/ocm/api/ocm/tools/signing"
+ "ocm.software/ocm/examples/lib/helper"
)
func ReadConfiguration(ctx ocm.Context, cfg *helper.Config) error {
diff --git a/examples/lib/comparison-scenario/01-create.go b/examples/lib/comparison-scenario/01-create.go
index 469359b43..2f4f62672 100644
--- a/examples/lib/comparison-scenario/01-create.go
+++ b/examples/lib/comparison-scenario/01-create.go
@@ -5,16 +5,16 @@ import (
"github.com/mandelsoft/goutils/errors"
- "github.com/open-component-model/ocm/examples/lib/helper"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
- metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/elements"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/elements/artifactaccess/helmaccess"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/elements/artifactaccess/ociartifactaccess"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/elements/artifactblob/fileblob"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/composition"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/resourcetypes"
- "github.com/open-component-model/ocm/pkg/mime"
+ "ocm.software/ocm/api/ocm"
+ metav1 "ocm.software/ocm/api/ocm/compdesc/meta/v1"
+ "ocm.software/ocm/api/ocm/elements"
+ "ocm.software/ocm/api/ocm/elements/artifactaccess/helmaccess"
+ "ocm.software/ocm/api/ocm/elements/artifactaccess/ociartifactaccess"
+ "ocm.software/ocm/api/ocm/elements/artifactblob/fileblob"
+ resourcetypes "ocm.software/ocm/api/ocm/extensions/artifacttypes"
+ "ocm.software/ocm/api/ocm/extensions/repositories/composition"
+ "ocm.software/ocm/api/utils/mime"
+ "ocm.software/ocm/examples/lib/helper"
)
const (
diff --git a/examples/lib/comparison-scenario/02-sign.go b/examples/lib/comparison-scenario/02-sign.go
index ab85c547b..9d8075b9a 100644
--- a/examples/lib/comparison-scenario/02-sign.go
+++ b/examples/lib/comparison-scenario/02-sign.go
@@ -5,11 +5,11 @@ import (
"github.com/mandelsoft/goutils/errors"
- "github.com/open-component-model/ocm/examples/lib/helper"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/attrs/signingattr"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/signing"
- "github.com/open-component-model/ocm/pkg/signing/handlers/rsa"
+ "ocm.software/ocm/api/ocm"
+ "ocm.software/ocm/api/ocm/extensions/attrs/signingattr"
+ "ocm.software/ocm/api/ocm/tools/signing"
+ "ocm.software/ocm/api/tech/signing/handlers/rsa"
+ "ocm.software/ocm/examples/lib/helper"
)
const SIGNATURE_NAME = "acme.org"
diff --git a/examples/lib/comparison-scenario/03-write.go b/examples/lib/comparison-scenario/03-write.go
index b727d5052..0d2ddc3dd 100644
--- a/examples/lib/comparison-scenario/03-write.go
+++ b/examples/lib/comparison-scenario/03-write.go
@@ -7,13 +7,13 @@ import (
"github.com/mandelsoft/goutils/errors"
- "github.com/open-component-model/ocm/examples/lib/helper"
- ociidentity "github.com/open-component-model/ocm/pkg/contexts/credentials/builtin/oci/identity"
- "github.com/open-component-model/ocm/pkg/contexts/oci"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/attrs/signingattr"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ocireg"
- "github.com/open-component-model/ocm/pkg/signing/handlers/rsa"
+ ociidentity "ocm.software/ocm/api/credentials/builtin/oci/identity"
+ "ocm.software/ocm/api/oci"
+ "ocm.software/ocm/api/ocm"
+ "ocm.software/ocm/api/ocm/extensions/attrs/signingattr"
+ "ocm.software/ocm/api/ocm/extensions/repositories/ocireg"
+ "ocm.software/ocm/api/tech/signing/handlers/rsa"
+ "ocm.software/ocm/examples/lib/helper"
)
const KEYFILE = "/tmp/comparison.pub"
diff --git a/examples/lib/comparison-scenario/04-transport.go b/examples/lib/comparison-scenario/04-transport.go
index 9060566d0..033fc75e9 100644
--- a/examples/lib/comparison-scenario/04-transport.go
+++ b/examples/lib/comparison-scenario/04-transport.go
@@ -5,12 +5,12 @@ import (
"github.com/mandelsoft/goutils/errors"
- "github.com/open-component-model/ocm/examples/lib/helper"
- "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/repositories/ocireg"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/transfer"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/transfer/transferhandler/standard"
+ "ocm.software/ocm/api/ocm"
+ "ocm.software/ocm/api/ocm/extensions/repositories/ocireg"
+ "ocm.software/ocm/api/ocm/tools/transfer"
+ "ocm.software/ocm/api/ocm/tools/transfer/transferhandler/standard"
+ common "ocm.software/ocm/api/utils/misc"
+ "ocm.software/ocm/examples/lib/helper"
)
func Transport(cfg *helper.Config) error {
diff --git a/examples/lib/comparison-scenario/05-verify.go b/examples/lib/comparison-scenario/05-verify.go
index 58563dbed..a2ebd9d92 100644
--- a/examples/lib/comparison-scenario/05-verify.go
+++ b/examples/lib/comparison-scenario/05-verify.go
@@ -5,9 +5,9 @@ import (
"github.com/mandelsoft/goutils/errors"
- "github.com/open-component-model/ocm/examples/lib/helper"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/signing"
+ "ocm.software/ocm/api/ocm"
+ "ocm.software/ocm/api/ocm/tools/signing"
+ "ocm.software/ocm/examples/lib/helper"
)
func Verify(cfg *helper.Config) error {
diff --git a/examples/lib/comparison-scenario/06-download.go b/examples/lib/comparison-scenario/06-download.go
index 9deea201d..61661e681 100644
--- a/examples/lib/comparison-scenario/06-download.go
+++ b/examples/lib/comparison-scenario/06-download.go
@@ -7,12 +7,12 @@ import (
"github.com/mandelsoft/vfs/pkg/memoryfs"
"github.com/mandelsoft/vfs/pkg/vfs"
- "github.com/open-component-model/ocm/examples/lib/helper"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
- metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/download"
- "github.com/open-component-model/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/utils/tarutils"
+ "ocm.software/ocm/api/ocm"
+ metav1 "ocm.software/ocm/api/ocm/compdesc/meta/v1"
+ "ocm.software/ocm/api/ocm/extensions/download"
+ "ocm.software/ocm/api/utils"
+ "ocm.software/ocm/api/utils/tarutils"
+ "ocm.software/ocm/examples/lib/helper"
)
func Download(cfg *helper.Config) error {
diff --git a/examples/lib/comparison-scenario/07-getref.go b/examples/lib/comparison-scenario/07-getref.go
index c87c41b1c..ce07a923c 100644
--- a/examples/lib/comparison-scenario/07-getref.go
+++ b/examples/lib/comparison-scenario/07-getref.go
@@ -6,10 +6,10 @@ import (
"github.com/mandelsoft/goutils/errors"
- "github.com/open-component-model/ocm/examples/lib/helper"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
- metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/utils"
+ "ocm.software/ocm/api/ocm"
+ metav1 "ocm.software/ocm/api/ocm/compdesc/meta/v1"
+ utils "ocm.software/ocm/api/ocm/ocmutils"
+ "ocm.software/ocm/examples/lib/helper"
)
func GetRef(cfg *helper.Config) error {
diff --git a/examples/lib/comparison-scenario/08-deployscript.go b/examples/lib/comparison-scenario/08-deployscript.go
index 4d24dec70..4a9dddc52 100644
--- a/examples/lib/comparison-scenario/08-deployscript.go
+++ b/examples/lib/comparison-scenario/08-deployscript.go
@@ -5,10 +5,10 @@ import (
"github.com/mandelsoft/goutils/errors"
- "github.com/open-component-model/ocm/examples/lib/helper"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
- metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/utils"
+ "ocm.software/ocm/api/ocm"
+ metav1 "ocm.software/ocm/api/ocm/compdesc/meta/v1"
+ utils "ocm.software/ocm/api/ocm/ocmutils"
+ "ocm.software/ocm/examples/lib/helper"
)
func GetDeployScript(cfg *helper.Config) error {
diff --git a/examples/lib/comparison-scenario/09-localize.go b/examples/lib/comparison-scenario/09-localize.go
index 44e084f2a..77337a4f6 100644
--- a/examples/lib/comparison-scenario/09-localize.go
+++ b/examples/lib/comparison-scenario/09-localize.go
@@ -10,18 +10,18 @@ import (
"helm.sh/helm/v3/pkg/chart"
"sigs.k8s.io/yaml"
- "github.com/open-component-model/ocm/examples/lib/helper"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc"
- v1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/download"
- ocmutils "github.com/open-component-model/ocm/pkg/contexts/ocm/utils"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/utils/localize"
- "github.com/open-component-model/ocm/pkg/helm/loader"
- "github.com/open-component-model/ocm/pkg/runtime"
- "github.com/open-component-model/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/utils/tarutils"
- "github.com/open-component-model/ocm/pkg/utils/template"
+ "ocm.software/ocm/api/ocm"
+ "ocm.software/ocm/api/ocm/compdesc"
+ v1 "ocm.software/ocm/api/ocm/compdesc/meta/v1"
+ "ocm.software/ocm/api/ocm/extensions/download"
+ ocmutils "ocm.software/ocm/api/ocm/ocmutils"
+ "ocm.software/ocm/api/ocm/ocmutils/localize"
+ "ocm.software/ocm/api/tech/helm/loader"
+ "ocm.software/ocm/api/utils"
+ "ocm.software/ocm/api/utils/runtime"
+ "ocm.software/ocm/api/utils/tarutils"
+ "ocm.software/ocm/api/utils/template"
+ "ocm.software/ocm/examples/lib/helper"
)
type DeployDescriptor struct {
diff --git a/examples/lib/comparison-scenario/main.go b/examples/lib/comparison-scenario/main.go
index 7ffe43da7..f25507ec2 100644
--- a/examples/lib/comparison-scenario/main.go
+++ b/examples/lib/comparison-scenario/main.go
@@ -4,8 +4,8 @@ import (
"fmt"
"os"
- "github.com/open-component-model/ocm/examples/lib/helper"
- "github.com/open-component-model/ocm/pkg/utils/template"
+ "ocm.software/ocm/api/utils/template"
+ "ocm.software/ocm/examples/lib/helper"
)
const (
diff --git a/examples/lib/comparison-scenario/utils.go b/examples/lib/comparison-scenario/utils.go
index d57ac8be8..c2ecf7629 100644
--- a/examples/lib/comparison-scenario/utils.go
+++ b/examples/lib/comparison-scenario/utils.go
@@ -10,10 +10,10 @@ import (
"helm.sh/helm/v3/pkg/chart"
"helm.sh/helm/v3/pkg/cli"
- "github.com/open-component-model/ocm/pkg/contexts/credentials"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/attrs/signingattr"
- "github.com/open-component-model/ocm/pkg/signing/handlers/rsa"
+ "ocm.software/ocm/api/credentials"
+ "ocm.software/ocm/api/ocm"
+ "ocm.software/ocm/api/ocm/extensions/attrs/signingattr"
+ "ocm.software/ocm/api/tech/signing/handlers/rsa"
)
func PrintPublicKey(ctx ocm.Context, name string) {
diff --git a/examples/lib/config1/example.go b/examples/lib/config1/example.go
index 7269d9a87..ea27903f0 100644
--- a/examples/lib/config1/example.go
+++ b/examples/lib/config1/example.go
@@ -5,12 +5,12 @@ import (
"github.com/mandelsoft/goutils/errors"
- "github.com/open-component-model/ocm/examples/lib/helper"
- "github.com/open-component-model/ocm/pkg/contexts/credentials"
- ociid "github.com/open-component-model/ocm/pkg/contexts/credentials/builtin/oci/identity"
- ccfg "github.com/open-component-model/ocm/pkg/contexts/credentials/config"
- "github.com/open-component-model/ocm/pkg/contexts/credentials/repositories/directcreds"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
+ "ocm.software/ocm/api/credentials"
+ ociid "ocm.software/ocm/api/credentials/builtin/oci/identity"
+ ccfg "ocm.software/ocm/api/credentials/config"
+ "ocm.software/ocm/api/credentials/extensions/repositories/directcreds"
+ "ocm.software/ocm/api/ocm"
+ "ocm.software/ocm/examples/lib/helper"
)
func UsingConfigs() error {
diff --git a/examples/lib/config2/example.go b/examples/lib/config2/example.go
index 6995c3fdf..20ba1f8fb 100644
--- a/examples/lib/config2/example.go
+++ b/examples/lib/config2/example.go
@@ -6,10 +6,10 @@ import (
"github.com/mandelsoft/goutils/errors"
- "github.com/open-component-model/ocm/pkg/contexts/credentials"
- ociid "github.com/open-component-model/ocm/pkg/contexts/credentials/builtin/oci/identity"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
- "github.com/open-component-model/ocm/pkg/runtime"
+ "ocm.software/ocm/api/credentials"
+ ociid "ocm.software/ocm/api/credentials/builtin/oci/identity"
+ "ocm.software/ocm/api/ocm"
+ "ocm.software/ocm/api/utils/runtime"
)
const CFGFILE = "examples/lib/config2/config.yaml"
diff --git a/examples/lib/config3/example.go b/examples/lib/config3/example.go
index c5fd4c240..f9e2b4f49 100644
--- a/examples/lib/config3/example.go
+++ b/examples/lib/config3/example.go
@@ -6,9 +6,9 @@ import (
"github.com/mandelsoft/goutils/errors"
- "github.com/open-component-model/ocm/pkg/contexts/config"
- "github.com/open-component-model/ocm/pkg/contexts/config/cpi"
- "github.com/open-component-model/ocm/pkg/runtime"
+ "ocm.software/ocm/api/config"
+ "ocm.software/ocm/api/config/cpi"
+ "ocm.software/ocm/api/utils/runtime"
)
const CFGFILE = "examples/lib/config3/config.yaml"
diff --git a/examples/lib/contexts.md b/examples/lib/contexts.md
index 6a61614ec..7a22afbe9 100644
--- a/examples/lib/contexts.md
+++ b/examples/lib/contexts.md
@@ -99,7 +99,7 @@ can be orchestrated by context builders.
## Package organization
All functional areas supported by contexts can be found as sub packages of
-`github.com/open-component-model/ocm/pkg/contexts`.
+`ocm.software/ocm/pkg/contexts`.
A context package directly contains the typical user API for the functional
area. The most important interface is the interface `Context`. It acts as main
@@ -122,7 +122,7 @@ might be attached to any kind of contexts. They are inherited along a
context usage relation (for example ocm -> oci -> credentials -> config).
If a context type supports multiple extension types there is typically
-a dedicated sub package for this type (for example `github.com/open-component-model/pkg/contexts/ocm/accessmethods`), which again
+a dedicated sub package for this type (for example `github.com/open-component-model/api/ocm/extensions/accessmethods`), which again
contains the various implementation types in sub packages.
### The OCM context organization
diff --git a/examples/lib/cred1/example.go b/examples/lib/cred1/example.go
index 07325f698..aa178e0ba 100644
--- a/examples/lib/cred1/example.go
+++ b/examples/lib/cred1/example.go
@@ -5,14 +5,14 @@ import (
"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/contexts/ocm"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc"
- metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ocireg"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/resourcetypes"
- "github.com/open-component-model/ocm/pkg/mime"
+ "ocm.software/ocm/api/ocm"
+ "ocm.software/ocm/api/ocm/compdesc"
+ metav1 "ocm.software/ocm/api/ocm/compdesc/meta/v1"
+ resourcetypes "ocm.software/ocm/api/ocm/extensions/artifacttypes"
+ "ocm.software/ocm/api/ocm/extensions/repositories/ocireg"
+ "ocm.software/ocm/api/utils/blobaccess"
+ "ocm.software/ocm/api/utils/mime"
+ "ocm.software/ocm/examples/lib/helper"
)
func SimpleWriteWithCredentials() error {
diff --git a/examples/lib/cred2/example.go b/examples/lib/cred2/example.go
index 1ca1e13fc..3d01062dc 100644
--- a/examples/lib/cred2/example.go
+++ b/examples/lib/cred2/example.go
@@ -5,17 +5,17 @@ import (
"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/contexts/credentials"
- "github.com/open-component-model/ocm/pkg/contexts/credentials/builtin/oci/identity"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/ociartifact"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc"
- metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ocireg"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/resourcetypes"
- "github.com/open-component-model/ocm/pkg/mime"
+ "ocm.software/ocm/api/credentials"
+ "ocm.software/ocm/api/credentials/builtin/oci/identity"
+ "ocm.software/ocm/api/ocm"
+ "ocm.software/ocm/api/ocm/compdesc"
+ metav1 "ocm.software/ocm/api/ocm/compdesc/meta/v1"
+ "ocm.software/ocm/api/ocm/extensions/accessmethods/ociartifact"
+ resourcetypes "ocm.software/ocm/api/ocm/extensions/artifacttypes"
+ "ocm.software/ocm/api/ocm/extensions/repositories/ocireg"
+ "ocm.software/ocm/api/utils/blobaccess"
+ "ocm.software/ocm/api/utils/mime"
+ "ocm.software/ocm/examples/lib/helper"
)
func SimpleWriteWithCredentials() (ferr error) {
diff --git a/examples/lib/cred3/example.go b/examples/lib/cred3/example.go
index 6e1d40709..202b4fdc2 100644
--- a/examples/lib/cred3/example.go
+++ b/examples/lib/cred3/example.go
@@ -5,15 +5,15 @@ import (
"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/contexts/credentials/repositories/dockerconfig"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc"
- metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ocireg"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/resourcetypes"
- "github.com/open-component-model/ocm/pkg/mime"
+ "ocm.software/ocm/api/credentials/extensions/repositories/dockerconfig"
+ "ocm.software/ocm/api/ocm"
+ "ocm.software/ocm/api/ocm/compdesc"
+ metav1 "ocm.software/ocm/api/ocm/compdesc/meta/v1"
+ resourcetypes "ocm.software/ocm/api/ocm/extensions/artifacttypes"
+ "ocm.software/ocm/api/ocm/extensions/repositories/ocireg"
+ "ocm.software/ocm/api/utils/blobaccess"
+ "ocm.software/ocm/api/utils/mime"
+ "ocm.software/ocm/examples/lib/helper"
)
func SimpleWriteWithCredentials() error {
diff --git a/examples/lib/creds.md b/examples/lib/creds.md
index f526a3c13..27ec5336b 100644
--- a/examples/lib/creds.md
+++ b/examples/lib/creds.md
@@ -24,7 +24,7 @@ the credentials directly for the lookup call:
defer repo.Close()
```
-Credentials are given by an object of type [`credentials.Credentials`](../../pkg/contexts/credentials/interface.go).
+Credentials are given by an object of type [`credentials.Credentials`](../../api/credentials/interface.go).
This is basically a set of string attributes. For OCM repositories based on OCI
registries two attributes are used:
- `credentials.ATTR_USERNAME` the username
@@ -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/credentials/builtin/oci/identity/identity.go) and repository,
+an [OCI registry](../../api/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.
diff --git a/examples/lib/ctf.md b/examples/lib/ctf.md
index 746600af5..a22f68567 100644
--- a/examples/lib/ctf.md
+++ b/examples/lib/ctf.md
@@ -15,7 +15,7 @@ which is the default.
In this example we just use a memory based filesystem.
```go
- import "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ctf"
+ import "ocm.software/ocm/api/ocm/extensions/repositories/ctf"
octx := ocm.DefaultContext()
diff --git a/examples/lib/ctf/example.go b/examples/lib/ctf/example.go
index 1a26b5f42..859c006aa 100644
--- a/examples/lib/ctf/example.go
+++ b/examples/lib/ctf/example.go
@@ -7,15 +7,15 @@ import (
"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"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc"
- metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ctf"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/resourcetypes"
- "github.com/open-component-model/ocm/pkg/mime"
+ "ocm.software/ocm/api/ocm"
+ "ocm.software/ocm/api/ocm/compdesc"
+ metav1 "ocm.software/ocm/api/ocm/compdesc/meta/v1"
+ resourcetypes "ocm.software/ocm/api/ocm/extensions/artifacttypes"
+ "ocm.software/ocm/api/ocm/extensions/repositories/ctf"
+ "ocm.software/ocm/api/utils/accessio"
+ "ocm.software/ocm/api/utils/accessobj"
+ "ocm.software/ocm/api/utils/blobaccess"
+ "ocm.software/ocm/api/utils/mime"
)
const (
diff --git a/examples/lib/example.go b/examples/lib/example.go
index 510581ef2..d0e4c3ddc 100644
--- a/examples/lib/example.go
+++ b/examples/lib/example.go
@@ -3,11 +3,11 @@ package main
import (
"fmt"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc"
- metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ocireg"
- "github.com/open-component-model/ocm/pkg/utils"
+ "ocm.software/ocm/api/ocm"
+ "ocm.software/ocm/api/ocm/compdesc"
+ metav1 "ocm.software/ocm/api/ocm/compdesc/meta/v1"
+ "ocm.software/ocm/api/ocm/extensions/repositories/ocireg"
+ "ocm.software/ocm/api/utils"
)
const (
diff --git a/examples/lib/helper/helper.go b/examples/lib/helper/helper.go
index 4085301df..0190c345f 100644
--- a/examples/lib/helper/helper.go
+++ b/examples/lib/helper/helper.go
@@ -6,9 +6,9 @@ import (
"github.com/mandelsoft/goutils/errors"
- "github.com/open-component-model/ocm/pkg/contexts/credentials"
- "github.com/open-component-model/ocm/pkg/contexts/credentials/builtin/oci/identity"
- "github.com/open-component-model/ocm/pkg/runtime"
+ "ocm.software/ocm/api/credentials"
+ "ocm.software/ocm/api/credentials/builtin/oci/identity"
+ "ocm.software/ocm/api/utils/runtime"
)
type Config struct {
diff --git a/examples/lib/tour/01-getting-started/README.md b/examples/lib/tour/01-getting-started/README.md
index 8754370f0..72ca76f19 100644
--- a/examples/lib/tour/01-getting-started/README.md
+++ b/examples/lib/tour/01-getting-started/README.md
@@ -32,7 +32,7 @@ a context object. Our example uses the default context
provided by the library, which covers the complete
type registration contained in the executable.
-It can be accessed by a function of the `pkg/contexts/ocm` package.
+It can be accessed by a function of the `api/ocm` package.
```go
ctx := ocm.DefaultContext()
@@ -53,7 +53,7 @@ the repository and can be used to store the serialized
form as part of other resources, for example
Kubernetes resources or configuration settings.
The available repository implementations can be found
-under `.../pkg/contexts/ocm/repositories`.
+under `.../api/ocm/extensions/repositories`.
```go
spec := ocireg.NewRepositorySpec("ghcr.io/open-component-model/ocm")
@@ -164,32 +164,32 @@ differ, because the code always describes the latest version):
```
resources of the latest version:
- version: 0.12.0
+ version: 0.13.0
provider: ocm.software
1: name: ocmcli
extra identity: "architecture"="amd64","os"="linux"
resource type: executable
- access: Local blob sha256:4a3e2f2069f428e237ca7cd21d9f525ac527cde92f4ae0f797697727d5e059f9[]
+ access: Local blob sha256:c02de4aa8801ee0300edd31749efc7ef1cb63f082fed67861fddc6ca0ace4545[]
2: name: ocmcli
extra identity: "architecture"="arm64","os"="linux"
resource type: executable
- access: Local blob sha256:b99a50553fdf100ec449dbfd3e822de8d5051e83070d37a3046703003ccba1db[]
+ access: Local blob sha256:7ac5a31e21214b533a6764c41f94703d9704a639a8c0119e6ece3070ba0e8988[]
3: name: ocmcli
extra identity: "architecture"="arm64","os"="darwin"
resource type: executable
- access: Local blob sha256:01f913684ca0b01ac0c93e5cee98e6d3a29e908b88761a0c869b39ae8971b538[]
+ access: Local blob sha256:63d4604711c55532882c8625a6214186e654558abb1b28861604ad856916c921[]
4: name: ocmcli
extra identity: "architecture"="amd64","os"="darwin"
resource type: executable
- access: Local blob sha256:ad5391320eb2662f84dbae676fb0963eb3925b0f76d966a71a89795bbac529a8[]
+ access: Local blob sha256:09f676530a5c4782bc9d62df7c352ab0797970aa4851e1809b39b586a18eaf57[]
5: name: ocmcli
extra identity: "architecture"="amd64","os"="windows"
resource type: executable
- access: Local blob sha256:71ed95abd178112489f32cddeea377d2703ad6213f54a3486741f48483cd4391[]
+ access: Local blob sha256:ed5a761031862f09b0851613802b9856e7a57410e52aa7a71d24a8118d0d6867[]
6: name: ocmcli-image
extra identity:
resource type: ociImage
- access: OCI artifact ghcr.io/open-component-model/ocm/ocm.software/ocmcli/ocmcli-image:0.12.0
+ access: OCI artifact ghcr.io/open-component-model/ocm/ocm.software/ocmcli/ocmcli-image:0.13.0
```
Resources have some metadata, like their identity and a resource type.
diff --git a/examples/lib/tour/01-getting-started/example.go b/examples/lib/tour/01-getting-started/example.go
index 23188abbb..25b5b3423 100644
--- a/examples/lib/tour/01-getting-started/example.go
+++ b/examples/lib/tour/01-getting-started/example.go
@@ -9,14 +9,14 @@ import (
"github.com/mandelsoft/goutils/errors"
- "github.com/open-component-model/ocm/pkg/common"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
- metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/download"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/extraid"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ocireg"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/utils"
- "github.com/open-component-model/ocm/pkg/semverutils"
+ "ocm.software/ocm/api/ocm"
+ metav1 "ocm.software/ocm/api/ocm/compdesc/meta/v1"
+ "ocm.software/ocm/api/ocm/extensions/download"
+ "ocm.software/ocm/api/ocm/extensions/repositories/ocireg"
+ "ocm.software/ocm/api/ocm/extraid"
+ utils "ocm.software/ocm/api/ocm/ocmutils"
+ common "ocm.software/ocm/api/utils/misc"
+ "ocm.software/ocm/api/utils/semverutils"
)
func GettingStarted() error {
@@ -46,7 +46,7 @@ func GettingStarted() error {
// form as part of other resources, for example
// Kubernetes resources.
// The available repository implementations can be found
- // under .../pkg/contexts/ocm/repositories.
+ // under .../api/ocm/extensions/repositories.
// --- begin repository spec ---
spec := ocireg.NewRepositorySpec("ghcr.io/open-component-model/ocm")
// --- end repository spec ---
diff --git a/examples/lib/tour/02-composing-a-component-version/01-basic-componentversion-creation.go b/examples/lib/tour/02-composing-a-component-version/01-basic-componentversion-creation.go
index a122669da..829e3ad90 100644
--- a/examples/lib/tour/02-composing-a-component-version/01-basic-componentversion-creation.go
+++ b/examples/lib/tour/02-composing-a-component-version/01-basic-componentversion-creation.go
@@ -7,18 +7,18 @@ 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"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/elements"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/elements/artifactblob/dockermultiblob"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/elements/artifactblob/textblob"
- ctfocm "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ctf"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/resourcetypes"
- "github.com/open-component-model/ocm/pkg/mime"
- "github.com/open-component-model/ocm/pkg/semverutils"
+ "ocm.software/ocm/api/ocm"
+ "ocm.software/ocm/api/ocm/compdesc"
+ "ocm.software/ocm/api/ocm/elements"
+ "ocm.software/ocm/api/ocm/elements/artifactblob/dockermultiblob"
+ "ocm.software/ocm/api/ocm/elements/artifactblob/textblob"
+ "ocm.software/ocm/api/ocm/extensions/accessmethods/ociartifact"
+ resourcetypes "ocm.software/ocm/api/ocm/extensions/artifacttypes"
+ ctfocm "ocm.software/ocm/api/ocm/extensions/repositories/ctf"
+ "ocm.software/ocm/api/utils/blobaccess"
+ "ocm.software/ocm/api/utils/mime"
+ common "ocm.software/ocm/api/utils/misc"
+ "ocm.software/ocm/api/utils/semverutils"
)
// setupVersion configures a component version.
@@ -70,7 +70,7 @@ func setupVersion(cv ocm.ComponentVersionAccess) error {
// Here, we just use an image provided by the
// OCM ecosystem.
// Supported access types can be found under
- // .../pkg/contexts/ocm/accessmethods.
+ // .../api/ocm/extensions/accessmethods.
// --- begin setup image access ---
acc := ociartifact.New("ghcr.io/open-component-model/ocm/ocm.software/toi/installers/helminstaller/helminstaller:0.4.0")
// --- end setup image access ---
diff --git a/examples/lib/tour/02-composing-a-component-version/02-composition-version.go b/examples/lib/tour/02-composing-a-component-version/02-composition-version.go
index dc664d227..e2d59cd98 100644
--- a/examples/lib/tour/02-composing-a-component-version/02-composition-version.go
+++ b/examples/lib/tour/02-composing-a-component-version/02-composition-version.go
@@ -5,8 +5,8 @@ import (
"github.com/mandelsoft/goutils/errors"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/composition"
+ "ocm.software/ocm/api/ocm"
+ "ocm.software/ocm/api/ocm/extensions/repositories/composition"
)
func ComposingAComponentVersionB() error {
diff --git a/examples/lib/tour/02-composing-a-component-version/README.md b/examples/lib/tour/02-composing-a-component-version/README.md
index 6cfd68ef0..573f1db9d 100644
--- a/examples/lib/tour/02-composing-a-component-version/README.md
+++ b/examples/lib/tour/02-composing-a-component-version/README.md
@@ -115,7 +115,7 @@ for this kind of repository, we can just refer to it.
Here, we just use an image provided by the
OCM ecosystem.
Supported access types can be found under
-.../pkg/contexts/ocm/accessmethods.
+.../api/ocm/extensions/accessmethods.
```go
acc := ociartifact.New("ghcr.io/open-component-model/ocm/ocm.software/toi/installers/helminstaller/helminstaller:0.4.0")
diff --git a/examples/lib/tour/03-working-with-credentials/01-using-credentials.go b/examples/lib/tour/03-working-with-credentials/01-using-credentials.go
index 8bf49d325..0bc75c89f 100644
--- a/examples/lib/tour/03-working-with-credentials/01-using-credentials.go
+++ b/examples/lib/tour/03-working-with-credentials/01-using-credentials.go
@@ -3,10 +3,10 @@ package main
import (
"github.com/mandelsoft/goutils/errors"
- "github.com/open-component-model/ocm/examples/lib/helper"
- ociidentity "github.com/open-component-model/ocm/pkg/contexts/credentials/builtin/oci/identity"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ocireg"
+ ociidentity "ocm.software/ocm/api/credentials/builtin/oci/identity"
+ "ocm.software/ocm/api/ocm"
+ "ocm.software/ocm/api/ocm/extensions/repositories/ocireg"
+ "ocm.software/ocm/examples/lib/helper"
)
func UsingCredentialsA(cfg *helper.Config) error {
diff --git a/examples/lib/tour/03-working-with-credentials/02-basic-credential-management.go b/examples/lib/tour/03-working-with-credentials/02-basic-credential-management.go
index 3d9a8ddf6..7d96b4497 100644
--- a/examples/lib/tour/03-working-with-credentials/02-basic-credential-management.go
+++ b/examples/lib/tour/03-working-with-credentials/02-basic-credential-management.go
@@ -7,12 +7,12 @@ import (
"github.com/mandelsoft/goutils/errors"
- "github.com/open-component-model/ocm/examples/lib/helper"
- "github.com/open-component-model/ocm/pkg/contexts/credentials"
- ociidentity "github.com/open-component-model/ocm/pkg/contexts/credentials/builtin/oci/identity"
- "github.com/open-component-model/ocm/pkg/contexts/oci"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ocireg"
+ "ocm.software/ocm/api/credentials"
+ ociidentity "ocm.software/ocm/api/credentials/builtin/oci/identity"
+ "ocm.software/ocm/api/oci"
+ "ocm.software/ocm/api/ocm"
+ "ocm.software/ocm/api/ocm/extensions/repositories/ocireg"
+ "ocm.software/ocm/examples/lib/helper"
)
func UsingCredentialsB(cfg *helper.Config, create bool) error {
diff --git a/examples/lib/tour/03-working-with-credentials/03-credential-repositories.go b/examples/lib/tour/03-working-with-credentials/03-credential-repositories.go
index a00b38a78..47e15dd83 100644
--- a/examples/lib/tour/03-working-with-credentials/03-credential-repositories.go
+++ b/examples/lib/tour/03-working-with-credentials/03-credential-repositories.go
@@ -5,12 +5,12 @@ import (
"github.com/mandelsoft/goutils/errors"
- "github.com/open-component-model/ocm/examples/lib/helper"
- "github.com/open-component-model/ocm/pkg/contexts/credentials"
- ociidentity "github.com/open-component-model/ocm/pkg/contexts/credentials/builtin/oci/identity"
- "github.com/open-component-model/ocm/pkg/contexts/credentials/repositories/dockerconfig"
- "github.com/open-component-model/ocm/pkg/contexts/oci"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
+ "ocm.software/ocm/api/credentials"
+ ociidentity "ocm.software/ocm/api/credentials/builtin/oci/identity"
+ "ocm.software/ocm/api/credentials/extensions/repositories/dockerconfig"
+ "ocm.software/ocm/api/oci"
+ "ocm.software/ocm/api/ocm"
+ "ocm.software/ocm/examples/lib/helper"
)
func UsingCredentialsRepositories(cfg *helper.Config) error {
diff --git a/examples/lib/tour/03-working-with-credentials/common.go b/examples/lib/tour/03-working-with-credentials/common.go
index c04b397ea..fa7184809 100644
--- a/examples/lib/tour/03-working-with-credentials/common.go
+++ b/examples/lib/tour/03-working-with-credentials/common.go
@@ -7,18 +7,18 @@ 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"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/ociartifact"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/elements"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/elements/artifactblob/dockermultiblob"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/elements/artifactblob/textblob"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/resourcetypes"
- "github.com/open-component-model/ocm/pkg/mime"
- "github.com/open-component-model/ocm/pkg/semverutils"
+ "ocm.software/ocm/api/credentials"
+ "ocm.software/ocm/api/ocm"
+ "ocm.software/ocm/api/ocm/compdesc"
+ "ocm.software/ocm/api/ocm/elements"
+ "ocm.software/ocm/api/ocm/elements/artifactblob/dockermultiblob"
+ "ocm.software/ocm/api/ocm/elements/artifactblob/textblob"
+ "ocm.software/ocm/api/ocm/extensions/accessmethods/ociartifact"
+ resourcetypes "ocm.software/ocm/api/ocm/extensions/artifacttypes"
+ "ocm.software/ocm/api/utils/blobaccess"
+ "ocm.software/ocm/api/utils/mime"
+ common "ocm.software/ocm/api/utils/misc"
+ "ocm.software/ocm/api/utils/semverutils"
)
// setupVersion configures a component version.
@@ -62,7 +62,7 @@ func setupVersion(cv ocm.ComponentVersionAccess) error {
// Here, we just use an image provided by the
// OCM ecosystem.
// Supported access types can be found under
- // .../pkg/contexts/ocm/accessmethods.
+ // .../api/ocm/extensions/accessmethods.
acc := ociartifact.New("ghcr.io/open-component-model/ocm/ocm.software/toi/installers/helminstaller/helminstaller:0.4.0")
// Once we have both, the metadata and the content specification,
diff --git a/examples/lib/tour/03-working-with-credentials/main.go b/examples/lib/tour/03-working-with-credentials/main.go
index e3fe4a35c..01ee318c0 100644
--- a/examples/lib/tour/03-working-with-credentials/main.go
+++ b/examples/lib/tour/03-working-with-credentials/main.go
@@ -5,7 +5,7 @@ import (
"os"
"strings"
- "github.com/open-component-model/ocm/examples/lib/helper"
+ "ocm.software/ocm/examples/lib/helper"
)
// CFG is the path to the file containing the credentials
diff --git a/examples/lib/tour/04-working-with-config/01-basic-config-management.go b/examples/lib/tour/04-working-with-config/01-basic-config-management.go
index 1045e20a8..f61df0936 100644
--- a/examples/lib/tour/04-working-with-config/01-basic-config-management.go
+++ b/examples/lib/tour/04-working-with-config/01-basic-config-management.go
@@ -7,12 +7,12 @@ import (
"github.com/go-test/deep"
"github.com/mandelsoft/goutils/errors"
- "github.com/open-component-model/ocm/examples/lib/helper"
- "github.com/open-component-model/ocm/pkg/contexts/config"
- "github.com/open-component-model/ocm/pkg/contexts/credentials"
- credcfg "github.com/open-component-model/ocm/pkg/contexts/credentials/config"
- "github.com/open-component-model/ocm/pkg/contexts/credentials/repositories/directcreds"
- "github.com/open-component-model/ocm/pkg/contexts/oci"
+ "ocm.software/ocm/api/config"
+ "ocm.software/ocm/api/credentials"
+ credcfg "ocm.software/ocm/api/credentials/config"
+ "ocm.software/ocm/api/credentials/extensions/repositories/directcreds"
+ "ocm.software/ocm/api/oci"
+ "ocm.software/ocm/examples/lib/helper"
)
func BasicConfigurationHandling(cfg *helper.Config) error {
diff --git a/examples/lib/tour/04-working-with-config/02-handle-arbitrary-config.go b/examples/lib/tour/04-working-with-config/02-handle-arbitrary-config.go
index a93e914d7..0a17a1183 100644
--- a/examples/lib/tour/04-working-with-config/02-handle-arbitrary-config.go
+++ b/examples/lib/tour/04-working-with-config/02-handle-arbitrary-config.go
@@ -6,13 +6,13 @@ import (
"github.com/mandelsoft/goutils/errors"
- "github.com/open-component-model/ocm/examples/lib/helper"
- "github.com/open-component-model/ocm/pkg/contexts/config"
- configcfg "github.com/open-component-model/ocm/pkg/contexts/config/config"
- "github.com/open-component-model/ocm/pkg/contexts/credentials"
- credcfg "github.com/open-component-model/ocm/pkg/contexts/credentials/config"
- "github.com/open-component-model/ocm/pkg/contexts/credentials/repositories/directcreds"
- "github.com/open-component-model/ocm/pkg/contexts/oci"
+ "ocm.software/ocm/api/config"
+ configcfg "ocm.software/ocm/api/config/extensions/config"
+ "ocm.software/ocm/api/credentials"
+ credcfg "ocm.software/ocm/api/credentials/config"
+ "ocm.software/ocm/api/credentials/extensions/repositories/directcreds"
+ "ocm.software/ocm/api/oci"
+ "ocm.software/ocm/examples/lib/helper"
)
func credConfig(cfg *helper.Config) (config.Config, error) {
diff --git a/examples/lib/tour/04-working-with-config/03-using-ocm-config.go b/examples/lib/tour/04-working-with-config/03-using-ocm-config.go
index cf8f5aa75..d88cb45c2 100644
--- a/examples/lib/tour/04-working-with-config/03-using-ocm-config.go
+++ b/examples/lib/tour/04-working-with-config/03-using-ocm-config.go
@@ -6,14 +6,14 @@ import (
"github.com/mandelsoft/goutils/errors"
"sigs.k8s.io/yaml"
- "github.com/open-component-model/ocm/examples/lib/helper"
- configcfg "github.com/open-component-model/ocm/pkg/contexts/config/config"
- "github.com/open-component-model/ocm/pkg/contexts/credentials"
- credcfg "github.com/open-component-model/ocm/pkg/contexts/credentials/config"
- "github.com/open-component-model/ocm/pkg/contexts/credentials/repositories/dockerconfig"
- "github.com/open-component-model/ocm/pkg/contexts/oci"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/utils"
+ configcfg "ocm.software/ocm/api/config/extensions/config"
+ "ocm.software/ocm/api/credentials"
+ credcfg "ocm.software/ocm/api/credentials/config"
+ "ocm.software/ocm/api/credentials/extensions/repositories/dockerconfig"
+ "ocm.software/ocm/api/oci"
+ "ocm.software/ocm/api/ocm"
+ utils "ocm.software/ocm/api/ocm/ocmutils"
+ "ocm.software/ocm/examples/lib/helper"
)
func HandleOCMConfig(cfg *helper.Config) error {
diff --git a/examples/lib/tour/04-working-with-config/04-write-config-type.go b/examples/lib/tour/04-working-with-config/04-write-config-type.go
index 403fbad1c..9d9ad2cb1 100644
--- a/examples/lib/tour/04-working-with-config/04-write-config-type.go
+++ b/examples/lib/tour/04-working-with-config/04-write-config-type.go
@@ -7,14 +7,14 @@ import (
"github.com/mandelsoft/goutils/errors"
"sigs.k8s.io/yaml"
- "github.com/open-component-model/ocm/examples/lib/helper"
- configcfg "github.com/open-component-model/ocm/pkg/contexts/config/config"
- "github.com/open-component-model/ocm/pkg/contexts/config/cpi"
- "github.com/open-component-model/ocm/pkg/contexts/credentials"
- ociidentity "github.com/open-component-model/ocm/pkg/contexts/credentials/builtin/oci/identity"
- "github.com/open-component-model/ocm/pkg/contexts/oci"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
- "github.com/open-component-model/ocm/pkg/runtime"
+ "ocm.software/ocm/api/config/cpi"
+ configcfg "ocm.software/ocm/api/config/extensions/config"
+ "ocm.software/ocm/api/credentials"
+ ociidentity "ocm.software/ocm/api/credentials/builtin/oci/identity"
+ "ocm.software/ocm/api/oci"
+ "ocm.software/ocm/api/ocm"
+ "ocm.software/ocm/api/utils/runtime"
+ "ocm.software/ocm/examples/lib/helper"
)
// TYPE is the name of our new configuration object type.
diff --git a/examples/lib/tour/04-working-with-config/05-write-config-consumer.go b/examples/lib/tour/04-working-with-config/05-write-config-consumer.go
index bd1c578ab..c5a4166df 100644
--- a/examples/lib/tour/04-working-with-config/05-write-config-consumer.go
+++ b/examples/lib/tour/04-working-with-config/05-write-config-consumer.go
@@ -6,11 +6,11 @@ import (
"github.com/mandelsoft/goutils/errors"
- "github.com/open-component-model/ocm/examples/lib/helper"
- "github.com/open-component-model/ocm/pkg/contexts/config/cpi"
- "github.com/open-component-model/ocm/pkg/contexts/credentials"
- ociidentity "github.com/open-component-model/ocm/pkg/contexts/credentials/builtin/oci/identity"
- "github.com/open-component-model/ocm/pkg/contexts/oci"
+ "ocm.software/ocm/api/config/cpi"
+ "ocm.software/ocm/api/credentials"
+ ociidentity "ocm.software/ocm/api/credentials/builtin/oci/identity"
+ "ocm.software/ocm/api/oci"
+ "ocm.software/ocm/examples/lib/helper"
)
// we already have our new acme.org config object type,
diff --git a/examples/lib/tour/04-working-with-config/README.md b/examples/lib/tour/04-working-with-config/README.md
index 3eef9b8a5..fa816ee17 100644
--- a/examples/lib/tour/04-working-with-config/README.md
+++ b/examples/lib/tour/04-working-with-config/README.md
@@ -115,7 +115,7 @@ settings for the given object and calls the appropriate
methods on this object (after a type cast).
Here is the code snippet from the apply method of the credential
-config object ([.../pkg/contexts/credentials/config/type.go](../../../../pkg/contexts/credentials/config/type.go)):
+config object ([.../api/credentials/config/type.go](../../../../../api/credentials/config/type.go)):
```go
diff --git a/examples/lib/tour/04-working-with-config/common.go b/examples/lib/tour/04-working-with-config/common.go
index 2c08f1d35..26f41f97e 100644
--- a/examples/lib/tour/04-working-with-config/common.go
+++ b/examples/lib/tour/04-working-with-config/common.go
@@ -1,7 +1,7 @@
package main
import (
- "github.com/open-component-model/ocm/pkg/contexts/credentials"
+ "ocm.software/ocm/api/credentials"
)
func obfuscate(creds credentials.Credentials) string {
diff --git a/examples/lib/tour/04-working-with-config/main.go b/examples/lib/tour/04-working-with-config/main.go
index 1866d3304..cf75297e1 100644
--- a/examples/lib/tour/04-working-with-config/main.go
+++ b/examples/lib/tour/04-working-with-config/main.go
@@ -5,7 +5,7 @@ import (
"os"
"strings"
- "github.com/open-component-model/ocm/examples/lib/helper"
+ "ocm.software/ocm/examples/lib/helper"
)
// CFG is the path to the file containing the credentials
diff --git a/examples/lib/tour/05-transporting-component-versions/common.go b/examples/lib/tour/05-transporting-component-versions/common.go
index fb356ef73..6e3356759 100644
--- a/examples/lib/tour/05-transporting-component-versions/common.go
+++ b/examples/lib/tour/05-transporting-component-versions/common.go
@@ -7,17 +7,17 @@ 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"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/elements"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/elements/artifactblob/dockermultiblob"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/elements/artifactblob/textblob"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/resourcetypes"
- "github.com/open-component-model/ocm/pkg/mime"
- "github.com/open-component-model/ocm/pkg/semverutils"
+ "ocm.software/ocm/api/ocm"
+ "ocm.software/ocm/api/ocm/compdesc"
+ "ocm.software/ocm/api/ocm/elements"
+ "ocm.software/ocm/api/ocm/elements/artifactblob/dockermultiblob"
+ "ocm.software/ocm/api/ocm/elements/artifactblob/textblob"
+ "ocm.software/ocm/api/ocm/extensions/accessmethods/ociartifact"
+ resourcetypes "ocm.software/ocm/api/ocm/extensions/artifacttypes"
+ "ocm.software/ocm/api/utils/blobaccess"
+ "ocm.software/ocm/api/utils/mime"
+ common "ocm.software/ocm/api/utils/misc"
+ "ocm.software/ocm/api/utils/semverutils"
)
// setupVersion configures a component version.
@@ -61,7 +61,7 @@ func setupVersion(cv ocm.ComponentVersionAccess) error {
// Here, we just use an image provided by the
// OCM ecosystem.
// Supported access types can be found under
- // .../pkg/contexts/ocm/accessmethods.
+ // .../api/ocm/extensions/accessmethods.
acc := ociartifact.New("ghcr.io/open-component-model/ocm/ocm.software/toi/installers/helminstaller/helminstaller:0.4.0")
// Once we have both, the metadata and the content specification,
diff --git a/examples/lib/tour/05-transporting-component-versions/example.go b/examples/lib/tour/05-transporting-component-versions/example.go
index 1b1406342..4818a1add 100644
--- a/examples/lib/tour/05-transporting-component-versions/example.go
+++ b/examples/lib/tour/05-transporting-component-versions/example.go
@@ -5,14 +5,14 @@ import (
"github.com/mandelsoft/goutils/errors"
- "github.com/open-component-model/ocm/examples/lib/helper"
- ociidentity "github.com/open-component-model/ocm/pkg/contexts/credentials/builtin/oci/identity"
- "github.com/open-component-model/ocm/pkg/contexts/oci"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ocireg"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/transfer"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/transfer/transferhandler/standard"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/utils"
+ ociidentity "ocm.software/ocm/api/credentials/builtin/oci/identity"
+ "ocm.software/ocm/api/oci"
+ "ocm.software/ocm/api/ocm"
+ "ocm.software/ocm/api/ocm/extensions/repositories/ocireg"
+ utils "ocm.software/ocm/api/ocm/ocmutils"
+ "ocm.software/ocm/api/ocm/tools/transfer"
+ "ocm.software/ocm/api/ocm/tools/transfer/transferhandler/standard"
+ "ocm.software/ocm/examples/lib/helper"
)
// --- begin read config ---
diff --git a/examples/lib/tour/05-transporting-component-versions/main.go b/examples/lib/tour/05-transporting-component-versions/main.go
index 6e6ad9b26..45661d413 100644
--- a/examples/lib/tour/05-transporting-component-versions/main.go
+++ b/examples/lib/tour/05-transporting-component-versions/main.go
@@ -5,7 +5,7 @@ import (
"os"
"strings"
- "github.com/open-component-model/ocm/examples/lib/helper"
+ "ocm.software/ocm/examples/lib/helper"
)
// CFG is the path to the file containing the credentials
diff --git a/examples/lib/tour/06-signing-component-versions/01-basic-signing.go b/examples/lib/tour/06-signing-component-versions/01-basic-signing.go
index b40dfe7f7..021995ddc 100644
--- a/examples/lib/tour/06-signing-component-versions/01-basic-signing.go
+++ b/examples/lib/tour/06-signing-component-versions/01-basic-signing.go
@@ -5,11 +5,11 @@ import (
"github.com/mandelsoft/goutils/errors"
- "github.com/open-component-model/ocm/examples/lib/helper"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/composition"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/signing"
- "github.com/open-component-model/ocm/pkg/signing/handlers/rsa"
+ "ocm.software/ocm/api/ocm"
+ "ocm.software/ocm/api/ocm/extensions/repositories/composition"
+ "ocm.software/ocm/api/ocm/tools/signing"
+ "ocm.software/ocm/api/tech/signing/handlers/rsa"
+ "ocm.software/ocm/examples/lib/helper"
)
func SigningComponentVersions(cfg *helper.Config) error {
diff --git a/examples/lib/tour/06-signing-component-versions/02-using-context-settings.go b/examples/lib/tour/06-signing-component-versions/02-using-context-settings.go
index faa2897cd..8340bac8a 100644
--- a/examples/lib/tour/06-signing-component-versions/02-using-context-settings.go
+++ b/examples/lib/tour/06-signing-component-versions/02-using-context-settings.go
@@ -5,15 +5,15 @@ import (
"github.com/mandelsoft/goutils/errors"
- "github.com/open-component-model/ocm/examples/lib/helper"
- configcfg "github.com/open-component-model/ocm/pkg/contexts/config/config"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/attrs/signingattr"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/composition"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/signing"
- "github.com/open-component-model/ocm/pkg/runtime"
- "github.com/open-component-model/ocm/pkg/signing/handlers/rsa"
- "github.com/open-component-model/ocm/pkg/signing/signutils"
+ configcfg "ocm.software/ocm/api/config/extensions/config"
+ "ocm.software/ocm/api/ocm"
+ "ocm.software/ocm/api/ocm/extensions/attrs/signingattr"
+ "ocm.software/ocm/api/ocm/extensions/repositories/composition"
+ "ocm.software/ocm/api/ocm/tools/signing"
+ "ocm.software/ocm/api/tech/signing/handlers/rsa"
+ "ocm.software/ocm/api/tech/signing/signutils"
+ "ocm.software/ocm/api/utils/runtime"
+ "ocm.software/ocm/examples/lib/helper"
)
func prepareComponentInRepo(ctx ocm.Context, cfg *helper.Config) error {
diff --git a/examples/lib/tour/06-signing-component-versions/common.go b/examples/lib/tour/06-signing-component-versions/common.go
index 15694c8c9..22e684896 100644
--- a/examples/lib/tour/06-signing-component-versions/common.go
+++ b/examples/lib/tour/06-signing-component-versions/common.go
@@ -9,21 +9,21 @@ import (
"github.com/mandelsoft/goutils/errors"
"github.com/mandelsoft/goutils/finalizer"
- "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"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc"
- metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/elements"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/elements/artifactblob/dockermultiblob"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/elements/artifactblob/textblob"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/resourcetypes"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/utils"
- "github.com/open-component-model/ocm/pkg/mime"
- "github.com/open-component-model/ocm/pkg/semverutils"
- "github.com/open-component-model/ocm/pkg/signing/signutils"
+ "ocm.software/ocm/api/ocm"
+ "ocm.software/ocm/api/ocm/compdesc"
+ metav1 "ocm.software/ocm/api/ocm/compdesc/meta/v1"
+ "ocm.software/ocm/api/ocm/elements"
+ "ocm.software/ocm/api/ocm/elements/artifactblob/dockermultiblob"
+ "ocm.software/ocm/api/ocm/elements/artifactblob/textblob"
+ "ocm.software/ocm/api/ocm/extensions/accessmethods/ociartifact"
+ resourcetypes "ocm.software/ocm/api/ocm/extensions/artifacttypes"
+ utils "ocm.software/ocm/api/ocm/ocmutils"
+ "ocm.software/ocm/api/tech/signing/signutils"
+ "ocm.software/ocm/api/utils/blobaccess"
+ "ocm.software/ocm/api/utils/mime"
+ common "ocm.software/ocm/api/utils/misc"
+ "ocm.software/ocm/api/utils/semverutils"
+ "ocm.software/ocm/examples/lib/helper"
)
// setupVersion configures a component version.
@@ -67,7 +67,7 @@ func setupVersion(cv ocm.ComponentVersionAccess) error {
// Here, we just use an image provided by the
// OCM ecosystem.
// Supported access types can be found under
- // .../pkg/contexts/ocm/accessmethods.
+ // .../api/ocm/extensions/accessmethods.
acc := ociartifact.New("ghcr.io/open-component-model/ocm/ocm.software/toi/installers/helminstaller/helminstaller:0.4.0")
// Once we have both, the metadata and the content specification,
diff --git a/examples/lib/tour/06-signing-component-versions/main.go b/examples/lib/tour/06-signing-component-versions/main.go
index 2a31e09f1..d1ee2e83e 100644
--- a/examples/lib/tour/06-signing-component-versions/main.go
+++ b/examples/lib/tour/06-signing-component-versions/main.go
@@ -5,9 +5,9 @@ import (
"os"
"strings"
- "github.com/open-component-model/ocm/examples/lib/helper"
- "github.com/open-component-model/ocm/pkg/signing/handlers/rsa"
- "github.com/open-component-model/ocm/pkg/signing/signutils"
+ "ocm.software/ocm/api/tech/signing/handlers/rsa"
+ "ocm.software/ocm/api/tech/signing/signutils"
+ "ocm.software/ocm/examples/lib/helper"
)
// CFG is the path to the file containing the credentials
diff --git a/examples/lib/tour/docsrc/01-getting-started/README.md b/examples/lib/tour/docsrc/01-getting-started/README.md
index ea0cc9648..d12704dd0 100644
--- a/examples/lib/tour/docsrc/01-getting-started/README.md
+++ b/examples/lib/tour/docsrc/01-getting-started/README.md
@@ -31,7 +31,7 @@ a context object. Our example uses the default context
provided by the library, which covers the complete
type registration contained in the executable.
-It can be accessed by a function of the `pkg/contexts/ocm` package.
+It can be accessed by a function of the `api/ocm` package.
```go
{{include}{../../01-getting-started/example.go}{default context}}
@@ -52,7 +52,7 @@ the repository and can be used to store the serialized
form as part of other resources, for example
Kubernetes resources or configuration settings.
The available repository implementations can be found
-under `.../pkg/contexts/ocm/repositories`.
+under `.../api/ocm/extensions/repositories`.
```go
{{include}{../../01-getting-started/example.go}{repository spec}}
diff --git a/examples/lib/tour/docsrc/02-composing-a-component-version/README.md b/examples/lib/tour/docsrc/02-composing-a-component-version/README.md
index ca91bca49..6e00432e2 100644
--- a/examples/lib/tour/docsrc/02-composing-a-component-version/README.md
+++ b/examples/lib/tour/docsrc/02-composing-a-component-version/README.md
@@ -93,7 +93,7 @@ for this kind of repository, we can just refer to it.
Here, we just use an image provided by the
OCM ecosystem.
Supported access types can be found under
-.../pkg/contexts/ocm/accessmethods.
+.../api/ocm/extensions/accessmethods.
```go
{{include}{../../02-composing-a-component-version/01-basic-componentversion-creation.go}{setup image access}}
diff --git a/examples/lib/tour/docsrc/04-working-with-config/README.md b/examples/lib/tour/docsrc/04-working-with-config/README.md
index bd0cf2a5b..e5fc80c3e 100644
--- a/examples/lib/tour/docsrc/04-working-with-config/README.md
+++ b/examples/lib/tour/docsrc/04-working-with-config/README.md
@@ -90,10 +90,10 @@ settings for the given object and calls the appropriate
methods on this object (after a type cast).
Here is the code snippet from the apply method of the credential
-config object ([.../pkg/contexts/credentials/config/type.go](../../../../pkg/contexts/credentials/config/type.go)):
+config object ([.../api/credentials/config/type.go](../../../../../api/credentials/config/type.go)):
```go
-{{include}{../../../../../pkg/contexts/credentials/config/type.go}{apply}}
+{{include}{../../../../../api/credentials/config/type.go}{apply}}
...
```
@@ -365,7 +365,7 @@ It just checks for a valid YAML document featuring a non-empty
`type` field:
```go
-{{include}{../../../../../pkg/runtime/utils.go}{check}}
+{{include}{../../../../../api/utils/runtime/utils.go}{check}}
```
The most important method to implement is `ApplyTo(_ cpi.Context, tgt interface{}) error`,
diff --git a/examples/lib/transfer1/example.go b/examples/lib/transfer1/example.go
index f1904fe61..fd92781d8 100644
--- a/examples/lib/transfer1/example.go
+++ b/examples/lib/transfer1/example.go
@@ -10,20 +10,20 @@ import (
"github.com/mandelsoft/vfs/pkg/osfs"
"github.com/mandelsoft/vfs/pkg/vfs"
- "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"
- "github.com/open-component-model/ocm/pkg/contexts/config/configutils"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc"
- metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ctf"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/resourcetypes"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/transfer"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/transfer/transferhandler/standard"
- "github.com/open-component-model/ocm/pkg/mime"
+ "ocm.software/ocm/api/config/configutils"
+ "ocm.software/ocm/api/ocm"
+ "ocm.software/ocm/api/ocm/compdesc"
+ metav1 "ocm.software/ocm/api/ocm/compdesc/meta/v1"
+ resourcetypes "ocm.software/ocm/api/ocm/extensions/artifacttypes"
+ "ocm.software/ocm/api/ocm/extensions/repositories/ctf"
+ "ocm.software/ocm/api/ocm/tools/transfer"
+ "ocm.software/ocm/api/ocm/tools/transfer/transferhandler/standard"
+ "ocm.software/ocm/api/utils/accessio"
+ "ocm.software/ocm/api/utils/accessobj"
+ "ocm.software/ocm/api/utils/blobaccess"
+ "ocm.software/ocm/api/utils/mime"
+ common "ocm.software/ocm/api/utils/misc"
+ "ocm.software/ocm/examples/lib/helper"
)
const (
diff --git a/flake.nix b/flake.nix
index 75488a690..bc4984948 100644
--- a/flake.nix
+++ b/flake.nix
@@ -40,10 +40,10 @@
ldflags = [
"-s" "-w"
- "-X github.com/open-component-model/ocm/pkg/version.gitVersion=${version}"
- "-X github.com/open-component-model/ocm/pkg/version.gitTreeState=${state}"
- "-X github.com/open-component-model/ocm/pkg/version.gitCommit=${gitCommit}"
- # "-X github.com/open-component-model/ocm/pkg/version.buildDate=1970-01-01T0:00:00+0000"
+ "-X ocm.software/ocm/api/version.gitVersion=${version}"
+ "-X ocm.software/ocm/api/version.gitTreeState=${state}"
+ "-X ocm.software/ocm/api/version.gitCommit=${gitCommit}"
+ # "-X ocm.software/ocm/api/version.buildDate=1970-01-01T0:00:00+0000"
];
CGO_ENABLED = 0;
diff --git a/go.mod b/go.mod
index fe7159f3c..a57696181 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module github.com/open-component-model/ocm
+module ocm.software/ocm
go 1.22.5
diff --git a/hack/cross-build.sh b/hack/cross-build.sh
index c6ee228f2..a3a09c30c 100755
--- a/hack/cross-build.sh
+++ b/hack/cross-build.sh
@@ -22,10 +22,10 @@ for i in "${build_matrix[@]}"; do
CGO_ENABLED=0 GOOS=$os GOARCH=$arch GO111MODULE=on \
go build -o $bin_path \
-ldflags "-s -w \
- -X github.com/open-component-model/ocm/pkg/version.gitVersion=$EFFECTIVE_VERSION \
- -X github.com/open-component-model/ocm/pkg/version.gitTreeState=$([ -z "$(git status --porcelain 2>/dev/null)" ] && echo clean || echo dirty) \
- -X github.com/open-component-model/ocm/pkg/version.gitCommit=$(git rev-parse --verify HEAD) \
- -X github.com/open-component-model/ocm/pkg/version.buildDate=$(date -u +%FT%T%z)" \
+ -X ocm.software/ocm/api/version.gitVersion=$EFFECTIVE_VERSION \
+ -X ocm.software/ocm/api/version.gitTreeState=$([ -z "$(git status --porcelain 2>/dev/null)" ] && echo clean || echo dirty) \
+ -X ocm.software/ocm/api/version.gitCommit=$(git rev-parse --verify HEAD) \
+ -X ocm.software/ocm/api/version.buildDate=$(date -u +%FT%T%z)" \
${PROJECT_ROOT}/cmds/ocm
# create zipped file
diff --git a/hack/format.sh b/hack/format.sh
index 1e19c9b97..5005dbba3 100755
--- a/hack/format.sh
+++ b/hack/format.sh
@@ -8,9 +8,9 @@ log() {
echo " === ${msg}"
}
-pkgprefix="github.com/open-component-model/ocm"
+pkgprefix="ocm.software/ocm"
-log "Format with gci" # gci write --custom-order --skip-generated -s standard -s blank -s dot -s default -s "Prefix(github.com/open-component-model/ocm)"
+log "Format with gci" # gci write --custom-order --skip-generated -s standard -s blank -s dot -s default -s "Prefix(ocm.software/ocm)"
GCIFMT=( -s standard -s blank -s dot -s default -s="prefix(${pkgprefix})" --custom-order )
gci diff --skip-generated "${GCIFMT[@]}" "${@%/...}" ` create a migration script usable to migrate projects using this library
+
+# Migrating projects using this library
+
+The migration was done creating a migration script `migration.mig`. It can be used
+to migrate packages or whole projects using this library to the new package structure and module name.
+It is executed by using the same migration Bash script `migrate.sh` using the option
+
+`--script ` migrate a project using the OCM library.
+
+Optionally, package paths can be added as additional arguments to the command line. By default, the
+complete current working directory is migrated.
+
diff --git a/migrate.mig b/migrate.mig
new file mode 100644
index 000000000..464a7a66c
--- /dev/null
+++ b/migrate.mig
@@ -0,0 +1,84 @@
+ package github.com/open-component-model/ocm
+ adaptMig pkg/contexts/datacontext api
+ adaptMig pkg/contexts/clictx api
+ adaptMig pkg/contexts/config api
+ adaptMig pkg/contexts/credentials api
+ adaptMig pkg/contexts/oci api
+ adaptMig api/clictx/config api/cli
+ adaptMig api/clictx/internal api/cli
+ adaptRename api/clictx cli
+ adaptRenameParent api/clictx cli
+ adaptMig pkg/contexts/ocm api
+ adaptMig api/ocm/registration api/ocm/plugin
+ adaptMig pkg/helm api/tech
+ adaptMig pkg/npm api/tech
+ adaptMig pkg/maven api/tech
+ adaptMig pkg/signing api/tech
+ adaptMig pkg/docker api/tech
+ adaptMig cmds/ocm/pkg/data cmds/ocm/common
+ adaptMig cmds/ocm/pkg/options cmds/ocm/common
+ adaptMig cmds/ocm/pkg/output cmds/ocm/common
+ adaptMig cmds/ocm/pkg/processing cmds/ocm/common
+ adaptMig cmds/ocm/pkg/tree cmds/ocm/common
+ adaptMig cmds/ocm/pkg/utils cmds/ocm/common
+ adaptRenameParent cmds/ocm/pkg common
+ adaptMig pkg/utils api
+ adaptMig pkg/runtime api/utils
+ adaptMig pkg/spiff api/utils
+ adaptMig pkg/dirtree api/utils
+ adaptMig pkg/blobaccess api/utils
+ adaptMig pkg/clisupport api/utils
+ adaptMig pkg/cobrautils api/utils
+ adaptMig pkg/encrypt api/utils
+ adaptMig pkg/errkind api/utils
+ adaptMig pkg/filelock api/utils
+ adaptMig pkg/mime api/utils
+ adaptMig pkg/out api/utils
+ adaptMig pkg/refmgmt api/utils
+ adaptMig pkg/iotools api/utils
+ adaptMig pkg/listformat api/utils
+ adaptMig pkg/logging api/utils
+ adaptMig pkg/registrations api/utils
+ adaptMig pkg/runtimefinalizer api/utils
+ adaptMig pkg/semverutils api/utils
+ adaptMig pkg/testutils api/utils
+ adaptMig pkg/common/accessio api/utils
+ adaptMig pkg/common/accessobj api/utils
+ adaptMig pkg/common/compression api/utils
+ adaptMig pkg/common api/utils
+ adaptRename api/utils/common misc
+ adaptRenameParent api/utils/common misc
+ adaptMig pkg/env/builder api/helper
+ adaptMig pkg/env api/helper
+ adaptMig api/config/config api/config/extensions
+ adaptMig api/credentials/repositories api/credentials/extensions
+ adaptMig api/oci/repositories api/oci/extensions
+ adaptMig api/oci/actions api/oci/extensions
+ adaptMig api/oci/attrs api/oci/extensions
+ adaptMig api/oci/transfer api/oci/tools
+ adaptMig api/ocm/repositories api/ocm/extensions
+ adaptMig api/ocm/accessmethods api/ocm/extensions
+ adaptMig api/ocm/blobhandler api/ocm/extensions
+ adaptMig api/ocm/attrs api/ocm/extensions
+ adaptMig api/ocm/download api/ocm/extensions
+ adaptMig api/ocm/actionhandler api/ocm/extensions
+ adaptMig api/ocm/digester api/ocm/extensions
+ adaptMig api/ocm/labels api/ocm/extensions
+ adaptMig api/ocm/resourcetypes api/ocm/extensions
+ adaptMig api/ocm/pubsub api/ocm/extensions
+ adaptMig pkg/toi api/ocm/tools
+ adaptMig api/ocm/signing api/ocm/tools
+ adaptMig api/ocm/transfer api/ocm/tools
+ adaptMig pkg/version api
+ adaptRename api/ocm/context types
+ adaptRenameParent api/ocm/context types
+ adaptMig api/ocm/utils/check api/ocm/ocmutils
+ adaptMig api/ocm/utils/defaultconfigregistry api/ocm/ocmutils
+ adaptMig api/ocm/utils/localize api/ocm/ocmutils
+ adaptMig api/ocm/utils/registry api/ocm/ocmutils
+ adaptRename api/ocm/utils ocmutils
+ adaptRenameParent api/ocm/utils ocmutils
+ adaptRename api/ocm/extensions/resourcetypes artifacttypes
+ adaptRenameParent api/ocm/extensions/resourcetypes artifacttypes
+ MODULE="ocm.software/ocm"
+ changeModuleName
diff --git a/migrate.sh b/migrate.sh
new file mode 100755
index 000000000..114fe7d04
--- /dev/null
+++ b/migrate.sh
@@ -0,0 +1,434 @@
+#!/bin/bash -e
+
+PACKAGE="github.com/open-component-model/ocm"
+
+build=(components .github Dockerfile flake.nix Makefile .goreleaser.yaml dist/config.yaml README.md .reuse/dep5)
+
+adapts=( api pkg cmds hack examples )
+
+
+addMigrator()
+{
+ if [ -n "$MIGRATOR" ]; then
+ echo "$NESTED" "$@" >>"${MIGRATOR}"
+ fi
+ if [ -n "$SCRIPT" ]; then
+ echo "$@"
+ fi
+}
+
+package()
+{
+ addMigrator package "$1"
+
+ PACKAGE="$1"
+ prefix="$PACKAGE/"
+}
+
+remove()
+{
+ for i in "$@"; do
+ if [ -f "$i" -o -d "$i" ]; then
+ echo "removing $i"
+ rm -rf "$i"
+ else
+ echo "already removed $i"
+ fi
+ done
+}
+
+subst()
+{
+ echo -n "s:$1\([^a-zA-Z0-9]\):$2\1:g"
+}
+
+substDot()
+{
+ echo -n "s:\./$1\([^a-zA-Z0-9]\):\./$2\1:g"
+}
+
+
+adaptMig()
+{
+ local dst="$2/$(basename "$1")"
+
+ addMigrator adaptMig "$1" "$2"
+
+ for s in "${adapts[@]}" "${@:3}"; do
+ if [ -e "$s" ]; then
+ echo "${NESTED} adapting absolute $s"
+ find "$s" -type f -exec sed -i "$(subst "$prefix$1" "$prefix$dst")" {} \;
+ fi
+ done
+}
+
+mig()
+{
+ local P
+ if [ "$1" == "-p" ]; then
+ P="$1"
+ shift
+ fi
+ local dst="$2/$(basename "$1")"
+ if [ -d "$dst" ]; then
+ echo "${NESTED}already migrated $1 to $dst"
+ return
+ fi
+ if [ ! -d "$1" ]; then
+ echo "${NESTED}already migrated $1 to $dst"
+ return
+ fi
+ echo "${NESTED}migrate $1 to $dst"
+
+ mkdir -p "$2"
+ mv "$1" "$2"
+
+ adaptMig "$1" "$2" "${@:3}"
+
+ # adapting relative (file) paths
+ if [ -z "$P" ]; then
+ for s in cmds examples "${@:3}"; do
+ if [ -e "$s" ]; then
+ echo "${NESTED} adapting relative $s"
+ find "$s" -type f -exec sed -i "$(subst "$1" "$dst")" {} \;
+ fi
+ done
+ else
+ for s in cmds examples "${@:3}"; do
+ if [ -e "$s" ]; then
+ echo "${NESTED} adapting relative $s"
+ find "$s" -type f -exec sed -i "$(substDot "$1" "$dst")" {} \;
+ fi
+ done
+ fi
+}
+
+substDirect()
+{
+ # -r requires unescaped brackets
+ echo -n "s:(import\s+)\"$1\":\1\"$2\":g"
+}
+
+substLabeled()
+{
+ # -r requires unescaped brackets
+ echo -n "s:([a-zA-Z0-9_]+\s+)\"$1\":\1\"$2\":g"
+}
+
+substUnLabeled()
+{
+ local old="$(basename "$1")"
+ # -r requires unescaped brackets
+ echo -n "s:\"$1\":$old \"$2\":g"
+}
+
+move()
+{
+ if [ -d "$2" ]; then
+ echo "already moved $1 to $2"
+ return
+ fi
+ if [ ! -d "$1" ]; then
+ echo "already moved $1 to $2"
+ return
+ fi
+
+ if [ "$(basename "$1")" == "$(basename "$2")" ]; then
+ mig "$1" "$(dirname "$2")"
+ return
+ fi
+
+ if [ "$(dirname "$1")" == "$(dirname "$2")" ]; then
+ rename "$1" "$(basename "$2")"
+ return
+ fi
+
+ mig "$1" "$(dirname "$2")"
+ rename "$(dirname "$2")/$(basename "$1")" "$(basename "$2")"
+}
+
+adaptRename()
+{
+ local dst="$(dirname "$1")/$2"
+
+ addMigrator adaptRename "$@"
+
+ for s in "${adapts[@]}"; do
+ if [ -e "$s" ]; then
+ echo " adapting $s"
+ find "$s" -type f -exec sed -r -i -e "$(substDirect "$prefix$1" "$prefix$dst")" -e "$(substLabeled "$prefix$1" "$prefix$dst")" -e "$(substUnLabeled "$prefix$1" "$prefix$dst")" {} \;
+ fi
+ done
+}
+
+adaptRenameParent()
+{
+ local dst="$(dirname "$1")/$2"
+
+ addMigrator adaptRenameParent "$@"
+
+ for s in "${adapts[@]}" "${@:3}"; do
+ if [ -e "$s" ]; then
+ echo " adapting $s"
+ find "$s" -type f -exec sed -i "$(subst "$1" "$dst")" {} \;
+ fi
+ done
+}
+
+rename() {
+ local dst="$(dirname "$1")/$2"
+
+ if [ -d "$dst" ]; then
+ echo already renamed "$1" to "$dst"
+ return
+ fi
+ if [ ! -d "$1" ]; then
+ echo already renamed "$1" to "$dst"
+ return
+ fi
+
+ echo "rename $1 to $dst"
+
+ mkdir -p "$dst"
+ for d in "$1"/*; do
+ if [ -d "$d" ]; then
+ if [ "$d" != testdata ]; then
+ NESTED=" " mig "$d" "$dst"
+ fi
+ fi
+ done
+
+ local files=( "$1"/* )
+ if [ ${#files[@]} -ne 1 -o "${files[0]}" != "$1/*" ]; then
+ mv "$1"/* "$dst"
+
+ adaptRename "$@"
+ fi
+
+ adaptRenameParent "$@"
+
+ rmdir "$1"
+}
+
+fixRelativePathsFor()
+{
+ p="$1"
+ dst=
+ lvl=1
+
+ while true; do
+ p="$p/*"
+ (( lvl++ ))
+
+ files=( $p )
+
+ if [ ${#files[@]} -eq 1 -a "${files[0]}" == "$p" ]; then
+ break
+ fi
+
+ echo "level $lvl: $p"
+ dst="$dst../"
+
+ d="$(sed 's/\./\\\./g' <<<"$dst")"
+
+ for f in "${files[@]}"; do
+ if [ -f "$f" -a ! -h "$f" ]; then
+ for t in "${@:2}"; do
+ sed -r -i -e "s:([^./])(\.\./)+$t:\1$d$t:g" "$f"
+ done
+ fi
+ done
+ done
+}
+
+
+changeModuleName()
+{
+ if [ -n "$MODULE" ]; then
+ echo "*** changing module name"
+
+ addMigrator MODULE=\""$MODULE"\"
+ addMigrator changeModuleName
+
+ for s in "${adapts[@]}" "$@" go.mod .golangci.yaml; do
+ find "$s" -type f -exec sed -i -e "s:$PACKAGE:$MODULE:g" -e "s:\(LABEL.*\)$MODULE:\1$PACKAGE:g" -e "s&\([uU]rl:.*\)$MODULE&\1$PACKAGE&g" {} \;
+ done
+
+ #echo "*** adapting nix description"
+ #sed -i -e "s=github:open-component-model/ocm=github:open-component-model/ocm-core=g" README.md
+ fi
+}
+
+##########################################################
+# main
+##########################################################
+
+if [ "$1" == "--reset" ]; then
+ echo "*** reset"
+ git checkout HEAD .
+ rm -rf api
+ rm -rf cmds/ocm/common
+ exit
+fi
+
+mkdir -p api
+
+if [ "$1" == "--test" ]; then
+ mig pkg/contexts/ocm api "${build[@]}"
+ sed -i -e "s/pkg/api/g" Makefile
+ sed -i -e "s/pkg/api/g" components/*/Dockerfile
+ exit
+fi
+
+while [ $# -gt 0 ]; do
+ case "$1" in
+ --migrator)
+ MIGRATOR="$2"
+ shift 2;;
+ --script)
+ SCRIPT="$2"
+ shift 2;;
+ --paths)
+ FIXPATHS=X
+ shift;;
+ --module)
+ MODULE=ocm.software/ocm
+ shift;;
+ --deprecated)
+ DEPRECATED=X
+ shift;;
+ -*)
+ echo "invalid option $1" >&2
+ exit 1;;
+ *)
+ if [ -z "$SCRIPT" ]; then
+ echo "invalid extra arguments $@" >&2
+ exit 1
+ fi
+ break;;
+ esac
+done
+
+package "$PACKAGE"
+
+if [ -n "$SCRIPT" ]; then
+ MIGRATOR=
+ adapts=( "${@}" )
+ if [ ${#adapts[@]} -eq 0 ]; then
+ adapts=( . )
+ fi
+
+ if [ ! -f "$SCRIPT" ]; then
+ echo "invalid script $SCRIPT" >&2
+ exit 1
+ fi
+ echo migrating "${adapts[@]}" with script "$SCRIPT"
+ source "$SCRIPT"
+ exit 0
+fi
+
+if [ -n "$MIGRATOR" ]; then
+ echo "restructure packages and create migration script..."
+else
+ echo "restructure packages..."
+fi
+
+echo "*** removing deprecated packages..."
+remove pkg/{contexts/options,errors,finalizer,exception,generics,optionutils,regex,tokens} pkg/utils/{pkgutils,testutils} testdata
+remove pkg/helm/identity pkg/contexts/oci/identity
+
+if [ -n "$DEPRECATED" ]; then
+ exit 0
+fi
+
+echo "*** relocating packages..."
+# contexts
+for s in datacontext clictx config credentials oci; do
+ mig pkg/contexts/$s api
+done
+rename api/clictx cli
+
+mig pkg/contexts/ocm api "${build[@]}"
+mig api/ocm/registration api/ocm/plugin
+
+# technology support
+for s in helm npm maven signing; do
+ mig pkg/$s api/tech
+done
+mig pkg/docker api/tech .golangci.yaml
+
+rename cmds/ocm/pkg common
+
+# utils
+mig pkg/utils api
+mig -p pkg/runtime api/utils
+for s in pkg/{spiff,dirtree,blobaccess,clisupport,cobrautils,encrypt,errkind,filelock,mime,out,refmgmt,iotools,listformat,logging,registrations,runtimefinalizer,semverutils,testutils} pkg/common/{accessio,accessobj,compression}; do
+ mig $s api/utils
+done
+
+move pkg/common api/utils/misc
+
+for s in pkg/{env/builder,env}; do
+ mig $s api/helper
+done
+
+
+# now migrate sub packaged from migrated packages
+
+# config extensions
+for s in api/config/config; do
+ mig $s api/config/extensions
+done
+
+# credentials extensions
+for s in api/credentials/repositories; do
+ mig $s api/credentials/extensions
+done
+
+# oci extensions
+for s in api/oci/{repositories,actions,attrs}; do
+ mig $s api/oci/extensions
+done
+
+# oci tools support
+for s in api/oci/transfer; do
+ mig $s api/oci/tools
+done
+
+# ocm extensions
+for s in api/ocm/{repositories,accessmethods,blobhandler,attrs,download,actionhandler,digester,labels,resourcetypes,pubsub}; do
+ mig $s api/ocm/extensions "${build[@]}"
+done
+
+# ocm tools support
+for s in pkg/toi api/ocm/{signing,transfer}; do
+ mig $s api/ocm/tools
+done
+
+mig pkg/version api "${build[@]}"
+
+echo "*** renaming packages..."
+rename api/ocm/context types
+rename api/ocm/utils ocmutils
+rename api/ocm/extensions/resourcetypes artifacttypes
+
+echo "*** adapting go source root folders"
+sed -i -e "s/pkg/api/g" Makefile
+sed -i -e "s/pkg/api/g" components/*/Dockerfile
+
+if [ -n "$FIXPATHS" ]; then
+ echo "*** adapting relative paths"
+ for i in api cmds examples docs; do
+ fixRelativePathsFor "$i" api cmds examples docs resources
+ done
+fi
+
+if [ -n "$MODULE" ]; then
+ changeModuleName components docs "${build[@]}" go.mod .golangci.yaml
+fi
+
+echo "*** formatting"
+go fmt ./{api,cmds}/... >/dev/null
+
+echo "*** generating"
+make generate
diff --git a/pkg/blobaccess/blobaccess/access.go b/pkg/blobaccess/blobaccess/access.go
deleted file mode 100644
index 4d64c9b47..000000000
--- a/pkg/blobaccess/blobaccess/access.go
+++ /dev/null
@@ -1,73 +0,0 @@
-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
- })
-}
diff --git a/pkg/blobaccess/blobaccess/deprecated.go b/pkg/blobaccess/blobaccess/deprecated.go
deleted file mode 100644
index f6d4aea82..000000000
--- a/pkg/blobaccess/blobaccess/deprecated.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package blobaccess
-
-import (
- "github.com/mandelsoft/vfs/pkg/vfs"
- "github.com/opencontainers/go-digest"
-
- "github.com/open-component-model/ocm/pkg/blobaccess/bpi"
- "github.com/open-component-model/ocm/pkg/blobaccess/file"
-)
-
-// ForTemporaryFile wraps a temporary file into a BlobAccess, which does not need a close.
-// Deprecated: ForTemporaryFile.
-func ForTemporaryFileWithMeta(mime string, digest digest.Digest, size int64, temp vfs.File, fss ...vfs.FileSystem) bpi.BlobAccess {
- return file.BlobAccessForTemporaryFile(mime, temp, file.WithFileSystem(fss...), file.WithDigest(digest), file.WithSize(size))
-}
-
-// ForTemporaryFile wraps a temporary file into a BlobAccess, which does not need a close.
-// Deprecated: ForTemporaryFilePath.
-func ForTemporaryFilePathWithMeta(mime string, digest digest.Digest, size int64, temp string, fss ...vfs.FileSystem) BlobAccess {
- return file.BlobAccessForTemporaryFilePath(mime, temp, file.WithFileSystem(fss...), file.WithDigest(digest), file.WithSize(size))
-}
diff --git a/pkg/blobaccess/blobaccess/interface.go b/pkg/blobaccess/blobaccess/interface.go
deleted file mode 100644
index ea6084f76..000000000
--- a/pkg/blobaccess/blobaccess/interface.go
+++ /dev/null
@@ -1,30 +0,0 @@
-package blobaccess
-
-import (
- "github.com/open-component-model/ocm/pkg/blobaccess/internal"
-)
-
-const (
- KIND_BLOB = internal.KIND_BLOB
- KIND_MEDIATYPE = internal.KIND_MEDIATYPE
-
- BLOB_UNKNOWN_SIZE = internal.BLOB_UNKNOWN_SIZE
- BLOB_UNKNOWN_DIGEST = internal.BLOB_UNKNOWN_DIGEST
-)
-
-type (
- DataAccess = internal.DataAccess
- DataReader = internal.DataReader
- DataGetter = internal.DataGetter
-)
-
-type (
- BlobAccess = internal.BlobAccess
- BlobAccessProvider = internal.BlobAccessProvider
-
- DataSource = internal.DataSource
- DigestSource = internal.DigestSource
- MimeType = internal.MimeType
-)
-
-type FileLocation = internal.FileLocation
diff --git a/pkg/blobaccess/blobaccess/utils.go b/pkg/blobaccess/blobaccess/utils.go
deleted file mode 100644
index 002a80c6e..000000000
--- a/pkg/blobaccess/blobaccess/utils.go
+++ /dev/null
@@ -1,78 +0,0 @@
-package blobaccess
-
-import (
- "io"
-
- "github.com/open-component-model/ocm/pkg/blobaccess/bpi"
- "github.com/open-component-model/ocm/pkg/iotools"
-)
-
-func Cast[I interface{}](acc BlobAccess) I {
- return bpi.Cast[I](acc)
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-// BlobData can be applied directly to a function result
-// providing a BlobAccess to get the data for the provided blob.
-// If the blob access providing function provides an error
-// result it is passed to the caller.
-func BlobData(blob DataGetter, err ...error) ([]byte, error) {
- if len(err) > 0 && err[0] != nil {
- return nil, err[0]
- }
- return blob.Get()
-}
-
-// BlobReader can be applied directly to a function result
-// providing a BlobAccess to get a reader for the provided blob.
-// If the blob access providing function provides an error
-// result it is passed to the caller.
-func BlobReader(blob DataReader, err ...error) (io.ReadCloser, error) {
- if len(err) > 0 && err[0] != nil {
- return nil, err[0]
- }
- return blob.Reader()
-}
-
-// DataFromProvider extracts the data for a given BlobAccess provider.
-func DataFromProvider(s BlobAccessProvider) ([]byte, error) {
- blob, err := s.BlobAccess()
- if err != nil {
- return nil, err
- }
- defer blob.Close()
- return blob.Get()
-}
-
-// ReaderFromProvider gets a reader for a BlobAccess provided by
-// a BlobAccesssProvider. Closing the Reader also closes the BlobAccess.
-func ReaderFromProvider(s BlobAccessProvider) (io.ReadCloser, error) {
- blob, err := s.BlobAccess()
- if err != nil {
- return nil, err
- }
- r, err := blob.Reader()
- if err != nil {
- blob.Close()
- return nil, err
- }
- return iotools.AddReaderCloser(r, blob), nil
-}
-
-// MimeReaderFromProvider gets a reader for a BlobAccess provided by
-// a BlobAccesssProvider. Closing the Reader also closes the BlobAccess.
-// Additionally, the mime type of the blob is returned.
-func MimeReaderFromProvider(s BlobAccessProvider) (io.ReadCloser, string, error) {
- blob, err := s.BlobAccess()
- if err != nil {
- return nil, "", err
- }
- mime := blob.MimeType()
- r, err := blob.Reader()
- if err != nil {
- blob.Close()
- return nil, "", err
- }
- return iotools.AddReaderCloser(r, blob), mime, nil
-}
diff --git a/pkg/blobaccess/bpi/interface.go b/pkg/blobaccess/bpi/interface.go
deleted file mode 100644
index 75af2f949..000000000
--- a/pkg/blobaccess/bpi/interface.go
+++ /dev/null
@@ -1,52 +0,0 @@
-package bpi
-
-import (
- "github.com/mandelsoft/goutils/errors"
- "github.com/opencontainers/go-digest"
-
- "github.com/open-component-model/ocm/pkg/blobaccess/internal"
- "github.com/open-component-model/ocm/pkg/refmgmt"
- "github.com/open-component-model/ocm/pkg/utils"
-)
-
-const (
- KIND_BLOB = internal.KIND_BLOB
- KIND_MEDIATYPE = internal.KIND_MEDIATYPE
-
- BLOB_UNKNOWN_SIZE = internal.BLOB_UNKNOWN_SIZE
- BLOB_UNKNOWN_DIGEST = internal.BLOB_UNKNOWN_DIGEST
-)
-
-var ErrClosed = refmgmt.ErrClosed
-
-type DataAccess = internal.DataAccess
-
-type (
- BlobAccess = internal.BlobAccess
- BlobAccessBase = internal.BlobAccessBase
- BlobAccessProvider = internal.BlobAccessProvider
-
- Validatable = utils.Validatable
-
- DataReader = internal.DataReader
- DataGetter = internal.DataGetter
- DataSource = internal.DataSource
- DigestSource = internal.DigestSource
- MimeType = internal.MimeType
-)
-
-type FileLocation = internal.FileLocation
-
-type BlobAccessProviderFunction func() (BlobAccess, error)
-
-func (p BlobAccessProviderFunction) BlobAccess() (BlobAccess, error) {
- return p()
-}
-
-func ErrBlobNotFound(digest digest.Digest) error {
- return errors.ErrNotFound(KIND_BLOB, digest.String())
-}
-
-func IsErrBlobNotFound(err error) bool {
- return errors.IsErrNotFoundKind(err, KIND_BLOB)
-}
diff --git a/pkg/blobaccess/bpi/utils.go b/pkg/blobaccess/bpi/utils.go
deleted file mode 100644
index 50be302ea..000000000
--- a/pkg/blobaccess/bpi/utils.go
+++ /dev/null
@@ -1,224 +0,0 @@
-package bpi
-
-import (
- "io"
- "sync"
- "sync/atomic"
-
- "github.com/opencontainers/go-digest"
-
- "github.com/open-component-model/ocm/pkg/iotools"
-)
-
-type _dataAccess = DataAccess
-
-type baseAccess interface {
- base() BlobAccessBase
-}
-
-func Cast[I interface{}](acc BlobAccess) I {
- var _nil I
-
- var b BlobAccessBase = acc
-
- for b != nil {
- if i, ok := b.(I); ok {
- return i
- }
- if i, ok := b.(baseAccess); ok {
- b = i.base()
- } else {
- b = nil
- }
- }
- return _nil
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-type blobAccess struct {
- _dataAccess
-
- lock sync.RWMutex
- digest digest.Digest
- size int64
- mimeType string
-}
-
-func (b *blobAccess) MimeType() string {
- return b.mimeType
-}
-
-func (b *blobAccess) DigestKnown() bool {
- b.lock.RLock()
- defer b.lock.RUnlock()
- return b.digest != ""
-}
-
-func (b *blobAccess) Digest() digest.Digest {
- b.lock.Lock()
- defer b.lock.Unlock()
- return b._Digest()
-}
-
-func (b *blobAccess) _Digest() digest.Digest {
- if b.digest == "" {
- b.update()
- }
- return b.digest
-}
-
-func (b *blobAccess) Size() int64 {
- b.lock.Lock()
- defer b.lock.Unlock()
- return b._Size()
-}
-
-func (b *blobAccess) _Size() int64 {
- if b.size < 0 {
- b.update()
- }
- return b.size
-}
-
-func (b *blobAccess) update() error {
- reader, err := b.Reader()
- if err != nil {
- return err
- }
-
- defer reader.Close()
- count := iotools.NewCountingReader(reader)
-
- digest, err := digest.Canonical.FromReader(count)
- if err != nil {
- return err
- }
-
- b.size = count.Size()
- b.digest = digest
-
- return nil
-}
-
-type closableBlobAccess struct {
- blobAccess
- closed atomic.Bool
-}
-
-func (b *closableBlobAccess) Close() error {
- b.lock.Lock()
- defer b.lock.Unlock()
- if !b.closed.Load() {
- tmp := b._dataAccess
- b.closed.Store(true)
- b._dataAccess = nil
- return tmp.Close()
- }
- return ErrClosed
-}
-
-func (b *closableBlobAccess) Get() ([]byte, error) {
- b.lock.Lock()
- defer b.lock.Unlock()
-
- if b.closed.Load() {
- return nil, ErrClosed
- }
- return b.blobAccess.Get()
-}
-
-func (b *closableBlobAccess) Reader() (io.ReadCloser, error) {
- b.lock.Lock()
- defer b.lock.Unlock()
-
- if b.closed.Load() {
- return nil, ErrClosed
- }
- return b.blobAccess.Reader()
-}
-
-func (b *closableBlobAccess) Digest() digest.Digest {
- b.lock.Lock()
- defer b.lock.Unlock()
-
- if b.closed.Load() {
- return b.digest
- }
- return b.blobAccess._Digest()
-}
-
-func (b *closableBlobAccess) Size() int64 {
- b.lock.Lock()
- defer b.lock.Unlock()
-
- if b.closed.Load() {
- return b.size
- }
- return b.blobAccess._Size()
-}
-
-// BaseAccessForDataAccess is used for a general data.
-// It calculated the metadata on-the-fly for the content
-// of the data access. The content may not be changing.
-func BaseAccessForDataAccess(mime string, acc DataAccess) BlobAccessBase {
- return &closableBlobAccess{
- blobAccess: blobAccess{mimeType: mime, _dataAccess: acc, digest: BLOB_UNKNOWN_DIGEST, size: BLOB_UNKNOWN_SIZE},
- }
-}
-
-// BaseAccessForDataAccessAndMeta provides a BlobAccessBase for a DataAccess
-// adding the additional blob access metadata (mime, digest, and size).
-// Digest and size can be set to unknown using the constants (BLOB_UNKNOWN_DIGEST
-// and BLOB_UNKNOWN_SIZE).
-func BaseAccessForDataAccessAndMeta(mime string, acc DataAccess, dig digest.Digest, size int64) BlobAccessBase {
- return &closableBlobAccess{
- blobAccess: blobAccess{mimeType: mime, _dataAccess: acc, digest: dig, size: size},
- }
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-// StaticBlobAccess is a BlobAccess which does not
-// require finalization, therefore it can be used
-// as BlobAccessProvider, also.
-type StaticBlobAccess interface {
- BlobAccess
- BlobAccessProvider
-}
-
-type staticBlobAccess struct {
- blobAccess
-}
-
-func (s *staticBlobAccess) Dup() (BlobAccess, error) {
- return s, nil
-}
-
-func (s *staticBlobAccess) BlobAccess() (BlobAccess, error) {
- return s, nil
-}
-
-func (s *staticBlobAccess) Close() error {
- return nil
-}
-
-// ForStaticDataAccess is used for a data access using no closer.
-// They don't require a finalization and can be used
-// as long as they exist. Therefore, no ref counting
-// is required and they can be used as BlobAccessProvider, also.
-func ForStaticDataAccess(mime string, acc DataAccess) StaticBlobAccess {
- return &staticBlobAccess{
- blobAccess: blobAccess{mimeType: mime, _dataAccess: acc, digest: BLOB_UNKNOWN_DIGEST, size: BLOB_UNKNOWN_SIZE},
- }
-}
-
-// ForStaticDataAccessAndMeta provides a StaticBlobAccess for a DataAccess
-// adding the additional blob access metadata (mime, digest, and size).
-// Digest and size can be set to unknown using the constants (BLOB_UNKNOWN_DIGEST
-// and BLOB_UNKNOWN_SIZE).
-func ForStaticDataAccessAndMeta(mime string, acc DataAccess, dig digest.Digest, size int64) StaticBlobAccess {
- return &staticBlobAccess{
- blobAccess: blobAccess{mimeType: mime, _dataAccess: acc, digest: dig, size: size},
- }
-}
diff --git a/pkg/blobaccess/bpi/view.go b/pkg/blobaccess/bpi/view.go
deleted file mode 100644
index abfc174c5..000000000
--- a/pkg/blobaccess/bpi/view.go
+++ /dev/null
@@ -1,96 +0,0 @@
-package bpi
-
-import (
- "fmt"
- "io"
-
- "github.com/opencontainers/go-digest"
-
- "github.com/open-component-model/ocm/pkg/refmgmt"
- "github.com/open-component-model/ocm/pkg/utils"
-)
-
-func NewBlobAccessForBase(acc BlobAccessBase, closer ...io.Closer) BlobAccess {
- return refmgmt.WithView[BlobAccessBase, BlobAccess](acc, blobAccessViewCreator, closer...)
-}
-
-func blobAccessViewCreator(blob BlobAccessBase, view *refmgmt.View[BlobAccess]) BlobAccess {
- return &blobAccessView{view, blob}
-}
-
-type blobAccessView struct {
- *refmgmt.View[BlobAccess]
- baseblob BlobAccessBase
-}
-
-var (
- _ utils.Validatable = (*blobAccessView)(nil)
- _ utils.Unwrappable = (*blobAccessView)(nil)
-)
-
-func (b *blobAccessView) base() BlobAccessBase {
- return b.baseblob
-}
-
-func (b *blobAccessView) Unwrap() interface{} {
- return b.baseblob
-}
-
-func (b *blobAccessView) Close() error {
- return b.View.Close()
-}
-
-func (b *blobAccessView) Validate() error {
- return utils.ValidateObject(b.baseblob)
-}
-
-func (b *blobAccessView) Get() (result []byte, err error) {
- return result, b.Execute(func() error {
- result, err = b.baseblob.Get()
- if err != nil {
- return err
- }
- return nil
- })
-}
-
-func (b *blobAccessView) Reader() (result io.ReadCloser, err error) {
- return result, b.Execute(func() error {
- result, err = b.baseblob.Reader()
- if err != nil {
- return fmt.Errorf("unable to read access: %w", err)
- }
-
- return nil
- })
-}
-
-func (b *blobAccessView) Digest() (result digest.Digest) {
- err := b.Execute(func() error {
- result = b.baseblob.Digest()
- return nil
- })
- if err != nil {
- return BLOB_UNKNOWN_DIGEST
- }
- return
-}
-
-func (b *blobAccessView) MimeType() string {
- return b.baseblob.MimeType()
-}
-
-func (b *blobAccessView) DigestKnown() bool {
- return b.baseblob.DigestKnown()
-}
-
-func (b *blobAccessView) Size() (result int64) {
- err := b.Execute(func() error {
- result = b.baseblob.Size()
- return nil
- })
- if err != nil {
- return BLOB_UNKNOWN_SIZE
- }
- return
-}
diff --git a/pkg/blobaccess/deprecated.go b/pkg/blobaccess/deprecated.go
deleted file mode 100644
index 30d1bf48c..000000000
--- a/pkg/blobaccess/deprecated.go
+++ /dev/null
@@ -1,11 +0,0 @@
-package blobaccess
-
-import (
- "github.com/open-component-model/ocm/pkg/blobaccess/blobaccess"
-)
-
-// DataAccessForBytes wraps a bytes slice into a DataAccess.
-// Deprecated: used DataAccessForData.
-func DataAccessForBytes(data []byte, origin ...string) DataSource {
- return blobaccess.DataAccessForData(data, origin...)
-}
diff --git a/pkg/blobaccess/dirtree/access.go b/pkg/blobaccess/dirtree/access.go
deleted file mode 100644
index 4da131a9f..000000000
--- a/pkg/blobaccess/dirtree/access.go
+++ /dev/null
@@ -1,77 +0,0 @@
-package dirtree
-
-import (
- "compress/gzip"
- "fmt"
-
- "github.com/mandelsoft/goutils/errors"
- "github.com/mandelsoft/goutils/optionutils"
- "github.com/mandelsoft/vfs/pkg/vfs"
-
- "github.com/open-component-model/ocm/pkg/blobaccess/bpi"
- "github.com/open-component-model/ocm/pkg/blobaccess/file"
- "github.com/open-component-model/ocm/pkg/mime"
- "github.com/open-component-model/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/utils/tarutils"
-)
-
-func DataAccess(path string, opts ...Option) (bpi.DataAccess, error) {
- blobAccess, err := BlobAccess(path, opts...)
- if err != nil {
- return nil, err
- }
- return blobAccess, nil
-}
-
-func BlobAccess(path string, opts ...Option) (_ bpi.BlobAccess, rerr error) {
- eff := optionutils.EvalOptions(opts...)
- fs := utils.FileSystem(eff.FileSystem)
-
- ok, err := vfs.IsDir(fs, path)
- if err != nil {
- return nil, err
- }
- if !ok {
- return nil, fmt.Errorf("%q is no directory", path)
- }
-
- taropts := tarutils.TarFileSystemOptions{
- IncludeFiles: eff.IncludeFiles,
- ExcludeFiles: eff.ExcludeFiles,
- PreserveDir: utils.AsBool(eff.PreserveDir),
- FollowSymlinks: utils.AsBool(eff.FollowSymlinks),
- }
-
- temp, err := file.NewTempFile(fs.FSTempDir(), "resourceblob*.tgz", fs)
- if err != nil {
- return nil, err
- }
- defer errors.PropagateError(&rerr, temp.Close)
-
- if utils.AsBool(eff.CompressWithGzip) {
- if eff.MimeType == "" {
- eff.MimeType = mime.MIME_TGZ
- }
- gw := gzip.NewWriter(temp.Writer())
- if err := tarutils.PackFsIntoTar(fs, path, gw, taropts); err != nil {
- return nil, fmt.Errorf("unable to tar input artifact: %w", err)
- }
- if err := gw.Close(); err != nil {
- return nil, fmt.Errorf("unable to close gzip writer: %w", err)
- }
- } else {
- if eff.MimeType == "" {
- eff.MimeType = mime.MIME_TAR
- }
- if err := tarutils.PackFsIntoTar(fs, path, temp.Writer(), taropts); err != nil {
- return nil, fmt.Errorf("unable to tar input artifact: %w", err)
- }
- }
- return temp.AsBlob(eff.MimeType), nil
-}
-
-func Provider(path string, opts ...Option) bpi.BlobAccessProvider {
- return bpi.BlobAccessProviderFunction(func() (bpi.BlobAccess, error) {
- return BlobAccess(path, opts...)
- })
-}
diff --git a/pkg/blobaccess/dirtree/deprecated.go b/pkg/blobaccess/dirtree/deprecated.go
deleted file mode 100644
index e5b32baac..000000000
--- a/pkg/blobaccess/dirtree/deprecated.go
+++ /dev/null
@@ -1,17 +0,0 @@
-package dirtree
-
-import (
- "github.com/open-component-model/ocm/pkg/blobaccess/bpi"
-)
-
-// BlobAccessForDirTree returns a BlobAccess for the given directory tree.
-// Deprecated: use BlobAccess.
-func BlobAccessForDirTree(path string, opts ...Option) (_ bpi.BlobAccess, rerr error) {
- return BlobAccess(path, opts...)
-}
-
-// BlobAccessProviderForDirTree returns a BlobAccessProvider for the given directory tree.
-// Deprecated: use Provider.
-func BlobAccessProviderForDirTree(path string, opts ...Option) bpi.BlobAccessProvider {
- return Provider(path, opts...)
-}
diff --git a/pkg/blobaccess/dirtree/options.go b/pkg/blobaccess/dirtree/options.go
deleted file mode 100644
index 3eba40a11..000000000
--- a/pkg/blobaccess/dirtree/options.go
+++ /dev/null
@@ -1,134 +0,0 @@
-package dirtree
-
-import (
- "github.com/mandelsoft/goutils/optionutils"
- "github.com/mandelsoft/vfs/pkg/vfs"
- "golang.org/x/exp/slices"
-
- "github.com/open-component-model/ocm/pkg/utils"
-)
-
-type Option = optionutils.Option[*Options]
-
-type Options struct {
- // FileSystem defines the file system that contains the specified directory.
- FileSystem vfs.FileSystem
- MimeType string
- // CompressWithGzip defines whether the specified directory should be compressed.
- CompressWithGzip *bool `json:"compress,omitempty"`
- // PreserveDir defines that the specified directory should be included in the blob.
- PreserveDir *bool `json:"preserveDir,omitempty"`
- // IncludeFiles is a list of shell file name patterns that describe the files that should be included.
- // If nothing is defined, all files are included.
- IncludeFiles []string `json:"includeFiles,omitempty"`
- // ExcludeFiles is a list of shell file name patterns that describe the files that should be excluded from the resulting tar.
- // Excluded files always overwrite included files.
- ExcludeFiles []string `json:"excludeFiles,omitempty"`
- // FollowSymlinks configures to follow and resolve symlinks when a directory is tarred.
- // This options will include the content of the symlink directly in the tar.
- // This option should be used with care.
- FollowSymlinks *bool `json:"followSymlinks,omitempty"`
-}
-
-func (o *Options) ApplyTo(opts *Options) {
- if opts == nil {
- return
- }
- if o.FileSystem != nil {
- opts.FileSystem = o.FileSystem
- }
- if o.MimeType != "" {
- opts.MimeType = o.MimeType
- }
- if o.CompressWithGzip != nil {
- opts.CompressWithGzip = utils.BoolP(*o.CompressWithGzip)
- }
- if o.PreserveDir != nil {
- opts.PreserveDir = utils.BoolP(*o.PreserveDir)
- }
- if len(o.IncludeFiles) != 0 {
- opts.IncludeFiles = slices.Clone(o.IncludeFiles)
- }
- if len(o.ExcludeFiles) != 0 {
- opts.ExcludeFiles = slices.Clone(o.ExcludeFiles)
- }
- if o.FollowSymlinks != nil {
- opts.FollowSymlinks = utils.BoolP(*o.FollowSymlinks)
- }
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-type fileSystem struct {
- fs vfs.FileSystem
-}
-
-func (o *fileSystem) ApplyTo(opts *Options) {
- opts.FileSystem = o.fs
-}
-
-func WithFileSystem(fs vfs.FileSystem) Option {
- return &fileSystem{fs: fs}
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-type mimeType string
-
-func (o mimeType) ApplyTo(opts *Options) {
- opts.MimeType = string(o)
-}
-
-func WithMimeType(mime string) Option {
- return mimeType(mime)
-}
-
-type compressWithGzip bool
-
-func (o compressWithGzip) ApplyTo(opts *Options) {
- opts.CompressWithGzip = utils.BoolP(o)
-}
-
-func WithCompressWithGzip(b ...bool) Option {
- return compressWithGzip(utils.OptionalDefaultedBool(true, b...))
-}
-
-type preserveDir bool
-
-func (o preserveDir) ApplyTo(opts *Options) {
- opts.PreserveDir = utils.BoolP(o)
-}
-
-func WithPreserveDir(b ...bool) Option {
- return preserveDir(utils.OptionalDefaultedBool(true, b...))
-}
-
-type includeFiles []string
-
-func (o includeFiles) ApplyTo(opts *Options) {
- opts.IncludeFiles = slices.Clone(o)
-}
-
-func WithIncludeFiles(files []string) Option {
- return includeFiles(files)
-}
-
-type excludeFiles []string
-
-func (o excludeFiles) ApplyTo(opts *Options) {
- opts.ExcludeFiles = slices.Clone(o)
-}
-
-func WithExcludeFiles(files []string) Option {
- return excludeFiles(files)
-}
-
-type followSymlinks bool
-
-func (o followSymlinks) ApplyTo(opts *Options) {
- opts.FollowSymlinks = utils.BoolP(o)
-}
-
-func WithFollowSymlinks(b ...bool) Option {
- return followSymlinks(utils.OptionalDefaultedBool(true, b...))
-}
diff --git a/pkg/blobaccess/dockerdaemon/access.go b/pkg/blobaccess/dockerdaemon/access.go
deleted file mode 100644
index e7cb29fb9..000000000
--- a/pkg/blobaccess/dockerdaemon/access.go
+++ /dev/null
@@ -1,76 +0,0 @@
-package dockerdaemon
-
-import (
- "fmt"
-
- "github.com/mandelsoft/goutils/optionutils"
-
- "github.com/open-component-model/ocm/pkg/blobaccess/bpi"
- "github.com/open-component-model/ocm/pkg/contexts/oci/annotations"
- "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/artifactset"
- "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/docker"
- cpi "github.com/open-component-model/ocm/pkg/contexts/oci/types"
-)
-
-func (o *Options) OCIContext() cpi.Context {
- if o.Context == nil {
- return cpi.DefaultContext()
- }
- return o.Context
-}
-
-func ImageInfoFor(name string, opts ...Option) (locator string, version string, err error) {
- eff := optionutils.EvalOptions(opts...)
-
- locator, version, err = docker.ParseGenericRef(name)
- if err != nil {
- return "", "", err
- }
-
- if version == "" || version == "latest" || optionutils.AsValue(eff.OverrideVersion) {
- version = eff.Version
- }
- if version == "" {
- return "", "", fmt.Errorf("no version specified")
- }
- return locator, version, nil
-}
-
-func Provider(name string, opts ...Option) bpi.BlobAccessProvider {
- return bpi.BlobAccessProviderFunction(func() (bpi.BlobAccess, error) {
- b, _, err := BlobAccess(name, opts...)
- return b, err
- })
-}
-
-// BlobAccess returns a BlobAccess for the image with the given name.
-func BlobAccess(name string, opts ...Option) (bpi.BlobAccess, string, error) {
- eff := optionutils.EvalOptions(opts...)
- ctx := eff.OCIContext()
-
- locator, version, err := ImageInfoFor(name, eff)
- if err != nil {
- return nil, "", err
- }
- spec := docker.NewRepositorySpec()
- repo, err := ctx.RepositoryForSpec(spec)
- if err != nil {
- return nil, "", err
- }
- ns, err := repo.LookupNamespace(locator)
- if err != nil {
- return nil, "", err
- }
- blob, err := artifactset.SynthesizeArtifactBlob(ns, version,
- func(art cpi.ArtifactAccess) error {
- if eff.Origin != nil {
- art.Artifact().SetAnnotation(annotations.COMPVERS_ANNOTATION, eff.Origin.String())
- }
- return nil
- },
- )
- if err != nil {
- return nil, "", err
- }
- return blob, version, nil
-}
diff --git a/pkg/blobaccess/dockerdaemon/deprecated.go b/pkg/blobaccess/dockerdaemon/deprecated.go
deleted file mode 100644
index 9ceb05f60..000000000
--- a/pkg/blobaccess/dockerdaemon/deprecated.go
+++ /dev/null
@@ -1,17 +0,0 @@
-package dockerdaemon
-
-import (
- "github.com/open-component-model/ocm/pkg/blobaccess/bpi"
-)
-
-// BlobAccessProviderForImageFromDockerDaemon returns a BlobAccessProvider for the image with the given name.
-// Deprecated: use Provider.
-func BlobAccessProviderForImageFromDockerDaemon(name string, opts ...Option) bpi.BlobAccessProvider {
- return Provider(name, opts...)
-}
-
-// BlobAccessForImageFromDockerDaemon returns a BlobAccess for the image with the given name.
-// Decrecated: use BlobAccess.
-func BlobAccessForImageFromDockerDaemon(name string, opts ...Option) (bpi.BlobAccess, string, error) {
- return BlobAccess(name, opts...)
-}
diff --git a/pkg/blobaccess/dockerdaemon/options.go b/pkg/blobaccess/dockerdaemon/options.go
deleted file mode 100644
index b9e8da91a..000000000
--- a/pkg/blobaccess/dockerdaemon/options.go
+++ /dev/null
@@ -1,110 +0,0 @@
-package dockerdaemon
-
-import (
- "github.com/mandelsoft/goutils/optionutils"
-
- "github.com/open-component-model/ocm/pkg/common"
- cpi "github.com/open-component-model/ocm/pkg/contexts/oci/types"
- "github.com/open-component-model/ocm/pkg/utils"
-)
-
-type Option = optionutils.Option[*Options]
-
-type Options struct {
- Context cpi.Context
- Name string
- Version string
- OverrideVersion *bool
- Origin *common.NameVersion
-}
-
-func (o *Options) ApplyTo(opts *Options) {
- if opts == nil {
- return
- }
- if o.Context != nil {
- opts.Context = o.Context
- }
- if o.Name != "" {
- opts.Name = o.Name
- }
- if o.Version != "" {
- opts.Version = o.Version
- }
- if o.OverrideVersion != nil {
- opts.OverrideVersion = o.OverrideVersion
- }
- if o.Origin != nil {
- opts.Origin = o.Origin
- }
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-type context struct {
- cpi.Context
-}
-
-func (o context) ApplyTo(opts *Options) {
- opts.Context = o
-}
-
-func WithContext(ctx cpi.ContextProvider) Option {
- return context{ctx.OCIContext()}
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-type name string
-
-func (o name) ApplyTo(opts *Options) {
- opts.Name = string(o)
-}
-
-func WithName(n string) Option {
- return name(n)
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-type version string
-
-func (o version) ApplyTo(opts *Options) {
- opts.Version = string(o)
-}
-
-func WithVersion(v string) Option {
- return version(v)
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-type override struct {
- flag bool
- version string
-}
-
-func (o *override) ApplyTo(opts *Options) {
- opts.OverrideVersion = utils.BoolP(o.flag)
- opts.Version = o.version
-}
-
-func WithVersionOverride(v string, flag ...bool) Option {
- return &override{
- version: v,
- flag: utils.OptionalDefaultedBool(true, flag...),
- }
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-type compvers common.NameVersion
-
-func (o compvers) ApplyTo(opts *Options) {
- n := common.NameVersion(o)
- opts.Origin = &n
-}
-
-func WithOrigin(o common.NameVersion) Option {
- return compvers(o)
-}
diff --git a/pkg/blobaccess/dockermulti/access.go b/pkg/blobaccess/dockermulti/access.go
deleted file mode 100644
index cc8d5dd28..000000000
--- a/pkg/blobaccess/dockermulti/access.go
+++ /dev/null
@@ -1,156 +0,0 @@
-package dockermulti
-
-import (
- "fmt"
-
- . "github.com/mandelsoft/goutils/finalizer"
-
- "github.com/mandelsoft/goutils/errors"
- "github.com/mandelsoft/goutils/optionutils"
- "github.com/opencontainers/go-digest"
-
- "github.com/open-component-model/ocm/pkg/blobaccess/bpi"
- "github.com/open-component-model/ocm/pkg/contexts/oci"
- "github.com/open-component-model/ocm/pkg/contexts/oci/annotations"
- "github.com/open-component-model/ocm/pkg/contexts/oci/artdesc"
- "github.com/open-component-model/ocm/pkg/contexts/oci/cpi"
- "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/artifactset"
- "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/docker"
-)
-
-func (o *Options) OCIContext() oci.Context {
- if o.Context == nil {
- return oci.DefaultContext()
- }
- return o.Context
-}
-
-func (s *Options) getVariant(ctx oci.Context, finalize *Finalizer, variant string) (oci.ArtifactAccess, error) {
- locator, version, err := docker.ParseGenericRef(variant)
- if err != nil {
- return nil, err
- }
- if version == "" {
- return nil, fmt.Errorf("artifact version required")
- }
- spec := docker.NewRepositorySpec()
- repo, err := ctx.RepositoryForSpec(spec)
- if err != nil {
- return nil, err
- }
- finalize.Close(repo)
- ns, err := repo.LookupNamespace(locator)
- if err != nil {
- return nil, err
- }
- finalize.Close(ns)
-
- art, err := ns.GetArtifact(version)
- if err != nil {
- return nil, artifactset.GetArtifactError{Original: err, Ref: locator + ":" + version}
- }
- finalize.Close(art)
- return art, nil
-}
-
-func BlobAccess(opts ...Option) (bpi.BlobAccess, error) {
- eff := optionutils.EvalOptions(opts...)
- ctx := eff.OCIContext()
-
- index := artdesc.NewIndex()
- i := 0
-
- version := eff.Version
- if eff.Origin != nil {
- if version == "" {
- version = eff.Origin.GetVersion()
- }
- index.SetAnnotation(annotations.COMPVERS_ANNOTATION, eff.Origin.String())
- }
- if version == "" {
- return nil, fmt.Errorf("no versio specified")
- }
-
- feedback := func(blob bpi.BlobAccess, art cpi.ArtifactAccess) error {
- desc := artdesc.DefaultBlobDescriptor(blob)
- if art.IsManifest() {
- cfgBlob, err := art.ManifestAccess().GetConfigBlob()
- if err != nil {
- return errors.Wrapf(err, "cannot get config blob")
- }
- cfg, err := artdesc.ParseImageConfig(cfgBlob)
- if err != nil {
- return errors.Wrapf(err, "cannot parse config blob")
- }
- if cfg.Architecture != "" {
- desc.Platform = &artdesc.Platform{
- Architecture: cfg.Architecture,
- OS: cfg.OS,
- Variant: cfg.Variant,
- }
- }
- }
- index.AddManifest(desc)
- return nil
- }
-
- blob, err := artifactset.SynthesizeArtifactBlobFor(version, func() (fac artifactset.ArtifactFactory, main bool, err error) {
- var art cpi.ArtifactAccess
- var blob bpi.BlobAccess
-
- switch {
- case i > len(eff.Variants):
- // end loop
- case i == len(eff.Variants):
- // provide index (main) artifact
- if eff.Printer != nil {
- eff.Printer.Printf("image %d: INDEX\n", i)
- }
- fac = func(set *artifactset.ArtifactSet) (digest.Digest, string, error) {
- art, err = set.NewArtifact(index)
- if err != nil {
- return "", "", errors.Wrapf(err, "cannot create index artifact")
- }
- defer art.Close()
- blob, err = set.AddArtifact(art)
- if err != nil {
- return "", "", errors.Wrapf(err, "cannot add index artifact")
- }
- defer blob.Close()
- return blob.Digest(), blob.MimeType(), nil
- }
- main = true
- default:
- // provide variant
- if eff.Printer != nil {
- eff.Printer.Printf("image %d: %s\n", i, eff.Variants[i])
- }
- var finalize Finalizer
-
- art, err = eff.getVariant(ctx, &finalize, eff.Variants[i])
-
- if err == nil {
- if eff.Origin != nil {
- art.Artifact().SetAnnotation(annotations.COMPVERS_ANNOTATION, eff.Origin.String())
- }
- blob, err = art.Blob()
- if err == nil {
- finalize.Close(art)
- fac = artifactset.ArtifactTransferCreator(art, &finalize, feedback)
- }
- }
- }
- i++
- return
- })
- if err != nil {
- return nil, err
- }
- return blob, nil
-}
-
-func Provider(opts ...Option) bpi.BlobAccessProvider {
- return bpi.BlobAccessProviderFunction(func() (bpi.BlobAccess, error) {
- return BlobAccess(opts...)
- })
-}
diff --git a/pkg/blobaccess/dockermulti/deprecated.go b/pkg/blobaccess/dockermulti/deprecated.go
deleted file mode 100644
index 4ef55d48b..000000000
--- a/pkg/blobaccess/dockermulti/deprecated.go
+++ /dev/null
@@ -1,17 +0,0 @@
-package dockermulti
-
-import (
- "github.com/open-component-model/ocm/pkg/blobaccess/bpi"
-)
-
-// BlobAccessForMultiImageFromDockerDaemon returns a BlobAccess for the image with the given name.
-// Deprecated: use BlobAccess.
-func BlobAccessForMultiImageFromDockerDaemon(opts ...Option) (bpi.BlobAccess, error) {
- return BlobAccess(opts...)
-}
-
-// BlobAccessProviderForMultiImageFromDockerDaemon returns a BlobAccessProvider for the image with the given name.
-// Deprecated: use Provider.
-func BlobAccessProviderForMultiImageFromDockerDaemon(opts ...Option) bpi.BlobAccessProvider {
- return Provider(opts...)
-}
diff --git a/pkg/blobaccess/dockermulti/options.go b/pkg/blobaccess/dockermulti/options.go
deleted file mode 100644
index 4b93db782..000000000
--- a/pkg/blobaccess/dockermulti/options.go
+++ /dev/null
@@ -1,105 +0,0 @@
-package dockermulti
-
-import (
- "github.com/mandelsoft/goutils/optionutils"
- "golang.org/x/exp/slices"
-
- "github.com/open-component-model/ocm/pkg/common"
- "github.com/open-component-model/ocm/pkg/contexts/oci"
-)
-
-type Option = optionutils.Option[*Options]
-
-type Options struct {
- Context oci.Context
- Version string
- Variants []string
- Origin *common.NameVersion
- Printer common.Printer
-}
-
-func (o *Options) ApplyTo(opts *Options) {
- if opts == nil {
- return
- }
- if o.Context != nil {
- opts.Context = o.Context
- }
- if o.Version != "" {
- opts.Version = o.Version
- }
- if o.Variants != nil {
- opts.Variants = append(opts.Variants, o.Variants...)
- }
- if o.Origin != nil {
- opts.Origin = o.Origin
- }
- if o.Printer != nil {
- opts.Printer = o.Printer
- }
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-type context struct {
- oci.Context
-}
-
-func (o context) ApplyTo(opts *Options) {
- opts.Context = o
-}
-
-func WithContext(ctx oci.ContextProvider) Option {
- return context{ctx.OCIContext()}
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-type version string
-
-func (o version) ApplyTo(opts *Options) {
- opts.Version = string(o)
-}
-
-func WithVersion(v string) Option {
- return version(v)
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-type compvers common.NameVersion
-
-func (o compvers) ApplyTo(opts *Options) {
- n := common.NameVersion(o)
- opts.Origin = &n
-}
-
-func WithOrigin(o common.NameVersion) Option {
- return compvers(o)
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-type variants []string
-
-func (o variants) ApplyTo(opts *Options) {
- opts.Variants = append(opts.Variants, []string(o)...)
-}
-
-func WithVariants(v ...string) Option {
- return variants(slices.Clone(v))
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-type printer struct {
- common.Printer
-}
-
-func (o printer) ApplyTo(opts *Options) {
- opts.Printer = o
-}
-
-func WithPrinter(p common.Printer) Option {
- return printer{p}
-}
diff --git a/pkg/blobaccess/file/access.go b/pkg/blobaccess/file/access.go
deleted file mode 100644
index 7a198da28..000000000
--- a/pkg/blobaccess/file/access.go
+++ /dev/null
@@ -1,340 +0,0 @@
-package file
-
-import (
- "io"
- "sync"
-
- "github.com/mandelsoft/goutils/errors"
- "github.com/mandelsoft/goutils/optionutils"
- "github.com/mandelsoft/vfs/pkg/vfs"
- "github.com/opencontainers/go-digest"
-
- "github.com/open-component-model/ocm/pkg/blobaccess/bpi"
- "github.com/open-component-model/ocm/pkg/iotools"
- "github.com/open-component-model/ocm/pkg/utils"
-)
-
-type (
- _nopCloser = iotools.NopCloser
- _blobAccess = bpi.BlobAccess
-)
-
-////////////////////////////////////////////////////////////////////////////////
-
-type fileDataAccess struct {
- _nopCloser
- fs vfs.FileSystem
- path string
-}
-
-var (
- _ bpi.DataSource = (*fileDataAccess)(nil)
- _ bpi.Validatable = (*fileDataAccess)(nil)
-)
-
-func DataAccess(fs vfs.FileSystem, path string) bpi.DataAccess {
- return &fileDataAccess{fs: fs, path: path}
-}
-
-func (a *fileDataAccess) Get() ([]byte, error) {
- data, err := vfs.ReadFile(a.fs, a.path)
- if err != nil {
- return nil, errors.Wrapf(err, "file %q", a.path)
- }
- return data, nil
-}
-
-func (a *fileDataAccess) Reader() (io.ReadCloser, error) {
- file, err := a.fs.Open(a.path)
- if err != nil {
- return nil, errors.Wrapf(err, "file %q", a.path)
- }
- return file, nil
-}
-
-// Validate checks if the access is valid, meaning
-// it can provide data. Here, this means
-// that the file exists.
-func (a *fileDataAccess) Validate() error {
- ok, err := vfs.Exists(a.fs, a.path)
- if err != nil {
- return err
- }
- if !ok {
- return errors.ErrNotFound("file", a.path)
- }
- return nil
-}
-
-func (a *fileDataAccess) Origin() string {
- return a.path
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-type fileBlobAccess struct {
- fileDataAccess
- mimeType string
-}
-
-var (
- _ bpi.BlobAccess = (*fileBlobAccess)(nil)
- _ bpi.FileLocation = (*fileBlobAccess)(nil)
-)
-
-func (f *fileBlobAccess) FileSystem() vfs.FileSystem {
- return f.fs
-}
-
-func (f *fileBlobAccess) Path() string {
- return f.path
-}
-
-func (f *fileBlobAccess) Dup() (bpi.BlobAccess, error) {
- return f, nil
-}
-
-func (f *fileBlobAccess) Size() int64 {
- size := bpi.BLOB_UNKNOWN_SIZE
- fi, err := f.fs.Stat(f.path)
- if err == nil {
- size = fi.Size()
- }
- return size
-}
-
-func (f *fileBlobAccess) MimeType() string {
- return f.mimeType
-}
-
-func (f *fileBlobAccess) DigestKnown() bool {
- return false
-}
-
-func (f *fileBlobAccess) Digest() digest.Digest {
- r, err := f.Reader()
- if err != nil {
- return ""
- }
- defer r.Close()
- d, err := digest.FromReader(r)
- if err != nil {
- return ""
- }
- return d
-}
-
-// BlobAccess wraps a file path into a BlobAccess, which does not need a close.
-func BlobAccess(mime string, path string, fss ...vfs.FileSystem) bpi.BlobAccess {
- return &fileBlobAccess{
- mimeType: mime,
- fileDataAccess: fileDataAccess{fs: utils.FileSystem(fss...), path: path},
- }
-}
-
-func Provider(mime string, path string, fss ...vfs.FileSystem) bpi.BlobAccessProvider {
- return bpi.BlobAccessProviderFunction(func() (bpi.BlobAccess, error) {
- return BlobAccess(mime, path, fss...), nil
- })
-}
-
-type fileBlobAccessView struct {
- _blobAccess
- access *fileDataAccess
-}
-
-var (
- _ bpi.BlobAccess = (*fileBlobAccessView)(nil)
- _ bpi.FileLocation = (*fileBlobAccessView)(nil)
-)
-
-func (f *fileBlobAccessView) Dup() (bpi.BlobAccess, error) {
- b, err := f._blobAccess.Dup()
- if err != nil {
- return nil, err
- }
- return &fileBlobAccessView{b, f.access}, nil
-}
-
-func (f *fileBlobAccessView) FileSystem() vfs.FileSystem {
- return f.access.fs
-}
-
-func (f *fileBlobAccessView) Path() string {
- return f.access.path
-}
-
-func BlobAccessWithCloser(closer io.Closer, mime string, path string, fss ...vfs.FileSystem) bpi.BlobAccess {
- fb := &fileBlobAccess{fileDataAccess{fs: utils.FileSystem(fss...), path: path}, mime}
- return &fileBlobAccessView{
- bpi.NewBlobAccessForBase(fb, closer),
- &fb.fileDataAccess,
- }
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-type temporaryFileBlob struct {
- _blobAccess
- lock sync.Mutex
- path string
- file vfs.File
- filesystem vfs.FileSystem
-}
-
-var (
- _ bpi.BlobAccessBase = (*temporaryFileBlob)(nil)
- _ bpi.FileLocation = (*temporaryFileBlob)(nil)
-)
-
-// Validate checks if the access is valid, meaning
-// it can provide data. Here, this means
-// that the file exists.
-func (b *temporaryFileBlob) Validate() error {
- b.lock.Lock()
- defer b.lock.Unlock()
- if b.path == "" {
- return bpi.ErrClosed
- }
- ok, err := vfs.Exists(b.filesystem, b.path)
- if err != nil {
- return err
- }
- if !ok {
- return errors.ErrNotFound("file", b.path)
- }
- return nil
-}
-
-func (b *temporaryFileBlob) Close() error {
- b.lock.Lock()
- defer b.lock.Unlock()
- if b.path != "" {
- list := errors.ErrListf("temporary blob")
- if b.file != nil {
- list.Add(b.file.Close())
- }
- list.Add(b.filesystem.Remove(b.path))
- b.path = ""
- b.file = nil
- b._blobAccess = nil
- return list.Result()
- }
- return nil
-}
-
-func (b *temporaryFileBlob) FileSystem() vfs.FileSystem {
- return b.filesystem
-}
-
-func (b *temporaryFileBlob) Path() string {
- return b.path
-}
-
-func BlobAccessForTemporaryFile(mime string, temp vfs.File, opts ...Option) bpi.BlobAccess {
- eff := optionutils.EvalOptions(opts...)
- t := &temporaryFileBlob{
- _blobAccess: BlobAccess(mime, temp.Name(), eff.FileSystem),
- filesystem: utils.FileSystem(eff.FileSystem),
- path: temp.Name(),
- file: temp,
- }
- // TODO: handle FileLocation interface in combination with partially set meta data.
- if eff.Digest != "" || eff.GetSize() != bpi.BLOB_UNKNOWN_SIZE {
- return bpi.NewBlobAccessForBase(bpi.BaseAccessForDataAccessAndMeta(mime, t, eff.Digest, eff.GetSize()))
- }
- return bpi.NewBlobAccessForBase(t)
-}
-
-func BlobAccessForTemporaryFilePath(mime string, temp string, opts ...Option) bpi.BlobAccess {
- eff := optionutils.EvalOptions(opts...)
- return bpi.NewBlobAccessForBase(bpi.BaseAccessForDataAccessAndMeta(mime, &temporaryFileBlob{
- _blobAccess: BlobAccess(mime, temp, eff.FileSystem),
- filesystem: utils.FileSystem(eff.FileSystem),
- path: temp,
- }, eff.Digest, eff.GetSize()))
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-// TempFile holds a temporary file that should be kept open.
-// Close should never be called directly.
-// It can be passed to another responsibility realm by calling Release-
-// For example to be transformed into a TemporaryBlobAccess.
-// Close will close and remove an unreleased file and does
-// nothing if it has been released.
-// If it has been released the new realm is responsible.
-// to close and remove it.
-type TempFile struct {
- lock sync.Mutex
- temp vfs.File
- filesystem vfs.FileSystem
-}
-
-func NewTempFile(dir string, pattern string, fss ...vfs.FileSystem) (*TempFile, error) {
- fs := utils.FileSystem(fss...)
- temp, err := vfs.TempFile(fs, dir, pattern)
- if err != nil {
- return nil, err
- }
- return &TempFile{
- temp: temp,
- filesystem: fs,
- }, nil
-}
-
-func (t *TempFile) Name() string {
- t.lock.Lock()
- defer t.lock.Unlock()
- return t.temp.Name()
-}
-
-func (t *TempFile) FileSystem() vfs.FileSystem {
- t.lock.Lock()
- defer t.lock.Unlock()
- return t.filesystem
-}
-
-// Release passes the responsibility for closing and removing
-// the temporary file to another realm. After calling this method
-// the TempFile object will not handle these operations anymore, if it is closed.
-func (t *TempFile) Release() vfs.File {
- t.lock.Lock()
- defer t.lock.Unlock()
- if t.temp != nil {
- t.temp.Sync()
- }
- tmp := t.temp
- t.temp = nil
- return tmp
-}
-
-func (t *TempFile) Writer() io.Writer {
- t.lock.Lock()
- defer t.lock.Unlock()
- return t.temp
-}
-
-func (t *TempFile) Sync() error {
- t.lock.Lock()
- defer t.lock.Unlock()
- return t.temp.Sync()
-}
-
-func (t *TempFile) AsBlob(mime string) bpi.BlobAccess {
- return BlobAccessForTemporaryFile(mime, t.Release(), WithFileSystem(t.filesystem))
-}
-
-// Close closes and removes the temporary file as long it has not
-// been released before by calling Release.
-func (t *TempFile) Close() error {
- t.lock.Lock()
- defer t.lock.Unlock()
- if t.temp != nil {
- name := t.temp.Name()
- t.temp.Close()
- t.temp = nil
- return t.filesystem.Remove(name)
- }
- return nil
-}
diff --git a/pkg/blobaccess/file/options.go b/pkg/blobaccess/file/options.go
deleted file mode 100644
index 5a2397654..000000000
--- a/pkg/blobaccess/file/options.go
+++ /dev/null
@@ -1,76 +0,0 @@
-package file
-
-import (
- "github.com/mandelsoft/goutils/generics"
- "github.com/mandelsoft/goutils/optionutils"
- "github.com/mandelsoft/vfs/pkg/vfs"
- "github.com/opencontainers/go-digest"
-
- "github.com/open-component-model/ocm/pkg/blobaccess/bpi"
- "github.com/open-component-model/ocm/pkg/utils"
-)
-
-type Option = optionutils.Option[*Options]
-
-type Options struct {
- // FileSystem defines the file system that contains the specified directory.
- FileSystem vfs.FileSystem
- Digest digest.Digest
- Size *int64
-}
-
-func (o *Options) GetSize() int64 {
- if o.Size == nil {
- return bpi.BLOB_UNKNOWN_SIZE
- }
- return *o.Size
-}
-
-func (o *Options) ApplyTo(opts *Options) {
- if opts == nil {
- return
- }
- if o.FileSystem != nil {
- opts.FileSystem = o.FileSystem
- }
- if o.Digest != "" {
- opts.Digest = o.Digest
- }
- optionutils.ApplyOption(o.Size, &opts.Size)
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-type fileSystem struct {
- fs vfs.FileSystem
-}
-
-func (o *fileSystem) ApplyTo(opts *Options) {
- opts.FileSystem = o.fs
-}
-
-func WithFileSystem(fss ...vfs.FileSystem) Option {
- return &fileSystem{fs: utils.FileSystem(fss...)}
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-type size int64
-
-func (o size) ApplyTo(opts *Options) {
- opts.Size = generics.Pointer(int64(o))
-}
-
-func WithSize(s int64) Option {
- return size(s)
-}
-
-type _digest digest.Digest
-
-func (o _digest) ApplyTo(opts *Options) {
- opts.Digest = digest.Digest(o)
-}
-
-func WithDigest(d digest.Digest) Option {
- return _digest(d)
-}
diff --git a/pkg/blobaccess/helm/access.go b/pkg/blobaccess/helm/access.go
deleted file mode 100644
index d64e78a16..000000000
--- a/pkg/blobaccess/helm/access.go
+++ /dev/null
@@ -1,81 +0,0 @@
-package helm
-
-import (
- "fmt"
-
- "github.com/mandelsoft/goutils/errors"
- "github.com/mandelsoft/goutils/optionutils"
- "github.com/mandelsoft/vfs/pkg/vfs"
-
- "github.com/open-component-model/ocm/pkg/blobaccess/bpi"
- "github.com/open-component-model/ocm/pkg/common"
- "github.com/open-component-model/ocm/pkg/contexts/credentials/builtin/helm/identity"
- ocihelm "github.com/open-component-model/ocm/pkg/contexts/oci/ociutils/helm"
- "github.com/open-component-model/ocm/pkg/helm"
- "github.com/open-component-model/ocm/pkg/helm/loader"
- "github.com/open-component-model/ocm/pkg/utils"
-)
-
-func BlobAccess(path string, opts ...Option) (blob bpi.BlobAccess, name, version string, err error) {
- eff := optionutils.EvalOptions(opts...)
- ctx := eff.OCIContext()
- fs := utils.FileSystem(eff.FileSystem)
- printer := eff.Printer
- if printer == nil {
- printer = common.NewPrinter(nil)
- }
-
- var chartLoader loader.Loader
- if eff.HelmRepository == "" {
- if ok, err := vfs.Exists(fs, path); !ok || err != nil {
- return nil, "", "", errors.NewEf(err, "invalid file path %q", path)
- }
- chartLoader = loader.VFSLoader(path, fs)
- } else {
- cert := []byte(eff.CACert)
- if eff.CACertFile != "" {
- cert, err = vfs.ReadFile(fs, eff.CACertFile)
- if err != nil {
- return nil, "", "", errors.Wrapf(err, "cannot read root certificates from %q", eff.CACertFile)
- }
- }
-
- acc, err := helm.DownloadChart(printer, ctx, path, eff.Version, eff.HelmRepository,
- helm.WithCredentials(identity.GetCredentials(ctx, eff.HelmRepository, path)),
- helm.WithRootCert(cert))
- if err != nil {
- return nil, "", "", errors.Wrapf(err, "cannot download chart %s:%s from %s", path, eff.Version, eff.HelmRepository)
- }
- chartLoader = loader.AccessLoader(acc)
- }
-
- defer errors.PropagateError(&err, chartLoader.Close)
-
- chart, err := chartLoader.Chart()
- if err != nil {
- return nil, "", "", err
- }
- vers := chart.Metadata.Version
- if vers == "" || optionutils.AsValue(eff.OverrideVersion) {
- vers = eff.Version
- }
- if vers == "" {
- return nil, "", "", fmt.Errorf("no version found or specified")
- }
-
- blob, err = chartLoader.ChartArtefactSet()
- if err == nil && blob == nil {
- blob, err = ocihelm.SynthesizeArtifactBlob(chartLoader)
- if err != nil {
- return nil, "", "", errors.Wrapf(err, "cannot synthesize artifact blob")
- }
- }
- return blob, chart.Name(), vers, err
-}
-
-func Provider(name string, opts ...Option) bpi.BlobAccessProvider {
- return bpi.BlobAccessProviderFunction(func() (bpi.BlobAccess, error) {
- b, _, _, err := BlobAccess(name, opts...)
- return b, err
- })
-}
diff --git a/pkg/blobaccess/helm/deprecated.go b/pkg/blobaccess/helm/deprecated.go
deleted file mode 100644
index f731f80c5..000000000
--- a/pkg/blobaccess/helm/deprecated.go
+++ /dev/null
@@ -1,17 +0,0 @@
-package helm
-
-import (
- "github.com/open-component-model/ocm/pkg/blobaccess/bpi"
-)
-
-// BlobAccessForHelmChart returns a BlobAccess for the Helm chart with the given path.
-// Deprecated: use BlobAccess.
-func BlobAccessForHelmChart(path string, opts ...Option) (blob bpi.BlobAccess, name, version string, err error) {
- return BlobAccess(path, opts...)
-}
-
-// BlobAccessProviderForHelmChart returns a BlobAccessProvider for the Helm chart with the given name.
-// Deprecated: use Provider.
-func BlobAccessProviderForHelmChart(name string, opts ...Option) bpi.BlobAccessProvider {
- return Provider(name, opts...)
-}
diff --git a/pkg/blobaccess/helm/options.go b/pkg/blobaccess/helm/options.go
deleted file mode 100644
index e75247140..000000000
--- a/pkg/blobaccess/helm/options.go
+++ /dev/null
@@ -1,171 +0,0 @@
-package helm
-
-import (
- "github.com/mandelsoft/goutils/optionutils"
- "github.com/mandelsoft/vfs/pkg/vfs"
-
- "github.com/open-component-model/ocm/pkg/common"
- "github.com/open-component-model/ocm/pkg/contexts/oci"
- "github.com/open-component-model/ocm/pkg/utils"
-)
-
-type Option = optionutils.Option[*Options]
-
-type Options struct {
- Context oci.Context
- FileSystem vfs.FileSystem
- Version string
- OverrideVersion *bool
- HelmRepository string
- CACert string
- CACertFile string
-
- Printer common.Printer
-}
-
-func (o *Options) ApplyTo(opts *Options) {
- if opts == nil {
- return
- }
- if o.Context != nil {
- opts.Context = o.Context
- }
- if o.FileSystem != nil {
- opts.FileSystem = o.FileSystem
- }
- if o.Version != "" {
- opts.Version = o.Version
- }
- if o.OverrideVersion != nil {
- opts.OverrideVersion = o.OverrideVersion
- }
- if o.HelmRepository != "" {
- opts.HelmRepository = o.HelmRepository
- }
- if o.CACert != "" {
- opts.CACert = o.CACert
- }
- if o.CACertFile != "" {
- opts.CACertFile = o.CACertFile
- }
- if o.Printer != nil {
- opts.Printer = o.Printer
- }
-}
-
-func (o *Options) OCIContext() oci.Context {
- if o.Context == nil {
- return oci.DefaultContext()
- }
- return o.Context
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-type context struct {
- oci.Context
-}
-
-func (o context) ApplyTo(opts *Options) {
- opts.Context = o
-}
-
-func WithContext(ctx oci.ContextProvider) Option {
- return context{ctx.OCIContext()}
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-type fileSystem struct {
- fs vfs.FileSystem
-}
-
-func (o *fileSystem) ApplyTo(opts *Options) {
- opts.FileSystem = o.fs
-}
-
-func WithFileSystem(fs vfs.FileSystem) Option {
- return &fileSystem{fs: fs}
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-type version string
-
-func (o version) ApplyTo(opts *Options) {
- opts.Version = string(o)
-}
-
-func WithVersion(v string) Option {
- return version(v)
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-type override struct {
- flag bool
- version string
-}
-
-func (o *override) ApplyTo(opts *Options) {
- opts.OverrideVersion = utils.BoolP(o.flag)
- opts.Version = o.version
-}
-
-func WithVersionOverride(v string, flag ...bool) Option {
- return &override{
- version: v,
- flag: utils.OptionalDefaultedBool(true, flag...),
- }
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-type helmrepo string
-
-func (o helmrepo) ApplyTo(opts *Options) {
- opts.HelmRepository = string(o)
-}
-
-// WithHelmRepository defines the helm repository to read from.
-func WithHelmRepository(v string) Option {
- return helmrepo(v)
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-type cacert string
-
-func (o cacert) ApplyTo(opts *Options) {
- opts.CACert = string(o)
-}
-
-func WithCACert(v string) Option {
- return cacert(v)
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-type cacertfile string
-
-func (o cacertfile) ApplyTo(opts *Options) {
- opts.CACertFile = string(o)
-}
-
-func WithCACertFile(v string) Option {
- return cacertfile(v)
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-type printer struct {
- common.Printer
-}
-
-func (o printer) ApplyTo(opts *Options) {
- opts.Printer = o
-}
-
-func WithPrinter(p common.Printer) Option {
- return printer{p}
-}
diff --git a/pkg/blobaccess/interface.go b/pkg/blobaccess/interface.go
deleted file mode 100644
index ea6084f76..000000000
--- a/pkg/blobaccess/interface.go
+++ /dev/null
@@ -1,30 +0,0 @@
-package blobaccess
-
-import (
- "github.com/open-component-model/ocm/pkg/blobaccess/internal"
-)
-
-const (
- KIND_BLOB = internal.KIND_BLOB
- KIND_MEDIATYPE = internal.KIND_MEDIATYPE
-
- BLOB_UNKNOWN_SIZE = internal.BLOB_UNKNOWN_SIZE
- BLOB_UNKNOWN_DIGEST = internal.BLOB_UNKNOWN_DIGEST
-)
-
-type (
- DataAccess = internal.DataAccess
- DataReader = internal.DataReader
- DataGetter = internal.DataGetter
-)
-
-type (
- BlobAccess = internal.BlobAccess
- BlobAccessProvider = internal.BlobAccessProvider
-
- DataSource = internal.DataSource
- DigestSource = internal.DigestSource
- MimeType = internal.MimeType
-)
-
-type FileLocation = internal.FileLocation
diff --git a/pkg/blobaccess/maven/access.go b/pkg/blobaccess/maven/access.go
deleted file mode 100644
index d66e26ad9..000000000
--- a/pkg/blobaccess/maven/access.go
+++ /dev/null
@@ -1,37 +0,0 @@
-package maven
-
-import (
- "github.com/mandelsoft/goutils/optionutils"
-
- "github.com/open-component-model/ocm/pkg/blobaccess/bpi"
- "github.com/open-component-model/ocm/pkg/maven"
-)
-
-func DataAccess(repo *maven.Repository, groupId, artifactId, version string, opts ...Option) (bpi.DataAccess, error) {
- return BlobAccess(repo, groupId, artifactId, version, opts...)
-}
-
-func BlobAccess(repo *maven.Repository, groupId, artifactId, version string, opts ...Option) (bpi.BlobAccess, error) {
- eff := optionutils.EvalOptions(opts...)
- s := &spec{
- coords: maven.NewCoordinates(groupId, artifactId, version, maven.WithOptionalClassifier(eff.Classifier), maven.WithOptionalExtension(eff.Extension)),
- repo: repo,
- options: eff,
- }
- return s.getBlobAccess()
-}
-
-func BlobAccessForCoords(repo *maven.Repository, coords *maven.Coordinates, opts ...Option) (bpi.BlobAccess, error) {
- return BlobAccess(repo, coords.GroupId, coords.ArtifactId, coords.Version, optionutils.WithDefaults(opts, WithOptionalClassifier(coords.Classifier), WithOptionalExtension(coords.Extension))...)
-}
-
-func Provider(repo *maven.Repository, groupId, artifactId, version string, opts ...Option) bpi.BlobAccessProvider {
- return bpi.BlobAccessProviderFunction(func() (bpi.BlobAccess, error) {
- b, err := BlobAccess(repo, groupId, artifactId, version, opts...)
- return b, err
- })
-}
-
-func ProviderCoords(repo *maven.Repository, coords *maven.Coordinates, opts ...Option) bpi.BlobAccessProvider {
- return Provider(repo, coords.GroupId, coords.ArtifactId, coords.Version, optionutils.WithDefaults(opts, WithOptionalClassifier(coords.Classifier), WithOptionalExtension(coords.Extension))...)
-}
diff --git a/pkg/blobaccess/maven/access_test.go b/pkg/blobaccess/maven/access_test.go
deleted file mode 100644
index 3b10c204b..000000000
--- a/pkg/blobaccess/maven/access_test.go
+++ /dev/null
@@ -1,128 +0,0 @@
-package maven_test
-
-import (
- "time"
-
- . "github.com/mandelsoft/goutils/testutils"
- . "github.com/onsi/ginkgo/v2"
- . "github.com/onsi/gomega"
- . "github.com/open-component-model/ocm/pkg/env/builder"
-
- me "github.com/open-component-model/ocm/pkg/blobaccess/maven"
- "github.com/open-component-model/ocm/pkg/maven"
- "github.com/open-component-model/ocm/pkg/maven/maventest"
- "github.com/open-component-model/ocm/pkg/utils/tarutils"
-)
-
-const (
- MAVEN_PATH = "/testdata/.m2/repository"
- FAIL_PATH = "/testdata/.m2/fail"
- MAVEN_CENTRAL_ADDRESS = "repo.maven.apache.org:443"
- MAVEN_CENTRAL = "https://repo.maven.apache.org/maven2/"
- MAVEN_GROUP_ID = "maven"
- MAVEN_ARTIFACT_ID = "maven"
- MAVEN_VERSION = "1.1"
-)
-
-var _ = Describe("blobaccess for maven", func() {
- Context("maven filesystem repository", func() {
- var env *Builder
- var repo *maven.Repository
-
- BeforeEach(func() {
- env = NewBuilder(maventest.TestData())
- repo = maven.NewFileRepository(MAVEN_PATH, env.FileSystem())
- })
-
- AfterEach(func() {
- MustBeSuccessful(env.Cleanup())
- })
-
- It("blobaccess for gav", func() {
- coords := maven.NewCoordinates("com.sap.cloud.sdk", "sdk-modules-bom", "5.7.0")
-
- b := Must(me.BlobAccess(repo, coords.GroupId, coords.ArtifactId, coords.Version, me.WithCachingFileSystem(env.FileSystem())))
- defer Close(b, "blobaccess")
- files := Must(tarutils.ListArchiveContentFromReader(Must(b.Reader())))
- Expect(files).To(ConsistOf(
- "sdk-modules-bom-5.7.0.pom",
- "sdk-modules-bom-5.7.0.jar",
- "sdk-modules-bom-5.7.0-random-content.txt",
- "sdk-modules-bom-5.7.0-random-content.json",
- "sdk-modules-bom-5.7.0-sources.jar"))
- })
-
- It("blobaccess for files with the same classifier", func() {
- coords := maven.NewCoordinates("com.sap.cloud.sdk", "sdk-modules-bom", "5.7.0",
- maven.WithClassifier("random-content"))
-
- b := Must(me.BlobAccessForCoords(repo, coords, me.WithCachingFileSystem(env.FileSystem())))
- defer Close(b, "blobaccess")
- files := Must(tarutils.ListArchiveContentFromReader(Must(b.Reader())))
- Expect(files).To(ConsistOf("sdk-modules-bom-5.7.0-random-content.txt",
- "sdk-modules-bom-5.7.0-random-content.json"))
- })
-
- It("blobaccess for files with empty classifier", func() {
- coords := maven.NewCoordinates("com.sap.cloud.sdk", "sdk-modules-bom", "5.7.0",
- maven.WithClassifier(""))
-
- b := Must(me.BlobAccessForCoords(repo, coords, me.WithCachingFileSystem(env.FileSystem())))
- defer Close(b, "blobaccess")
- files := Must(tarutils.ListArchiveContentFromReader(Must(b.Reader())))
- Expect(files).To(ConsistOf("sdk-modules-bom-5.7.0.pom",
- "sdk-modules-bom-5.7.0.jar"))
- })
-
- It("blobaccess for files with extension", func() {
- coords := maven.NewCoordinates("com.sap.cloud.sdk", "sdk-modules-bom", "5.7.0",
- maven.WithExtension("jar"))
-
- b := Must(me.BlobAccessForCoords(repo, coords, me.WithCachingFileSystem(env.FileSystem())))
- defer Close(b, "blobaccess")
- files := Must(tarutils.ListArchiveContentFromReader(Must(b.Reader())))
- Expect(files).To(ConsistOf("sdk-modules-bom-5.7.0-sources.jar",
- "sdk-modules-bom-5.7.0.jar"))
- })
-
- It("blobaccess for files with extension", func() {
- coords := maven.NewCoordinates("com.sap.cloud.sdk", "sdk-modules-bom", "5.7.0",
- maven.WithExtension("txt"))
-
- b := Must(me.BlobAccessForCoords(repo, coords, me.WithCachingFileSystem(env.FileSystem())))
- defer Close(b, "blobaccess")
- files := Must(tarutils.ListArchiveContentFromReader(Must(b.Reader())))
- Expect(files).To(ConsistOf("sdk-modules-bom-5.7.0-random-content.txt"))
- })
-
- It("blobaccess for a single file with classifier and extension", func() {
- coords := maven.NewCoordinates("com.sap.cloud.sdk", "sdk-modules-bom", "5.7.0",
- maven.WithClassifier("random-content"), maven.WithExtension("json"))
-
- b := Must(me.BlobAccessForCoords(repo, coords, me.WithCachingFileSystem(env.FileSystem())))
- defer Close(b, "blobaccess")
- Expect(string(Must(b.Get()))).To(Equal(`{"some": "test content"}`))
- })
- })
-
- Context("maven http repository", func() {
- if PingTCPServer(MAVEN_CENTRAL_ADDRESS, time.Second) == nil {
- var coords *maven.Coordinates
- BeforeEach(func() {
- coords = maven.NewCoordinates(MAVEN_GROUP_ID, MAVEN_ARTIFACT_ID, MAVEN_VERSION)
- })
- It("blobaccess for gav", func() {
- repo := Must(maven.NewUrlRepository(MAVEN_CENTRAL))
- b := Must(me.BlobAccessForCoords(repo, coords))
- defer Close(b, "blobaccess")
- files := Must(tarutils.ListArchiveContentFromReader(Must(b.Reader())))
- Expect(files).To(ConsistOf(
- "maven-1.1-RC1.javadoc.javadoc.jar",
- "maven-1.1-sources.jar",
- "maven-1.1.jar",
- "maven-1.1.pom",
- ))
- })
- }
- })
-})
diff --git a/pkg/blobaccess/maven/deprecated.go b/pkg/blobaccess/maven/deprecated.go
deleted file mode 100644
index fc48da8f3..000000000
--- a/pkg/blobaccess/maven/deprecated.go
+++ /dev/null
@@ -1,36 +0,0 @@
-package maven
-
-import (
- "github.com/open-component-model/ocm/pkg/blobaccess/bpi"
- "github.com/open-component-model/ocm/pkg/maven"
-)
-
-// DataAccessForMaven returns a DataAccess for the Maven artifact with the given coordinates.
-// Deprecated: use DataAccess.
-func DataAccessForMaven(repo *maven.Repository, groupId, artifactId, version string, opts ...Option) (bpi.DataAccess, error) {
- return DataAccess(repo, groupId, artifactId, version, opts...)
-}
-
-// BlobAccessForMaven returns a BlobAccess for the Maven artifact with the given coordinates.
-// Deprecated: use BlobAccess.
-func BlobAccessForMaven(repo *maven.Repository, groupId, artifactId, version string, opts ...Option) (bpi.BlobAccess, error) {
- return BlobAccess(repo, groupId, artifactId, version, opts...)
-}
-
-// BlobAccessForMavenCoords returns a BlobAccessProvider for the Maven artifact with the given coordinates.
-// Deprecated: use BlobAccessForCoords.
-func BlobAccessForMavenCoords(repo *maven.Repository, coords *maven.Coordinates, opts ...Option) (bpi.BlobAccess, error) {
- return BlobAccessForCoords(repo, coords, opts...)
-}
-
-// BlobAccessProviderForMaven returns a BlobAccessProvider for the Maven artifact with the given coordinates.
-// Deprecated: use Provider.
-func BlobAccessProviderForMaven(repo *maven.Repository, groupId, artifactId, version string, opts ...Option) bpi.BlobAccessProvider {
- return Provider(repo, groupId, artifactId, version, opts...)
-}
-
-// BlobAccessProviderForMavenCoords returns a BlobAccessProvider for the Maven artifact with the given coordinates.
-// Deprecated: use ProviderCoords.
-func BlobAccessProviderForMavenCoords(repo *maven.Repository, coords *maven.Coordinates, opts ...Option) bpi.BlobAccessProvider {
- return ProviderCoords(repo, coords, opts...)
-}
diff --git a/pkg/blobaccess/maven/options.go b/pkg/blobaccess/maven/options.go
deleted file mode 100644
index 679ad81a2..000000000
--- a/pkg/blobaccess/maven/options.go
+++ /dev/null
@@ -1,202 +0,0 @@
-package maven
-
-import (
- "github.com/mandelsoft/goutils/optionutils"
- "github.com/mandelsoft/logging"
- "github.com/mandelsoft/vfs/pkg/vfs"
-
- "github.com/open-component-model/ocm/pkg/contexts/credentials"
- "github.com/open-component-model/ocm/pkg/contexts/datacontext"
- "github.com/open-component-model/ocm/pkg/contexts/datacontext/attrs/tmpcache"
- ocmlog "github.com/open-component-model/ocm/pkg/logging"
- "github.com/open-component-model/ocm/pkg/maven"
-)
-
-type Option = optionutils.Option[*Options]
-
-type Options struct {
- CredentialContext credentials.Context
- LoggingContext logging.Context
- CachingContext datacontext.Context
- CachingFileSystem vfs.FileSystem
- CachingPath string
- // Credentials allows to pass credentials and certificates for the http communication
- Credentials credentials.Credentials
-
- maven.FileCoordinates
-}
-
-func (o *Options) Logger(keyValuePairs ...interface{}) logging.Logger {
- return ocmlog.LogContext(o.LoggingContext, o.CredentialContext).Logger(maven.REALM).WithValues(keyValuePairs...)
-}
-
-func (o *Options) Cache() *tmpcache.Attribute {
- if o.CachingPath != "" {
- return tmpcache.New(o.CachingPath, o.CachingFileSystem)
- }
- if o.CachingContext == nil {
- return tmpcache.Get(o.CredentialContext)
- }
- return tmpcache.Get(o.CachingContext)
-}
-
-func (o *Options) GetCredentials(repo *maven.Repository, groupId string) (maven.Credentials, error) {
- if repo.IsFileSystem() {
- return nil, nil
- }
-
- switch {
- case o.Credentials != nil:
- return MapCredentials(o.Credentials), nil
- case o.CredentialContext != nil:
- return GetCredentials(o.CredentialContext, repo, groupId)
- default:
- return nil, nil
- }
-}
-
-func (o *Options) ApplyTo(opts *Options) {
- if opts == nil {
- return
- }
- if o.CredentialContext != nil {
- opts.CredentialContext = o.CredentialContext
- }
- if o.LoggingContext != nil {
- opts.LoggingContext = o.LoggingContext
- }
- if o.CachingFileSystem != nil {
- opts.CachingFileSystem = o.CachingFileSystem
- }
- if o.Credentials != nil {
- opts.Credentials = o.Credentials
- }
- if o.Classifier != nil {
- opts.Classifier = o.Classifier
- }
- if o.Extension != nil {
- opts.Extension = o.Extension
- }
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-type context struct {
- credentials.Context
-}
-
-func (o context) ApplyTo(opts *Options) {
- opts.CredentialContext = o
-}
-
-func WithCredentialContext(ctx credentials.ContextProvider) Option {
- return context{ctx.CredentialsContext()}
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-type loggingContext struct {
- logging.Context
-}
-
-func (o loggingContext) ApplyTo(opts *Options) {
- opts.LoggingContext = o
-}
-
-func WithLoggingContext(ctx logging.ContextProvider) Option {
- return loggingContext{ctx.LoggingContext()}
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-type cachingContext struct {
- datacontext.Context
-}
-
-func (o cachingContext) ApplyTo(opts *Options) {
- opts.CachingContext = o
-}
-
-func WithCachingContext(ctx datacontext.Context) Option {
- return cachingContext{ctx}
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-type cachingFileSystem struct {
- fs vfs.FileSystem
-}
-
-func (o *cachingFileSystem) ApplyTo(opts *Options) {
- opts.CachingFileSystem = o.fs
-}
-
-func WithCachingFileSystem(fs vfs.FileSystem) Option {
- return &cachingFileSystem{fs: fs}
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-type cachingPath string
-
-func (o cachingPath) ApplyTo(opts *Options) {
- opts.CachingPath = string(o)
-}
-
-func WithCachingPath(p string) Option {
- return cachingPath(p)
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-type creds struct {
- credentials.Credentials
-}
-
-func (o creds) ApplyTo(opts *Options) {
- opts.Credentials = o.Credentials
-}
-
-func WithCredentials(c credentials.Credentials) Option {
- return creds{c}
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-type classifier string
-
-func (o classifier) ApplyTo(opts *Options) {
- opts.Classifier = optionutils.PointerTo(string(o))
-}
-
-func WithClassifier(c string) Option {
- return classifier(c)
-}
-
-func WithOptionalClassifier(c *string) Option {
- if c != nil {
- return WithClassifier(*c)
- }
- return &optionutils.NoOption[*Options]{}
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-type extension string
-
-func (o extension) ApplyTo(opts *Options) {
- opts.Extension = optionutils.PointerTo(string(o))
-}
-
-func WithExtension(e string) Option {
- return extension(e)
-}
-
-func WithOptionalExtension(e *string) Option {
- if e != nil {
- return WithExtension(*e)
- }
- return &optionutils.NoOption[*Options]{}
-}
-
-////////////////////////////////////////////////////////////////////////////////
diff --git a/pkg/blobaccess/maven/utils.go b/pkg/blobaccess/maven/utils.go
deleted file mode 100644
index 6c2fdc6ac..000000000
--- a/pkg/blobaccess/maven/utils.go
+++ /dev/null
@@ -1,168 +0,0 @@
-package maven
-
-import (
- "io"
-
- "github.com/mandelsoft/goutils/errors"
- "github.com/mandelsoft/goutils/finalizer"
- "github.com/mandelsoft/goutils/optionutils"
- "github.com/mandelsoft/vfs/pkg/osfs"
- "github.com/mandelsoft/vfs/pkg/vfs"
- "github.com/opencontainers/go-digest"
-
- "github.com/open-component-model/ocm/pkg/blobaccess/blobaccess"
- "github.com/open-component-model/ocm/pkg/blobaccess/bpi"
- "github.com/open-component-model/ocm/pkg/blobaccess/file"
- "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/credentials"
- "github.com/open-component-model/ocm/pkg/contexts/credentials/builtin/maven/identity"
- "github.com/open-component-model/ocm/pkg/iotools"
- "github.com/open-component-model/ocm/pkg/maven"
- "github.com/open-component-model/ocm/pkg/mime"
- "github.com/open-component-model/ocm/pkg/utils"
- "github.com/open-component-model/ocm/pkg/utils/tarutils"
-)
-
-type coords = *maven.Coordinates
-
-type spec struct {
- coords
- repo *maven.Repository
- options *Options
-}
-
-func (s *spec) getBlobAccess() (_ bpi.BlobAccess, rerr error) {
- var finalize finalizer.Finalizer
- defer finalize.FinalizeWithErrorPropagation(&rerr)
-
- log := s.options.Logger("RepoUrl", s.repo.String())
- creds, err := s.options.GetCredentials(s.repo, s.GroupId)
- if err != nil {
- return nil, err
- }
- fileMap, err := s.repo.GavFiles(s.coords, creds)
- if err != nil {
- return nil, err
- }
-
- fileMap = s.coords.FilterFileMap(fileMap)
-
- switch l := len(fileMap); {
- case l <= 0:
- return nil, errors.New("no maven artifact files found")
- case l == 1 && optionutils.AsValue(s.Extension) != "" && s.Classifier != nil:
- for file, hash := range fileMap {
- metadata, err := s.repo.GetFileMeta(s.coords, file, hash, creds)
- if err != nil {
- return nil, err
- }
- return blobAccessForRepositoryAccess(metadata, creds, s.options)
- }
- // default: continue below with: create tmpfs where all files can be downloaded to and packed together as tar.gz
- }
-
- tmpfs, err := osfs.NewTempFileSystem()
- if err != nil {
- return nil, err
- }
- finalize.With(func() error {
- return vfs.Cleanup(tmpfs)
- })
-
- for file, hash := range fileMap {
- loop := finalize.Nested()
- metadata, err := s.repo.GetFileMeta(s.coords, file, hash, creds)
- if err != nil {
- return nil, err
- }
-
- // download the artifact into the temporary file system
- out, err := tmpfs.Create(file)
- if err != nil {
- return nil, err
- }
- loop.Close(out)
-
- reader, err := metadata.Location.GetReader(creds)
- if err != nil {
- return nil, err
- }
- loop.Close(reader)
- if hash > 0 {
- dreader := iotools.NewDigestReaderWithHash(hash, reader)
- _, err = io.Copy(out, dreader)
- if err != nil {
- return nil, err
- }
- sum := dreader.Digest().Encoded()
- if metadata.Hash != sum {
- return nil, errors.Newf("%s digest mismatch: expected %s, found %s", metadata.HashType, metadata.Hash, sum)
- }
- } else {
- _, err = io.Copy(out, reader)
- return nil, err
- }
- err = loop.Finalize()
- if err != nil {
- return nil, err
- }
- }
-
- // pack all downloaded files into a tar.gz file
- fs := utils.FileSystem(s.options.CachingFileSystem)
- tgz, err := vfs.TempFile(fs, "", "maven-"+s.coords.FileNamePrefix()+"-*.tar.gz")
- if err != nil {
- return nil, err
- }
-
- dw := iotools.NewDigestWriterWith(digest.SHA256, tgz)
- finalize.Close(dw)
-
- err = tarutils.TgzFs(tmpfs, dw)
- if err != nil {
- return nil, err
- }
- log.Debug("created", "file", tgz.Name())
- return file.BlobAccessForTemporaryFilePath(mime.MIME_TGZ, tgz.Name(), file.WithFileSystem(fs), file.WithDigest(dw.Digest()), file.WithSize(dw.Size())), nil
-}
-
-func blobAccessForRepositoryAccess(meta *BlobMeta, creds maven.Credentials, opts *Options) (bpi.BlobAccess, error) {
- reader := func() (io.ReadCloser, error) {
- return meta.Location.GetReader(creds)
- }
- if meta.Hash != "" {
- getreader := reader
- reader = func() (io.ReadCloser, error) {
- readCloser, err := getreader()
- if err != nil {
- return nil, err
- }
- return iotools.VerifyingReaderWithHash(readCloser, meta.HashType, meta.Hash), nil
- }
- }
- acc := blobaccess.DataAccessForReaderFunction(reader, meta.Location.String())
- return accessobj.CachedBlobAccessForWriterWithCache(opts.Cache(), meta.MimeType, accessio.NewDataAccessWriter(acc)), nil
-}
-
-func MapCredentials(creds credentials.Credentials) maven.Credentials {
- if creds == nil || (!creds.ExistsProperty(identity.ATTR_USERNAME) && !creds.ExistsProperty(identity.ATTR_PASSWORD)) {
- return nil
- }
- return &maven.BasicAuthCredentials{
- Username: creds.GetProperty(identity.ATTR_USERNAME),
- Password: creds.GetProperty(identity.ATTR_PASSWORD),
- }
-}
-
-func GetCredentials(ctx credentials.ContextProvider, repo *Repository, groupId string) (maven.Credentials, error) {
- consumerid, err := identity.GetConsumerId(repo.String(), groupId)
- if err != nil {
- return nil, err
- }
- creds, err := credentials.CredentialsForConsumer(ctx, consumerid, identity.IdentityMatcher)
- if err != nil {
- return nil, err
- }
- return MapCredentials(creds), nil
-}
diff --git a/pkg/blobaccess/ociartifact/access.go b/pkg/blobaccess/ociartifact/access.go
deleted file mode 100644
index f224e0f08..000000000
--- a/pkg/blobaccess/ociartifact/access.go
+++ /dev/null
@@ -1,55 +0,0 @@
-package ociartifact
-
-import (
- "fmt"
-
- "github.com/mandelsoft/goutils/optionutils"
-
- "github.com/open-component-model/ocm/pkg/blobaccess/bpi"
- "github.com/open-component-model/ocm/pkg/contexts/oci"
- "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/artifactset"
-)
-
-func BlobAccess(refname string, opts ...Option) (bpi.BlobAccess, string, error) {
- eff := optionutils.EvalOptions(opts...)
-
- eff.Printf("image %s\n", refname)
- ref, err := oci.ParseRef(refname)
- if err != nil {
- return nil, "", err
- }
-
- spec, err := eff.OCIContext().MapUniformRepositorySpec(&ref.UniformRepositorySpec)
- if err != nil {
- return nil, "", err
- }
-
- repo, err := eff.OCIContext().RepositoryForSpec(spec)
- if err != nil {
- return nil, "", err
- }
- ns, err := repo.LookupNamespace(ref.Repository)
- if err != nil {
- return nil, "", err
- }
-
- version := ref.Version()
- if version == "" || version == "latest" {
- version = eff.Version
- }
- if version == "" {
- return nil, "", fmt.Errorf("no version specified")
- }
- blob, err := artifactset.SynthesizeArtifactBlobWithFilter(ns, version, eff.Filter)
- if err != nil {
- return nil, "", err
- }
- return blob, version, nil
-}
-
-func Provider(name string, opts ...Option) bpi.BlobAccessProvider {
- return bpi.BlobAccessProviderFunction(func() (bpi.BlobAccess, error) {
- b, _, err := BlobAccess(name, opts...)
- return b, err
- })
-}
diff --git a/pkg/blobaccess/ociartifact/deprecated.go b/pkg/blobaccess/ociartifact/deprecated.go
deleted file mode 100644
index 7531805de..000000000
--- a/pkg/blobaccess/ociartifact/deprecated.go
+++ /dev/null
@@ -1,17 +0,0 @@
-package ociartifact
-
-import (
- "github.com/open-component-model/ocm/pkg/blobaccess/bpi"
-)
-
-// BlobAccessForOCIArtifact returns a BlobAccess for the OCI artifact with the given refname.
-// Deprecated: use BlobAccess.
-func BlobAccessForOCIArtifact(refname string, opts ...Option) (bpi.BlobAccess, string, error) {
- return BlobAccess(refname, opts...)
-}
-
-// BlobAccessProviderForOCIArtifact returns a BlobAccessProvider for the OCI artifact with the given name.
-// Deprecated: use Provider.
-func BlobAccessProviderForOCIArtifact(name string, opts ...Option) bpi.BlobAccessProvider {
- return Provider(name, opts...)
-}
diff --git a/pkg/blobaccess/ociartifact/options.go b/pkg/blobaccess/ociartifact/options.go
deleted file mode 100644
index 6e3469306..000000000
--- a/pkg/blobaccess/ociartifact/options.go
+++ /dev/null
@@ -1,112 +0,0 @@
-package ociartifact
-
-import (
- "github.com/mandelsoft/goutils/optionutils"
-
- "github.com/open-component-model/ocm/pkg/common"
- "github.com/open-component-model/ocm/pkg/contexts/oci"
- "github.com/open-component-model/ocm/pkg/contexts/oci/transfer/filters"
-)
-
-type Option = optionutils.Option[*Options]
-
-type Filter = filters.Filter
-
-type Options struct {
- Context oci.Context
- Version string
- Filter Filter
- Printer common.Printer
-}
-
-func (o *Options) OCIContext() oci.Context {
- if o.Context == nil {
- return oci.DefaultContext()
- }
- return o.Context
-}
-
-func (o *Options) GetPrinter() common.Printer {
- if o.Printer == nil {
- return common.NewPrinter(nil)
- }
- return o.Printer
-}
-
-func (o *Options) Printf(msg string, args ...interface{}) {
- if o.Printer != nil {
- o.Printer.Printf(msg, args...)
- }
-}
-
-func (o *Options) ApplyTo(opts *Options) {
- if opts == nil {
- return
- }
- if o.Context != nil {
- opts.Context = o.Context
- }
- if o.Version != "" {
- opts.Version = o.Version
- }
- if o.Printer != nil {
- opts.Printer = o.Printer
- }
- if o.Filter != nil {
- opts.Filter = o.Filter
- }
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-type context struct {
- oci.Context
-}
-
-func (o context) ApplyTo(opts *Options) {
- opts.Context = o
-}
-
-func WithContext(ctx oci.ContextProvider) Option {
- return context{ctx.OCIContext()}
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-type version string
-
-func (o version) ApplyTo(opts *Options) {
- opts.Version = string(o)
-}
-
-func WithVersion(v string) Option {
- return version(v)
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-type printer struct {
- common.Printer
-}
-
-func (o printer) ApplyTo(opts *Options) {
- opts.Printer = o
-}
-
-func WithPrinter(p common.Printer) Option {
- return printer{p}
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-type _filter struct {
- filters.Filter
-}
-
-func (o _filter) ApplyTo(opts *Options) {
- opts.Filter = o.Filter
-}
-
-func WithFilter(f filters.Filter) Option {
- return _filter{f}
-}
diff --git a/pkg/blobaccess/wget/access.go b/pkg/blobaccess/wget/access.go
deleted file mode 100644
index b982b97e4..000000000
--- a/pkg/blobaccess/wget/access.go
+++ /dev/null
@@ -1,181 +0,0 @@
-package wget
-
-import (
- gocontext "context"
- "crypto/tls"
- "encoding/base64"
- "io"
- "mime"
- "net/http"
-
- "github.com/mandelsoft/goutils/errors"
- "github.com/mandelsoft/goutils/optionutils"
-
- "github.com/open-component-model/ocm/pkg/blobaccess/blobaccess"
- "github.com/open-component-model/ocm/pkg/blobaccess/bpi"
- "github.com/open-component-model/ocm/pkg/blobaccess/file"
- "github.com/open-component-model/ocm/pkg/contexts/credentials"
- "github.com/open-component-model/ocm/pkg/contexts/credentials/builtin/wget/identity"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/cpi"
- ocmmime "github.com/open-component-model/ocm/pkg/mime"
- "github.com/open-component-model/ocm/pkg/utils"
-)
-
-const (
- CACHE_CONTENT_THRESHOLD = 4096
-)
-
-func DataAccess(url string, opts ...Option) (bpi.DataAccess, error) {
- blobAccess, err := BlobAccess(url, opts...)
- if err != nil {
- return nil, err
- }
- return blobAccess, nil
-}
-
-func BlobAccess(url string, opts ...Option) (_ bpi.BlobAccess, rerr error) {
- eff := optionutils.EvalOptions(opts...)
- log := eff.Logger("URL", url)
-
- creds, err := eff.GetCredentials(url)
- if err != nil {
- return nil, err
- }
- if creds == nil {
- log.Debug("no credentials found for url {{url}}", "url", url)
- }
-
- // configure http client
- rootCAs, err := credentials.GetRootCAs(eff.CredentialContext, creds)
- if rerr != nil {
- return nil, err
- }
- clientCerts, err := credentials.GetClientCerts(eff.CredentialContext, creds)
- if err != nil {
- return nil, errors.New("client certificate and private key provided in credentials could not be loaded " +
- "as tls certificate")
- }
-
- transport := &http.Transport{
- TLSClientConfig: &tls.Config{
- MinVersion: tls.VersionTLS13,
- RootCAs: rootCAs,
- Certificates: clientCerts,
- },
- }
-
- var redirectFunc func(req *http.Request, via []*http.Request) error = nil
- if eff.NoRedirect != nil && *eff.NoRedirect {
- redirectFunc = func(req *http.Request, via []*http.Request) error {
- return http.ErrUseLastResponse
- }
- }
-
- client := &http.Client{
- CheckRedirect: redirectFunc,
- Transport: transport,
- }
-
- if eff.Verb == "" {
- eff.Verb = http.MethodGet
- }
-
- // configure http request
- request, err := http.NewRequestWithContext(gocontext.Background(), eff.Verb, url, eff.Body)
- if err != nil {
- return nil, err
- }
-
- if eff.Header != nil {
- for key, arr := range eff.Header {
- for _, el := range arr {
- request.Header.Add(key, el)
- }
- }
- }
-
- if creds != nil {
- user := creds.GetProperty(identity.ATTR_USERNAME)
- password := creds.GetProperty(identity.ATTR_PASSWORD)
- token := creds.GetProperty(identity.ATTR_IDENTITY_TOKEN)
-
- if user != "" && password != "" {
- auth := user + ":" + password
- auth = base64.StdEncoding.EncodeToString([]byte(auth))
- request.Header.Add("Authorization", "Basic "+auth)
- } else if token != "" {
- request.Header.Add("Authorization", "Bearer "+token)
- }
- }
-
- // make http request
- resp, err := client.Do(request)
- if err != nil {
- return nil, err
- }
- defer errors.PropagateError(&rerr, resp.Body.Close)
- log.Debug("http status code {{code}}", "code", resp.StatusCode)
-
- // determine effective mime type
- if eff.MimeType == "" {
- log.Debug("no mime type provided as option, trying to extract mime type from content type " +
- "response header")
-
- contentType := resp.Header.Get("Content-Type")
- eff.MimeType, _, err = mime.ParseMediaType(contentType)
- if err != nil {
- log.Debug("failed to get mime type from content type response header with error {{err}}",
- "err", err)
- }
- }
- if eff.MimeType == "" {
- log.Debug("no mime type was provided as content type header of the http response, trying to" +
- "extract mime type from url")
- ext, err := utils.GetFileExtensionFromUrl(url)
- if err == nil && ext != "" {
- eff.MimeType = mime.TypeByExtension(ext)
- } else if err != nil {
- log.Debug(err.Error())
- }
- }
- if eff.MimeType == "" {
- eff.MimeType = ocmmime.MIME_OCTET
- log.Debug("no mime type could be extract from the url, defaulting to {{default}}", "default",
- eff.MimeType)
- }
-
- // download content
- var blob cpi.BlobAccess
- if resp.ContentLength < 0 || resp.ContentLength > CACHE_CONTENT_THRESHOLD {
- log.Debug("download to file because content length is unknown or greater than {{threshold}}", "threshold", CACHE_CONTENT_THRESHOLD)
- f, err := file.NewTempFile("", "wget")
- if err != nil {
- return nil, err
- }
- defer errors.PropagateError(&rerr, f.Close)
-
- n, err := io.Copy(f.Writer(), resp.Body)
- if err != nil {
- return nil, err
- }
- log.Debug("downloaded size {{size}} to {{filepath}}", "size", n, "filepath", f.Name())
-
- blob = f.AsBlob(eff.MimeType)
- } else {
- log.Debug("download to memory because content length is less than {{threshold}}", "threshold", CACHE_CONTENT_THRESHOLD)
- buf, err := io.ReadAll(resp.Body)
- if err != nil {
- return nil, err
- }
- blob = blobaccess.ForData(eff.MimeType, buf)
- }
-
- return blob, nil
-}
-
-func Provider(url string, opts ...Option) bpi.BlobAccessProvider {
- return bpi.BlobAccessProviderFunction(func() (bpi.BlobAccess, error) {
- b, err := BlobAccess(url, opts...)
- return b, err
- })
-}
diff --git a/pkg/blobaccess/wget/deprecated.go b/pkg/blobaccess/wget/deprecated.go
deleted file mode 100644
index 793eb85ef..000000000
--- a/pkg/blobaccess/wget/deprecated.go
+++ /dev/null
@@ -1,23 +0,0 @@
-package wget
-
-import (
- "github.com/open-component-model/ocm/pkg/blobaccess/bpi"
-)
-
-// DataAccessForWget returns a DataAccess for the given URL.
-// Deprecated: use DataAccess.
-func DataAccessForWget(url string, opts ...Option) (bpi.DataAccess, error) {
- return DataAccess(url, opts...)
-}
-
-// BlobAccessForWget returns a BlobAccess for the given URL.
-// Deprecated: use BlobAccess.
-func BlobAccessForWget(url string, opts ...Option) (_ bpi.BlobAccess, rerr error) {
- return BlobAccess(url, opts...)
-}
-
-// BlobAccessProviderForWget returns a BlobAccessProvider for the given URL.
-// Deprecated: use Provider.
-func BlobAccessProviderForWget(url string, opts ...Option) bpi.BlobAccessProvider {
- return Provider(url, opts...)
-}
diff --git a/pkg/blobaccess/wget/logging.go b/pkg/blobaccess/wget/logging.go
deleted file mode 100644
index 0814553e5..000000000
--- a/pkg/blobaccess/wget/logging.go
+++ /dev/null
@@ -1,7 +0,0 @@
-package wget
-
-import (
- ocmlog "github.com/open-component-model/ocm/pkg/logging"
-)
-
-var REALM = ocmlog.DefineSubRealm("blob access for wget", "blobaccess/wget")
diff --git a/pkg/blobaccess/wget/options.go b/pkg/blobaccess/wget/options.go
deleted file mode 100644
index a808e4545..000000000
--- a/pkg/blobaccess/wget/options.go
+++ /dev/null
@@ -1,188 +0,0 @@
-package wget
-
-import (
- "io"
- "net/http"
-
- "github.com/mandelsoft/goutils/optionutils"
- "github.com/mandelsoft/logging"
-
- "github.com/open-component-model/ocm/pkg/contexts/credentials"
- "github.com/open-component-model/ocm/pkg/contexts/credentials/builtin/wget/identity"
- ocmlog "github.com/open-component-model/ocm/pkg/logging"
- "github.com/open-component-model/ocm/pkg/utils"
-)
-
-type Option = optionutils.Option[*Options]
-
-type Options struct {
- CredentialContext credentials.Context
- LoggingContext logging.Context
- // Header to be passed in the http request
- Header http.Header
- // Verb is the http verb to be used for the request
- Verb string
- // Body is the body to be included in the http request
- Body io.Reader
- // NoRedirect allows to disable redirects
- NoRedirect *bool
- // MimeType defines the media type of the downloaded content
- MimeType string
- // Credentials allows to pass credentials and certificates for the http communication
- Credentials credentials.Credentials
-}
-
-func (o *Options) Logger(keyValuePairs ...interface{}) logging.Logger {
- return ocmlog.LogContext(o.LoggingContext, o.CredentialContext).Logger(REALM).WithValues(keyValuePairs...)
-}
-
-func (o *Options) GetCredentials(url string) (credentials.Credentials, error) {
- switch {
- case o.Credentials != nil:
- return o.Credentials, nil
- case o.CredentialContext != nil:
- creds, err := credentials.CredentialsForConsumer(o.CredentialContext, identity.GetConsumerId(url), identity.IdentityMatcher)
- if err != nil {
- return nil, err
- }
- return creds, nil
- default:
- return nil, nil
- }
-}
-
-func (o *Options) ApplyTo(opts *Options) {
- if opts == nil {
- return
- }
- if o.MimeType != "" {
- opts.MimeType = o.MimeType
- }
- if o.CredentialContext != nil {
- opts.CredentialContext = o.CredentialContext
- }
- if o.LoggingContext != nil {
- opts.LoggingContext = o.LoggingContext
- }
- if o.Credentials != nil {
- opts.Credentials = o.Credentials
- }
- if o.Header != nil {
- opts.Header = o.Header
- }
- if o.Verb != "" {
- opts.Verb = o.Verb
- }
- if o.Body != nil {
- opts.Body = o.Body
- }
- if o.NoRedirect != nil {
- opts.NoRedirect = o.NoRedirect
- }
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-type context struct {
- credentials.Context
-}
-
-func (o context) ApplyTo(opts *Options) {
- opts.CredentialContext = o
-}
-
-func WithCredentialContext(ctx credentials.ContextProvider) Option {
- return context{ctx.CredentialsContext()}
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-type loggingContext struct {
- logging.Context
-}
-
-func (o loggingContext) ApplyTo(opts *Options) {
- opts.LoggingContext = o
-}
-
-func WithLoggingContext(ctx logging.ContextProvider) Option {
- return loggingContext{ctx.LoggingContext()}
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-type mimeType string
-
-func (o mimeType) ApplyTo(opts *Options) {
- opts.MimeType = string(o)
-}
-
-func WithMimeType(mime string) Option {
- return mimeType(mime)
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-type creds struct {
- credentials.Credentials
-}
-
-func (o creds) ApplyTo(opts *Options) {
- opts.Credentials = o.Credentials
-}
-
-func WithCredentials(c credentials.Credentials) Option {
- return creds{c}
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-type header http.Header
-
-func (o header) ApplyTo(opts *Options) {
- opts.Header = http.Header(o)
-}
-
-func WithHeader(h http.Header) Option {
- return header(h)
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-type verb string
-
-func (o verb) ApplyTo(opts *Options) {
- opts.Verb = string(o)
-}
-
-func WithVerb(v string) Option {
- return verb(v)
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-type body struct {
- io.Reader
-}
-
-func (o *body) ApplyTo(opts *Options) {
- if o.Reader != nil {
- opts.Body = io.Reader(o)
- }
-}
-
-func WithBody(v io.Reader) Option {
- return &body{v}
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-type noredirect bool
-
-func (o noredirect) ApplyTo(opts *Options) {
- opts.NoRedirect = utils.BoolP(o)
-}
-
-func WithNoRedirect(r ...bool) Option {
- return noredirect(utils.OptionalDefaultedBool(true, r...))
-}
diff --git a/pkg/clisupport/labels.go b/pkg/clisupport/labels.go
deleted file mode 100644
index 574bbd1e9..000000000
--- a/pkg/clisupport/labels.go
+++ /dev/null
@@ -1,94 +0,0 @@
-package clisupport
-
-import (
- "encoding/json"
- "strings"
-
- "github.com/mandelsoft/goutils/errors"
- "github.com/mandelsoft/vfs/pkg/osfs"
- "github.com/mandelsoft/vfs/pkg/vfs"
- "sigs.k8s.io/yaml"
-
- metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1"
- "github.com/open-component-model/ocm/pkg/utils"
-)
-
-func gkind(kind ...string) string {
- for _, k := range kind {
- if k != "" {
- return k
- }
- }
- return "label"
-}
-
-func ParseLabel(fs vfs.FileSystem, a string, kind ...string) (*metav1.Label, error) {
- var err error
-
- if fs == nil {
- fs = osfs.New()
- }
- i := strings.Index(a, "=")
- if i < 0 {
- return nil, errors.ErrInvalid(gkind(kind...), a)
- }
- label := a[:i]
-
- data, err := utils.ResolveData(a[i+1:], fs)
- if err != nil {
- return nil, err
- }
-
- var value interface{}
- err = yaml.Unmarshal(data, &value)
- if err != nil {
- return nil, errors.Wrapf(errors.ErrInvalid(gkind(kind...), a), "no yaml or json")
- }
- data, err = json.Marshal(value)
- if err != nil {
- return nil, errors.Wrapf(errors.ErrInvalid(gkind(kind...), a), err.Error())
- }
- return &metav1.Label{
- Name: strings.TrimSpace(label),
- Value: json.RawMessage(data),
- }, nil
-}
-
-func AddParsedLabel(fs vfs.FileSystem, labels metav1.Labels, a string, kind ...string) (metav1.Labels, error) {
- l, err := ParseLabel(fs, a, kind...)
- if err != nil {
- return nil, err
- }
- for _, c := range labels {
- if c.Name == l.Name {
- return nil, errors.Newf("duplicate %s %q", gkind(kind...), l.Name)
- }
- }
- return append(labels, *l), nil
-}
-
-func ParseLabels(fs vfs.FileSystem, labels []string, kind ...string) (metav1.Labels, error) {
- var err error
- result := metav1.Labels{}
- for _, l := range labels {
- result, err = AddParsedLabel(fs, result, l, kind...)
- if err != nil {
- return nil, err
- }
- }
- return result, err
-}
-
-func SetParsedLabel(fs vfs.FileSystem, labels metav1.Labels, a string, kind ...string) (metav1.Labels, error) {
- l, err := ParseLabel(fs, a, kind...)
- if err != nil {
- return nil, err
- }
- for i, c := range labels {
- if c.Name == l.Name {
- labels[i].Value = l.Value
- return labels, nil
- }
- }
- return append(labels, *l), nil
-}
diff --git a/pkg/cobrautils/flagsets/flagsetscheme/scheme.go b/pkg/cobrautils/flagsets/flagsetscheme/scheme.go
deleted file mode 100644
index aafc90fd6..000000000
--- a/pkg/cobrautils/flagsets/flagsetscheme/scheme.go
+++ /dev/null
@@ -1,129 +0,0 @@
-package flagsetscheme
-
-import (
- "github.com/open-component-model/ocm/pkg/cobrautils/flagsets"
- "github.com/open-component-model/ocm/pkg/logging"
- "github.com/open-component-model/ocm/pkg/runtime"
- "github.com/open-component-model/ocm/pkg/runtime/descriptivetype"
- "github.com/open-component-model/ocm/pkg/utils"
-)
-
-// VersionTypedObjectType is the appropriately extended type interface
-// based on runtime.VersionTypedObjectType.
-type VersionTypedObjectType[T runtime.VersionedTypedObject] interface {
- descriptivetype.TypedObjectType[T]
-
- ConfigOptionTypeSetHandler() flagsets.ConfigOptionTypeSetHandler
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-// ExtendedTypeScheme is the appropriately extended scheme interface based on
-// runtime.TypeScheme supporting an extended config provider interface.
-type ExtendedTypeScheme[T runtime.VersionedTypedObject, R VersionTypedObjectType[T], P flagsets.ConfigTypeOptionSetConfigProvider] interface {
- descriptivetype.TypeScheme[T, R]
-
- CreateConfigTypeSetConfigProvider() P
-
- Unwrap() TypeScheme[T, R]
-}
-
-type _TypeScheme[T runtime.VersionedTypedObject, R VersionTypedObjectType[T]] interface {
- TypeScheme[T, R]
-}
-
-type typeSchemeWrapper[T runtime.VersionedTypedObject, R VersionTypedObjectType[T], P flagsets.ConfigTypeOptionSetConfigProvider] struct {
- _TypeScheme[T, R]
-}
-
-func (s *typeSchemeWrapper[T, R, P]) CreateConfigTypeSetConfigProvider() P {
- return s._TypeScheme.CreateConfigTypeSetConfigProvider().(P)
-}
-
-func (s *typeSchemeWrapper[T, R, P]) Unwrap() TypeScheme[T, R] {
- return s._TypeScheme
-}
-
-// NewTypeSchemeWrapper wraps a [TypeScheme] into a scheme returning a specialized config provider
-// by casting the result. The type scheme constructor provides different implementations based on its
-// arguments. This method here can be used to provide a type scheme returning the correct type.
-func NewTypeSchemeWrapper[T runtime.VersionedTypedObject, R VersionTypedObjectType[T], P flagsets.ConfigTypeOptionSetConfigProvider](s TypeScheme[T, R]) ExtendedTypeScheme[T, R, P] {
- return &typeSchemeWrapper[T, R, P]{s}
-}
-
-// TypeScheme is the appropriately extended scheme interface based on
-// runtime.TypeScheme.
-type TypeScheme[T runtime.VersionedTypedObject, R VersionTypedObjectType[T]] interface {
- ExtendedTypeScheme[T, R, flagsets.ConfigTypeOptionSetConfigProvider]
-}
-
-type _typeScheme[T runtime.VersionedTypedObject, R VersionTypedObjectType[T]] interface {
- descriptivetype.TypeScheme[T, R]
-}
-
-type typeScheme[T runtime.VersionedTypedObject, R VersionTypedObjectType[T], S TypeScheme[T, R]] struct {
- cfgname string
- description string
- group string
- typeOption string
- _typeScheme[T, R]
-}
-
-func flagExtender[T runtime.VersionedTypedObject, R VersionTypedObjectType[T]](ty R) string {
- if h := ty.ConfigOptionTypeSetHandler(); h != nil {
- return utils.IndentLines(flagsets.FormatConfigOptions(h), " ")
- }
- return ""
-}
-
-// NewTypeScheme provides an TypeScheme implementation based on the interfaces
-// and the default runtime.TypeScheme implementation.
-func NewTypeScheme[T runtime.VersionedTypedObject, R VersionTypedObjectType[T], S TypeScheme[T, R]](kindname string, cfgname, typeOption, desc, group string, unknown runtime.Unstructured, acceptUnknown bool, base ...S) TypeScheme[T, R] {
- scheme := descriptivetype.NewTypeScheme[T, R](kindname, flagExtender[T, R], unknown, acceptUnknown, utils.Optional(base...))
- return &typeScheme[T, R, S]{
- cfgname: cfgname,
- description: desc,
- group: group,
- typeOption: typeOption,
- _typeScheme: scheme,
- }
-}
-
-func (s *typeScheme[T, R, S]) Unwrap() TypeScheme[T, R] {
- return s
-}
-
-func (t *typeScheme[T, R, S]) CreateConfigTypeSetConfigProvider() flagsets.ConfigTypeOptionSetConfigProvider {
- var prov flagsets.ConfigTypeOptionSetConfigProvider
- if t.typeOption == "" {
- prov = flagsets.NewExplicitlyTypedConfigProvider(t.cfgname, t.description, true)
- } else {
- prov = flagsets.NewTypedConfigProvider(t.cfgname, t.description, t.typeOption, true)
- }
- if t.group != "" {
- prov.AddGroups(t.group)
- }
- for _, p := range t.KnownTypes() {
- err := prov.AddTypeSet(p.ConfigOptionTypeSetHandler())
- if err != nil {
- logging.Logger().LogError(err, "cannot compose type CLI options", "type", t.cfgname)
- }
- }
- if t.BaseScheme() != nil {
- base := t.BaseScheme()
- for _, s := range base.(S).CreateConfigTypeSetConfigProvider().OptionTypeSets() {
- if prov.GetTypeSet(s.GetName()) == nil {
- err := prov.AddTypeSet(s)
- if err != nil {
- logging.Logger().LogError(err, "cannot compose type CLI options", "type", t.cfgname)
- }
- }
- }
- }
-
- return prov
-}
-
-func (t *typeScheme[T, R, S]) KnownTypes() runtime.KnownTypes[T, R] {
- return t._typeScheme.KnownTypes() // Goland
-}
diff --git a/pkg/cobrautils/flagsets/flagsetscheme/types.go b/pkg/cobrautils/flagsets/flagsetscheme/types.go
deleted file mode 100644
index 2e9c3483d..000000000
--- a/pkg/cobrautils/flagsets/flagsetscheme/types.go
+++ /dev/null
@@ -1,62 +0,0 @@
-package flagsetscheme
-
-import (
- "github.com/mandelsoft/goutils/optionutils"
-
- "github.com/open-component-model/ocm/pkg/cobrautils/flagsets"
- "github.com/open-component-model/ocm/pkg/runtime"
- "github.com/open-component-model/ocm/pkg/runtime/descriptivetype"
-)
-
-type additionalTypeInfo interface {
- ConfigOptionTypeSetHandler() flagsets.ConfigOptionTypeSetHandler
- Description() string
- Format() string
-}
-
-type TypedObjectTypeObject[E runtime.VersionedTypedObject] struct {
- *descriptivetype.TypedObjectTypeObject[E]
- handler flagsets.ConfigOptionTypeSetHandler
- validator func(E) error
-}
-
-var _ additionalTypeInfo = (*TypedObjectTypeObject[runtime.VersionedTypedObject])(nil)
-
-func NewTypedObjectTypeObject[E runtime.VersionedTypedObject](vt runtime.VersionedTypedObjectType[E], opts ...TypeOption) *TypedObjectTypeObject[E] {
- t := NewTypeObjectTarget[E](&TypedObjectTypeObject[E]{
- TypedObjectTypeObject: descriptivetype.NewTypedObjectTypeObject[E](vt),
- })
- optionutils.ApplyOptions[OptionTarget](t, opts...)
- return t.target
-}
-
-func (t *TypedObjectTypeObject[E]) ConfigOptionTypeSetHandler() flagsets.ConfigOptionTypeSetHandler {
- return t.handler
-}
-
-func (t *TypedObjectTypeObject[E]) Validate(e E) error {
- if t.validator == nil {
- return nil
- }
- return t.validator(e)
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-// TypeObjectTarget is used as target for option functions, it provides
-// setters for fields, which should nor be modifiable for a final type object.
-type TypeObjectTarget[E runtime.VersionedTypedObject] struct {
- *descriptivetype.TypeObjectTarget[E]
- target *TypedObjectTypeObject[E]
-}
-
-func NewTypeObjectTarget[E runtime.VersionedTypedObject](target *TypedObjectTypeObject[E]) *TypeObjectTarget[E] {
- return &TypeObjectTarget[E]{
- target: target,
- TypeObjectTarget: descriptivetype.NewTypeObjectTarget[E](target.TypedObjectTypeObject),
- }
-}
-
-func (t TypeObjectTarget[E]) SetConfigHandler(value flagsets.ConfigOptionTypeSetHandler) {
- t.target.handler = value
-}
diff --git a/pkg/cobrautils/flagsets/provider.go b/pkg/cobrautils/flagsets/provider.go
deleted file mode 100644
index 2f96f5cce..000000000
--- a/pkg/cobrautils/flagsets/provider.go
+++ /dev/null
@@ -1,252 +0,0 @@
-package flagsets
-
-import (
- "fmt"
- "strings"
-
- "github.com/mandelsoft/goutils/errors"
-
- "github.com/open-component-model/ocm/pkg/runtime"
- "github.com/open-component-model/ocm/pkg/utils"
-)
-
-type ConfigProvider interface {
- CreateOptions() ConfigOptions
- GetConfigFor(opts ConfigOptions) (Config, error)
-}
-
-type ConfigTypeOptionSetConfigProvider interface {
- ConfigProvider
- ConfigOptionTypeSet
-
- GetPlainOptionType() ConfigOptionType
- GetTypeOptionType() ConfigOptionType
-
- IsExplicitlySelected(opts ConfigOptions) bool
-}
-
-type _ConfigTypeOptionSetConfigProvider = ConfigTypeOptionSetConfigProvider
-
-////////////////////////////////////////////////////////////////////////////////
-
-type plainConfigProvider struct {
- ConfigOptionTypeSetHandler
-}
-
-var _ ConfigTypeOptionSetConfigProvider = (*plainConfigProvider)(nil)
-
-func NewPlainConfigProvider(name string, adder ConfigAdder, types ...ConfigOptionType) ConfigTypeOptionSetConfigProvider {
- h := NewConfigOptionTypeSetHandler(name, adder, types...)
- return &plainConfigProvider{
- ConfigOptionTypeSetHandler: h,
- }
-}
-
-func (p *plainConfigProvider) GetConfigOptionTypeSet() ConfigOptionTypeSet {
- return p
-}
-
-func (p *plainConfigProvider) GetPlainOptionType() ConfigOptionType {
- return nil
-}
-
-func (p *plainConfigProvider) GetTypeOptionType() ConfigOptionType {
- return nil
-}
-
-func (p *plainConfigProvider) IsExplicitlySelected(opts ConfigOptions) bool {
- return opts.FilterBy(p.HasOptionType).Changed()
-}
-
-func (p *plainConfigProvider) GetConfigFor(opts ConfigOptions) (Config, error) {
- if !p.IsExplicitlySelected(opts) {
- return nil, nil
- }
- config := Config{}
- err := p.ApplyConfig(opts, config)
- return config, err
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-type typedConfigProvider struct {
- _ConfigTypeOptionSetConfigProvider
- typeOptionType ConfigOptionType
-}
-
-var _ ConfigTypeOptionSetConfigProvider = (*typedConfigProvider)(nil)
-
-func NewTypedConfigProvider(name string, desc, typeOption string, acceptUnknown ...bool) ConfigTypeOptionSetConfigProvider {
- typeOpt := NewStringOptionType(name+"Type", "type of "+desc)
- return &typedConfigProvider{NewTypedConfigProviderBase(name, desc, TypeNameProviderFromOptions(typeOption), utils.Optional(acceptUnknown...), typeOpt), typeOpt}
-}
-
-func (p *typedConfigProvider) GetTypeOptionType() ConfigOptionType {
- return p.typeOptionType
-}
-
-func (p *typedConfigProvider) IsExplicitlySelected(opts ConfigOptions) bool {
- return opts.Changed(p.typeOptionType.GetName(), p.GetName())
-}
-
-func TypeNameProviderFromOptions(name string) TypeNameProvider {
- return func(opts ConfigOptions) (string, error) {
- typv, _ := opts.GetValue(name)
- typ, ok := typv.(string)
- if !ok {
- return "", fmt.Errorf("failed to assert type %T as string", typv)
- }
- return typ, nil
- }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-type ExplicitlyTypedConfigTypeOptionSetConfigProvider interface {
- ConfigTypeOptionSetConfigProvider
- SetTypeName(n string)
-}
-
-type explicitlyTypedConfigProvider struct {
- _ConfigTypeOptionSetConfigProvider
- typeName string
-}
-
-var _ ConfigTypeOptionSetConfigProvider = (*typedConfigProvider)(nil)
-
-func NewExplicitlyTypedConfigProvider(name string, desc string, acceptUnknown ...bool) ExplicitlyTypedConfigTypeOptionSetConfigProvider {
- p := &explicitlyTypedConfigProvider{}
- p._ConfigTypeOptionSetConfigProvider = NewTypedConfigProviderBase(name, desc, p.getTypeName, utils.Optional(acceptUnknown...))
- return p
-}
-
-func (p *explicitlyTypedConfigProvider) SetTypeName(n string) {
- p.typeName = n
-}
-
-func (p *explicitlyTypedConfigProvider) getTypeName(opts ConfigOptions) (string, error) {
- return p.typeName, nil
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-type TypeNameProvider func(opts ConfigOptions) (string, error)
-
-type typedConfigProviderBase struct {
- ConfigOptionTypeSet
- typeProvider TypeNameProvider
- meta ConfigOptionTypeSet
- acceptUnknown bool
- plainOptionType ConfigOptionType
-}
-
-var _ ConfigTypeOptionSetConfigProvider = (*typedConfigProviderBase)(nil)
-
-func NewTypedConfigProviderBase(name string, desc string, prov TypeNameProvider, acceptUnknown bool, types ...ConfigOptionType) ConfigTypeOptionSetConfigProvider {
- plainType := NewValueMapYAMLOptionType(name, desc+" (YAML)")
- set := NewConfigOptionTypeSet(name, append(types, plainType)...)
- return &typedConfigProviderBase{
- ConfigOptionTypeSet: set,
- typeProvider: prov,
- meta: NewConfigOptionTypeSet(name, append(types, NewValueMapYAMLOptionType(name, desc+" (YAML)"))...),
- acceptUnknown: acceptUnknown,
- plainOptionType: plainType,
- }
-}
-
-func (p *typedConfigProviderBase) GetConfigOptionTypeSet() ConfigOptionTypeSet {
- return p
-}
-
-func (p *typedConfigProviderBase) GetPlainOptionType() ConfigOptionType {
- return p.plainOptionType
-}
-
-func (p *typedConfigProviderBase) GetTypeOptionType() ConfigOptionType {
- return nil
-}
-
-func (p *typedConfigProviderBase) IsExplicitlySelected(opts ConfigOptions) bool {
- t, err := p.typeProvider(opts)
- return err == nil && t != ""
-}
-
-func (p *typedConfigProviderBase) GetConfigFor(opts ConfigOptions) (Config, error) {
- typ, err := p.typeProvider(opts)
- if err != nil {
- return nil, err
- }
- cfgv, _ := opts.GetValue(p.GetName())
-
- var data Config
- if cfgv != nil {
- var ok bool
- data, ok = cfgv.(Config)
- if !ok {
- return nil, fmt.Errorf("failed to assert type %T as Config", cfgv)
- }
- }
-
- opts = opts.FilterBy(p.HasOptionType)
- if typ == "" && data != nil && data["type"] != nil {
- t := data["type"]
- if t != nil {
- if s, ok := t.(string); ok {
- typ = s
- } else {
- return nil, fmt.Errorf("type field must be a string")
- }
- }
- }
-
- if opts.Changed() || typ != "" {
- if typ == "" {
- return nil, fmt.Errorf("type required for explicitly configured options")
- }
- if data == nil {
- data = Config{}
- }
- data["type"] = typ
- if err := p.applyConfigForType(typ, opts, data); err != nil {
- if !p.acceptUnknown || !errors.Is(err, errors.ErrUnknown(typ)) {
- return nil, err
- }
- unexpected := opts.FilterBy(And(Changed(opts), Not(p.meta.HasOptionType))).Names()
- if len(unexpected) > 0 {
- return nil, fmt.Errorf("unexpected options %s", strings.Join(unexpected, ", "))
- }
- }
- }
- return data, nil
-}
-
-func (p *typedConfigProviderBase) GetTypeSetForType(name string) ConfigOptionTypeSet {
- set := p.GetTypeSet(name)
- if set == nil {
- k, v := runtime.KindVersion(name)
- if v == "" {
- set = p.GetTypeSet(runtime.TypeName(name, "v1"))
- } else if v == "v1" {
- set = p.GetTypeSet(k)
- }
- }
- return set
-}
-
-func (p *typedConfigProviderBase) applyConfigForType(name string, opts ConfigOptions, config Config) error {
- set := p.GetTypeSetForType(name)
- if set == nil {
- return errors.ErrUnknown(name)
- }
-
- opts = opts.FilterBy(Not(p.meta.HasOptionType))
- err := opts.Check(set, p.GetName()+" type "+name)
- if err != nil {
- return err
- }
- handler, ok := set.(ConfigHandler)
- if !ok {
- return fmt.Errorf("no config handler defined for %s type %s", p.GetName(), name)
- }
- return handler.ApplyConfig(opts, config)
-}
diff --git a/pkg/cobrautils/flagsets/types.go b/pkg/cobrautils/flagsets/types.go
deleted file mode 100644
index 8fae19c7b..000000000
--- a/pkg/cobrautils/flagsets/types.go
+++ /dev/null
@@ -1,553 +0,0 @@
-package flagsets
-
-import (
- "reflect"
-
- "github.com/spf13/pflag"
-
- "github.com/open-component-model/ocm/pkg/cobrautils/flag"
- "github.com/open-component-model/ocm/pkg/cobrautils/groups"
-)
-
-type TypeOptionBase struct {
- name string
- description string
-}
-
-func (b *TypeOptionBase) GetName() string {
- return b.name
-}
-
-func (b *TypeOptionBase) GetDescription() string {
- return b.description
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-type OptionBase struct {
- otyp ConfigOptionType
- flag *pflag.Flag
- groups []string
-}
-
-func NewOptionBase(otyp ConfigOptionType) OptionBase {
- return OptionBase{otyp: otyp}
-}
-
-func (b *OptionBase) Type() ConfigOptionType {
- return b.otyp
-}
-
-func (b *OptionBase) GetName() string {
- return b.otyp.GetName()
-}
-
-func (b *OptionBase) Description() string {
- return b.otyp.GetDescription()
-}
-
-func (b *OptionBase) Changed() bool {
- return b.flag.Changed
-}
-
-func (b *OptionBase) AddGroups(groups ...string) {
- b.groups = AddGroups(b.groups, groups...)
- b.addGroups()
-}
-
-func (b *OptionBase) addGroups() {
- if len(b.groups) == 0 || b.flag == nil {
- return
- }
- if b.flag.Annotations == nil {
- b.flag.Annotations = map[string][]string{}
- }
- list := b.flag.Annotations[groups.FlagGroupAnnotation]
- b.flag.Annotations[groups.FlagGroupAnnotation] = AddGroups(list, b.groups...)
-}
-
-func (b *OptionBase) TweakFlag(f *pflag.Flag) {
- b.flag = f
- b.addGroups()
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-type StringOptionType struct {
- TypeOptionBase
-}
-
-func NewStringOptionType(name string, description string) ConfigOptionType {
- return &StringOptionType{
- TypeOptionBase: TypeOptionBase{name, description},
- }
-}
-
-func (s *StringOptionType) Equal(optionType ConfigOptionType) bool {
- return reflect.DeepEqual(s, optionType)
-}
-
-func (s *StringOptionType) Create() Option {
- return &StringOption{
- OptionBase: NewOptionBase(s),
- }
-}
-
-type StringOption struct {
- OptionBase
- value string
-}
-
-var _ Option = (*StringOption)(nil)
-
-func (o *StringOption) AddFlags(fs *pflag.FlagSet) {
- o.TweakFlag(flag.StringVarPF(fs, &o.value, o.otyp.GetName(), "", "", o.otyp.GetDescription()))
-}
-
-func (o *StringOption) Value() interface{} {
- return o.value
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-type StringArrayOptionType struct {
- TypeOptionBase
-}
-
-func NewStringArrayOptionType(name string, description string) ConfigOptionType {
- return &StringArrayOptionType{
- TypeOptionBase: TypeOptionBase{name, description},
- }
-}
-
-func (s *StringArrayOptionType) Equal(optionType ConfigOptionType) bool {
- return reflect.DeepEqual(s, optionType)
-}
-
-func (s *StringArrayOptionType) Create() Option {
- return &StringArrayOption{
- OptionBase: NewOptionBase(s),
- }
-}
-
-type StringArrayOption struct {
- OptionBase
- value []string
-}
-
-var _ Option = (*StringArrayOption)(nil)
-
-func (o *StringArrayOption) AddFlags(fs *pflag.FlagSet) {
- o.TweakFlag(flag.StringArrayVarPF(fs, &o.value, o.otyp.GetName(), "", nil, o.otyp.GetDescription()))
-}
-
-func (o *StringArrayOption) Value() interface{} {
- return o.value
-}
-
-// PathOptionType //////////////////////////////////////////////////////////////////////////////
-
-type PathOptionType struct {
- TypeOptionBase
-}
-
-func NewPathOptionType(name string, description string) ConfigOptionType {
- return &PathOptionType{
- TypeOptionBase: TypeOptionBase{name, description},
- }
-}
-
-func (s *PathOptionType) Equal(optionType ConfigOptionType) bool {
- return reflect.DeepEqual(s, optionType)
-}
-
-func (s *PathOptionType) Create() Option {
- return &PathOption{
- OptionBase: NewOptionBase(s),
- }
-}
-
-type PathOption struct {
- OptionBase
- value string
-}
-
-var _ Option = (*PathOption)(nil)
-
-func (o *PathOption) AddFlags(fs *pflag.FlagSet) {
- o.TweakFlag(flag.PathVarPF(fs, &o.value, o.otyp.GetName(), "", "", o.otyp.GetDescription()))
-}
-
-func (o *PathOption) Value() interface{} {
- return o.value
-}
-
-// PathArrayOptionType //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-type PathArrayOptionType struct {
- TypeOptionBase
-}
-
-func NewPathArrayOptionType(name string, description string) ConfigOptionType {
- return &PathArrayOptionType{
- TypeOptionBase: TypeOptionBase{name, description},
- }
-}
-
-func (s *PathArrayOptionType) Equal(optionType ConfigOptionType) bool {
- return reflect.DeepEqual(s, optionType)
-}
-
-func (s *PathArrayOptionType) Create() Option {
- return &PathArrayOption{
- OptionBase: NewOptionBase(s),
- }
-}
-
-type PathArrayOption struct {
- OptionBase
- value []string
-}
-
-var _ Option = (*PathArrayOption)(nil)
-
-func (o *PathArrayOption) AddFlags(fs *pflag.FlagSet) {
- o.TweakFlag(flag.PathArrayVarPF(fs, &o.value, o.otyp.GetName(), "", nil, o.otyp.GetDescription()))
-}
-
-func (o *PathArrayOption) Value() interface{} {
- return o.value
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-type BoolOptionType struct {
- TypeOptionBase
-}
-
-func NewBoolOptionType(name string, description string) ConfigOptionType {
- return &BoolOptionType{
- TypeOptionBase: TypeOptionBase{name, description},
- }
-}
-
-func (s *BoolOptionType) Equal(optionType ConfigOptionType) bool {
- return reflect.DeepEqual(s, optionType)
-}
-
-func (s *BoolOptionType) Create() Option {
- return &BoolOption{
- OptionBase: NewOptionBase(s),
- }
-}
-
-type BoolOption struct {
- OptionBase
- value bool
-}
-
-var _ Option = (*BoolOption)(nil)
-
-func (o *BoolOption) AddFlags(fs *pflag.FlagSet) {
- o.TweakFlag(flag.BoolVarPF(fs, &o.value, o.otyp.GetName(), "", false, o.otyp.GetDescription()))
-}
-
-func (o *BoolOption) Value() interface{} {
- return o.value
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-type IntOptionType struct {
- TypeOptionBase
-}
-
-func NewIntOptionType(name string, description string) ConfigOptionType {
- return &IntOptionType{
- TypeOptionBase: TypeOptionBase{name, description},
- }
-}
-
-func (s *IntOptionType) Equal(optionType ConfigOptionType) bool {
- return reflect.DeepEqual(s, optionType)
-}
-
-func (s *IntOptionType) Create() Option {
- return &IntOption{
- OptionBase: NewOptionBase(s),
- }
-}
-
-type IntOption struct {
- OptionBase
- value int
-}
-
-var _ Option = (*IntOption)(nil)
-
-func (o *IntOption) AddFlags(fs *pflag.FlagSet) {
- o.TweakFlag(flag.IntVarPF(fs, &o.value, o.otyp.GetName(), "", 0, o.otyp.GetDescription()))
-}
-
-func (o *IntOption) Value() interface{} {
- return o.value
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-type YAMLOptionType struct {
- TypeOptionBase
-}
-
-func NewYAMLOptionType(name string, description string) ConfigOptionType {
- return &YAMLOptionType{
- TypeOptionBase: TypeOptionBase{name, description},
- }
-}
-
-func (s *YAMLOptionType) Equal(optionType ConfigOptionType) bool {
- return reflect.DeepEqual(s, optionType)
-}
-
-func (s *YAMLOptionType) Create() Option {
- return &YAMLOption{
- OptionBase: NewOptionBase(s),
- }
-}
-
-type YAMLOption struct {
- OptionBase
- value interface{}
-}
-
-var _ Option = (*YAMLOption)(nil)
-
-func (o *YAMLOption) AddFlags(fs *pflag.FlagSet) {
- o.TweakFlag(flag.YAMLVarPF(fs, &o.value, o.otyp.GetName(), "", nil, o.otyp.GetDescription()))
-}
-
-func (o *YAMLOption) Value() interface{} {
- return o.value
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-type ValueMapYAMLOptionType struct {
- TypeOptionBase
-}
-
-func NewValueMapYAMLOptionType(name string, description string) ConfigOptionType {
- return &ValueMapYAMLOptionType{
- TypeOptionBase: TypeOptionBase{name, description},
- }
-}
-
-func (s *ValueMapYAMLOptionType) Equal(optionType ConfigOptionType) bool {
- return reflect.DeepEqual(s, optionType)
-}
-
-func (s *ValueMapYAMLOptionType) Create() Option {
- return &ValueMapYAMLOption{
- OptionBase: NewOptionBase(s),
- }
-}
-
-type ValueMapYAMLOption struct {
- OptionBase
- value map[string]interface{}
-}
-
-var _ Option = (*ValueMapYAMLOption)(nil)
-
-func (o *ValueMapYAMLOption) AddFlags(fs *pflag.FlagSet) {
- o.TweakFlag(flag.YAMLVarPF(fs, &o.value, o.otyp.GetName(), "", nil, o.otyp.GetDescription()))
-}
-
-func (o *ValueMapYAMLOption) Value() interface{} {
- return o.value
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-type ValueMapOptionType struct {
- TypeOptionBase
-}
-
-func NewValueMapOptionType(name string, description string) ConfigOptionType {
- return &ValueMapOptionType{
- TypeOptionBase: TypeOptionBase{name, description},
- }
-}
-
-func (s *ValueMapOptionType) Equal(optionType ConfigOptionType) bool {
- return reflect.DeepEqual(s, optionType)
-}
-
-func (s *ValueMapOptionType) Create() Option {
- return &ValueMapOption{
- OptionBase: NewOptionBase(s),
- }
-}
-
-type ValueMapOption struct {
- OptionBase
- value map[string]interface{}
-}
-
-var _ Option = (*ValueMapOption)(nil)
-
-func (o *ValueMapOption) AddFlags(fs *pflag.FlagSet) {
- o.TweakFlag(flag.StringToValueVarPF(fs, &o.value, o.otyp.GetName(), "", nil, o.otyp.GetDescription()))
-}
-
-func (o *ValueMapOption) Value() interface{} {
- return o.value
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-type StringMapOptionType struct {
- TypeOptionBase
-}
-
-func NewStringMapOptionType(name string, description string) ConfigOptionType {
- return &StringMapOptionType{
- TypeOptionBase: TypeOptionBase{name, description},
- }
-}
-
-func (s *StringMapOptionType) Equal(optionType ConfigOptionType) bool {
- return reflect.DeepEqual(s, optionType)
-}
-
-func (s *StringMapOptionType) Create() Option {
- return &StringMapOption{
- OptionBase: NewOptionBase(s),
- }
-}
-
-type StringMapOption struct {
- OptionBase
- value map[string]string
-}
-
-var _ Option = (*StringMapOption)(nil)
-
-func (o *StringMapOption) AddFlags(fs *pflag.FlagSet) {
- o.TweakFlag(flag.StringToStringVarPF(fs, &o.value, o.otyp.GetName(), "", nil, o.otyp.GetDescription()))
-}
-
-func (o *StringMapOption) Value() interface{} {
- return o.value
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-type BytesOptionType struct {
- TypeOptionBase
-}
-
-func NewBytesOptionType(name string, description string) ConfigOptionType {
- return &BytesOptionType{
- TypeOptionBase: TypeOptionBase{name, description},
- }
-}
-
-func (s *BytesOptionType) Equal(optionType ConfigOptionType) bool {
- return reflect.DeepEqual(s, optionType)
-}
-
-func (s *BytesOptionType) Create() Option {
- return &BytesOption{
- OptionBase: NewOptionBase(s),
- }
-}
-
-type BytesOption struct {
- OptionBase
- value []byte
-}
-
-var _ Option = (*BytesOption)(nil)
-
-func (o *BytesOption) AddFlags(fs *pflag.FlagSet) {
- o.TweakFlag(flag.BytesBase64VarPF(fs, &o.value, o.otyp.GetName(), "", nil, o.otyp.GetDescription()))
-}
-
-func (o *BytesOption) Value() interface{} {
- return o.value
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-type StringSliceMapOptionType struct {
- TypeOptionBase
-}
-
-func NewStringSliceMapOptionType(name string, description string) ConfigOptionType {
- return &StringSliceMapOptionType{
- TypeOptionBase: TypeOptionBase{name, description},
- }
-}
-
-func (s *StringSliceMapOptionType) Equal(optionType ConfigOptionType) bool {
- return reflect.DeepEqual(s, optionType)
-}
-
-func (s *StringSliceMapOptionType) Create() Option {
- return &StringSliceMapOption{
- OptionBase: NewOptionBase(s),
- }
-}
-
-type StringSliceMapOption struct {
- OptionBase
- value map[string][]string
-}
-
-var _ Option = (*StringSliceMapOption)(nil)
-
-func (o *StringSliceMapOption) AddFlags(fs *pflag.FlagSet) {
- o.TweakFlag(flag.StringToStringSliceVarPF(fs, &o.value, o.otyp.GetName(), "", nil, o.otyp.GetDescription()))
-}
-
-func (o *StringSliceMapOption) Value() interface{} {
- return o.value
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-type StringSliceMapColonOptionType struct {
- TypeOptionBase
-}
-
-func NewStringSliceMapColonOptionType(name string, description string) ConfigOptionType {
- return &StringSliceMapColonOptionType{
- TypeOptionBase: TypeOptionBase{name, description},
- }
-}
-
-func (s *StringSliceMapColonOptionType) Equal(optionType ConfigOptionType) bool {
- return reflect.DeepEqual(s, optionType)
-}
-
-func (s *StringSliceMapColonOptionType) Create() Option {
- return &StringSliceMapColonOption{
- OptionBase: NewOptionBase(s),
- }
-}
-
-type StringSliceMapColonOption struct {
- OptionBase
- value map[string][]string
-}
-
-var _ Option = (*StringSliceMapColonOption)(nil)
-
-func (o *StringSliceMapColonOption) AddFlags(fs *pflag.FlagSet) {
- o.TweakFlag(flag.StringColonStringSliceVarPF(fs, &o.value, o.otyp.GetName(), "", nil, o.otyp.GetDescription()))
-}
-
-func (o *StringSliceMapColonOption) Value() interface{} {
- return o.value
-}
diff --git a/pkg/cobrautils/flagsets/utils_test.go b/pkg/cobrautils/flagsets/utils_test.go
deleted file mode 100644
index 91f83b0ba..000000000
--- a/pkg/cobrautils/flagsets/utils_test.go
+++ /dev/null
@@ -1,112 +0,0 @@
-package flagsets_test
-
-import (
- . "github.com/onsi/ginkgo/v2"
- . "github.com/onsi/gomega"
-
- "github.com/open-component-model/ocm/pkg/cobrautils/flagsets"
-)
-
-type Config = flagsets.Config
-
-var (
- GetField = flagsets.GetField
- SetField = flagsets.SetField
-)
-
-var _ = Describe("config", func() {
- Context("get", func() {
- It("gets a field from empty map", func() {
- m := flagsets.Config{}
- Expect(GetField(m, "a")).To(BeNil())
- })
-
- It("gets a non existing field", func() {
- m := Config{}
- m["b"] = "vb"
- Expect(GetField(m, "a")).To(BeNil())
- })
-
- It("gets a flat field", func() {
- m := Config{}
- m["a"] = "va"
- Expect(GetField(m, "a")).To(Equal("va"))
- })
-
- It("gets a deep field", func() {
- m := Config{}
- a := Config{}
- m["a"] = a
- a["b"] = "vb"
- Expect(GetField(m, "a", "b")).To(Equal("vb"))
- })
-
- It("fails for non map", func() {
- m := Config{}
- m["a"] = "va"
- _, err := GetField(m, "a", "b")
- Expect(err).To(HaveOccurred())
- Expect(err.Error()).To(Equal("a is no map"))
- })
-
- It("fails for deep non map", func() {
- m := Config{}
- a := Config{}
- m["a"] = a
- a["b"] = "va"
- _, err := GetField(m, "a", "b", "c")
- Expect(err).To(HaveOccurred())
- Expect(err.Error()).To(Equal("a.b is no map"))
- })
- })
-
- Context("set", func() {
- It("fails for empty map", func() {
- err := SetField(nil, "x", "a")
- Expect(err).To(HaveOccurred())
- Expect(err.Error()).To(Equal("no map given"))
- })
-
- It("sets flat field", func() {
- m := Config{}
- err := SetField(m, "x", "a")
- Expect(err).To(Succeed())
- Expect(m).To(Equal(Config{"a": "x"}))
- })
-
- It("adds flat field", func() {
- m := Config{"b": "y"}
- err := SetField(m, "x", "a")
- Expect(err).To(Succeed())
- Expect(m).To(Equal(Config{"a": "x", "b": "y"}))
- })
-
- It("sets deep field", func() {
- m := Config{"a": Config{}}
- err := SetField(m, "x", "a", "b")
- Expect(err).To(Succeed())
- Expect(m).To(Equal(Config{"a": Config{"b": "x"}}))
- })
-
- It("inserts intermediate maps", func() {
- m := Config{"a": Config{}}
- err := SetField(m, "x", "a", "b", "c", "d")
- Expect(err).To(Succeed())
- Expect(m).To(Equal(Config{"a": Config{"b": Config{"c": Config{"d": "x"}}}}))
- })
-
- It("fails for non map", func() {
- m := Config{"a": "va"}
- err := SetField(m, "x", "a", "b")
- Expect(err).To(HaveOccurred())
- Expect(err.Error()).To(Equal("a is no map"))
- })
-
- It("fails for non map intermediate", func() {
- m := Config{"a": "va"}
- err := SetField(m, "x", "a", "b", "c")
- Expect(err).To(HaveOccurred())
- Expect(err.Error()).To(Equal("a is no map"))
- })
- })
-})
diff --git a/pkg/cobrautils/logopts/close_test.go b/pkg/cobrautils/logopts/close_test.go
deleted file mode 100644
index d3dcf3308..000000000
--- a/pkg/cobrautils/logopts/close_test.go
+++ /dev/null
@@ -1,55 +0,0 @@
-package logopts
-
-import (
- "runtime"
- "time"
-
- . "github.com/mandelsoft/goutils/testutils"
- . "github.com/onsi/ginkgo/v2"
- . "github.com/onsi/gomega"
-
- "github.com/mandelsoft/logging"
- "github.com/mandelsoft/vfs/pkg/osfs"
- "github.com/mandelsoft/vfs/pkg/vfs"
-
- logging2 "github.com/open-component-model/ocm/pkg/cobrautils/logopts/logging"
- "github.com/open-component-model/ocm/pkg/contexts/datacontext"
- "github.com/open-component-model/ocm/pkg/contexts/datacontext/attrs/vfsattr"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
-)
-
-var _ = Describe("log file", func() {
- var fs vfs.FileSystem
-
- BeforeEach(func() {
- fs = Must(osfs.NewTempFileSystem())
- })
-
- AfterEach(func() {
- vfs.Cleanup(fs)
- })
-
- It("closes log file", func() {
- ctx := ocm.New(datacontext.MODE_INITIAL)
- lctx := logging.NewDefault()
-
- vfsattr.Set(ctx, fs)
-
- opts := &Options{
- ConfigFragment: ConfigFragment{
- LogLevel: "debug",
- LogFileName: "debug.log",
- },
- }
-
- MustBeSuccessful(opts.Configure(ctx, lctx))
-
- Expect(logging2.GetLogFileFor(opts.LogFileName, fs)).NotTo(BeNil())
- lctx = nil
- for i := 1; i < 100; i++ {
- time.Sleep(1 * time.Millisecond)
- runtime.GC()
- }
- Expect(logging2.GetLogFileFor(opts.LogFileName, fs)).To(BeNil())
- })
-})
diff --git a/pkg/cobrautils/logopts/config.go b/pkg/cobrautils/logopts/config.go
deleted file mode 100644
index d4738f6e3..000000000
--- a/pkg/cobrautils/logopts/config.go
+++ /dev/null
@@ -1,146 +0,0 @@
-package logopts
-
-import (
- "strings"
-
- "github.com/mandelsoft/goutils/errors"
- "github.com/mandelsoft/logging"
- "github.com/mandelsoft/logging/config"
- "github.com/mandelsoft/logging/logrusl/adapter"
- "github.com/mandelsoft/logging/logrusr"
- "github.com/mandelsoft/vfs/pkg/vfs"
- "github.com/sirupsen/logrus"
- "github.com/spf13/pflag"
-
- logdata "github.com/open-component-model/ocm/pkg/cobrautils/logopts/logging"
- "github.com/open-component-model/ocm/pkg/contexts/datacontext/attrs/logforward"
- "github.com/open-component-model/ocm/pkg/contexts/datacontext/attrs/vfsattr"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
- "github.com/open-component-model/ocm/pkg/utils"
-)
-
-// ConfigFragment is a serializable log config used
-// for CLI commands.
-type ConfigFragment struct {
- LogLevel string `json:"logLevel,omitempty"`
- LogConfig string `json:"logConfig,omitempty"`
- LogKeys []string `json:"logKeys,omitempty"`
- Json bool `json:"json,omitempty"`
-
- // LogFileName is a CLI option, only. Do not serialize and forward
- LogFileName string `json:"-"`
-}
-
-func (c *ConfigFragment) AddFlags(fs *pflag.FlagSet) {
- fs.BoolVarP(&c.Json, "logJson", "", false, "log as json instead of human readable logs")
- fs.StringVarP(&c.LogLevel, "loglevel", "l", "", "set log level")
- fs.StringVarP(&c.LogFileName, "logfile", "L", "", "set log file")
- fs.StringVarP(&c.LogConfig, "logconfig", "", "", "log config")
- fs.StringArrayVarP(&c.LogKeys, "logkeys", "", nil, "log tags/realms(with leading /) to be enabled ([/[+]]name{,[/[+]]name}[=level])")
-}
-
-func (c *ConfigFragment) GetLogConfig(fss ...vfs.FileSystem) (*config.Config, error) {
- var (
- err error
- cfg *config.Config
- )
-
- if c.LogConfig != "" {
- var data []byte
- if strings.HasPrefix(c.LogConfig, "@") {
- data, err = utils.ReadFile(c.LogConfig[1:], utils.FileSystem(fss...))
- if err != nil {
- return nil, errors.Wrapf(err, "cannot read logging config file %q", c.LogConfig[1:])
- }
- } else {
- data = []byte(c.LogConfig)
- }
- if cfg, err = config.EvaluateFromData(data); err != nil {
- return nil, errors.Wrapf(err, "invalid logging config: %q", c.LogConfig)
- }
- } else {
- cfg = &config.Config{DefaultLevel: "Warn"}
- }
-
- for _, t := range c.LogKeys {
- level := logging.InfoLevel
- i := strings.Index(t, "=")
- if i >= 0 {
- level, err = logging.ParseLevel(t[i+1:])
- if err != nil {
- return nil, errors.Wrapf(err, "invalid log tag setting")
- }
- t = t[:i]
- }
- var cfgcond []config.Condition
-
- for _, tag := range strings.Split(t, ",") {
- tag = strings.TrimSpace(tag)
- if strings.HasPrefix(tag, "/") {
- realm := tag[1:]
- if strings.HasPrefix(realm, "+") {
- cfgcond = append(cfgcond, config.RealmPrefix(realm[1:]))
- } else {
- cfgcond = append(cfgcond, config.Realm(realm))
- }
- } else {
- cfgcond = append(cfgcond, config.Tag(tag))
- }
- }
- cfg.Rules = append(cfg.Rules, config.ConditionalRule(logging.LevelName(level), cfgcond...))
- }
-
- if c.LogLevel != "" {
- _, err := logging.ParseLevel(c.LogLevel)
- if err != nil {
- return nil, errors.Wrapf(err, "invalid log level %q", c.LogLevel)
- }
- cfg.DefaultLevel = c.LogLevel
- }
-
- return cfg, nil
-}
-
-func (c *ConfigFragment) Evaluate(ctx ocm.Context, logctx logging.Context, main bool) (*EvaluatedOptions, error) {
- var err error
- var opts EvaluatedOptions
-
- for logctx.Tree().GetBaseContext() != nil {
- logctx = logctx.Tree().GetBaseContext()
- }
-
- fs := vfsattr.Get(ctx)
- if main && c.LogFileName != "" && logdata.GlobalLogFileOverride == "" {
- if opts.LogFile == nil {
- opts.LogFile, err = logdata.LogFileFor(c.LogFileName, fs)
- if err != nil {
- return nil, errors.Wrapf(err, "cannot open log file %q", opts.LogFile)
- }
- }
- logdata.ConfigureLogrusFor(logctx, !c.Json, opts.LogFile)
- if logctx == logging.DefaultContext() {
- logdata.GlobalLogFile = opts.LogFile
- }
- } else {
- // overwrite current log formatter in case of a logrus logger is
- // used as logging backend.
- var f logrus.Formatter = adapter.NewJSONFormatter()
- if !c.Json {
- f = adapter.NewTextFmtFormatter()
- }
- logrusr.SetFormatter(logging.UnwrapLogSink(logctx.GetSink()), f)
- }
-
- cfg, err := c.GetLogConfig(fs)
- if err != nil {
- return &opts, err
- }
- err = config.Configure(logctx, cfg)
- if err != nil {
- return &opts, err
- }
- opts.LogForward = cfg
- logforward.Set(ctx.AttributesContext(), opts.LogForward)
-
- return &opts, nil
-}
diff --git a/pkg/cobrautils/logopts/options.go b/pkg/cobrautils/logopts/options.go
deleted file mode 100644
index 0a4b3c931..000000000
--- a/pkg/cobrautils/logopts/options.go
+++ /dev/null
@@ -1,71 +0,0 @@
-package logopts
-
-import (
- "github.com/mandelsoft/logging"
- "github.com/mandelsoft/logging/config"
- "github.com/spf13/pflag"
-
- logging2 "github.com/open-component-model/ocm/pkg/cobrautils/logopts/logging"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
-)
-
-var Description = `
-The --log* options can be used to configure the logging behaviour.
-For details see ocm logging.
-
-There is a quick config option --logkeys to configure simple
-tag/realm based condition rules. The comma-separated names build an AND rule.
-Hereby, names starting with a slash (/) denote a realm (without
-the leading slash). A realm is a slash separated sequence of identifiers. If
-the realm name starts with a plus (+) character the generated rule
-will match the realm and all its sub-realms, otherwise, only the dedicated
-realm is affected. For example /+ocm=trace will enable all log output of the
-OCM library.
-
-A tag directly matches the logging tags. Used tags and realms can be found under
-topic ocm logging. The ocm coding basically uses the realm ocm.
-The default level to enable is info. Separated by an equal sign (=)
-optionally a dedicated level can be specified. Log levels can be (error,
-warn, info, debug and trace.
-The default level is warn.
-The --logconfig* options can be used to configure a complete
-logging configuration (yaml/json) via command line. If the argument starts with
-an @, the logging configuration is taken from a file.
-`
-
-////////////////////////////////////////////////////////////////////////////////
-
-type EvaluatedOptions struct {
- LogForward *config.Config
- LogFile *logging2.LogFile
-}
-
-func (o *EvaluatedOptions) Close() error {
- if o.LogFile == nil {
- return nil
- }
- return o.LogFile.Close()
-}
-
-type Options struct {
- ConfigFragment
- *EvaluatedOptions
-}
-
-func (o *Options) AddFlags(fs *pflag.FlagSet) {
- o.ConfigFragment.AddFlags(fs)
-}
-
-func (o *Options) Close() error {
- if o.EvaluatedOptions == nil {
- return nil
- }
- return o.EvaluatedOptions.Close()
-}
-
-func (o *Options) Configure(ctx ocm.Context, logctx logging.Context) error {
- var err error
-
- o.EvaluatedOptions, err = o.ConfigFragment.Evaluate(ctx, logctx, true)
- return err
-}
diff --git a/pkg/cobrautils/logopts/options_test.go b/pkg/cobrautils/logopts/options_test.go
deleted file mode 100644
index 13c914c90..000000000
--- a/pkg/cobrautils/logopts/options_test.go
+++ /dev/null
@@ -1,59 +0,0 @@
-package logopts
-
-import (
- "encoding/json"
- "fmt"
-
- . "github.com/mandelsoft/goutils/testutils"
- . "github.com/onsi/ginkgo/v2"
- . "github.com/onsi/gomega"
-
- "github.com/mandelsoft/logging"
- "github.com/mandelsoft/logging/config"
- "sigs.k8s.io/yaml"
-
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
-)
-
-var _ = Describe("log configuration", func() {
- It("provides forward config", func() {
- ctx := clictx.New()
-
- opts := Options{
- ConfigFragment: ConfigFragment{
- LogLevel: "debug",
- LogKeys: []string{
- "tag=trace",
- "/realm=info",
- "/+all=info",
- },
- },
- }
-
- MustBeSuccessful(opts.Configure(ctx.OCMContext(), ctx.LoggingContext()))
- Expect(opts.LogForward).NotTo(BeNil())
-
- data := Must(yaml.Marshal(opts.LogForward))
- fmt.Printf("%s\n", string(data))
- logctx := logging.NewWithBase(nil)
- MustBeSuccessful(config.Configure(logctx, opts.LogForward))
-
- Expect(logctx.GetDefaultLevel()).To(Equal(logging.DebugLevel))
- Expect(logctx.Logger(logging.NewTag("tag")).Enabled(logging.TraceLevel)).To(BeTrue())
- Expect(logctx.Logger(logging.NewRealm("all")).Enabled(logging.DebugLevel)).To(BeFalse())
- Expect(logctx.Logger(logging.NewRealm("all/test")).Enabled(logging.DebugLevel)).To(BeFalse())
- Expect(logctx.Logger(logging.NewRealm("realm")).Enabled(logging.InfoLevel)).To(BeTrue())
- Expect(logctx.Logger(logging.NewRealm("realm")).Enabled(logging.DebugLevel)).To(BeFalse())
- Expect(logctx.Logger(logging.NewRealm("realm/test")).Enabled(logging.InfoLevel)).To(BeTrue())
- Expect(logctx.Logger(logging.NewRealm("realm/test")).Enabled(logging.DebugLevel)).To(BeTrue())
- })
-
- Context("serialize", func() {
- It("does not serialize log file name", func() {
- var c ConfigFragment
- c.LogFileName = "test"
- data := Must(json.Marshal(&c))
- Expect(string(data)).To(Equal("{}"))
- })
- })
-})
diff --git a/pkg/common/accessio/access.go b/pkg/common/accessio/access.go
deleted file mode 100644
index e4245cf2c..000000000
--- a/pkg/common/accessio/access.go
+++ /dev/null
@@ -1,98 +0,0 @@
-package accessio
-
-import (
- "math/rand"
- "time"
-
- "github.com/mandelsoft/goutils/errors"
-
- "github.com/open-component-model/ocm/pkg/iotools"
- "github.com/open-component-model/ocm/pkg/refmgmt"
-)
-
-var (
- ErrClosed = refmgmt.ErrClosed
- ErrReadOnly = errors.ErrReadOnly()
-)
-
-////////////////////////////////////////////////////////////////////////////////
-
-type NopCloser = iotools.NopCloser
-
-////////////////////////////////////////////////////////////////////////////////
-
-type retriableError struct {
- wrapped error
-}
-
-func IsRetriableError(err error) bool {
- if err == nil {
- return false
- }
- return errors.IsA(err, &retriableError{})
-}
-
-func RetriableError(err error) error {
- if err == nil {
- return nil
- }
- return &retriableError{err}
-}
-
-func RetriableError1[T any](r T, err error) (T, error) {
- if err == nil {
- return r, nil
- }
- return r, &retriableError{err}
-}
-
-func RetriableError2[S, T any](s S, r T, err error) (S, T, error) {
- if err == nil {
- return s, r, nil
- }
- return s, r, &retriableError{err}
-}
-
-func (e *retriableError) Error() string {
- return e.wrapped.Error()
-}
-
-func (e *retriableError) Unwrap() error {
- return e.wrapped
-}
-
-func Retry(cnt int, d time.Duration, f func() error) error {
- for {
- err := f()
- if err == nil || cnt <= 0 || !IsRetriableError(err) {
- return err
- }
- jitter := time.Duration(rand.Int63n(int64(d))) //nolint: gosec // just an random number
- d = 2*d + (d/2-jitter)/10
- cnt--
- }
-}
-
-func Retry1[T any](cnt int, d time.Duration, f func() (T, error)) (T, error) {
- for {
- r, err := f()
- if err == nil || cnt <= 0 || !IsRetriableError(err) {
- return r, err
- }
- jitter := time.Duration(rand.Int63n(int64(d))) //nolint: gosec // just an random number
- d = 2*d + (d/2-jitter)/10
- cnt--
- }
-}
-
-func Retry2[S, T any](cnt int, d time.Duration, f func() (S, T, error)) (S, T, error) {
- for {
- s, t, err := f()
- if err == nil || cnt <= 0 || !IsRetriableError(err) {
- return s, t, err
- }
- jitter := time.Duration(rand.Int63n(int64(d))) //nolint: gosec // just an random number
- d = 2*d + (d/2-jitter)/10
- cnt--
- }
-}
diff --git a/pkg/common/accessio/cache.go b/pkg/common/accessio/cache.go
deleted file mode 100644
index 8f770c339..000000000
--- a/pkg/common/accessio/cache.go
+++ /dev/null
@@ -1,653 +0,0 @@
-package accessio
-
-import (
- "fmt"
- "io"
- "os"
- "strings"
- "sync"
- "time"
-
- "github.com/mandelsoft/goutils/errors"
- "github.com/mandelsoft/vfs/pkg/osfs"
- "github.com/mandelsoft/vfs/pkg/projectionfs"
- "github.com/mandelsoft/vfs/pkg/vfs"
- "github.com/marstr/guid"
- "github.com/opencontainers/go-digest"
-
- "github.com/open-component-model/ocm/pkg/blobaccess/blobaccess"
- "github.com/open-component-model/ocm/pkg/blobaccess/file"
- "github.com/open-component-model/ocm/pkg/common"
- "github.com/open-component-model/ocm/pkg/iotools"
- "github.com/open-component-model/ocm/pkg/refmgmt"
-)
-
-type StaticAllocatable struct{}
-
-func (_ StaticAllocatable) Ref() error { return nil }
-func (_ StaticAllocatable) Unref() error { return nil }
-
-type BlobSource interface {
- refmgmt.Allocatable
- GetBlobData(digest digest.Digest) (int64, blobaccess.DataAccess, error)
-}
-
-type BlobSink interface {
- refmgmt.Allocatable
- AddBlob(blob blobaccess.BlobAccess) (int64, digest.Digest, error)
-}
-
-type RootedCache interface {
- Root() (string, vfs.FileSystem)
-}
-
-type CleanupCache interface {
- // Cleanup can be implemented to offer a cache reorg.
- // It returns the number and size of
- // - handled entries (cnt, size)
- // - not handled entries (ncnt, nsize)
- // - failing entries (fcnt, fsize)
- Cleanup(p common.Printer, before *time.Time, dryrun bool) (cnt int, ncnt int, fcnt int, size int64, nsize int64, fsize int64, err error)
-}
-
-type BlobCache interface {
- BlobSource
- BlobSink
- AddData(data blobaccess.DataAccess) (int64, digest.Digest, error)
-}
-
-type blobCache struct {
- refmgmt.Allocatable
- lock sync.RWMutex
- cache vfs.FileSystem
-}
-
-var (
- _ sync.Locker = (*blobCache)(nil)
- _ RootedCache = (*blobCache)(nil)
-)
-
-// ACCESS_SUFFIX is the suffix of an additional blob related
-// file used to track the last access time by its modification time,
-// because Go does not support a platform independent way to access the
-// last access time attribute of a filesystem.
-const ACCESS_SUFFIX = ".acc"
-
-func NewDefaultBlobCache(fss ...vfs.FileSystem) (BlobCache, error) {
- var err error
- fs := DefaultedFileSystem(nil, fss...)
- if fs == nil {
- fs, err = osfs.NewTempFileSystem()
- if err != nil {
- return nil, err
- }
- }
- c := &blobCache{
- cache: fs,
- }
- c.Allocatable = refmgmt.NewAllocatable(c.cleanup)
- return c, nil
-}
-
-func NewStaticBlobCache(path string, fss ...vfs.FileSystem) (BlobCache, error) {
- fs := FileSystem(fss...)
- err := fs.MkdirAll(path, 0o700)
- if err != nil {
- return nil, err
- }
- fs, err = projectionfs.New(fs, path)
- if err != nil {
- return nil, err
- }
- return NewDefaultBlobCache(fs)
-}
-
-func (c *blobCache) Root() (string, vfs.FileSystem) {
- return vfs.PathSeparatorString, c.cache
-}
-
-func (c *blobCache) Lock() {
- c.lock.Lock()
-}
-
-func (c *blobCache) Unlock() {
- c.lock.Unlock()
-}
-
-func (c *blobCache) Cleanup(p common.Printer, before *time.Time, dryrun bool) (cnt int, ncnt int, fcnt int, size int64, nsize int64, fsize int64, err error) {
- c.Lock()
- defer c.Unlock()
-
- if p == nil {
- p = common.NewPrinter(nil)
- }
- path, fs := c.Root()
-
- entries, err := vfs.ReadDir(fs, path)
- if err != nil {
- return 0, 0, 0, 0, 0, 0, err
- }
- for _, e := range entries {
- if strings.HasSuffix(e.Name(), ACCESS_SUFFIX) {
- continue
- }
- base := vfs.Join(fs, path, e.Name())
- if before != nil && !before.IsZero() {
- fi, err := fs.Stat(base + ACCESS_SUFFIX)
- if err != nil {
- if !vfs.IsErrNotExist(err) {
- if p != nil {
- p.Printf("cannot stat %q: %s", e.Name(), err)
- }
- fcnt++
- fsize += e.Size()
- continue
- }
- } else {
- if fi.ModTime().After(*before) {
- ncnt++
- nsize += e.Size()
- continue
- }
- }
- }
- if !dryrun {
- err := fs.RemoveAll(base)
- if err != nil {
- if p != nil {
- p.Printf("cannot delete %q: %s", e.Name(), err)
- }
- fcnt++
- fsize += e.Size()
- continue
- }
- fs.RemoveAll(base + ACCESS_SUFFIX)
- }
- cnt++
- size += e.Size()
- }
- return cnt, ncnt, fcnt, size, nsize, fsize, nil
-}
-
-func (c *blobCache) cleanup() error {
- return vfs.Cleanup(c.cache)
-}
-
-func (c *blobCache) GetBlobData(digest digest.Digest) (int64, blobaccess.DataAccess, error) {
- err := c.Ref()
- if err == nil {
- defer c.Unref()
- c.lock.RLock()
- defer c.lock.RUnlock()
-
- path := common.DigestToFileName(digest)
- fi, err := c.cache.Stat(path)
- if err == nil {
- vfs.WriteFile(c.cache, path+ACCESS_SUFFIX, []byte{}, 0o600)
- // now := time.Now()
- // c.cache.Chtimes(path+ACCESS_SUFFIX, now, now)
- return fi.Size(), file.DataAccess(c.cache, path), nil
- }
- if os.IsNotExist(err) {
- return -1, nil, blobaccess.ErrBlobNotFound(digest)
- }
- }
- return blobaccess.BLOB_UNKNOWN_SIZE, nil, err
-}
-
-func (c *blobCache) AddBlob(blob blobaccess.BlobAccess) (int64, digest.Digest, error) {
- err := c.Ref()
- if err != nil {
- return blobaccess.BLOB_UNKNOWN_SIZE, blobaccess.BLOB_UNKNOWN_DIGEST, err
- }
- defer c.Unref()
-
- var digester *iotools.DigestReader
-
- if blob.DigestKnown() {
- c.lock.RLock()
- path := common.DigestToFileName(blob.Digest())
- if ok, err := vfs.Exists(c.cache, path); ok || err != nil {
- c.lock.RUnlock()
- return blob.Size(), blob.Digest(), err
- }
- c.lock.RUnlock()
- }
-
- tmp := "TMP" + guid.NewGUID().String()
-
- br, err := blob.Reader()
- if err != nil {
- return blobaccess.BLOB_UNKNOWN_SIZE, "", errors.Wrapf(err, "cannot get blob content")
- }
- defer br.Close()
-
- reader := io.Reader(br)
- if !blob.DigestKnown() {
- digester = iotools.NewDefaultDigestReader(reader)
- reader = digester
- }
-
- writer, err := c.cache.Create(tmp)
- if err != nil {
- return blobaccess.BLOB_UNKNOWN_SIZE, "", errors.Wrapf(err, "cannot create blob file in cache")
- }
- size, err := io.Copy(writer, reader)
- writer.Close()
- if err != nil {
- c.cache.Remove(tmp)
- return blobaccess.BLOB_UNKNOWN_SIZE, "", err
- }
-
- var digest digest.Digest
- var ok bool
- if digester != nil {
- digest = digester.Digest()
- } else {
- digest = blob.Digest()
- }
- target := common.DigestToFileName(digest)
-
- c.lock.Lock()
- defer c.lock.Unlock()
- if ok, err = vfs.Exists(c.cache, target); err != nil || !ok {
- err = c.cache.Rename(tmp, target)
- }
- c.cache.Remove(tmp)
- vfs.WriteFile(c.cache, target+ACCESS_SUFFIX, []byte{}, 0o600)
- return size, digest, err
-}
-
-func (c *blobCache) AddData(data blobaccess.DataAccess) (int64, digest.Digest, error) {
- return c.AddBlob(blobaccess.ForDataAccess(blobaccess.BLOB_UNKNOWN_DIGEST, blobaccess.BLOB_UNKNOWN_SIZE, "", data))
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-type cascadedCache struct {
- refmgmt.Allocatable
- lock sync.RWMutex
- parent BlobSource
- source BlobSource
- sink BlobSink
-}
-
-var _ BlobCache = (*cascadedCache)(nil)
-
-func NewCascadedBlobCache(parent BlobCache) (BlobCache, error) {
- if parent != nil {
- err := parent.Ref()
- if err != nil {
- return nil, err
- }
- }
- c := &cascadedCache{
- parent: parent,
- }
- c.Allocatable = refmgmt.NewAllocatable(c.cleanup)
- return c, nil
-}
-
-func NewCascadedBlobCacheForSource(parent BlobSource, src BlobSource) (BlobCache, error) {
- if parent != nil {
- err := parent.Ref()
- if err != nil {
- return nil, err
- }
- }
- if src != nil {
- err := src.Ref()
- if err != nil {
- return nil, err
- }
- }
- c := &cascadedCache{
- parent: parent,
- source: src,
- }
- c.Allocatable = refmgmt.NewAllocatable(c.cleanup)
- return c, nil
-}
-
-func NewCascadedBlobCacheForCache(parent BlobSource, src BlobCache) (BlobCache, error) {
- if parent != nil {
- err := parent.Ref()
- if err != nil {
- return nil, err
- }
- }
- if src != nil {
- err := src.Ref()
- if err != nil {
- return nil, err
- }
- }
- c := &cascadedCache{
- parent: parent,
- source: src,
- sink: src,
- }
- c.Allocatable = refmgmt.NewAllocatable(c.cleanup)
- return c, nil
-}
-
-func (c *cascadedCache) cleanup() error {
- list := errors.ErrListf("closing cascaded blob cache")
- if c.source != nil {
- list.Add(c.source.Unref())
- }
- if c.parent != nil {
- list.Add(c.parent.Unref())
- }
- return list.Result()
-}
-
-func (c *cascadedCache) GetBlobData(digest digest.Digest) (int64, blobaccess.DataAccess, error) {
- err := c.Ref()
- if err != nil {
- return blobaccess.BLOB_UNKNOWN_SIZE, nil, err
- }
- defer c.Unref()
-
- c.lock.RLock()
- defer c.lock.RUnlock()
-
- if c.source != nil {
- size, acc, err := c.source.GetBlobData(digest)
- if err == nil {
- return size, acc, err
- }
- if !blobaccess.IsErrBlobNotFound(err) {
- return blobaccess.BLOB_UNKNOWN_SIZE, nil, err
- }
- }
- if c.parent != nil {
- return c.parent.GetBlobData(digest)
- }
- return blobaccess.BLOB_UNKNOWN_SIZE, nil, blobaccess.ErrBlobNotFound(digest)
-}
-
-func (c *cascadedCache) AddData(data blobaccess.DataAccess) (int64, digest.Digest, error) {
- return c.AddBlob(blobaccess.ForDataAccess(blobaccess.BLOB_UNKNOWN_DIGEST, blobaccess.BLOB_UNKNOWN_SIZE, "", data))
-}
-
-func (c *cascadedCache) AddBlob(blob blobaccess.BlobAccess) (int64, digest.Digest, error) {
- err := c.Ref()
- if err == nil {
- defer c.Unref()
- c.lock.Lock()
- defer c.lock.Unlock()
-
- if c.source == nil {
- cache, err := NewDefaultBlobCache()
- if err != nil {
- return blobaccess.BLOB_UNKNOWN_SIZE, blobaccess.BLOB_UNKNOWN_DIGEST, err
- }
- c.source = cache
- c.sink = cache
- }
- if c.sink != nil {
- return c.sink.AddBlob(blob)
- }
- if c.parent != nil {
- if sink, ok := c.parent.(BlobSink); ok {
- return sink.AddBlob(blob)
- }
- }
- }
- return blobaccess.BLOB_UNKNOWN_SIZE, blobaccess.BLOB_UNKNOWN_DIGEST, err
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-type cached struct {
- refmgmt.Allocatable
- lock sync.RWMutex
- source BlobSource
- sink BlobSink
- cache BlobCache
-}
-
-var _ BlobCache = (*cached)(nil)
-
-func (c *cached) cleanup() error {
- list := errors.ErrListf("closing cached blob store")
- if c.sink != nil {
- list.Add(c.sink.Unref())
- }
- if c.source != nil {
- list.Add(c.source.Unref())
- }
- c.cache.Unref()
- return list.Result()
-}
-
-func (a *cached) GetBlobData(digest digest.Digest) (int64, blobaccess.DataAccess, error) {
- err := a.Ref()
- if err != nil {
- return blobaccess.BLOB_UNKNOWN_SIZE, nil, err
- }
- defer a.Unref()
-
- size, acc, err := a.cache.GetBlobData(digest)
- if err != nil {
- if !blobaccess.IsErrBlobNotFound(err) {
- return blobaccess.BLOB_UNKNOWN_SIZE, nil, err
- }
- size, acc, err = a.source.GetBlobData(digest)
- if err == nil {
- acc = newCachedAccess(a, acc, size, digest)
- }
- }
- return size, acc, err
-}
-
-func (a *cached) AddBlob(blob blobaccess.BlobAccess) (int64, digest.Digest, error) {
- err := a.Ref()
- if err != nil {
- return blobaccess.BLOB_UNKNOWN_SIZE, blobaccess.BLOB_UNKNOWN_DIGEST, err
- }
- defer a.Unref()
-
- if a.sink == nil {
- return blobaccess.BLOB_UNKNOWN_SIZE, blobaccess.BLOB_UNKNOWN_DIGEST, fmt.Errorf("no blob sink")
- }
- size, digest, err := a.cache.AddBlob(blob)
- if err != nil {
- return blobaccess.BLOB_UNKNOWN_SIZE, blobaccess.BLOB_UNKNOWN_DIGEST, err
- }
- _, acc, err := a.cache.GetBlobData(digest)
- if err != nil {
- return blobaccess.BLOB_UNKNOWN_SIZE, blobaccess.BLOB_UNKNOWN_DIGEST, err
- }
- size, digest, err = a.sink.AddBlob(blobaccess.ForDataAccess(digest, size, blob.MimeType(), acc))
- if err != nil {
- return blobaccess.BLOB_UNKNOWN_SIZE, blobaccess.BLOB_UNKNOWN_DIGEST, err
- }
- return size, digest, err
-}
-
-func (c *cached) AddData(data blobaccess.DataAccess) (int64, digest.Digest, error) {
- return c.AddBlob(blobaccess.ForDataAccess(blobaccess.BLOB_UNKNOWN_DIGEST, blobaccess.BLOB_UNKNOWN_SIZE, "", data))
-}
-
-/////////////////////////////////////////
-
-type cachedAccess struct {
- lock sync.Mutex
- cache *cached
- access blobaccess.DataAccess
- digest digest.Digest
- size int64
- orig blobaccess.DataAccess
-}
-
-var _ blobaccess.DataAccess = (*cachedAccess)(nil)
-
-func CachedAccess(src BlobSource, dst BlobSink, cache BlobCache) (BlobCache, error) {
- var err error
- if cache == nil {
- cache, err = NewDefaultBlobCache()
- if err != nil {
- return nil, err
- }
- } else {
- err = cache.Ref()
- if err != nil {
- return nil, err
- }
- }
- if src != nil {
- err = src.Ref()
- if err != nil {
- return nil, err
- }
- }
- if dst != nil {
- err = dst.Ref()
- if err != nil {
- return nil, err
- }
- }
- c := &cached{source: src, sink: dst, cache: cache}
- c.Allocatable = refmgmt.NewAllocatable(c.cleanup)
- return c, nil
-}
-
-func newCachedAccess(cache *cached, blob blobaccess.DataAccess, size int64, digest digest.Digest) blobaccess.DataAccess {
- return &cachedAccess{
- cache: cache,
- size: size,
- digest: digest,
- orig: blob,
- }
-}
-
-func (c *cachedAccess) Get() ([]byte, error) {
- var err error
-
- c.lock.Lock()
- defer c.lock.Unlock()
- if c.access == nil && c.digest != "" {
- c.size, c.access, _ = c.cache.cache.GetBlobData(c.digest)
- }
- if c.access == nil {
- c.cache.lock.Lock()
- defer c.cache.lock.Unlock()
-
- if c.digest != "" {
- c.size, c.access, err = c.cache.cache.GetBlobData(c.digest)
- if err != nil && !blobaccess.IsErrBlobNotFound(err) {
- return nil, err
- }
- }
- if c.access == nil {
- data, err := c.orig.Get()
- if err != nil {
- return nil, err
- }
- c.size, c.digest, err = c.cache.cache.AddData(blobaccess.DataAccessForData(data))
- if err == nil {
- c.orig.Close()
- c.orig = nil
- }
- return data, err
- }
- }
- return c.access.Get()
-}
-
-func (c *cachedAccess) Reader() (io.ReadCloser, error) {
- var err error
-
- c.lock.Lock()
- defer c.lock.Unlock()
- if c.access == nil && c.digest != "" {
- c.size, c.access, _ = c.cache.cache.GetBlobData(c.digest)
- }
- if c.access == nil {
- c.cache.lock.Lock()
- defer c.cache.lock.Unlock()
-
- if c.digest != "" {
- c.size, c.access, err = c.cache.cache.GetBlobData(c.digest)
- if err != nil && !blobaccess.IsErrBlobNotFound(err) {
- return nil, err
- }
- }
- if c.access == nil {
- c.size, c.digest, err = c.cache.cache.AddData(c.orig)
- if err == nil {
- _, c.access, err = c.cache.cache.GetBlobData(c.digest)
- }
- if err != nil {
- return nil, err
- }
- c.orig.Close()
- c.orig = nil
- }
- }
- return c.access.Reader()
-}
-
-func (c *cachedAccess) Close() error {
- return nil
-}
-
-func (c *cachedAccess) Size() int64 {
- return c.size
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-type norefBlobSource struct {
- BlobSource
-}
-
-var _ BlobSource = (*norefBlobSource)(nil)
-
-func NoRefBlobSource(s BlobSource) BlobSource { return &norefBlobSource{s} }
-
-func (norefBlobSource) Ref() error {
- return nil
-}
-
-func (norefBlobSource) Unref() error {
- return nil
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-type norefBlobSink struct {
- BlobSink
-}
-
-var _ BlobSink = (*norefBlobSink)(nil)
-
-func NoRefBlobSink(s BlobSink) BlobSink { return &norefBlobSink{s} }
-
-func (norefBlobSink) Ref() error {
- return nil
-}
-
-func (norefBlobSink) Unref() error {
- return nil
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-type norefBlobCache struct {
- BlobCache
-}
-
-var _ BlobCache = (*norefBlobCache)(nil)
-
-func NoRefBlobCache(s BlobCache) BlobCache { return &norefBlobCache{s} }
-
-func (norefBlobCache) Ref() error {
- return nil
-}
-
-func (norefBlobCache) Unref() error {
- return nil
-}
diff --git a/pkg/common/accessio/deprecated.go b/pkg/common/accessio/deprecated.go
deleted file mode 100644
index 6513bcb2f..000000000
--- a/pkg/common/accessio/deprecated.go
+++ /dev/null
@@ -1,233 +0,0 @@
-package accessio
-
-import (
- "crypto"
- "io"
-
- "github.com/mandelsoft/goutils/errors"
- "github.com/mandelsoft/goutils/sliceutils"
- "github.com/mandelsoft/vfs/pkg/vfs"
- "github.com/opencontainers/go-digest"
-
- "github.com/open-component-model/ocm/pkg/blobaccess/blobaccess"
- "github.com/open-component-model/ocm/pkg/blobaccess/file"
- "github.com/open-component-model/ocm/pkg/iotools"
- "github.com/open-component-model/ocm/pkg/utils"
-)
-
-const (
- // Deprecated: use blobaccess.BLOB_UNKNOWN_SIZE.
- BLOB_UNKNOWN_SIZE = blobaccess.BLOB_UNKNOWN_SIZE
- // Deprecated: use blobaccess.BLOB_UNKNOWN_DIGEST.
- BLOB_UNKNOWN_DIGEST = blobaccess.BLOB_UNKNOWN_DIGEST
-)
-
-const (
- // Deprecated: use blobaccess.KIND_BLOB.
- KIND_BLOB = blobaccess.KIND_BLOB
- // Deprecated: use blobaccess.KIND_MEDIATYPE.
- KIND_MEDIATYPE = blobaccess.KIND_MEDIATYPE
-)
-
-// Deprecated: use blobaccess.ErrBlobNotFound.
-func ErrBlobNotFound(digest digest.Digest) error {
- return errors.ErrNotFound(blobaccess.KIND_BLOB, digest.String())
-}
-
-// Deprecated: use blobaccess.IsErrBlobNotFound.
-func IsErrBlobNotFound(err error) bool {
- return errors.IsErrNotFoundKind(err, blobaccess.KIND_BLOB)
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-// DataSource describes some data plus its origin.
-// Deprecated: use blobaccess.DataSource.
-type DataSource = blobaccess.DataSource
-
-////////////////////////////////////////////////////////////////////////////////
-
-// DataAccess describes the access to sequence of bytes.
-// Deprecated: use blobaccess.DataAccess.
-type DataAccess = blobaccess.DataAccess
-
-// BlobAccess describes the access to a blob.
-// Deprecated: use blobaccess.BlobAccess.
-type BlobAccess = blobaccess.BlobAccess
-
-////////////////////////////////////////////////////////////////////////////////
-
-// Deprecated: use blobaccess.DataAccessForReaderFunction.
-func DataAccessForReaderFunction(reader func() (io.ReadCloser, error), origin string) blobaccess.DataAccess {
- return blobaccess.DataAccessForReaderFunction(reader, origin)
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-// Deprecated: use blobaccess.DataAccessForFile.
-func DataAccessForFile(fs vfs.FileSystem, path string) blobaccess.DataAccess {
- return file.DataAccess(fs, path)
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-// Deprecated: use blobaccess.DataAccessForBytes.
-func DataAccessForBytes(data []byte, origin ...string) blobaccess.DataSource {
- return blobaccess.DataAccessForData(data, origin...)
-}
-
-// Deprecated: use blobaccess.DataAccessForString.
-func DataAccessForString(data string, origin ...string) blobaccess.DataSource {
- return blobaccess.DataAccessForData([]byte(data), origin...)
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-// BlobWithMimeType changes the mime type for a blob access
-// by wrapping the given blob access. It does NOT provide
-// a new view for the given blob access, so closing the resulting
-// blob access will directly close the backing blob access.
-// Deprecated: use blobaccess.WithMimeType.
-func BlobWithMimeType(mimeType string, blob blobaccess.BlobAccess) blobaccess.BlobAccess {
- return blobaccess.WithMimeType(mimeType, blob)
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-// AnnotatedBlobAccess provides access to the original underlying data source.
-// Deprecated: use blobaccess.AnnotatedBlobAccess.
-type AnnotatedBlobAccess[T blobaccess.DataAccess] interface {
- blobaccess.BlobAccess
- Source() T
-}
-
-// BlobAccessForDataAccess wraps the general access object into a blob access.
-// It closes the wrapped access, if closed.
-// Deprecated: use blobaccess.ForDataAccess.
-func BlobAccessForDataAccess[T blobaccess.DataAccess](digest digest.Digest, size int64, mimeType string, access T) blobaccess.AnnotatedBlobAccess[T] {
- return blobaccess.ForDataAccess[T](digest, size, mimeType, access)
-}
-
-// Deprecated: use blobaccess.ForString.
-func BlobAccessForString(mimeType string, data string) blobaccess.BlobAccess {
- return blobaccess.ForData(mimeType, []byte(data))
-}
-
-// Deprecated: use blobaccess.ForData.
-func BlobAccessForData(mimeType string, data []byte) blobaccess.BlobAccess {
- return blobaccess.ForData(mimeType, data)
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-// Deprecated: use blobaccess.ForFile.
-func BlobAccessForFile(mimeType string, path string, fss ...vfs.FileSystem) blobaccess.BlobAccess {
- return file.BlobAccess(mimeType, path, fss...)
-}
-
-// Deprecated: use blobaccess.ForFileWithCloser.
-func BlobAccessForFileWithCloser(closer io.Closer, mimeType string, path string, fss ...vfs.FileSystem) blobaccess.BlobAccess {
- return file.BlobAccessWithCloser(closer, mimeType, path, fss...)
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-// Deprecated: use blobaccess.ForTemporaryFile.
-func BlobAccessForTemporaryFile(mime string, temp vfs.File, fss ...vfs.FileSystem) blobaccess.BlobAccess {
- return file.BlobAccessForTemporaryFile(mime, temp, file.WithFileSystem(fss...))
-}
-
-// Deprecated: use blobaccess.ForTemporaryFilePath.
-func BlobAccessForTemporaryFilePath(mime string, temp string, fss ...vfs.FileSystem) blobaccess.BlobAccess {
- return file.BlobAccessForTemporaryFilePath(mime, temp, file.WithFileSystem(fss...))
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-// Deprecated: use blobaccess.NewTempFile.
-func NewTempFile(fs vfs.FileSystem, dir string, pattern string) (*file.TempFile, error) {
- return file.NewTempFile(dir, pattern, fs)
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-// Deprecated: use iotools.DigestReader.
-type DigestReader = iotools.DigestReader
-
-// Deprecated: use iotools.NewDefaultDigestReader.
-func NewDefaultDigestReader(r io.Reader) *iotools.DigestReader {
- return iotools.NewDigestReaderWith(digest.Canonical, r)
-}
-
-// Deprecated: use iotools.NewDigestReaderWith.
-func NewDigestReaderWith(algorithm digest.Algorithm, r io.Reader) *iotools.DigestReader {
- return iotools.NewDigestReaderWith(algorithm, r)
-}
-
-// Deprecated: use iotools.NewDigestReaderWithHash.
-func NewDigestReaderWithHash(hash crypto.Hash, r io.Reader) *iotools.DigestReader {
- return iotools.NewDigestReaderWithHash(hash, r)
-}
-
-// Deprecated: use iotools.VerifyingReader.
-func VerifyingReader(r io.ReadCloser, digest digest.Digest) io.ReadCloser {
- return iotools.VerifyingReader(r, digest)
-}
-
-// Deprecated: use iotools.VerifyingReaderWithHash.
-func VerifyingReaderWithHash(r io.ReadCloser, hash crypto.Hash, digest string) io.ReadCloser {
- return iotools.VerifyingReaderWithHash(r, hash, digest)
-}
-
-// Deprecated: use blobaccess.Digest.
-func Digest(access blobaccess.DataAccess) (digest.Digest, error) {
- return blobaccess.Digest(access)
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-// Deprecated: use iotools.DigestWriter.
-type DigestWriter = iotools.DigestWriter
-
-// Deprecated: use iotools.NewDefaultDigestWriter.
-func NewDefaultDigestWriter(w io.WriteCloser) *iotools.DigestWriter {
- return iotools.NewDefaultDigestWriter(w)
-}
-
-// Deprecated: use iotools.NewDigestWriterWith.
-func NewDigestWriterWith(algorithm digest.Algorithm, w io.WriteCloser) *iotools.DigestWriter {
- return iotools.NewDigestWriterWith(algorithm, w)
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-// Deprecated: use blobaccess.BlobData.
-func BlobData(blob blobaccess.DataGetter, err error) ([]byte, error) {
- if err != nil {
- return nil, err
- }
- return blob.Get()
-}
-
-// Deprecated: use blobaccess.BlobReader.
-func BlobReader(blob blobaccess.DataReader, err error) (io.ReadCloser, error) {
- if err != nil {
- return nil, err
- }
- return blob.Reader()
-}
-
-// Deprecated: use utils.FileSystem.
-func FileSystem(fss ...vfs.FileSystem) vfs.FileSystem {
- return utils.FileSystem(fss...)
-}
-
-// Deprecated: use utils.DefaultedFileSystem.
-func DefaultedFileSystem(def vfs.FileSystem, fss ...vfs.FileSystem) vfs.FileSystem {
- return utils.DefaultedFileSystem(def, fss...)
-}
-
-// Deprecated: use iotools.AddReaderCloser.
-func AddCloser(reader io.ReadCloser, closer io.Closer, msg ...string) io.ReadCloser {
- return iotools.AddReaderCloser(reader, closer, sliceutils.AsAny(msg)...)
-}
diff --git a/pkg/common/accessio/downloader/http/downloader.go b/pkg/common/accessio/downloader/http/downloader.go
deleted file mode 100644
index 484c0989d..000000000
--- a/pkg/common/accessio/downloader/http/downloader.go
+++ /dev/null
@@ -1,45 +0,0 @@
-package http
-
-import (
- "bytes"
- "context"
- "fmt"
- "io"
- "net/http"
-
- "github.com/open-component-model/ocm/pkg/common/accessio/downloader"
-)
-
-// Downloader simply uses the default HTTP client to download the contents of a URL.
-type Downloader struct {
- link string
-}
-
-func NewDownloader(link string) downloader.Downloader {
- return &Downloader{
- link: link,
- }
-}
-
-func (h *Downloader) Download(w io.WriterAt) error {
- req, err := http.NewRequestWithContext(context.Background(), http.MethodGet, h.link, nil)
- if err != nil {
- return err
- }
-
- resp, err := http.DefaultClient.Do(req)
- if err != nil {
- return fmt.Errorf("failed to get link: %w", err)
- }
- defer resp.Body.Close()
-
- var blob []byte
- buf := bytes.NewBuffer(blob)
- if _, err := io.Copy(buf, resp.Body); err != nil {
- return fmt.Errorf("failed to copy response body: %w", err)
- }
- if _, err := w.WriteAt(buf.Bytes(), 0); err != nil {
- return fmt.Errorf("failed to WriteAt to the writer: %w", err)
- }
- return nil
-}
diff --git a/pkg/common/accessio/format.go b/pkg/common/accessio/format.go
deleted file mode 100644
index 9ef0d43f3..000000000
--- a/pkg/common/accessio/format.go
+++ /dev/null
@@ -1,176 +0,0 @@
-package accessio
-
-import (
- "archive/tar"
- "compress/gzip"
- "io"
- "sort"
- "strings"
-
- "github.com/mandelsoft/goutils/errors"
- "github.com/mandelsoft/vfs/pkg/vfs"
-
- "github.com/open-component-model/ocm/pkg/common/compression"
- "github.com/open-component-model/ocm/pkg/utils/tarutils"
-)
-
-const KIND_FILEFORMAT = "file format"
-
-type FileFormat string
-
-func (f FileFormat) String() string {
- return string(f)
-}
-
-func (f FileFormat) Suffix() string {
- return suffixes[f]
-}
-
-func (o FileFormat) ApplyOption(options Options) error {
- if o != "" {
- options.SetFileFormat(o)
- }
- return nil
-}
-
-const (
- FormatTar FileFormat = "tar"
- FormatTGZ FileFormat = "tgz"
- FormatDirectory FileFormat = "directory"
- FormatNone FileFormat = ""
-)
-
-var suffixes = map[FileFormat]string{
- FormatTar: "." + string(FormatTar),
- FormatTGZ: "." + string(FormatTGZ),
-}
-
-func ErrInvalidFileFormat(fmt string) error {
- return errors.ErrInvalid(KIND_FILEFORMAT, fmt)
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-func GetFormats() []string {
- return []string{string(FormatDirectory), string(FormatTar), string(FormatTGZ)}
-}
-
-func GetFormatsFor[T any](fileFormats map[FileFormat]T) []string {
- var def FileFormat
-
- list := []string{}
- for k := range fileFormats {
- // as favorite default, directory should be the first entry in the list
- if k != FormatDirectory {
- list = append(list, string(k))
- } else {
- def = k
- }
- }
- sort.Strings(list)
- if def != "" {
- return append(append(list[:0:0], string(def)), list...)
- }
- return list
-}
-
-// FileFormatForTypeSpec returns the format hint provided
-// by a type specification.The format hint is an optional
-// suffix separated by a +.
-func FileFormatForTypeSpec(t string) FileFormat {
- i := strings.Index(t, "+")
- if i < 0 {
- return ""
- }
- return FileFormat(t[i+1:])
-}
-
-// TypeForTypeSpec returns the pure type info provided
-// by a type specification.The format hint is an optional
-// suffix separated by a +.
-func TypeForTypeSpec(t string) string {
- i := strings.Index(t, "+")
- if i < 0 {
- return t
- }
- return t[:i]
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-func CopyFileSystem(format FileFormat, srcfs vfs.FileSystem, src string, dstfs vfs.FileSystem, dst string, perm vfs.FileMode) error {
- compr := compression.None
- switch format {
- case FormatDirectory:
- return vfs.CopyDir(srcfs, src, dstfs, dst)
- case FormatTGZ:
- compr = compression.Gzip
- fallthrough
- case FormatTar:
- file, err := dstfs.OpenFile(dst, vfs.O_CREATE|vfs.O_TRUNC|vfs.O_WRONLY, perm)
- if err != nil {
- return err
- }
- defer file.Close()
- w, err := compr.Compressor(file, nil, nil)
- if err != nil {
- return err
- }
- return tarutils.PackFsIntoTar(srcfs, src, w, tarutils.TarFileSystemOptions{})
- default:
- return errors.ErrUnknown(KIND_FILEFORMAT, format.String())
- }
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-func DetectFormat(path string, fs vfs.FileSystem) (*FileFormat, error) {
- if fs == nil {
- fs = _osfs
- }
-
- fi, err := fs.Stat(path)
- if err != nil {
- return nil, err
- }
-
- format := FormatDirectory
- if !fi.IsDir() {
- file, err := fs.Open(path)
- if err != nil {
- return nil, err
- }
- defer file.Close()
- return DetectFormatForFile(file)
- }
- return &format, nil
-}
-
-func DetectFormatForFile(file vfs.File) (*FileFormat, error) {
- fi, err := file.Stat()
- if err != nil {
- return nil, err
- }
- format := FormatDirectory
- if !fi.IsDir() {
- var r io.Reader
-
- defer file.Seek(0, io.SeekStart)
- zip, err := gzip.NewReader(file)
- if err == nil {
- format = FormatTGZ
- defer zip.Close()
- r = zip
- } else {
- file.Seek(0, io.SeekStart)
- format = FormatTar
- r = file
- }
- t := tar.NewReader(r)
- _, err = t.Next()
- if err != nil {
- return nil, err
- }
- }
- return &format, nil
-}
diff --git a/pkg/common/accessio/utils.go b/pkg/common/accessio/utils.go
deleted file mode 100644
index bc9a1c62a..000000000
--- a/pkg/common/accessio/utils.go
+++ /dev/null
@@ -1,84 +0,0 @@
-package accessio
-
-import (
- "fmt"
- "io"
-
- "github.com/mandelsoft/goutils/errors"
-
- "github.com/open-component-model/ocm/pkg/common/compression"
-)
-
-type closableReader struct {
- reader io.Reader
-}
-
-func ReadCloser(r io.Reader) io.ReadCloser { return closableReader{r} }
-
-func (r closableReader) Read(p []byte) (n int, err error) {
- return r.reader.Read(p)
-}
-
-func (r closableReader) Close() error {
- return nil
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-// NopWriteCloser returns a ReadCloser with a no-op Close method wrapping
-// the provided Reader r.
-func NopWriteCloser(w io.Writer) io.WriteCloser {
- return compression.NopWriteCloser(w)
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-type once struct {
- callbacks []CloserCallback
- closer io.Closer
-}
-
-type CloserCallback func()
-
-func OnceCloser(c io.Closer, callbacks ...CloserCallback) io.Closer {
- return &once{callbacks, c}
-}
-
-func (c *once) Close() error {
- if c.closer == nil {
- return nil
- }
-
- t := c.closer
- c.closer = nil
- err := t.Close()
-
- for _, cb := range c.callbacks {
- cb()
- }
-
- if err != nil {
- return fmt.Errorf("unable to close: %w", err)
- }
-
- return nil
-}
-
-func Close(closer ...io.Closer) error {
- if len(closer) == 0 {
- return nil
- }
- list := errors.ErrList()
- for _, c := range closer {
- if c != nil {
- list.Add(c.Close())
- }
- }
- return list.Result()
-}
-
-type Closer func() error
-
-func (c Closer) Close() error {
- return c()
-}
diff --git a/pkg/common/accessobj/check.go b/pkg/common/accessobj/check.go
deleted file mode 100644
index 0bd554aa2..000000000
--- a/pkg/common/accessobj/check.go
+++ /dev/null
@@ -1,81 +0,0 @@
-package accessobj
-
-import (
- "archive/tar"
- "io"
-
- "github.com/mandelsoft/filepath/pkg/filepath"
- "github.com/mandelsoft/goutils/errors"
- "github.com/mandelsoft/vfs/pkg/vfs"
-
- "github.com/open-component-model/ocm/pkg/common/compression"
-)
-
-func mapErr(forced bool, err error) (bool, bool, error) {
- if !forced {
- return false, false, nil
- }
- return false, true, err
-}
-
-// CheckFile returns create, acceptable, error.
-func CheckFile(kind string, createHint string, forcedType bool, path string, fs vfs.FileSystem, descriptorname string) (bool, bool, error) {
- info, err := fs.Stat(path)
- if err != nil {
- if createHint == kind {
- if vfs.IsErrNotExist(err) {
- return true, true, nil
- }
- }
- return mapErr(forcedType, err)
- }
- accepted := false
- if !info.IsDir() {
- file, err := fs.Open(path)
- if err != nil {
- return mapErr(forcedType, err)
- }
- defer file.Close()
- forcedType = false
- r, _, err := compression.AutoDecompress(file)
- if err != nil {
- return mapErr(forcedType, err)
- }
- tr := tar.NewReader(r)
- for {
- header, err := tr.Next()
- if err != nil {
- if errors.Is(err, io.EOF) {
- break
- }
- return mapErr(forcedType, err)
- }
-
- switch header.Typeflag {
- case tar.TypeReg:
- if header.Name == descriptorname {
- accepted = true
- break
- }
- }
- }
- } else {
- if forcedType {
- entries, err := vfs.ReadDir(fs, path)
- if err == nil && len(entries) > 0 {
- forcedType = false
- }
- }
- if ok, err := vfs.FileExists(fs, filepath.Join(path, descriptorname)); !ok || err != nil {
- if err != nil {
- return mapErr(forcedType, err)
- }
- } else {
- accepted = ok
- }
- }
- if !accepted {
- return mapErr(forcedType, errors.Newf("%s: no %s", path, kind))
- }
- return false, true, nil
-}
diff --git a/pkg/common/accessobj/filesystemaccess.go b/pkg/common/accessobj/filesystemaccess.go
deleted file mode 100644
index bdf667c7e..000000000
--- a/pkg/common/accessobj/filesystemaccess.go
+++ /dev/null
@@ -1,155 +0,0 @@
-package accessobj
-
-import (
- "fmt"
- "io"
- "os"
- "sync"
-
- "github.com/mandelsoft/vfs/pkg/vfs"
- "github.com/opencontainers/go-digest"
-
- "github.com/open-component-model/ocm/pkg/blobaccess/blobaccess"
- "github.com/open-component-model/ocm/pkg/blobaccess/file"
- "github.com/open-component-model/ocm/pkg/common"
- "github.com/open-component-model/ocm/pkg/common/accessio"
- "github.com/open-component-model/ocm/pkg/mime"
- "github.com/open-component-model/ocm/pkg/utils/tarutils"
-)
-
-type FileSystemBlobAccess struct {
- sync.RWMutex
- base *AccessObject
-}
-
-func NewFileSystemBlobAccess(access *AccessObject) *FileSystemBlobAccess {
- return &FileSystemBlobAccess{
- base: access,
- }
-}
-
-func (a *FileSystemBlobAccess) Access() *AccessObject {
- return a.base
-}
-
-func (a *FileSystemBlobAccess) SetReadOnly() {
- a.base.SetReadOnly()
-}
-
-func (a *FileSystemBlobAccess) IsReadOnly() bool {
- return a.base.IsReadOnly()
-}
-
-func (a *FileSystemBlobAccess) IsClosed() bool {
- return a.base.IsClosed()
-}
-
-func (a *FileSystemBlobAccess) Write(path string, mode vfs.FileMode, opts ...accessio.Option) error {
- return a.base.Write(path, mode, opts...)
-}
-
-func (a *FileSystemBlobAccess) Update() error {
- return a.base.Update()
-}
-
-func (a *FileSystemBlobAccess) Close() error {
- return a.base.Close()
-}
-
-func (a *FileSystemBlobAccess) GetState() State {
- return a.base.GetState()
-}
-
-// DigestPath returns the path to the blob for a given name.
-func (a *FileSystemBlobAccess) DigestPath(digest digest.Digest) string {
- return a.BlobPath(common.DigestToFileName(digest))
-}
-
-// BlobPath returns the path to the blob for a given name.
-func (a *FileSystemBlobAccess) BlobPath(name string) string {
- return a.base.GetInfo().SubPath(name)
-}
-
-func (a *FileSystemBlobAccess) GetBlobData(digest digest.Digest) (int64, blobaccess.DataAccess, error) {
- if a.IsClosed() {
- return blobaccess.BLOB_UNKNOWN_SIZE, nil, accessio.ErrClosed
- }
- path := a.DigestPath(digest)
- if ok, err := vfs.FileExists(a.base.GetFileSystem(), path); ok {
- return blobaccess.BLOB_UNKNOWN_SIZE, file.DataAccess(a.base.GetFileSystem(), path), nil
- } else {
- if err != nil {
- return blobaccess.BLOB_UNKNOWN_SIZE, nil, err
- }
- return blobaccess.BLOB_UNKNOWN_SIZE, nil, blobaccess.ErrBlobNotFound(digest)
- }
-}
-
-func (a *FileSystemBlobAccess) GetBlobDataByName(name string) (blobaccess.DataAccess, error) {
- if a.IsClosed() {
- return nil, accessio.ErrClosed
- }
-
- path := a.BlobPath(name)
- if ok, err := vfs.IsDir(a.base.GetFileSystem(), path); ok {
- tempfile, err := file.NewTempFile(os.TempDir(), "COMPARCH")
- if err != nil {
- return nil, err
- }
- err = tarutils.PackFsIntoTar(a.base.GetFileSystem(), path, tempfile.Writer(), tarutils.TarFileSystemOptions{})
- if err != nil {
- return nil, err
- }
- return tempfile.AsBlob(mime.MIME_TAR), nil
- } else {
- if err != nil {
- return nil, err
- }
-
- if ok, err := vfs.FileExists(a.base.GetFileSystem(), path); ok {
- return file.DataAccess(a.base.GetFileSystem(), path), nil
- } else {
- if err != nil {
- return nil, err
- }
- return nil, blobaccess.ErrBlobNotFound(digest.Digest(name))
- }
- }
-}
-
-func (a *FileSystemBlobAccess) AddBlob(blob blobaccess.BlobAccess) error {
- if a.base.IsClosed() {
- return accessio.ErrClosed
- }
-
- if a.base.IsReadOnly() {
- return accessio.ErrReadOnly
- }
-
- path := a.DigestPath(blob.Digest())
-
- if ok, err := vfs.FileExists(a.base.GetFileSystem(), path); ok {
- return nil
- } else if err != nil {
- return fmt.Errorf("failed to check if '%s' file exists: %w", path, err)
- }
-
- r, err := blob.Reader()
- if err != nil {
- return fmt.Errorf("unable to read blob: %w", err)
- }
-
- defer r.Close()
- w, err := a.base.GetFileSystem().OpenFile(path, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, a.base.GetMode()&0o666)
- if err != nil {
- return fmt.Errorf("unable to open file '%s': %w", path, err)
- }
-
- _, err = io.Copy(w, r)
- if err != nil {
- w.Close()
-
- return fmt.Errorf("unable to copy blob content: %w", err)
- }
- return w.Close()
-}
diff --git a/pkg/common/accessobj/format-tgz.go b/pkg/common/accessobj/format-tgz.go
deleted file mode 100644
index c5c348ec7..000000000
--- a/pkg/common/accessobj/format-tgz.go
+++ /dev/null
@@ -1,12 +0,0 @@
-package accessobj
-
-import (
- "github.com/open-component-model/ocm/pkg/common/accessio"
- "github.com/open-component-model/ocm/pkg/common/compression"
-)
-
-var FormatTGZ = NewTarHandlerWithCompression(accessio.FormatTGZ, compression.Gzip)
-
-func init() {
- RegisterFormat(FormatTGZ)
-}
diff --git a/pkg/common/accessobj/format.go b/pkg/common/accessobj/format.go
deleted file mode 100644
index bb9055c8a..000000000
--- a/pkg/common/accessobj/format.go
+++ /dev/null
@@ -1,174 +0,0 @@
-package accessobj
-
-import (
- "fmt"
- "io"
- "sync"
- "time"
-
- "github.com/mandelsoft/goutils/errors"
- "github.com/mandelsoft/vfs/pkg/vfs"
-
- "github.com/open-component-model/ocm/pkg/common/accessio"
-)
-
-const KIND_FILEFORMAT = accessio.KIND_FILEFORMAT
-
-const (
- DirMode = 0o755
- FileMode = 0o644
-)
-
-var ModTime = time.Date(2022, 1, 1, 0, 0, 0, 0, time.UTC)
-
-type FileFormat = accessio.FileFormat
-
-type FormatHandler interface {
- accessio.Option
-
- Format() accessio.FileFormat
-
- Open(info AccessObjectInfo, acc AccessMode, path string, opts accessio.Options) (*AccessObject, error)
- Create(info AccessObjectInfo, path string, opts accessio.Options, mode vfs.FileMode) (*AccessObject, error)
- Write(obj *AccessObject, path string, opts accessio.Options, mode vfs.FileMode) error
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-var (
- fileFormats = map[FileFormat]FormatHandler{}
- lock sync.RWMutex
-)
-
-func RegisterFormat(f FormatHandler) {
- lock.Lock()
- defer lock.Unlock()
- fileFormats[f.Format()] = f
-}
-
-func GetFormat(name FileFormat) FormatHandler {
- lock.RLock()
- defer lock.RUnlock()
- return fileFormats[name]
-}
-
-func GetFormats() map[accessio.FileFormat]FormatHandler {
- lock.RLock()
- defer lock.RUnlock()
-
- m := map[accessio.FileFormat]FormatHandler{}
- for k, v := range fileFormats {
- m[k] = v
- }
- return m
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-type Closer interface {
- Close(*AccessObject) error
-}
-
-type CloserFunction func(*AccessObject) error
-
-func (f CloserFunction) Close(obj *AccessObject) error {
- return f(obj)
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-type Setup interface {
- Setup(vfs.FileSystem) error
-}
-
-type SetupFunction func(vfs.FileSystem) error
-
-func (f SetupFunction) Setup(fs vfs.FileSystem) error {
- return f(fs)
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-type StandardReaderHandler interface {
- Write(obj *AccessObject, path string, opts accessio.Options, mode vfs.FileMode) error
- NewFromReader(info AccessObjectInfo, acc AccessMode, in io.Reader, opts accessio.Options, closer Closer) (*AccessObject, error)
-}
-
-func DefaultOpenOptsFileHandling(kind string, info AccessObjectInfo, acc AccessMode, path string, opts accessio.Options, handler StandardReaderHandler) (*AccessObject, error) {
- if err := opts.ValidForPath(path); err != nil {
- return nil, err
- }
- var file vfs.File
- var err error
- var closer Closer
-
- reader := opts.GetReader()
- switch {
- case reader != nil:
- case opts.GetFile() == nil:
- // we expect that the path point to a tar
- file, err = opts.GetPathFileSystem().Open(path)
- if err != nil {
- return nil, fmt.Errorf("unable to open %s from %s: %w", kind, path, err)
- }
- defer file.Close()
- default:
- file = opts.GetFile()
- }
- if file != nil {
- reader = file
- fi, err := file.Stat()
- if err != nil {
- return nil, err
- }
- closer = CloserFunction(func(obj *AccessObject) error { return handler.Write(obj, path, opts, fi.Mode()) })
- }
- return handler.NewFromReader(info, acc, reader, opts, closer)
-}
-
-func DefaultCreateOptsFileHandling(kind string, info AccessObjectInfo, path string, opts accessio.Options, mode vfs.FileMode, handler StandardReaderHandler) (*AccessObject, error) {
- if err := opts.ValidForPath(path); err != nil {
- return nil, err
- }
- if opts.GetReader() != nil {
- return nil, errors.ErrNotSupported("reader option not supported")
- }
- if opts.GetFile() == nil {
- ok, err := vfs.Exists(opts.GetPathFileSystem(), path)
- if err != nil {
- return nil, err
- }
- if ok {
- return nil, vfs.ErrExist
- }
- }
-
- return NewAccessObject(info, ACC_CREATE, opts.GetRepresentation(), nil, CloserFunction(func(obj *AccessObject) error { return handler.Write(obj, path, opts, mode) }), DirMode)
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-// MapType maps a given type name to an effective type and a format.
-func MapType(hint string, efftyp string, deffmt accessio.FileFormat, useFormats bool, alt ...string) (string, accessio.FileFormat) {
- typ := accessio.TypeForTypeSpec(hint)
- f := accessio.FileFormatForTypeSpec(hint)
- if f != "" {
- deffmt = f
- }
- if typ == efftyp {
- return efftyp, deffmt
- }
- for _, t := range alt {
- if typ == t {
- return efftyp, deffmt
- }
- }
- if useFormats {
- for _, f := range accessio.GetFormats() {
- if hint == f {
- return efftyp, accessio.FileFormat(f)
- }
- }
- }
- return "", ""
-}
diff --git a/pkg/common/accessobj/utils.go b/pkg/common/accessobj/utils.go
deleted file mode 100644
index 308c46c0c..000000000
--- a/pkg/common/accessobj/utils.go
+++ /dev/null
@@ -1,58 +0,0 @@
-package accessobj
-
-import (
- "github.com/mandelsoft/goutils/errors"
- "github.com/mandelsoft/vfs/pkg/osfs"
- "github.com/mandelsoft/vfs/pkg/vfs"
-
- "github.com/open-component-model/ocm/pkg/common/accessio"
-)
-
-type FilesystemSetup func(fs vfs.FileSystem, mode vfs.FileMode) error
-
-// InternalRepresentationFilesystem defaults a filesystem to temp filesystem and adapts.
-func InternalRepresentationFilesystem(acc AccessMode, fs vfs.FileSystem, setup FilesystemSetup, mode vfs.FileMode) (bool, vfs.FileSystem, error) {
- var err error
-
- tmp := false
- if fs == nil {
- fs, err = osfs.NewTempFileSystem()
- if err != nil {
- return false, nil, err
- }
- tmp = true
- }
- if !acc.IsReadonly() && setup != nil {
- err = setup(fs, mode)
- if err != nil {
- return false, nil, err
- }
- }
- return tmp, fs, err
-}
-
-func HandleAccessMode(acc AccessMode, path string, opts accessio.Options, olist ...accessio.Option) (accessio.Options, bool, error) {
- ok := true
- o, err := accessio.AccessOptions(opts, olist...)
- if err != nil {
- return nil, false, err
- }
- if o.GetFile() == nil && o.GetReader() == nil {
- ok, err = vfs.Exists(o.GetPathFileSystem(), path)
- if err != nil {
- return o, false, err
- }
- }
- if !ok {
- if !acc.IsCreate() {
- return o, false, errors.ErrNotFoundWrap(vfs.ErrNotExist, "file", path)
- }
- if o.GetFileFormat() == nil {
- o.SetFileFormat(accessio.FormatDirectory)
- }
- return o, true, nil
- }
-
- err = o.DefaultForPath(path)
- return o, false, err
-}
diff --git a/pkg/common/types.go b/pkg/common/types.go
deleted file mode 100644
index 170a65f7e..000000000
--- a/pkg/common/types.go
+++ /dev/null
@@ -1,86 +0,0 @@
-package common
-
-import (
- "encoding/json"
- "fmt"
- "strings"
-
- "github.com/mandelsoft/goutils/errors"
-
- "github.com/open-component-model/ocm/pkg/semverutils"
-)
-
-// VersionedElement describes an element that has a name and a version.
-type VersionedElement interface {
- // GetName gets the name of the element
- GetName() string
- // GetVersion gets the version of the element
- GetVersion() string
-}
-
-type NameVersion struct {
- name string
- version string
-}
-
-var (
- _ json.Marshaler = (*NameVersion)(nil)
- _ VersionedElement = (*NameVersion)(nil)
-)
-
-func NewNameVersion(name, version string) NameVersion {
- return NameVersion{name, version}
-}
-
-func VersionedElementKey(v VersionedElement) NameVersion {
- if k, ok := v.(NameVersion); ok {
- return k
- }
- return NameVersion{v.GetName(), v.GetVersion()}
-}
-
-func (n NameVersion) GetName() string {
- return n.name
-}
-
-func (n NameVersion) GetVersion() string {
- return n.version
-}
-
-func (n NameVersion) MarshalJSON() ([]byte, error) {
- return json.Marshal(fmt.Sprintf("%s:%s", n.GetName(), n.GetVersion()))
-}
-
-func (n NameVersion) Compare(o NameVersion) int {
- c := strings.Compare(n.name, o.name)
- if c == 0 {
- return semverutils.Compare(n.version, o.version)
- }
- return c
-}
-
-func (n NameVersion) String() string {
- if n.version == "" {
- return n.name
- }
- if n.name == "" {
- return n.version
- }
- return n.name + ":" + n.version
-}
-
-func ParseNameVersion(s string) (NameVersion, error) {
- a := strings.Split(s, ":")
- if len(a) != 2 {
- return NameVersion{}, errors.ErrInvalid("name:version", s)
- }
- return NewNameVersion(strings.TrimSpace(a[0]), strings.TrimSpace(a[1])), nil
-}
-
-func CompareNameVersion(a, b NameVersion) int {
- d := strings.Compare(a.name, b.name)
- if d == 0 {
- d = strings.Compare(a.version, b.version)
- }
- return d
-}
diff --git a/pkg/common/walk.go b/pkg/common/walk.go
deleted file mode 100644
index 9707c88e5..000000000
--- a/pkg/common/walk.go
+++ /dev/null
@@ -1,52 +0,0 @@
-package common
-
-import (
- "github.com/mandelsoft/logging"
-
- ocmlog "github.com/open-component-model/ocm/pkg/logging"
- "github.com/open-component-model/ocm/pkg/utils"
-)
-
-type NameVersionInfo[T any] map[NameVersion]T
-
-func (s NameVersionInfo[T]) Add(nv NameVersion, data ...T) bool {
- if _, ok := s[nv]; !ok {
- s[nv] = utils.Optional(data...)
- return true
- }
- return false
-}
-
-func (s NameVersionInfo[T]) Contains(nv NameVersion) bool {
- _, ok := s[nv]
- return ok
-}
-
-type WalkingState[T any, C any] struct {
- LogCtx logging.Context
- Logger logging.Logger
- Context C
- Closure NameVersionInfo[T]
- History History
-}
-
-func NewWalkingState[T any, C any](ctx C, lctx ...logging.Context) WalkingState[T, C] {
- logctx := utils.OptionalDefaulted[logging.Context](ocmlog.Context(), lctx...)
- return WalkingState[T, C]{Context: ctx, Closure: NameVersionInfo[T]{}, LogCtx: logctx, Logger: logctx.Logger()}
-}
-
-func (s *WalkingState[T, C]) Add(kind string, nv NameVersion) (bool, error) {
- if err := s.History.Add(kind, nv); err != nil {
- return false, err
- }
- return s.Closure.Add(nv), nil
-}
-
-func (s *WalkingState[T, C]) Contains(nv NameVersion) bool {
- _, ok := s.Closure[nv]
- return ok
-}
-
-func (s *WalkingState[T, C]) Get(nv NameVersion) T {
- return s.Closure[nv]
-}
diff --git a/pkg/contexts/clictx/builder.go b/pkg/contexts/clictx/builder.go
deleted file mode 100644
index c1f5cc7a5..000000000
--- a/pkg/contexts/clictx/builder.go
+++ /dev/null
@@ -1,44 +0,0 @@
-package clictx
-
-import (
- "context"
- "io"
-
- "github.com/mandelsoft/vfs/pkg/vfs"
-
- "github.com/open-component-model/ocm/pkg/contexts/clictx/internal"
- "github.com/open-component-model/ocm/pkg/contexts/datacontext"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
-)
-
-func WithContext(ctx context.Context) internal.Builder {
- return internal.Builder{}.WithContext(ctx)
-}
-
-func WithSharedAttributes(ctx datacontext.AttributesContext) internal.Builder {
- return internal.Builder{}.WithSharedAttributes(ctx)
-}
-
-func WithOCM(ctx ocm.Context) internal.Builder {
- return internal.Builder{}.WithOCM(ctx)
-}
-
-func WithFileSystem(fs vfs.FileSystem) internal.Builder {
- return internal.Builder{}.WithFileSystem(fs)
-}
-
-func WithOutput(w io.Writer) internal.Builder {
- return internal.Builder{}.WithOutput(w)
-}
-
-func WithErrorOutput(w io.Writer) internal.Builder {
- return internal.Builder{}.WithErrorOutput(w)
-}
-
-func WithInput(r io.Reader) internal.Builder {
- return internal.Builder{}.WithInput(r)
-}
-
-func New(mode ...datacontext.BuilderMode) internal.Context {
- return internal.Builder{}.New(mode...)
-}
diff --git a/pkg/contexts/clictx/config/config_test.go b/pkg/contexts/clictx/config/config_test.go
deleted file mode 100644
index b005a7059..000000000
--- a/pkg/contexts/clictx/config/config_test.go
+++ /dev/null
@@ -1,61 +0,0 @@
-package config_test
-
-import (
- "encoding/json"
-
- . "github.com/onsi/ginkgo/v2"
- . "github.com/onsi/gomega"
-
- "github.com/open-component-model/ocm/pkg/contexts/clictx"
- "github.com/open-component-model/ocm/pkg/contexts/clictx/config"
- "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/ocireg"
- ocmocireg "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ocireg"
-)
-
-var DefaultContext = clictx.New()
-
-func normalize(i interface{}) ([]byte, error) {
- data, err := json.Marshal(i)
- if err != nil {
- return nil, err
- }
- var generic map[string]interface{}
- err = json.Unmarshal(data, &generic)
- if err != nil {
- return nil, err
- }
- return json.Marshal(generic)
-}
-
-var _ = Describe("command config", func() {
- ocispec := ocireg.NewRepositorySpec("ghcr.io")
-
- ocidata, err := normalize(ocispec)
- Expect(err).To(Succeed())
-
- ocmspec := ocmocireg.NewRepositorySpec("gcr.io", nil)
- ocmdata, err := normalize(ocmspec)
- Expect(err).To(Succeed())
-
- specdata := "{\"ociRepositories\":{\"oci\":" + string(ocidata) + "},\"ocmRepositories\":{\"ocm\":" + string(ocmdata) + "},\"type\":\"" + config.OCMCmdConfigType + "\"}"
-
- Context("serialize", func() {
- It("serializes config", func() {
- cfg := config.New()
- err := cfg.AddOCIRepository("oci", ocispec)
- Expect(err).To(Succeed())
- err = cfg.AddOCMRepository("ocm", ocmspec)
- Expect(err).To(Succeed())
-
- data, err := normalize(cfg)
-
- Expect(err).To(Succeed())
- Expect(data).To(Equal([]byte(specdata)))
-
- cfg2 := config.New()
- err = json.Unmarshal(data, cfg2)
- Expect(err).To(Succeed())
- Expect(cfg2).To(Equal(cfg))
- })
- })
-})
diff --git a/pkg/contexts/clictx/config/type.go b/pkg/contexts/clictx/config/type.go
deleted file mode 100644
index ec39f96f8..000000000
--- a/pkg/contexts/clictx/config/type.go
+++ /dev/null
@@ -1,100 +0,0 @@
-package config
-
-import (
- "fmt"
-
- "github.com/open-component-model/ocm/pkg/contexts/clictx/internal"
- "github.com/open-component-model/ocm/pkg/contexts/config"
- "github.com/open-component-model/ocm/pkg/contexts/config/cpi"
- ocicpi "github.com/open-component-model/ocm/pkg/contexts/oci/cpi"
- ocmcpi "github.com/open-component-model/ocm/pkg/contexts/ocm/cpi"
- "github.com/open-component-model/ocm/pkg/runtime"
-)
-
-const (
- OCMCmdConfigType = "ocm.cmd" + cpi.OCM_CONFIG_TYPE_SUFFIX
- OCMCmdConfigTypeV1 = OCMCmdConfigType + runtime.VersionSeparator + "v1"
-)
-
-func init() {
- cpi.RegisterConfigType(cpi.NewConfigType[*Config](OCMCmdConfigType, usage))
- cpi.RegisterConfigType(cpi.NewConfigType[*Config](OCMCmdConfigTypeV1, usage))
-}
-
-// Config describes a memory based repository interface.
-type Config struct {
- runtime.ObjectVersionedType `json:",inline"`
- OCMRepositories map[string]*ocmcpi.GenericRepositorySpec `json:"ocmRepositories,omitempty"`
- OCIRepositories map[string]*ocicpi.GenericRepositorySpec `json:"ociRepositories,omitempty"`
-}
-
-// New creates a new memory ConfigSpec.
-func New() *Config {
- return &Config{
- ObjectVersionedType: runtime.NewVersionedTypedObject(OCMCmdConfigType),
- }
-}
-
-func (a *Config) GetType() string {
- return OCMCmdConfigType
-}
-
-func (a *Config) AddOCIRepository(name string, spec ocicpi.RepositorySpec) error {
- g, err := ocicpi.ToGenericRepositorySpec(spec)
- if err != nil {
- return fmt.Errorf("unable to convert oci repository spec to generic spec: %w", err)
- }
-
- if a.OCIRepositories == nil {
- a.OCIRepositories = map[string]*ocicpi.GenericRepositorySpec{}
- }
-
- a.OCIRepositories[name] = g
-
- return nil
-}
-
-func (a *Config) AddOCMRepository(name string, spec ocmcpi.RepositorySpec) error {
- g, err := ocmcpi.ToGenericRepositorySpec(spec)
- if err != nil {
- return fmt.Errorf("unable to convert ocm repository spec to generic spec: %w", err)
- }
-
- if a.OCMRepositories == nil {
- a.OCMRepositories = map[string]*ocmcpi.GenericRepositorySpec{}
- }
-
- a.OCMRepositories[name] = g
-
- return nil
-}
-
-func (a *Config) ApplyTo(ctx config.Context, target interface{}) error {
- t, ok := target.(internal.Context)
- if !ok {
- return config.ErrNoContext(OCMCmdConfigType)
- }
- for n, s := range a.OCIRepositories {
- t.OCI().Context().SetAlias(n, s)
- }
- for n, s := range a.OCMRepositories {
- t.OCM().Context().SetAlias(n, s)
- }
- return nil
-}
-
-const usage = `
-The config type ` + OCMCmdConfigType + ` can be used to
-configure predefined aliases for dedicated OCM repositories and
-OCI registries.
-
-
- type: ` + OCMCmdConfigType + `
- ocmRepositories:
- <name>: <specification of OCM repository>
- ...
- ociRepositories:
- <name>: <specification of OCI registry>
- ...
-
-`
diff --git a/pkg/contexts/clictx/interface.go b/pkg/contexts/clictx/interface.go
deleted file mode 100644
index 694a825c2..000000000
--- a/pkg/contexts/clictx/interface.go
+++ /dev/null
@@ -1,15 +0,0 @@
-package clictx
-
-import (
- "github.com/open-component-model/ocm/pkg/contexts/clictx/internal"
-)
-
-type (
- Context = internal.Context
- OCI = internal.OCI
- OCM = internal.OCM
-)
-
-func DefaultContext() Context {
- return internal.DefaultContext
-}
diff --git a/pkg/contexts/clictx/internal/builder.go b/pkg/contexts/clictx/internal/builder.go
deleted file mode 100644
index d065c7216..000000000
--- a/pkg/contexts/clictx/internal/builder.go
+++ /dev/null
@@ -1,84 +0,0 @@
-package internal
-
-import (
- "context"
- "io"
-
- "github.com/mandelsoft/vfs/pkg/vfs"
-
- "github.com/open-component-model/ocm/pkg/contexts/datacontext"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
- "github.com/open-component-model/ocm/pkg/out"
-)
-
-type Builder struct {
- ctx context.Context
- shared datacontext.AttributesContext
- ocm ocm.Context
- out out.Context
- filesystem vfs.FileSystem
-}
-
-func (b *Builder) getContext() context.Context {
- if b.ctx == nil {
- return context.Background()
- }
- return b.ctx
-}
-
-func (b Builder) WithContext(ctx context.Context) Builder {
- b.ctx = ctx
- return b
-}
-
-func (b Builder) WithFileSystem(fs vfs.FileSystem) Builder {
- b.filesystem = fs
- return b
-}
-
-func (b Builder) WithSharedAttributes(ctx datacontext.AttributesContext) Builder {
- b.shared = ctx
- return b
-}
-
-func (b Builder) WithOCM(ctx ocm.Context) Builder {
- b.ocm = ctx
- return b
-}
-
-func (b Builder) WithOutput(w io.Writer) Builder {
- b.out = out.WithOutput(b.out, w)
- return b
-}
-
-func (b Builder) WithErrorOutput(w io.Writer) Builder {
- b.out = out.WithErrorOutput(b.out, w)
- return b
-}
-
-func (b Builder) WithInput(r io.Reader) Builder {
- b.out = out.WithInput(b.out, r)
- return b
-}
-
-func (b Builder) Bound() (Context, context.Context) {
- c := b.New()
- return c, context.WithValue(b.getContext(), key, c)
-}
-
-func (b Builder) New(m ...datacontext.BuilderMode) Context {
- mode := datacontext.Mode(m...)
- ctx := b.getContext()
-
- if b.ocm == nil {
- var ok bool
- b.ocm, ok = ocm.DefinedForContext(ctx)
- if !ok && mode != datacontext.MODE_SHARED {
- b.ocm = ocm.New(mode)
- }
- }
- if b.shared == nil {
- b.shared = b.ocm.AttributesContext()
- }
- return datacontext.SetupContext(mode, newContext(b.shared, b.ocm, out.NewFor(b.out), b.filesystem, b.shared))
-}
diff --git a/pkg/contexts/clictx/internal/context.go b/pkg/contexts/clictx/internal/context.go
deleted file mode 100644
index f0230b7a0..000000000
--- a/pkg/contexts/clictx/internal/context.go
+++ /dev/null
@@ -1,313 +0,0 @@
-package internal
-
-import (
- "context"
- "io"
- "reflect"
-
- "github.com/mandelsoft/goutils/errors"
- "github.com/mandelsoft/goutils/general"
- "github.com/mandelsoft/vfs/pkg/vfs"
-
- "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/config"
- cfgcpi "github.com/open-component-model/ocm/pkg/contexts/config/cpi"
- "github.com/open-component-model/ocm/pkg/contexts/credentials"
- "github.com/open-component-model/ocm/pkg/contexts/datacontext"
- "github.com/open-component-model/ocm/pkg/contexts/datacontext/attrs/vfsattr"
- "github.com/open-component-model/ocm/pkg/contexts/oci"
- ctfoci "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/ctf"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
- ctfocm "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ctf"
- "github.com/open-component-model/ocm/pkg/out"
-)
-
-const CONTEXT_TYPE = "ocm.cmd" + datacontext.OCM_CONTEXT_SUFFIX
-
-type OCI interface {
- Context() oci.Context
- OpenCTF(path string) (oci.Repository, error)
-}
-
-type OCM interface {
- Context() ocm.Context
- OpenCTF(path string) (ocm.Repository, error)
-}
-
-type FileSystem struct {
- vfs.FileSystem
-}
-
-func (f *FileSystem) ApplyOption(options accessio.Options) error {
- options.SetPathFileSystem(f.FileSystem)
- return nil
-}
-
-type ContextProvider interface {
- CLIContext() Context
-}
-
-type Context interface {
- datacontext.Context
- ContextProvider
- datacontext.ContextProvider
- config.ContextProvider
- credentials.ContextProvider
- oci.ContextProvider
- ocm.ContextProvider
-
- FileSystem() *FileSystem
-
- OCI() OCI
- OCM() OCM
-
- ApplyOption(options accessio.Options) error
-
- out.Context
- WithStdIO(r io.Reader, o io.Writer, e io.Writer) Context
-}
-
-var key = reflect.TypeOf(_context{})
-
-// DefaultContext is the default context initialized by init functions.
-var DefaultContext = Builder{}.New(datacontext.MODE_SHARED)
-
-// ForContext returns the Context to use for context.Context.
-// This is either an explicit context or the default context.
-// The returned context incorporates the given context.
-func ForContext(ctx context.Context) Context {
- c, _ := datacontext.ForContextByKey(ctx, key, DefaultContext)
- return c.(Context)
-}
-
-func DefinedForContext(ctx context.Context) (Context, bool) {
- c, ok := datacontext.ForContextByKey(ctx, key, DefaultContext)
- if c != nil {
- return c.(Context), ok
- }
- return nil, ok
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-type _InternalContext = datacontext.InternalContext
-
-type _context struct {
- _InternalContext
- updater cfgcpi.Updater
-
- sharedAttributes datacontext.AttributesContext
-
- credentials credentials.Context
- oci *_oci
- ocm *_ocm
-
- out out.Context
-}
-
-var (
- _ Context = (*_context)(nil)
- _ datacontext.ViewCreator[Context] = (*_context)(nil)
-)
-
-// gcWrapper is used as garbage collectable
-// wrapper for a context implementation
-// to establish a runtime finalizer.
-type gcWrapper struct {
- datacontext.GCWrapper
- *_context
-}
-
-func newView(c *_context, ref ...bool) Context {
- if general.Optional(ref...) {
- return datacontext.FinalizedContext[gcWrapper](c)
- }
- return c
-}
-
-func (w *gcWrapper) SetContext(c *_context) {
- w._context = c
-}
-
-func newContext(shared datacontext.AttributesContext, ocmctx ocm.Context, outctx out.Context, fs vfs.FileSystem, delegates datacontext.Delegates) Context {
- if outctx == nil {
- outctx = out.New()
- }
- if shared == nil {
- shared = ocmctx.AttributesContext()
- }
- c := &_context{
- sharedAttributes: datacontext.PersistentContextRef(shared),
- credentials: datacontext.PersistentContextRef(ocmctx.CredentialsContext()),
- out: outctx,
- }
- c._InternalContext = datacontext.NewContextBase(c, CONTEXT_TYPE, key, ocmctx.GetAttributes(), delegates)
- c.updater = cfgcpi.NewUpdater(datacontext.PersistentContextRef(ocmctx.CredentialsContext().ConfigContext()), c)
- ocmctx = datacontext.PersistentContextRef(ocmctx)
- c.oci = newOCI(c, ocmctx)
- c.ocm = newOCM(c, ocmctx)
- if fs != nil {
- vfsattr.Set(c.AttributesContext(), fs)
- }
- return newView(c, true)
-}
-
-func (c *_context) CreateView() Context {
- return newView(c, true)
-}
-
-func (c *_context) CLIContext() Context {
- return newView(c)
-}
-
-func (c *_context) Update() error {
- return c.updater.Update()
-}
-
-func (c *_context) AttributesContext() datacontext.AttributesContext {
- return c.sharedAttributes
-}
-
-func (c *_context) ConfigContext() config.Context {
- return c.updater.GetContext()
-}
-
-func (c *_context) CredentialsContext() credentials.Context {
- return c.credentials
-}
-
-func (c *_context) OCIContext() oci.Context {
- return c.oci.Context()
-}
-
-func (c *_context) OCMContext() ocm.Context {
- return c.ocm.Context()
-}
-
-func (c *_context) FileSystem() *FileSystem {
- return &FileSystem{vfsattr.Get(c.CLIContext())}
-}
-
-func (c *_context) OCI() OCI {
- return c.oci
-}
-
-func (c *_context) OCM() OCM {
- return c.ocm
-}
-
-func (c *_context) ApplyOption(options accessio.Options) error {
- options.SetPathFileSystem(c.FileSystem())
- return nil
-}
-
-func (c *_context) StdOut() io.Writer {
- return c.out.StdOut()
-}
-
-func (c *_context) StdErr() io.Writer {
- return c.out.StdErr()
-}
-
-func (c *_context) StdIn() io.Reader {
- return c.out.StdIn()
-}
-
-func (c *_context) WithStdIO(r io.Reader, o io.Writer, e io.Writer) Context {
- return &_view{
- Context: c.CLIContext(),
- out: out.NewFor(out.WithStdIO(c.out, r, o, e)),
- }
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-type _view struct {
- Context
- out out.Context
-}
-
-func (c *_view) StdOut() io.Writer {
- return c.out.StdOut()
-}
-
-func (c *_view) StdErr() io.Writer {
- return c.out.StdErr()
-}
-
-func (c *_view) StdIn() io.Reader {
- return c.out.StdIn()
-}
-
-func (c *_view) WithStdIO(r io.Reader, o io.Writer, e io.Writer) Context {
- return &_view{
- Context: c.CLIContext(),
- out: out.NewFor(out.WithStdIO(c.out, r, o, e)),
- }
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// the coding for _oci and _ocm is identical except the package used:
-// _oci uses oci and ctfoci
-// _ocm uses ocm and ctfocm
-
-type _oci struct {
- cli *_context
- ctx oci.Context
- repos map[string]oci.RepositorySpec
-}
-
-func newOCI(ctx *_context, ocmctx ocm.Context) *_oci {
- return &_oci{
- cli: ctx,
- ctx: ocmctx.OCIContext(),
- repos: map[string]oci.RepositorySpec{},
- }
-}
-
-func (c *_oci) Context() oci.Context {
- return c.ctx
-}
-
-func (c *_oci) OpenCTF(path string) (oci.Repository, error) {
- ok, err := vfs.Exists(c.cli.FileSystem(), path)
- if err != nil {
- return nil, err
- }
- if !ok {
- return nil, errors.ErrNotFound("file", path)
- }
- return ctfoci.Open(c.ctx, accessobj.ACC_WRITABLE, path, 0, accessio.PathFileSystem(c.cli.FileSystem()))
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-type _ocm struct {
- cli *_context
- ctx ocm.Context
- repos map[string]ocm.RepositorySpec
-}
-
-func newOCM(ctx *_context, ocmctx ocm.Context) *_ocm {
- return &_ocm{
- cli: ctx,
- ctx: ocmctx,
- repos: map[string]ocm.RepositorySpec{},
- }
-}
-
-func (c *_ocm) Context() ocm.Context {
- return c.ctx
-}
-
-func (c *_ocm) OpenCTF(path string) (ocm.Repository, error) {
- ok, err := vfs.Exists(c.cli.FileSystem(), path)
- if err != nil {
- return nil, err
- }
- if !ok {
- return nil, errors.ErrNotFound("file", path)
- }
- return ctfocm.Open(c.ctx, accessobj.ACC_WRITABLE, path, 0, c.cli.FileSystem())
-}
diff --git a/pkg/contexts/config/builder.go b/pkg/contexts/config/builder.go
deleted file mode 100644
index fd618ae8d..000000000
--- a/pkg/contexts/config/builder.go
+++ /dev/null
@@ -1,24 +0,0 @@
-package config
-
-import (
- "context"
-
- "github.com/open-component-model/ocm/pkg/contexts/config/internal"
- "github.com/open-component-model/ocm/pkg/contexts/datacontext"
-)
-
-func WithContext(ctx context.Context) internal.Builder {
- return internal.Builder{}.WithContext(ctx)
-}
-
-func WithSharedAttributes(ctx datacontext.AttributesContext) internal.Builder {
- return internal.Builder{}.WithSharedAttributes(ctx)
-}
-
-func WithConfigTypeScheme(scheme ConfigTypeScheme) internal.Builder {
- return internal.Builder{}.WithConfigTypeScheme(scheme)
-}
-
-func New(mode ...datacontext.BuilderMode) Context {
- return internal.Builder{}.New(mode...)
-}
diff --git a/pkg/contexts/config/config/context_test.go b/pkg/contexts/config/config/context_test.go
deleted file mode 100644
index 8f24fea51..000000000
--- a/pkg/contexts/config/config/context_test.go
+++ /dev/null
@@ -1,178 +0,0 @@
-package config_test
-
-import (
- "os"
- "reflect"
- "runtime"
- "time"
-
- . "github.com/mandelsoft/goutils/testutils"
- . "github.com/onsi/ginkgo/v2"
- . "github.com/onsi/gomega"
-
- "github.com/mandelsoft/goutils/general"
- "sigs.k8s.io/yaml"
-
- "github.com/open-component-model/ocm/pkg/contexts/config"
- local "github.com/open-component-model/ocm/pkg/contexts/config/config"
- "github.com/open-component-model/ocm/pkg/contexts/datacontext"
-)
-
-func CheckRefs(ctx config.Context, n int) {
- runtime.GC()
- time.Sleep(time.Second)
- Expect(datacontext.GetContextRefCount(ctx)).To(Equal(n)) // all temp refs have been finalized
-}
-
-var _ = Describe("generic config handling", func() {
- var scheme config.ConfigTypeScheme
- var cfgctx config.Context
-
- testdataconfig, _ := os.ReadFile("testdata/config.yaml")
- testdatajson, _ := yaml.YAMLToJSON(testdataconfig)
-
- nesteddataconfig, _ := os.ReadFile("testdata/nested.yaml")
-
- _ = testdatajson
-
- BeforeEach(func() {
- scheme = config.NewConfigTypeScheme()
- scheme.AddKnownTypes(config.DefaultContext().ConfigTypes())
- cfgctx = config.WithConfigTypeScheme(scheme).New()
- })
-
- It("can deserialize config", func() {
- result, err := cfgctx.GetConfigForData(testdataconfig, nil)
- Expect(err).To(Succeed())
- Expect(config.IsGeneric(result)).To(BeFalse())
- Expect(reflect.TypeOf(result).String()).To(Equal("*config.Config"))
-
- CheckRefs(cfgctx, 1)
- })
-
- It("it applies to existing context", func() {
- RegisterAt(scheme)
- d := newDummy(cfgctx)
-
- cfg, err := cfgctx.GetConfigForData(testdataconfig, nil)
- Expect(err).To(Succeed())
-
- err = cfgctx.ApplyConfig(cfg, "testconfig")
- Expect(err).To(Succeed())
- gen, cfgs := cfgctx.GetConfig(config.AllGenerations, nil)
- Expect(gen).To(Equal(int64(3)))
- Expect(len(cfgs)).To(Equal(3))
-
- Expect(d.getApplied()).To(Equal([]*Config{NewConfig("alice", ""), NewConfig("", "bob")}))
-
- CheckRefs(cfgctx, 1)
- })
-
- It("it applies nested to existing context", func() {
- RegisterAt(scheme)
- d := newDummy(cfgctx)
-
- cfg, err := cfgctx.GetConfigForData(nesteddataconfig, nil)
- Expect(err).To(Succeed())
-
- err = cfgctx.ApplyConfig(cfg, "testconfig")
- Expect(err).To(Succeed())
- gen, cfgs := cfgctx.GetConfig(config.AllGenerations, nil)
- Expect(gen).To(Equal(int64(4)))
- Expect(len(cfgs)).To(Equal(4))
-
- Expect(d.getApplied()).To(Equal([]*Config{NewConfig("alice", ""), NewConfig("", "bob")}))
-
- CheckRefs(cfgctx, 1)
- })
-
- It("it applies unknown type to existing context", func() {
- cfg, err := cfgctx.GetConfigForData(testdataconfig, nil)
- Expect(err).To(Succeed())
-
- err = cfgctx.ApplyConfig(cfg, "testconfig")
- Expect(err).To(HaveOccurred())
- Expect(err.Error()).To(StringEqualWithContext("testconfig: config apply errors: {config entry 0--testconfig: config type \"Dummy\" is unknown, config entry 1--testconfig: config type \"Dummy\" is unknown}"))
- gen, cfgs := cfgctx.GetConfig(config.AllGenerations, nil)
- Expect(gen).To(Equal(int64(3)))
- Expect(len(cfgs)).To(Equal(3))
-
- RegisterAt(scheme)
- d := newDummy(cfgctx)
- Expect(d.getApplied()).To(Equal([]*Config{NewConfig("alice", ""), NewConfig("", "bob")}))
-
- CheckRefs(cfgctx, 1)
- })
-
- It("it applies composed config to existing context", func() {
- RegisterAt(scheme)
- d := newDummy(cfgctx)
-
- cfg := local.New()
-
- nested := NewConfig("alice", "")
- cfg.AddConfig(nested)
- nested = NewConfig("", "bob")
- cfg.AddConfig(nested)
-
- err := cfgctx.ApplyConfig(cfg, "testconfig")
- Expect(err).To(Succeed())
- gen, cfgs := cfgctx.GetConfig(config.AllGenerations, nil)
- Expect(gen).To(Equal(int64(3)))
- Expect(len(cfgs)).To(Equal(3))
-
- Expect(d.getApplied()).To(Equal([]*Config{NewConfig("alice", ""), NewConfig("", "bob")}))
-
- CheckRefs(cfgctx, 1)
- })
-
- It("it applies composed config set to existing context", func() {
- RegisterAt(scheme)
- d := newDummy(cfgctx)
-
- cfg := local.New()
-
- nested := NewConfig("alice", "")
- cfg.AddConfigToSet("test", nested)
- nested = NewConfig("", "bob")
- cfg.AddConfig(nested)
-
- err := cfgctx.ApplyConfig(cfg, "testconfig")
- Expect(err).To(Succeed())
- gen, cfgs := cfgctx.GetConfig(config.AllGenerations, nil)
- Expect(gen).To(Equal(int64(2)))
- Expect(len(cfgs)).To(Equal(2))
-
- Expect(d.getApplied()).To(Equal([]*Config{NewConfig("", "bob")}))
-
- err = cfgctx.ApplyConfigSet("test")
- Expect(err).To(Succeed())
-
- gen, cfgs = cfgctx.GetConfig(config.AllGenerations, nil)
- Expect(gen).To(Equal(int64(3)))
- Expect(len(cfgs)).To(Equal(3))
- Expect(d.getApplied()).To(Equal([]*Config{NewConfig("", "bob"), NewConfig("alice", "")}))
-
- CheckRefs(cfgctx, 1)
- })
-
- It("it applies compig to storing target", func() {
- RegisterAt(scheme)
- d := newDummy(cfgctx)
-
- cfg := NewConfig("alice", "")
-
- err := cfgctx.ApplyConfig(cfg, "testconfig")
- Expect(err).To(Succeed())
-
- Expect(d.getApplied()).To(Equal([]*Config{NewConfig("alice", "")}))
-
- target := dummyTarget{}
- MustBeSuccessful(cfgctx.ApplyTo(0, &target))
- Expect(target.used).NotTo(BeNil())
- Expect(target.used.GetId()).To(Equal(cfgctx.GetId()))
-
- CheckRefs(cfgctx, general.Conditional(datacontext.MULTI_REF, 2, 1)) // config context stored in target with separate ref
- target.used.GetId()
- })
-})
diff --git a/pkg/contexts/config/config/dummy_test.go b/pkg/contexts/config/config/dummy_test.go
deleted file mode 100644
index 3c8c2bae3..000000000
--- a/pkg/contexts/config/config/dummy_test.go
+++ /dev/null
@@ -1,88 +0,0 @@
-package config_test
-
-import (
- "github.com/open-component-model/ocm/pkg/contexts/config"
- "github.com/open-component-model/ocm/pkg/contexts/config/cpi"
- "github.com/open-component-model/ocm/pkg/runtime"
-)
-
-const (
- DummyType = "Dummy"
- DummyTypeV1 = DummyType + "/v1"
-)
-
-func RegisterAt(reg cpi.ConfigTypeScheme) {
- reg.Register(cpi.NewConfigType[*Config](DummyType))
- reg.Register(cpi.NewConfigType[*Config](DummyTypeV1))
-}
-
-// Config describes a a dummy config
-type Config struct {
- runtime.ObjectVersionedType `json:",inline"`
- Alice string `json:"alice,omitempty"`
- Bob string `json:"bob,omitempty"`
-}
-
-// NewConfig creates a new memory ConfigSpec
-func NewConfig(a, b string) *Config {
- return &Config{
- ObjectVersionedType: runtime.NewVersionedTypedObject(DummyType),
- Alice: a,
- Bob: b,
- }
-}
-
-func (a *Config) GetType() string {
- return DummyType
-}
-
-func (a *Config) Info() string {
- return "dummy config"
-}
-
-func (a *Config) ApplyTo(ctx config.Context, target interface{}) error {
- d, ok := target.(*dummyContext)
- if ok {
- d.applied = append(d.applied, a)
- return nil
- }
- c, ok := target.(*dummyTarget)
- if ok {
- c.used = ctx
- return nil
- }
- return cpi.ErrNoContext(DummyType)
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-type dummyTarget struct {
- used config.Context
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-func newDummy(ctx config.Context) *dummyContext {
- d := &dummyContext{
- config: ctx,
- }
- d.update()
- return d
-}
-
-type dummyContext struct {
- config config.Context
- lastGeneration int64
- applied []*Config
-}
-
-func (d *dummyContext) getApplied() []*Config {
- d.update()
- return d.applied
-}
-
-func (d *dummyContext) update() error {
- gen, err := d.config.ApplyTo(d.lastGeneration, d)
- d.lastGeneration = gen
- return err
-}
diff --git a/pkg/contexts/config/config/type.go b/pkg/contexts/config/config/type.go
deleted file mode 100644
index c5451db45..000000000
--- a/pkg/contexts/config/config/type.go
+++ /dev/null
@@ -1,97 +0,0 @@
-package config
-
-import (
- "fmt"
-
- "github.com/mandelsoft/goutils/errors"
-
- "github.com/open-component-model/ocm/pkg/contexts/config/cpi"
- "github.com/open-component-model/ocm/pkg/runtime"
-)
-
-const (
- ConfigType = "generic" + cpi.OCM_CONFIG_TYPE_SUFFIX
- ConfigTypeV1 = ConfigType + runtime.VersionSeparator + "v1"
-)
-
-func init() {
- cpi.RegisterConfigType(cpi.NewConfigType[*Config](ConfigType, usage))
- cpi.RegisterConfigType(cpi.NewConfigType[*Config](ConfigTypeV1, usage))
-}
-
-// Config describes a memory based repository interface.
-type Config struct {
- runtime.ObjectVersionedType `json:",inline"`
- cpi.ConfigurationList `json:",inline"`
- Sets map[string]cpi.ConfigSet `json:"sets,omitempty"`
-}
-
-// New creates a new memory ConfigSpec.
-func New() *Config {
- return &Config{
- ObjectVersionedType: runtime.NewVersionedTypedObject(ConfigType),
- ConfigurationList: cpi.ConfigurationList{[]*cpi.GenericConfig{}},
- Sets: map[string]cpi.ConfigSet{},
- }
-}
-
-func (c *Config) AddSet(name, desc string) {
- set := c.Sets[name]
- set.Description = desc
- c.Sets[name] = set
-}
-
-func (c *Config) AddConfigToSet(name string, cfg cpi.Config) error {
- set := c.Sets[name]
- err := set.AddConfig(cfg)
- if err == nil {
- c.Sets[name] = set
- }
- return err
-}
-
-func (c *Config) GetType() string {
- return ConfigType
-}
-
-func (c *Config) ApplyTo(ctx cpi.Context, target interface{}) error {
- if cctx, ok := target.(cpi.Context); ok {
- for n, s := range c.Sets {
- set := s
- cctx.AddConfigSet(n, &set)
- }
-
- list := errors.ErrListf("applying generic config list")
- for i, cfg := range c.Configurations {
- sub := fmt.Sprintf("config entry %d", i)
- list.Add(cctx.ApplyConfig(cfg, ctx.WithInfo(sub).Info()))
- }
- return list.Result()
- }
- return cpi.ErrNoContext(ConfigType)
-}
-
-const usage = `
-The config type ` + ConfigType + ` can be used to define a list
-of arbitrary configuration specifications and named configuration sets:
-
-
- type: ` + ConfigType + `
- configurations:
- - type: <any config type>
- ...
- ...
- sets:
- standard:
- description: my selectable standard config
- configurations:
- - type: ...
- ...
- ...
-
-
-Configurations are directly applied. Configuration sets are
-just stored in the configuration context and can be applied
-on-demand. On the CLI, this can be done using the main command option
---config-set <name>.
-`
diff --git a/pkg/contexts/config/config/utils.go b/pkg/contexts/config/config/utils.go
deleted file mode 100644
index 126ebdb7f..000000000
--- a/pkg/contexts/config/config/utils.go
+++ /dev/null
@@ -1,60 +0,0 @@
-package config
-
-import (
- "github.com/open-component-model/ocm/pkg/contexts/config/cpi"
-)
-
-type Aggregator struct {
- cfg cpi.Config
- aggr *Config
- optimized bool
-}
-
-func NewAggregator(optimized bool, cfgs ...cpi.Config) (*Aggregator, error) {
- a := &Aggregator{optimized: optimized}
- for _, c := range cfgs {
- err := a.AddConfig(c)
- if err != nil {
- return nil, err
- }
- }
- return a, nil
-}
-
-func (a *Aggregator) Get() cpi.Config {
- return a.cfg
-}
-
-func (a *Aggregator) AddConfig(cfg cpi.Config) error {
- if a.cfg == nil {
- a.cfg = cfg
- if aggr, ok := cfg.(*Config); ok && a.optimized {
- a.aggr = aggr
- }
- } else {
- if a.aggr == nil {
- a.aggr = New()
- if m, ok := a.cfg.(*Config); ok {
- // transfer initial config aggregation
- for _, c := range m.Configurations {
- err := a.aggr.AddConfig(c)
- if err != nil {
- return err
- }
- }
- } else {
- // add initial config to new aggregation
- err := a.aggr.AddConfig(a.cfg)
- if err != nil {
- return err
- }
- }
- a.cfg = a.aggr
- }
- err := a.aggr.AddConfig(cfg)
- if err != nil {
- return err
- }
- }
- return nil
-}
diff --git a/pkg/contexts/config/configutils/configure.go b/pkg/contexts/config/configutils/configure.go
deleted file mode 100644
index 29fb04d3e..000000000
--- a/pkg/contexts/config/configutils/configure.go
+++ /dev/null
@@ -1,20 +0,0 @@
-package configutils
-
-import (
- _ "github.com/open-component-model/ocm/pkg/contexts/datacontext/config"
-
- "github.com/mandelsoft/vfs/pkg/vfs"
-
- "github.com/open-component-model/ocm/pkg/contexts/config"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/utils"
-)
-
-func Configure(path string, fss ...vfs.FileSystem) error {
- _, err := utils.Configure(config.DefaultContext(), path, fss...)
- return err
-}
-
-func ConfigureContext(ctxp config.ContextProvider, path string, fss ...vfs.FileSystem) error {
- _, err := utils.Configure(ctxp, path, fss...)
- return err
-}
diff --git a/pkg/contexts/config/context_test.go b/pkg/contexts/config/context_test.go
deleted file mode 100644
index 19f75f469..000000000
--- a/pkg/contexts/config/context_test.go
+++ /dev/null
@@ -1,89 +0,0 @@
-package config_test
-
-import (
- "encoding/json"
- "reflect"
-
- . "github.com/onsi/ginkgo/v2"
- . "github.com/onsi/gomega"
-
- "github.com/mandelsoft/goutils/errors"
-
- "github.com/open-component-model/ocm/pkg/contexts/config"
- "github.com/open-component-model/ocm/pkg/contexts/datacontext"
-)
-
-var _ = Describe("config handling", func() {
- var scheme config.ConfigTypeScheme
- var cfgctx config.Context
-
- BeforeEach(func() {
- scheme = config.NewConfigTypeScheme()
- cfgctx = config.WithConfigTypeScheme(scheme).New()
- Expect(cfgctx.AttributesContext().GetId()).NotTo(BeIdenticalTo(datacontext.DefaultContext.GetId()))
- })
-
- It("can deserialize unknown", func() {
- cfg := NewConfig("a", "b")
- data, err := json.Marshal(cfg)
- Expect(err).To(Succeed())
-
- result, err := cfgctx.GetConfigForData(data, nil)
- Expect(err).To(Succeed())
- Expect(config.IsGeneric(result)).To(BeTrue())
- })
-
- It("can deserialize known", func() {
- RegisterAt(scheme)
-
- cfg := NewConfig("a", "b")
- data, err := json.Marshal(cfg)
- Expect(err).To(Succeed())
-
- result, err := cfgctx.GetConfigForData(data, nil)
- Expect(err).To(Succeed())
- Expect(config.IsGeneric(result)).To(BeFalse())
- Expect(reflect.TypeOf(result).String()).To(Equal("*config_test.Config"))
- })
-
- It("it applies to existing context", func() {
- RegisterAt(scheme)
-
- d := newDummy(cfgctx)
-
- cfg := NewConfig("a", "b")
-
- err := cfgctx.ApplyConfig(cfg, "test")
-
- Expect(err).To(Succeed())
-
- Expect(d.getApplied()).To(Equal([]*Config{cfg}))
- })
-
- It("it applies to new context", func() {
- RegisterAt(scheme)
-
- cfg := NewConfig("a", "b")
-
- err := cfgctx.ApplyConfig(cfg, "test")
- Expect(err).To(Succeed())
-
- d := newDummy(cfgctx)
- Expect(d.applied).To(Equal([]*Config{cfg}))
- })
-
- It("it applies generic to new context", func() {
- cfg := NewConfig("a", "b")
- data, err := json.Marshal(cfg)
- Expect(err).To(Succeed())
-
- gen, err := cfgctx.ApplyData(data, nil, "test")
- Expect(err).To(HaveOccurred())
- Expect(errors.IsErrUnknownKind(err, config.KIND_CONFIGTYPE)).To(BeTrue())
- Expect(config.IsGeneric(gen)).To(BeTrue())
-
- RegisterAt(scheme)
- d := newDummy(cfgctx)
- Expect(d.getApplied()).To(Equal([]*Config{cfg}))
- })
-})
diff --git a/pkg/contexts/config/cpi/config.go b/pkg/contexts/config/cpi/config.go
deleted file mode 100644
index 07c6da453..000000000
--- a/pkg/contexts/config/cpi/config.go
+++ /dev/null
@@ -1,54 +0,0 @@
-package cpi
-
-import (
- "strings"
-
- "github.com/open-component-model/ocm/pkg/contexts/config/internal"
- "github.com/open-component-model/ocm/pkg/runtime"
-)
-
-type ConfigTypeVersionScheme = runtime.TypeVersionScheme[Config, ConfigType]
-
-func NewConfigTypeVersionScheme(kind string) ConfigTypeVersionScheme {
- return runtime.NewTypeVersionScheme[Config, ConfigType](kind, internal.NewStrictConfigTypeScheme())
-}
-
-func RegisterConfigType(rtype ConfigType) {
- internal.DefaultConfigTypeScheme.Register(rtype)
-}
-
-func RegisterConfigTypeVersions(s ConfigTypeVersionScheme) {
- internal.DefaultConfigTypeScheme.AddKnownTypes(s)
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-type configType struct {
- runtime.VersionedTypedObjectType[Config]
- usage string
-}
-
-func NewConfigType[I Config](name string, usages ...string) ConfigType {
- return &configType{
- VersionedTypedObjectType: runtime.NewVersionedTypedObjectType[Config, I](name),
- usage: strings.Join(usages, "\n"),
- }
-}
-
-func NewConfigTypeyConverter[I Config, V runtime.TypedObject](name string, converter runtime.Converter[I, V], usages ...string) ConfigType {
- return &configType{
- VersionedTypedObjectType: runtime.NewVersionedTypedObjectTypeByConverter[Config, I](name, converter),
- usage: strings.Join(usages, "\n"),
- }
-}
-
-func NewConfigTypeByFormatVersion(name string, fmt runtime.FormatVersion[Config], usages ...string) ConfigType {
- return &configType{
- VersionedTypedObjectType: runtime.NewVersionedTypedObjectTypeByFormatVersion[Config](name, fmt),
- usage: strings.Join(usages, "\n"),
- }
-}
-
-func (t *configType) Usage() string {
- return t.usage
-}
diff --git a/pkg/contexts/config/cpi/interface.go b/pkg/contexts/config/cpi/interface.go
deleted file mode 100644
index b61ab01eb..000000000
--- a/pkg/contexts/config/cpi/interface.go
+++ /dev/null
@@ -1,77 +0,0 @@
-package cpi
-
-// This is the Context Provider Interface for credential providers
-
-import (
- "github.com/open-component-model/ocm/pkg/contexts/config/internal"
- "github.com/open-component-model/ocm/pkg/runtime"
-)
-
-const KIND_CONFIGTYPE = internal.KIND_CONFIGTYPE
-
-const OCM_CONFIG_TYPE_SUFFIX = internal.OCM_CONFIG_TYPE_SUFFIX
-
-const CONTEXT_TYPE = internal.CONTEXT_TYPE
-
-type (
- Context = internal.Context
- ContextProvider = internal.ContextProvider
- Config = internal.Config
- ConfigType = internal.ConfigType
- ConfigTypeScheme = internal.ConfigTypeScheme
- GenericConfig = internal.GenericConfig
-
- ConfigSet = internal.ConfigSet
- ConfigurationList = internal.ConfigurationList
-
- ConfigApplier = internal.ConfigApplier
- ConfigApplierFunction = internal.ConfigApplierFunction
-)
-
-var DefaultContext = internal.DefaultContext
-
-func FromProvider(p ContextProvider) Context {
- return internal.FromProvider(p)
-}
-
-func NewGenericConfig(data []byte, unmarshaler runtime.Unmarshaler) (Config, error) {
- return internal.NewGenericConfig(data, unmarshaler)
-}
-
-func ToGenericConfig(c Config) (*GenericConfig, error) {
- return internal.ToGenericConfig(c)
-}
-
-func NewConfigTypeScheme() ConfigTypeScheme {
- return internal.NewConfigTypeScheme(nil)
-}
-
-func IsGeneric(cfg Config) bool {
- return internal.IsGeneric(cfg)
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-type Updater = internal.Updater
-
-func NewUpdater(ctx ContextProvider, target interface{}) Updater {
- return internal.NewUpdater(ctx, target)
-}
-
-func NewUpdaterForFactory[T any](ctx ContextProvider, f func() T) Updater {
- return internal.NewUpdaterForFactory(ctx, f)
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-func ErrNoContext(name string) error {
- return internal.ErrNoContext(name)
-}
-
-func IsErrNoContext(err error) bool {
- return internal.IsErrNoContext(err)
-}
-
-func IsErrConfigNotApplicable(err error) bool {
- return internal.IsErrConfigNotApplicable(err)
-}
diff --git a/pkg/contexts/config/dummy_test.go b/pkg/contexts/config/dummy_test.go
deleted file mode 100644
index 72f59e1cd..000000000
--- a/pkg/contexts/config/dummy_test.go
+++ /dev/null
@@ -1,73 +0,0 @@
-package config_test
-
-import (
- "github.com/open-component-model/ocm/pkg/contexts/config"
- "github.com/open-component-model/ocm/pkg/contexts/config/cpi"
- "github.com/open-component-model/ocm/pkg/runtime"
-)
-
-const (
- DummyType = "Dummy"
- DummyTypeV1 = DummyType + "/v1"
-)
-
-func RegisterAt(reg cpi.ConfigTypeScheme) {
- reg.Register(cpi.NewConfigType[*Config](DummyType))
- reg.Register(cpi.NewConfigType[*Config](DummyTypeV1))
-}
-
-// Config describes a a dummy config
-type Config struct {
- runtime.ObjectVersionedType `json:",inline"`
- Alice string `json:"alice,omitempty"`
- Bob string `json:"bob,omitempty"`
-}
-
-// NewConfig creates a new memory Config
-func NewConfig(a, b string) *Config {
- return &Config{
- ObjectVersionedType: runtime.NewVersionedTypedObject(DummyType),
- Alice: a,
- Bob: b,
- }
-}
-
-func (a *Config) GetType() string {
- return DummyType
-}
-
-func (a *Config) ApplyTo(ctx config.Context, target interface{}) error {
- d, ok := target.(*dummyContext)
- if ok {
- d.applied = append(d.applied, a)
- return nil
- }
- return cpi.ErrNoContext(DummyType)
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-func newDummy(ctx config.Context) *dummyContext {
- d := &dummyContext{
- config: ctx,
- }
- d.update()
- return d
-}
-
-type dummyContext struct {
- config config.Context
- lastGeneration int64
- applied []*Config
-}
-
-func (d *dummyContext) getApplied() []*Config {
- d.update()
- return d.applied
-}
-
-func (d *dummyContext) update() error {
- gen, err := d.config.ApplyTo(d.lastGeneration, d)
- d.lastGeneration = gen
- return err
-}
diff --git a/pkg/contexts/config/gc_test.go b/pkg/contexts/config/gc_test.go
deleted file mode 100644
index 996cb2338..000000000
--- a/pkg/contexts/config/gc_test.go
+++ /dev/null
@@ -1,34 +0,0 @@
-package config_test
-
-import (
- "runtime"
- "time"
-
- . "github.com/onsi/ginkgo/v2"
- . "github.com/onsi/gomega"
-
- me "github.com/open-component-model/ocm/pkg/contexts/config"
- "github.com/open-component-model/ocm/pkg/runtimefinalizer"
-)
-
-var _ = Describe("area test", func() {
- It("can be garbage collected", func() {
- ctx := me.New()
-
- r := runtimefinalizer.GetRuntimeFinalizationRecorder(ctx)
- Expect(r).NotTo(BeNil())
-
- runtime.GC()
- time.Sleep(time.Second)
- ctx.GetType()
- Expect(r.Get()).To(BeNil())
-
- ctx = nil
- for i := 0; i < 100; i++ {
- runtime.GC()
- time.Sleep(time.Millisecond)
- }
-
- Expect(r.Get()).To(ContainElement(ContainSubstring(me.CONTEXT_TYPE)))
- })
-})
diff --git a/pkg/contexts/config/init.go b/pkg/contexts/config/init.go
deleted file mode 100644
index 0e5ec5827..000000000
--- a/pkg/contexts/config/init.go
+++ /dev/null
@@ -1,6 +0,0 @@
-package config
-
-import (
- _ "github.com/open-component-model/ocm/pkg/contexts/config/config"
- _ "github.com/open-component-model/ocm/pkg/contexts/datacontext/config"
-)
diff --git a/pkg/contexts/config/interface.go b/pkg/contexts/config/interface.go
deleted file mode 100644
index e7311f634..000000000
--- a/pkg/contexts/config/interface.go
+++ /dev/null
@@ -1,76 +0,0 @@
-package config
-
-import (
- "context"
-
- "github.com/open-component-model/ocm/pkg/contexts/config/cpi"
- "github.com/open-component-model/ocm/pkg/contexts/config/internal"
- "github.com/open-component-model/ocm/pkg/runtime"
-)
-
-const KIND_CONFIGTYPE = internal.KIND_CONFIGTYPE
-
-const OCM_CONFIG_TYPE_SUFFIX = internal.OCM_CONFIG_TYPE_SUFFIX
-
-const CONTEXT_TYPE = internal.CONTEXT_TYPE
-
-var AllConfigs = internal.AllConfigs
-
-const AllGenerations = internal.AllGenerations
-
-type (
- Context = internal.Context
- ContextProvider = internal.ContextProvider
- Config = internal.Config
- ConfigType = internal.ConfigType
- ConfigTypeScheme = internal.ConfigTypeScheme
- GenericConfig = internal.GenericConfig
- ConfigSelector = internal.ConfigSelector
- ConfigSelectorFunction = internal.ConfigSelectorFunction
- ConfigApplier = internal.ConfigApplier
- ConfigApplierFunction = internal.ConfigApplierFunction
-)
-
-func DefaultContext() internal.Context {
- return internal.DefaultContext
-}
-
-func ForContext(ctx context.Context) Context {
- return internal.FromContext(ctx)
-}
-
-func FromProvider(p ContextProvider) Context {
- return internal.FromProvider(p)
-}
-
-func DefinedForContext(ctx context.Context) (Context, bool) {
- return internal.DefinedForContext(ctx)
-}
-
-func NewGenericConfig(data []byte, unmarshaler runtime.Unmarshaler) (Config, error) {
- return internal.NewGenericConfig(data, unmarshaler)
-}
-
-func ToGenericConfig(c Config) (*GenericConfig, error) {
- return internal.ToGenericConfig(c)
-}
-
-func NewConfigTypeScheme() ConfigTypeScheme {
- return internal.NewConfigTypeScheme(nil)
-}
-
-func IsGeneric(cfg Config) bool {
- return internal.IsGeneric(cfg)
-}
-
-func ErrNoContext(name string) error {
- return internal.ErrNoContext(name)
-}
-
-func IsErrNoContext(err error) bool {
- return cpi.IsErrNoContext(err)
-}
-
-func IsErrConfigNotApplicable(err error) bool {
- return cpi.IsErrConfigNotApplicable(err)
-}
diff --git a/pkg/contexts/config/internal/builder.go b/pkg/contexts/config/internal/builder.go
deleted file mode 100644
index 255fe3912..000000000
--- a/pkg/contexts/config/internal/builder.go
+++ /dev/null
@@ -1,69 +0,0 @@
-package internal
-
-import (
- "context"
-
- "github.com/open-component-model/ocm/pkg/contexts/datacontext"
-)
-
-type Builder struct {
- ctx context.Context
- shared datacontext.AttributesContext
- reposcheme ConfigTypeScheme
-}
-
-func (b *Builder) getContext() context.Context {
- if b.ctx == nil {
- return context.Background()
- }
- return b.ctx
-}
-
-func (b Builder) WithContext(ctx context.Context) Builder {
- b.ctx = ctx
- return b
-}
-
-func (b Builder) WithSharedAttributes(ctx datacontext.AttributesContext) Builder {
- b.shared = ctx
- return b
-}
-
-func (b Builder) WithConfigTypeScheme(scheme ConfigTypeScheme) Builder {
- b.reposcheme = scheme
- return b
-}
-
-func (b Builder) Bound() (Context, context.Context) {
- c := b.New()
- return c, context.WithValue(b.getContext(), key, c)
-}
-
-func (b Builder) New(m ...datacontext.BuilderMode) Context {
- mode := datacontext.Mode(m...)
- ctx := b.getContext()
-
- if b.shared == nil {
- if mode == datacontext.MODE_SHARED {
- b.shared = datacontext.ForContext(ctx)
- } else {
- b.shared = datacontext.New(nil)
- }
- }
- if b.reposcheme == nil {
- switch mode {
- case datacontext.MODE_INITIAL:
- b.reposcheme = NewConfigTypeScheme(nil)
- case datacontext.MODE_CONFIGURED:
- b.reposcheme = NewConfigTypeScheme(nil)
- b.reposcheme.AddKnownTypes(DefaultConfigTypeScheme)
- case datacontext.MODE_EXTENDED:
- b.reposcheme = NewConfigTypeScheme(nil, DefaultConfigTypeScheme)
- case datacontext.MODE_DEFAULTED:
- fallthrough
- case datacontext.MODE_SHARED:
- b.reposcheme = DefaultConfigTypeScheme
- }
- }
- return datacontext.SetupContext(mode, newContext(b.shared, b.reposcheme, b.shared))
-}
diff --git a/pkg/contexts/config/internal/builder_test.go b/pkg/contexts/config/internal/builder_test.go
deleted file mode 100644
index aff15ecc8..000000000
--- a/pkg/contexts/config/internal/builder_test.go
+++ /dev/null
@@ -1,37 +0,0 @@
-package internal_test
-
-import (
- . "github.com/onsi/ginkgo/v2"
- . "github.com/onsi/gomega"
-
- local "github.com/open-component-model/ocm/pkg/contexts/config/internal"
- "github.com/open-component-model/ocm/pkg/contexts/datacontext"
-)
-
-var _ = Describe("builder test", func() {
- It("creates local", func() {
- ctx := local.Builder{}.New(datacontext.MODE_SHARED)
-
- Expect(ctx.AttributesContext()).To(BeIdenticalTo(datacontext.DefaultContext))
- Expect(ctx).NotTo(BeIdenticalTo(local.DefaultContext))
- Expect(ctx.ConfigTypes()).To(BeIdenticalTo(local.DefaultConfigTypeScheme))
- })
-
- It("creates configured", func() {
- ctx := local.Builder{}.New(datacontext.MODE_CONFIGURED)
-
- Expect(ctx.AttributesContext()).NotTo(BeIdenticalTo(datacontext.DefaultContext))
- Expect(ctx).NotTo(BeIdenticalTo(local.DefaultContext))
- Expect(ctx.ConfigTypes()).NotTo(BeIdenticalTo(local.DefaultConfigTypeScheme))
- Expect(ctx.ConfigTypes().KnownTypeNames()).To(Equal(local.DefaultConfigTypeScheme.KnownTypeNames()))
- })
-
- It("creates iniial", func() {
- ctx := local.Builder{}.New(datacontext.MODE_INITIAL)
-
- Expect(ctx.AttributesContext()).NotTo(BeIdenticalTo(datacontext.DefaultContext))
- Expect(ctx).NotTo(BeIdenticalTo(local.DefaultContext))
- Expect(ctx.ConfigTypes()).NotTo(BeIdenticalTo(local.DefaultConfigTypeScheme))
- Expect(len(ctx.ConfigTypes().KnownTypeNames())).To(Equal(0))
- })
-})
diff --git a/pkg/contexts/config/internal/config.go b/pkg/contexts/config/internal/config.go
deleted file mode 100644
index 0b8923ec8..000000000
--- a/pkg/contexts/config/internal/config.go
+++ /dev/null
@@ -1,61 +0,0 @@
-package internal
-
-import (
- "fmt"
-
- "github.com/mandelsoft/goutils/errors"
-
- "github.com/open-component-model/ocm/pkg/runtime"
-)
-
-const KIND_CONFIGSET = "config set"
-
-type ConfigApplier interface {
- ApplyConfigTo(Context, cfg, tgt interface{}) error
-}
-
-type Config interface {
- runtime.VersionedTypedObject
-
- ApplyTo(Context, interface{}) error
-}
-
-type ConfigApplierFunction func(ctx Context, cfg, tgt interface{}) error
-
-func (f ConfigApplierFunction) ApplyConfigTo(ctx Context, cfg, tgt interface{}) error {
- return f(ctx, cfg, tgt)
-}
-
-type ConfigSet struct {
- Description string `json:"description,omitempty"`
- ConfigurationList `json:",inline"`
-}
-
-type ConfigurationList struct {
- Configurations []*GenericConfig `json:"configurations,omitempty"`
-}
-
-func (c *ConfigurationList) AddConfig(cfg Config) error {
- g, err := ToGenericConfig(cfg)
- if err != nil {
- return fmt.Errorf("unable to convert config to generic: %w", err)
- }
-
- c.Configurations = append(c.Configurations, g)
-
- return nil
-}
-
-func (c *ConfigurationList) AddConfigData(ctx Context, data []byte) error {
- cfg, err := ctx.GetConfigForData(data, nil)
- if err != nil {
- return errors.Wrapf(err, "invalid config specification")
- }
- g, err := ToGenericConfig(cfg)
- if err != nil {
- return fmt.Errorf("unable to convert config to generic: %w", err)
- }
-
- c.Configurations = append(c.Configurations, g)
- return nil
-}
diff --git a/pkg/contexts/config/internal/context.go b/pkg/contexts/config/internal/context.go
deleted file mode 100644
index 02777ceaf..000000000
--- a/pkg/contexts/config/internal/context.go
+++ /dev/null
@@ -1,356 +0,0 @@
-package internal
-
-import (
- "context"
- "reflect"
-
- "github.com/mandelsoft/goutils/errors"
-
- "github.com/open-component-model/ocm/pkg/common"
- "github.com/open-component-model/ocm/pkg/contexts/datacontext"
- "github.com/open-component-model/ocm/pkg/runtime"
- "github.com/open-component-model/ocm/pkg/utils"
-)
-
-// OCM_CONFIG_TYPE_SUFFIX is the standard suffix used for configuration
-// types provided by this library.
-const OCM_CONFIG_TYPE_SUFFIX = ".config" + common.OCM_TYPE_GROUP_SUFFIX
-
-type ConfigSelector interface {
- Select(Config) bool
-}
-type ConfigSelectorFunction func(Config) bool
-
-func (f ConfigSelectorFunction) Select(cfg Config) bool { return f(cfg) }
-
-var AllConfigs = AppliedConfigSelectorFunction(func(*AppliedConfig) bool { return true })
-
-const AllGenerations int64 = 0
-
-const CONTEXT_TYPE = "config" + datacontext.OCM_CONTEXT_SUFFIX
-
-type ContextProvider interface {
- ConfigContext() Context
-}
-
-type Context interface {
- datacontext.Context
- ContextProvider
-
- AttributesContext() datacontext.AttributesContext
-
- // Info provides the context for nested configuration evaluation
- Info() string
- // WithInfo provides the same context with additional nesting info
- WithInfo(desc string) Context
-
- ConfigTypes() ConfigTypeScheme
-
- // SkipUnknownConfig can be used to control the behaviour
- // for processing unknown configuration object types.
- // It returns the previous mode valid before setting the
- // new one.
- SkipUnknownConfig(bool) bool
-
- // Validate validates the applied configuration for not using
- // unknown configuration types, anymore. This can be used after setting
- // SkipUnknownConfig, to check whether there are still unknown types
- // which will be skipped. It does not provide information, whether
- // config objects were skipped for previous object configuration
- // requests.
- Validate() error
-
- // GetConfigForData deserialize configuration objects for known
- // configuration types.
- GetConfigForData(data []byte, unmarshaler runtime.Unmarshaler) (Config, error)
-
- // ApplyData applies the config given by a byte stream to the config store
- // If the config type is not known, a generic config is stored and returned.
- // In this case an unknown error for kind KIND_CONFIGTYPE is returned.
- ApplyData(data []byte, unmarshaler runtime.Unmarshaler, desc string) (Config, error)
- // ApplyConfig applies the config to the config store
- ApplyConfig(spec Config, desc string) error
-
- GetConfigForType(generation int64, typ string) (int64, []Config)
- GetConfigForName(generation int64, name string) (int64, []Config)
- GetConfig(generation int64, selector ConfigSelector) (int64, []Config)
-
- AddConfigSet(name string, set *ConfigSet)
- ApplyConfigSet(name string) error
-
- // Reset all configs applied so far, subsequent calls to ApplyTo will
- // ony see configs allpied after the last reset.
- Reset() int64
- // Generation return the actual config generation.
- // this is a strictly increasing number, regardless of the number
- // of Reset calls.
- Generation() int64
- // ApplyTo applies all configurations applied after the last reset with
- // a generation larger than the given watermark to the specified target.
- // A target may be any object. The applied configuration objects decide
- // on their own whether they are applicable for the given target.
- // The generation of the last applied object is returned to be used as
- // new watermark.
- ApplyTo(gen int64, target interface{}) (int64, error)
-}
-
-var key = reflect.TypeOf(_context{})
-
-// DefaultContext is the default context initialized by init functions.
-var DefaultContext = Builder{}.New(datacontext.MODE_SHARED)
-
-// FromContext returns the Context to use for context.Context.
-// This is either an explicit context or the default context.
-// The returned context incorporates the given context.
-func FromContext(ctx context.Context) Context {
- c, _ := datacontext.ForContextByKey(ctx, key, DefaultContext)
- return c.(Context)
-}
-
-func FromProvider(p ContextProvider) Context {
- if p == nil {
- return nil
- }
- return p.ConfigContext()
-}
-
-func DefinedForContext(ctx context.Context) (Context, bool) {
- c, ok := datacontext.ForContextByKey(ctx, key, DefaultContext)
- if c != nil {
- return c.(Context), ok
- }
- return nil, ok
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-type _InternalContext = datacontext.InternalContext
-
-type coreContext struct {
- _InternalContext
- updater Updater
-
- sharedAttributes datacontext.AttributesContext
-
- knownConfigTypes ConfigTypeScheme
-
- configs *ConfigStore
- skipUnknownConfig bool
-}
-
-type _context struct {
- *coreContext
- description string
-}
-
-var (
- _ Context = (*_context)(nil)
- _ datacontext.ViewCreator[Context] = (*_context)(nil)
-)
-
-// gcWrapper is used as garbage collectable
-// wrapper for a context implementation
-// to establish a runtime finalizer.
-type gcWrapper struct {
- datacontext.GCWrapper
- *_context
-}
-
-func newView(c *_context, ref ...bool) Context {
- if utils.Optional(ref...) {
- return datacontext.FinalizedContext[gcWrapper](c)
- }
- return c
-}
-
-func (w *gcWrapper) SetContext(c *_context) {
- w._context = c
-}
-
-func newContext(shared datacontext.AttributesContext, reposcheme ConfigTypeScheme, delegates datacontext.Delegates) Context {
- c := &_context{
- coreContext: &coreContext{
- sharedAttributes: shared,
- knownConfigTypes: reposcheme,
- configs: NewConfigStore(),
- },
- }
- c._InternalContext = datacontext.NewContextBase(c, CONTEXT_TYPE, key, shared.GetAttributes(), delegates)
- c.updater = NewUpdaterForFactory(c, c.ConfigContext) // provide target as new view to internal context
- datacontext.AssureUpdater(shared, NewUpdater(c, datacontext.PersistentContextRef(shared)))
-
- return newView(c, true)
-}
-
-func (c *_context) CreateView() Context {
- return newView(c, true)
-}
-
-func (c *_context) ConfigContext() Context {
- return newView(c)
-}
-
-func (c *_context) Update() error {
- return c.updater.Update()
-}
-
-var _ datacontext.Updater = (*_context)(nil)
-
-func (c *_context) Info() string {
- return c.description
-}
-
-func (c *_context) WithInfo(desc string) Context {
- if c.description != "" {
- desc = desc + "--" + c.description
- }
- return newView(&_context{c.coreContext, desc})
-}
-
-func (c *_context) AttributesContext() datacontext.AttributesContext {
- c.updater.Update()
- return c.sharedAttributes
-}
-
-func (c *_context) ConfigTypes() ConfigTypeScheme {
- return c.knownConfigTypes
-}
-
-func (c *_context) SkipUnknownConfig(b bool) bool {
- old := c.skipUnknownConfig
- c.skipUnknownConfig = b
- return old
-}
-
-func (c *_context) ConfigForData(data []byte, unmarshaler runtime.Unmarshaler) (Config, error) {
- return c.knownConfigTypes.Decode(data, unmarshaler)
-}
-
-func (c *_context) GetConfigForData(data []byte, unmarshaler runtime.Unmarshaler) (Config, error) {
- spec, err := c.knownConfigTypes.Decode(data, unmarshaler)
- if err != nil {
- return nil, err
- }
- return spec, nil
-}
-
-func (c *_context) ApplyConfig(spec Config, desc string) error {
- var unknown error
-
- // use temporary view for outbound calls
- spec, err := (&AppliedConfig{config: spec}).eval(newView(c))
- if err != nil {
- if !errors.IsErrUnknownKind(err, KIND_CONFIGTYPE) {
- return errors.Wrapf(err, "%s", desc)
- }
- if !c.skipUnknownConfig {
- unknown = err
- }
- err = nil
- }
-
- c.configs.Apply(spec, desc)
-
- for {
- // apply directly and also indirectly described configurations
- if gen, in := c.updater.State(); err != nil || in || gen >= c.configs.Generation() {
- break
- }
- err = c.Update()
- if IsErrNoContext(err) {
- err = unknown
- }
- }
-
- return errors.Wrapf(err, "%s", desc)
-}
-
-func (c *_context) ApplyData(data []byte, unmarshaler runtime.Unmarshaler, desc string) (Config, error) {
- spec, err := c.knownConfigTypes.Decode(data, unmarshaler)
- if err != nil {
- return nil, err
- }
- return spec, c.ApplyConfig(spec, desc)
-}
-
-func (c *_context) selector(gen int64, selector ConfigSelector) AppliedConfigSelector {
- if gen <= 0 {
- return AppliedConfigSelectorFor(selector)
- }
- if selector == nil {
- return AppliedGenerationSelector(gen)
- }
- return AppliedAndSelector(AppliedGenerationSelector(gen), AppliedConfigSelectorFor(selector))
-}
-
-func (c *_context) Generation() int64 {
- return c.configs.Generation()
-}
-
-func (c *_context) Reset() int64 {
- return c.configs.Reset()
-}
-
-func (c *_context) ApplyTo(gen int64, target interface{}) (int64, error) {
- cur := c.configs.Generation()
- if cur <= gen {
- return gen, nil
- }
- cur, cfgs := c.configs.GetConfigForSelector(c, AppliedGenerationSelector(gen))
-
- list := errors.ErrListf("config apply errors")
- for _, cfg := range cfgs {
- err := cfg.config.ApplyTo(c.WithInfo(cfg.description), target)
- if c.skipUnknownConfig && errors.IsErrUnknownKind(err, KIND_CONFIGTYPE) {
- err = nil
- }
- err = errors.Wrapf(err, "%s", cfg.description)
- if !IsErrNoContext(err) {
- list.Add(err)
- }
- }
- return cur, list.Result()
-}
-
-func (c *_context) Validate() error {
- list := errors.ErrList()
-
- _, cfgs := c.configs.GetConfigForSelector(c, AllAppliedConfigs)
- for _, cfg := range cfgs {
- _, err := cfg.eval(newView(c))
- list.Add(err)
- }
- return list.Result()
-}
-
-func (c *_context) AddConfigSet(name string, set *ConfigSet) {
- c.configs.AddSet(name, set)
-}
-
-func (c *_context) ApplyConfigSet(name string) error {
- set := c.configs.GetSet(name)
- if set == nil {
- return errors.ErrUnknown(KIND_CONFIGSET, name)
- }
- desc := "config set " + name
- list := errors.ErrListf("applying %s", desc)
- for _, cfg := range set.Configurations {
- list.Add(c.ApplyConfig(cfg, desc))
- }
- return list.Result()
-}
-
-func (c *_context) GetConfig(gen int64, selector ConfigSelector) (int64, []Config) {
- gen, cfgs := c.configs.GetConfigForSelector(c, c.selector(gen, selector))
- return gen, cfgs.Configs()
-}
-
-func (c *_context) GetConfigForName(gen int64, name string) (int64, []Config) {
- gen, cfgs := c.configs.GetConfigForName(c, name, c.selector(gen, nil))
- return gen, cfgs.Configs()
-}
-
-func (c *_context) GetConfigForType(gen int64, typ string) (int64, []Config) {
- gen, cfgs := c.configs.GetConfigForType(c, typ, c.selector(gen, nil))
- return gen, cfgs.Configs()
-}
diff --git a/pkg/contexts/config/internal/logging.go b/pkg/contexts/config/internal/logging.go
deleted file mode 100644
index 396e75025..000000000
--- a/pkg/contexts/config/internal/logging.go
+++ /dev/null
@@ -1,9 +0,0 @@
-package internal
-
-import (
- ocmlog "github.com/open-component-model/ocm/pkg/logging"
-)
-
-var Realm = ocmlog.DefineSubRealm("configuration management", "config")
-
-var Logger = ocmlog.DynamicLogger(Realm)
diff --git a/pkg/contexts/config/internal/setup_test.go b/pkg/contexts/config/internal/setup_test.go
deleted file mode 100644
index bfe489c86..000000000
--- a/pkg/contexts/config/internal/setup_test.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package internal_test
-
-import (
- . "github.com/onsi/ginkgo/v2"
- . "github.com/onsi/gomega"
-
- "github.com/open-component-model/ocm/pkg/contexts/config"
- "github.com/open-component-model/ocm/pkg/contexts/config/internal"
-)
-
-var _ = Describe("setup", func() {
- It("creates initial", func() {
- Expect(len(config.DefaultContext().ConfigTypes().KnownTypeNames())).To(Equal(6))
- Expect(len(internal.DefaultConfigTypeScheme.KnownTypeNames())).To(Equal(6))
- })
-})
diff --git a/pkg/contexts/config/logging.go b/pkg/contexts/config/logging.go
deleted file mode 100644
index cc3916117..000000000
--- a/pkg/contexts/config/logging.go
+++ /dev/null
@@ -1,17 +0,0 @@
-package config
-
-import (
- "github.com/open-component-model/ocm/pkg/contexts/config/internal"
-)
-
-var Realm = internal.Realm
-
-var Logger = internal.Logger
-
-func Debug(c Context, msg string, keypairs ...interface{}) {
- c.LoggingContext().Logger(Realm).Debug(msg, append(keypairs, "id", c.GetId())...)
-}
-
-func Info(c Context, msg string, keypairs ...interface{}) {
- c.LoggingContext().Logger(Realm).Info(msg, append(keypairs, "id", c.GetId())...)
-}
diff --git a/pkg/contexts/config/plugin/type.go b/pkg/contexts/config/plugin/type.go
deleted file mode 100644
index a240644ff..000000000
--- a/pkg/contexts/config/plugin/type.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package plugin
-
-import (
- "github.com/open-component-model/ocm/pkg/contexts/config/cpi"
- "github.com/open-component-model/ocm/pkg/contexts/config/internal"
- "github.com/open-component-model/ocm/pkg/runtime"
-)
-
-var _ cpi.Config = (*Config)(nil)
-
-type Config struct {
- runtime.UnstructuredVersionedTypedObject `json:",inline"`
-}
-
-func (c *Config) ApplyTo(context internal.Context, i interface{}) error {
- return nil
-}
-
-func New(name string, desc string) cpi.ConfigType {
- return cpi.NewConfigType[*Config](name, desc)
-}
diff --git a/pkg/contexts/credentials/builder.go b/pkg/contexts/credentials/builder.go
deleted file mode 100644
index fcb4c2568..000000000
--- a/pkg/contexts/credentials/builder.go
+++ /dev/null
@@ -1,29 +0,0 @@
-package credentials
-
-import (
- "context"
-
- "github.com/open-component-model/ocm/pkg/contexts/config"
- "github.com/open-component-model/ocm/pkg/contexts/credentials/internal"
- "github.com/open-component-model/ocm/pkg/contexts/datacontext"
-)
-
-func WithContext(ctx context.Context) internal.Builder {
- return internal.Builder{}.WithContext(ctx)
-}
-
-func WithConfigs(ctx config.Context) internal.Builder {
- return internal.Builder{}.WithConfig(ctx)
-}
-
-func WithRepositoyTypeScheme(scheme RepositoryTypeScheme) internal.Builder {
- return internal.Builder{}.WithRepositoyTypeScheme(scheme)
-}
-
-func WithStandardConumerMatchers(matchers internal.IdentityMatcherRegistry) internal.Builder {
- return internal.Builder{}.WithStandardConumerMatchers(matchers)
-}
-
-func New(mode ...datacontext.BuilderMode) Context {
- return internal.Builder{}.New(mode...)
-}
diff --git a/pkg/contexts/credentials/builtin/github/github.go b/pkg/contexts/credentials/builtin/github/github.go
deleted file mode 100644
index 733820d04..000000000
--- a/pkg/contexts/credentials/builtin/github/github.go
+++ /dev/null
@@ -1,22 +0,0 @@
-package github
-
-import (
- "os"
-
- "github.com/open-component-model/ocm/pkg/common"
- "github.com/open-component-model/ocm/pkg/contexts/credentials/builtin/github/identity"
- "github.com/open-component-model/ocm/pkg/contexts/credentials/cpi"
-)
-
-func init() {
- t := os.Getenv("GITHUB_TOKEN")
- if t != "" {
- us := os.Getenv("GITHUB_SERVER_URL")
- id := identity.GetConsumerId(us)
-
- if src, err := cpi.DefaultContext.GetCredentialsForConsumer(id); err != nil || src == nil {
- creds := cpi.NewCredentials(common.Properties{cpi.ATTR_TOKEN: t})
- cpi.DefaultContext.SetCredentialsForConsumer(id, creds)
- }
- }
-}
diff --git a/pkg/contexts/credentials/builtin/github/identity/identity.go b/pkg/contexts/credentials/builtin/github/identity/identity.go
deleted file mode 100644
index c07a16906..000000000
--- a/pkg/contexts/credentials/builtin/github/identity/identity.go
+++ /dev/null
@@ -1,83 +0,0 @@
-package identity
-
-import (
- "net/url"
- "path"
- "strings"
-
- "github.com/open-component-model/ocm/pkg/contexts/credentials/cpi"
- "github.com/open-component-model/ocm/pkg/contexts/credentials/identity/hostpath"
- "github.com/open-component-model/ocm/pkg/listformat"
-)
-
-const CONSUMER_TYPE = "Github"
-
-// identity properties
-const (
- ID_HOSTNAME = hostpath.ID_HOSTNAME
- ID_PORT = hostpath.ID_PORT
- ID_PATHPREFIX = hostpath.ID_PATHPREFIX
-)
-
-// credential properties
-const (
- ATTR_TOKEN = cpi.ATTR_TOKEN
-)
-
-const GITHUB = "github.com"
-
-var identityMatcher = hostpath.IdentityMatcher(CONSUMER_TYPE)
-
-func IdentityMatcher(pattern, cur, id cpi.ConsumerIdentity) bool {
- return identityMatcher(pattern, cur, id)
-}
-
-func init() {
- attrs := listformat.FormatListElements("", listformat.StringElementDescriptionList{
- ATTR_TOKEN, "GitHub personal access token",
- })
- cpi.RegisterStandardIdentity(CONSUMER_TYPE, identityMatcher,
- `GitHub credential matcher
-
-This matcher is a hostpath matcher.`,
- attrs)
-}
-
-func PATCredentials(pat string) cpi.Credentials {
- return cpi.DirectCredentials{
- ATTR_TOKEN: pat,
- }
-}
-
-func GetConsumerId(serverurl string, repo ...string) cpi.ConsumerIdentity {
- host := GITHUB
- port := ""
- if serverurl != "" {
- u, err := url.Parse(serverurl)
- if err == nil {
- host = u.Host
- }
- }
- if idx := strings.Index(host, ":"); idx > 0 {
- port = host[idx+1:]
- host = host[:idx]
- }
-
- id := cpi.ConsumerIdentity{
- cpi.ID_TYPE: CONSUMER_TYPE,
- ID_HOSTNAME: host,
- }
- if port != "" {
- id[ID_PORT] = port
- }
- p := path.Join(repo...)
- if p != "" {
- id[ID_PATHPREFIX] = p
- }
- return id
-}
-
-func GetCredentials(ctx cpi.ContextProvider, serverurl string, repo ...string) (cpi.Credentials, error) {
- id := GetConsumerId(serverurl, repo...)
- return cpi.CredentialsForConsumer(ctx.CredentialsContext(), id, identityMatcher)
-}
diff --git a/pkg/contexts/credentials/builtin/helm/identity/identity.go b/pkg/contexts/credentials/builtin/helm/identity/identity.go
deleted file mode 100644
index eac827125..000000000
--- a/pkg/contexts/credentials/builtin/helm/identity/identity.go
+++ /dev/null
@@ -1,103 +0,0 @@
-package identity
-
-import (
- "strings"
-
- "helm.sh/helm/v3/pkg/registry"
-
- "github.com/open-component-model/ocm/pkg/common"
- ociidentity "github.com/open-component-model/ocm/pkg/contexts/credentials/builtin/oci/identity"
- "github.com/open-component-model/ocm/pkg/contexts/credentials/cpi"
- "github.com/open-component-model/ocm/pkg/contexts/credentials/identity/hostpath"
- "github.com/open-component-model/ocm/pkg/listformat"
-)
-
-// CONSUMER_TYPE is the Helm chart repository type.
-const CONSUMER_TYPE = "HelmChartRepository"
-
-// ID_TYPE is the type field of a consumer identity.
-const ID_TYPE = cpi.ID_TYPE
-
-// ID_SCHEME is the scheme of the repository.
-const ID_SCHEME = hostpath.ID_SCHEME
-
-// ID_HOSTNAME is the hostname of a repository.
-const ID_HOSTNAME = hostpath.ID_HOSTNAME
-
-// ID_PORT is the port number of a repository.
-const ID_PORT = hostpath.ID_PORT
-
-// ID_PATHPREFIX is the path of a repository.
-const ID_PATHPREFIX = hostpath.ID_PATHPREFIX
-
-func init() {
- attrs := listformat.FormatListElements("", listformat.StringElementDescriptionList{
- ATTR_USERNAME, "the basic auth user name",
- ATTR_PASSWORD, "the basic auth password",
- ATTR_CERTIFICATE, "TLS client certificate",
- ATTR_PRIVATE_KEY, "TLS private key",
- ATTR_CERTIFICATE_AUTHORITY, "TLS certificate authority",
- })
-
- cpi.RegisterStandardIdentity(CONSUMER_TYPE, IdentityMatcher, `Helm chart repository
-
-It matches the `+CONSUMER_TYPE+` consumer type and additionally acts like
-the `+hostpath.IDENTITY_TYPE+` type.`,
- attrs)
-}
-
-var identityMatcher = hostpath.IdentityMatcher("")
-
-func IdentityMatcher(pattern, cur, id cpi.ConsumerIdentity) bool {
- return identityMatcher(pattern, cur, id)
-}
-
-// used credential attributes
-
-const (
- ATTR_USERNAME = cpi.ATTR_USERNAME
- ATTR_PASSWORD = cpi.ATTR_PASSWORD
- ATTR_CERTIFICATE_AUTHORITY = cpi.ATTR_CERTIFICATE_AUTHORITY
- ATTR_CERTIFICATE = cpi.ATTR_CERTIFICATE
- ATTR_PRIVATE_KEY = cpi.ATTR_PRIVATE_KEY
-)
-
-func OCIRepoURL(repourl string, chartname string) string {
- repourl = strings.TrimSuffix(repourl, "/")[3+len(registry.OCIScheme):]
- if chartname != "" {
- repourl += "/" + chartname
- }
- return repourl
-}
-
-func SimpleCredentials(user, passwd string) cpi.Credentials {
- return cpi.DirectCredentials{
- ATTR_USERNAME: user,
- ATTR_PASSWORD: passwd,
- }
-}
-
-func GetConsumerId(repourl string, chartname string) cpi.ConsumerIdentity {
- i := strings.LastIndex(chartname, ":")
- if i >= 0 {
- chartname = chartname[:i]
- }
- if registry.IsOCI(repourl) {
- repourl = strings.TrimSuffix(repourl, "/")
- return ociidentity.GetConsumerId(OCIRepoURL(repourl, ""), chartname)
- } else {
- return hostpath.GetConsumerIdentity(CONSUMER_TYPE, repourl)
- }
-}
-
-func GetCredentials(ctx cpi.ContextProvider, repourl string, chartname string) common.Properties {
- id := GetConsumerId(repourl, chartname)
- if id == nil {
- return nil
- }
- creds, err := cpi.CredentialsForConsumer(ctx.CredentialsContext(), id)
- if creds == nil || err != nil {
- return nil
- }
- return creds.Properties()
-}
diff --git a/pkg/contexts/credentials/builtin/helm/identity/identity_test.go b/pkg/contexts/credentials/builtin/helm/identity/identity_test.go
deleted file mode 100644
index 752637555..000000000
--- a/pkg/contexts/credentials/builtin/helm/identity/identity_test.go
+++ /dev/null
@@ -1,77 +0,0 @@
-package identity_test
-
-import (
- . "github.com/onsi/ginkgo/v2"
- . "github.com/onsi/gomega"
- . "github.com/open-component-model/ocm/pkg/contexts/credentials/builtin/helm/identity"
-
- "github.com/open-component-model/ocm/pkg/common"
- "github.com/open-component-model/ocm/pkg/contexts/credentials"
- ociidentity "github.com/open-component-model/ocm/pkg/contexts/credentials/builtin/oci/identity"
- "github.com/open-component-model/ocm/pkg/contexts/datacontext"
- "github.com/open-component-model/ocm/pkg/contexts/oci"
-)
-
-var _ = Describe("consumer id handling", func() {
- Context("id deternation", func() {
- It("handles helm repos", func() {
- id := GetConsumerId("https://acme.org/charts", "demo:v1")
- Expect(id).To(Equal(credentials.NewConsumerIdentity(CONSUMER_TYPE,
- "pathprefix", "charts",
- "port", "443",
- "hostname", "acme.org",
- "scheme", "https",
- )))
- })
-
- It("handles oci repos", func() {
- id := GetConsumerId("oci://acme.org/charts", "demo:v1")
- Expect(id).To(Equal(credentials.NewConsumerIdentity(ociidentity.CONSUMER_TYPE,
- "pathprefix", "charts/demo",
- "hostname", "acme.org",
- )))
- })
- })
-
- Context("query credentials", func() {
- var ctx oci.Context
- var credctx credentials.Context
-
- BeforeEach(func() {
- ctx = oci.New(datacontext.MODE_EXTENDED)
- credctx = ctx.CredentialsContext()
- })
-
- It("queries helm credentials", func() {
- id := GetConsumerId("https://acme.org/charts", "demo:v1")
- credctx.SetCredentialsForConsumer(id,
- credentials.CredentialsFromList(
- ATTR_USERNAME, "helm",
- ATTR_PASSWORD, "helmpass",
- ),
- )
-
- creds := GetCredentials(ctx, "https://acme.org/charts", "demo:v1")
- Expect(creds).To(Equal(common.Properties{
- ATTR_USERNAME: "helm",
- ATTR_PASSWORD: "helmpass",
- }))
- })
-
- It("queries oci credentials", func() {
- id := GetConsumerId("oci://acme.org/charts", "demo:v1")
- credctx.SetCredentialsForConsumer(id,
- credentials.CredentialsFromList(
- ATTR_USERNAME, "oci",
- ATTR_PASSWORD, "ocipass",
- ),
- )
-
- creds := GetCredentials(ctx, "oci://acme.org/charts", "demo:v1")
- Expect(creds).To(Equal(common.Properties{
- ATTR_USERNAME: "oci",
- ATTR_PASSWORD: "ocipass",
- }))
- })
- })
-})
diff --git a/pkg/contexts/credentials/builtin/init.go b/pkg/contexts/credentials/builtin/init.go
deleted file mode 100644
index 7996eab6a..000000000
--- a/pkg/contexts/credentials/builtin/init.go
+++ /dev/null
@@ -1,8 +0,0 @@
-package builtin
-
-import (
- _ "github.com/open-component-model/ocm/pkg/contexts/credentials/builtin/github"
- _ "github.com/open-component-model/ocm/pkg/contexts/credentials/builtin/helm/identity"
- _ "github.com/open-component-model/ocm/pkg/contexts/credentials/builtin/oci/identity"
- _ "github.com/open-component-model/ocm/pkg/contexts/credentials/builtin/wget/identity"
-)
diff --git a/pkg/contexts/credentials/builtin/maven/identity/identity.go b/pkg/contexts/credentials/builtin/maven/identity/identity.go
deleted file mode 100644
index 491e38b45..000000000
--- a/pkg/contexts/credentials/builtin/maven/identity/identity.go
+++ /dev/null
@@ -1,62 +0,0 @@
-package identity
-
-import (
- . "net/url"
-
- "github.com/open-component-model/ocm/pkg/contexts/credentials/cpi"
- "github.com/open-component-model/ocm/pkg/contexts/credentials/identity/hostpath"
- "github.com/open-component-model/ocm/pkg/listformat"
- "github.com/open-component-model/ocm/pkg/logging"
-)
-
-const (
- // CONSUMER_TYPE is the maven repository type.
- CONSUMER_TYPE = "MavenRepository"
-
- // ATTR_USERNAME is the username attribute. Required for login at any maven registry.
- ATTR_USERNAME = cpi.ATTR_USERNAME
- // ATTR_PASSWORD is the password attribute. Required for login at any maven registry.
- ATTR_PASSWORD = cpi.ATTR_PASSWORD
-)
-
-// REALM the logging realm / prefix.
-var REALM = logging.DefineSubRealm("Maven repository", "maven")
-
-func init() {
- attrs := listformat.FormatListElements("", listformat.StringElementDescriptionList{
- ATTR_USERNAME, "the basic auth user name",
- ATTR_PASSWORD, "the basic auth password",
- })
-
- cpi.RegisterStandardIdentity(CONSUMER_TYPE, hostpath.IdentityMatcher(CONSUMER_TYPE), `MVN repository
-
-It matches the `+CONSUMER_TYPE+` consumer type and additionally acts like
-the `+hostpath.IDENTITY_TYPE+` type.`,
- attrs)
-}
-
-var identityMatcher = hostpath.IdentityMatcher(CONSUMER_TYPE)
-
-func IdentityMatcher(pattern, cur, id cpi.ConsumerIdentity) bool {
- return identityMatcher(pattern, cur, id)
-}
-
-func GetConsumerId(rawURL, groupId string) (cpi.ConsumerIdentity, error) {
- url, err := JoinPath(rawURL, groupId)
- if err != nil {
- return nil, err
- }
- return hostpath.GetConsumerIdentity(CONSUMER_TYPE, url), nil
-}
-
-func GetCredentials(ctx cpi.ContextProvider, repoUrl, groupId string) (cpi.Credentials, error) {
- id, err := GetConsumerId(repoUrl, groupId)
- if err != nil {
- return nil, err
- }
- if id == nil {
- logging.DynamicLogger(REALM).Debug("No consumer identity found.", "url", repoUrl, "groupId", groupId)
- return nil, nil
- }
- return cpi.CredentialsForConsumer(ctx.CredentialsContext(), id)
-}
diff --git a/pkg/contexts/credentials/builtin/npm/identity/identity.go b/pkg/contexts/credentials/builtin/npm/identity/identity.go
deleted file mode 100644
index dd90ef107..000000000
--- a/pkg/contexts/credentials/builtin/npm/identity/identity.go
+++ /dev/null
@@ -1,68 +0,0 @@
-package identity
-
-import (
- "net/url"
-
- "github.com/open-component-model/ocm/pkg/contexts/credentials/cpi"
- "github.com/open-component-model/ocm/pkg/contexts/credentials/identity/hostpath"
- "github.com/open-component-model/ocm/pkg/listformat"
- "github.com/open-component-model/ocm/pkg/logging"
-)
-
-const (
- // CONSUMER_TYPE is the npm repository type.
- CONSUMER_TYPE = "NpmRegistry"
-
- // ATTR_USERNAME is the username attribute. Required for login at any npm registry.
- ATTR_USERNAME = cpi.ATTR_USERNAME
- // ATTR_PASSWORD is the password attribute. Required for login at any npm registry.
- ATTR_PASSWORD = cpi.ATTR_PASSWORD
- // ATTR_EMAIL is the email attribute. Required for login at any npm registry.
- ATTR_EMAIL = cpi.ATTR_EMAIL
- // ATTR_TOKEN is the token attribute. May exist after login at any npm registry.
- ATTR_TOKEN = cpi.ATTR_TOKEN
-)
-
-// Logging Realm.
-var REALM = logging.DefineSubRealm("NPM registry", "npm")
-
-func init() {
- attrs := listformat.FormatListElements("", listformat.StringElementDescriptionList{
- ATTR_USERNAME, "the basic auth user name",
- ATTR_PASSWORD, "the basic auth password",
- ATTR_EMAIL, "NPM registry, require an email address",
- ATTR_TOKEN, "the token attribute. May exist after login at any npm registry. Check your .npmrc file!",
- })
-
- cpi.RegisterStandardIdentity(CONSUMER_TYPE, hostpath.IdentityMatcher(CONSUMER_TYPE), `NPM registry
-
-It matches the `+CONSUMER_TYPE+` consumer type and additionally acts like
-the `+hostpath.IDENTITY_TYPE+` type.`,
- attrs)
-}
-
-var identityMatcher = hostpath.IdentityMatcher(CONSUMER_TYPE)
-
-func IdentityMatcher(pattern, cur, id cpi.ConsumerIdentity) bool {
- return identityMatcher(pattern, cur, id)
-}
-
-func GetConsumerId(rawURL, groupId string) (cpi.ConsumerIdentity, error) {
- _url, err := url.JoinPath(rawURL, groupId)
- if err != nil {
- return nil, err
- }
- return hostpath.GetConsumerIdentity(CONSUMER_TYPE, _url), nil
-}
-
-func GetCredentials(ctx cpi.ContextProvider, repoUrl string, pkgName string) (cpi.Credentials, error) {
- id, err := GetConsumerId(repoUrl, pkgName)
- if err != nil {
- return nil, err
- }
- if id == nil {
- logging.DynamicLogger(REALM).Debug("No consumer identity found.", "url", repoUrl, "groupId", pkgName)
- return nil, nil
- }
- return cpi.CredentialsForConsumer(ctx.CredentialsContext(), id)
-}
diff --git a/pkg/contexts/credentials/builtin/oci/identity/id_test.go b/pkg/contexts/credentials/builtin/oci/identity/id_test.go
deleted file mode 100644
index e516ef0ed..000000000
--- a/pkg/contexts/credentials/builtin/oci/identity/id_test.go
+++ /dev/null
@@ -1,145 +0,0 @@
-package identity_test
-
-import (
- . "github.com/onsi/ginkgo/v2"
- . "github.com/onsi/gomega"
-
- "github.com/open-component-model/ocm/pkg/contexts/credentials"
- "github.com/open-component-model/ocm/pkg/contexts/credentials/builtin/oci/identity"
-)
-
-var _ = Describe("ctf management", func() {
- Context("with path", func() {
- pat := credentials.ConsumerIdentity{
- identity.ID_HOSTNAME: "host",
- identity.ID_PATHPREFIX: "a/b",
- identity.ID_PORT: "4711",
- }
-
- It("complete", func() {
- id := credentials.ConsumerIdentity{
- identity.ID_HOSTNAME: "host",
- identity.ID_PATHPREFIX: "a/b",
- identity.ID_PORT: "4711",
- }
- Expect(identity.IdentityMatcher(pat, nil, id)).To(BeTrue())
- Expect(identity.IdentityMatcher(pat, id, id)).To(BeFalse())
- })
-
- It("path prefix", func() {
- id := credentials.ConsumerIdentity{
- identity.ID_HOSTNAME: "host",
- identity.ID_PATHPREFIX: "a",
- identity.ID_PORT: "4711",
- }
- Expect(identity.IdentityMatcher(pat, nil, id)).To(BeTrue())
- Expect(identity.IdentityMatcher(pat, pat, id)).To(BeFalse())
- })
- It("different prefix", func() {
- id := credentials.ConsumerIdentity{
- identity.ID_HOSTNAME: "host",
- identity.ID_PATHPREFIX: "b",
- identity.ID_PORT: "4711",
- }
- Expect(identity.IdentityMatcher(pat, nil, id)).To(BeFalse())
- Expect(identity.IdentityMatcher(pat, pat, id)).To(BeFalse())
- })
- It("longer prefix", func() {
- id := credentials.ConsumerIdentity{
- identity.ID_HOSTNAME: "host",
- identity.ID_PATHPREFIX: "a/b/c",
- identity.ID_PORT: "4711",
- }
- Expect(identity.IdentityMatcher(pat, nil, id)).To(BeFalse())
- Expect(identity.IdentityMatcher(pat, pat, id)).To(BeFalse())
- })
- It("missing path", func() {
- id := credentials.ConsumerIdentity{
- identity.ID_HOSTNAME: "host",
- identity.ID_PORT: "4711",
- }
- Expect(identity.IdentityMatcher(pat, nil, id)).To(BeTrue())
- Expect(identity.IdentityMatcher(pat, pat, id)).To(BeFalse())
- })
- It("missing port", func() {
- id := credentials.ConsumerIdentity{
- identity.ID_HOSTNAME: "host",
- identity.ID_PATHPREFIX: "a/b",
- }
- Expect(identity.IdentityMatcher(pat, nil, id)).To(BeTrue())
- Expect(identity.IdentityMatcher(pat, pat, id)).To(BeFalse())
-
- Expect(identity.IdentityMatcher(id, nil, pat)).To(BeTrue()) // accept additional port as fallback
- Expect(identity.IdentityMatcher(id, id, pat)).To(BeFalse()) // but not to replace more general match
- })
- It("different port", func() {
- id := credentials.ConsumerIdentity{
- identity.ID_HOSTNAME: "host",
- identity.ID_PATHPREFIX: "a/b",
- identity.ID_PORT: "0815",
- }
- Expect(identity.IdentityMatcher(pat, nil, id)).To(BeFalse())
- Expect(identity.IdentityMatcher(pat, pat, id)).To(BeFalse())
- })
-
- It("different host", func() {
- id := credentials.ConsumerIdentity{
- identity.ID_HOSTNAME: "other",
- identity.ID_PATHPREFIX: "a/b",
- identity.ID_PORT: "4711",
- }
- Expect(identity.IdentityMatcher(pat, nil, id)).To(BeFalse())
- Expect(identity.IdentityMatcher(pat, pat, id)).To(BeFalse())
- })
- It("no host", func() {
- id := credentials.ConsumerIdentity{
- identity.ID_PATHPREFIX: "a/b",
- identity.ID_PORT: "4711",
- }
- Expect(identity.IdentityMatcher(id, nil, pat)).To(BeTrue())
- Expect(identity.IdentityMatcher(pat, id, id)).To(BeFalse())
- Expect(identity.IdentityMatcher(pat, id, pat)).To(BeTrue())
- })
- })
-
- Context("without path", func() {
- pat := credentials.ConsumerIdentity{
- identity.ID_HOSTNAME: "host",
- identity.ID_PORT: "4711",
- }
-
- It("complete", func() {
- id := credentials.ConsumerIdentity{
- identity.ID_HOSTNAME: "host",
- identity.ID_PORT: "4711",
- }
- Expect(identity.IdentityMatcher(pat, nil, id)).To(BeTrue())
- Expect(identity.IdentityMatcher(pat, id, id)).To(BeFalse())
- })
-
- It("different prefix", func() {
- id := credentials.ConsumerIdentity{
- identity.ID_HOSTNAME: "host",
- identity.ID_PORT: "4711",
- identity.ID_PATHPREFIX: "b",
- }
- Expect(identity.IdentityMatcher(pat, nil, id)).To(BeFalse())
- Expect(identity.IdentityMatcher(pat, pat, id)).To(BeFalse())
- })
- It("missing port", func() {
- id := credentials.ConsumerIdentity{
- identity.ID_HOSTNAME: "host",
- }
- Expect(identity.IdentityMatcher(pat, nil, id)).To(BeTrue())
- Expect(identity.IdentityMatcher(pat, pat, id)).To(BeFalse())
- })
- It("different port", func() {
- id := credentials.ConsumerIdentity{
- identity.ID_HOSTNAME: "host",
- identity.ID_PORT: "0815",
- }
- Expect(identity.IdentityMatcher(pat, nil, id)).To(BeFalse())
- Expect(identity.IdentityMatcher(pat, pat, id)).To(BeFalse())
- })
- })
-})
diff --git a/pkg/contexts/credentials/builtin/oci/identity/identity.go b/pkg/contexts/credentials/builtin/oci/identity/identity.go
deleted file mode 100644
index 57917f4d0..000000000
--- a/pkg/contexts/credentials/builtin/oci/identity/identity.go
+++ /dev/null
@@ -1,48 +0,0 @@
-package identity
-
-import (
- "github.com/open-component-model/ocm/pkg/contexts/credentials/cpi"
- "github.com/open-component-model/ocm/pkg/contexts/credentials/identity/hostpath"
- "github.com/open-component-model/ocm/pkg/listformat"
-)
-
-// CONSUMER_TYPE is the OCT registry type.
-const CONSUMER_TYPE = "OCIRegistry"
-
-// used identity properties.
-const (
- ID_TYPE = hostpath.ID_TYPE
- ID_HOSTNAME = hostpath.ID_HOSTNAME
- ID_PORT = hostpath.ID_PORT
- ID_PATHPREFIX = hostpath.ID_PATHPREFIX
- ID_SCHEME = hostpath.ID_SCHEME
-)
-
-// used credential properties.
-const (
- ATTR_USERNAME = cpi.ATTR_USERNAME
- ATTR_PASSWORD = cpi.ATTR_PASSWORD
- ATTR_IDENTITY_TOKEN = cpi.ATTR_IDENTITY_TOKEN
- ATTR_CERTIFICATE_AUTHORITY = cpi.ATTR_CERTIFICATE_AUTHORITY
-)
-
-func init() {
- attrs := listformat.FormatListElements("", listformat.StringElementDescriptionList{
- ATTR_USERNAME, "the basic auth user name",
- ATTR_PASSWORD, "the basic auth password",
- ATTR_IDENTITY_TOKEN, "the bearer token used for non-basic auth authorization",
- ATTR_CERTIFICATE_AUTHORITY, "the certificate authority certificate used to verify certificates",
- })
-
- cpi.RegisterStandardIdentity(CONSUMER_TYPE, IdentityMatcher, `OCI registry credential matcher
-
-It matches the `+CONSUMER_TYPE+` consumer type and additionally acts like
-the `+hostpath.IDENTITY_TYPE+` type.`,
- attrs)
-}
-
-var identityMatcher = hostpath.IdentityMatcher(CONSUMER_TYPE)
-
-func IdentityMatcher(pattern, cur, id cpi.ConsumerIdentity) bool {
- return identityMatcher(pattern, cur, id)
-}
diff --git a/pkg/contexts/credentials/builtin/wget/identity/identity.go b/pkg/contexts/credentials/builtin/wget/identity/identity.go
deleted file mode 100644
index feac525e0..000000000
--- a/pkg/contexts/credentials/builtin/wget/identity/identity.go
+++ /dev/null
@@ -1,56 +0,0 @@
-package identity
-
-import (
- "github.com/open-component-model/ocm/pkg/contexts/credentials/cpi"
- "github.com/open-component-model/ocm/pkg/contexts/credentials/identity/hostpath"
- "github.com/open-component-model/ocm/pkg/listformat"
-)
-
-// CONSUMER_TYPE is the wget access method type.
-const CONSUMER_TYPE = "wget"
-
-// used identity properties.
-const (
- ID_TYPE = hostpath.ID_TYPE
- ID_HOSTNAME = hostpath.ID_HOSTNAME
- ID_PORT = hostpath.ID_PORT
- ID_PATHPREFIX = hostpath.ID_PATHPREFIX
- ID_SCHEME = hostpath.ID_SCHEME
-)
-
-// used credential properties.
-const (
- ATTR_USERNAME = cpi.ATTR_USERNAME
- ATTR_PASSWORD = cpi.ATTR_PASSWORD
- ATTR_IDENTITY_TOKEN = cpi.ATTR_IDENTITY_TOKEN
- ATTR_CERTIFICATE_AUTHORITY = cpi.ATTR_CERTIFICATE_AUTHORITY
- ATTR_CERTIFICATE = cpi.ATTR_CERTIFICATE
- ATTR_PRIVATE_KEY = cpi.ATTR_PRIVATE_KEY
-)
-
-func init() {
- attrs := listformat.FormatListElements("", listformat.StringElementDescriptionList{
- ATTR_USERNAME, "the basic auth user name",
- ATTR_PASSWORD, "the basic auth password",
- ATTR_IDENTITY_TOKEN, "the bearer token used for non-basic auth authorization",
- ATTR_CERTIFICATE_AUTHORITY, "the certificate authority certificate used to verify certificates presented by the server",
- ATTR_CERTIFICATE, "the certificate used to present to the server",
- ATTR_PRIVATE_KEY, "the private key corresponding to the certificate",
- })
-
- cpi.RegisterStandardIdentity(CONSUMER_TYPE, IdentityMatcher, `wget credential matcher
-
-It matches the `+CONSUMER_TYPE+` consumer type and additionally acts like
-the `+hostpath.IDENTITY_TYPE+` type.`,
- attrs)
-}
-
-var identityMatcher = hostpath.IdentityMatcher(CONSUMER_TYPE)
-
-func IdentityMatcher(pattern, cur, id cpi.ConsumerIdentity) bool {
- return identityMatcher(pattern, cur, id)
-}
-
-func GetConsumerId(url string) cpi.ConsumerIdentity {
- return hostpath.GetConsumerIdentity(CONSUMER_TYPE, url)
-}
diff --git a/pkg/contexts/credentials/builtin/wget/identity/identity_test.go b/pkg/contexts/credentials/builtin/wget/identity/identity_test.go
deleted file mode 100644
index 263548988..000000000
--- a/pkg/contexts/credentials/builtin/wget/identity/identity_test.go
+++ /dev/null
@@ -1,145 +0,0 @@
-package identity_test
-
-import (
- . "github.com/onsi/ginkgo/v2"
- . "github.com/onsi/gomega"
- . "github.com/open-component-model/ocm/pkg/contexts/credentials/builtin/wget/identity"
-
- "github.com/open-component-model/ocm/pkg/contexts/credentials"
-)
-
-var _ = Describe("wget credential management", func() {
- Context("with path", func() {
- pat := credentials.ConsumerIdentity{
- ID_HOSTNAME: "host",
- ID_PATHPREFIX: "a/b",
- ID_PORT: "4711",
- }
-
- It("complete", func() {
- id := credentials.ConsumerIdentity{
- ID_HOSTNAME: "host",
- ID_PATHPREFIX: "a/b",
- ID_PORT: "4711",
- }
- Expect(IdentityMatcher(pat, nil, id)).To(BeTrue())
- Expect(IdentityMatcher(pat, id, id)).To(BeFalse())
- })
-
- It("path prefix", func() {
- id := credentials.ConsumerIdentity{
- ID_HOSTNAME: "host",
- ID_PATHPREFIX: "a",
- ID_PORT: "4711",
- }
- Expect(IdentityMatcher(pat, nil, id)).To(BeTrue())
- Expect(IdentityMatcher(pat, pat, id)).To(BeFalse())
- })
- It("different prefix", func() {
- id := credentials.ConsumerIdentity{
- ID_HOSTNAME: "host",
- ID_PATHPREFIX: "b",
- ID_PORT: "4711",
- }
- Expect(IdentityMatcher(pat, nil, id)).To(BeFalse())
- Expect(IdentityMatcher(pat, pat, id)).To(BeFalse())
- })
- It("longer prefix", func() {
- id := credentials.ConsumerIdentity{
- ID_HOSTNAME: "host",
- ID_PATHPREFIX: "a/b/c",
- ID_PORT: "4711",
- }
- Expect(IdentityMatcher(pat, nil, id)).To(BeFalse())
- Expect(IdentityMatcher(pat, pat, id)).To(BeFalse())
- })
- It("missing path", func() {
- id := credentials.ConsumerIdentity{
- ID_HOSTNAME: "host",
- ID_PORT: "4711",
- }
- Expect(IdentityMatcher(pat, nil, id)).To(BeTrue())
- Expect(IdentityMatcher(pat, pat, id)).To(BeFalse())
- })
- It("missing port", func() {
- id := credentials.ConsumerIdentity{
- ID_HOSTNAME: "host",
- ID_PATHPREFIX: "a/b",
- }
- Expect(IdentityMatcher(pat, nil, id)).To(BeTrue())
- Expect(IdentityMatcher(pat, pat, id)).To(BeFalse())
-
- Expect(IdentityMatcher(id, nil, pat)).To(BeTrue()) // accept additional port as fallback
- Expect(IdentityMatcher(id, id, pat)).To(BeFalse()) // but not to replace more general match
- })
- It("different port", func() {
- id := credentials.ConsumerIdentity{
- ID_HOSTNAME: "host",
- ID_PATHPREFIX: "a/b",
- ID_PORT: "0815",
- }
- Expect(IdentityMatcher(pat, nil, id)).To(BeFalse())
- Expect(IdentityMatcher(pat, pat, id)).To(BeFalse())
- })
-
- It("different host", func() {
- id := credentials.ConsumerIdentity{
- ID_HOSTNAME: "other",
- ID_PATHPREFIX: "a/b",
- ID_PORT: "4711",
- }
- Expect(IdentityMatcher(pat, nil, id)).To(BeFalse())
- Expect(IdentityMatcher(pat, pat, id)).To(BeFalse())
- })
- It("no host", func() {
- id := credentials.ConsumerIdentity{
- ID_PATHPREFIX: "a/b",
- ID_PORT: "4711",
- }
- Expect(IdentityMatcher(id, nil, pat)).To(BeTrue())
- Expect(IdentityMatcher(pat, id, id)).To(BeFalse())
- Expect(IdentityMatcher(pat, id, pat)).To(BeTrue())
- })
- })
-
- Context("without path", func() {
- pat := credentials.ConsumerIdentity{
- ID_HOSTNAME: "host",
- ID_PORT: "4711",
- }
-
- It("complete", func() {
- id := credentials.ConsumerIdentity{
- ID_HOSTNAME: "host",
- ID_PORT: "4711",
- }
- Expect(IdentityMatcher(pat, nil, id)).To(BeTrue())
- Expect(IdentityMatcher(pat, id, id)).To(BeFalse())
- })
-
- It("different prefix", func() {
- id := credentials.ConsumerIdentity{
- ID_HOSTNAME: "host",
- ID_PORT: "4711",
- ID_PATHPREFIX: "b",
- }
- Expect(IdentityMatcher(pat, nil, id)).To(BeFalse())
- Expect(IdentityMatcher(pat, pat, id)).To(BeFalse())
- })
- It("missing port", func() {
- id := credentials.ConsumerIdentity{
- ID_HOSTNAME: "host",
- }
- Expect(IdentityMatcher(pat, nil, id)).To(BeTrue())
- Expect(IdentityMatcher(pat, pat, id)).To(BeFalse())
- })
- It("different port", func() {
- id := credentials.ConsumerIdentity{
- ID_HOSTNAME: "host",
- ID_PORT: "0815",
- }
- Expect(IdentityMatcher(pat, nil, id)).To(BeFalse())
- Expect(IdentityMatcher(pat, pat, id)).To(BeFalse())
- })
- })
-})
diff --git a/pkg/contexts/credentials/config/config_test.go b/pkg/contexts/credentials/config/config_test.go
deleted file mode 100644
index e07492762..000000000
--- a/pkg/contexts/credentials/config/config_test.go
+++ /dev/null
@@ -1,209 +0,0 @@
-package config_test
-
-import (
- "encoding/json"
- "reflect"
-
- . "github.com/onsi/ginkgo/v2"
- . "github.com/onsi/gomega"
-
- "github.com/mandelsoft/goutils/testutils"
-
- "github.com/open-component-model/ocm/pkg/common"
- "github.com/open-component-model/ocm/pkg/contexts/config"
- "github.com/open-component-model/ocm/pkg/contexts/credentials"
- localconfig "github.com/open-component-model/ocm/pkg/contexts/credentials/config"
- "github.com/open-component-model/ocm/pkg/contexts/credentials/repositories/aliases"
- "github.com/open-component-model/ocm/pkg/contexts/credentials/repositories/directcreds"
- "github.com/open-component-model/ocm/pkg/contexts/credentials/repositories/memory"
- "github.com/open-component-model/ocm/pkg/runtime"
-)
-
-var DefaultContext = credentials.New()
-
-var _ = Describe("generic credentials", func() {
- props := common.Properties{
- "user": "USER",
- "password": "PASSWORD",
- }
-
- repospec := memory.NewRepositorySpec("test")
- credspec := credentials.NewCredentialsSpec("cred", repospec)
- direct := directcreds.NewRepositorySpec(props)
-
- cfgconsumerdata := "{\"type\":\"credentials.config.ocm.software\",\"consumers\":[{\"identity\":{\"type\":\"oci\",\"url\":\"https://acme.com\"},\"credentials\":[{\"credentialsName\":\"cred\",\"repoName\":\"test\",\"type\":\"Memory\"}]}]}"
- cfgrepodata := "{\"type\":\"credentials.config.ocm.software\",\"repositories\":[{\"repository\":{\"repoName\":\"test\",\"type\":\"Memory\"},\"credentials\":[{\"properties\":{\"password\":\"PASSWORD\",\"user\":\"USER\"},\"type\":\"Credentials\"}]}]}"
- cfgaliasdata := "{\"type\":\"credentials.config.ocm.software\",\"aliases\":{\"alias\":{\"repository\":{\"repoName\":\"test\",\"type\":\"Memory\"},\"credentials\":[{\"properties\":{\"password\":\"PASSWORD\",\"user\":\"USER\"},\"type\":\"Credentials\"}]}}}"
- _ = props
-
- Context("serialize", func() {
- It("serializes repository spec not in map", func() {
- mapdata := "{\"repositories\":{\"repository\":{\"repoName\":\"test\",\"type\":\"Memory\"}}}"
- type S struct {
- Repositories localconfig.RepositorySpec `json:"repositories"`
- }
-
- rspec, err := credentials.ToGenericRepositorySpec(repospec)
- Expect(err).To(Succeed())
- s := &S{
- Repositories: localconfig.RepositorySpec{Repository: *rspec},
- }
- data, err := json.Marshal(s)
-
- Expect(err).To(Succeed())
- Expect(data).To(Equal([]byte(mapdata)))
- })
-
- It("serializes repository spec map", func() {
- mapdata := "{\"repositories\":{\"repo\":{\"repository\":{\"repoName\":\"test\",\"type\":\"Memory\"}}}}"
- type S struct {
- Repositories map[string]localconfig.RepositorySpec `json:"repositories"`
- }
-
- rspec, err := credentials.ToGenericRepositorySpec(repospec)
- Expect(err).To(Succeed())
- s := &S{
- Repositories: map[string]localconfig.RepositorySpec{
- "repo": {Repository: *rspec},
- },
- }
- data, err := json.Marshal(s)
- Expect(err).To(Succeed())
- Expect(data).To(Equal([]byte(mapdata)))
- })
- })
-
- Context("composition", func() {
- It("composes a config for consumers", func() {
- consumerid := credentials.ConsumerIdentity{
- "type": "oci",
- "url": "https://acme.com",
- }
-
- cfg := localconfig.New()
-
- cfg.AddConsumer(consumerid, credspec)
-
- data, err := json.Marshal(cfg)
- Expect(err).To(Succeed())
- Expect(data).To(Equal([]byte(cfgconsumerdata)))
-
- cfg2 := &localconfig.Config{}
- err = json.Unmarshal(data, cfg2)
- Expect(err).To(Succeed())
- Expect(cfg2).To(Equal(cfg))
- })
-
- It("composes a config for repositories", func() {
- cfg := localconfig.New()
-
- cfg.AddRepository(repospec, direct)
-
- data, err := json.Marshal(cfg)
- Expect(err).To(Succeed())
- Expect(data).To(Equal([]byte(cfgrepodata)))
-
- cfg2 := &localconfig.Config{}
- err = json.Unmarshal(data, cfg2)
- Expect(err).To(Succeed())
- Expect(cfg2).To(Equal(cfg))
- })
-
- It("composes a config for aliases", func() {
- cfg := localconfig.New()
-
- cfg.AddAlias("alias", repospec, direct)
-
- data, err := json.Marshal(cfg)
- Expect(err).To(Succeed())
- Expect(data).To(Equal([]byte(cfgaliasdata)))
-
- cfg2 := &localconfig.Config{}
- err = json.Unmarshal(data, cfg2)
- Expect(err).To(Succeed())
- Expect(cfg2).To(Equal(cfg))
- })
- })
-
- Context("apply", func() {
- var ctx credentials.Context
-
- _ = ctx
-
- BeforeEach(func() {
- ctx = credentials.WithConfigs(config.New()).New()
- })
-
- It("applies a config for aliases", func() {
- cfg := localconfig.New()
- cfg.AddAlias("alias", repospec, direct)
-
- ctx.ConfigContext().ApplyConfig(cfg, "testconfig")
-
- spec := aliases.NewRepositorySpec("alias")
-
- repo, err := ctx.RepositoryForSpec(spec)
- Expect(err).To(Succeed())
- Expect(reflect.TypeOf(repo).String()).To(Equal("*memory.Repository"))
- })
-
- It("applies a config for consumers", func() {
- cfg := localconfig.New()
-
- consumer := credentials.ConsumerIdentity{
- credentials.ID_TYPE: "mytype",
- "host": "localhost",
- }
- props := common.Properties{"token": "mytoken"}
- creds := directcreds.NewCredentials(props)
- Expect(cfg.AddConsumer(consumer, creds)).To(Succeed())
-
- data, err := runtime.DefaultYAMLEncoding.Marshal(cfg)
- Expect(err).To(Succeed())
- Expect(string(data)).To(testutils.StringEqualTrimmedWithContext(`
-consumers:
-- credentials:
- - credentialsName: Credentials
- properties:
- token: mytoken
- type: Credentials
- identity:
- host: localhost
- type: mytype
-type: credentials.config.ocm.software
-`))
-
- ctx.ConfigContext().ApplyConfig(cfg, "testconfig")
-
- result, err := credentials.CredentialsForConsumer(ctx, consumer, credentials.CompleteMatch)
- Expect(err).To(Succeed())
-
- Expect(result.Properties()).To(Equal(props))
- })
-
- It("applies a config for consumers", func() {
- props := common.Properties{"token": "mytoken"}
- consumer := credentials.ConsumerIdentity{
- credentials.ID_TYPE: "mytype",
- "host": "localhost",
- }
- data := `
-type: credentials.config.ocm.software
-consumers:
-- credentials:
- - type: Credentials
- properties:
- token: mytoken
- identity:
- host: localhost
- type: mytype
-`
- ctx.ConfigContext().ApplyData([]byte(data), nil, "testconfig")
-
- result, err := credentials.CredentialsForConsumer(ctx, consumer, credentials.CompleteMatch)
- Expect(err).To(Succeed())
-
- Expect(result.Properties()).To(Equal(props))
- })
- })
-})
diff --git a/pkg/contexts/credentials/config/type.go b/pkg/contexts/credentials/config/type.go
deleted file mode 100644
index 9f3fe9ca3..000000000
--- a/pkg/contexts/credentials/config/type.go
+++ /dev/null
@@ -1,186 +0,0 @@
-package config
-
-import (
- "fmt"
-
- "github.com/mandelsoft/goutils/errors"
-
- cfgcpi "github.com/open-component-model/ocm/pkg/contexts/config/cpi"
- "github.com/open-component-model/ocm/pkg/contexts/credentials/cpi"
- "github.com/open-component-model/ocm/pkg/runtime"
-)
-
-const (
- ConfigType = "credentials" + cfgcpi.OCM_CONFIG_TYPE_SUFFIX
- ConfigTypeV1 = ConfigType + runtime.VersionSeparator + "v1"
-)
-
-func init() {
- cfgcpi.RegisterConfigType(cfgcpi.NewConfigType[*Config](ConfigType, usage))
- cfgcpi.RegisterConfigType(cfgcpi.NewConfigType[*Config](ConfigTypeV1, usage))
-}
-
-// Config describes a configuration for the config context.
-type Config struct {
- runtime.ObjectVersionedType `json:",inline"`
- // Consumers describe predefine logical cosumer specs mapped to credentials
- // These will (potentially) be evaluated if access objects requiring credentials
- // are provided by other modules (e.g. oci repo access) without
- // specifying crednentials. Then this module can request credentials here by passing
- // an appropriate consumer spec.
- Consumers []ConsumerSpec `json:"consumers,omitempty"`
- // Repositories describe preloaded credential repositories with potential credential chain
- Repositories []RepositorySpec `json:"repositories,omitempty"`
- // Aliases describe logical credential repositories mapped to implementing repositories
- Aliases map[string]RepositorySpec `json:"aliases,omitempty"`
-}
-
-type ConsumerSpec struct {
- Identity cpi.ConsumerIdentity `json:"identity"`
- Credentials []cpi.GenericCredentialsSpec `json:"credentials"`
-}
-
-type RepositorySpec struct {
- Repository cpi.GenericRepositorySpec `json:"repository"`
- Credentials []cpi.GenericCredentialsSpec `json:"credentials,omitempty"`
-}
-
-// NewConfigSpec creates a new memory ConfigSpec.
-func New() *Config {
- return &Config{
- ObjectVersionedType: runtime.NewVersionedTypedObject(ConfigType),
- }
-}
-
-func (a *Config) GetType() string {
- return ConfigType
-}
-
-func (a *Config) MapCredentialsChain(creds ...cpi.CredentialsSpec) ([]cpi.GenericCredentialsSpec, error) {
- var cgens []cpi.GenericCredentialsSpec
- for _, c := range creds {
- cgen, err := cpi.ToGenericCredentialsSpec(c)
- if err != nil {
- return nil, err
- }
- cgens = append(cgens, *cgen)
- }
- return cgens, nil
-}
-
-func (a *Config) AddConsumer(id cpi.ConsumerIdentity, creds ...cpi.CredentialsSpec) error {
- cgens, err := a.MapCredentialsChain(creds...)
- if err != nil {
- return fmt.Errorf("failed to map credentials chain: %w", err)
- }
-
- spec := &ConsumerSpec{
- Identity: id,
- Credentials: cgens,
- }
- a.Consumers = append(a.Consumers, *spec)
- return nil
-}
-
-func (a *Config) MapRepository(repo cpi.RepositorySpec, creds ...cpi.CredentialsSpec) (*RepositorySpec, error) {
- rgen, err := cpi.ToGenericRepositorySpec(repo)
- if err != nil {
- return nil, err
- }
-
- cgens, err := a.MapCredentialsChain(creds...)
- if err != nil {
- return nil, err
- }
-
- return &RepositorySpec{
- Repository: *rgen,
- Credentials: cgens,
- }, nil
-}
-
-func (a *Config) AddRepository(repo cpi.RepositorySpec, creds ...cpi.CredentialsSpec) error {
- spec, err := a.MapRepository(repo, creds...)
- if err != nil {
- return fmt.Errorf("failed to map repository: %w", err)
- }
-
- a.Repositories = append(a.Repositories, *spec)
-
- return nil
-}
-
-func (a *Config) AddAlias(name string, repo cpi.RepositorySpec, creds ...cpi.CredentialsSpec) error {
- spec, err := a.MapRepository(repo, creds...)
- if err != nil {
- return fmt.Errorf("failed to map repository: %w", err)
- }
-
- if a.Aliases == nil {
- a.Aliases = map[string]RepositorySpec{}
- }
- a.Aliases[name] = *spec
- return nil
-}
-
-// --- begin apply ---
-
-func (a *Config) ApplyTo(ctx cfgcpi.Context, target interface{}) error {
- list := errors.ErrListf("applying config")
- t, ok := target.(cpi.Context)
- if !ok {
- return cfgcpi.ErrNoContext(ConfigType)
- }
- for _, e := range a.Consumers {
- t.SetCredentialsForConsumer(e.Identity, CredentialsChain(e.Credentials...))
- }
- // --- end apply ---
- sub := errors.ErrListf("applying aliases")
- for n, e := range a.Aliases {
- sub.Add(t.SetAlias(n, &e.Repository, CredentialsChain(e.Credentials...)))
- }
- list.Add(sub.Result())
- sub = errors.ErrListf("applying repositories")
- for i, e := range a.Repositories {
- _, err := t.RepositoryForSpec(&e.Repository, CredentialsChain(e.Credentials...))
- sub.Add(errors.Wrapf(err, "repository entry %d", i))
- }
- list.Add(sub.Result())
-
- return list.Result()
-}
-
-func CredentialsChain(creds ...cpi.GenericCredentialsSpec) cpi.CredentialsChain {
- r := make([]cpi.CredentialsSource, len(creds))
- for i := range creds {
- r[i] = &creds[i]
- }
- return r
-}
-
-const usage = `
-The config type ` + ConfigType + ` can be used to define a list
-of arbitrary configuration specifications:
-
-
- type: ` + ConfigType + `
- consumers:
- - identity:
- <name>: <value>
- ...
- credentials:
- - <credential specification>
- ... credential chain
- repositories:
- - repository: <repository specification>
- credentials:
- - <credential specification>
- ... credential chain
- aliases:
- <name>:
- repository: <repository specification>
- credentials:
- - <credential specification>
- ... credential chain
-
-`
diff --git a/pkg/contexts/credentials/const.go b/pkg/contexts/credentials/const.go
deleted file mode 100644
index 13dfe2455..000000000
--- a/pkg/contexts/credentials/const.go
+++ /dev/null
@@ -1,20 +0,0 @@
-package credentials
-
-import (
- "github.com/open-component-model/ocm/pkg/contexts/credentials/internal"
-)
-
-const (
- ID_TYPE = internal.ID_TYPE
-
- ATTR_TYPE = internal.ATTR_TYPE
- ATTR_USERNAME = internal.ATTR_USERNAME
- ATTR_PASSWORD = internal.ATTR_PASSWORD
- ATTR_CERTIFICATE_AUTHORITY = internal.ATTR_CERTIFICATE_AUTHORITY
- ATTR_CERTIFICATE = internal.ATTR_CERTIFICATE // PEM encoded
- ATTR_PRIVATE_KEY = internal.ATTR_PRIVATE_KEY // PEM encoded
- ATTR_SERVER_ADDRESS = internal.ATTR_SERVER_ADDRESS
- ATTR_IDENTITY_TOKEN = internal.ATTR_IDENTITY_TOKEN
- ATTR_REGISTRY_TOKEN = internal.ATTR_REGISTRY_TOKEN
- ATTR_TOKEN = internal.ATTR_TOKEN
-)
diff --git a/pkg/contexts/credentials/cpi/const.go b/pkg/contexts/credentials/cpi/const.go
deleted file mode 100644
index 0c65870f1..000000000
--- a/pkg/contexts/credentials/cpi/const.go
+++ /dev/null
@@ -1,22 +0,0 @@
-package cpi
-
-import (
- "github.com/open-component-model/ocm/pkg/contexts/credentials/internal"
-)
-
-const (
- ID_TYPE = internal.ID_TYPE
-
- ATTR_TYPE = internal.ATTR_TYPE
- ATTR_USERNAME = internal.ATTR_USERNAME
- ATTR_EMAIL = internal.ATTR_EMAIL
- ATTR_PASSWORD = internal.ATTR_PASSWORD
- ATTR_SERVER_ADDRESS = internal.ATTR_SERVER_ADDRESS
- ATTR_TOKEN = internal.ATTR_TOKEN
- ATTR_IDENTITY_TOKEN = internal.ATTR_IDENTITY_TOKEN
- ATTR_REGISTRY_TOKEN = internal.ATTR_REGISTRY_TOKEN
- ATTR_KEY = internal.ATTR_KEY
- ATTR_CERTIFICATE_AUTHORITY = internal.ATTR_CERTIFICATE_AUTHORITY
- ATTR_CERTIFICATE = internal.ATTR_CERTIFICATE
- ATTR_PRIVATE_KEY = internal.ATTR_PRIVATE_KEY
-)
diff --git a/pkg/contexts/credentials/cpi/interface.go b/pkg/contexts/credentials/cpi/interface.go
deleted file mode 100644
index 2499903c1..000000000
--- a/pkg/contexts/credentials/cpi/interface.go
+++ /dev/null
@@ -1,128 +0,0 @@
-package cpi
-
-// This is the Context Provider Interface for credential providers
-
-import (
- "github.com/open-component-model/ocm/pkg/common"
- "github.com/open-component-model/ocm/pkg/contexts/credentials/internal"
- "github.com/open-component-model/ocm/pkg/contexts/datacontext"
-)
-
-const (
- KIND_CREDENTIALS = internal.KIND_CREDENTIALS
- KIND_REPOSITORY = internal.KIND_REPOSITORY
-)
-
-const CONTEXT_TYPE = internal.CONTEXT_TYPE
-
-type (
- Context = internal.Context
- ContextProvider = internal.ContextProvider
- Repository = internal.Repository
- RepositoryType = internal.RepositoryType
- RepositoryTypeProvider = internal.RepositoryTypeProvider
- RepositoryTypeScheme = internal.RepositoryTypeScheme
- Credentials = internal.Credentials
- CredentialsSource = internal.CredentialsSource
- CredentialsChain = internal.CredentialsChain
- CredentialsSpec = internal.CredentialsSpec
- RepositorySpec = internal.RepositorySpec
- GenericRepositorySpec = internal.GenericRepositorySpec
- GenericCredentialsSpec = internal.GenericCredentialsSpec
- DirectCredentials = internal.DirectCredentials
- EvaluationContext = internal.EvaluationContext
-)
-
-type (
- ConsumerIdentity = internal.ConsumerIdentity
- ConsumerIdentityProvider = internal.ConsumerIdentityProvider
- ProviderIdentity = internal.ProviderIdentity
- ConsumerProvider = internal.ConsumerProvider
- UsageContext = internal.UsageContext
- StringUsageContext = internal.StringUsageContext
- IdentityMatcher = internal.IdentityMatcher
- IdentityMatcherInfo = internal.IdentityMatcherInfo
- IdentityMatcherRegistry = internal.IdentityMatcherRegistry
-)
-
-var DefaultContext = internal.DefaultContext
-
-func FromProvider(p ContextProvider) Context {
- return internal.FromProvider(p)
-}
-
-func New(m ...datacontext.BuilderMode) Context {
- return internal.Builder{}.New(m...)
-}
-
-func NewConsumerIdentity(typ string, attrs ...string) ConsumerIdentity {
- return internal.NewConsumerIdentity(typ, attrs...)
-}
-
-func NewGenericCredentialsSpec(name string, repospec *GenericRepositorySpec) *GenericCredentialsSpec {
- return internal.NewGenericCredentialsSpec(name, repospec)
-}
-
-func NewCredentialsSpec(name string, repospec RepositorySpec) CredentialsSpec {
- return internal.NewCredentialsSpec(name, repospec)
-}
-
-func ToGenericCredentialsSpec(spec CredentialsSpec) (*GenericCredentialsSpec, error) {
- return internal.ToGenericCredentialsSpec(spec)
-}
-
-func ToGenericRepositorySpec(spec RepositorySpec) (*GenericRepositorySpec, error) {
- return internal.ToGenericRepositorySpec(spec)
-}
-
-func RegisterStandardIdentityMatcher(typ string, matcher IdentityMatcher, desc string) {
- internal.StandardIdentityMatchers.Register(typ, matcher, desc)
-}
-
-func RegisterStandardIdentity(typ string, matcher IdentityMatcher, desc string, attrs string) {
- internal.StandardIdentityMatchers.Register(typ, matcher, desc, attrs)
-}
-
-func NewCredentials(props common.Properties) Credentials {
- return internal.NewCredentials(props)
-}
-
-func ErrUnknownCredentials(name string) error {
- return internal.ErrUnknownCredentials(name)
-}
-
-func ErrUnknownRepository(kind, name string) error {
- return internal.ErrUnknownRepository(kind, name)
-}
-
-func CredentialsForConsumer(ctx ContextProvider, id ConsumerIdentity, matchers ...IdentityMatcher) (Credentials, error) {
- return internal.CredentialsForConsumer(ctx, id, false, matchers...)
-}
-
-func RequiredCredentialsForConsumer(ctx ContextProvider, id ConsumerIdentity, matchers ...IdentityMatcher) (Credentials, error) {
- return internal.CredentialsForConsumer(ctx, id, true, matchers...)
-}
-
-func GetCredentialsForConsumer(ctx Context, ectx EvaluationContext, identity ConsumerIdentity, matchers ...IdentityMatcher) (CredentialsSource, error) {
- return internal.GetCredentialsForConsumer(ctx, ectx, identity, matchers...)
-}
-
-func GetEvaluationContextFor[T any](ectx EvaluationContext) T {
- return internal.GetEvaluationContextFor[T](ectx)
-}
-
-func SetEvaluationContextFor(ectx EvaluationContext, e any) {
- internal.SetEvaluationContextFor(ectx, e)
-}
-
-var (
- CompleteMatch = internal.CompleteMatch
- NoMatch = internal.NoMatch
- PartialMatch = internal.PartialMatch
-)
-
-// provide context interface for other files to avoid diffs in imports.
-var (
- newStrictRepositoryTypeScheme = internal.NewStrictRepositoryTypeScheme
- defaultRepositoryTypeScheme = internal.DefaultRepositoryTypeScheme
-)
diff --git a/pkg/contexts/credentials/cpi/repotypes.go b/pkg/contexts/credentials/cpi/repotypes.go
deleted file mode 100644
index d79212ce4..000000000
--- a/pkg/contexts/credentials/cpi/repotypes.go
+++ /dev/null
@@ -1,49 +0,0 @@
-package cpi
-
-// this file is identical for contexts oci and credentials and similar for
-// ocm.
-
-import (
- "github.com/open-component-model/ocm/pkg/runtime"
- "github.com/open-component-model/ocm/pkg/runtime/descriptivetype"
-)
-
-type RepositoryTypeVersionScheme = runtime.TypeVersionScheme[RepositorySpec, RepositoryType]
-
-func NewRepositoryTypeVersionScheme(kind string) RepositoryTypeVersionScheme {
- return runtime.NewTypeVersionScheme[RepositorySpec, RepositoryType](kind, newStrictRepositoryTypeScheme())
-}
-
-func RegisterRepositoryType(rtype RepositoryType) {
- defaultRepositoryTypeScheme.Register(rtype)
-}
-
-func RegisterRepositoryTypeVersions(s RepositoryTypeVersionScheme) {
- defaultRepositoryTypeScheme.AddKnownTypes(s)
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-func NewRepositoryType[I RepositorySpec](name string, opts ...RepositoryOption) RepositoryType {
- return descriptivetype.NewTypedObjectTypeObject(runtime.NewVersionedTypedObjectType[RepositorySpec, I](name), opts...)
-}
-
-func NewRepositoryTypeByConverter[I RepositorySpec, V runtime.TypedObject](name string, converter runtime.Converter[I, V], opts ...RepositoryOption) RepositoryType {
- return descriptivetype.NewTypedObjectTypeObject(runtime.NewVersionedTypedObjectTypeByConverter[RepositorySpec, I](name, converter), opts...)
-}
-
-func NewRepositoryTypeByFormatVersion(name string, fmt runtime.FormatVersion[RepositorySpec], opts ...RepositoryOption) RepositoryType {
- return descriptivetype.NewTypedObjectTypeObject(runtime.NewVersionedTypedObjectTypeByFormatVersion[RepositorySpec](name, fmt), opts...)
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-type RepositoryOption = descriptivetype.Option
-
-func WithDescription(v string) RepositoryOption {
- return descriptivetype.WithDescription(v)
-}
-
-func WithFormatSpec(v string) RepositoryOption {
- return descriptivetype.WithFormatSpec(v)
-}
diff --git a/pkg/contexts/credentials/gc_test.go b/pkg/contexts/credentials/gc_test.go
deleted file mode 100644
index c96f94c41..000000000
--- a/pkg/contexts/credentials/gc_test.go
+++ /dev/null
@@ -1,34 +0,0 @@
-package credentials_test
-
-import (
- "runtime"
- "time"
-
- . "github.com/onsi/ginkgo/v2"
- . "github.com/onsi/gomega"
-
- me "github.com/open-component-model/ocm/pkg/contexts/credentials"
- "github.com/open-component-model/ocm/pkg/runtimefinalizer"
-)
-
-var _ = Describe("area test", func() {
- It("can be garbage collected", func() {
- ctx := me.New()
-
- r := runtimefinalizer.GetRuntimeFinalizationRecorder(ctx)
- Expect(r).NotTo(BeNil())
-
- runtime.GC()
- time.Sleep(time.Second)
- ctx.GetType()
- Expect(r.Get()).To(BeNil())
-
- ctx = nil
- for i := 0; i < 100; i++ {
- runtime.GC()
- time.Sleep(time.Millisecond)
- }
-
- Expect(r.Get()).To(ContainElement(ContainSubstring(me.CONTEXT_TYPE)))
- })
-})
diff --git a/pkg/contexts/credentials/identity/hostpath/id_test.go b/pkg/contexts/credentials/identity/hostpath/id_test.go
deleted file mode 100644
index bbaaa2007..000000000
--- a/pkg/contexts/credentials/identity/hostpath/id_test.go
+++ /dev/null
@@ -1,204 +0,0 @@
-package hostpath_test
-
-import (
- . "github.com/onsi/ginkgo/v2"
- . "github.com/onsi/gomega"
-
- "github.com/open-component-model/ocm/pkg/contexts/credentials"
- "github.com/open-component-model/ocm/pkg/contexts/credentials/cpi"
- "github.com/open-component-model/ocm/pkg/contexts/credentials/identity/hostpath"
-)
-
-func IdentityMatcher(pattern, cur, id cpi.ConsumerIdentity) bool {
- return hostpath.IdentityMatcher("OCIRegistry")(pattern, cur, id)
-}
-
-var _ = Describe("ctf management", func() {
- Context("with path", func() {
- pat := credentials.ConsumerIdentity{
- hostpath.ID_HOSTNAME: "host",
- hostpath.ID_PATHPREFIX: "a/b",
- hostpath.ID_PORT: "4711",
- hostpath.ID_SCHEME: "scheme://",
- }
-
- It("complete", func() {
- id := credentials.ConsumerIdentity{
- hostpath.ID_HOSTNAME: "host",
- hostpath.ID_PATHPREFIX: "a/b",
- hostpath.ID_PORT: "4711",
- hostpath.ID_SCHEME: "scheme://",
- }
- Expect(IdentityMatcher(pat, nil, id)).To(BeTrue())
- Expect(IdentityMatcher(pat, id, id)).To(BeFalse())
- })
-
- It("path prefix", func() {
- id := credentials.ConsumerIdentity{
- hostpath.ID_HOSTNAME: "host",
- hostpath.ID_PATHPREFIX: "a",
- hostpath.ID_PORT: "4711",
- hostpath.ID_SCHEME: "scheme://",
- }
- Expect(IdentityMatcher(pat, nil, id)).To(BeTrue())
- Expect(IdentityMatcher(pat, pat, id)).To(BeFalse())
- })
- It("different prefix", func() {
- id := credentials.ConsumerIdentity{
- hostpath.ID_HOSTNAME: "host",
- hostpath.ID_PATHPREFIX: "b",
- hostpath.ID_PORT: "4711",
- hostpath.ID_SCHEME: "scheme://",
- }
- Expect(IdentityMatcher(pat, nil, id)).To(BeFalse())
- Expect(IdentityMatcher(pat, pat, id)).To(BeFalse())
- })
- It("longer prefix", func() {
- id := credentials.ConsumerIdentity{
- hostpath.ID_HOSTNAME: "host",
- hostpath.ID_PATHPREFIX: "a/b/c",
- hostpath.ID_PORT: "4711",
- hostpath.ID_SCHEME: "scheme://",
- }
- Expect(IdentityMatcher(pat, nil, id)).To(BeFalse())
- Expect(IdentityMatcher(pat, pat, id)).To(BeFalse())
- })
- It("missing path", func() {
- id := credentials.ConsumerIdentity{
- hostpath.ID_HOSTNAME: "host",
- hostpath.ID_PORT: "4711",
- hostpath.ID_SCHEME: "scheme://",
- }
- Expect(IdentityMatcher(pat, nil, id)).To(BeTrue())
- Expect(IdentityMatcher(pat, pat, id)).To(BeFalse())
- })
- It("missing port", func() {
- id := credentials.ConsumerIdentity{
- hostpath.ID_HOSTNAME: "host",
- hostpath.ID_PATHPREFIX: "a/b",
- hostpath.ID_SCHEME: "scheme://",
- }
- Expect(IdentityMatcher(pat, nil, id)).To(BeTrue())
- Expect(IdentityMatcher(pat, pat, id)).To(BeFalse())
-
- Expect(IdentityMatcher(id, nil, pat)).To(BeTrue()) // accept additional port as fallback
- Expect(IdentityMatcher(id, id, pat)).To(BeFalse()) // but not to replace more general match
- })
- It("different port", func() {
- id := credentials.ConsumerIdentity{
- hostpath.ID_HOSTNAME: "host",
- hostpath.ID_PATHPREFIX: "a/b",
- hostpath.ID_PORT: "0815",
- hostpath.ID_SCHEME: "scheme://",
- }
- Expect(IdentityMatcher(pat, nil, id)).To(BeFalse())
- Expect(IdentityMatcher(pat, pat, id)).To(BeFalse())
- })
-
- It("different host", func() {
- id := credentials.ConsumerIdentity{
- hostpath.ID_HOSTNAME: "other",
- hostpath.ID_PATHPREFIX: "a/b",
- hostpath.ID_PORT: "4711",
- hostpath.ID_SCHEME: "scheme://",
- }
- Expect(IdentityMatcher(pat, nil, id)).To(BeFalse())
- Expect(IdentityMatcher(pat, pat, id)).To(BeFalse())
- })
- It("no host", func() {
- id := credentials.ConsumerIdentity{
- hostpath.ID_PATHPREFIX: "a/b",
- hostpath.ID_PORT: "4711",
- hostpath.ID_SCHEME: "scheme://",
- }
- Expect(IdentityMatcher(id, nil, pat)).To(BeTrue())
- Expect(IdentityMatcher(pat, id, id)).To(BeFalse())
- Expect(IdentityMatcher(pat, id, pat)).To(BeTrue())
- })
-
- It("different scheme", func() {
- id := credentials.ConsumerIdentity{
- hostpath.ID_HOSTNAME: "host",
- hostpath.ID_PATHPREFIX: "a/b",
- hostpath.ID_PORT: "4711",
- hostpath.ID_SCHEME: "otherscheme://",
- }
- Expect(IdentityMatcher(pat, nil, id)).To(BeFalse())
- Expect(IdentityMatcher(pat, pat, id)).To(BeFalse())
- })
- It("no scheme", func() {
- id := credentials.ConsumerIdentity{
- hostpath.ID_HOSTNAME: "host",
- hostpath.ID_PATHPREFIX: "a/b",
- hostpath.ID_PORT: "4711",
- }
- Expect(IdentityMatcher(id, nil, pat)).To(BeTrue())
- Expect(IdentityMatcher(pat, id, id)).To(BeFalse())
- Expect(IdentityMatcher(pat, id, pat)).To(BeTrue())
- })
- })
-
- Context("without path", func() {
- pat := credentials.ConsumerIdentity{
- hostpath.ID_HOSTNAME: "host",
- hostpath.ID_PORT: "4711",
- hostpath.ID_SCHEME: "scheme://",
- }
-
- It("complete", func() {
- id := credentials.ConsumerIdentity{
- hostpath.ID_HOSTNAME: "host",
- hostpath.ID_PORT: "4711",
- hostpath.ID_SCHEME: "scheme://",
- }
- Expect(IdentityMatcher(pat, nil, id)).To(BeTrue())
- Expect(IdentityMatcher(pat, id, id)).To(BeFalse())
- })
-
- It("different prefix", func() {
- id := credentials.ConsumerIdentity{
- hostpath.ID_HOSTNAME: "host",
- hostpath.ID_PORT: "4711",
- hostpath.ID_PATHPREFIX: "b",
- hostpath.ID_SCHEME: "scheme://",
- }
- Expect(IdentityMatcher(pat, nil, id)).To(BeFalse())
- Expect(IdentityMatcher(pat, pat, id)).To(BeFalse())
- })
- It("missing port", func() {
- id := credentials.ConsumerIdentity{
- hostpath.ID_HOSTNAME: "host",
- hostpath.ID_SCHEME: "scheme://",
- }
- Expect(IdentityMatcher(pat, nil, id)).To(BeTrue())
- Expect(IdentityMatcher(pat, pat, id)).To(BeFalse())
- })
- It("different port", func() {
- id := credentials.ConsumerIdentity{
- hostpath.ID_HOSTNAME: "host",
- hostpath.ID_PORT: "0815",
- hostpath.ID_SCHEME: "scheme://",
- }
- Expect(IdentityMatcher(pat, nil, id)).To(BeFalse())
- Expect(IdentityMatcher(pat, pat, id)).To(BeFalse())
- })
-
- It("different scheme", func() {
- id := credentials.ConsumerIdentity{
- hostpath.ID_HOSTNAME: "host",
- hostpath.ID_PORT: "4711",
- hostpath.ID_SCHEME: "otherscheme://",
- }
- Expect(IdentityMatcher(pat, nil, id)).To(BeFalse())
- Expect(IdentityMatcher(pat, pat, id)).To(BeFalse())
- })
- It("no scheme", func() {
- id := credentials.ConsumerIdentity{
- hostpath.ID_HOSTNAME: "host",
- hostpath.ID_PORT: "4711",
- }
- Expect(IdentityMatcher(pat, nil, id)).To(BeTrue())
- Expect(IdentityMatcher(pat, pat, id)).To(BeFalse())
- })
- })
-})
diff --git a/pkg/contexts/credentials/identity/hostpath/identity.go b/pkg/contexts/credentials/identity/hostpath/identity.go
deleted file mode 100644
index 7cd128d78..000000000
--- a/pkg/contexts/credentials/identity/hostpath/identity.go
+++ /dev/null
@@ -1,148 +0,0 @@
-package hostpath
-
-import (
- "net/url"
- "strings"
-
- "github.com/open-component-model/ocm/pkg/contexts/credentials/cpi"
-)
-
-// IDENTITY_TYPE is the identity of this matcher.
-const IDENTITY_TYPE = "hostpath"
-
-// ID_TYPE is the type of the consumer.
-const ID_TYPE = cpi.ID_TYPE
-
-// ID_HOSTNAME is a hostname.
-const ID_HOSTNAME = "hostname"
-
-// ID_PORT is a port.
-const ID_PORT = "port"
-
-// ID_PATHPREFIX is the path prefix below the host.
-const ID_PATHPREFIX = "pathprefix"
-
-// ID_SCHEME is the scheme prefix.
-const ID_SCHEME = "scheme"
-
-func init() {
- cpi.RegisterStandardIdentityMatcher(IDENTITY_TYPE, Matcher, `Host and path based credential matcher
-
-This matcher works on the following properties:
-
-- *`+ID_TYPE+`* (required if set in pattern): the identity type
-- *`+ID_HOSTNAME+`* (required if set in pattern): the hostname of a server
-- *`+ID_SCHEME+`* (optional): the URL scheme of a server
-- *`+ID_PORT+`* (optional): the port of a server
-- *`+ID_PATHPREFIX+`* (optional): a path prefix to match. The
- element with the most matching path components is selected (separator is /).
-`)
-}
-
-var Matcher = IdentityMatcher("")
-
-func Match(identityType string, request, cur, id cpi.ConsumerIdentity) (match bool, better bool) {
- if request[ID_TYPE] != "" && request[ID_TYPE] != id[ID_TYPE] {
- return false, false
- }
-
- if identityType != "" && request[ID_TYPE] != "" && identityType != request[ID_TYPE] {
- return false, false
- }
-
- if request[ID_HOSTNAME] != "" && id[ID_HOSTNAME] != "" && request[ID_HOSTNAME] != id[ID_HOSTNAME] {
- return false, false
- }
-
- if request[ID_PORT] != "" {
- if id[ID_PORT] != "" && id[ID_PORT] != request[ID_PORT] {
- return false, false
- }
- }
-
- if request[ID_SCHEME] != "" {
- if id[ID_SCHEME] != "" && id[ID_SCHEME] != request[ID_SCHEME] {
- return false, false
- }
- }
-
- if request[ID_PATHPREFIX] != "" {
- if id[ID_PATHPREFIX] != "" {
- if len(id[ID_PATHPREFIX]) > len(request[ID_PATHPREFIX]) {
- return false, false
- }
- pcomps := strings.Split(request[ID_PATHPREFIX], "/")
- icomps := strings.Split(id[ID_PATHPREFIX], "/")
- if len(icomps) > len(pcomps) {
- return false, false
- }
- for i := range icomps {
- if pcomps[i] != icomps[i] {
- return false, false
- }
- }
- }
- } else {
- if id[ID_PATHPREFIX] != "" {
- return false, false
- }
- }
-
- // ok now it basically matches, check against current match
- if len(cur) == 0 {
- return true, true
- }
-
- if cur[ID_HOSTNAME] == "" && id[ID_HOSTNAME] != "" {
- return true, true
- }
- if cur[ID_PORT] == "" && (id[ID_PORT] != "" && request[ID_PORT] != "") {
- return true, true
- }
- if cur[ID_SCHEME] == "" && (id[ID_SCHEME] != "" && request[ID_SCHEME] != "") {
- return true, true
- }
-
- if len(cur[ID_PATHPREFIX]) < len(id[ID_PATHPREFIX]) {
- return true, true
- }
- return true, false
-}
-
-func IdentityMatcher(identityType string) cpi.IdentityMatcher {
- return func(request, cur, id cpi.ConsumerIdentity) bool {
- _, better := Match(identityType, request, cur, id)
- return better
- }
-}
-
-func GetConsumerIdentity(typ, _url string) cpi.ConsumerIdentity {
- u, err := url.Parse(_url)
- if err != nil {
- return nil
- }
-
- id := cpi.NewConsumerIdentity(typ)
- if u.Host != "" {
- parts := strings.Split(u.Host, ":")
- if len(parts) > 1 {
- id[ID_PORT] = parts[1]
- } else {
- switch u.Scheme {
- case "https":
- id[ID_PORT] = "443"
- case "http":
- id[ID_PORT] = "80"
- }
- }
- id[ID_HOSTNAME] = parts[0]
- }
- if u.Scheme != "" {
- id[ID_SCHEME] = u.Scheme
- }
- path := strings.Trim(u.Path, "/")
- if path != "" {
- id[ID_PATHPREFIX] = path
- }
- return id
-}
diff --git a/pkg/contexts/credentials/init.go b/pkg/contexts/credentials/init.go
deleted file mode 100644
index 1ee7dbf31..000000000
--- a/pkg/contexts/credentials/init.go
+++ /dev/null
@@ -1,7 +0,0 @@
-package credentials
-
-import (
- _ "github.com/open-component-model/ocm/pkg/contexts/credentials/builtin"
- _ "github.com/open-component-model/ocm/pkg/contexts/credentials/config"
- _ "github.com/open-component-model/ocm/pkg/contexts/credentials/repositories"
-)
diff --git a/pkg/contexts/credentials/interface.go b/pkg/contexts/credentials/interface.go
deleted file mode 100644
index 34f1e74a5..000000000
--- a/pkg/contexts/credentials/interface.go
+++ /dev/null
@@ -1,134 +0,0 @@
-package credentials
-
-import (
- "context"
-
- "github.com/open-component-model/ocm/pkg/common"
- "github.com/open-component-model/ocm/pkg/contexts/credentials/internal"
- "github.com/open-component-model/ocm/pkg/contexts/credentials/repositories/directcreds"
- "github.com/open-component-model/ocm/pkg/runtime"
-)
-
-const (
- KIND_CREDENTIALS = internal.KIND_CREDENTIALS
- KIND_CONSUMER = internal.KIND_CONSUMER
- KIND_REPOSITORY = internal.KIND_REPOSITORY
-)
-
-const CONTEXT_TYPE = internal.CONTEXT_TYPE
-
-const AliasRepositoryType = internal.AliasRepositoryType
-
-type (
- Context = internal.Context
- ContextProvider = internal.ContextProvider
- RepositoryTypeScheme = internal.RepositoryTypeScheme
- Repository = internal.Repository
- Credentials = internal.Credentials
- CredentialsSource = internal.CredentialsSource
- CredentialsChain = internal.CredentialsChain
- CredentialsSpec = internal.CredentialsSpec
- RepositorySpec = internal.RepositorySpec
-)
-
-type (
- ConsumerIdentity = internal.ConsumerIdentity
- ConsumerIdentityProvider = internal.ConsumerIdentityProvider
- ProviderIdentity = internal.ProviderIdentity
- UsageContext = internal.UsageContext
- StringUsageContext = internal.StringUsageContext
- IdentityMatcher = internal.IdentityMatcher
- IdentityMatcherInfo = internal.IdentityMatcherInfo
- IdentityMatcherInfos = internal.IdentityMatcherInfos
- IdentityMatcherRegistry = internal.IdentityMatcherRegistry
-)
-
-type (
- GenericRepositorySpec = internal.GenericRepositorySpec
- GenericCredentialsSpec = internal.GenericCredentialsSpec
- DirectCredentials = internal.DirectCredentials
-)
-
-func DefaultContext() internal.Context {
- return internal.DefaultContext
-}
-
-func FromContext(ctx context.Context) Context {
- return internal.FromContext(ctx)
-}
-
-func FromProvider(p ContextProvider) Context {
- return internal.FromProvider(p)
-}
-
-func DefinedForContext(ctx context.Context) (Context, bool) {
- return internal.DefinedForContext(ctx)
-}
-
-func NewCredentialsSpec(name string, repospec RepositorySpec) CredentialsSpec {
- return internal.NewCredentialsSpec(name, repospec)
-}
-
-func NewGenericCredentialsSpec(name string, repospec *GenericRepositorySpec) CredentialsSpec {
- return internal.NewGenericCredentialsSpec(name, repospec)
-}
-
-func NewGenericRepositorySpec(data []byte, unmarshaler runtime.Unmarshaler) (RepositorySpec, error) {
- return internal.NewGenericRepositorySpec(data, unmarshaler)
-}
-
-func NewCredentials(props common.Properties) Credentials {
- return internal.NewCredentials(props)
-}
-
-func CredentialsFromList(props ...string) Credentials {
- creds := DirectCredentials{}
- for i := 1; i < len(props); i += 2 {
- creds[props[i-1]] = props[i]
- }
- return creds
-}
-
-func CredentialsSpecFromList(props ...string) CredentialsSpec {
- creds := DirectCredentials{}
- for i := 1; i < len(props); i += 2 {
- creds[props[i-1]] = props[i]
- }
- return directcreds.NewCredentials(creds.Properties())
-}
-
-func ToGenericCredentialsSpec(spec CredentialsSpec) (*GenericCredentialsSpec, error) {
- return internal.ToGenericCredentialsSpec(spec)
-}
-
-func ToGenericRepositorySpec(spec RepositorySpec) (*GenericRepositorySpec, error) {
- return internal.ToGenericRepositorySpec(spec)
-}
-
-func ErrUnknownCredentials(name string) error {
- return internal.ErrUnknownCredentials(name)
-}
-
-// CredentialsForConsumer determine effective credentials for a consumer.
-// If no credentials are configured no error and nil is returned.
-// It evaluates a found credentials source for the consumer to determine the
-// final credential properties.
-func CredentialsForConsumer(ctx ContextProvider, id ConsumerIdentity, matchers ...IdentityMatcher) (Credentials, error) {
- return internal.CredentialsForConsumer(ctx, id, false, matchers...)
-}
-
-// RequiredCredentialsForConsumer like CredentialsForConsumer, but an errors is returned
-// if no credentials are found.
-func RequiredCredentialsForConsumer(ctx ContextProvider, id ConsumerIdentity, matchers ...IdentityMatcher) (Credentials, error) {
- return internal.CredentialsForConsumer(ctx, id, true, matchers...)
-}
-
-var (
- CompleteMatch = internal.CompleteMatch
- NoMatch = internal.NoMatch
- PartialMatch = internal.PartialMatch
-)
-
-func NewConsumerIdentity(typ string, attrs ...string) ConsumerIdentity {
- return internal.NewConsumerIdentity(typ, attrs...)
-}
diff --git a/pkg/contexts/credentials/internal/builder.go b/pkg/contexts/credentials/internal/builder.go
deleted file mode 100644
index 41cb04c55..000000000
--- a/pkg/contexts/credentials/internal/builder.go
+++ /dev/null
@@ -1,79 +0,0 @@
-package internal
-
-import (
- "context"
-
- "github.com/open-component-model/ocm/pkg/contexts/config"
- "github.com/open-component-model/ocm/pkg/contexts/datacontext"
-)
-
-type Builder struct {
- ctx context.Context
- config config.Context
- reposcheme RepositoryTypeScheme
- matchers IdentityMatcherRegistry
-}
-
-func (b *Builder) getContext() context.Context {
- if b.ctx == nil {
- return context.Background()
- }
- return b.ctx
-}
-
-func (b Builder) WithContext(ctx context.Context) Builder {
- b.ctx = ctx
- return b
-}
-
-func (b Builder) WithConfig(ctx config.Context) Builder {
- b.config = ctx
- return b
-}
-
-func (b Builder) WithRepositoyTypeScheme(scheme RepositoryTypeScheme) Builder {
- b.reposcheme = scheme
- return b
-}
-
-func (b Builder) WithStandardConumerMatchers(matchers IdentityMatcherRegistry) Builder {
- b.matchers = matchers
- return b
-}
-
-func (b Builder) Bound() (Context, context.Context) {
- c := b.New()
- return c, context.WithValue(b.getContext(), key, c)
-}
-
-func (b Builder) New(m ...datacontext.BuilderMode) Context {
- mode := datacontext.Mode(m...)
- ctx := b.getContext()
-
- if b.config == nil {
- var ok bool
- b.config, ok = config.DefinedForContext(ctx)
- if !ok && mode != datacontext.MODE_SHARED {
- b.config = config.New(mode)
- }
- }
- if b.reposcheme == nil {
- switch mode {
- case datacontext.MODE_INITIAL:
- b.reposcheme = NewRepositoryTypeScheme(nil)
- case datacontext.MODE_CONFIGURED:
- b.reposcheme = NewRepositoryTypeScheme(nil)
- b.reposcheme.AddKnownTypes(DefaultRepositoryTypeScheme)
- case datacontext.MODE_EXTENDED:
- b.reposcheme = NewRepositoryTypeScheme(nil, DefaultRepositoryTypeScheme)
- case datacontext.MODE_DEFAULTED:
- fallthrough
- case datacontext.MODE_SHARED:
- b.reposcheme = DefaultRepositoryTypeScheme
- }
- }
- if b.matchers == nil {
- b.matchers = StandardIdentityMatchers
- }
- return datacontext.SetupContext(mode, newContext(b.config, b.reposcheme, b.matchers, b.config))
-}
diff --git a/pkg/contexts/credentials/internal/builder_test.go b/pkg/contexts/credentials/internal/builder_test.go
deleted file mode 100644
index d686a7d48..000000000
--- a/pkg/contexts/credentials/internal/builder_test.go
+++ /dev/null
@@ -1,58 +0,0 @@
-package internal_test
-
-import (
- . "github.com/onsi/ginkgo/v2"
- . "github.com/onsi/gomega"
-
- "github.com/open-component-model/ocm/pkg/contexts/config"
- local "github.com/open-component-model/ocm/pkg/contexts/credentials/internal"
- "github.com/open-component-model/ocm/pkg/contexts/datacontext"
-)
-
-var _ = Describe("builder test", func() {
- It("creates local", func() {
- ctx := local.Builder{}.New(datacontext.MODE_SHARED)
-
- Expect(ctx.AttributesContext()).To(BeIdenticalTo(datacontext.DefaultContext))
- Expect(ctx).NotTo(BeIdenticalTo(local.DefaultContext))
- Expect(ctx.RepositoryTypes()).To(BeIdenticalTo(local.DefaultRepositoryTypeScheme))
-
- Expect(ctx.ConfigContext().GetId()).To(BeIdenticalTo(config.DefaultContext().GetId()))
- })
-
- It("creates defaulted", func() {
- ctx := local.Builder{}.New(datacontext.MODE_DEFAULTED)
-
- Expect(ctx.AttributesContext()).NotTo(BeIdenticalTo(datacontext.DefaultContext))
- Expect(ctx).NotTo(BeIdenticalTo(local.DefaultContext))
- Expect(ctx.RepositoryTypes()).To(BeIdenticalTo(local.DefaultRepositoryTypeScheme))
-
- Expect(ctx.ConfigContext().GetId()).NotTo(BeIdenticalTo(config.DefaultContext().GetType()))
- Expect(ctx.ConfigContext().ConfigTypes()).To(BeIdenticalTo(config.DefaultContext().ConfigTypes()))
- })
-
- It("creates configured", func() {
- ctx := local.Builder{}.New(datacontext.MODE_CONFIGURED)
-
- Expect(ctx.AttributesContext()).NotTo(BeIdenticalTo(datacontext.DefaultContext))
- Expect(ctx).NotTo(BeIdenticalTo(local.DefaultContext))
- Expect(ctx.RepositoryTypes()).NotTo(BeIdenticalTo(local.DefaultRepositoryTypeScheme))
- Expect(ctx.RepositoryTypes().KnownTypeNames()).To(Equal(local.DefaultRepositoryTypeScheme.KnownTypeNames()))
-
- Expect(ctx.ConfigContext().GetId()).NotTo(BeIdenticalTo(config.DefaultContext().GetId()))
- Expect(ctx.ConfigContext().ConfigTypes()).NotTo(BeIdenticalTo(config.DefaultContext().ConfigTypes()))
- Expect(ctx.ConfigContext().ConfigTypes().KnownTypeNames()).To(Equal(config.DefaultContext().ConfigTypes().KnownTypeNames()))
- })
-
- It("creates iniial", func() {
- ctx := local.Builder{}.New(datacontext.MODE_INITIAL)
-
- Expect(ctx.AttributesContext()).NotTo(BeIdenticalTo(datacontext.DefaultContext))
- Expect(ctx).NotTo(BeIdenticalTo(local.DefaultContext))
- Expect(ctx.RepositoryTypes()).NotTo(BeIdenticalTo(local.DefaultRepositoryTypeScheme))
- Expect(len(ctx.RepositoryTypes().KnownTypeNames())).To(Equal(0))
-
- Expect(ctx.ConfigContext()).NotTo(BeIdenticalTo(config.DefaultContext()))
- Expect(len(ctx.ConfigContext().ConfigTypes().KnownTypeNames())).To(Equal(0))
- })
-})
diff --git a/pkg/contexts/credentials/internal/context.go b/pkg/contexts/credentials/internal/context.go
deleted file mode 100644
index 09c6e297e..000000000
--- a/pkg/contexts/credentials/internal/context.go
+++ /dev/null
@@ -1,322 +0,0 @@
-package internal
-
-import (
- "context"
- "fmt"
- "reflect"
-
- "github.com/mandelsoft/goutils/errors"
- "github.com/mandelsoft/goutils/generics"
- "github.com/mandelsoft/goutils/maputils"
- "golang.org/x/exp/maps"
-
- "github.com/open-component-model/ocm/pkg/contexts/config"
- cfgcpi "github.com/open-component-model/ocm/pkg/contexts/config/cpi"
- "github.com/open-component-model/ocm/pkg/contexts/datacontext"
- "github.com/open-component-model/ocm/pkg/runtime"
- "github.com/open-component-model/ocm/pkg/runtimefinalizer"
- "github.com/open-component-model/ocm/pkg/utils"
-)
-
-// CONTEXT_TYPE is the global type for a credential context.
-const CONTEXT_TYPE = "credentials" + datacontext.OCM_CONTEXT_SUFFIX
-
-// ProviderIdentity is used to uniquely identify a provider
-// for a configured consumer id. If non-empty it
-// must start with a DNSname identifying the origin of the
-// provider followed by a slash and a local arbitrary identity.
-type ProviderIdentity = runtimefinalizer.ObjectIdentity
-
-type ContextProvider interface {
- CredentialsContext() Context
-}
-
-type ConsumerProvider interface {
- Unregister(id ProviderIdentity)
- Get(id ConsumerIdentity) (CredentialsSource, bool)
- Match(ectx EvaluationContext, id ConsumerIdentity, cur ConsumerIdentity, matcher IdentityMatcher) (CredentialsSource, ConsumerIdentity)
-}
-
-type EvaluationContext *evaluationContext
-
-type evaluationContext struct {
- data map[reflect.Type]interface{}
-}
-
-func (e evaluationContext) String() string {
- return fmt.Sprintf("%v", maputils.Transform(e.data, func(k reflect.Type, v interface{}) (string, string) {
- return k.Name(), fmt.Sprintf("%v", v)
- }))
-}
-
-func GetEvaluationContextFor[T any](ectx EvaluationContext) T {
- var _nil T
- if ectx.data == nil {
- return _nil
- }
- return generics.Cast[T](ectx.data[generics.TypeOf[T]()])
-}
-
-func SetEvaluationContextFor(ectx EvaluationContext, e any) EvaluationContext {
- if ectx.data == nil {
- ectx.data = map[reflect.Type]interface{}{}
- }
- n := &evaluationContext{maps.Clone(ectx.data)}
- n.data[reflect.TypeOf(e)] = e
- return n
-}
-
-type Context interface {
- datacontext.Context
- ContextProvider
- config.ContextProvider
-
- AttributesContext() datacontext.AttributesContext
- RepositoryTypes() RepositoryTypeScheme
-
- RepositorySpecForConfig(data []byte, unmarshaler runtime.Unmarshaler) (RepositorySpec, error)
-
- RepositoryForSpec(spec RepositorySpec, creds ...CredentialsSource) (Repository, error)
- RepositoryForConfig(data []byte, unmarshaler runtime.Unmarshaler, creds ...CredentialsSource) (Repository, error)
-
- CredentialsForSpec(spec CredentialsSpec, creds ...CredentialsSource) (Credentials, error)
- CredentialsForConfig(data []byte, unmarshaler runtime.Unmarshaler, cred ...CredentialsSource) (Credentials, error)
-
- RegisterConsumerProvider(id ProviderIdentity, provider ConsumerProvider)
- UnregisterConsumerProvider(id ProviderIdentity)
-
- GetCredentialsForConsumer(ConsumerIdentity, ...IdentityMatcher) (CredentialsSource, error)
- getCredentialsForConsumer(EvaluationContext, ConsumerIdentity, ...IdentityMatcher) (CredentialsSource, error)
- SetCredentialsForConsumer(identity ConsumerIdentity, creds CredentialsSource)
- SetCredentialsForConsumerWithProvider(pid ProviderIdentity, identity ConsumerIdentity, creds CredentialsSource)
-
- SetAlias(name string, spec RepositorySpec, creds ...CredentialsSource) error
-
- ConsumerIdentityMatchers() IdentityMatcherRegistry
-}
-
-var key = reflect.TypeOf(_context{})
-
-// DefaultContext is the default context initialized by init functions.
-var DefaultContext = Builder{}.New(datacontext.MODE_SHARED)
-
-// FromContext returns the Context to use for context.Context.
-// This is either an explicit context or the default context.
-func FromContext(ctx context.Context) Context {
- c, _ := datacontext.ForContextByKey(ctx, key, DefaultContext)
- return c.(Context)
-}
-
-func FromProvider(p ContextProvider) Context {
- if p == nil {
- return nil
- }
- return p.CredentialsContext()
-}
-
-func DefinedForContext(ctx context.Context) (Context, bool) {
- c, ok := datacontext.ForContextByKey(ctx, key, DefaultContext)
- if c != nil {
- return c.(Context), ok
- }
- return nil, ok
-}
-
-type _InternalContext = datacontext.InternalContext
-
-type _context struct {
- _InternalContext
-
- sharedattributes datacontext.AttributesContext
- updater cfgcpi.Updater
- knownRepositoryTypes RepositoryTypeScheme
- consumerIdentityMatchers IdentityMatcherRegistry
- consumerProviders *consumerProviderRegistry
-}
-
-var (
- _ Context = (*_context)(nil)
- _ datacontext.ViewCreator[Context] = (*_context)(nil)
-)
-
-// gcWrapper is used as garbage collectable
-// wrapper for a context implementation
-// to establish a runtime finalizer.
-type gcWrapper struct {
- datacontext.GCWrapper
- *_context
-}
-
-func newView(c *_context, ref ...bool) Context {
- if utils.Optional(ref...) {
- return datacontext.FinalizedContext[gcWrapper](c)
- }
- return c
-}
-
-func (w *gcWrapper) SetContext(c *_context) {
- w._context = c
-}
-
-func newContext(configctx config.Context, reposcheme RepositoryTypeScheme, consumerMatchers IdentityMatcherRegistry, delegates datacontext.Delegates) Context {
- c := &_context{
- sharedattributes: datacontext.PersistentContextRef(configctx.AttributesContext()),
- knownRepositoryTypes: reposcheme,
- consumerIdentityMatchers: consumerMatchers,
- consumerProviders: newConsumerProviderRegistry(),
- }
- c._InternalContext = datacontext.NewContextBase(c, CONTEXT_TYPE, key, configctx.GetAttributes(), delegates)
- c.updater = cfgcpi.NewUpdaterForFactory(datacontext.PersistentContextRef(configctx), c.CredentialsContext)
- return newView(c, true)
-}
-
-func (c *_context) CreateView() Context {
- return newView(c, true)
-}
-
-func (c *_context) CredentialsContext() Context {
- return newView(c)
-}
-
-func (c *_context) Update() error {
- return c.updater.Update()
-}
-
-func (c *_context) GetType() string {
- return CONTEXT_TYPE
-}
-
-func (c *_context) AttributesContext() datacontext.AttributesContext {
- return c.sharedattributes
-}
-
-func (c *_context) ConfigContext() config.Context {
- return c.updater.GetContext()
-}
-
-func (c *_context) RepositoryTypes() RepositoryTypeScheme {
- return c.knownRepositoryTypes
-}
-
-func (c *_context) RepositorySpecForConfig(data []byte, unmarshaler runtime.Unmarshaler) (RepositorySpec, error) {
- return c.knownRepositoryTypes.Decode(data, unmarshaler)
-}
-
-func (c *_context) RepositoryForSpec(spec RepositorySpec, creds ...CredentialsSource) (Repository, error) {
- out := newView(c)
- cred, err := CredentialsChain(creds).Credentials(out)
- if err != nil {
- return nil, err
- }
- c.Update()
- return spec.Repository(out, cred)
-}
-
-func (c *_context) RepositoryForConfig(data []byte, unmarshaler runtime.Unmarshaler, creds ...CredentialsSource) (Repository, error) {
- spec, err := c.knownRepositoryTypes.Decode(data, unmarshaler)
- if err != nil {
- return nil, err
- }
- return c.RepositoryForSpec(spec, creds...)
-}
-
-func (c *_context) CredentialsForSpec(spec CredentialsSpec, creds ...CredentialsSource) (Credentials, error) {
- out := newView(c)
- repospec := spec.GetRepositorySpec(out)
- repo, err := c.RepositoryForSpec(repospec, creds...)
- if err != nil {
- return nil, err
- }
- return repo.LookupCredentials(spec.GetCredentialsName())
-}
-
-func (c *_context) CredentialsForConfig(data []byte, unmarshaler runtime.Unmarshaler, creds ...CredentialsSource) (Credentials, error) {
- spec := &GenericCredentialsSpec{}
- err := unmarshaler.Unmarshal(data, spec)
- if err != nil {
- return nil, err
- }
- return c.CredentialsForSpec(spec, creds...)
-}
-
-var emptyIdentity = ConsumerIdentity{}
-
-func (c *_context) GetCredentialsForConsumer(identity ConsumerIdentity, matchers ...IdentityMatcher) (CredentialsSource, error) {
- return c.getCredentialsForConsumer(nil, identity, matchers...)
-}
-
-func (c *_context) getCredentialsForConsumer(ectx EvaluationContext, identity ConsumerIdentity, matchers ...IdentityMatcher) (CredentialsSource, error) {
- err := c.Update()
- if err != nil {
- return nil, err
- }
-
- if ectx == nil {
- ectx = &evaluationContext{}
- }
- m := c.defaultMatcher(identity, matchers...)
- var credsrc CredentialsSource
- if m == nil {
- credsrc, _ = c.consumerProviders.Get(identity)
- } else {
- credsrc, _ = c.consumerProviders.Match(ectx, identity, nil, m)
- }
- if credsrc == nil {
- credsrc, _ = c.consumerProviders.Get(emptyIdentity)
- }
- if credsrc == nil {
- return nil, ErrUnknownConsumer(identity.String())
- }
- return credsrc, nil
-}
-
-func (c *_context) defaultMatcher(id ConsumerIdentity, matchers ...IdentityMatcher) IdentityMatcher {
- def := c.consumerIdentityMatchers.Get(id.Type())
- if def == nil {
- def = PartialMatch
- }
- return mergeMatcher(def, andMatcher, matchers)
-}
-
-func (c *_context) SetCredentialsForConsumer(identity ConsumerIdentity, creds CredentialsSource) {
- c.Update()
- c.consumerProviders.Set(identity, "", creds)
-}
-
-func (c *_context) SetCredentialsForConsumerWithProvider(pid ProviderIdentity, identity ConsumerIdentity, creds CredentialsSource) {
- c.Update()
- c.consumerProviders.Set(identity, pid, creds)
-}
-
-func (c *_context) ConsumerIdentityMatchers() IdentityMatcherRegistry {
- return c.consumerIdentityMatchers
-}
-
-func (c *_context) SetAlias(name string, spec RepositorySpec, creds ...CredentialsSource) error {
- c.Update()
- t := c.knownRepositoryTypes.GetType(AliasRepositoryType)
- if t == nil {
- return errors.ErrNotSupported("aliases")
- }
- if a, ok := t.(AliasRegistry); ok {
- return a.SetAlias(c, name, spec, CredentialsChain(creds))
- }
- return errors.ErrNotImplemented("interface", "AliasRegistry", reflect.TypeOf(t).String())
-}
-
-func (c *_context) RegisterConsumerProvider(id ProviderIdentity, provider ConsumerProvider) {
- c.consumerProviders.Register(id, provider)
-}
-
-func (c *_context) UnregisterConsumerProvider(id ProviderIdentity) {
- c.consumerProviders.Unregister(id)
-}
-
-///////////////////////////////////////
-
-func GetCredentialsForConsumer(ctx Context, ectx EvaluationContext, identity ConsumerIdentity, matchers ...IdentityMatcher) (CredentialsSource, error) {
- if ectx == nil {
- ectx = &evaluationContext{}
- }
- return ctx.getCredentialsForConsumer(ectx, identity, matchers...)
-}
diff --git a/pkg/contexts/credentials/internal/cred_test.go b/pkg/contexts/credentials/internal/cred_test.go
deleted file mode 100644
index 26204a994..000000000
--- a/pkg/contexts/credentials/internal/cred_test.go
+++ /dev/null
@@ -1,87 +0,0 @@
-package internal_test
-
-import (
- "encoding/json"
- "reflect"
-
- . "github.com/onsi/ginkgo/v2"
- . "github.com/onsi/gomega"
-
- "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/credentials/internal"
- "github.com/open-component-model/ocm/pkg/contexts/credentials/repositories/memory"
-)
-
-var DefaultContext = credentials.New()
-
-var _ = Describe("generic credentials", func() {
- props := common.Properties{
- "user": "USER",
- "password": "PASSWORD",
- }
- credmemdata := "{\"credentialsName\":\"cred\",\"repoName\":\"test\",\"type\":\"Memory\"}"
- memdata := "{\"repoName\":\"test\",\"type\":\"Memory\"}"
-
- _ = props
-
- It("de/serializes credentials spec", func() {
- repospec := memory.NewRepositorySpec("test")
- credspec := credentials.NewCredentialsSpec("cred", repospec)
-
- data, err := json.Marshal(credspec)
- Expect(err).To(Succeed())
- Expect(data).To(Equal([]byte(credmemdata)))
-
- credspec = &internal.DefaultCredentialsSpec{}
- err = json.Unmarshal(data, credspec)
- Expect(err).To(Succeed())
- s := credspec.(*internal.DefaultCredentialsSpec)
- Expect(reflect.TypeOf(s.RepositorySpec).String()).To(Equal("*memory.RepositorySpec"))
- Expect(s.CredentialsName).To(Equal("cred"))
- Expect(s.RepositorySpec.(*memory.RepositorySpec).RepositoryName).To(Equal("test"))
- })
-
- It("de/serializes generic credentials spec", func() {
- credspec := &internal.GenericCredentialsSpec{}
-
- err := json.Unmarshal([]byte(credmemdata), credspec)
- Expect(err).To(Succeed())
-
- data, err := json.Marshal(credspec)
- Expect(err).To(Succeed())
- Expect(data).To(Equal([]byte(credmemdata)))
- })
-
- It("de/serializes generic repository spec", func() {
- credspec := &internal.GenericRepositorySpec{}
-
- err := json.Unmarshal([]byte(memdata), credspec)
- Expect(err).To(Succeed())
-
- data, err := json.Marshal(credspec)
- Expect(err).To(Succeed())
- Expect(data).To(Equal([]byte(memdata)))
- })
-
- It("converts credentials spec to generic ones", func() {
- repospec := memory.NewRepositorySpec("test")
- credspec := credentials.NewCredentialsSpec("cred", repospec)
- data, err := json.Marshal(credspec)
- Expect(err).To(Succeed())
-
- gen, err := credentials.ToGenericCredentialsSpec(credspec)
- Expect(err).To(Succeed())
-
- Expect(reflect.TypeOf(gen).String()).To(Equal("*internal.GenericCredentialsSpec"))
- Expect(reflect.TypeOf(gen.RepositorySpec).String()).To(Equal("*internal.GenericRepositorySpec"))
-
- gen2, err := credentials.ToGenericCredentialsSpec(gen)
- Expect(err).To(Succeed())
- Expect(gen2).To(BeIdenticalTo(gen))
-
- data3, err := json.Marshal(gen)
- Expect(err).To(Succeed())
- Expect(data3).To(Equal(data))
- })
-})
diff --git a/pkg/contexts/credentials/internal/logging.go b/pkg/contexts/credentials/internal/logging.go
deleted file mode 100644
index 6934cbe1e..000000000
--- a/pkg/contexts/credentials/internal/logging.go
+++ /dev/null
@@ -1,10 +0,0 @@
-package internal
-
-import (
- ocmlog "github.com/open-component-model/ocm/pkg/logging"
-)
-
-var (
- REALM = ocmlog.DefineSubRealm("Credentials", "credentials")
- log = ocmlog.DynamicLogger(REALM)
-)
diff --git a/pkg/contexts/credentials/internal/repository.go b/pkg/contexts/credentials/internal/repository.go
deleted file mode 100644
index 171477cea..000000000
--- a/pkg/contexts/credentials/internal/repository.go
+++ /dev/null
@@ -1,63 +0,0 @@
-package internal
-
-import (
- "github.com/mandelsoft/goutils/set"
-
- "github.com/open-component-model/ocm/pkg/common"
-)
-
-type Repository interface {
- ExistsCredentials(name string) (bool, error)
- LookupCredentials(name string) (Credentials, error)
- WriteCredentials(name string, creds Credentials) (Credentials, error)
-}
-
-type Credentials interface {
- CredentialsSource
- ExistsProperty(name string) bool
- GetProperty(name string) string
- PropertyNames() set.Set[string]
- Properties() common.Properties
-}
-
-type DirectCredentials common.Properties
-
-var _ Credentials = (*DirectCredentials)(nil)
-
-func NewCredentials(props common.Properties) DirectCredentials {
- if props == nil {
- props = common.Properties{}
- } else {
- props = props.Copy()
- }
- return DirectCredentials(props)
-}
-
-func (c DirectCredentials) ExistsProperty(name string) bool {
- _, ok := c[name]
- return ok
-}
-
-func (c DirectCredentials) GetProperty(name string) string {
- return c[name]
-}
-
-func (c DirectCredentials) PropertyNames() set.Set[string] {
- return common.Properties(c).Names()
-}
-
-func (c DirectCredentials) Properties() common.Properties {
- return common.Properties(c).Copy()
-}
-
-func (c DirectCredentials) Credentials(Context, ...CredentialsSource) (Credentials, error) {
- return c, nil
-}
-
-func (c DirectCredentials) Copy() DirectCredentials {
- return DirectCredentials(common.Properties(c).Copy())
-}
-
-func (c DirectCredentials) String() string {
- return common.Properties(c).String()
-}
diff --git a/pkg/contexts/credentials/internal/repotypes.go b/pkg/contexts/credentials/internal/repotypes.go
deleted file mode 100644
index 37d3f94df..000000000
--- a/pkg/contexts/credentials/internal/repotypes.go
+++ /dev/null
@@ -1,138 +0,0 @@
-package internal
-
-import (
- "encoding/json"
-
- "github.com/mandelsoft/goutils/errors"
- "github.com/mandelsoft/goutils/generics"
- "github.com/modern-go/reflect2"
-
- "github.com/open-component-model/ocm/pkg/runtime"
- "github.com/open-component-model/ocm/pkg/runtime/descriptivetype"
- "github.com/open-component-model/ocm/pkg/utils"
-)
-
-type RepositoryType interface {
- descriptivetype.TypedObjectType[RepositorySpec]
-}
-
-type RepositorySpec interface {
- runtime.VersionedTypedObject
-
- Repository(Context, Credentials) (Repository, error)
-}
-
-type (
- RepositorySpecDecoder = runtime.TypedObjectDecoder[RepositorySpec]
- RepositoryTypeProvider = runtime.KnownTypesProvider[RepositorySpec, RepositoryType]
-)
-
-type RepositoryTypeScheme interface {
- descriptivetype.TypeScheme[RepositorySpec, RepositoryType]
-}
-
-type _Scheme = descriptivetype.TypeScheme[RepositorySpec, RepositoryType]
-
-type repositoryTypeScheme struct {
- _Scheme
-}
-
-func NewRepositoryTypeScheme(defaultDecoder RepositorySpecDecoder, base ...RepositoryTypeScheme) RepositoryTypeScheme {
- scheme := descriptivetype.MustNewDefaultTypeScheme[RepositorySpec, RepositoryType, RepositoryTypeScheme]("Credential provider", nil, &UnknownRepositorySpec{}, true, defaultDecoder, utils.Optional(base...))
- return &repositoryTypeScheme{scheme}
-}
-
-func NewStrictRepositoryTypeScheme(base ...RepositoryTypeScheme) runtime.VersionedTypeRegistry[RepositorySpec, RepositoryType] {
- scheme := descriptivetype.MustNewDefaultTypeScheme[RepositorySpec, RepositoryType, RepositoryTypeScheme]("Credential provider", nil, nil, false, nil, utils.Optional(base...))
- return &repositoryTypeScheme{scheme}
-}
-
-func (t *repositoryTypeScheme) KnownTypes() runtime.KnownTypes[RepositorySpec, RepositoryType] {
- return t._Scheme.KnownTypes()
-}
-
-// DefaultRepositoryTypeScheme contains all globally known access serializer.
-var DefaultRepositoryTypeScheme = NewRepositoryTypeScheme(nil)
-
-func RegisterRepositoryType(atype RepositoryType) {
- DefaultRepositoryTypeScheme.Register(atype)
-}
-
-func CreateRepositorySpec(t runtime.TypedObject) (RepositorySpec, error) {
- return DefaultRepositoryTypeScheme.Convert(t)
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-type UnknownRepositorySpec struct {
- runtime.UnstructuredVersionedTypedObject `json:",inline"`
-}
-
-var (
- _ RepositorySpec = &UnknownRepositorySpec{}
- _ runtime.Unknown = &UnknownRepositorySpec{}
-)
-
-func (r *UnknownRepositorySpec) IsUnknown() bool {
- return true
-}
-
-func (r *UnknownRepositorySpec) Repository(Context, Credentials) (Repository, error) {
- return nil, errors.ErrUnknown("repository type", r.GetType())
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-type GenericRepositorySpec struct {
- runtime.UnstructuredVersionedTypedObject `json:",inline"`
-}
-
-var _ RepositorySpec = &GenericRepositorySpec{}
-
-func ToGenericRepositorySpec(spec RepositorySpec) (*GenericRepositorySpec, error) {
- if reflect2.IsNil(spec) {
- return nil, nil
- }
- if g, ok := spec.(*GenericRepositorySpec); ok {
- return g, nil
- }
- data, err := json.Marshal(spec)
- if err != nil {
- return nil, err
- }
- return newGenericRepositorySpec(data, runtime.DefaultJSONEncoding)
-}
-
-func NewGenericRepositorySpec(data []byte, unmarshaler runtime.Unmarshaler) (RepositorySpec, error) {
- return generics.CastPointerR[RepositorySpec](newGenericRepositorySpec(data, unmarshaler))
-}
-
-func newGenericRepositorySpec(data []byte, unmarshaler runtime.Unmarshaler) (*GenericRepositorySpec, error) {
- unstr := &runtime.UnstructuredVersionedTypedObject{}
- if unmarshaler == nil {
- unmarshaler = runtime.DefaultYAMLEncoding
- }
- err := unmarshaler.Unmarshal(data, unstr)
- if err != nil {
- return nil, err
- }
- return &GenericRepositorySpec{*unstr}, nil
-}
-
-func (s *GenericRepositorySpec) Evaluate(ctx Context) (RepositorySpec, error) {
- raw, err := s.GetRaw()
- if err != nil {
- return nil, err
- }
- return ctx.RepositoryTypes().Decode(raw, runtime.DefaultJSONEncoding)
-}
-
-func (s *GenericRepositorySpec) Repository(ctx Context, creds Credentials) (Repository, error) {
- spec, err := s.Evaluate(ctx)
- if err != nil {
- return nil, err
- }
- return spec.Repository(ctx, creds)
-}
-
-////////////////////////////////////////////////////////////////////////////////
diff --git a/pkg/contexts/credentials/repositories/aliases/cache.go b/pkg/contexts/credentials/repositories/aliases/cache.go
deleted file mode 100644
index 8a9db2441..000000000
--- a/pkg/contexts/credentials/repositories/aliases/cache.go
+++ /dev/null
@@ -1,37 +0,0 @@
-package aliases
-
-import (
- "sync"
-
- "github.com/open-component-model/ocm/pkg/contexts/credentials/cpi"
- "github.com/open-component-model/ocm/pkg/contexts/datacontext"
-)
-
-const ATTR_REPOS = "github.com/open-component-model/ocm/pkg/contexts/credentials/repositories/aliases"
-
-type Repositories struct {
- sync.RWMutex
- repos map[string]*Repository
-}
-
-func newRepositories(datacontext.Context) interface{} {
- return &Repositories{
- repos: map[string]*Repository{},
- }
-}
-
-func (c *Repositories) GetRepository(name string) *Repository {
- c.RLock()
- defer c.RUnlock()
- return c.repos[name]
-}
-
-func (c *Repositories) Set(name string, spec cpi.RepositorySpec, creds cpi.CredentialsSource) {
- c.Lock()
- defer c.Unlock()
- c.repos[name] = &Repository{
- name: name,
- spec: spec,
- creds: creds,
- }
-}
diff --git a/pkg/contexts/credentials/repositories/aliases/repo_test.go b/pkg/contexts/credentials/repositories/aliases/repo_test.go
deleted file mode 100644
index 1e98ba8ce..000000000
--- a/pkg/contexts/credentials/repositories/aliases/repo_test.go
+++ /dev/null
@@ -1,70 +0,0 @@
-package aliases_test
-
-import (
- "encoding/json"
- "reflect"
-
- . "github.com/onsi/ginkgo/v2"
- . "github.com/onsi/gomega"
-
- "github.com/open-component-model/ocm/pkg/common"
- "github.com/open-component-model/ocm/pkg/contexts/credentials"
- local "github.com/open-component-model/ocm/pkg/contexts/credentials/repositories/aliases"
-)
-
-var DefaultContext = credentials.New()
-
-var _ = Describe("alias credentials", func() {
- props := common.Properties{
- "user": "USER",
- "password": "PASSWORD",
- }
-
- memorydata := "{\"type\":\"Memory\",\"repoName\":\"myrepo\"}"
- specdata := "{\"type\":\"Alias\",\"alias\":\"test\"}"
-
- It("serializes repo spec", func() {
- spec := local.NewRepositorySpec("test")
- data, err := json.Marshal(spec)
- Expect(err).To(Succeed())
- Expect(data).To(Equal([]byte(specdata)))
- })
- It("deserializes repo spec", func() {
- spec, err := DefaultContext.RepositorySpecForConfig([]byte(specdata), nil)
- Expect(err).To(Succeed())
- Expect(reflect.TypeOf(spec).String()).To(Equal("*aliases.RepositorySpec"))
- Expect(spec.(*local.RepositorySpec).Alias).To(Equal("test"))
- })
-
- It("resolves repository", func() {
- memoryspec, err := credentials.NewGenericRepositorySpec([]byte(memorydata), nil)
- Expect(err).To(Succeed())
-
- err = DefaultContext.SetAlias("test", memoryspec)
- Expect(err).To(Succeed())
-
- repo, err := DefaultContext.RepositoryForConfig([]byte(specdata), nil)
- Expect(err).To(Succeed())
- Expect(reflect.TypeOf(repo).String()).To(Equal("*memory.Repository"))
- })
-
- It("sets and retrieves credentials", func() {
- memoryspec, err := credentials.NewGenericRepositorySpec([]byte(memorydata), nil)
- Expect(err).To(Succeed())
-
- err = DefaultContext.SetAlias("test", memoryspec)
- Expect(err).To(Succeed())
-
- repo, err := DefaultContext.RepositoryForConfig([]byte(memorydata), nil)
- Expect(err).To(Succeed())
-
- _, err = repo.WriteCredentials("bibo", credentials.NewCredentials(props))
- Expect(err).To(Succeed())
-
- credspec := credentials.NewCredentialsSpec("bibo", local.NewRepositorySpec("test"))
-
- creds, err := DefaultContext.CredentialsForSpec(credspec)
- Expect(err).To(Succeed())
- Expect(creds.Properties()).To(Equal(props))
- })
-})
diff --git a/pkg/contexts/credentials/repositories/aliases/repository.go b/pkg/contexts/credentials/repositories/aliases/repository.go
deleted file mode 100644
index 3ed4bb259..000000000
--- a/pkg/contexts/credentials/repositories/aliases/repository.go
+++ /dev/null
@@ -1,45 +0,0 @@
-package aliases
-
-import (
- "sync"
-
- "github.com/open-component-model/ocm/pkg/contexts/credentials/cpi"
-)
-
-type Repository struct {
- sync.Mutex
- name string
- spec cpi.RepositorySpec
- creds cpi.CredentialsSource
- repo cpi.Repository
-}
-
-func (a *Repository) GetRepository(ctx cpi.Context, creds cpi.Credentials) (cpi.Repository, error) {
- a.Lock()
- defer a.Unlock()
- if a.repo != nil {
- return a.repo, nil
- }
-
- src := cpi.CredentialsChain{}
- if a.creds != nil {
- src = append(src, a.creds)
- }
- if creds != nil {
- src = append(src, creds)
- }
- repo, err := ctx.RepositoryForSpec(a.spec, src...)
- if err != nil {
- return nil, err
- }
- a.repo = repo
- return repo, nil
-}
-
-func NewRepository(name string, spec cpi.RepositorySpec, creds cpi.Credentials) *Repository {
- return &Repository{
- name: name,
- spec: spec,
- creds: creds,
- }
-}
diff --git a/pkg/contexts/credentials/repositories/aliases/type.go b/pkg/contexts/credentials/repositories/aliases/type.go
deleted file mode 100644
index 7b8a90b98..000000000
--- a/pkg/contexts/credentials/repositories/aliases/type.go
+++ /dev/null
@@ -1,59 +0,0 @@
-package aliases
-
-import (
- "fmt"
-
- "github.com/open-component-model/ocm/pkg/contexts/credentials/cpi"
- "github.com/open-component-model/ocm/pkg/runtime"
-)
-
-const (
- Type = cpi.AliasRepositoryType
- TypeV1 = Type + runtime.VersionSeparator + "v1"
-)
-
-func init() {
- cpi.RegisterRepositoryType(cpi.NewAliasRegistry(cpi.NewRepositoryType[*RepositorySpec](Type), setAlias))
- cpi.RegisterRepositoryType(cpi.NewRepositoryType[*RepositorySpec](TypeV1))
-}
-
-func setAlias(ctx cpi.Context, name string, spec cpi.RepositorySpec, creds cpi.CredentialsSource) error {
- r := ctx.GetAttributes().GetOrCreateAttribute(ATTR_REPOS, newRepositories)
- repos, ok := r.(*Repositories)
- if !ok {
- return fmt.Errorf("failed to assert type %T to Repositories", r)
- }
- repos.Set(name, spec, creds)
- return nil
-}
-
-// RepositorySpec describes a memory based repository interface.
-type RepositorySpec struct {
- runtime.ObjectVersionedType `json:",inline"`
- Alias string `json:"alias"`
-}
-
-// NewRepositorySpec creates a new memory RepositorySpec.
-func NewRepositorySpec(name string) *RepositorySpec {
- return &RepositorySpec{
- ObjectVersionedType: runtime.NewVersionedTypedObject(Type),
- Alias: name,
- }
-}
-
-func (a *RepositorySpec) GetType() string {
- return Type
-}
-
-func (a *RepositorySpec) Repository(ctx cpi.Context, creds cpi.Credentials) (cpi.Repository, error) {
- r := ctx.GetAttributes().GetOrCreateAttribute(ATTR_REPOS, newRepositories)
- repos, ok := r.(*Repositories)
- if !ok {
- return nil, fmt.Errorf("failed to assert type %T to Repositories", r)
- }
- alias := repos.GetRepository(a.Alias)
- if alias == nil {
- return nil, cpi.ErrUnknownRepository(Type, a.Alias)
- }
- return alias.GetRepository(ctx, creds)
-}
diff --git a/pkg/contexts/credentials/repositories/directcreds/a_usage.go b/pkg/contexts/credentials/repositories/directcreds/a_usage.go
deleted file mode 100644
index b808e7d9f..000000000
--- a/pkg/contexts/credentials/repositories/directcreds/a_usage.go
+++ /dev/null
@@ -1,14 +0,0 @@
-package directcreds
-
-import (
- "github.com/open-component-model/ocm/pkg/listformat"
-)
-
-var usage = `
-This repository type can be used to specify a single inline credential
-set. The default name is the empty string or ` + Type + `.`
-
-var format = `The repository specification supports the following fields:
-` + listformat.FormatListElements("", listformat.StringElementDescriptionList{
- "properties", "*map[string]string*: direct credential fields",
-})
diff --git a/pkg/contexts/credentials/repositories/directcreds/credentials.go b/pkg/contexts/credentials/repositories/directcreds/credentials.go
deleted file mode 100644
index 48c29b528..000000000
--- a/pkg/contexts/credentials/repositories/directcreds/credentials.go
+++ /dev/null
@@ -1,10 +0,0 @@
-package directcreds
-
-import (
- "github.com/open-component-model/ocm/pkg/common"
- "github.com/open-component-model/ocm/pkg/contexts/credentials/cpi"
-)
-
-func NewCredentials(props common.Properties) cpi.CredentialsSpec {
- return cpi.NewCredentialsSpec(Type, NewRepositorySpec(props))
-}
diff --git a/pkg/contexts/credentials/repositories/directcreds/repo_test.go b/pkg/contexts/credentials/repositories/directcreds/repo_test.go
deleted file mode 100644
index 3694363e8..000000000
--- a/pkg/contexts/credentials/repositories/directcreds/repo_test.go
+++ /dev/null
@@ -1,43 +0,0 @@
-package directcreds_test
-
-import (
- "encoding/json"
- "reflect"
-
- . "github.com/onsi/ginkgo/v2"
- . "github.com/onsi/gomega"
-
- "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/credentials/repositories/directcreds"
-)
-
-var DefaultContext = credentials.New()
-
-var _ = Describe("direct credentials", func() {
- props := common.Properties{
- "user": "USER",
- "password": "PASSWORD",
- }
- propsdata := "{\"type\":\"Credentials\",\"properties\":{\"password\":\"PASSWORD\",\"user\":\"USER\"}}"
-
- It("serializes credentials spec", func() {
- spec := directcreds.NewRepositorySpec(props)
- data, err := json.Marshal(spec)
- Expect(err).To(Succeed())
- Expect(data).To(Equal([]byte(propsdata)))
- })
- It("deserializes credentials spec", func() {
- spec, err := DefaultContext.RepositoryForConfig([]byte(propsdata), nil)
- Expect(err).To(Succeed())
- Expect(reflect.TypeOf(spec).String()).To(Equal("*directcreds.Repository"))
- })
-
- It("resolved direct credentials", func() {
- spec := directcreds.NewCredentials(props)
-
- creds, err := DefaultContext.CredentialsForSpec(spec)
- Expect(err).To(Succeed())
- Expect(creds.Properties()).To(Equal(props))
- })
-})
diff --git a/pkg/contexts/credentials/repositories/directcreds/repository.go b/pkg/contexts/credentials/repositories/directcreds/repository.go
deleted file mode 100644
index 6a58b16e3..000000000
--- a/pkg/contexts/credentials/repositories/directcreds/repository.go
+++ /dev/null
@@ -1,34 +0,0 @@
-package directcreds
-
-import (
- "github.com/mandelsoft/goutils/errors"
-
- "github.com/open-component-model/ocm/pkg/contexts/credentials/cpi"
-)
-
-type Repository struct {
- Credentials cpi.Credentials
-}
-
-func NewRepository(creds cpi.Credentials) cpi.Repository {
- return &Repository{
- Credentials: creds,
- }
-}
-
-func (r *Repository) ExistsCredentials(name string) (bool, error) {
- return name == Type, nil
-}
-
-func (r *Repository) LookupCredentials(name string) (cpi.Credentials, error) {
- if name != Type && name != "" {
- return nil, cpi.ErrUnknownCredentials(name)
- }
- return r.Credentials, nil
-}
-
-func (r *Repository) WriteCredentials(name string, creds cpi.Credentials) (cpi.Credentials, error) {
- return nil, errors.ErrNotSupported(cpi.KIND_CREDENTIALS, "write", "constant credential")
-}
-
-var _ cpi.Repository = &Repository{}
diff --git a/pkg/contexts/credentials/repositories/directcreds/type.go b/pkg/contexts/credentials/repositories/directcreds/type.go
deleted file mode 100644
index bb81cec7b..000000000
--- a/pkg/contexts/credentials/repositories/directcreds/type.go
+++ /dev/null
@@ -1,56 +0,0 @@
-package directcreds
-
-import (
- "github.com/open-component-model/ocm/pkg/common"
- "github.com/open-component-model/ocm/pkg/contexts/credentials/cpi"
- "github.com/open-component-model/ocm/pkg/runtime"
-)
-
-const (
- Type = "Credentials"
- TypeV1 = Type + runtime.VersionSeparator + "v1"
-)
-
-func init() {
- cpi.RegisterRepositoryType(cpi.NewRepositoryType[*RepositorySpec](Type))
- cpi.RegisterRepositoryType(cpi.NewRepositoryType[*RepositorySpec](TypeV1, cpi.WithDescription(usage), cpi.WithFormatSpec(format)))
-}
-
-// RepositorySpec describes a repository interface for single direct credentials.
-type RepositorySpec struct {
- runtime.ObjectVersionedType `json:",inline"`
- Properties common.Properties `json:"properties"`
-}
-
-var (
- _ cpi.RepositorySpec = &RepositorySpec{}
- _ cpi.CredentialsSpec = &RepositorySpec{}
-)
-
-// NewRepositorySpec creates a new RepositorySpec.
-func NewRepositorySpec(credentials common.Properties) *RepositorySpec {
- return &RepositorySpec{
- ObjectVersionedType: runtime.NewVersionedTypedObject(Type),
- Properties: credentials,
- }
-}
-
-func (a *RepositorySpec) GetType() string {
- return Type
-}
-
-func (a *RepositorySpec) Repository(ctx cpi.Context, creds cpi.Credentials) (cpi.Repository, error) {
- return NewRepository(cpi.NewCredentials(a.Properties)), nil
-}
-
-func (a *RepositorySpec) Credentials(context cpi.Context, source ...cpi.CredentialsSource) (cpi.Credentials, error) {
- return cpi.NewCredentials(a.Properties), nil
-}
-
-func (a *RepositorySpec) GetCredentialsName() string {
- return ""
-}
-
-func (a *RepositorySpec) GetRepositorySpec(context cpi.Context) cpi.RepositorySpec {
- return a
-}
diff --git a/pkg/contexts/credentials/repositories/dockerconfig/a_usage.go b/pkg/contexts/credentials/repositories/dockerconfig/a_usage.go
deleted file mode 100644
index 1df556666..000000000
--- a/pkg/contexts/credentials/repositories/dockerconfig/a_usage.go
+++ /dev/null
@@ -1,19 +0,0 @@
-package dockerconfig
-
-import (
- "github.com/open-component-model/ocm/pkg/listformat"
-)
-
-var usage = `
-This repository type can be used to access credentials stored in a file
-following the docker config json format. It take into account the
-credentials helper section, also. If enabled, the described
-credentials will be automatically assigned to appropriate consumer ids.
-`
-
-var format = `The repository specification supports the following fields:
-` + listformat.FormatListElements("", listformat.StringElementDescriptionList{
- "dockerConfigFile", "*string*: the file path to a docker config file",
- "dockerConfig", "*json*: an embedded docker config json",
- "propagateConsumerIdentity", "*bool*(optional): enable consumer id propagation",
-})
diff --git a/pkg/contexts/credentials/repositories/dockerconfig/cache.go b/pkg/contexts/credentials/repositories/dockerconfig/cache.go
deleted file mode 100644
index 8b8290242..000000000
--- a/pkg/contexts/credentials/repositories/dockerconfig/cache.go
+++ /dev/null
@@ -1,40 +0,0 @@
-package dockerconfig
-
-import (
- "sync"
-
- "github.com/open-component-model/ocm/pkg/contexts/credentials/cpi"
- "github.com/open-component-model/ocm/pkg/contexts/datacontext"
-)
-
-const ATTR_REPOS = "github.com/open-component-model/ocm/pkg/contexts/credentials/repositories/dockerconfig"
-
-type Repositories struct {
- lock sync.Mutex
- repos map[string]*Repository
-}
-
-func newRepositories(datacontext.Context) interface{} {
- return &Repositories{
- repos: map[string]*Repository{},
- }
-}
-
-func (r *Repositories) GetRepository(ctx cpi.Context, name string, data []byte, propagate bool) (*Repository, error) {
- r.lock.Lock()
- defer r.lock.Unlock()
- var (
- err error = nil
- repo *Repository
- )
- if name != "" {
- repo = r.repos[name]
- }
- if repo == nil {
- repo, err = NewRepository(ctx, name, data, propagate)
- if err == nil {
- r.repos[name] = repo
- }
- }
- return repo, err
-}
diff --git a/pkg/contexts/credentials/repositories/dockerconfig/credentials.go b/pkg/contexts/credentials/repositories/dockerconfig/credentials.go
deleted file mode 100644
index a6a38f829..000000000
--- a/pkg/contexts/credentials/repositories/dockerconfig/credentials.go
+++ /dev/null
@@ -1,67 +0,0 @@
-package dockerconfig
-
-import (
- "github.com/docker/cli/cli/config/configfile"
- dockercred "github.com/docker/cli/cli/config/credentials"
- "github.com/docker/cli/cli/config/types"
- "github.com/mandelsoft/goutils/set"
-
- "github.com/open-component-model/ocm/pkg/common"
- "github.com/open-component-model/ocm/pkg/contexts/credentials/cpi"
-)
-
-type Credentials struct {
- config *configfile.ConfigFile
- name string
- store dockercred.Store
-}
-
-var _ cpi.Credentials = (*Credentials)(nil)
-
-// NewCredentials describes a default getter method for a authentication method.
-func NewCredentials(cfg *configfile.ConfigFile, name string, store dockercred.Store) cpi.Credentials {
- return &Credentials{
- config: cfg,
- name: name,
- store: store,
- }
-}
-
-func (c *Credentials) get() common.Properties {
- auth, err := c.config.GetAuthConfig(c.name)
- if err != nil {
- return common.Properties{}
- }
- return newCredentials(auth).Properties()
-}
-
-func (c *Credentials) Credentials(context cpi.Context, source ...cpi.CredentialsSource) (cpi.Credentials, error) {
- var auth types.AuthConfig
- var err error
- if c.store == nil {
- auth, err = c.config.GetAuthConfig(c.name)
- } else {
- auth, err = c.store.Get(c.name)
- }
- if err != nil {
- return nil, err
- }
- return newCredentials(auth), nil
-}
-
-func (c *Credentials) ExistsProperty(name string) bool {
- _, ok := c.get()[name]
- return ok
-}
-
-func (c *Credentials) GetProperty(name string) string {
- return c.get()[name]
-}
-
-func (c *Credentials) PropertyNames() set.Set[string] {
- return c.get().Names()
-}
-
-func (c *Credentials) Properties() common.Properties {
- return c.get()
-}
diff --git a/pkg/contexts/credentials/repositories/dockerconfig/default.go b/pkg/contexts/credentials/repositories/dockerconfig/default.go
deleted file mode 100644
index f29813bbc..000000000
--- a/pkg/contexts/credentials/repositories/dockerconfig/default.go
+++ /dev/null
@@ -1,32 +0,0 @@
-package dockerconfig
-
-import (
- dockercli "github.com/docker/cli/cli/config"
- "github.com/mandelsoft/filepath/pkg/filepath"
- "github.com/mandelsoft/vfs/pkg/osfs"
- "github.com/mandelsoft/vfs/pkg/vfs"
-
- "github.com/open-component-model/ocm/pkg/contexts/config"
- credcfg "github.com/open-component-model/ocm/pkg/contexts/credentials/config"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/utils/defaultconfigregistry"
-)
-
-func init() {
- defaultconfigregistry.RegisterDefaultConfigHandler(DefaultConfigHandler, desc)
-}
-
-func DefaultConfigHandler(cfg config.Context) (string, config.Config, error) {
- // use docker config as default config for ocm cli
- d := filepath.Join(dockercli.Dir(), dockercli.ConfigFileName)
- if ok, err := vfs.FileExists(osfs.New(), d); ok && err == nil {
- ccfg := credcfg.New()
- ccfg.AddRepository(NewRepositorySpec(d, true))
- return d, ccfg, nil
- }
- return "", nil, nil
-}
-
-var desc = `
-The docker configuration file at ~/.docker/config.json is
-read to feed in the configured credentials for OCI registries.
-`
diff --git a/pkg/contexts/credentials/repositories/dockerconfig/logging.go b/pkg/contexts/credentials/repositories/dockerconfig/logging.go
deleted file mode 100644
index 1902d87bc..000000000
--- a/pkg/contexts/credentials/repositories/dockerconfig/logging.go
+++ /dev/null
@@ -1,7 +0,0 @@
-package dockerconfig
-
-import (
- ocmlog "github.com/open-component-model/ocm/pkg/logging"
-)
-
-var REALM = ocmlog.DefineSubRealm("docker config handling as credential repository", "credentials/dockerconfig")
diff --git a/pkg/contexts/credentials/repositories/dockerconfig/provider.go b/pkg/contexts/credentials/repositories/dockerconfig/provider.go
deleted file mode 100644
index 1ac017391..000000000
--- a/pkg/contexts/credentials/repositories/dockerconfig/provider.go
+++ /dev/null
@@ -1,87 +0,0 @@
-package dockerconfig
-
-import (
- "github.com/docker/cli/cli/config/configfile"
- dockercred "github.com/docker/cli/cli/config/credentials"
-
- "github.com/open-component-model/ocm/pkg/contexts/credentials/builtin/oci/identity"
- "github.com/open-component-model/ocm/pkg/contexts/credentials/cpi"
- "github.com/open-component-model/ocm/pkg/utils"
-)
-
-const PROVIDER = "ocm.software/credentialprovider/" + Type
-
-type ConsumerProvider struct {
- cfg *configfile.ConfigFile
-}
-
-var _ cpi.ConsumerProvider = (*ConsumerProvider)(nil)
-
-func (p *ConsumerProvider) Unregister(id cpi.ProviderIdentity) {
-}
-
-func (p *ConsumerProvider) Match(ectx cpi.EvaluationContext, req cpi.ConsumerIdentity, cur cpi.ConsumerIdentity, m cpi.IdentityMatcher) (cpi.CredentialsSource, cpi.ConsumerIdentity) {
- return p.get(req, cur, m)
-}
-
-func (p *ConsumerProvider) Get(req cpi.ConsumerIdentity) (cpi.CredentialsSource, bool) {
- creds, _ := p.get(req, nil, cpi.CompleteMatch)
- return creds, creds != nil
-}
-
-func (p *ConsumerProvider) get(req cpi.ConsumerIdentity, cur cpi.ConsumerIdentity, m cpi.IdentityMatcher) (cpi.CredentialsSource, cpi.ConsumerIdentity) {
- cfg := p.cfg
- all := cfg.GetAuthConfigs()
- defaultStore := dockercred.DetectDefaultStore(cfg.CredentialsStore)
- var store dockercred.Store
- if defaultStore != "" {
- store = dockercred.NewNativeStore(cfg, defaultStore)
- }
-
- var creds cpi.CredentialsSource
-
- for h, a := range all {
- hostname, port, _ := utils.SplitLocator(dockercred.ConvertToHostname(h))
- if hostname == "index.docker.io" {
- hostname = "docker.io"
- }
- attrs := []string{identity.ID_HOSTNAME, hostname}
- if port != "" {
- attrs = append(attrs, identity.ID_PORT, port)
- }
- id := cpi.NewConsumerIdentity(identity.CONSUMER_TYPE, attrs...)
- if m(req, cur, id) {
- if IsEmptyAuthConfig(a) {
- store := store
- for hh, helper := range cfg.CredentialHelpers {
- if hh == h {
- store = dockercred.NewNativeStore(cfg, helper)
- break
- }
- }
- if store == nil {
- continue
- }
- creds = NewCredentials(cfg, h, store)
- } else {
- creds = newCredentials(a)
- }
- cur = id
- }
- }
- for h, helper := range cfg.CredentialHelpers {
- hostname := dockercred.ConvertToHostname(h)
- if hostname == "index.docker.io" {
- hostname = "docker.io"
- }
- id := cpi.ConsumerIdentity{
- cpi.ATTR_TYPE: identity.CONSUMER_TYPE,
- identity.ID_HOSTNAME: hostname,
- }
- if m(req, cur, id) {
- creds = NewCredentials(cfg, h, dockercred.NewNativeStore(cfg, helper))
- cur = id
- }
- }
- return creds, cur
-}
diff --git a/pkg/contexts/credentials/repositories/dockerconfig/repo_test.go b/pkg/contexts/credentials/repositories/dockerconfig/repo_test.go
deleted file mode 100644
index e3e2e8c7b..000000000
--- a/pkg/contexts/credentials/repositories/dockerconfig/repo_test.go
+++ /dev/null
@@ -1,172 +0,0 @@
-package dockerconfig_test
-
-import (
- "encoding/json"
- "os"
- "reflect"
- "runtime"
- "time"
-
- . "github.com/mandelsoft/goutils/testutils"
- . "github.com/onsi/ginkgo/v2"
- . "github.com/onsi/gomega"
-
- "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/credentials/builtin/oci/identity"
- "github.com/open-component-model/ocm/pkg/contexts/credentials/cpi"
- local "github.com/open-component-model/ocm/pkg/contexts/credentials/repositories/dockerconfig"
- "github.com/open-component-model/ocm/pkg/contexts/datacontext"
- "github.com/open-component-model/ocm/pkg/runtimefinalizer"
-)
-
-var _ = Describe("docker config", func() {
- props := common.Properties{
- "username": "mandelsoft",
- "password": "password",
- "serverAddress": "https://index.docker.io/v1/",
- }
-
- props2 := common.Properties{
- "username": "mandelsoft",
- "password": "token",
- "serverAddress": "https://ghcr.io",
- }
-
- var DefaultContext credentials.Context
-
- BeforeEach(func() {
- DefaultContext = credentials.New()
- })
-
- Context("file based", func() {
- specdata := "{\"type\":\"DockerConfig\",\"dockerConfigFile\":\"testdata/dockerconfig.json\"}"
- specdata2 := "{\"type\":\"DockerConfig\",\"dockerConfigFile\":\"testdata/dockerconfig.json\",\"propagateConsumerIdentity\":true}"
-
- It("serializes repo spec", func() {
- spec := local.NewRepositorySpec("testdata/dockerconfig.json")
- data := Must(json.Marshal(spec))
- Expect(data).To(Equal([]byte(specdata)))
-
- spec = local.NewRepositorySpec("testdata/dockerconfig.json").WithConsumerPropagation(true)
- data = Must(json.Marshal(spec))
- Expect(data).To(Equal([]byte(specdata2)))
- })
-
- It("deserializes repo spec", func() {
- spec := Must(DefaultContext.RepositorySpecForConfig([]byte(specdata), nil))
- Expect(reflect.TypeOf(spec).String()).To(Equal("*dockerconfig.RepositorySpec"))
- Expect(spec.(*local.RepositorySpec).DockerConfigFile).To(Equal("testdata/dockerconfig.json"))
- })
-
- It("resolves repository", func() {
- repo := Must(DefaultContext.RepositoryForConfig([]byte(specdata), nil))
- Expect(reflect.TypeOf(repo).String()).To(Equal("*dockerconfig.Repository"))
- })
-
- It("retrieves credentials", func() {
- repo := Must(DefaultContext.RepositoryForConfig([]byte(specdata), nil))
-
- creds := Must(repo.LookupCredentials("index.docker.io"))
- Expect(creds.Properties()).To(Equal(props))
-
- creds = Must(repo.LookupCredentials("ghcr.io"))
- Expect(creds.Properties()).To(Equal(props2))
- })
-
- It("propagates credentials to consumer identity", func() {
- Must(DefaultContext.RepositoryForConfig([]byte(specdata2), nil))
-
- creds := Must(credentials.CredentialsForConsumer(DefaultContext, credentials.ConsumerIdentity{
- cpi.ATTR_TYPE: identity.CONSUMER_TYPE,
- identity.ID_HOSTNAME: "ghcr.io",
- }))
- Expect(creds.Properties()).To(Equal(props2))
- })
- })
-
- Context("inline data", func() {
- specdata := "{\"type\":\"DockerConfig\",\"dockerConfig\":{\"auths\":{\"https://index.docker.io/v1/\":{\"auth\":\"bWFuZGVsc29mdDpwYXNzd29yZA==\"},\"https://ghcr.io\":{\"auth\":\"bWFuZGVsc29mdDp0b2tlbg==\"}},\"HttpHeaders\":{\"User-Agent\":\"Docker-Client/18.06.1-ce (linux)\"}},\"propagateConsumerIdentity\":true}"
-
- It("serializes repo spec", func() {
- configdata := Must(os.ReadFile("testdata/dockerconfig.json"))
- spec := local.NewRepositorySpecForConfig(configdata).WithConsumerPropagation(true)
- data := Must(json.Marshal(spec))
-
- var (
- datajson map[string]interface{}
- specjson map[string]interface{}
- )
- // Comparing the bytes might be problematic as the order of the JSON objects within the config file might change
- // during Marshaling
- MustBeSuccessful(json.Unmarshal([]byte(specdata), &specjson))
- MustBeSuccessful(json.Unmarshal(data, &datajson))
- Expect(datajson).To(Equal(specjson))
- })
-
- It("deserializes repo spec", func() {
- spec := Must(DefaultContext.RepositorySpecForConfig([]byte(specdata), nil))
- Expect(reflect.TypeOf(spec).String()).To(Equal("*dockerconfig.RepositorySpec"))
- configdata := Must(os.ReadFile("testdata/dockerconfig.json"))
- var (
- configdatajson map[string]interface{}
- dockerconfigjson map[string]interface{}
- )
- // Comparing the bytes might be problematic as the order of the JSON objects within the config file might change
- // during Marshaling
- MustBeSuccessful(json.Unmarshal(configdata, &configdatajson))
- MustBeSuccessful(json.Unmarshal(spec.(*local.RepositorySpec).DockerConfig, &dockerconfigjson))
- Expect(dockerconfigjson).To(Equal(configdatajson))
- })
-
- It("resolves repository", func() {
- repo := Must(DefaultContext.RepositoryForConfig([]byte(specdata), nil))
- Expect(reflect.TypeOf(repo).String()).To(Equal("*dockerconfig.Repository"))
- })
-
- It("retrieves credentials", func() {
- repo := Must(DefaultContext.RepositoryForConfig([]byte(specdata), nil))
-
- creds := Must(repo.LookupCredentials("index.docker.io"))
- Expect(creds.Properties()).To(Equal(props))
-
- creds = Must(repo.LookupCredentials("ghcr.io"))
- Expect(creds.Properties()).To(Equal(props2))
- })
-
- It("propagates credentials to consumer identity", func() {
- Must(DefaultContext.RepositoryForConfig([]byte(specdata), nil))
-
- creds := Must(credentials.CredentialsForConsumer(DefaultContext, credentials.ConsumerIdentity{
- cpi.ATTR_TYPE: identity.CONSUMER_TYPE,
- identity.ID_HOSTNAME: "ghcr.io",
- }))
- Expect(creds.Properties()).To(Equal(props2))
- })
- })
-
- Context("ref handling", func() {
- specdata := "{\"type\":\"DockerConfig\",\"dockerConfigFile\":\"testdata/dockerconfig.json\",\"propagateConsumerIdentity\":true}"
-
- It("can access the default context", func() {
- ctx := credentials.New()
-
- r := runtimefinalizer.GetRuntimeFinalizationRecorder(ctx)
- Expect(r).NotTo(BeNil())
-
- Must(ctx.RepositoryForConfig([]byte(specdata), nil))
-
- runtime.GC()
- time.Sleep(time.Second)
- ctx.GetType()
- Expect(r.Get()).To(BeNil())
-
- Expect(datacontext.GetContextRefCount(ctx)).To(Equal(1))
- ctx = nil
- runtime.GC()
- time.Sleep(time.Second)
-
- Expect(r.Get()).To(ContainElement(ContainSubstring(credentials.CONTEXT_TYPE)))
- })
- })
-})
diff --git a/pkg/contexts/credentials/repositories/dockerconfig/repository.go b/pkg/contexts/credentials/repositories/dockerconfig/repository.go
deleted file mode 100644
index 108494fea..000000000
--- a/pkg/contexts/credentials/repositories/dockerconfig/repository.go
+++ /dev/null
@@ -1,143 +0,0 @@
-package dockerconfig
-
-import (
- "bytes"
- "fmt"
- "os"
- "strings"
- "sync"
-
- "github.com/docker/cli/cli/config"
- "github.com/docker/cli/cli/config/configfile"
- "github.com/docker/cli/cli/config/types"
- "github.com/mandelsoft/goutils/errors"
-
- "github.com/open-component-model/ocm/pkg/common"
- "github.com/open-component-model/ocm/pkg/contexts/credentials/cpi"
- "github.com/open-component-model/ocm/pkg/contexts/datacontext"
- "github.com/open-component-model/ocm/pkg/runtimefinalizer"
- "github.com/open-component-model/ocm/pkg/utils"
-)
-
-type Repository struct {
- lock sync.RWMutex
- ctx cpi.Context
- propagate bool
- path string
- data []byte
- config *configfile.ConfigFile
-}
-
-func NewRepository(ctx cpi.Context, path string, data []byte, propagate bool) (*Repository, error) {
- r := &Repository{
- ctx: datacontext.InternalContextRef(ctx),
- propagate: propagate,
- path: path,
- data: data,
- }
- if path != "" && len(data) > 0 {
- return nil, fmt.Errorf("only config file or config data possible")
- }
- err := r.Read(true)
- return r, err
-}
-
-var _ cpi.Repository = &Repository{}
-
-func (r *Repository) ExistsCredentials(name string) (bool, error) {
- err := r.Read(false)
- if err != nil {
- return false, err
- }
- r.lock.RLock()
- defer r.lock.RUnlock()
-
- _, err = r.config.GetAuthConfig(name)
- return err != nil, err
-}
-
-func (r *Repository) LookupCredentials(name string) (cpi.Credentials, error) {
- err := r.Read(false)
- if err != nil {
- return nil, err
- }
- r.lock.RLock()
- defer r.lock.RUnlock()
-
- auth, err := r.config.GetAuthConfig(name)
- if err != nil {
- return nil, err
- }
- return newCredentials(auth), nil
-}
-
-func (r *Repository) WriteCredentials(name string, creds cpi.Credentials) (cpi.Credentials, error) {
- return nil, errors.ErrNotSupported("write", "credentials", Type)
-}
-
-func (r *Repository) Read(force bool) error {
- r.lock.Lock()
- defer r.lock.Unlock()
- if !force && r.config != nil {
- return nil
- }
- var (
- data []byte
- err error
- id runtimefinalizer.ObjectIdentity
- )
- if r.path != "" {
- path, err := utils.ResolvePath(r.path)
- if err != nil {
- return errors.Wrapf(err, "cannot resolve path %q", r.path)
- }
- data, err = os.ReadFile(path)
- if err != nil {
- return fmt.Errorf("failed to read file '%s': %w", path, err)
- }
- id = cpi.ProviderIdentity(PROVIDER + "/" + path)
- } else if len(r.data) > 0 {
- data = r.data
- id = runtimefinalizer.NewObjectIdentity(PROVIDER)
- }
-
- cfg, err := config.LoadFromReader(bytes.NewBuffer(data))
- if err != nil {
- return fmt.Errorf("failed to load config: %w", err)
- }
- if r.propagate {
- r.ctx.RegisterConsumerProvider(id, &ConsumerProvider{cfg})
- }
- r.config = cfg
- return nil
-}
-
-func newCredentials(auth types.AuthConfig) cpi.Credentials {
- props := common.Properties{
- cpi.ATTR_USERNAME: norm(auth.Username),
- cpi.ATTR_PASSWORD: norm(auth.Password),
- }
- props.SetNonEmptyValue("auth", auth.Auth)
- props.SetNonEmptyValue(cpi.ATTR_SERVER_ADDRESS, norm(auth.ServerAddress))
- props.SetNonEmptyValue(cpi.ATTR_IDENTITY_TOKEN, norm(auth.IdentityToken))
- props.SetNonEmptyValue(cpi.ATTR_REGISTRY_TOKEN, norm(auth.RegistryToken))
- return cpi.NewCredentials(props)
-}
-
-func norm(s string) string {
- for strings.HasSuffix(s, "\n") {
- s = s[:len(s)-1]
- }
- return s
-}
-
-// IsEmptyAuthConfig validates if the resulting auth config contains credentials.
-func IsEmptyAuthConfig(auth types.AuthConfig) bool {
- if len(auth.Auth) != 0 {
- return false
- }
- if len(auth.Username) != 0 {
- return false
- }
- return true
-}
diff --git a/pkg/contexts/credentials/repositories/dockerconfig/type.go b/pkg/contexts/credentials/repositories/dockerconfig/type.go
deleted file mode 100644
index d18cd7f26..000000000
--- a/pkg/contexts/credentials/repositories/dockerconfig/type.go
+++ /dev/null
@@ -1,76 +0,0 @@
-package dockerconfig
-
-import (
- "encoding/json"
- "fmt"
-
- "github.com/mandelsoft/goutils/generics"
-
- "github.com/open-component-model/ocm/pkg/contexts/credentials/cpi"
- "github.com/open-component-model/ocm/pkg/runtime"
- "github.com/open-component-model/ocm/pkg/utils"
-)
-
-const (
- Type = "DockerConfig"
- TypeV1 = Type + runtime.VersionSeparator + "v1"
-)
-
-func init() {
- cpi.RegisterRepositoryType(cpi.NewRepositoryType[*RepositorySpec](Type))
- cpi.RegisterRepositoryType(cpi.NewRepositoryType[*RepositorySpec](TypeV1, cpi.WithDescription(usage), cpi.WithFormatSpec(format)))
-}
-
-// RepositorySpec describes a docker config based credential repository interface.
-type RepositorySpec struct {
- runtime.ObjectVersionedType `json:",inline"`
- DockerConfigFile string `json:"dockerConfigFile,omitempty"`
- DockerConfig json.RawMessage `json:"dockerConfig,omitempty"`
- PropgateConsumerIdentity *bool `json:"propagateConsumerIdentity,omitempty"`
-}
-
-func (s RepositorySpec) WithConsumerPropagation(propagate bool) *RepositorySpec {
- s.PropgateConsumerIdentity = &propagate
- return &s
-}
-
-// NewRepositorySpec creates a new memory RepositorySpec.
-func NewRepositorySpec(path string, prop ...bool) *RepositorySpec {
- var p *bool
- if len(prop) > 0 {
- p = generics.Pointer(utils.Optional(prop...))
- }
- if path == "" {
- path = "~/.docker/config.json"
- }
- return &RepositorySpec{
- ObjectVersionedType: runtime.NewVersionedTypedObject(Type),
- DockerConfigFile: path,
- PropgateConsumerIdentity: p,
- }
-}
-
-func NewRepositorySpecForConfig(data []byte, prop ...bool) *RepositorySpec {
- var p *bool
- if len(prop) > 0 {
- p = generics.Pointer(utils.Optional(prop...))
- }
- return &RepositorySpec{
- ObjectVersionedType: runtime.NewVersionedTypedObject(Type),
- DockerConfig: data,
- PropgateConsumerIdentity: p,
- }
-}
-
-func (a *RepositorySpec) GetType() string {
- return Type
-}
-
-func (a *RepositorySpec) Repository(ctx cpi.Context, creds cpi.Credentials) (cpi.Repository, error) {
- r := ctx.GetAttributes().GetOrCreateAttribute(ATTR_REPOS, newRepositories)
- repos, ok := r.(*Repositories)
- if !ok {
- return nil, fmt.Errorf("failed to assert type %T to Repositories", r)
- }
- return repos.GetRepository(ctx, a.DockerConfigFile, a.DockerConfig, utils.AsBool(a.PropgateConsumerIdentity, true))
-}
diff --git a/pkg/contexts/credentials/repositories/gardenerconfig/cache.go b/pkg/contexts/credentials/repositories/gardenerconfig/cache.go
deleted file mode 100644
index 43f62e0d2..000000000
--- a/pkg/contexts/credentials/repositories/gardenerconfig/cache.go
+++ /dev/null
@@ -1,36 +0,0 @@
-package gardenerconfig
-
-import (
- "fmt"
- "sync"
-
- "github.com/open-component-model/ocm/pkg/contexts/credentials/cpi"
- gardenercfgcpi "github.com/open-component-model/ocm/pkg/contexts/credentials/repositories/gardenerconfig/cpi"
- "github.com/open-component-model/ocm/pkg/contexts/datacontext"
-)
-
-const ATTR_REPOS = "github.com/open-component-model/ocm/pkg/contexts/credentials/repositories/gardenerconfig"
-
-type Repositories struct {
- lock sync.Mutex
- repos map[string]*Repository
-}
-
-func newRepositories(datacontext.Context) interface{} {
- return &Repositories{
- repos: map[string]*Repository{},
- }
-}
-
-func (r *Repositories) GetRepository(ctx cpi.Context, url string, configType gardenercfgcpi.ConfigType, cipher Cipher, key []byte, propagateConsumerIdentity bool) (*Repository, error) {
- r.lock.Lock()
- defer r.lock.Unlock()
- if _, ok := r.repos[url]; !ok {
- repo, err := NewRepository(ctx, url, configType, cipher, key, propagateConsumerIdentity)
- if err != nil {
- return nil, fmt.Errorf("unable to create repository: %w", err)
- }
- r.repos[url] = repo
- }
- return r.repos[url], nil
-}
diff --git a/pkg/contexts/credentials/repositories/gardenerconfig/cpi/interface.go b/pkg/contexts/credentials/repositories/gardenerconfig/cpi/interface.go
deleted file mode 100644
index 1ee6b7ed4..000000000
--- a/pkg/contexts/credentials/repositories/gardenerconfig/cpi/interface.go
+++ /dev/null
@@ -1,53 +0,0 @@
-package cpi
-
-import (
- "io"
- "sync"
-
- "github.com/open-component-model/ocm/pkg/contexts/credentials/cpi"
-)
-
-type ConfigType string
-
-const (
- ContainerRegistry ConfigType = "container_registry"
-)
-
-type Credential interface {
- Name() string
- ConsumerIdentity() cpi.ConsumerIdentity
- Properties() cpi.Credentials
-}
-
-type Handler interface {
- ConfigType() ConfigType
- ParseConfig(io.Reader) ([]Credential, error)
-}
-
-var (
- handlers = map[ConfigType]Handler{}
- lock sync.RWMutex
-)
-
-func RegisterHandler(h Handler) {
- lock.Lock()
- defer lock.Unlock()
- handlers[h.ConfigType()] = h
-}
-
-func GetHandler(configType ConfigType) Handler {
- lock.RLock()
- defer lock.RUnlock()
- return handlers[configType]
-}
-
-func GetHandlers() map[ConfigType]Handler {
- lock.RLock()
- defer lock.RUnlock()
-
- m := map[ConfigType]Handler{}
- for k, v := range handlers {
- m[k] = v
- }
- return m
-}
diff --git a/pkg/contexts/credentials/repositories/gardenerconfig/credentials.go b/pkg/contexts/credentials/repositories/gardenerconfig/credentials.go
deleted file mode 100644
index c633b9120..000000000
--- a/pkg/contexts/credentials/repositories/gardenerconfig/credentials.go
+++ /dev/null
@@ -1,15 +0,0 @@
-package gardenerconfig
-
-import (
- "github.com/open-component-model/ocm/pkg/contexts/credentials/cpi"
-)
-
-type credentialGetter struct {
- getCredentials func() (cpi.Credentials, error)
-}
-
-var _ cpi.CredentialsSource = credentialGetter{}
-
-func (c credentialGetter) Credentials(ctx cpi.Context, cs ...cpi.CredentialsSource) (cpi.Credentials, error) {
- return c.getCredentials()
-}
diff --git a/pkg/contexts/credentials/repositories/gardenerconfig/handler/container_registry/credentials.go b/pkg/contexts/credentials/repositories/gardenerconfig/handler/container_registry/credentials.go
deleted file mode 100644
index 7ff669591..000000000
--- a/pkg/contexts/credentials/repositories/gardenerconfig/handler/container_registry/credentials.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package container_registry
-
-import (
- "github.com/open-component-model/ocm/pkg/contexts/credentials/cpi"
- gardenercfgcpi "github.com/open-component-model/ocm/pkg/contexts/credentials/repositories/gardenerconfig/cpi"
-)
-
-type credentials struct {
- name string
- consumerIdentity cpi.ConsumerIdentity
- properties cpi.Credentials
-}
-
-func (c credentials) Name() string {
- return c.name
-}
-
-func (c credentials) ConsumerIdentity() cpi.ConsumerIdentity {
- return c.consumerIdentity
-}
-
-func (c credentials) Properties() cpi.Credentials {
- return c.properties
-}
-
-var _ gardenercfgcpi.Credential = credentials{}
diff --git a/pkg/contexts/credentials/repositories/gardenerconfig/handler/container_registry/handler.go b/pkg/contexts/credentials/repositories/gardenerconfig/handler/container_registry/handler.go
deleted file mode 100644
index a06583804..000000000
--- a/pkg/contexts/credentials/repositories/gardenerconfig/handler/container_registry/handler.go
+++ /dev/null
@@ -1,99 +0,0 @@
-package container_registry
-
-import (
- "encoding/json"
- "fmt"
- "io"
- "strings"
-
- "github.com/open-component-model/ocm/pkg/common"
- "github.com/open-component-model/ocm/pkg/contexts/credentials/builtin/oci/identity"
- "github.com/open-component-model/ocm/pkg/contexts/credentials/cpi"
- "github.com/open-component-model/ocm/pkg/contexts/credentials/identity/hostpath"
- gardenercfgcpi "github.com/open-component-model/ocm/pkg/contexts/credentials/repositories/gardenerconfig/cpi"
- "github.com/open-component-model/ocm/pkg/utils"
-)
-
-func init() {
- gardenercfgcpi.RegisterHandler(Handler{})
-}
-
-// config is the struct that describes the gardener config data structure.
-type config struct {
- ContainerRegistry map[string]*containerRegistryCredentials `json:"container_registry"`
-}
-
-// containerRegistryCredentials describes the container registry credentials struct as defined by the gardener config.
-type containerRegistryCredentials struct {
- Username string `json:"username"`
- Password string `json:"password"`
- Privileges string `json:"privileges"`
- Host string `json:"host,omitempty"`
- ImageReferencePrefixes []string `json:"image_reference_prefixes,omitempty"`
-}
-
-type Handler struct{}
-
-func (h Handler) ConfigType() gardenercfgcpi.ConfigType {
- return gardenercfgcpi.ContainerRegistry
-}
-
-func (h Handler) ParseConfig(configReader io.Reader) ([]gardenercfgcpi.Credential, error) {
- config := &config{}
- if err := json.NewDecoder(configReader).Decode(&config); err != nil {
- return nil, fmt.Errorf("unable to unmarshal config: %w", err)
- }
-
- creds := []gardenercfgcpi.Credential{}
- for credentialName, credential := range config.ContainerRegistry {
- var (
- scheme string
- port string
- )
- if credential.Host != "" {
- parsedHost, err := utils.ParseURL(credential.Host)
- if err != nil {
- return nil, fmt.Errorf("unable to parse host: %w", err)
- }
- scheme = parsedHost.Scheme
- port = parsedHost.Port()
- }
-
- for _, imgRef := range credential.ImageReferencePrefixes {
- parsedImgPrefix, err := utils.ParseURL(imgRef)
- if err != nil {
- return nil, fmt.Errorf("unable to parse image prefix: %w", err)
- }
- if parsedImgPrefix.Host == "index.docker.io" {
- parsedImgPrefix.Host = "docker.io"
- }
-
- consumerIdentity := cpi.ConsumerIdentity{
- cpi.ID_TYPE: identity.CONSUMER_TYPE,
- hostpath.ID_HOSTNAME: parsedImgPrefix.Host,
- hostpath.ID_PATHPREFIX: strings.Trim(parsedImgPrefix.Path, "/"),
- }
- consumerIdentity.SetNonEmptyValue(hostpath.ID_SCHEME, scheme)
- consumerIdentity.SetNonEmptyValue(hostpath.ID_PORT, port)
-
- c := credentials{
- name: credentialName,
- consumerIdentity: consumerIdentity,
- properties: newCredentialsFromContainerRegistryCredentials(credential),
- }
-
- creds = append(creds, c)
- }
- }
-
- return creds, nil
-}
-
-func newCredentialsFromContainerRegistryCredentials(auth *containerRegistryCredentials) cpi.Credentials {
- props := common.Properties{
- cpi.ATTR_USERNAME: auth.Username,
- cpi.ATTR_PASSWORD: auth.Password,
- }
- props.SetNonEmptyValue(cpi.ATTR_SERVER_ADDRESS, auth.Host)
- return cpi.NewCredentials(props)
-}
diff --git a/pkg/contexts/credentials/repositories/gardenerconfig/identity/identity.go b/pkg/contexts/credentials/repositories/gardenerconfig/identity/identity.go
deleted file mode 100644
index 39ff6d172..000000000
--- a/pkg/contexts/credentials/repositories/gardenerconfig/identity/identity.go
+++ /dev/null
@@ -1,60 +0,0 @@
-package identity
-
-import (
- "fmt"
- "strings"
-
- "github.com/open-component-model/ocm/pkg/common"
- "github.com/open-component-model/ocm/pkg/contexts/credentials/cpi"
- "github.com/open-component-model/ocm/pkg/contexts/credentials/identity/hostpath"
- "github.com/open-component-model/ocm/pkg/listformat"
- "github.com/open-component-model/ocm/pkg/utils"
-)
-
-const CONSUMER_TYPE = "Buildcredentials" + common.OCM_TYPE_GROUP_SUFFIX
-
-// used identity attributes.
-const (
- ID_SCHEME = hostpath.ID_SCHEME
- ID_HOSTNAME = hostpath.ID_HOSTNAME
- ID_PORT = hostpath.ID_PORT
- ID_PATHPREFIX = hostpath.ID_PATHPREFIX
-)
-
-// used credential properties.
-const (
- ATTR_KEY = cpi.ATTR_KEY
-)
-
-var identityMatcher = hostpath.IdentityMatcher(CONSUMER_TYPE)
-
-func IdentityMatcher(pattern, cur, id cpi.ConsumerIdentity) bool {
- return identityMatcher(pattern, cur, id)
-}
-
-func init() {
- attrs := listformat.FormatListElements("", listformat.StringElementDescriptionList{
- ATTR_KEY, "secret key use to access the credential server",
- })
-
- cpi.RegisterStandardIdentity(CONSUMER_TYPE, IdentityMatcher, `Gardener config credential matcher
-
-It matches the `+CONSUMER_TYPE+` consumer type and additionally acts like
-the `+hostpath.IDENTITY_TYPE+` type.`,
- attrs)
-}
-
-func GetConsumerId(configURL string) (cpi.ConsumerIdentity, error) {
- parsedURL, err := utils.ParseURL(configURL)
- if err != nil {
- return nil, fmt.Errorf("unable to parse url: %w", err)
- }
-
- id := cpi.NewConsumerIdentity(CONSUMER_TYPE)
- id.SetNonEmptyValue(ID_HOSTNAME, parsedURL.Host)
- id.SetNonEmptyValue(ID_SCHEME, parsedURL.Scheme)
- id.SetNonEmptyValue(ID_PATHPREFIX, strings.Trim(parsedURL.Path, "/"))
- id.SetNonEmptyValue(ID_PORT, parsedURL.Port())
-
- return id, nil
-}
diff --git a/pkg/contexts/credentials/repositories/gardenerconfig/init.go b/pkg/contexts/credentials/repositories/gardenerconfig/init.go
deleted file mode 100644
index 9b69c3a3a..000000000
--- a/pkg/contexts/credentials/repositories/gardenerconfig/init.go
+++ /dev/null
@@ -1,5 +0,0 @@
-package gardenerconfig
-
-import (
- _ "github.com/open-component-model/ocm/pkg/contexts/credentials/repositories/gardenerconfig/handler/container_registry"
-)
diff --git a/pkg/contexts/credentials/repositories/gardenerconfig/repo_test.go b/pkg/contexts/credentials/repositories/gardenerconfig/repo_test.go
deleted file mode 100644
index beb5a3241..000000000
--- a/pkg/contexts/credentials/repositories/gardenerconfig/repo_test.go
+++ /dev/null
@@ -1,200 +0,0 @@
-package gardenerconfig_test
-
-import (
- "encoding/base64"
- "encoding/json"
- "fmt"
- "net/http"
- "net/http/httptest"
- "reflect"
- "strings"
-
- . "github.com/onsi/ginkgo/v2"
- . "github.com/onsi/gomega"
-
- "github.com/mandelsoft/vfs/pkg/memoryfs"
-
- "github.com/open-component-model/ocm/pkg/contexts/credentials"
- ociidentity "github.com/open-component-model/ocm/pkg/contexts/credentials/builtin/oci/identity"
- "github.com/open-component-model/ocm/pkg/contexts/credentials/cpi"
- local "github.com/open-component-model/ocm/pkg/contexts/credentials/repositories/gardenerconfig"
- gardenercfgcpi "github.com/open-component-model/ocm/pkg/contexts/credentials/repositories/gardenerconfig/cpi"
- "github.com/open-component-model/ocm/pkg/contexts/credentials/repositories/gardenerconfig/identity"
- "github.com/open-component-model/ocm/pkg/contexts/datacontext/attrs/vfsattr"
- "github.com/open-component-model/ocm/pkg/utils"
-)
-
-var _ = Describe("gardener config", func() {
- containerRegistryCfg := `{
- "container_registry": {
- "test-credentials": {
- "username": "abc",
- "password": "123",
- "image_reference_prefixes": [
- "eu.gcr.io/test-project"
- ]
- }
- }
-}`
- encryptionKey := "abcdefghijklmnop"
- encryptedContainerRegistryCfg := "Uz4mfePXFOUbjUEZnRrnG8zP2T7lRH6bR2rFHYgWDwZUXfW7D5wArwY4dsBACPVFNapF7kcM9z79+LvJXd2kNoIfvUyMOhrSDAyv4LtUqYSKBOoRH/aJMnXjmN9GQBCXSRSJs/Fu21AoDNo8fA9zYvvc7WxTldkYC/vHxLVNJu5j176e1QiaS9hwDjgNhgyUT3XUjHUyQ19PcRgwDglRLfiL4Cs/fYPPxdg4YZQdCnc="
- expectedCreds := cpi.DirectCredentials{
- cpi.ATTR_USERNAME: "abc",
- cpi.ATTR_PASSWORD: "123",
- }
-
- repoSpecTemplate := `{"type":"GardenerConfig","url":"%s","configType":"container_registry","cipher":"%s","propagateConsumerIdentity":true}`
-
- var defaultContext credentials.Context
-
- BeforeEach(func() {
- defaultContext = credentials.New()
- })
-
- It("serializes repo spec", func() {
- const (
- url = "http://localhost:8080/container_registry"
- cipher = local.Plaintext
- )
- expectedSpec := fmt.Sprintf(repoSpecTemplate, url, cipher)
-
- spec := local.NewRepositorySpec("http://localhost:8080/container_registry", "container_registry", local.Plaintext, true)
- data, err := json.Marshal(spec)
- Expect(err).ToNot(HaveOccurred())
- Expect(data).To(Equal([]byte(expectedSpec)))
- })
-
- It("deserializes repo spec", func() {
- const (
- url = "http://localhost:8080/container_registry"
- cipher = local.Plaintext
- )
- specdata := fmt.Sprintf(repoSpecTemplate, url, cipher)
-
- spec, err := defaultContext.RepositorySpecForConfig([]byte(specdata), nil)
- Expect(err).ToNot(HaveOccurred())
- Expect(reflect.TypeOf(spec).String()).To(Equal("*gardenerconfig.RepositorySpec"))
-
- parsedSpec := spec.(*local.RepositorySpec)
- Expect(parsedSpec.URL).To(Equal(url))
- Expect(parsedSpec.ConfigType).To(Equal(gardenercfgcpi.ContainerRegistry))
- Expect(parsedSpec.Cipher).To(Equal(cipher))
- })
-
- It("resolves repository", func() {
- const (
- url = "http://localhost:8080/container_registry"
- cipher = local.Plaintext
- )
- specdata := fmt.Sprintf(repoSpecTemplate, url, cipher)
-
- repo, err := defaultContext.RepositoryForConfig([]byte(specdata), nil)
- Expect(err).ToNot(HaveOccurred())
- Expect(repo).ToNot(BeNil())
- Expect(reflect.TypeOf(repo).String()).To(Equal("*gardenerconfig.Repository"))
- })
-
- It("retrieves credentials from unencrypted server", func() {
- svr := httptest.NewServer(http.HandlerFunc(func(writer http.ResponseWriter, request *http.Request) {
- writer.WriteHeader(200)
- _, err := writer.Write([]byte(containerRegistryCfg))
- Expect(err).ToNot(HaveOccurred())
- }))
- defer svr.Close()
-
- spec := fmt.Sprintf(repoSpecTemplate, svr.URL, local.Plaintext)
-
- repo, err := defaultContext.RepositoryForConfig([]byte(spec), nil)
- Expect(err).ToNot(HaveOccurred())
- Expect(repo).ToNot(BeNil())
-
- credentialsFromRepo, err := repo.LookupCredentials("test-credentials")
- Expect(err).ToNot(HaveOccurred())
- Expect(credentialsFromRepo).To(Equal(expectedCreds))
- })
-
- It("propagates credentials with consumer ids in the context", func() {
- expectedConsumerId := cpi.ConsumerIdentity{
- cpi.ID_TYPE: ociidentity.CONSUMER_TYPE,
- ociidentity.ID_HOSTNAME: "eu.gcr.io",
- ociidentity.ID_PATHPREFIX: "test-project",
- }
-
- svr := httptest.NewServer(http.HandlerFunc(func(writer http.ResponseWriter, request *http.Request) {
- writer.WriteHeader(200)
- _, err := writer.Write([]byte(containerRegistryCfg))
- Expect(err).ToNot(HaveOccurred())
- }))
- defer svr.Close()
-
- spec := fmt.Sprintf(repoSpecTemplate, svr.URL, local.Plaintext)
-
- repo, err := defaultContext.RepositoryForConfig([]byte(spec), nil)
- Expect(err).ToNot(HaveOccurred())
- Expect(repo).ToNot(BeNil())
-
- credentialsFromCtx, err := credentials.CredentialsForConsumer(defaultContext, expectedConsumerId)
- Expect(err).ToNot(HaveOccurred())
- Expect(credentialsFromCtx).To(Equal(expectedCreds))
- })
-
- It("retrieves credentials from encrypted server", func() {
- svr := httptest.NewServer(http.HandlerFunc(func(writer http.ResponseWriter, request *http.Request) {
- writer.WriteHeader(200)
- data, err := base64.StdEncoding.DecodeString(encryptedContainerRegistryCfg)
- Expect(err).ToNot(HaveOccurred())
- _, err = writer.Write(data)
- Expect(err).ToNot(HaveOccurred())
- }))
- defer svr.Close()
-
- parsedURL, err := utils.ParseURL(svr.URL)
- Expect(err).ToNot(HaveOccurred())
-
- id := cpi.NewConsumerIdentity(identity.CONSUMER_TYPE)
- id.SetNonEmptyValue(identity.ID_HOSTNAME, parsedURL.Host)
- id.SetNonEmptyValue(identity.ID_SCHEME, parsedURL.Scheme)
- id.SetNonEmptyValue(identity.ID_PATHPREFIX, strings.Trim(parsedURL.Path, "/"))
- id.SetNonEmptyValue(identity.ID_PORT, parsedURL.Port())
-
- creds := credentials.DirectCredentials{
- cpi.ATTR_KEY: encryptionKey,
- }
- defaultContext.SetCredentialsForConsumer(id, creds)
-
- spec := fmt.Sprintf(repoSpecTemplate, svr.URL, local.AESECB)
-
- repo, err := defaultContext.RepositoryForConfig([]byte(spec), nil)
- Expect(err).ToNot(HaveOccurred())
- Expect(repo).ToNot(BeNil())
-
- credentialsFromRepo, err := repo.LookupCredentials("test-credentials")
- Expect(err).ToNot(HaveOccurred())
- Expect(credentialsFromRepo).To(Equal(expectedCreds))
- })
-
- It("retrieves credentials from file", func() {
- filename := "/container_registry"
- fs := memoryfs.New()
- vfsattr.Set(defaultContext, fs)
-
- file, err := fs.Create(filename)
- Expect(err).ToNot(HaveOccurred())
-
- _, err = file.Write([]byte(containerRegistryCfg))
- Expect(err).ToNot(HaveOccurred())
-
- err = file.Close()
- Expect(err).ToNot(HaveOccurred())
-
- spec := fmt.Sprintf(repoSpecTemplate, "file://"+filename, local.Plaintext)
-
- repo, err := defaultContext.RepositoryForConfig([]byte(spec), nil)
- Expect(err).ToNot(HaveOccurred())
- Expect(repo).ToNot(BeNil())
-
- credentialsFromRepo, err := repo.LookupCredentials("test-credentials")
- Expect(err).ToNot(HaveOccurred())
- Expect(credentialsFromRepo).To(Equal(expectedCreds))
- })
-})
diff --git a/pkg/contexts/credentials/repositories/gardenerconfig/repository.go b/pkg/contexts/credentials/repositories/gardenerconfig/repository.go
deleted file mode 100644
index 70fc7606b..000000000
--- a/pkg/contexts/credentials/repositories/gardenerconfig/repository.go
+++ /dev/null
@@ -1,223 +0,0 @@
-package gardenerconfig
-
-import (
- "bytes"
- "context"
- "crypto/aes"
- "crypto/cipher"
- "fmt"
- "io"
- "net/http"
- "net/url"
- "sync"
-
- "github.com/mandelsoft/goutils/errors"
- "github.com/mandelsoft/vfs/pkg/vfs"
-
- "github.com/open-component-model/ocm/pkg/contexts/credentials/cpi"
- "github.com/open-component-model/ocm/pkg/contexts/credentials/internal"
- gardenercfgcpi "github.com/open-component-model/ocm/pkg/contexts/credentials/repositories/gardenerconfig/cpi"
- "github.com/open-component-model/ocm/pkg/contexts/credentials/repositories/gardenerconfig/identity"
- "github.com/open-component-model/ocm/pkg/contexts/datacontext/attrs/vfsattr"
- "github.com/open-component-model/ocm/pkg/errkind"
-)
-
-type Cipher string
-
-const (
- Plaintext Cipher = "PLAINTEXT"
- AESECB Cipher = "AES.ECB"
-)
-
-type Repository struct {
- ctx cpi.Context
- lock sync.RWMutex
- url string
- configType gardenercfgcpi.ConfigType
- cipher Cipher
- key []byte
- propagateConsumerIdentity bool
- creds map[string]cpi.Credentials
- fs vfs.FileSystem
-}
-
-var _ cpi.ConsumerIdentityProvider = (*Repository)(nil)
-
-func NewRepository(ctx cpi.Context, url string, configType gardenercfgcpi.ConfigType, cipher Cipher, key []byte, propagateConsumerIdentity bool) (*Repository, error) {
- r := &Repository{
- ctx: ctx,
- url: url,
- configType: configType,
- cipher: cipher,
- key: key,
- propagateConsumerIdentity: propagateConsumerIdentity,
- fs: vfsattr.Get(ctx),
- }
- if err := r.read(true); err != nil {
- return nil, fmt.Errorf("unable to read repository content: %w", err)
- }
- return r, nil
-}
-
-var _ cpi.Repository = &Repository{}
-
-func (r *Repository) GetConsumerId(uctx ...internal.UsageContext) internal.ConsumerIdentity {
- id, err := identity.GetConsumerId(r.url)
- if err != nil {
- return nil
- }
- return id
-}
-
-func (r *Repository) GetIdentityMatcher() string {
- return identity.CONSUMER_TYPE
-}
-
-func (r *Repository) ExistsCredentials(name string) (bool, error) {
- r.lock.RLock()
- defer r.lock.RUnlock()
-
- if err := r.read(false); err != nil {
- return false, fmt.Errorf("unable to read repository content: %w", err)
- }
-
- return r.creds[name] != nil, nil
-}
-
-func (r *Repository) LookupCredentials(name string) (cpi.Credentials, error) {
- r.lock.RLock()
- defer r.lock.RUnlock()
-
- if err := r.read(false); err != nil {
- return nil, fmt.Errorf("unable to read repository content: %w", err)
- }
-
- auth, ok := r.creds[name]
- if !ok {
- return nil, cpi.ErrUnknownCredentials(name)
- }
-
- return auth, nil
-}
-
-func (r *Repository) WriteCredentials(name string, creds cpi.Credentials) (cpi.Credentials, error) {
- return nil, errors.ErrNotSupported("write", "credentials", Type)
-}
-
-func (r *Repository) read(force bool) error {
- if !force && r.creds != nil {
- return nil
- }
-
- configReader, err := r.getRawConfig()
- if err != nil {
- return fmt.Errorf("unable to get config: %w", err)
- }
- if configReader == nil {
- return nil
- }
- defer configReader.Close()
-
- handler := gardenercfgcpi.GetHandler(r.configType)
- if handler == nil {
- return errors.Newf("unable to get handler for config type %s", string(r.configType))
- }
-
- creds, err := handler.ParseConfig(configReader)
- if err != nil {
- return fmt.Errorf("unable to parse config: %w", err)
- }
-
- r.creds = map[string]cpi.Credentials{}
- for _, cred := range creds {
- credName := cred.Name()
- if _, ok := r.creds[credName]; !ok {
- r.creds[credName] = cred.Properties()
- }
- if r.propagateConsumerIdentity {
- getCredentials := func() (cpi.Credentials, error) {
- return r.LookupCredentials(credName)
- }
- cg := credentialGetter{
- getCredentials: getCredentials,
- }
- r.ctx.SetCredentialsForConsumer(cred.ConsumerIdentity(), cg)
- }
- }
-
- return nil
-}
-
-func (r *Repository) getRawConfig() (io.ReadCloser, error) {
- u, err := url.Parse(r.url)
- if err != nil {
- return nil, fmt.Errorf("unable to parse url: %w", err)
- }
-
- var reader io.ReadCloser
- if u.Scheme == "file" {
- f, err := r.fs.Open(u.Path)
- if err != nil {
- return nil, fmt.Errorf("unable to open file: %w", err)
- }
- reader = f
- } else {
- req, err := http.NewRequestWithContext(context.Background(), http.MethodGet, u.String(), nil)
- if err != nil {
- return nil, fmt.Errorf("request to secret server failed: %w", err)
- }
- res, err := http.DefaultClient.Do(req)
- if err != nil {
- // the secret server might be temporarily not available.
- // for these situations we should allow a retry at a later point in time
- // while keeping the old data for the moment.
- if errkind.IsRetryable(err) {
- // TODO: log error
- return nil, nil
- }
- return nil, fmt.Errorf("request to secret server failed: %w", err)
- }
- reader = res.Body
- }
-
- switch r.cipher {
- case AESECB:
- var srcBuf bytes.Buffer
- if _, err := io.Copy(&srcBuf, reader); err != nil {
- return nil, fmt.Errorf("unable to read: %w", err)
- }
- if err := reader.Close(); err != nil {
- return nil, fmt.Errorf("unable to close reader: %w", err)
- }
- block, err := aes.NewCipher(r.key)
- if err != nil {
- return nil, fmt.Errorf("unable to create cipher: %w", err)
- }
- dst := make([]byte, srcBuf.Len())
- if err := ecbDecrypt(block, dst, srcBuf.Bytes()); err != nil {
- return nil, fmt.Errorf("unable to decrypt: %w", err)
- }
-
- return io.NopCloser(bytes.NewBuffer(dst)), nil
- case Plaintext:
- return reader, nil
- default:
- return nil, errors.ErrNotImplemented("cipher algorithm", string(r.cipher), Type)
- }
-}
-
-func ecbDecrypt(block cipher.Block, dst, src []byte) error {
- blockSize := block.BlockSize()
- if len(src)%blockSize != 0 {
- return fmt.Errorf("input must contain only full blocks (blocksize: %d; input length: %d)", blockSize, len(src))
- }
- if len(dst) < len(src) {
- return errors.New("destination is smaller than source")
- }
- for len(src) > 0 {
- block.Decrypt(dst, src[:blockSize])
- src = src[blockSize:]
- dst = dst[blockSize:]
- }
- return nil
-}
diff --git a/pkg/contexts/credentials/repositories/gardenerconfig/type.go b/pkg/contexts/credentials/repositories/gardenerconfig/type.go
deleted file mode 100644
index 9824dcab6..000000000
--- a/pkg/contexts/credentials/repositories/gardenerconfig/type.go
+++ /dev/null
@@ -1,96 +0,0 @@
-package gardenerconfig
-
-import (
- "fmt"
-
- "github.com/mandelsoft/goutils/generics"
-
- "github.com/open-component-model/ocm/pkg/contexts/credentials/cpi"
- "github.com/open-component-model/ocm/pkg/contexts/credentials/internal"
- gardenercfgcpi "github.com/open-component-model/ocm/pkg/contexts/credentials/repositories/gardenerconfig/cpi"
- "github.com/open-component-model/ocm/pkg/contexts/credentials/repositories/gardenerconfig/identity"
- "github.com/open-component-model/ocm/pkg/runtime"
- "github.com/open-component-model/ocm/pkg/utils"
-)
-
-const (
- Type = "GardenerConfig"
- TypeV1 = Type + runtime.VersionSeparator + "v1"
-)
-
-func init() {
- cpi.RegisterRepositoryType(cpi.NewRepositoryType[*RepositorySpec](Type))
- cpi.RegisterRepositoryType(cpi.NewRepositoryType[*RepositorySpec](TypeV1))
-}
-
-// RepositorySpec describes a secret server based credential repository interface.
-type RepositorySpec struct {
- runtime.ObjectVersionedType `json:",inline"`
- URL string `json:"url"`
- ConfigType gardenercfgcpi.ConfigType `json:"configType"`
- Cipher Cipher `json:"cipher"`
- PropagateConsumerIdentity *bool `json:"propagateConsumerIdentity,omitempty"`
-}
-
-var _ cpi.ConsumerIdentityProvider = (*RepositorySpec)(nil)
-
-// NewRepositorySpec creates a new memory RepositorySpec.
-func NewRepositorySpec(url string, configType gardenercfgcpi.ConfigType, cipher Cipher, propagateConsumerIdentity ...bool) *RepositorySpec {
- return &RepositorySpec{
- ObjectVersionedType: runtime.NewVersionedTypedObject(Type),
- URL: url,
- ConfigType: configType,
- Cipher: cipher,
- PropagateConsumerIdentity: generics.Pointer(utils.OptionalDefaultedBool(true, propagateConsumerIdentity...)),
- }
-}
-
-func (a *RepositorySpec) GetType() string {
- return Type
-}
-
-func (a *RepositorySpec) Repository(ctx cpi.Context, creds cpi.Credentials) (cpi.Repository, error) {
- r := ctx.GetAttributes().GetOrCreateAttribute(ATTR_REPOS, newRepositories)
- repos, ok := r.(*Repositories)
- if !ok {
- return nil, fmt.Errorf("failed to assert type %T to Responsitories", r)
- }
-
- key, err := getKey(ctx, a.URL)
- if err != nil {
- return nil, fmt.Errorf("unable to get key from context: %w", err)
- }
-
- return repos.GetRepository(ctx, a.URL, a.ConfigType, a.Cipher, key, utils.AsBool(a.PropagateConsumerIdentity, true))
-}
-
-func (a *RepositorySpec) GetConsumerId(uctx ...internal.UsageContext) internal.ConsumerIdentity {
- id, err := identity.GetConsumerId(a.URL)
- if err != nil {
- return nil
- }
- return id
-}
-
-func (a *RepositorySpec) GetIdentityMatcher() string {
- return identity.CONSUMER_TYPE
-}
-
-func getKey(cctx cpi.Context, configURL string) ([]byte, error) {
- id, err := identity.GetConsumerId(configURL)
- if err != nil {
- return nil, err
- }
-
- creds, err := cpi.CredentialsForConsumer(cctx, id)
- if err != nil {
- return nil, err
- }
-
- var key string
- if creds != nil {
- key = creds.GetProperty(identity.ATTR_KEY)
- }
-
- return []byte(key), nil
-}
diff --git a/pkg/contexts/credentials/repositories/init.go b/pkg/contexts/credentials/repositories/init.go
deleted file mode 100644
index fbdbb91bc..000000000
--- a/pkg/contexts/credentials/repositories/init.go
+++ /dev/null
@@ -1,12 +0,0 @@
-package repositories
-
-import (
- _ "github.com/open-component-model/ocm/pkg/contexts/credentials/repositories/aliases"
- _ "github.com/open-component-model/ocm/pkg/contexts/credentials/repositories/directcreds"
- _ "github.com/open-component-model/ocm/pkg/contexts/credentials/repositories/dockerconfig"
- _ "github.com/open-component-model/ocm/pkg/contexts/credentials/repositories/gardenerconfig"
- _ "github.com/open-component-model/ocm/pkg/contexts/credentials/repositories/memory"
- _ "github.com/open-component-model/ocm/pkg/contexts/credentials/repositories/memory/config"
- _ "github.com/open-component-model/ocm/pkg/contexts/credentials/repositories/npm"
- _ "github.com/open-component-model/ocm/pkg/contexts/credentials/repositories/vault"
-)
diff --git a/pkg/contexts/credentials/repositories/memory/cache.go b/pkg/contexts/credentials/repositories/memory/cache.go
deleted file mode 100644
index aec6fd2b0..000000000
--- a/pkg/contexts/credentials/repositories/memory/cache.go
+++ /dev/null
@@ -1,31 +0,0 @@
-package memory
-
-import (
- "sync"
-
- "github.com/open-component-model/ocm/pkg/contexts/datacontext"
-)
-
-const ATTR_REPOS = "github.com/open-component-model/ocm/pkg/contexts/credentials/repositories/memory"
-
-type Repositories struct {
- lock sync.Mutex
- repos map[string]*Repository
-}
-
-func newRepositories(datacontext.Context) interface{} {
- return &Repositories{
- repos: map[string]*Repository{},
- }
-}
-
-func (r *Repositories) GetRepository(name string) *Repository {
- r.lock.Lock()
- defer r.lock.Unlock()
- repo := r.repos[name]
- if repo == nil {
- repo = NewRepository(name)
- r.repos[name] = repo
- }
- return repo
-}
diff --git a/pkg/contexts/credentials/repositories/memory/config/config_test.go b/pkg/contexts/credentials/repositories/memory/config/config_test.go
deleted file mode 100644
index 139c1770f..000000000
--- a/pkg/contexts/credentials/repositories/memory/config/config_test.go
+++ /dev/null
@@ -1,62 +0,0 @@
-package config_test
-
-import (
- . "github.com/onsi/ginkgo/v2"
- . "github.com/onsi/gomega"
- . "github.com/open-component-model/ocm/pkg/env"
-
- "github.com/mandelsoft/vfs/pkg/vfs"
-
- "github.com/open-component-model/ocm/pkg/common"
- "github.com/open-component-model/ocm/pkg/contexts/config"
- "github.com/open-component-model/ocm/pkg/contexts/credentials"
- "github.com/open-component-model/ocm/pkg/contexts/credentials/repositories/memory"
-)
-
-var _ = Describe("configure credentials", func() {
- var env *Environment
- var ctx credentials.Context
- var cfg config.Context
-
- BeforeEach(func() {
- env = NewEnvironment(TestData())
- cfg = config.New()
- ctx = credentials.WithConfigs(cfg).New()
- })
-
- AfterEach(func() {
- env.Cleanup()
- })
-
- It("reads config with ref", func() {
- data, err := vfs.ReadFile(env, "/testdata/creds.yaml")
- Expect(err).To(Succeed())
- _, err = cfg.ApplyData(data, nil, "creds.yaml")
- Expect(err).To(Succeed())
-
- spec := memory.NewRepositorySpec("default")
- repo, err := ctx.RepositoryForSpec(spec)
- Expect(err).To(Succeed())
- mem := repo.(*memory.Repository)
- Expect(mem.ExistsCredentials("ref")).To(BeTrue())
- creds, err := mem.LookupCredentials("ref")
- Expect(err).To(Succeed())
- Expect(creds.Properties()).To(Equal(common.Properties{"username": "mandelsoft", "password": "specialsecret"}))
- })
-
- It("reads config with direct", func() {
- data, err := vfs.ReadFile(env, "/testdata/creds.yaml")
- Expect(err).To(Succeed())
- _, err = cfg.ApplyData(data, nil, "creds.yaml")
- Expect(err).To(Succeed())
-
- spec := memory.NewRepositorySpec("default")
- repo, err := ctx.RepositoryForSpec(spec)
- Expect(err).To(Succeed())
- mem := repo.(*memory.Repository)
- Expect(mem.ExistsCredentials("direct")).To(BeTrue())
- creds, err := mem.LookupCredentials("direct")
- Expect(err).To(Succeed())
- Expect(creds.Properties()).To(Equal(common.Properties{"username": "mandelsoft2", "password": "specialsecret2"}))
- })
-})
diff --git a/pkg/contexts/credentials/repositories/memory/config/type.go b/pkg/contexts/credentials/repositories/memory/config/type.go
deleted file mode 100644
index 3e1b5aecd..000000000
--- a/pkg/contexts/credentials/repositories/memory/config/type.go
+++ /dev/null
@@ -1,131 +0,0 @@
-package config
-
-import (
- "fmt"
-
- "github.com/mandelsoft/goutils/errors"
-
- "github.com/open-component-model/ocm/pkg/common"
- cfgcpi "github.com/open-component-model/ocm/pkg/contexts/config/cpi"
- "github.com/open-component-model/ocm/pkg/contexts/credentials/cpi"
- "github.com/open-component-model/ocm/pkg/contexts/credentials/repositories/memory"
- "github.com/open-component-model/ocm/pkg/runtime"
-)
-
-const (
- ConfigType = "memory.credentials" + cfgcpi.OCM_CONFIG_TYPE_SUFFIX
- ConfigTypeV1 = ConfigType + runtime.VersionSeparator + "v1"
-)
-
-func init() {
- cfgcpi.RegisterConfigType(cfgcpi.NewConfigType[*Config](ConfigType, usage))
- cfgcpi.RegisterConfigType(cfgcpi.NewConfigType[*Config](ConfigTypeV1, usage))
-}
-
-// Config describes a configuration for the config context.
-type Config struct {
- runtime.ObjectVersionedType `json:",inline"`
- RepoName string `json:"repoName"`
- Credentials []CredentialsSpec `json:"credentials,omitempty"`
-}
-
-type CredentialsSpec struct {
- CredentialsName string `json:"credentialsName"`
- // Reference refers to credentials store in some othe repo
- Reference *cpi.GenericCredentialsSpec `json:"reference,omitempty"`
- // Credentials are direct credentials (one of Reference or Credentials must be set)
- Credentials common.Properties `json:"credentials"`
-}
-
-// New creates a new memory ConfigSpec.
-func New(repo string, credentials ...CredentialsSpec) *Config {
- return &Config{
- ObjectVersionedType: runtime.NewVersionedTypedObject(ConfigType),
- RepoName: repo,
- Credentials: credentials,
- }
-}
-
-func (a *Config) GetType() string {
- return ConfigType
-}
-
-func (a *Config) AddCredentials(name string, props common.Properties) error {
- a.Credentials = append(a.Credentials, CredentialsSpec{CredentialsName: name, Credentials: props})
- return nil
-}
-
-func (a *Config) AddCredentialsRef(name string, refname string, spec cpi.RepositorySpec) error {
- repo, err := cpi.ToGenericRepositorySpec(spec)
- if err != nil {
- return fmt.Errorf("unable to convert cpi repository spec to generic: %w", err)
- }
-
- ref := cpi.NewGenericCredentialsSpec(refname, repo)
- a.Credentials = append(a.Credentials, CredentialsSpec{CredentialsName: name, Reference: ref})
-
- return nil
-}
-
-func (a *Config) ApplyTo(ctx cfgcpi.Context, target interface{}) error {
- list := errors.ErrListf("applying config")
-
- t, ok := target.(cpi.Context)
- if !ok {
- return cfgcpi.ErrNoContext(ConfigType)
- }
-
- repo, err := t.RepositoryForSpec(memory.NewRepositorySpec(a.RepoName))
- if err != nil {
- return fmt.Errorf("unable to get repository for spec: %w", err)
- }
-
- mem, ok := repo.(*memory.Repository)
- if !ok {
- return fmt.Errorf("invalid type assertion of type %T to memory.Repository", repo)
- }
-
- for i, e := range a.Credentials {
- var creds cpi.Credentials
- if e.Reference != nil {
- if len(e.Credentials) != 0 {
- err = fmt.Errorf("credentials and reference set")
- } else {
- creds, err = e.Reference.Credentials(t)
- }
- } else {
- creds = cpi.NewCredentials(e.Credentials)
- }
- if err != nil {
- list.Add(errors.Wrapf(err, "config entry %d[%s]", i, e.CredentialsName))
- }
- if creds != nil {
- _, err = mem.WriteCredentials(e.CredentialsName, creds)
- if err != nil {
- list.Add(errors.Wrapf(err, "config entry %d", i))
- }
- }
- }
- return list.Result()
-}
-
-const usage = `
-The config type ` + ConfigType + ` can be used to define a list
-of arbitrary credentials stored in a memory based credentials repository:
-
-
- type: ` + ConfigType + `
- repoName: default
- credentials:
- - credentialsName: ref
- reference: # refer to a credential set stored in some other credential repository
- type: Credentials # this is a repo providing just one explicit credential set
- properties:
- username: mandelsoft
- password: specialsecret
- - credentialsName: direct
- credentials: # direct credential specification
- username: mandelsoft2
- password: specialsecret2
-
-`
diff --git a/pkg/contexts/credentials/repositories/memory/repo_test.go b/pkg/contexts/credentials/repositories/memory/repo_test.go
deleted file mode 100644
index 0e7ca7b71..000000000
--- a/pkg/contexts/credentials/repositories/memory/repo_test.go
+++ /dev/null
@@ -1,119 +0,0 @@
-package memory_test
-
-import (
- "encoding/json"
- "reflect"
-
- . "github.com/onsi/ginkgo/v2"
- . "github.com/onsi/gomega"
-
- "github.com/open-component-model/ocm/pkg/common"
- "github.com/open-component-model/ocm/pkg/contexts/credentials"
- local "github.com/open-component-model/ocm/pkg/contexts/credentials/repositories/memory"
-)
-
-var DefaultContext = credentials.New()
-
-var _ = Describe("direct credentials", func() {
- props := common.Properties{
- "user": "USER",
- "password": "PASSWORD",
- }
-
- props2 := common.Properties{
- "user": "OTHER",
- "password": "OTHERPASSWORD",
- }
-
- specdata := "{\"type\":\"Memory\",\"repoName\":\"test\"}"
-
- _ = props
-
- It("serializes repo spec", func() {
- spec := local.NewRepositorySpec("test")
- data, err := json.Marshal(spec)
- Expect(err).To(Succeed())
- Expect(data).To(Equal([]byte(specdata)))
- })
- It("deserializes repo spec", func() {
- spec, err := DefaultContext.RepositorySpecForConfig([]byte(specdata), nil)
- Expect(err).To(Succeed())
- Expect(reflect.TypeOf(spec).String()).To(Equal("*memory.RepositorySpec"))
- Expect(spec.(*local.RepositorySpec).RepositoryName).To(Equal("test"))
- })
-
- It("resolves repository", func() {
- repo, err := DefaultContext.RepositoryForConfig([]byte(specdata), nil)
- Expect(err).To(Succeed())
- Expect(reflect.TypeOf(repo).String()).To(Equal("*memory.Repository"))
- })
-
- It("sets and retrieves credentials", func() {
- repo, err := DefaultContext.RepositoryForConfig([]byte(specdata), nil)
- Expect(err).To(Succeed())
-
- _, err = repo.WriteCredentials("bibo", credentials.NewCredentials(props))
- Expect(err).To(Succeed())
-
- creds, err := repo.LookupCredentials("bibo")
- Expect(err).To(Succeed())
- Expect(creds.Properties()).To(Equal(props))
-
- creds, err = repo.LookupCredentials("other")
- Expect(err).NotTo(Succeed())
- Expect(creds).To(BeNil())
- })
-
- It("caches repo", func() {
- repo, err := DefaultContext.RepositoryForConfig([]byte(specdata), nil)
- Expect(err).To(Succeed())
-
- _, err = repo.WriteCredentials("bibo", credentials.NewCredentials(props))
- Expect(err).To(Succeed())
-
- // re-request repo by spec
- repo, err = DefaultContext.RepositoryForConfig([]byte(specdata), nil)
- Expect(err).To(Succeed())
-
- creds, err := repo.LookupCredentials("bibo")
- Expect(err).To(Succeed())
- Expect(creds.Properties()).To(Equal(props))
-
- creds, err = repo.LookupCredentials("other")
- Expect(err).NotTo(Succeed())
- Expect(creds).To(BeNil())
- })
-
- It("caches repo in two contexts", func() {
- ctx1 := DefaultContext
- ctx2 := credentials.New()
-
- // write to first context
- repo1, err := ctx1.RepositoryForConfig([]byte(specdata), nil)
- Expect(err).To(Succeed())
-
- _, err = repo1.WriteCredentials("bibo", credentials.NewCredentials(props))
- Expect(err).To(Succeed())
-
- // request repo in second context
- repo2, err := ctx2.RepositoryForConfig([]byte(specdata), nil)
- Expect(err).To(Succeed())
-
- creds, err := repo2.LookupCredentials("bibo")
- Expect(err).NotTo(Succeed())
- Expect(creds).To(BeNil())
-
- // write to second context
- _, err = repo2.WriteCredentials("bibo", credentials.NewCredentials(props2))
- Expect(err).To(Succeed())
-
- creds, err = repo2.LookupCredentials("bibo")
- Expect(err).To(Succeed())
- Expect(creds.Properties()).To(Equal(props2))
-
- // check first context
- creds, err = repo1.LookupCredentials("bibo")
- Expect(err).To(Succeed())
- Expect(creds.Properties()).To(Equal(props))
- })
-})
diff --git a/pkg/contexts/credentials/repositories/memory/repository.go b/pkg/contexts/credentials/repositories/memory/repository.go
deleted file mode 100644
index 5149f7992..000000000
--- a/pkg/contexts/credentials/repositories/memory/repository.go
+++ /dev/null
@@ -1,47 +0,0 @@
-package memory
-
-import (
- "sync"
-
- "github.com/open-component-model/ocm/pkg/contexts/credentials/cpi"
-)
-
-type Repository struct {
- lock sync.RWMutex
- name string
- credentials map[string]cpi.Credentials
-}
-
-func NewRepository(name string) *Repository {
- return &Repository{
- name: name,
- credentials: map[string]cpi.Credentials{},
- }
-}
-
-var _ cpi.Repository = &Repository{}
-
-func (r *Repository) ExistsCredentials(name string) (bool, error) {
- r.lock.RLock()
- defer r.lock.RUnlock()
- _, ok := r.credentials[name]
- return ok, nil
-}
-
-func (r *Repository) LookupCredentials(name string) (cpi.Credentials, error) {
- r.lock.RLock()
- defer r.lock.RUnlock()
- c, ok := r.credentials[name]
- if ok {
- return cpi.NewCredentials(c.Properties()), nil
- }
- return nil, cpi.ErrUnknownCredentials(name)
-}
-
-func (r *Repository) WriteCredentials(name string, creds cpi.Credentials) (cpi.Credentials, error) {
- c := cpi.NewCredentials(creds.Properties())
- r.lock.Lock()
- defer r.lock.Unlock()
- r.credentials[name] = c
- return c, nil
-}
diff --git a/pkg/contexts/credentials/repositories/memory/type.go b/pkg/contexts/credentials/repositories/memory/type.go
deleted file mode 100644
index fd2812d76..000000000
--- a/pkg/contexts/credentials/repositories/memory/type.go
+++ /dev/null
@@ -1,45 +0,0 @@
-package memory
-
-import (
- "fmt"
-
- "github.com/open-component-model/ocm/pkg/contexts/credentials/cpi"
- "github.com/open-component-model/ocm/pkg/runtime"
-)
-
-const (
- Type = "Memory"
- TypeV1 = Type + runtime.VersionSeparator + "v1"
-)
-
-func init() {
- cpi.RegisterRepositoryType(cpi.NewRepositoryType[*RepositorySpec](Type))
- cpi.RegisterRepositoryType(cpi.NewRepositoryType[*RepositorySpec](TypeV1))
-}
-
-// RepositorySpec describes a memory based repository interface.
-type RepositorySpec struct {
- runtime.ObjectVersionedType `json:",inline"`
- RepositoryName string `json:"repoName"`
-}
-
-// NewRepositorySpec creates a new memory RepositorySpec.
-func NewRepositorySpec(name string) *RepositorySpec {
- return &RepositorySpec{
- ObjectVersionedType: runtime.NewVersionedTypedObject(Type),
- RepositoryName: name,
- }
-}
-
-func (a *RepositorySpec) GetType() string {
- return Type
-}
-
-func (a *RepositorySpec) Repository(ctx cpi.Context, creds cpi.Credentials) (cpi.Repository, error) {
- r := ctx.GetAttributes().GetOrCreateAttribute(ATTR_REPOS, newRepositories)
- repos, ok := r.(*Repositories)
- if !ok {
- return nil, fmt.Errorf("failed to assert type %T to Repositories", r)
- }
- return repos.GetRepository(a.RepositoryName), nil
-}
diff --git a/pkg/contexts/credentials/repositories/npm/a_usage.go b/pkg/contexts/credentials/repositories/npm/a_usage.go
deleted file mode 100644
index a8b77fb9d..000000000
--- a/pkg/contexts/credentials/repositories/npm/a_usage.go
+++ /dev/null
@@ -1,18 +0,0 @@
-package npm
-
-import (
- "github.com/open-component-model/ocm/pkg/listformat"
-)
-
-var usage = `
-This repository type can be used to access credentials stored in a file
-following the NPM npmrc format (~/.npmrc). It take into account the
-credentials helper section, also. If enabled, the described
-credentials will be automatically assigned to appropriate consumer ids.
-`
-
-var format = `The repository specification supports the following fields:
-` + listformat.FormatListElements("", listformat.StringElementDescriptionList{
- "npmrcFile", "*string*: the file path to a NPM npmrc file",
- "propagateConsumerIdentity", "*bool*(optional): enable consumer id propagation",
-})
diff --git a/pkg/contexts/credentials/repositories/npm/cache.go b/pkg/contexts/credentials/repositories/npm/cache.go
deleted file mode 100644
index 15b2f0e74..000000000
--- a/pkg/contexts/credentials/repositories/npm/cache.go
+++ /dev/null
@@ -1,33 +0,0 @@
-package npm
-
-import (
- "github.com/open-component-model/ocm/pkg/contexts/credentials/cpi"
- "github.com/open-component-model/ocm/pkg/contexts/datacontext"
-)
-
-type Cache struct {
- repos map[string]*Repository
-}
-
-func createCache(_ datacontext.Context) interface{} {
- return &Cache{
- repos: map[string]*Repository{},
- }
-}
-
-func (r *Cache) GetRepository(ctx cpi.Context, name string, prop bool) (*Repository, error) {
- var (
- err error = nil
- repo *Repository
- )
- if name != "" {
- repo = r.repos[name]
- }
- if repo == nil {
- repo, err = NewRepository(ctx, name, prop)
- if err == nil {
- r.repos[name] = repo
- }
- }
- return repo, err
-}
diff --git a/pkg/contexts/credentials/repositories/npm/config.go b/pkg/contexts/credentials/repositories/npm/config.go
deleted file mode 100644
index d61cb00d4..000000000
--- a/pkg/contexts/credentials/repositories/npm/config.go
+++ /dev/null
@@ -1,56 +0,0 @@
-package npm
-
-import (
- "bufio"
- "os"
- "strings"
-
- "github.com/mandelsoft/goutils/errors"
-
- "github.com/open-component-model/ocm/pkg/utils"
-)
-
-type npmConfig map[string]string
-
-// readNpmConfigFile reads "~/.npmrc" file line by line, parse it and return the result as a npmConfig.
-func readNpmConfigFile(path string) (npmConfig, string, error) {
- path, err := utils.ResolvePath(path)
- if err != nil {
- return nil, path, errors.Wrapf(err, "cannot resolve path %q", path)
- }
-
- // Open the file
- file, err := os.Open(path)
- if err != nil {
- return nil, path, err
- }
- defer file.Close()
-
- // Create a new scanner and read the file line by line
- scanner := bufio.NewScanner(file)
- cfg := make(map[string]string)
- for scanner.Scan() {
- line := scanner.Text()
- line, authFound := strings.CutPrefix(line, "//")
- if !authFound {
- // e.g. 'global=false'
- continue
- }
- // Split the line into key and value
- parts := strings.SplitN(line, ":_authToken=", 2)
- if len(parts) == 2 {
- if strings.HasSuffix(parts[0], "/") {
- cfg[parts[0][:len(parts[0])-1]] = parts[1]
- } else {
- cfg[parts[0]] = parts[1]
- }
- }
- }
-
- // Check for errors
- if err = scanner.Err(); err != nil {
- return nil, path, err
- }
-
- return cfg, path, nil
-}
diff --git a/pkg/contexts/credentials/repositories/npm/config_test.go b/pkg/contexts/credentials/repositories/npm/config_test.go
deleted file mode 100644
index 177c60778..000000000
--- a/pkg/contexts/credentials/repositories/npm/config_test.go
+++ /dev/null
@@ -1,38 +0,0 @@
-package npm_test
-
-import (
- . "github.com/mandelsoft/goutils/testutils"
- . "github.com/onsi/ginkgo/v2"
- . "github.com/onsi/gomega"
-
- "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/credentials/builtin/npm/identity"
- "github.com/open-component-model/ocm/pkg/contexts/credentials/repositories/npm"
-)
-
-var _ = Describe("Config deserialization Test Environment", func() {
- It("read .npmrc", func() {
- ctx := credentials.New()
- repo := Must(npm.NewRepository(ctx, "testdata/.npmrc"))
- Expect(Must(repo.LookupCredentials("registry.npmjs.org")).Properties()).To(Equal(common.Properties{identity.ATTR_TOKEN: "npm_TOKEN"}))
- Expect(Must(repo.LookupCredentials("npm.registry.acme.com/api/npm")).Properties()).To(Equal(common.Properties{identity.ATTR_TOKEN: "bearer_TOKEN"}))
- })
-
- It("propagates credentials", func() {
- ctx := credentials.New()
- spec := npm.NewRepositorySpec("testdata/.npmrc")
- _ = Must(ctx.RepositoryForSpec(spec))
- id := Must(identity.GetConsumerId("registry.npmjs.org", "pkg"))
- creds := Must(credentials.CredentialsForConsumer(ctx, id))
- Expect(creds).NotTo(BeNil())
- Expect(creds.GetProperty(identity.ATTR_TOKEN)).To(Equal("npm_TOKEN"))
- })
-
- It("has description", func() {
- ctx := credentials.New()
- t := ctx.RepositoryTypes().GetType(npm.TypeV1)
- Expect(t).NotTo(BeNil())
- Expect(t.Description()).NotTo(Equal(""))
- })
-})
diff --git a/pkg/contexts/credentials/repositories/npm/default.go b/pkg/contexts/credentials/repositories/npm/default.go
deleted file mode 100644
index 1c11e20cd..000000000
--- a/pkg/contexts/credentials/repositories/npm/default.go
+++ /dev/null
@@ -1,49 +0,0 @@
-package npm
-
-import (
- "fmt"
- "os"
-
- "github.com/mandelsoft/filepath/pkg/filepath"
- "github.com/mandelsoft/vfs/pkg/osfs"
- "github.com/mandelsoft/vfs/pkg/vfs"
-
- "github.com/open-component-model/ocm/pkg/contexts/config"
- credcfg "github.com/open-component-model/ocm/pkg/contexts/credentials/config"
- "github.com/open-component-model/ocm/pkg/contexts/ocm/utils/defaultconfigregistry"
-)
-
-const (
- ConfigFileName = ".npmrc"
-)
-
-func init() {
- defaultconfigregistry.RegisterDefaultConfigHandler(DefaultConfigHandler, desc)
-}
-
-func DefaultConfig() (string, error) {
- d, err := os.UserHomeDir()
- if err != nil {
- return "", err
- }
- return filepath.Join(d, ConfigFileName), nil
-}
-
-func DefaultConfigHandler(cfg config.Context) (string, config.Config, error) {
- // use docker config as default config for ocm cli
- d, err := DefaultConfig()
- if err != nil {
- return "", nil, nil
- }
- if ok, err := vfs.FileExists(osfs.OsFs, d); ok && err == nil {
- ccfg := credcfg.New()
- ccfg.AddRepository(NewRepositorySpec(d, true))
- return d, ccfg, nil
- }
- return "", nil, nil
-}
-
-var desc = fmt.Sprintf(`
-The npm configuration file at ~/%s is
-read to feed in the configured credentials for NPM registries.
-`, ConfigFileName)
diff --git a/pkg/contexts/credentials/repositories/npm/provider.go b/pkg/contexts/credentials/repositories/npm/provider.go
deleted file mode 100644
index a60520437..000000000
--- a/pkg/contexts/credentials/repositories/npm/provider.go
+++ /dev/null
@@ -1,51 +0,0 @@
-package npm
-
-import (
- npm "github.com/open-component-model/ocm/pkg/contexts/credentials/builtin/npm/identity"
- "github.com/open-component-model/ocm/pkg/contexts/credentials/cpi"
- "github.com/open-component-model/ocm/pkg/logging"
-)
-
-type ConsumerProvider struct {
- npmrcPath string
-}
-
-var _ cpi.ConsumerProvider = (*ConsumerProvider)(nil)
-
-func (p *ConsumerProvider) Unregister(_ cpi.ProviderIdentity) {
-}
-
-func (p *ConsumerProvider) Match(ectx cpi.EvaluationContext, req cpi.ConsumerIdentity, cur cpi.ConsumerIdentity, m cpi.IdentityMatcher) (cpi.CredentialsSource, cpi.ConsumerIdentity) {
- return p.get(req, cur, m)
-}
-
-func (p *ConsumerProvider) Get(req cpi.ConsumerIdentity) (cpi.CredentialsSource, bool) {
- creds, _ := p.get(req, nil, cpi.CompleteMatch)
- return creds, creds != nil
-}
-
-func (p *ConsumerProvider) get(requested cpi.ConsumerIdentity, currentFound cpi.ConsumerIdentity, m cpi.IdentityMatcher) (cpi.CredentialsSource, cpi.ConsumerIdentity) {
- all, path, err := readNpmConfigFile(p.npmrcPath)
- if err != nil {
- log := logging.Context().Logger(npm.REALM)
- log.LogError(err, "Failed to read npmrc file", "path", path)
- return nil, nil
- }
-
- var creds cpi.CredentialsSource
-
- for key, value := range all {
- id, err := npm.GetConsumerId("https://"+key, "")
- if err != nil {
- log := logging.Context().Logger(npm.REALM)
- log.LogError(err, "Failed to get consumer id", "key", key, "value", value)
- return nil, nil
- }
- if m(requested, currentFound, id) {
- creds = newCredentials(value)
- currentFound = id
- }
- }
-
- return creds, currentFound
-}
diff --git a/pkg/contexts/credentials/repositories/npm/repository.go b/pkg/contexts/credentials/repositories/npm/repository.go
deleted file mode 100644
index 0cd48ffa4..000000000
--- a/pkg/contexts/credentials/repositories/npm/repository.go
+++ /dev/null
@@ -1,88 +0,0 @@
-package npm
-
-import (
- "fmt"
-
- "github.com/mandelsoft/goutils/errors"
-
- "github.com/open-component-model/ocm/pkg/common"
- npmCredentials "github.com/open-component-model/ocm/pkg/contexts/credentials/builtin/npm/identity"
- "github.com/open-component-model/ocm/pkg/contexts/credentials/cpi"
- "github.com/open-component-model/ocm/pkg/utils"
-)
-
-const PROVIDER = "ocm.software/credentialprovider/" + Type
-
-type Repository struct {
- ctx cpi.Context
- path string
- propagate bool
- npmrc npmConfig
-}
-
-func NewRepository(ctx cpi.Context, path string, prop ...bool) (*Repository, error) {
- return newRepository(ctx, path, utils.OptionalDefaultedBool(true, prop...))
-}
-
-func newRepository(ctx cpi.Context, path string, prop bool) (*Repository, error) {
- r := &Repository{
- ctx: ctx,
- path: path,
- propagate: prop,
- }
- err := r.Read(true)
- return r, err
-}
-
-var _ cpi.Repository = &Repository{}
-
-func (r *Repository) ExistsCredentials(name string) (bool, error) {
- err := r.Read(false)
- if err != nil {
- return false, err
- }
- return r.npmrc[name] != "", nil
-}
-
-func (r *Repository) LookupCredentials(name string) (cpi.Credentials, error) {
- exists, err := r.ExistsCredentials(name)
- if err != nil {
- return nil, err
- }
- if !exists {
- return nil, errors.ErrNotFound("credentials", name, Type)
- }
- return newCredentials(r.npmrc[name]), nil
-}
-
-func (r *Repository) WriteCredentials(_ string, _ cpi.Credentials) (cpi.Credentials, error) {
- return nil, errors.ErrNotSupported("write", "credentials", Type)
-}
-
-func (r *Repository) Read(force bool) error {
- if !force && r.npmrc != nil {
- return nil
- }
-
- if r.path == "" {
- return errors.New("npmrc path not provided")
- }
- cfg, path, err := readNpmConfigFile(r.path)
- if err != nil {
- return fmt.Errorf("failed to load npmrc: %w", err)
- }
- id := cpi.ProviderIdentity(PROVIDER + "/" + path)
-
- if r.propagate {
- r.ctx.RegisterConsumerProvider(id, &ConsumerProvider{r.path})
- }
- r.npmrc = cfg
- return nil
-}
-
-func newCredentials(token string) cpi.Credentials {
- props := common.Properties{
- npmCredentials.ATTR_TOKEN: token,
- }
- return cpi.NewCredentials(props)
-}
diff --git a/pkg/contexts/credentials/repositories/npm/repository_test.go b/pkg/contexts/credentials/repositories/npm/repository_test.go
deleted file mode 100644
index 2e4442a50..000000000
--- a/pkg/contexts/credentials/repositories/npm/repository_test.go
+++ /dev/null
@@ -1,77 +0,0 @@
-package npm_test
-
-import (
- "encoding/json"
- "reflect"
-
- . "github.com/mandelsoft/goutils/testutils"
- . "github.com/onsi/ginkgo/v2"
- . "github.com/onsi/gomega"
-
- "github.com/open-component-model/ocm/pkg/common"
- "github.com/open-component-model/ocm/pkg/contexts/credentials"
- npmCredentials "github.com/open-component-model/ocm/pkg/contexts/credentials/builtin/npm/identity"
- "github.com/open-component-model/ocm/pkg/contexts/credentials/cpi"
- local "github.com/open-component-model/ocm/pkg/contexts/credentials/repositories/npm"
- "github.com/open-component-model/ocm/pkg/runtimefinalizer"
-)
-
-var _ = Describe("NPM config - .npmrc", func() {
- props := common.Properties{
- npmCredentials.ATTR_TOKEN: "npm_TOKEN",
- }
-
- props2 := common.Properties{
- npmCredentials.ATTR_TOKEN: "bearer_TOKEN",
- }
-
- var DefaultContext credentials.Context
-
- BeforeEach(func() {
- DefaultContext = credentials.New()
- })
-
- specdata := "{\"type\":\"NPMConfig\",\"npmrcFile\":\"testdata/.npmrc\"}"
-
- It("serializes repo spec", func() {
- spec := local.NewRepositorySpec("testdata/.npmrc")
- data := Must(json.Marshal(spec))
- Expect(data).To(Equal([]byte(specdata)))
- })
-
- It("deserializes repo spec", func() {
- spec := Must(DefaultContext.RepositorySpecForConfig([]byte(specdata), nil))
- Expect(reflect.TypeOf(spec).String()).To(Equal("*npm.RepositorySpec"))
- Expect(spec.(*local.RepositorySpec).NpmrcFile).To(Equal("testdata/.npmrc"))
- })
-
- It("resolves repository", func() {
- repo := Must(DefaultContext.RepositoryForConfig([]byte(specdata), nil))
- Expect(reflect.TypeOf(repo).String()).To(Equal("*npm.Repository"))
- })
-
- It("retrieves credentials", func() {
- repo := Must(DefaultContext.RepositoryForConfig([]byte(specdata), nil))
-
- creds := Must(repo.LookupCredentials("registry.npmjs.org"))
- Expect(creds.Properties()).To(Equal(props))
-
- creds = Must(repo.LookupCredentials("npm.registry.acme.com/api/npm"))
- Expect(creds.Properties()).To(Equal(props2))
- })
-
- It("can access the default context", func() {
- ctx := credentials.New()
-
- r := runtimefinalizer.GetRuntimeFinalizationRecorder(ctx)
- Expect(r).NotTo(BeNil())
-
- Must(ctx.RepositoryForConfig([]byte(specdata), nil))
-
- ci := cpi.NewConsumerIdentity(npmCredentials.CONSUMER_TYPE)
- Expect(ci).NotTo(BeNil())
- credentials := Must(cpi.CredentialsForConsumer(ctx.CredentialsContext(), ci))
- Expect(credentials).NotTo(BeNil())
- Expect(credentials.Properties()).To(Equal(props))
- })
-})
diff --git a/pkg/contexts/credentials/repositories/npm/type.go b/pkg/contexts/credentials/repositories/npm/type.go
deleted file mode 100644
index d2b695851..000000000
--- a/pkg/contexts/credentials/repositories/npm/type.go
+++ /dev/null
@@ -1,62 +0,0 @@
-package npm
-
-import (
- "fmt"
-
- "github.com/mandelsoft/goutils/generics"
-
- "github.com/open-component-model/ocm/pkg/contexts/credentials/cpi"
- "github.com/open-component-model/ocm/pkg/runtime"
- "github.com/open-component-model/ocm/pkg/utils"
-)
-
-const (
- // Type is the type of the NPMConfig.
- Type = "NPMConfig"
- TypeV1 = Type + runtime.VersionSeparator + "v1"
-)
-
-func init() {
- cpi.RegisterRepositoryType(cpi.NewRepositoryType[*RepositorySpec](Type))
- cpi.RegisterRepositoryType(cpi.NewRepositoryType[*RepositorySpec](TypeV1, cpi.WithDescription(usage), cpi.WithFormatSpec(format)))
-}
-
-// RepositorySpec describes a docker npmrc based credential repository interface.
-type RepositorySpec struct {
- runtime.ObjectVersionedType `json:",inline"`
- NpmrcFile string `json:"npmrcFile,omitempty"`
- PropgateConsumerIdentity *bool `json:"propagateConsumerIdentity,omitempty"`
-}
-
-// NewRepositorySpec creates a new memory RepositorySpec.
-func NewRepositorySpec(path string, propagate ...bool) *RepositorySpec {
- var p *bool
- if path == "" {
- d, err := DefaultConfig()
- if err == nil {
- path = d
- }
- }
- if len(propagate) > 0 {
- p = generics.Pointer(utils.OptionalDefaultedBool(true, propagate...))
- }
-
- return &RepositorySpec{
- ObjectVersionedType: runtime.NewVersionedTypedObject(Type),
- NpmrcFile: path,
- PropgateConsumerIdentity: p,
- }
-}
-
-func (rs *RepositorySpec) GetType() string {
- return Type
-}
-
-func (rs *RepositorySpec) Repository(ctx cpi.Context, _ cpi.Credentials) (cpi.Repository, error) {
- r := ctx.GetAttributes().GetOrCreateAttribute(".npmrc", createCache)
- cache, ok := r.(*Cache)
- if !ok {
- return nil, fmt.Errorf("failed to assert type %T to Cache", r)
- }
- return cache.GetRepository(ctx, rs.NpmrcFile, utils.AsBool(rs.PropgateConsumerIdentity, true))
-}
diff --git a/pkg/contexts/credentials/repositories/vault/a_usage.go b/pkg/contexts/credentials/repositories/vault/a_usage.go
deleted file mode 100644
index 5c165c063..000000000
--- a/pkg/contexts/credentials/repositories/vault/a_usage.go
+++ /dev/null
@@ -1,56 +0,0 @@
-package vault
-
-import (
- "strings"
-
- "github.com/open-component-model/ocm/pkg/contexts/credentials/cpi"
- "github.com/open-component-model/ocm/pkg/contexts/credentials/repositories/vault/identity"
- "github.com/open-component-model/ocm/pkg/listformat"
-)
-
-func init() {
- info := cpi.DefaultContext.ConsumerIdentityMatchers().GetInfo(identity.CONSUMER_TYPE)
- idx := strings.Index(info.Description, "\n")
- desc := `
-This repository type can be used to access credentials stored in a HashiCorp
-Vault.
-
-It provides access to list of secrets stored under a dedicated path in
-a vault namespace. This list can either explicitly be specified, or
-it is taken from the metadata of a specified secret.
-
-The following custom metadata attributes are evaluated:
-- ` + CUSTOM_SECRETS + ` this attribute may contain a comma separated list of
- vault secrets, which should be exposed by this repository instance.
- The names are evaluated under the path prefix used for the repository.
-- ` + CUSTOM_CONSUMERID + ` this attribute may contain a JSON encoded
- consumer id , this secret should be assigned to.
-- type if no special attribute is defined this attribute
- indicated to use the complete custom metadata as consumer id.
-
-It uses the ` + identity.CONSUMER_TYPE + ` identity matcher and consumer type
-to requests credentials for the access.
-` + info.Description[idx:] + `
-
-It requires the following credential attributes:
-
-` + info.CredentialAttributes
-
- usage = desc
-}
-
-var usage string
-
-var format = `
-The repository specification supports the following fields:
-` + listformat.FormatListElements("", listformat.StringElementDescriptionList{
- "serverURL", "*string* (required): the URL of the vault instance",
- "namespace", "*string* (optional): the namespace used to evaluate secrets",
- "mountPath", "*string* (optional): the mount path to use (default: secrets)",
- "path", "*string* (optional): the path prefix used to lookup secrets",
- "secrets", "*[]string* (optional): list of secrets",
- "propagateConsumerIdentity", "*bool*(optional): evaluate metadata for consumer id propagation",
-}) + `
-If the secrets list is empty, all secret entries found in the given path
-is read.
-`
diff --git a/pkg/contexts/credentials/repositories/vault/cache.go b/pkg/contexts/credentials/repositories/vault/cache.go
deleted file mode 100644
index 12638d4d8..000000000
--- a/pkg/contexts/credentials/repositories/vault/cache.go
+++ /dev/null
@@ -1,44 +0,0 @@
-package vault
-
-import (
- "sync"
-
- "github.com/mandelsoft/goutils/errors"
-
- "github.com/open-component-model/ocm/pkg/contexts/credentials/cpi"
- "github.com/open-component-model/ocm/pkg/contexts/datacontext"
-)
-
-const ATTR_REPOS = "github.com/open-component-model/ocm/pkg/contexts/credentials/repositories/vault"
-
-type Repositories struct {
- lock sync.Mutex
- repos map[cpi.ProviderIdentity]*Repository
-}
-
-func newRepositories(datacontext.Context) interface{} {
- return &Repositories{
- repos: map[cpi.ProviderIdentity]*Repository{},
- }
-}
-
-func (r *Repositories) GetRepository(ctx cpi.Context, spec *RepositorySpec) (*Repository, error) {
- var repo *Repository
-
- if spec.ServerURL == "" {
- return nil, errors.ErrInvalid("server url")
- }
- r.lock.Lock()
- defer r.lock.Unlock()
-
- var err error
- key := spec.GetKey()
- repo = r.repos[key]
- if repo == nil {
- repo, err = NewRepository(ctx, spec)
- if err == nil {
- r.repos[key] = repo
- }
- }
- return repo, err
-}
diff --git a/pkg/contexts/credentials/repositories/vault/identity/identity.go b/pkg/contexts/credentials/repositories/vault/identity/identity.go
deleted file mode 100644
index 4cae7c00f..000000000
--- a/pkg/contexts/credentials/repositories/vault/identity/identity.go
+++ /dev/null
@@ -1,124 +0,0 @@
-package identity
-
-import (
- "net"
- "net/url"
- "strings"
-
- "github.com/mandelsoft/goutils/errors"
-
- "github.com/open-component-model/ocm/pkg/contexts/credentials/cpi"
- "github.com/open-component-model/ocm/pkg/contexts/credentials/identity/hostpath"
- "github.com/open-component-model/ocm/pkg/listformat"
-)
-
-const CONSUMER_TYPE = "HashiCorpVault"
-
-// identity properties.
-const (
- ID_HOSTNAME = hostpath.ID_HOSTNAME
- ID_SCHEMA = hostpath.ID_SCHEME
- ID_PORT = hostpath.ID_PORT
- ID_PATHPREFIX = hostpath.ID_PATHPREFIX
- ID_MOUNTPATH = "mountPath"
- ID_NAMESPACE = "namespace"
-)
-
-// credential properties.
-const (
- ATTR_AUTHMETH = "authmeth"
- ATTR_TOKEN = cpi.ATTR_TOKEN
- ATTR_ROLEID = "roleid"
- ATTR_SECRETID = "secretid"
-)
-
-const (
- AUTH_APPROLE = "approle"
- AUTH_TOKEN = "token"
-)
-
-var identityMatcher = hostpath.IdentityMatcher(CONSUMER_TYPE)
-
-func IdentityMatcher(request, cur, id cpi.ConsumerIdentity) bool {
- if id[ID_NAMESPACE] != request[ID_NAMESPACE] {
- return false
- }
- if id[ID_MOUNTPATH] != "" && id[ID_MOUNTPATH] != request[ID_MOUNTPATH] {
- return false
- }
- return identityMatcher(request, cur, id)
-}
-
-func init() {
- attrs := listformat.FormatListElements("", listformat.StringElementDescriptionList{
- ATTR_AUTHMETH, "auth method",
- ATTR_TOKEN, "vault token",
- ATTR_ROLEID, "applrole role id",
- ATTR_SECRETID, "applrole secret id",
- })
- ids := listformat.FormatListElements("", listformat.StringElementDescriptionList{
- ID_HOSTNAME, "vault server host",
- ID_SCHEMA, "(optional) URL scheme",
- ID_PORT, "(optional) server port",
- ID_NAMESPACE, "vault namespace",
- ID_MOUNTPATH, "mount path",
- ID_PATHPREFIX, "path prefix for secret",
- })
- cpi.RegisterStandardIdentity(CONSUMER_TYPE, identityMatcher,
- `HashiCorp Vault credential matcher
-
-This matcher matches credentials for a HashiCorp vault instance.
-It uses the following identity attributes:
-`+ids,
- attrs+`
-The only supported auth methods, so far, are token and approle.
-`)
-}
-
-func GetConsumerId(serverurl string, namespace string, mountpath string, secretpath string) (cpi.ConsumerIdentity, error) {
- if serverurl == "" {
- return nil, errors.Newf("server address must be given")
- }
- u, err := url.Parse(serverurl)
- if err != nil {
- return nil, errors.ErrInvalidWrap(err, "server url", serverurl)
- }
-
- host, port, err := net.SplitHostPort(u.Host)
- if err != nil {
- if strings.LastIndex(host, ":") >= 0 {
- return nil, errors.ErrInvalidWrap(err, "server url", serverurl)
- }
- host = u.Host
- }
-
- id := cpi.ConsumerIdentity{
- cpi.ID_TYPE: CONSUMER_TYPE,
- ID_HOSTNAME: host,
- }
- if u.Scheme != "" {
- id[ID_SCHEMA] = u.Scheme
- }
- if port != "" {
- id[ID_PORT] = port
- }
- if namespace != "" {
- id[ID_NAMESPACE] = namespace
- }
- if mountpath != "" {
- id[ID_MOUNTPATH] = mountpath
- }
-
- if secretpath != "" {
- id[ID_PATHPREFIX] = secretpath
- }
- return id, nil
-}
-
-func GetCredentials(ctx cpi.ContextProvider, serverurl, namespace string, mountpath, secretpath string) (cpi.Credentials, error) {
- id, err := GetConsumerId(serverurl, namespace, mountpath, secretpath)
- if err != nil {
- return nil, err
- }
- return cpi.CredentialsForConsumer(ctx.CredentialsContext(), id, IdentityMatcher)
-}
diff --git a/pkg/contexts/credentials/repositories/vault/logging.go b/pkg/contexts/credentials/repositories/vault/logging.go
deleted file mode 100644
index e5ccfdaeb..000000000
--- a/pkg/contexts/credentials/repositories/vault/logging.go
+++ /dev/null
@@ -1,10 +0,0 @@
-package vault
-
-import (
- ocmlog "github.com/open-component-model/ocm/pkg/logging"
-)
-
-var (
- REALM = ocmlog.DefineSubRealm("HashiCorp Vault Access", "credentials", "vault")
- log = ocmlog.DynamicLogger(REALM)
-)
diff --git a/pkg/contexts/credentials/repositories/vault/options.go b/pkg/contexts/credentials/repositories/vault/options.go
deleted file mode 100644
index 59d292583..000000000
--- a/pkg/contexts/credentials/repositories/vault/options.go
+++ /dev/null
@@ -1,96 +0,0 @@
-package vault
-
-import (
- "github.com/mandelsoft/goutils/optionutils"
- "golang.org/x/exp/slices"
-
- "github.com/open-component-model/ocm/pkg/utils"
-)
-
-type Option = optionutils.Option[*Options]
-
-type Options struct {
- Namespace string `json:"namespace,omitempty"`
- MountPath string `json:"mountPath,omitempty"`
- Path string `json:"path,omitempty"`
- Secrets []string `json:"secrets,omitempty"`
- PropgateConsumerIdentity bool `json:"propagateConsumerIdentity,omitempty"`
-}
-
-var _ Option = (*Options)(nil)
-
-func (o *Options) ApplyTo(opts *Options) {
- if o.Namespace != "" {
- opts.Namespace = o.Namespace
- }
- if o.MountPath != "" {
- opts.MountPath = o.MountPath
- }
- if o.Path != "" {
- opts.Path = o.Path
- }
- if o.Secrets != nil {
- opts.Secrets = slices.Clone(o.Secrets)
- }
- opts.PropgateConsumerIdentity = o.PropgateConsumerIdentity
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-type ns string
-
-func (o ns) ApplyTo(opts *Options) {
- opts.Namespace = string(o)
-}
-
-func WithNamespace(s string) Option {
- return ns(s)
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-type m string
-
-func (o m) ApplyTo(opts *Options) {
- opts.MountPath = string(o)
-}
-
-func WithMountPath(s string) Option {
- return m(s)
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-type p string
-
-func (o p) ApplyTo(opts *Options) {
- opts.Path = string(o)
-}
-
-func WithPath(s string) Option {
- return p(s)
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-type sec []string
-
-func (o sec) ApplyTo(opts *Options) {
- opts.Secrets = append(opts.Secrets, []string(o)...)
-}
-
-func WithSecrets(s ...string) Option {
- return sec(slices.Clone(s))
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-type pr bool
-
-func (o pr) ApplyTo(opts *Options) {
- opts.PropgateConsumerIdentity = bool(o)
-}
-
-func WithPropagation(b ...bool) Option {
- return pr(utils.OptionalDefaultedBool(true, b...))
-}
diff --git a/pkg/contexts/credentials/repositories/vault/provider.go b/pkg/contexts/credentials/repositories/vault/provider.go
deleted file mode 100644
index 12d1a13d1..000000000
--- a/pkg/contexts/credentials/repositories/vault/provider.go
+++ /dev/null
@@ -1,320 +0,0 @@
-package vault
-
-import (
- "context"
- "encoding/json"
- "net/http"
- "path"
- "strings"
- "sync"
- "time"
-
- "github.com/hashicorp/vault-client-go"
- "github.com/mandelsoft/goutils/errors"
- "golang.org/x/exp/slices"
-
- "github.com/open-component-model/ocm/pkg/common"
- "github.com/open-component-model/ocm/pkg/contexts/credentials/cpi"
- "github.com/open-component-model/ocm/pkg/contexts/credentials/internal"
- "github.com/open-component-model/ocm/pkg/contexts/credentials/repositories/vault/identity"
-)
-
-const PROVIDER = "ocm.software/credentialprovider/" + Type
-
-const (
- CUSTOM_SECRETS = "secrets"
- CUSTOM_CONSUMERID = "consumerId"
-)
-
-type mapping struct {
- Id cpi.ConsumerIdentity
- Name string
-}
-
-type credentialCache struct {
- creds cpi.CredentialsSource
- credentials map[string]cpi.DirectCredentials
- consumer []*mapping
-}
-
-func newCredentialCache(creds cpi.CredentialsSource) *credentialCache {
- return &credentialCache{
- creds: creds,
- credentials: map[string]cpi.DirectCredentials{},
- }
-}
-
-type ConsumerProvider struct {
- lock sync.Mutex
- repository *Repository
- cache *credentialCache
-
- updated bool
-}
-
-var (
- _ cpi.ConsumerProvider = (*ConsumerProvider)(nil)
- _ cpi.ConsumerIdentityProvider = (*ConsumerProvider)(nil)
-)
-
-func NewConsumerProvider(repo *Repository) (*ConsumerProvider, error) {
- src, err := repo.ctx.GetCredentialsForConsumer(repo.id)
- if err != nil {
- return nil, err
- }
- return &ConsumerProvider{
- cache: newCredentialCache(src),
- repository: repo,
- }, nil
-}
-
-func (p *ConsumerProvider) String() string {
- return p.repository.id.String()
-}
-
-func (p *ConsumerProvider) GetConsumerId(uctx ...internal.UsageContext) internal.ConsumerIdentity {
- return p.repository.GetConsumerId()
-}
-
-func (p *ConsumerProvider) GetIdentityMatcher() string {
- return p.repository.GetIdentityMatcher()
-}
-
-func (p *ConsumerProvider) update(ectx cpi.EvaluationContext) error {
- if p.updated {
- return nil
- }
- credsrc, err := cpi.GetCredentialsForConsumer(p.repository.ctx, ectx, p.repository.id, identity.IdentityMatcher)
- if err != nil {
- return err
- }
- creds, err := credsrc.Credentials(p.repository.ctx)
- if err != nil {
- return err
- }
- err = p.validateCreds(creds)
- if err != nil {
- return err
- }
-
- ctx := context.Background()
-
- client, err := vault.New(
- vault.WithAddress(p.repository.spec.ServerURL),
- vault.WithRequestTimeout(30*time.Second),
- )
- if err != nil {
- return err
- }
-
- // vault.WithMountPath("piper/PIPELINE-GROUP-4953/PIPELINE-25042/appRoleCredentials"),
- token, err := p.getToken(ctx, client, creds)
- if err != nil {
- return err
- }
-
- if err := client.SetToken(token); err != nil {
- return err
- }
- if err := client.SetNamespace(p.repository.spec.Namespace); err != nil {
- return err
- }
-
- cache := newCredentialCache(credsrc)
-
- // TODO: support for pure path based access for other secret engine types
- secrets := slices.Clone(p.repository.spec.Secrets)
- if len(secrets) == 0 {
- s, err := client.Secrets.KvV2List(ctx, p.repository.spec.Path,
- vault.WithMountPath(p.repository.spec.MountPath))
- if err != nil {
- p.error(err, "error listing secrets", "")
- return err
- }
- for _, k := range s.Data.Keys {
- if !strings.HasSuffix(k, "/") {
- secrets = append(secrets, k)
- }
- }
- }
- for i := 0; i < len(secrets); i++ {
- n := secrets[i]
- creds, id, list, err := p.read(ctx, client, n)
- p.error(err, "error reading vault secret", n)
- if err == nil {
- for _, a := range list {
- if !slices.Contains(secrets, a) {
- secrets = append(secrets, a)
- }
- }
- if len(id) > 0 {
- cache.consumer = append(cache.consumer, &mapping{
- Id: cpi.ConsumerIdentity(id),
- Name: n,
- })
- }
- if len(creds) > 0 {
- cache.credentials[n] = cpi.DirectCredentials(creds)
- }
- }
- }
- p.cache = cache
- p.updated = true
- return nil
-}
-
-func (p *ConsumerProvider) validateCreds(creds cpi.Credentials) error {
- m := creds.GetProperty(identity.ATTR_AUTHMETH)
- if m == "" {
- return errors.ErrRequired(identity.ATTR_AUTHMETH)
- }
- meth := methods.Get(m)
- if meth == nil {
- return errors.ErrInvalid(identity.ATTR_AUTHMETH, m)
- }
- return meth.Validate(creds)
-}
-
-func (p *ConsumerProvider) getToken(ctx context.Context, client *vault.Client, creds cpi.Credentials) (string, error) {
- m := creds.GetProperty(identity.ATTR_AUTHMETH)
- return methods.Get(m).GetToken(ctx, client, p.repository.spec.Namespace, creds)
-}
-
-func (p *ConsumerProvider) error(err error, msg string, secret string, keypairs ...interface{}) {
- if err == nil {
- return
- }
- f := log.Info
- var v *vault.ResponseError
- if errors.As(err, &v) && v.StatusCode != http.StatusNotFound {
- f = log.Error
- }
- f(msg, append(keypairs,
- "server", p.repository.spec.ServerURL,
- "namespace", p.repository.spec.Namespace,
- "engine", p.repository.spec.MountPath,
- "path", path.Join(p.repository.spec.Path, secret),
- "error", err.Error(),
- )...,
- )
-}
-
-func (p *ConsumerProvider) read(ctx context.Context, client *vault.Client, secret string) (common.Properties, common.Properties, []string, error) {
- // read the secret
-
- secret = path.Join(p.repository.spec.Path, secret)
- s, err := client.Secrets.KvV2Read(ctx, secret,
- vault.WithMountPath(p.repository.spec.MountPath))
- if err != nil {
- return nil, nil, nil, err
- }
-
- var id common.Properties
- var list []string
- props := getProps(s.Data.Data)
-
- if meta, ok := s.Data.Metadata["custom_metadata"].(map[string]interface{}); ok {
- sub := false
- if cid := meta[CUSTOM_CONSUMERID]; cid != nil {
- id = common.Properties{}
- if err := json.Unmarshal([]byte(cid.(string)), &id); err != nil {
- id = nil
- }
- sub = true
- }
- if cid := meta[CUSTOM_SECRETS]; cid != nil {
- if s, ok := meta[CUSTOM_SECRETS].(string); ok {
- for _, e := range strings.Split(s, ",") {
- e = strings.TrimSpace(e)
- if e != "" {
- list = append(list, e)
- }
- }
- }
- sub = true
- }
- if _, ok := meta[cpi.ID_TYPE]; !sub && ok {
- id = getProps(meta)
- }
- }
- return props, id, list, nil
-}
-
-func getProps(data map[string]interface{}) common.Properties {
- props := common.Properties{}
- for k, v := range data {
- if s, ok := v.(string); ok {
- props[k] = s
- }
- }
- return props
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// ConsumerProvider interface
-
-func (p *ConsumerProvider) Unregister(id cpi.ProviderIdentity) {
-}
-
-func (p *ConsumerProvider) Match(ectx cpi.EvaluationContext, req cpi.ConsumerIdentity, cur cpi.ConsumerIdentity, m cpi.IdentityMatcher) (cpi.CredentialsSource, cpi.ConsumerIdentity) {
- return p.get(ectx, req, cur, m)
-}
-
-func (p *ConsumerProvider) Get(req cpi.ConsumerIdentity) (cpi.CredentialsSource, bool) {
- creds, _ := p.get(nil, req, nil, cpi.CompleteMatch)
- return creds, creds != nil
-}
-
-func (p *ConsumerProvider) get(ectx cpi.EvaluationContext, req cpi.ConsumerIdentity, cur cpi.ConsumerIdentity, m cpi.IdentityMatcher) (cpi.CredentialsSource, cpi.ConsumerIdentity) {
- if req.Equals(p.repository.id) {
- return nil, cur
- }
-
- p.lock.Lock()
- defer p.lock.Unlock()
-
- err := p.update(ectx)
- if err != nil {
- log.Info("error accessing credentials provider", "error", err)
- }
-
- var creds cpi.CredentialsSource
-
- for _, a := range p.cache.consumer {
- if m(req, cur, a.Id) {
- cur = a.Id
- creds = p.cache.credentials[a.Name]
- }
- }
- return creds, cur
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// lookup
-
-func (c *ConsumerProvider) ExistsCredentials(name string) (bool, error) {
- c.lock.Lock()
- defer c.lock.Unlock()
-
- err := c.update(nil)
- if err != nil {
- return false, err
- }
- _, ok := c.cache.credentials[name]
- return ok, nil
-}
-
-func (c *ConsumerProvider) LookupCredentials(name string) (cpi.Credentials, error) {
- c.lock.Lock()
- defer c.lock.Unlock()
-
- err := c.update(nil)
- if err != nil {
- return nil, err
- }
- src, ok := c.cache.credentials[name]
- if ok {
- return src, nil
- }
- return nil, nil
-}
diff --git a/pkg/contexts/credentials/repositories/vault/repo_test.go b/pkg/contexts/credentials/repositories/vault/repo_test.go
deleted file mode 100644
index 581390405..000000000
--- a/pkg/contexts/credentials/repositories/vault/repo_test.go
+++ /dev/null
@@ -1,70 +0,0 @@
-package vault_test
-
-import (
- "encoding/json"
- "fmt"
- "reflect"
-
- . "github.com/mandelsoft/goutils/testutils"
- . "github.com/onsi/ginkgo/v2"
- . "github.com/onsi/gomega"
-
- "github.com/open-component-model/ocm/pkg/common"
- "github.com/open-component-model/ocm/pkg/contexts/credentials"
- me "github.com/open-component-model/ocm/pkg/contexts/credentials/repositories/vault"
- "github.com/open-component-model/ocm/pkg/contexts/credentials/repositories/vault/identity"
-)
-
-const (
- VAULT_ADDRESS = "127.0.0.1:8200"
- VAULT_HTTP_URL = "http://" + VAULT_ADDRESS
- VAULT_NAMESPACE = "test-namespace"
- VAULT_MOUNT_PATH = "secret"
- VAULT_PATH_REPO1 = "mysecrets/repo1"
- VAULT_PATH_REPO2 = "mysecrets/repo2"
-)
-
-var _ = Describe("", func() {
- Context("serialization and deserialization", func() {
- DefaultContext := credentials.New()
-
- specdata := fmt.Sprintf("{\"type\": %q, \"serverURL\": %q, \"namespace\": %q, \"mountPath\": %q, \"path\": %q, \"secrets\": [\"secret1\", \"secret2\", \"secret3\"], \"propagateConsumerIdentity\": true }", me.Type, "http://"+VAULT_ADDRESS, VAULT_NAMESPACE, VAULT_MOUNT_PATH, VAULT_PATH_REPO1)
- spec := me.NewRepositorySpec("http://"+VAULT_ADDRESS, me.WithNamespace(VAULT_NAMESPACE), me.WithMountPath(VAULT_MOUNT_PATH), me.WithPath(VAULT_PATH_REPO1), me.WithSecrets("secret1", "secret2", "secret3"), me.WithPropagation())
-
- specdata2 := fmt.Sprintf("{\"type\": %q, \"serverURL\": %q }", me.Type, "http://"+VAULT_ADDRESS)
- spec2 := me.NewRepositorySpec("http://" + VAULT_ADDRESS)
-
- It("serializes repo spec", func() {
- data := Must(json.Marshal(spec))
- Expect(data).To(YAMLEqual([]byte(specdata)))
-
- data = Must(json.Marshal(spec2))
- Expect(data).To(YAMLEqual([]byte(specdata2)))
- })
-
- It("deserializes repo spec", func() {
- localspec := Must(DefaultContext.RepositorySpecForConfig([]byte(specdata), nil))
- Expect(reflect.TypeOf(localspec).String()).To(Equal("*vault.RepositorySpec"))
- Expect(localspec).To(Equal(spec))
-
- localspec = Must(DefaultContext.RepositorySpecForConfig([]byte(specdata2), nil))
- Expect(reflect.TypeOf(localspec).String()).To(Equal("*vault.RepositorySpec"))
- Expect(localspec).To(Equal(spec2))
- })
-
- It("resolves repository", func() {
- // Since vault always requires credentials to be accessed, RepositoryForConfig checks whether credentials
- // for a corresponding consumer exist. Thus, creating such credentials is required to test the method even
- // though they are not used
- consumerId := Must(identity.GetConsumerId(VAULT_HTTP_URL, VAULT_NAMESPACE, VAULT_MOUNT_PATH, VAULT_PATH_REPO1))
- creds := credentials.NewCredentials(common.Properties{
- identity.ATTR_AUTHMETH: identity.AUTH_TOKEN,
- identity.ATTR_TOKEN: "token",
- })
- DefaultContext.SetCredentialsForConsumer(consumerId, creds)
-
- repo := Must(DefaultContext.RepositoryForConfig([]byte(specdata), nil))
- Expect(repo).ToNot(BeNil())
- })
- })
-})
diff --git a/pkg/contexts/credentials/repositories/vault/repository.go b/pkg/contexts/credentials/repositories/vault/repository.go
deleted file mode 100644
index 449db5667..000000000
--- a/pkg/contexts/credentials/repositories/vault/repository.go
+++ /dev/null
@@ -1,66 +0,0 @@
-package vault
-
-import (
- "github.com/mandelsoft/goutils/errors"
-
- "github.com/open-component-model/ocm/pkg/contexts/credentials/cpi"
- "github.com/open-component-model/ocm/pkg/contexts/credentials/internal"
- "github.com/open-component-model/ocm/pkg/contexts/credentials/repositories/vault/identity"
-)
-
-type Repository struct {
- ctx cpi.Context
- spec *RepositorySpec
- id cpi.ConsumerIdentity
- provider *ConsumerProvider
-}
-
-var (
- _ cpi.Repository = (*Repository)(nil)
- _ cpi.ConsumerIdentityProvider = (*Repository)(nil)
-)
-
-func NewRepository(ctx cpi.Context, spec *RepositorySpec) (*Repository, error) {
- id, err := identity.GetConsumerId(spec.ServerURL, spec.Namespace, spec.MountPath, spec.Path)
- if err != nil {
- return nil, err
- }
- r := &Repository{
- ctx: ctx,
- spec: spec,
- id: id,
- }
- if spec.ServerURL == "" {
- return nil, errors.ErrInvalid("server url")
- }
- r.provider, err = NewConsumerProvider(r)
- if err != nil {
- return nil, err
- }
- if spec.PropgateConsumerIdentity {
- ctx.RegisterConsumerProvider(spec.GetKey(), r.provider)
- }
- return r, err
-}
-
-var _ cpi.Repository = &Repository{}
-
-func (r *Repository) ExistsCredentials(name string) (bool, error) {
- return r.provider.ExistsCredentials(name)
-}
-
-func (r *Repository) LookupCredentials(name string) (cpi.Credentials, error) {
- return r.provider.LookupCredentials(name)
-}
-
-func (r *Repository) WriteCredentials(name string, creds cpi.Credentials) (cpi.Credentials, error) {
- return nil, errors.ErrNotSupported("write", "credentials", Type)
-}
-
-func (r *Repository) GetConsumerId(uctx ...internal.UsageContext) internal.ConsumerIdentity {
- return r.id
-}
-
-func (r *Repository) GetIdentityMatcher() string {
- return identity.CONSUMER_TYPE
-}
diff --git a/pkg/contexts/credentials/repositories/vault/type.go b/pkg/contexts/credentials/repositories/vault/type.go
deleted file mode 100644
index aa78f2b93..000000000
--- a/pkg/contexts/credentials/repositories/vault/type.go
+++ /dev/null
@@ -1,82 +0,0 @@
-package vault
-
-import (
- "encoding/json"
- "fmt"
-
- "github.com/mandelsoft/goutils/optionutils"
- "golang.org/x/exp/slices"
-
- "github.com/open-component-model/ocm/pkg/contexts/credentials/cpi"
- "github.com/open-component-model/ocm/pkg/contexts/credentials/internal"
- "github.com/open-component-model/ocm/pkg/contexts/credentials/repositories/vault/identity"
- "github.com/open-component-model/ocm/pkg/runtime"
-)
-
-const (
- Type = "HashiCorpVault"
- TypeV1 = Type + runtime.VersionSeparator + "v1"
-)
-
-func init() {
- cpi.RegisterRepositoryType(cpi.NewRepositoryType[*RepositorySpec](Type))
- cpi.RegisterRepositoryType(cpi.NewRepositoryType[*RepositorySpec](TypeV1, cpi.WithDescription(usage), cpi.WithFormatSpec(format)))
-}
-
-// RepositorySpec describes a docker config based credential repository interface.
-type RepositorySpec struct {
- runtime.ObjectVersionedType `json:",inline"`
- ServerURL string `json:"serverURL"`
- Options `json:",inline"`
-}
-
-var _ cpi.ConsumerIdentityProvider = (*RepositorySpec)(nil)
-
-// NewRepositorySpec creates a new memory RepositorySpec.
-func NewRepositorySpec(url string, opts ...Option) *RepositorySpec {
- return &RepositorySpec{
- ObjectVersionedType: runtime.NewVersionedTypedObject(Type),
- ServerURL: url,
- Options: *optionutils.EvalOptions(opts...),
- }
-}
-
-func (a *RepositorySpec) GetType() string {
- return Type
-}
-
-func (a *RepositorySpec) Repository(ctx cpi.Context, creds cpi.Credentials) (cpi.Repository, error) {
- r := ctx.GetAttributes().GetOrCreateAttribute(ATTR_REPOS, newRepositories)
- repos, ok := r.(*Repositories)
- if !ok {
- return nil, fmt.Errorf("failed to assert type %T to Repositories", r)
- }
- spec := *a
- spec.Secrets = slices.Clone(a.Secrets)
- if spec.MountPath == "" {
- spec.MountPath = "secret"
- }
- return repos.GetRepository(ctx, &spec)
-}
-
-func (a *RepositorySpec) GetKey() cpi.ProviderIdentity {
- spec := *a
- spec.PropgateConsumerIdentity = false
- data, err := json.Marshal(&spec)
- if err == nil {
- return cpi.ProviderIdentity(data)
- }
- return cpi.ProviderIdentity(spec.ServerURL)
-}
-
-func (a *RepositorySpec) GetConsumerId(uctx ...internal.UsageContext) internal.ConsumerIdentity {
- id, err := identity.GetConsumerId(a.ServerURL, a.Namespace, a.MountPath, a.Path)
- if err != nil {
- return nil
- }
- return id
-}
-
-func (a *RepositorySpec) GetIdentityMatcher() string {
- return identity.CONSUMER_TYPE
-}
diff --git a/pkg/contexts/credentials/utils.go b/pkg/contexts/credentials/utils.go
deleted file mode 100644
index e33477a36..000000000
--- a/pkg/contexts/credentials/utils.go
+++ /dev/null
@@ -1,139 +0,0 @@
-package credentials
-
-import (
- "crypto/tls"
- "crypto/x509"
- "strings"
-
- "github.com/mandelsoft/goutils/errors"
- "github.com/texttheater/golang-levenshtein/levenshtein"
-
- "github.com/open-component-model/ocm/pkg/contexts/credentials/internal"
- "github.com/open-component-model/ocm/pkg/contexts/datacontext/attrs/rootcertsattr"
- "github.com/open-component-model/ocm/pkg/utils"
-)
-
-func GetProvidedConsumerId(obj interface{}, uctx ...UsageContext) ConsumerIdentity {
- return utils.UnwrappingCall(obj, func(provider ConsumerIdentityProvider) ConsumerIdentity {
- return provider.GetConsumerId(uctx...)
- })
-}
-
-func GetProvidedIdentityMatcher(obj interface{}) string {
- return utils.UnwrappingCall(obj, func(provider ConsumerIdentityProvider) string {
- return provider.GetIdentityMatcher()
- })
-}
-
-func CredentialsFor(ctx ContextProvider, obj interface{}, uctx ...UsageContext) (Credentials, error) {
- id := GetProvidedConsumerId(obj, uctx...)
- if id == nil {
- return nil, errors.ErrNotSupported(KIND_CONSUMER)
- }
- return CredentialsForConsumer(ctx, id)
-}
-
-func GetRootCAs(ctx ContextProvider, creds Credentials) (*x509.CertPool, error) {
- var rootCAs *x509.CertPool
- var err error
-
- if creds != nil {
- c := creds.GetProperty(internal.ATTR_CERTIFICATE_AUTHORITY)
- if c != "" {
- rootCAs = x509.NewCertPool()
- rootCAs.AppendCertsFromPEM([]byte(c))
- }
- }
- if rootCAs == nil {
- if ctx != nil {
- rootCAs = rootcertsattr.Get(ctx.CredentialsContext()).GetRootCertPool(true)
- } else {
- rootCAs, err = x509.SystemCertPool()
- if err != nil {
- return nil, err
- }
- }
- }
- return rootCAs, nil
-}
-
-func GetClientCerts(ctx ContextProvider, creds Credentials) ([]tls.Certificate, error) {
- if creds != nil {
- cert := creds.GetProperty(internal.ATTR_CERTIFICATE)
- priv := creds.GetProperty(internal.ATTR_PRIVATE_KEY)
- if cert == "" && priv == "" {
- return nil, nil
- }
- if cert == "" || priv == "" {
- return nil, errors.New("both, private key and certificate are required for tls client authentication")
- }
- if cert != "" && priv != "" {
- tlsCert, err := tls.X509KeyPair([]byte(cert), []byte(priv))
- if err != nil {
- return nil, err
- }
- return []tls.Certificate{tlsCert}, nil
- }
- }
- return nil, nil
-}
-
-func GuessConsumerType(ctxp ContextProvider, spec string) string {
- matchers := ctxp.CredentialsContext().ConsumerIdentityMatchers()
- lspec := strings.ToLower(spec)
-
- if matchers.Get(spec) == nil {
- fix := ""
- for _, i := range matchers.List() {
- idx := strings.Index(i.Type, ".")
- if idx > 0 && i.Type[:idx] == spec {
- fix = i.Type
- break
- }
- }
- if fix == "" {
- for _, i := range matchers.List() {
- if strings.ToLower(i.Type) == lspec {
- fix = i.Type
- break
- }
- }
- }
- if fix == "" {
- for _, i := range matchers.List() {
- idx := strings.Index(i.Type, ".")
- if idx > 0 && strings.ToLower(i.Type[:idx]) == lspec {
- fix = i.Type
- break
- }
- }
- }
- if fix == "" {
- min := -1
- for _, i := range matchers.List() {
- idx := strings.Index(i.Type, ".")
- if idx > 0 {
- d := levenshtein.DistanceForStrings([]rune(lspec), []rune(strings.ToLower(i.Type[:idx])), levenshtein.DefaultOptions)
- if d < 5 && fix == "" || min > d {
- fix = i.Type
- min = d
- }
- }
- }
- }
- if fix == "" {
- min := -1
- for _, i := range matchers.List() {
- d := levenshtein.DistanceForStrings([]rune(lspec), []rune(strings.ToLower(i.Type)), levenshtein.DefaultOptions)
- if d < 5 && fix == "" || min > d {
- fix = i.Type
- min = d
- }
- }
- }
- if fix != "" {
- return fix
- }
- }
- return spec
-}
diff --git a/pkg/contexts/datacontext/action/api/action_test.go b/pkg/contexts/datacontext/action/api/action_test.go
deleted file mode 100644
index be26d3014..000000000
--- a/pkg/contexts/datacontext/action/api/action_test.go
+++ /dev/null
@@ -1,108 +0,0 @@
-package api_test
-
-import (
- "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/credentials/identity/hostpath"
- "github.com/open-component-model/ocm/pkg/contexts/datacontext/action/api"
- "github.com/open-component-model/ocm/pkg/runtime"
-)
-
-const NAME = "testAction"
-
-const CONSUMER_TYPE = "TestAction"
-
-const ID_HOSTNAME = hostpath.ID_HOSTNAME
-
-func RegisterAction(registry api.ActionTypeRegistry) {
- registry.RegisterAction(NAME, "test action", "nothing special", []string{ID_HOSTNAME})
-
- registry.RegisterActionType(api.NewActionType[*ActionSpec, *ActionResult](NAME, "v1"))
- registry.RegisterActionType(api.NewActionTypeByConverter[*ActionSpec, *ActionSpecV2, *ActionResult, *ActionResultV2](NAME, "v2", convertSpecV2{}, convertResultV2{}))
-}
-
-func NewActionSpec(field string) api.ActionSpec {
- return &ActionSpec{
- ObjectVersionedType: runtime.NewVersionedObjectType(runtime.TypeName(NAME, "v1")),
- Field: field,
- }
-}
-
-func NewActionResult(msg string) api.ActionResult {
- return &ActionResult{
- ObjectVersionedType: runtime.NewVersionedObjectType(runtime.TypeName(NAME, "v1")),
- Message: msg,
- }
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// internal version
-
-type ActionSpec struct {
- runtime.ObjectVersionedType `json:",inline"`
- Field string `json:"field"`
-}
-
-func (a *ActionSpec) Selector() api.Selector {
- return api.Selector(a.Field)
-}
-
-func (a *ActionSpec) GetConsumerAttributes() common.Properties {
- return common.Properties(credentials.NewConsumerIdentity(CONSUMER_TYPE,
- ID_HOSTNAME, a.Field,
- ))
-}
-
-type ActionResult struct {
- runtime.ObjectVersionedType `json:",inline"`
- Message string `json:"message"`
-}
-
-func (r ActionResult) GetMessage() string {
- return r.Message
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// external version
-
-type ActionSpecV2 struct {
- runtime.ObjectVersionedType `json:",inline"`
- Data string `json:"data"`
-}
-
-type ActionResultV2 struct {
- runtime.ObjectVersionedType `json:",inline"`
- Data string `json:"data"`
-}
-
-type convertSpecV2 struct{}
-
-func (c convertSpecV2) ConvertFrom(in *ActionSpec) (*ActionSpecV2, error) {
- return &ActionSpecV2{
- ObjectVersionedType: runtime.NewVersionedObjectType(runtime.TypeName(NAME, "v2")),
- Data: in.Field,
- }, nil
-}
-
-func (c convertSpecV2) ConvertTo(in *ActionSpecV2) (*ActionSpec, error) {
- return &ActionSpec{
- ObjectVersionedType: runtime.NewVersionedObjectType(runtime.TypeName(NAME, "v2")),
- Field: in.Data,
- }, nil
-}
-
-type convertResultV2 struct{}
-
-func (c convertResultV2) ConvertFrom(in *ActionResult) (*ActionResultV2, error) {
- return &ActionResultV2{
- ObjectVersionedType: runtime.NewVersionedObjectType(runtime.TypeName(NAME, "v2")),
- Data: in.Message,
- }, nil
-}
-
-func (c convertResultV2) ConvertTo(in *ActionResultV2) (*ActionResult, error) {
- return &ActionResult{
- ObjectVersionedType: runtime.NewVersionedObjectType(runtime.TypeName(NAME, "v2")),
- Message: in.Data,
- }, nil
-}
diff --git a/pkg/contexts/datacontext/action/api/interface.go b/pkg/contexts/datacontext/action/api/interface.go
deleted file mode 100644
index eb3a7928f..000000000
--- a/pkg/contexts/datacontext/action/api/interface.go
+++ /dev/null
@@ -1,84 +0,0 @@
-package api
-
-import (
- "github.com/open-component-model/ocm/pkg/common"
- "github.com/open-component-model/ocm/pkg/runtime"
-)
-
-type Action interface {
- Name() string
- Description() string
- Usage() string
- ConsumerAttributes() []string
- GetVersion(string) ActionType
- SupportedVersions() []string
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// Action Specification
-
-type Selector string
-
-func (s Selector) ApplyActionHandlerOptionTo(opts *Options) {
- opts.Selectors = append(opts.Selectors, s)
-}
-
-type ActionSpec interface {
- runtime.VersionedTypedObject
- SetVersion(string)
- Selector() Selector
- GetConsumerAttributes() common.Properties
-}
-
-type ActionSpecType runtime.VersionedTypedObjectType[ActionSpec]
-
-////////////////////////////////////////////////////////////////////////////////
-// Action Result
-
-type ActionResult interface {
- runtime.VersionedTypedObject
- SetVersion(string)
- SetType(string)
- GetMessage() string
-}
-
-// CommonResult is the minimal action result.
-type CommonResult struct {
- runtime.ObjectVersionedType `json:",inline"`
- Message string `json:"message,omitempty"`
-}
-
-func (r *CommonResult) GetMessage() string {
- return r.Message
-}
-
-func (r *CommonResult) SetType(typ string) {
- r.Type = typ
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// Action Type
-
-type ActionResultType runtime.VersionedTypedObjectType[ActionResult]
-
-type ActionType interface {
- runtime.VersionedTypedObject
- SpecificationType() ActionSpecType
- ResultType() ActionResultType
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// Options Type
-
-type Option interface {
- ApplyActionHandlerOptionTo(*Options)
-}
-
-type Options struct {
- Action string
- Selectors []Selector
- Priority int
- Versions []string
-}
-
-var _ Option = (*Options)(nil)
diff --git a/pkg/contexts/datacontext/action/api/registry.go b/pkg/contexts/datacontext/action/api/registry.go
deleted file mode 100644
index 40b9af6ad..000000000
--- a/pkg/contexts/datacontext/action/api/registry.go
+++ /dev/null
@@ -1,235 +0,0 @@
-package api
-
-import (
- "fmt"
- "sync"
-
- "github.com/mandelsoft/goutils/errors"
- "golang.org/x/exp/slices"
-
- "github.com/open-component-model/ocm/pkg/runtime"
- "github.com/open-component-model/ocm/pkg/utils"
-)
-
-const (
- KIND_ACTION = "action"
- KIND_ACTIONTYPE = "action type"
-)
-
-type ActionTypeRegistry interface {
- RegisterAction(name string, description string, usage string, attrs []string) error
- RegisterActionType(typ ActionType) error
-
- DecodeActionSpec(data []byte, unmarshaler runtime.Unmarshaler) (ActionSpec, error)
- EncodeActionSpec(spec ActionSpec, marshaler runtime.Marshaler) ([]byte, error)
-
- DecodeActionResult(data []byte, unmarshaler runtime.Unmarshaler) (ActionResult, error)
- EncodeActionResult(spec ActionResult, marshaler runtime.Marshaler) ([]byte, error)
-
- GetAction(name string) Action
- SupportedActionVersions(name string) []string
-
- Copy() ActionTypeRegistry
-}
-
-type action struct {
- lock sync.Mutex
- name string
- shortdesc string
- usage string
- attributes []string
- types map[string]ActionType
-}
-
-var _ Action = (*action)(nil)
-
-func (a *action) Name() string {
- return a.name
-}
-
-func (a *action) Description() string {
- return a.shortdesc
-}
-
-func (a *action) Usage() string {
- return a.usage
-}
-
-func (a *action) ConsumerAttributes() []string {
- return a.attributes
-}
-
-func (a *action) GetVersion(v string) ActionType {
- a.lock.Lock()
- defer a.lock.Unlock()
- return a.types[v]
-}
-
-func (a *action) SupportedVersions() []string {
- return utils.StringMapKeys(a.types)
-}
-
-type actionRegistry struct {
- lock sync.Mutex
- actions map[string]*action
- actionspecs runtime.TypeScheme[ActionSpec, ActionSpecType]
- resultspecs runtime.TypeScheme[ActionResult, ActionResultType]
-}
-
-func NewActionTypeRegistry() ActionTypeRegistry {
- return &actionRegistry{
- actions: map[string]*action{},
- actionspecs: runtime.NewTypeScheme[ActionSpec, ActionSpecType](),
- resultspecs: runtime.NewTypeScheme[ActionResult, ActionResultType](),
- }
-}
-
-func (r *actionRegistry) Copy() ActionTypeRegistry {
- r.lock.Lock()
- defer r.lock.Unlock()
-
- actions := map[string]*action{}
-
- for k, v := range r.actions {
- v.lock.Lock()
- a := action{
- name: v.name,
- shortdesc: v.shortdesc,
- usage: v.usage,
- attributes: v.attributes,
- }
- a.types = map[string]ActionType{}
- for _, t := range v.types {
- a.types[t.GetType()] = t
- }
- v.lock.Unlock()
- actions[k] = &a
- }
- actionspecs := runtime.NewTypeScheme[ActionSpec, ActionSpecType]()
- actionspecs.AddKnownTypes(r.actionspecs)
- resultspecs := runtime.NewTypeScheme[ActionResult, ActionResultType]()
- resultspecs.AddKnownTypes(r.resultspecs)
- return &actionRegistry{
- actions: actions,
- actionspecs: actionspecs,
- resultspecs: resultspecs,
- }
-}
-
-func (r *actionRegistry) RegisterAction(name string, description string, usage string, attrs []string) error {
- r.lock.Lock()
- defer r.lock.Unlock()
-
- ai := r.actions[name]
- if ai != nil {
- return errors.ErrAlreadyExists(KIND_ACTION, name)
- }
-
- ai = &action{
- name: name,
- shortdesc: description,
- usage: usage,
- attributes: slices.Clone(attrs),
- types: map[string]ActionType{},
- }
- r.actions[name] = ai
- return nil
-}
-
-func (r *actionRegistry) RegisterActionType(typ ActionType) error {
- r.lock.Lock()
- defer r.lock.Unlock()
-
- k := typ.GetKind()
-
- ai := r.actions[k]
- if ai == nil {
- return errors.ErrNotFound(KIND_ACTION, k)
- }
-
- if typ.SpecificationType().GetType() != typ.ResultType().GetType() {
- return errors.ErrInvalidWrap(fmt.Errorf("version mismatch: request[%s]!=result[%s]", typ.SpecificationType().GetType(), typ.ResultType().GetType()), KIND_ACTIONTYPE, k)
- }
- if typ.SpecificationType().GetKind() != k {
- return errors.ErrInvalidWrap(fmt.Errorf("kind mismatch in types: %s", typ.SpecificationType().GetType()), KIND_ACTIONTYPE, k)
- }
- ai.types[typ.GetVersion()] = typ
- ai.lock.Lock()
- defer ai.lock.Unlock()
- r.actionspecs.Register(typ.SpecificationType())
- r.resultspecs.Register(typ.ResultType())
- return nil
-}
-
-func (r *actionRegistry) GetAction(name string) Action {
- r.lock.Lock()
- defer r.lock.Unlock()
-
- return r.actions[name]
-}
-
-func (r *actionRegistry) DecodeActionSpec(data []byte, unmarshaler runtime.Unmarshaler) (ActionSpec, error) {
- return r.actionspecs.Decode(data, unmarshaler)
-}
-
-func (r *actionRegistry) DecodeActionResult(data []byte, unmarshaler runtime.Unmarshaler) (ActionResult, error) {
- return r.resultspecs.Decode(data, unmarshaler)
-}
-
-func (r *actionRegistry) EncodeActionSpec(spec ActionSpec, marshaler runtime.Marshaler) ([]byte, error) {
- return r.actionspecs.Encode(spec, marshaler)
-}
-
-func (r *actionRegistry) EncodeActionResult(spec ActionResult, marshaler runtime.Marshaler) ([]byte, error) {
- return r.resultspecs.Encode(spec, marshaler)
-}
-
-func (r *actionRegistry) SupportedActionVersions(name string) []string {
- r.lock.Lock()
- defer r.lock.Unlock()
- a := r.actions[name]
- if a == nil {
- return nil
- }
- return a.SupportedVersions()
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-var registry = NewActionTypeRegistry()
-
-func DefaultRegistry() ActionTypeRegistry {
- return registry
-}
-
-func RegisterAction(name string, description string, usage string, attrs []string) error {
- return registry.RegisterAction(name, description, usage, attrs)
-}
-
-func RegisterType(typ ActionType) error {
- return registry.RegisterActionType(typ)
-}
-
-func GetAction(name string) Action {
- return registry.GetAction(name)
-}
-
-func DecodeActionSpec(data []byte, unmarshaler runtime.Unmarshaler) (ActionSpec, error) {
- return registry.DecodeActionSpec(data, unmarshaler)
-}
-
-func EncodeActionSpec(spec ActionSpec, marshaler runtime.Marshaler) ([]byte, error) {
- return registry.EncodeActionSpec(spec, marshaler)
-}
-
-func DecodeActionResult(data []byte, unmarshaler runtime.Unmarshaler) (ActionResult, error) {
- return registry.DecodeActionResult(data, unmarshaler)
-}
-
-func EncodeActionResult(spec ActionResult, marshaler runtime.Marshaler) ([]byte, error) {
- return registry.EncodeActionResult(spec, marshaler)
-}
-
-func SupportedActionVersions(name string) []string {
- return registry.SupportedActionVersions(name)
-}
diff --git a/pkg/contexts/datacontext/action/api/registry_test.go b/pkg/contexts/datacontext/action/api/registry_test.go
deleted file mode 100644
index d5e22c04f..000000000
--- a/pkg/contexts/datacontext/action/api/registry_test.go
+++ /dev/null
@@ -1,100 +0,0 @@
-package api_test
-
-import (
- . "github.com/mandelsoft/goutils/testutils"
- . "github.com/onsi/ginkgo/v2"
- . "github.com/onsi/gomega"
-
- "github.com/open-component-model/ocm/pkg/common"
- "github.com/open-component-model/ocm/pkg/contexts/datacontext"
- "github.com/open-component-model/ocm/pkg/contexts/datacontext/action/api"
- "github.com/open-component-model/ocm/pkg/contexts/datacontext/action/handlers"
- "github.com/open-component-model/ocm/pkg/runtime"
-)
-
-type Handler struct {
- spec api.ActionSpec
- creds common.Properties
-}
-
-func (h *Handler) Handle(spec api.ActionSpec, creds common.Properties) (api.ActionResult, error) {
- h.spec = spec
- h.creds = creds
- r := NewActionResult(spec.(*ActionSpec).Field)
- r.SetVersion("v2")
- return r, nil
-}
-
-var _ handlers.ActionHandler = &Handler{}
-
-var _ = Describe("action registry", func() {
- var registry api.ActionTypeRegistry
-
- BeforeEach(func() {
- registry = api.NewActionTypeRegistry()
- RegisterAction(registry)
- })
-
- Context("plain", func() {
- It("registers", func() {
- Expect(registry.SupportedActionVersions(NAME)).To(Equal([]string{"v1", "v2"}))
- })
-
- It("encoding spec v1", func() {
- spec := NewActionSpec("acme.com")
- spec.SetVersion("v1")
- data := Must(registry.EncodeActionSpec(spec, runtime.DefaultJSONEncoding))
- Expect(string(data)).To(Equal(`{"type":"testAction/v1","field":"acme.com"}`))
- d := Must(registry.DecodeActionSpec(data, runtime.DefaultJSONEncoding))
- Expect(d).To(Equal(spec))
- })
- It("encoding spec v2", func() {
- spec := NewActionSpec("acme.com")
- spec.SetVersion("v2")
- data := Must(registry.EncodeActionSpec(spec, runtime.DefaultJSONEncoding))
- Expect(string(data)).To(Equal(`{"type":"testAction/v2","data":"acme.com"}`))
- d := Must(registry.DecodeActionSpec(data, runtime.DefaultJSONEncoding))
- Expect(d).To(Equal(spec))
- })
-
- It("encoding result v1", func() {
- spec := NewActionResult("successful")
- spec.SetVersion("v1")
- data := Must(registry.EncodeActionResult(spec, runtime.DefaultJSONEncoding))
- Expect(string(data)).To(Equal(`{"type":"testAction/v1","message":"successful"}`))
- d := Must(registry.DecodeActionResult(data, runtime.DefaultJSONEncoding))
- Expect(d).To(Equal(spec))
- })
- It("encoding result v2", func() {
- spec := NewActionResult("successful")
- spec.SetVersion("v2")
- data := Must(registry.EncodeActionResult(spec, runtime.DefaultJSONEncoding))
- Expect(string(data)).To(Equal(`{"type":"testAction/v2","data":"successful"}`))
- d := Must(registry.DecodeActionResult(data, runtime.DefaultJSONEncoding))
- Expect(d).To(Equal(spec))
- })
- })
-
- Context("data context", func() {
- var ctx datacontext.Context
- var handler *Handler
-
- BeforeEach(func() {
- handler = &Handler{}
- ctx = datacontext.NewWithActions(nil, handlers.NewRegistry(registry))
- Expect(ctx.GetActions().GetActionTypes()).To(BeIdenticalTo(registry))
- MustBeSuccessful(ctx.GetActions().Register(handler, handlers.ForAction(NAME), handlers.WithVersions("v2"), handlers.ForSelectors(".*\\.com")))
- })
-
- It("", func() {
- spec := NewActionSpec("acme.com")
- creds := common.Properties{"alice": "bob"}
- r := Must(ctx.GetActions().Execute(spec, creds))
- Expect(handler.spec).To(Equal(spec))
- Expect(handler.creds).To(Equal(creds))
- rs := NewActionResult("acme.com")
- rs.SetVersion("v2")
- Expect(r).To(Equal(rs))
- })
- })
-})
diff --git a/pkg/contexts/datacontext/action/api/utils.go b/pkg/contexts/datacontext/action/api/utils.go
deleted file mode 100644
index 1652b9568..000000000
--- a/pkg/contexts/datacontext/action/api/utils.go
+++ /dev/null
@@ -1,38 +0,0 @@
-package api
-
-import (
- "github.com/open-component-model/ocm/pkg/runtime"
-)
-
-type _Object = runtime.ObjectVersionedTypedObject
-
-type actionType struct {
- _Object
- spectype ActionSpecType
- restype ActionResultType
-}
-
-var _ ActionType = (*actionType)(nil)
-
-func NewActionType[IS ActionSpec, IR ActionResult](kind, version string) ActionType {
- return NewActionTypeByConverter[IS, IS, IR, IR](kind, version, runtime.IdentityConverter[IS]{}, runtime.IdentityConverter[IR]{})
-}
-
-func NewActionTypeByConverter[IS ActionSpec, VS runtime.TypedObject, IR ActionResult, VR runtime.TypedObject](kind, version string, specconv runtime.Converter[IS, VS], resconv runtime.Converter[IR, VR]) ActionType {
- name := runtime.TypeName(kind, version)
- st := runtime.NewVersionedTypedObjectTypeByConverter[ActionSpec, IS, VS](name, specconv)
- rt := runtime.NewVersionedTypedObjectTypeByConverter[ActionResult, IR, VR](name, resconv)
- return &actionType{
- _Object: runtime.NewVersionedTypedObject(kind, version),
- spectype: st,
- restype: rt,
- }
-}
-
-func (a *actionType) SpecificationType() ActionSpecType {
- return a.spectype
-}
-
-func (a *actionType) ResultType() ActionResultType {
- return a.restype
-}
diff --git a/pkg/contexts/datacontext/action/handlers/options.go b/pkg/contexts/datacontext/action/handlers/options.go
deleted file mode 100644
index 3bcb9e82e..000000000
--- a/pkg/contexts/datacontext/action/handlers/options.go
+++ /dev/null
@@ -1,72 +0,0 @@
-package handlers
-
-import (
- "golang.org/x/exp/slices"
-
- "github.com/open-component-model/ocm/pkg/contexts/datacontext/action/api"
-)
-
-type (
- Option = api.Option
- Options = api.Options
-)
-
-func NewOptions(opts ...Option) *Options {
- return api.NewOptions(opts...)
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-type kind struct {
- action string
-}
-
-func ForAction(a string) Option {
- return kind{a}
-}
-
-func (o kind) ApplyActionHandlerOptionTo(opts *Options) {
- opts.Action = o.action
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-type prio struct {
- prio int
-}
-
-func WithPrio(p int) Option {
- return prio{p}
-}
-
-func (o prio) ApplyActionHandlerOptionTo(opts *Options) {
- opts.Priority = o.prio
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-type selectors struct {
- selectors []api.Selector
-}
-
-func ForSelectors(s ...api.Selector) Option {
- return selectors{s}
-}
-
-func (o selectors) ApplyActionHandlerOptionTo(opts *Options) {
- opts.Selectors = append(opts.Selectors, o.selectors...)
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-type versions struct {
- versions []string
-}
-
-func WithVersions(vers ...string) Option {
- return versions{slices.Clone(vers)}
-}
-
-func (o versions) ApplyActionHandlerOptionTo(opts *Options) {
- opts.Versions = append(opts.Versions, o.versions...)
-}
diff --git a/pkg/contexts/datacontext/action/handlers/registry.go b/pkg/contexts/datacontext/action/handlers/registry.go
deleted file mode 100644
index ef8061a75..000000000
--- a/pkg/contexts/datacontext/action/handlers/registry.go
+++ /dev/null
@@ -1,233 +0,0 @@
-package handlers
-
-import (
- "fmt"
- "regexp"
- "sort"
- "strings"
- "sync"
-
- "github.com/mandelsoft/goutils/errors"
- "github.com/mandelsoft/goutils/general"
- "golang.org/x/exp/slices"
-
- "github.com/open-component-model/ocm/pkg/common"
- "github.com/open-component-model/ocm/pkg/contexts/datacontext/action/api"
- "github.com/open-component-model/ocm/pkg/registrations"
- "github.com/open-component-model/ocm/pkg/semverutils"
- "github.com/open-component-model/ocm/pkg/utils"
-)
-
-var defaultHandlers = NewRegistry(api.DefaultRegistry())
-
-func DefaultRegistry() Registry {
- return defaultHandlers
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-type ActionsProvider interface {
- GetActions() Registry
-}
-
-type ActionHandler interface {
- Handle(api.ActionSpec, common.Properties) (api.ActionResult, error)
-}
-
-type ActionHandlerMatch struct {
- Handler ActionHandler
- Version string
- Priority int
-}
-
-type (
- Target = ActionsProvider
- HandlerConfig = registrations.HandlerConfig
- HandlerRegistrationHandler = registrations.HandlerRegistrationHandler[Target, Option]
- HandlerRegistrationRegistry = registrations.HandlerRegistrationRegistry[Target, Option]
-)
-
-func NewHandlerRegistrationRegistry(base ...HandlerRegistrationRegistry) HandlerRegistrationRegistry {
- return registrations.NewHandlerRegistrationRegistry[Target, Option](base...)
-}
-
-type Registry interface {
- registrations.HandlerRegistrationRegistry[Target, Option]
-
- GetActionTypes() api.ActionTypeRegistry
-
- Register(h ActionHandler, opts ...Option) error
- Execute(spec api.ActionSpec, creds common.Properties) (api.ActionResult, error)
- Get(spec api.ActionSpec, possible ...string) []ActionHandlerMatch
- AddTo(t Registry)
-}
-
-type registration struct {
- handler ActionHandler
- versions []string
- priority int
-}
-
-var _ Option = (*registration)(nil)
-
-func (r *registration) ApplyActionHandlerOptionTo(opts *api.Options) {
- opts.Priority = r.priority
-}
-
-type registry struct {
- registrations.HandlerRegistrationRegistry[Target, Option]
- types api.ActionTypeRegistry
-
- lock sync.Mutex
- base Registry
- registrations map[string]map[api.Selector]*registration
-}
-
-var _ Registry = (*registry)(nil)
-
-func NewRegistry(types api.ActionTypeRegistry, base ...Registry) Registry {
- b := utils.Optional(base...)
- if types == nil {
- if b == nil {
- types = api.DefaultRegistry()
- } else {
- types = b.GetActionTypes()
- }
- }
- r := ®istry{
- base: b,
- types: types,
- registrations: map[string]map[api.Selector]*registration{},
- HandlerRegistrationRegistry: NewHandlerRegistrationRegistry(b),
- }
- return r
-}
-
-func (r *registry) GetActionTypes() api.ActionTypeRegistry {
- return r.types
-}
-
-func (r *registry) AddTo(t Registry) {
- r.lock.Lock()
- defer r.lock.Unlock()
-
- if r.base != nil {
- r.base.AddTo(t)
- }
- for k, sel := range r.registrations {
- for s, reg := range sel {
- t.Register(reg.handler, ForAction(k), WithVersions(reg.versions...), s, reg)
- }
- }
-}
-
-func (r *registry) Register(h ActionHandler, olist ...Option) error {
- r.lock.Lock()
- defer r.lock.Unlock()
-
- opts := NewOptions(olist...)
- if opts.Action == "" {
- return fmt.Errorf("action kind required for action handler registration")
- }
-
- kinds := r.registrations[opts.Action]
- if kinds == nil {
- kinds = map[api.Selector]*registration{}
- r.registrations[opts.Action] = kinds
- }
-
- versions := opts.Versions
- if versions == nil {
- versions = r.types.SupportedActionVersions(opts.Action)
- }
- versions = slices.Clone(versions)
- if err := semverutils.SortVersions(versions); err != nil {
- return errors.Wrapf(err, "invalid version set")
- }
- reg := ®istration{
- handler: h,
- versions: versions,
- priority: general.Conditional(opts.Priority >= 0, opts.Priority, 10),
- }
-
- for _, s := range opts.Selectors {
- kinds[s] = reg
- }
- return nil
-}
-
-func (r *registry) Execute(spec api.ActionSpec, creds common.Properties) (api.ActionResult, error) {
- result := r.Get(spec)
- sort.SliceStable(result, func(a, b int) bool {
- return result[a].Priority < result[b].Priority
- })
- if len(result) > 0 {
- spec.SetVersion(result[0].Version)
- return result[0].Handler.Handle(spec, creds)
- }
- return nil, nil
-}
-
-func (r *registry) Get(spec api.ActionSpec, possible ...string) []ActionHandlerMatch {
- if len(possible) == 0 {
- possible = r.GetActionTypes().SupportedActionVersions(spec.GetKind())
- }
-
- r.lock.Lock()
- defer r.lock.Unlock()
-
- var result []ActionHandlerMatch
-
- if kinds := r.registrations[spec.GetKind()]; kinds != nil {
- // first, check direct selctor match
- if reg := kinds[spec.Selector()]; reg != nil {
- if len(reg.versions) != 0 {
- if v := MatchVersion(r.types.SupportedActionVersions(spec.GetKind()), reg.versions); v != "" {
- result = append(result, ActionHandlerMatch{Handler: reg.handler, Version: v, Priority: reg.priority})
- }
- }
- } else {
- // second, try registrations as regexp matcher
- for sel, reg := range kinds {
- s := string(sel)
- e, err := regexp.Compile(s)
- if err == nil {
- t := strings.Trim(s, "^$")
- if t == s {
- e, err = regexp.Compile("^" + s + "$")
- }
- }
- if err == nil {
- if e.MatchString(string(spec.Selector())) {
- if v := MatchVersion(r.types.SupportedActionVersions(spec.GetKind()), reg.versions); v != "" {
- result = append(result, ActionHandlerMatch{Handler: reg.handler, Version: v, Priority: reg.priority})
- }
- }
- }
- }
- }
- }
-
- if r.base != nil {
- result = append(result, r.base.Get(spec, possible...)...)
- }
- return result
-}
-
-func MatchVersion(possible []string, avail []string) string {
- p := slices.Clone(possible)
- a := slices.Clone(avail)
-
- semverutils.SortVersions(p)
- semverutils.SortVersions(a)
- f := ""
- for _, v := range p {
- for _, c := range a {
- if v == c {
- f = c
- break
- }
- }
- }
- return f
-}
diff --git a/pkg/contexts/datacontext/action/type.go b/pkg/contexts/datacontext/action/type.go
deleted file mode 100644
index efdcad6d3..000000000
--- a/pkg/contexts/datacontext/action/type.go
+++ /dev/null
@@ -1,20 +0,0 @@
-package action
-
-import (
- "github.com/open-component-model/ocm/pkg/contexts/datacontext/action/api"
-)
-
-const KIND_ACTION = api.KIND_ACTION
-
-type (
- Selector = api.Selector
- Action = api.Action
- ActionSpec = api.ActionSpec
- ActionResult = api.ActionResult
- ActionType = api.ActionType
- ActionTypeRegistry = api.ActionTypeRegistry
-)
-
-func DefaultRegistry() ActionTypeRegistry {
- return api.DefaultRegistry()
-}
diff --git a/pkg/contexts/datacontext/attrs/clicfgattr/attr.go b/pkg/contexts/datacontext/attrs/clicfgattr/attr.go
deleted file mode 100644
index f2c05406e..000000000
--- a/pkg/contexts/datacontext/attrs/clicfgattr/attr.go
+++ /dev/null
@@ -1,70 +0,0 @@
-package clicfgattr
-
-import (
- "encoding/json"
- "fmt"
-
- "sigs.k8s.io/yaml"
-
- "github.com/open-component-model/ocm/pkg/contexts/config"
- "github.com/open-component-model/ocm/pkg/contexts/datacontext"
- "github.com/open-component-model/ocm/pkg/runtime"
-)
-
-const (
- ATTR_KEY = "ocm.software/cliconfig"
- ATTR_SHORT = "cliconfig"
-)
-
-func init() {
- datacontext.RegisterAttributeType(ATTR_KEY, AttributeType{}, ATTR_SHORT)
-}
-
-type AttributeType struct{}
-
-func (a AttributeType) Name() string {
- return ATTR_KEY
-}
-
-func (a AttributeType) Description() string {
- return `
-*cliconfigr* Configuration Object passed to command line pluging.
-`
-}
-
-func (a AttributeType) Encode(v interface{}, marshaller runtime.Marshaler) ([]byte, error) {
- switch c := v.(type) {
- case config.Config:
- return json.Marshal(v)
- case []byte:
- if _, err := a.Decode(c, nil); err != nil {
- return nil, err
- }
- return c, nil
- default:
- return nil, fmt.Errorf("config object required")
- }
-}
-
-func (a AttributeType) Decode(data []byte, _ runtime.Unmarshaler) (interface{}, error) {
- var c config.GenericConfig
- err := yaml.Unmarshal(data, &c)
- if err != nil {
- return nil, err
- }
- return &c, nil
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-func Get(ctx datacontext.Context) config.Config {
- v := ctx.GetAttributes().GetAttribute(ATTR_KEY)
- if v == nil {
- return nil
- }
- return v.(config.Config)
-}
-
-func Set(ctx datacontext.Context, c config.Config) {
- ctx.GetAttributes().SetAttribute(ATTR_KEY, c)
-}
diff --git a/pkg/contexts/datacontext/attrs/init.go b/pkg/contexts/datacontext/attrs/init.go
deleted file mode 100644
index 471f9f03f..000000000
--- a/pkg/contexts/datacontext/attrs/init.go
+++ /dev/null
@@ -1,8 +0,0 @@
-package attrs
-
-import (
- _ "github.com/open-component-model/ocm/pkg/contexts/datacontext/attrs/logforward"
- _ "github.com/open-component-model/ocm/pkg/contexts/datacontext/attrs/rootcertsattr"
- _ "github.com/open-component-model/ocm/pkg/contexts/datacontext/attrs/tmpcache"
- _ "github.com/open-component-model/ocm/pkg/contexts/datacontext/attrs/vfsattr"
-)
diff --git a/pkg/contexts/datacontext/attrs/logforward/attr.go b/pkg/contexts/datacontext/attrs/logforward/attr.go
deleted file mode 100644
index 3d2151940..000000000
--- a/pkg/contexts/datacontext/attrs/logforward/attr.go
+++ /dev/null
@@ -1,66 +0,0 @@
-package logforward
-
-import (
- "encoding/json"
- "fmt"
-
- logcfg "github.com/mandelsoft/logging/config"
- "sigs.k8s.io/yaml"
-
- "github.com/open-component-model/ocm/pkg/contexts/datacontext"
- "github.com/open-component-model/ocm/pkg/runtime"
-)
-
-const (
- ATTR_KEY = "github.com/mandelsoft/logforward"
- ATTR_SHORT = "logfwd"
-)
-
-func init() {
- datacontext.RegisterAttributeType(ATTR_KEY, AttributeType{}, ATTR_SHORT)
-}
-
-type AttributeType struct{}
-
-func (a AttributeType) Name() string {
- return ATTR_KEY
-}
-
-func (a AttributeType) Description() string {
- return `
-*logconfig* Logging config structure used for config forwarding
-This attribute is used to specify a logging configuration intended
-to be forwarded to other tools.
-(For example: TOI passes this config to the executor)
-`
-}
-
-func (a AttributeType) Encode(v interface{}, marshaller runtime.Marshaler) ([]byte, error) {
- if _, ok := v.(*logcfg.Config); !ok {
- return nil, fmt.Errorf("logging config required")
- }
- return json.Marshal(v)
-}
-
-func (a AttributeType) Decode(data []byte, unmarshaller runtime.Unmarshaler) (interface{}, error) {
- var c logcfg.Config
- err := yaml.Unmarshal(data, &c)
- if err != nil {
- return nil, err
- }
- return &c, nil
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-func Get(ctx datacontext.Context) *logcfg.Config {
- v := ctx.GetAttributes().GetAttribute(ATTR_KEY)
- if v == nil {
- return nil
- }
- return v.(*logcfg.Config)
-}
-
-func Set(ctx datacontext.Context, c *logcfg.Config) {
- ctx.GetAttributes().SetAttribute(ATTR_KEY, c)
-}
diff --git a/pkg/contexts/datacontext/attrs/rootcertsattr/attr.go b/pkg/contexts/datacontext/attrs/rootcertsattr/attr.go
deleted file mode 100644
index bee68ece4..000000000
--- a/pkg/contexts/datacontext/attrs/rootcertsattr/attr.go
+++ /dev/null
@@ -1,148 +0,0 @@
-package rootcertsattr
-
-import (
- "crypto/x509"
- "encoding/json"
- "sync"
-
- "github.com/mandelsoft/goutils/errors"
-
- "github.com/open-component-model/ocm/pkg/contexts/datacontext"
- "github.com/open-component-model/ocm/pkg/runtime"
- "github.com/open-component-model/ocm/pkg/signing/signutils"
-)
-
-const (
- ATTR_KEY = "github.com/mandelsoft/ocm/rootcerts"
- ATTR_SHORT = "rootcerts"
-)
-
-type (
- Context = datacontext.AttributesContext
- ContextProvider = datacontext.ContextProvider
-)
-
-func init() {
- datacontext.RegisterAttributeType(ATTR_KEY, AttributeType{}, ATTR_SHORT)
-}
-
-type AttributeType struct{}
-
-func (a AttributeType) Name() string {
- return ATTR_KEY
-}
-
-func (a AttributeType) Description() string {
- return `
-*JSON*
-General root certificate settings given as JSON document with the following
-format:
-
-
-{
- "rootCertificates"": [
- {
- "data": ""<base64>"
- },
- {
- "path": ""<file path>"
- }
- ],
-
-
-One of following data fields are possible:
-- data: base64 encoded binary data
-- stringdata: plain text data
-- path: a file path to read the data from
-`
-}
-
-func (a AttributeType) Encode(v interface{}, marshaller runtime.Marshaler) ([]byte, error) {
- attr, ok := v.(*Attribute)
- if !ok {
- return nil, errors.ErrInvalid("certificate attribute")
- }
- cfg := New()
-
- attr.lock.Lock()
- defer attr.lock.Unlock()
-
- for _, c := range attr.rootCertificates {
- data := signutils.CertificateToPem(c)
- cfg.AddRootCertificateData(data)
- }
-
- return json.Marshal(cfg)
-}
-
-func (a AttributeType) Decode(data []byte, unmarshaller runtime.Unmarshaler) (interface{}, error) {
- var value Config
- err := unmarshaller.Unmarshal(data, &value)
- if err != nil {
- return nil, err
- }
-
- attr := &Attribute{}
- err = value.ApplyToAttribute(attr)
- if err != nil {
- return nil, err
- }
- return attr, nil
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-type Attribute struct {
- lock sync.Mutex
- rootCertificates []*x509.Certificate
-}
-
-func (a *Attribute) RegisterRootCertificates(cert signutils.GenericCertificateChain) error {
- certs, err := signutils.GetCertificateChain(cert, false)
- if err != nil {
- return err
- }
-
- a.lock.Lock()
- defer a.lock.Unlock()
-
- a.rootCertificates = append(a.rootCertificates, certs...)
- return nil
-}
-
-func (a *Attribute) HasRootCertificates() bool {
- a.lock.Lock()
- defer a.lock.Unlock()
- return len(a.rootCertificates) > 0
-}
-
-func (a *Attribute) GetRootCertPool(system bool) *x509.CertPool {
- var pool *x509.CertPool
-
- if system {
- pool, _ = x509.SystemCertPool()
- }
- if pool == nil {
- pool = x509.NewCertPool()
- }
-
- a.lock.Lock()
- defer a.lock.Unlock()
-
- for _, c := range a.rootCertificates {
- pool.AddCert(c)
- }
- return pool
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-func Get(ctx ContextProvider) *Attribute {
- return ctx.AttributesContext().GetAttributes().GetOrCreateAttribute(ATTR_KEY, func(ctx datacontext.Context) interface{} {
- return &Attribute{}
- }).(*Attribute)
-}
-
-func Set(ctx ContextProvider, attribute *Attribute) error {
- return ctx.AttributesContext().GetAttributes().SetAttribute(ATTR_KEY, attribute)
-}
diff --git a/pkg/contexts/datacontext/attrs/rootcertsattr/attr_test.go b/pkg/contexts/datacontext/attrs/rootcertsattr/attr_test.go
deleted file mode 100644
index ef1515303..000000000
--- a/pkg/contexts/datacontext/attrs/rootcertsattr/attr_test.go
+++ /dev/null
@@ -1,66 +0,0 @@
-package rootcertsattr_test
-
-import (
- "encoding/json"
-
- . "github.com/onsi/ginkgo/v2"
- . "github.com/onsi/gomega"
-
- "github.com/open-component-model/ocm/pkg/contexts/config"
- "github.com/open-component-model/ocm/pkg/contexts/datacontext"
- me "github.com/open-component-model/ocm/pkg/contexts/datacontext/attrs/rootcertsattr"
-)
-
-const NAME = "test"
-
-var certdata = []byte(`
------BEGIN CERTIFICATE-----
-MIIDBDCCAeygAwIBAgIQF+kRr0G+faDEAH5Y4P1J7DANBgkqhkiG9w0BAQsFADAc
-MQwwCgYDVQQKEwNPQ00xDDAKBgNVBAMTA29jbTAeFw0yMzEyMjkxMDIyMzdaFw0y
-NDEyMjgxMDIyMzdaMBwxDDAKBgNVBAoTA09DTTEMMAoGA1UEAxMDb2NtMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvpTQIQFNy23ygef3pshdeNjT7TME
-kPEuqrqcF3KIX1cX16pHMQeU+VzXAFRj3xCy3LAM8ZzLsdHSwZDsIsGdg0nAbGjz
-+USez/9TGC58ktr/84Kh0gHDE28YSVhsnNSrBJcWaBlYZz4Iy89O2Xc4jbK34Cwg
-Si0ES+Ru1lxLD6FSLYLe43wCIjWRJRrMFcua6nI0P4MCpcKmTkXG2/xz80QSobI3
-z/isqOT54FKHW8DZZVlQMOxh+loeLksfEq7EYVkQoUWEV6xyR24TEpMGfxERgDre
-l7lmx8nIFzRMXkot+P19XWfUBgqctVEiDF4DlRE+SvCZsNCrg7nQuC2AZQIDAQAB
-o0IwQDAOBgNVHQ8BAf8EBAMCAqQwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU
-1iQqrWM/bCXMk+5c1bulfI5zlKcwDQYJKoZIhvcNAQELBQADggEBAAQO6lw6ePuX
-E+NyhDYCulueMWHC7GRUKa1KpouFT2yM0BSQnP04VakTlwVO3w4w2KucSVVomHR3
-hTY9Ypx7iGLaqdXHmUZvx3uaTM5IXQKMMWL1LJsxAvuzucehgDlOnFBD91tKsr5o
-VRvRU5ya0igBCnnGpFu7NuH3C9pgF01lrQ3EhUHuNeazxleaE3/uQWmAXfxFB4ci
-gHMKSEk3HuYA1raDJFv4ihwO5pXHvlDhcW0C1oMG9lOCh8TXpVzzBDZiH1kWPWSs
-gW9YBu7/p/22U4++X23RyaheGuysfRAMv9cTv+8T0J8NHaAmQz4/QHFXh+0/tQgU
-EVQVGDF6KNU=
------END CERTIFICATE-----
-`)
-
-var _ = Describe("attribute", func() {
- var cfgctx config.Context
- var ctx me.Context
-
- BeforeEach(func() {
- cfgctx = config.New(datacontext.MODE_DEFAULTED)
- ctx = cfgctx.AttributesContext()
- })
-
- It("marshal/unmarshal", func() {
- cfg := me.New()
- cfg.AddRootCertificateData(certdata)
-
- data, err := json.Marshal(cfg)
- Expect(err).To(Succeed())
-
- r := &me.Config{}
- Expect(json.Unmarshal(data, r)).To(Succeed())
- Expect(r).To(Equal(cfg))
- })
-
- It("applies root certificate", func() {
- cfg := me.New()
- cfg.AddRootCertificateData(certdata)
-
- Expect(cfgctx.ApplyConfig(cfg, "from test")).To(Succeed())
- Expect(me.Get(ctx).HasRootCertificates()).To(BeTrue())
- })
-})
diff --git a/pkg/contexts/datacontext/attrs/rootcertsattr/config.go b/pkg/contexts/datacontext/attrs/rootcertsattr/config.go
deleted file mode 100644
index 4516793c5..000000000
--- a/pkg/contexts/datacontext/attrs/rootcertsattr/config.go
+++ /dev/null
@@ -1,108 +0,0 @@
-package rootcertsattr
-
-import (
- "sync"
-
- "github.com/mandelsoft/goutils/errors"
- "github.com/mandelsoft/vfs/pkg/vfs"
-
- cfgcpi "github.com/open-component-model/ocm/pkg/contexts/config/cpi"
- "github.com/open-component-model/ocm/pkg/runtime"
- "github.com/open-component-model/ocm/pkg/signing/signutils"
- "github.com/open-component-model/ocm/pkg/utils"
-)
-
-const (
- ConfigType = "rootcerts" + cfgcpi.OCM_CONFIG_TYPE_SUFFIX
- ConfigTypeV1 = ConfigType + runtime.VersionSeparator + "v1"
-)
-
-func init() {
- cfgcpi.RegisterConfigType(cfgcpi.NewConfigType[*Config](ConfigType, usage))
- cfgcpi.RegisterConfigType(cfgcpi.NewConfigType[*Config](ConfigTypeV1, usage))
-}
-
-// Config describes a memory based repository interface.
-type Config struct {
- runtime.ObjectVersionedType `json:",inline"`
- RootCertificates []cfgcpi.ContentSpec `json:"rootCertificates,omitempty"`
-}
-
-// New creates a new memory ConfigSpec.
-func New() *Config {
- return &Config{
- ObjectVersionedType: runtime.NewVersionedTypedObject(ConfigType),
- }
-}
-
-func (a *Config) GetType() string {
- return ConfigType
-}
-
-func (a *Config) AddRootCertificateFile(name string, fss ...vfs.FileSystem) {
- a.RootCertificates = append(a.RootCertificates, cfgcpi.ContentSpec{Path: name, FileSystem: utils.Optional(fss...)})
-}
-
-func (a *Config) AddRootCertificateData(data []byte) {
- a.RootCertificates = append(a.RootCertificates, cfgcpi.ContentSpec{Data: data})
-}
-
-func (a *Config) AddRootCertificate(chain signutils.GenericCertificateChain) error {
- certs, err := signutils.GetCertificateChain(chain, false)
- if err != nil {
- return err
- }
- a.RootCertificates = append(a.RootCertificates, cfgcpi.ContentSpec{Data: signutils.CertificateChainToPem(certs), Parsed: certs})
- return nil
-}
-
-func (a *Config) ApplyTo(ctx cfgcpi.Context, target interface{}) error {
- if t, ok := target.(Context); ok {
- if t.AttributesContext().IsAttributesContext() { // apply only to root context
- return errors.Wrapf(a.ApplyToAttribute(Get(t)), "applying config to certattr failed")
- }
- }
- return cfgcpi.ErrNoContext(ConfigType)
-}
-
-func (a *Config) ApplyToAttribute(attr *Attribute) error {
- for i, k := range a.RootCertificates {
- err := attr.RegisterRootCertificates(k)
- if err != nil {
- return errors.Wrapf(err, "invalid certificate %d", i)
- }
- }
- return nil
-}
-
-const usage = `
-The config type ` + ConfigType + ` can be used to define
-general root certificates. A certificate value might be given by one of the fields:
-- path: path of file with key data
-- data: base64 encoded binary data
-- stringdata: data a string parsed by key handler
-
-
- rootCertificates:
- - path: <file path>
-
-
-`
-
-type Appliers struct {
- lock sync.Mutex
- appliers []cfgcpi.ConfigApplier
-}
-
-func (r *Appliers) Register(a ...cfgcpi.ConfigApplier) {
- r.lock.Lock()
- defer r.lock.Unlock()
-
- r.appliers = append(r.appliers, a...)
-}
-
-var DefaultAppliers = &Appliers{}
-
-func RegisterApplier(a ...cfgcpi.ConfigApplier) {
- DefaultAppliers.Register(a...)
-}
diff --git a/pkg/contexts/datacontext/attrs/tmpcache/attr.go b/pkg/contexts/datacontext/attrs/tmpcache/attr.go
deleted file mode 100644
index bbe00a818..000000000
--- a/pkg/contexts/datacontext/attrs/tmpcache/attr.go
+++ /dev/null
@@ -1,104 +0,0 @@
-package tmpcache
-
-import (
- "fmt"
-
- "github.com/mandelsoft/goutils/errors"
- "github.com/mandelsoft/vfs/pkg/vfs"
-
- "github.com/open-component-model/ocm/pkg/contexts/datacontext"
- "github.com/open-component-model/ocm/pkg/contexts/datacontext/attrs/vfsattr"
- "github.com/open-component-model/ocm/pkg/runtime"
- "github.com/open-component-model/ocm/pkg/utils"
-)
-
-const (
- ATTR_KEY = "github.com/mandelsoft/tempblobcache"
- ATTR_SHORT = "blobcache"
-)
-
-func init() {
- datacontext.RegisterAttributeType(ATTR_KEY, AttributeType{}, ATTR_SHORT)
-}
-
-type AttributeType struct{}
-
-func (a AttributeType) Name() string {
- return ATTR_KEY
-}
-
-func (a AttributeType) Description() string {
- return `
-*string* Foldername for temporary blob cache
-The temporary blob cache is used to accessing large blobs from remote sytems.
-The are temporarily stored in the filesystem, instead of the memory, to avoid
-blowing up the memory consumption.
-`
-}
-
-func (a AttributeType) Encode(v interface{}, marshaller runtime.Marshaler) ([]byte, error) {
- if a, ok := v.(*Attribute); !ok {
- return nil, fmt.Errorf("temppcache attribute")
- } else {
- return []byte(a.Path), nil
- }
-}
-
-func (a AttributeType) Decode(data []byte, unmarshaller runtime.Unmarshaler) (interface{}, error) {
- var s string
- err := runtime.DefaultYAMLEncoding.Unmarshal(data, &s)
- if err != nil {
- return nil, errors.Wrapf(err, "invalid attribute value for %s", ATTR_KEY)
- }
- return &Attribute{
- Path: s,
- }, nil
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-type Attribute struct {
- Path string
- Filesystem vfs.FileSystem
-}
-
-func New(path string, fss ...vfs.FileSystem) *Attribute {
- return &Attribute{
- Path: path,
- Filesystem: utils.FileSystem(fss...),
- }
-}
-
-func (a *Attribute) CreateTempFile(pat string) (vfs.File, error) {
- err := a.Filesystem.MkdirAll(a.Path, 0o777)
- if err != nil {
- return nil, err
- }
- return vfs.TempFile(a.Filesystem, a.Path, pat)
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-func Get(ctx datacontext.Context) *Attribute {
- var v interface{}
- var fs vfs.FileSystem
-
- if ctx != nil {
- v = ctx.GetAttributes().GetAttribute(ATTR_KEY)
- fs = utils.FileSystem(vfsattr.Get(ctx))
- }
- fs = utils.FileSystem(fs)
-
- if v != nil {
- a := v.(*Attribute)
- if a.Filesystem == nil {
- a.Filesystem = fs
- }
- return a
- }
- return &Attribute{fs.FSTempDir(), fs}
-}
-
-func Set(ctx datacontext.Context, a *Attribute) {
- ctx.GetAttributes().SetAttribute(ATTR_KEY, a)
-}
diff --git a/pkg/contexts/datacontext/attrs/vfsattr/attr.go b/pkg/contexts/datacontext/attrs/vfsattr/attr.go
deleted file mode 100644
index 4b93bb7c3..000000000
--- a/pkg/contexts/datacontext/attrs/vfsattr/attr.go
+++ /dev/null
@@ -1,62 +0,0 @@
-package vfsattr
-
-import (
- "fmt"
-
- "github.com/mandelsoft/goutils/errors"
- "github.com/mandelsoft/vfs/pkg/osfs"
- "github.com/mandelsoft/vfs/pkg/vfs"
-
- "github.com/open-component-model/ocm/pkg/contexts/datacontext"
- "github.com/open-component-model/ocm/pkg/runtime"
-)
-
-const (
- ATTR_KEY = "github.com/mandelsoft/vfs"
- ATTR_SHORT = "vfs"
-)
-
-func init() {
- datacontext.RegisterAttributeType(ATTR_KEY, AttributeType{}, ATTR_SHORT)
-}
-
-type AttributeType struct{}
-
-func (a AttributeType) Name() string {
- return ATTR_KEY
-}
-
-func (a AttributeType) Description() string {
- return `
-*intern* (not via command line)
-Virtual filesystem to use for command line context.
-`
-}
-
-func (a AttributeType) Encode(v interface{}, marshaller runtime.Marshaler) ([]byte, error) {
- if _, ok := v.(vfs.FileSystem); !ok {
- return nil, fmt.Errorf("vfs.CachingFileSystem required")
- }
- return nil, nil
-}
-
-func (a AttributeType) Decode(data []byte, unmarshaller runtime.Unmarshaler) (interface{}, error) {
- return nil, errors.ErrNotSupported("decode attribute", ATTR_KEY)
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-var _osfs = osfs.New()
-
-func Get(ctx datacontext.Context) vfs.FileSystem {
- v := ctx.GetAttributes().GetAttribute(ATTR_KEY)
- if v == nil {
- return _osfs
- }
- fs, _ := v.(vfs.FileSystem)
- return fs
-}
-
-func Set(ctx datacontext.Context, fs vfs.FileSystem) {
- ctx.GetAttributes().SetAttribute(ATTR_KEY, fs)
-}
diff --git a/pkg/contexts/datacontext/builder.go b/pkg/contexts/datacontext/builder.go
deleted file mode 100644
index bb6a7ae19..000000000
--- a/pkg/contexts/datacontext/builder.go
+++ /dev/null
@@ -1,63 +0,0 @@
-package datacontext
-
-import (
- "context"
-
- "github.com/open-component-model/ocm/pkg/contexts/datacontext/action/api"
- "github.com/open-component-model/ocm/pkg/contexts/datacontext/action/handlers"
-)
-
-type Builder struct {
- ctx context.Context
- attributes Attributes
- actions handlers.Registry
-}
-
-func (b *Builder) getContext() context.Context {
- if b.ctx == nil {
- return context.Background()
- }
- return b.ctx
-}
-
-func (b Builder) WithContext(ctx context.Context) Builder {
- b.ctx = ctx
- return b
-}
-
-func (b Builder) WithAttributes(paranetAttr Attributes) Builder {
- b.attributes = paranetAttr
- return b
-}
-
-func (b Builder) WithActionHandlers(hdlrs handlers.Registry) Builder {
- b.actions = hdlrs
- return b
-}
-
-func (b Builder) Bound() (Context, context.Context) {
- c := b.New()
- return c, context.WithValue(b.getContext(), key, c)
-}
-
-func (b Builder) New(m ...BuilderMode) Context {
- mode := Mode(m...)
-
- if b.actions == nil {
- switch mode {
- case MODE_INITIAL:
- b.actions = handlers.NewRegistry(api.NewActionTypeRegistry())
- case MODE_CONFIGURED:
- b.actions = handlers.NewRegistry(api.DefaultRegistry().Copy())
- handlers.DefaultRegistry().AddTo(b.actions)
- case MODE_EXTENDED:
- b.actions = handlers.NewRegistry(api.DefaultRegistry(), handlers.DefaultRegistry())
- case MODE_DEFAULTED:
- fallthrough
- case MODE_SHARED:
- b.actions = handlers.DefaultRegistry()
- }
- }
-
- return newWithActions(mode, nil, b.actions)
-}
diff --git a/pkg/contexts/datacontext/config/attrs/config_test.go b/pkg/contexts/datacontext/config/attrs/config_test.go
deleted file mode 100644
index 4b4eb7a55..000000000
--- a/pkg/contexts/datacontext/config/attrs/config_test.go
+++ /dev/null
@@ -1,80 +0,0 @@
-package attrs_test
-
-import (
- "fmt"
-
- . "github.com/onsi/ginkgo/v2"
- . "github.com/onsi/gomega"
-
- "github.com/open-component-model/ocm/pkg/contexts/config"
- "github.com/open-component-model/ocm/pkg/contexts/credentials"
- "github.com/open-component-model/ocm/pkg/contexts/datacontext"
- local "github.com/open-component-model/ocm/pkg/contexts/datacontext/config/attrs"
- "github.com/open-component-model/ocm/pkg/runtime"
-)
-
-const ATTR_KEY = "test"
-
-func init() {
- datacontext.RegisterAttributeType(ATTR_KEY, AttributeType{})
-}
-
-type AttributeType struct{}
-
-func (a AttributeType) Name() string {
- return ATTR_KEY
-}
-
-func (a AttributeType) Description() string {
- return `
-A Test attribute.
-`
-}
-
-type Attribute struct {
- Value string `json:"value"`
-}
-
-func (a AttributeType) Encode(v interface{}, marshaller runtime.Marshaler) ([]byte, error) {
- if _, ok := v.(*Attribute); !ok {
- return nil, fmt.Errorf("boolean required")
- }
- return marshaller.Marshal(v)
-}
-
-func (a AttributeType) Decode(data []byte, unmarshaller runtime.Unmarshaler) (interface{}, error) {
- var value Attribute
- err := unmarshaller.Unmarshal(data, &value)
- return &value, err
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-var _ = Describe("generic attributes", func() {
- attribute := &Attribute{"TEST"}
- var ctx config.Context
-
- BeforeEach(func() {
- ctx = config.WithSharedAttributes(datacontext.New(nil)).New()
- })
-
- Context("applies", func() {
- It("applies later attribute config", func() {
- sub := credentials.WithConfigs(ctx).New()
- spec := local.New()
- Expect(spec.AddAttribute(ATTR_KEY, attribute)).To(Succeed())
- Expect(ctx.ApplyConfig(spec, "test")).To(Succeed())
-
- Expect(sub.GetAttributes().GetAttribute(ATTR_KEY, nil)).To(Equal(attribute))
- })
-
- It("applies earlier attribute config", func() {
- spec := local.New()
- Expect(spec.AddAttribute(ATTR_KEY, attribute)).To(Succeed())
- Expect(ctx.ApplyConfig(spec, "test")).To(Succeed())
-
- sub := credentials.WithConfigs(ctx).New()
- Expect(sub.GetAttributes().GetAttribute(ATTR_KEY, nil)).To(Equal(attribute))
- })
- })
-})
diff --git a/pkg/contexts/datacontext/config/attrs/type.go b/pkg/contexts/datacontext/config/attrs/type.go
deleted file mode 100644
index 3e8f3eeb6..000000000
--- a/pkg/contexts/datacontext/config/attrs/type.go
+++ /dev/null
@@ -1,87 +0,0 @@
-package attrs
-
-import (
- "encoding/json"
-
- "github.com/mandelsoft/goutils/errors"
-
- cfgcpi "github.com/open-component-model/ocm/pkg/contexts/config/cpi"
- "github.com/open-component-model/ocm/pkg/contexts/datacontext"
- "github.com/open-component-model/ocm/pkg/runtime"
-)
-
-const (
- ConfigType = "attributes" + cfgcpi.OCM_CONFIG_TYPE_SUFFIX
- ConfigTypeV1 = ConfigType + runtime.VersionSeparator + "v1"
-)
-
-func init() {
- cfgcpi.RegisterConfigType(cfgcpi.NewConfigType[*Config](ConfigType, usage))
- cfgcpi.RegisterConfigType(cfgcpi.NewConfigType[*Config](ConfigTypeV1, usage))
-}
-
-// Config describes a memory based repository interface.
-type Config struct {
- runtime.ObjectVersionedType `json:",inline"`
- // Attributes descibe a set of geeric attribute settings
- Attributes map[string]json.RawMessage `json:"attributes,omitempty"`
-}
-
-// New creates a new memory ConfigSpec.
-func New() *Config {
- return &Config{
- ObjectVersionedType: runtime.NewVersionedTypedObject(ConfigType),
- Attributes: map[string]json.RawMessage{},
- }
-}
-
-func (a *Config) GetType() string {
- return ConfigType
-}
-
-func (a *Config) AddAttribute(attr string, value interface{}) error {
- data, err := datacontext.DefaultAttributeScheme.Encode(attr, value, runtime.DefaultJSONEncoding)
- if err == nil {
- a.Attributes[attr] = data
- }
- return err
-}
-
-func (a *Config) AddRawAttribute(attr string, data []byte) error {
- _, err := datacontext.DefaultAttributeScheme.Decode(attr, data, runtime.DefaultJSONEncoding)
- if err == nil {
- a.Attributes[attr] = data
- }
- return err
-}
-
-func (a *Config) ApplyTo(ctx cfgcpi.Context, target interface{}) error {
- list := errors.ErrListf("applying config")
- t, ok := target.(cfgcpi.Context)
- if !ok {
- return cfgcpi.ErrNoContext(ConfigType)
- }
- if a.Attributes == nil {
- return nil
- }
- for a, e := range a.Attributes {
- eff := datacontext.DefaultAttributeScheme.Shortcuts()[a]
- if eff != "" {
- a = eff
- }
- list.Add(errors.Wrapf(t.GetAttributes().SetEncodedAttribute(a, e, runtime.DefaultJSONEncoding), "attribute %q", a))
- }
- return list.Result()
-}
-
-const usage = `
-The config type ` + ConfigType + ` can be used to define a list
-of arbitrary attribute specifications:
-
-
- type: ` + ConfigType + `
- attributes:
- <name>: <yaml defining the attribute>
- ...
-
-`
diff --git a/pkg/contexts/datacontext/config/init.go b/pkg/contexts/datacontext/config/init.go
deleted file mode 100644
index 3235db34f..000000000
--- a/pkg/contexts/datacontext/config/init.go
+++ /dev/null
@@ -1,6 +0,0 @@
-package config
-
-import (
- _ "github.com/open-component-model/ocm/pkg/contexts/datacontext/config/attrs"
- _ "github.com/open-component-model/ocm/pkg/contexts/datacontext/config/logging"
-)
diff --git a/pkg/contexts/datacontext/config/logging/config_test.go b/pkg/contexts/datacontext/config/logging/config_test.go
deleted file mode 100644
index d57a017c7..000000000
--- a/pkg/contexts/datacontext/config/logging/config_test.go
+++ /dev/null
@@ -1,240 +0,0 @@
-package logging_test
-
-import (
- "bytes"
-
- . "github.com/mandelsoft/goutils/testutils"
- . "github.com/onsi/ginkgo/v2"
- . "github.com/onsi/gomega"
- . "github.com/open-component-model/ocm/pkg/logging/testhelper"
-
- "github.com/mandelsoft/logging"
- "github.com/tonglil/buflogr"
-
- "github.com/open-component-model/ocm/pkg/contexts/config"
- "github.com/open-component-model/ocm/pkg/contexts/datacontext"
- logcfg "github.com/open-component-model/ocm/pkg/contexts/datacontext/config/logging"
- log "github.com/open-component-model/ocm/pkg/logging"
-)
-
-var _ = Describe("logging configuration", func() {
- var ctx datacontext.AttributesContext
- var cfg config.Context
- var buf bytes.Buffer
- var orig logging.Context
-
- BeforeEach(func() {
- orig = logging.DefaultContext().(*logging.ContextReference).Context
- logging.SetDefaultContext(logging.NewDefault())
- log.SetContext(nil)
- ctx = datacontext.New(nil)
- cfg = config.WithSharedAttributes(ctx).New()
-
- buf.Reset()
- def := buflogr.NewWithBuffer(&buf)
- ctx.LoggingContext().SetBaseLogger(def)
- })
-
- AfterEach(func() {
- // logging.SetDefaultContext(orig)
- })
- _ = cfg
- _ = orig
-
- It("just logs with defaults", func() {
- LogTest(ctx)
-
- Expect(buf.String()).To(StringEqualTrimmedWithContext(`
-V[3] info realm ocm
-V[2] warn realm ocm
-ERROR error realm ocm
-`))
- })
-
- It("just logs with settings from default context", func() {
- logging.DefaultContext().AddRule(logging.NewConditionRule(logging.DebugLevel))
- LogTest(ctx)
-
- Expect(buf.String()).To(StringEqualTrimmedWithContext(`
-V[4] debug realm ocm
-V[3] info realm ocm
-V[2] warn realm ocm
-ERROR error realm ocm
-`))
- })
-
- It("just logs with settings from default context", func() {
- logging.DefaultContext().AddRule(logging.NewConditionRule(logging.DebugLevel))
- LogTest(cfg)
-
- Expect(buf.String()).To(StringEqualTrimmedWithContext(`
-V[4] debug realm ocm
-V[3] info realm ocm
-V[2] warn realm ocm
-ERROR error realm ocm
-`))
- })
-
- It("just logs with settings for root context", func() {
- spec := `
-type: ` + logcfg.ConfigTypeV1 + `
-contextType: ` + datacontext.CONTEXT_TYPE + `
-settings:
- rules:
- - rule:
- level: Debug
-`
- _, err := cfg.ApplyData([]byte(spec), nil, "testconfig")
- Expect(err).To(Succeed())
- LogTest(ctx)
- LogTest(cfg, "cfg")
-
- Expect(buf.String()).To(StringEqualTrimmedWithContext(`
-V[4] debug realm ocm
-V[3] info realm ocm
-V[2] warn realm ocm
-ERROR error realm ocm
-V[4] cfgdebug realm ocm
-V[3] cfginfo realm ocm
-V[2] cfgwarn realm ocm
-ERROR cfgerror realm ocm
-`))
- })
-
- It("just logs with settings for root context by context provider", func() {
- spec := `
-type: ` + logcfg.ConfigTypeV1 + `
-settings:
- rules:
- - rule:
- level: Debug
-`
- _, err := cfg.ApplyData([]byte(spec), nil, "testconfig")
- Expect(err).To(Succeed())
-
- LogTest(ctx)
- LogTest(cfg, "cfg")
-
- Expect(buf.String()).To(StringEqualTrimmedWithContext(`
-V[4] debug realm ocm
-V[3] info realm ocm
-V[2] warn realm ocm
-ERROR error realm ocm
-V[4] cfgdebug realm ocm
-V[3] cfginfo realm ocm
-V[2] cfgwarn realm ocm
-ERROR cfgerror realm ocm
-`))
- })
-
- It("just logs with settings for config context", func() {
- spec := `
-type: ` + logcfg.ConfigTypeV1 + `
-contextType: ` + config.CONTEXT_TYPE + `
-settings:
- rules:
- - rule:
- level: Debug
-`
- _, err := cfg.ApplyData([]byte(spec), nil, "testconfig")
- Expect(err).To(Succeed())
-
- LogTest(ctx)
- LogTest(cfg, "cfg")
-
- Expect(buf.String()).To(StringEqualTrimmedWithContext(`
-V[3] info realm ocm
-V[2] warn realm ocm
-ERROR error realm ocm
-V[4] cfgdebug realm ocm
-V[3] cfginfo realm ocm
-V[2] cfgwarn realm ocm
-ERROR cfgerror realm ocm
-`))
- })
-
- Context("default logging", func() {
- spec1 := `
-type: ` + logcfg.ConfigTypeV1 + `
-contextType: default
-settings:
- rules:
- - rule:
- level: Debug
-`
- spec2 := `
-type: ` + logcfg.ConfigTypeV1 + `
-contextType: default
-settings:
- rules:
- - rule:
- level: Info
-`
- spec3 := `
-type: ` + logcfg.ConfigTypeV1 + `
-contextType: default
-extraId: extra
-settings:
- rules:
- - rule:
- level: Debug
-`
-
- var ctx logging.Context
-
- BeforeEach(func() {
- log.SetContext(logging.NewDefault())
- buf.Reset()
- def := buflogr.NewWithBuffer(&buf)
- ctx = log.Context()
- ctx.SetBaseLogger(def)
- })
-
- It("just logs with config", func() {
- _, err := cfg.ApplyData([]byte(spec1), nil, "spec1")
- Expect(err).To(Succeed())
- LogTest(ctx)
-
- Expect(buf.String()).To(StringEqualTrimmedWithContext(`
-V[4] debug realm ocm
-V[3] info realm ocm
-V[2] warn realm ocm
-ERROR error realm ocm
-`))
- })
-
- It("applies config once", func() {
- _, err := cfg.ApplyData([]byte(spec1), nil, "spec1")
- Expect(err).To(Succeed())
- _, err = cfg.ApplyData([]byte(spec2), nil, "spec2")
- Expect(err).To(Succeed())
- _, err = cfg.ApplyData([]byte(spec1), nil, "spec1.2")
- Expect(err).To(Succeed())
-
- LogTest(ctx)
-
- Expect(buf.String()).To(StringEqualTrimmedWithContext(`
-V[3] info realm ocm
-V[2] warn realm ocm
-ERROR error realm ocm
-`))
- })
- It("re-applies config with extra id", func() {
- _, err := cfg.ApplyData([]byte(spec1), nil, "spec1")
- Expect(err).To(Succeed())
- _, err = cfg.ApplyData([]byte(spec2), nil, "spec2")
- Expect(err).To(Succeed())
- _, err = cfg.ApplyData([]byte(spec3), nil, "spec3")
- Expect(err).To(Succeed())
-
- LogTest(ctx)
-
- Expect(buf.String()).To(StringEqualTrimmedWithContext(`
-V[4] debug realm ocm
-V[3] info realm ocm
-V[2] warn realm ocm
-ERROR error realm ocm
-`))
- })
- })
-})
diff --git a/pkg/contexts/datacontext/config/logging/type.go b/pkg/contexts/datacontext/config/logging/type.go
deleted file mode 100644
index f4f13f488..000000000
--- a/pkg/contexts/datacontext/config/logging/type.go
+++ /dev/null
@@ -1,139 +0,0 @@
-package logging
-
-import (
- "github.com/mandelsoft/logging"
- logcfg "github.com/mandelsoft/logging/config"
-
- logdata "github.com/open-component-model/ocm/pkg/cobrautils/logopts/logging"
- "github.com/open-component-model/ocm/pkg/contexts/config/cpi"
- "github.com/open-component-model/ocm/pkg/contexts/datacontext"
- local "github.com/open-component-model/ocm/pkg/logging"
- "github.com/open-component-model/ocm/pkg/runtime"
-)
-
-const (
- ConfigType = "logging" + cpi.OCM_CONFIG_TYPE_SUFFIX
- ConfigTypeV1 = ConfigType + runtime.VersionSeparator + "v1"
-)
-
-func init() {
- cpi.RegisterConfigType(cpi.NewConfigType[*Config](ConfigType, usage))
- cpi.RegisterConfigType(cpi.NewConfigType[*Config](ConfigTypeV1, usage))
-}
-
-// Config describes logging settings for a dedicated context type.
-type Config struct {
- runtime.ObjectVersionedType `json:",inline"`
-
- // ContextType described the context type to apply the setting.
- // If not set, the settings will be applied to any logging context provider,
- // which are not derived contexts.
- ContextType string `json:"contextType,omitempty"`
- Settings logcfg.Config `json:"settings"`
-
- // ExtraId is used for the context type "default", "ocm" or "global" to be able
- // to reapply the same config again using a different
- // identity given by the settings hash + the id.
- ExtraId string `json:"extraId,omitempty"`
-}
-
-// New creates a logging config specification.
-func New(ctxtype string, deflvl int) *Config {
- return &Config{
- ObjectVersionedType: runtime.NewVersionedTypedObject(ConfigType),
- ContextType: ctxtype,
- Settings: logcfg.Config{
- DefaultLevel: logging.LevelName(deflvl),
- },
- }
-}
-
-// NewWithConfig creates a logging config specification from a
-// logging config object.
-func NewWithConfig(ctxtype string, cfg *logcfg.Config) *Config {
- return &Config{
- ObjectVersionedType: runtime.NewVersionedTypedObject(ConfigType),
- ContextType: ctxtype,
- Settings: *cfg,
- }
-}
-
-func (c *Config) AddRuleSpec(r logcfg.Rule) error {
- c.Settings.Rules = append(c.Settings.Rules, r)
- return nil
-}
-
-func (c *Config) GetType() string {
- return ConfigType
-}
-
-func (c *Config) ApplyTo(ctx cpi.Context, target interface{}) error {
- // first: check for forward configuration
- if lc, ok := target.(*logdata.LoggingConfiguration); ok {
- switch c.ContextType {
- case "default", "ocm", "global", "slave":
- lc.LogConfig.DefaultLevel = c.Settings.DefaultLevel
- lc.LogConfig.Rules = append(lc.LogConfig.Rules, c.Settings.Rules...)
- }
- return nil
- }
-
- // second: main use case is to configure vrious logging contexts
- switch c.ContextType {
- // configure local static logging context.
- // here, config is only applied once for every
- // setting hash.
- case "default":
- return local.Configure(&c.Settings, c.ExtraId)
-
- case "ocm":
- return local.ConfigureOCM(&c.Settings, c.ExtraId)
-
- case "global":
- return local.ConfigureGlobal(&c.Settings, c.ExtraId)
-
- case "slave":
- return nil
-
- // configure logging context providers.
- case "":
- if _, ok := target.(datacontext.AttributesContext); !ok {
- return cpi.ErrNoContext("attribute context")
- }
-
- // configure dedicated context types.
- default:
- dc, ok := target.(datacontext.Context)
- if !ok {
- return cpi.ErrNoContext("data context")
- }
- if dc.GetType() != c.ContextType {
- return cpi.ErrNoContext(c.ContextType)
- }
- }
- lctx, ok := target.(logging.ContextProvider)
- if !ok {
- return cpi.ErrNoContext("logging context")
- }
- return logcfg.DefaultRegistry().Configure(lctx.LoggingContext(), &c.Settings)
-}
-
-const usage = `
-The config type ` + ConfigType + ` can be used to configure the logging
-aspect of a dedicated context type:
-
-
- type: ` + ConfigType + `
- contextType: ` + datacontext.CONTEXT_TYPE + `
- settings:
- defaultLevel: Info
- rules:
- - ...
-
-
-The context type ` + datacontext.CONTEXT_TYPE + ` is the root context of a
-context hierarchy.
-
-If no context type is specified, the config will be applies to any target
-acting as logging context provider, which is not a non-root context.
-`
diff --git a/pkg/contexts/datacontext/context.go b/pkg/contexts/datacontext/context.go
deleted file mode 100644
index d12eedbb7..000000000
--- a/pkg/contexts/datacontext/context.go
+++ /dev/null
@@ -1,412 +0,0 @@
-package datacontext
-
-import (
- "context"
- "fmt"
- "io"
- "reflect"
- "sync"
-
- "github.com/mandelsoft/goutils/errors"
- "github.com/mandelsoft/goutils/finalizer"
- "github.com/mandelsoft/logging"
-
- "github.com/open-component-model/ocm/pkg/common"
- "github.com/open-component-model/ocm/pkg/contexts/datacontext/action/handlers"
- ocmlog "github.com/open-component-model/ocm/pkg/logging"
- "github.com/open-component-model/ocm/pkg/refmgmt"
- "github.com/open-component-model/ocm/pkg/runtime"
- "github.com/open-component-model/ocm/pkg/runtimefinalizer"
- "github.com/open-component-model/ocm/pkg/utils"
-)
-
-const OCM_CONTEXT_SUFFIX = ".context" + common.OCM_TYPE_GROUP_SUFFIX
-
-// BuilderMode controls the handling of unset information in the
-// builder configuration when calling the New method.
-type BuilderMode int
-
-const (
- // MODE_SHARED uses the default contexts for unset nested context types.
- MODE_SHARED BuilderMode = iota
- // MODE_DEFAULTED uses dedicated context instances configured with the
- // context type specific default registrations.
- MODE_DEFAULTED
- // MODE_EXTENDED uses dedicated context instances configured with
- // context type registrations extending the default registrations.
- MODE_EXTENDED
- // MODE_CONFIGURED uses dedicated context instances configured with the
- // context type registrations configured with the actual state of the
- // default registrations.
- MODE_CONFIGURED
- // MODE_INITIAL uses completely new contexts for unset nested context types
- // and initial registrations.
- MODE_INITIAL
-)
-
-const MULTI_REF = false
-
-func (m BuilderMode) String() string {
- switch m {
- case MODE_SHARED:
- return "shared"
- case MODE_DEFAULTED:
- return "defaulted"
- case MODE_EXTENDED:
- return "extended"
- case MODE_CONFIGURED:
- return "configured"
- case MODE_INITIAL:
- return "initial"
- default:
- return fmt.Sprintf("(invalid %d)", m)
- }
-}
-
-func Mode(m ...BuilderMode) BuilderMode {
- return utils.OptionalDefaulted(MODE_EXTENDED, m...)
-}
-
-type ContextIdentity = runtimefinalizer.ObjectIdentity
-
-type ContextProvider interface {
- // AttributesContext returns the shared attributes
- AttributesContext() AttributesContext
-}
-
-// Delegates is the interface for common
-// Context features, which might be delegated
-// to aggregated contexts.
-type Delegates interface {
- ocmlog.LogProvider
- handlers.ActionsProvider
-}
-
-type _delegates struct {
- logging logging.Context
- actions handlers.Registry
-}
-
-func (d _delegates) LoggingContext() logging.Context {
- return d.logging
-}
-
-func (d _delegates) AttributionContext() logging.AttributionContext {
- return d.logging.AttributionContext()
-}
-
-func (d _delegates) Logger(messageContext ...logging.MessageContext) logging.Logger {
- return d.logging.Logger(messageContext)
-}
-
-func (d _delegates) GetActions() handlers.Registry {
- return d.actions
-}
-
-func ComposeDelegates(l logging.Context, a handlers.Registry) Delegates {
- return _delegates{l, a}
-}
-
-type ContextBinder interface {
- // BindTo binds the context to a context.Context and makes it
- // retrievable by a ForContext method
- BindTo(ctx context.Context) context.Context
-}
-
-// Context describes a common interface for a data context used for a dedicated
-// purpose.
-// Such has a type and always specific attribute store.
-// Every Context can be bound to a context.Context.
-type Context interface {
- ContextBinder
- ContextProvider
- Delegates
-
- IsIdenticalTo(Context) bool
-
- // GetType returns the context type
- GetType() string
- GetId() ContextIdentity
-
- GetAttributes() Attributes
-
- Finalize() error
- Finalizer() *finalizer.Finalizer
-}
-
-type InternalContext interface {
- Context
- runtimefinalizer.RecorderProvider
- GetKey() interface{}
- GetAllocatable() refmgmt.Allocatable
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-// CONTEXT_TYPE is the global type for an attribute context.
-const CONTEXT_TYPE = "attributes" + OCM_CONTEXT_SUFFIX
-
-type AttributesContext interface {
- Context
-
- IsAttributesContext() bool
- AttributesContext() AttributesContext
-
- BindTo(ctx context.Context) context.Context
-}
-
-// AttributeFactory is used to atomicly create a new attribute for a context.
-type AttributeFactory func(Context) interface{}
-
-type Attributes interface {
- finalizer.Finalizable
-
- GetAttribute(name string, def ...interface{}) interface{}
- SetAttribute(name string, value interface{}) error
- SetEncodedAttribute(name string, data []byte, unmarshaller runtime.Unmarshaler) error
- GetOrCreateAttribute(name string, creator AttributeFactory) interface{}
-}
-
-// DefaultContext is the default context initialized by init functions.
-var DefaultContext = NewWithActions(nil, handlers.DefaultRegistry())
-
-// ForContext returns the Context to use for context.Context.
-// This is either an explicit context or the default context.
-func ForContext(ctx context.Context) AttributesContext {
- c, _ := ForContextByKey(ctx, key, DefaultContext)
- if c == nil {
- return nil
- }
- return c.(AttributesContext)
-}
-
-// WithContext create a new Context bound to a context.Context.
-func WithContext(ctx context.Context, parentAttrs Attributes) (Context, context.Context) {
- c := New(parentAttrs)
- return c, c.BindTo(ctx)
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-type Updater interface {
- Update() error
-}
-
-type UpdateFunc func() error
-
-func (u UpdateFunc) Update() error {
- return u()
-}
-
-type delegates = Delegates
-
-////////////////////////////////////////////////////////////////////////////////
-
-var key = reflect.TypeOf(_context{})
-
-type _context struct {
- *contextBase
- updater Updater
-}
-
-// gcWrapper is used as garbage collectable
-// wrapper for a context implementation
-// to establish a runtime finalizer.
-type gcWrapper struct {
- GCWrapper
- *_context
-}
-
-func newView(c *_context, ref ...bool) AttributesContext {
- if utils.Optional(ref...) {
- return FinalizedContext[gcWrapper](c)
- }
- return c
-}
-
-func (w *gcWrapper) SetContext(c *_context) {
- w._context = c
-}
-
-var (
- _ Context = (*_context)(nil)
- _ ViewCreator[AttributesContext] = (*_context)(nil)
-)
-
-// New provides a root attribute context.
-func New(parentAttrs ...Attributes) AttributesContext {
- return NewWithActions(utils.Optional(parentAttrs...), handlers.NewRegistry(nil, handlers.DefaultRegistry()))
-}
-
-func NewWithActions(parentAttrs Attributes, actions handlers.Registry) AttributesContext {
- return newWithActions(MODE_DEFAULTED, parentAttrs, actions)
-}
-
-func newWithActions(mode BuilderMode, parentAttrs Attributes, actions handlers.Registry) AttributesContext {
- c := &_context{}
- c.contextBase = newContextBase(c, CONTEXT_TYPE, key, parentAttrs, &c.updater,
- ComposeDelegates(logging.NewWithBase(ocmlog.Context()), handlers.NewRegistry(nil, actions)),
- )
- return SetupContext(mode, c.CreateView()) // see above
-}
-
-func (c *_context) CreateView() AttributesContext {
- return newView(c, true)
-}
-
-func (c *_context) AttributesContext() AttributesContext {
- if c.updater != nil {
- c.updater.Update()
- }
- return newView(c)
-}
-
-func (c *_context) IsAttributesContext() bool {
- return true
-}
-
-func (c *_context) Actions() handlers.Registry {
- if c.updater != nil {
- c.updater.Update()
- }
- return c.contextBase.GetActions()
-}
-
-func (c *_context) LoggingContext() logging.Context {
- if c.updater != nil {
- c.updater.Update()
- }
- return c.contextBase.LoggingContext()
-}
-
-func (c *_context) Logger(messageContext ...logging.MessageContext) logging.Logger {
- if c.updater != nil {
- c.updater.Update()
- }
- return c.contextBase.Logger(messageContext...)
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-var contextrange, attrsrange = runtimefinalizer.NumberRange{}, runtimefinalizer.NumberRange{}
-
-type _attributes struct {
- sync.RWMutex
- id uint64
- ctx Context
- parent Attributes
- updater *Updater
- attributes map[string]interface{}
-}
-
-var _ Attributes = &_attributes{}
-
-func NewAttributes(ctx Context, parent Attributes, updater *Updater) Attributes {
- return newAttributes(ctx, parent, updater)
-}
-
-func newAttributes(ctx Context, parent Attributes, updater *Updater) *_attributes {
- return &_attributes{
- id: attrsrange.NextId(),
- ctx: ctx,
- parent: parent,
- updater: updater,
- attributes: map[string]interface{}{},
- }
-}
-
-func (c *_attributes) Finalize() error {
- list := errors.ErrListf("finalizing attributes")
- for n, a := range c.attributes {
- if f, ok := a.(finalizer.Finalizable); ok {
- list.Addf(nil, f.Finalize(), "attribute %s", n)
- }
- }
- return list.Result()
-}
-
-func (c *_attributes) GetAttribute(name string, def ...interface{}) interface{} {
- if *c.updater != nil {
- (*c.updater).Update()
- }
- c.RLock()
- defer c.RUnlock()
- if a := c.attributes[name]; a != nil {
- return a
- }
- if c.parent != nil {
- if a := c.parent.GetAttribute(name); a != nil {
- return a
- }
- }
- return utils.Optional(def...)
-}
-
-func (c *_attributes) SetEncodedAttribute(name string, data []byte, unmarshaller runtime.Unmarshaler) error {
- s := DefaultAttributeScheme.Shortcuts()[name]
- if s != "" {
- name = s
- }
- v, err := DefaultAttributeScheme.Decode(name, data, unmarshaller)
- if err != nil {
- return err
- }
- c.SetAttribute(name, v)
- return nil
-}
-
-func (c *_attributes) setAttribute(name string, value interface{}) error {
- c.Lock()
- defer c.Unlock()
-
- _, err := DefaultAttributeScheme.Encode(name, value, nil)
- if err != nil && !errors.IsErrUnknownKind(err, "attribute") {
- return err
- }
- old := c.attributes[name]
- if old != nil && old != value {
- if c, ok := old.(io.Closer); ok {
- c.Close()
- }
- }
- value, err = DefaultAttributeScheme.Convert(name, value)
- if err != nil && !errors.IsErrUnknownKind(err, "attribute") {
- return err
- }
- c.attributes[name] = value
- return nil
-}
-
-func (c *_attributes) SetAttribute(name string, value interface{}) error {
- err := c.setAttribute(name, value)
- if err == nil {
- if *c.updater != nil {
- (*c.updater).Update()
- }
- }
- return err
-}
-
-func (c *_attributes) getOrCreateAttribute(name string, creator AttributeFactory) interface{} {
- c.Lock()
- defer c.Unlock()
- if v := c.attributes[name]; v != nil {
- return v
- }
- if c.parent != nil {
- if v := c.parent.GetAttribute(name); v != nil {
- return v
- }
- }
- v := creator(c.ctx)
- c.attributes[name] = v
- return v
-}
-
-func (c *_attributes) GetOrCreateAttribute(name string, creator AttributeFactory) interface{} {
- r := c.getOrCreateAttribute(name, creator)
- if *c.updater != nil {
- (*c.updater).Update()
- }
- return r
-}
diff --git a/pkg/contexts/datacontext/context_test.go b/pkg/contexts/datacontext/context_test.go
deleted file mode 100644
index 11e97cf1b..000000000
--- a/pkg/contexts/datacontext/context_test.go
+++ /dev/null
@@ -1,23 +0,0 @@
-package datacontext_test
-
-import (
- . "github.com/onsi/ginkgo/v2"
- . "github.com/onsi/gomega"
-
- me "github.com/open-component-model/ocm/pkg/contexts/datacontext"
-)
-
-var _ = Describe("area test", func() {
- It("can be garbage collected", func() {
- // ocmlog.Context().AddRule(logging.NewConditionRule(logging.DebugLevel, me.Realm))
-
- ctx := me.New()
- Expect(ctx.IsIdenticalTo(ctx)).To(BeTrue())
-
- ctx2 := ctx.AttributesContext()
- Expect(ctx.IsIdenticalTo(ctx2)).To(BeTrue())
-
- ctx3 := me.New()
- Expect(ctx.IsIdenticalTo(ctx3)).To(BeFalse())
- })
-})
diff --git a/pkg/contexts/datacontext/gc_test.go b/pkg/contexts/datacontext/gc_test.go
deleted file mode 100644
index 23022c9ff..000000000
--- a/pkg/contexts/datacontext/gc_test.go
+++ /dev/null
@@ -1,92 +0,0 @@
-package datacontext_test
-
-import (
- "runtime"
- "time"
-
- . "github.com/onsi/ginkgo/v2"
- . "github.com/onsi/gomega"
-
- "github.com/mandelsoft/goutils/general"
-
- me "github.com/open-component-model/ocm/pkg/contexts/datacontext"
- "github.com/open-component-model/ocm/pkg/runtimefinalizer"
-)
-
-var _ = Describe("area test", func() {
- It("can be garbage collected", func() {
- ctx := me.New()
- r := runtimefinalizer.GetRuntimeFinalizationRecorder(ctx)
- id := ctx.GetId()
- Expect(me.GetContextRefCount(ctx)).To(Equal(1))
- ctx = nil
- runtime.GC()
- time.Sleep(time.Second)
- Expect(r.Get()).To(ConsistOf(id))
- })
-
- It("provides second reference", func() {
- // ocmlog.Context().AddRule(logging.NewConditionRule(logging.DebugLevel, me.Realm))
- multiRefs := general.Conditional(me.MULTI_REF, 2, 1)
-
- ctx := me.New()
- Expect(me.GetContextRefCount(ctx)).To(Equal(1))
-
- actx := ctx.AttributesContext()
- Expect(me.GetContextRefCount(ctx)).To(Equal(multiRefs))
-
- r := runtimefinalizer.GetRuntimeFinalizationRecorder(ctx)
- Expect(r).NotTo(BeNil())
-
- runtime.GC()
- time.Sleep(time.Second)
- ctx.GetType()
- Expect(r.Get()).To(BeNil())
-
- actx.GetType()
- actx = nil
- runtime.GC()
- time.Sleep(time.Second)
- ctx.GetType()
- Expect(r.Get()).To(BeNil())
- Expect(me.GetContextRefCount(ctx)).To(Equal(1))
-
- ctx = nil
- for i := 0; i < 100; i++ {
- runtime.GC()
- time.Sleep(time.Millisecond)
- }
-
- Expect(r.Get()).To(ContainElement(ContainSubstring(me.CONTEXT_TYPE)))
- })
-
- It("creates views", func() {
- ctx := me.New()
- r := runtimefinalizer.GetRuntimeFinalizationRecorder(ctx)
-
- Expect(me.GetContextRefCount(ctx)).To(Equal(1))
- Expect(me.IsPersistentContextRef(ctx)).To(BeTrue())
-
- view := me.PersistentContextRef(ctx)
- Expect(me.GetContextRefCount(view)).To(Equal(1)) // reuse persistent ref
- Expect(me.IsPersistentContextRef(view)).To(BeTrue())
-
- non := view.AttributesContext()
- Expect(me.IsPersistentContextRef(non)).To(BeFalse())
-
- view2 := me.PersistentContextRef(non)
- Expect(me.GetContextRefCount(view2)).To(Equal(2)) // create new view
- Expect(me.IsPersistentContextRef(view2)).To(BeTrue())
-
- Expect(ctx.IsIdenticalTo(view)).To(BeTrue())
- Expect(ctx.IsIdenticalTo(view2)).To(BeTrue())
-
- ctx = nil
- view = nil
- view2 = nil
-
- runtime.GC()
- time.Sleep(time.Second)
- Expect(len(r.Get())).To(Equal(1)) // ref non is not persistent
- })
-})
diff --git a/pkg/contexts/datacontext/logging.go b/pkg/contexts/datacontext/logging.go
deleted file mode 100644
index 4fa21e3ff..000000000
--- a/pkg/contexts/datacontext/logging.go
+++ /dev/null
@@ -1,13 +0,0 @@
-package datacontext
-
-import (
- ocmlog "github.com/open-component-model/ocm/pkg/logging"
-)
-
-var Realm = ocmlog.DefineSubRealm("context lifecycle", "context")
-
-var Logger = ocmlog.DynamicLogger(Realm)
-
-func Debug(c Context, msg string, keypairs ...interface{}) {
- c.LoggingContext().Logger(Realm).Debug(msg, append(keypairs, "id", c.GetId())...)
-}
diff --git a/pkg/contexts/datacontext/session.go b/pkg/contexts/datacontext/session.go
deleted file mode 100644
index a56434cc1..000000000
--- a/pkg/contexts/datacontext/session.go
+++ /dev/null
@@ -1,149 +0,0 @@
-package datacontext
-
-import (
- "io"
- "sync"
-
- "github.com/mandelsoft/goutils/errors"
-
- "github.com/open-component-model/ocm/pkg/common/accessio"
-)
-
-// Session is a context keeping track of objects requiring a close
-// after final use. When closing a session all subsequent objects
-// will be closed in the opposite order they are added.
-// Added closers may be closed prio to the session without causing
-// errors.
-type Session interface {
- // Closer adds a closer returned by a function call providing a closer and an error
- // to the session if not error is returned. The results of the call are forwarded to
- // the own result. Unfortunately, Go does not support type parameters for methods,
- // therefore only an io.Closer can be returned a function result.
- Closer(closer io.Closer, extra ...interface{}) (io.Closer, error)
- GetOrCreate(key interface{}, creator func(SessionBase) Session) Session
- AddCloser(closer io.Closer, callbacks ...accessio.CloserCallback) io.Closer
- Close() error
- IsClosed() bool
-}
-
-type SessionBase interface {
- Lock()
- Unlock()
- RLock()
- RUnlock()
-
- Session() Session
- IsClosed() bool
- AddCloser(closer io.Closer, callbacks ...accessio.CloserCallback) io.Closer
-}
-
-type ObjectKey struct {
- Object interface{}
- Name string
-}
-
-type session struct {
- base sessionBase
-}
-
-type sessionBase struct {
- sync.RWMutex
- session Session
- closed bool
- closer []io.Closer
- sessions map[interface{}]Session
-}
-
-func NewSession() Session {
- s := &session{
- sessionBase{
- sessions: map[interface{}]Session{},
- },
- }
- s.base.session = s
- return s
-}
-
-func GetOrCreateSubSession(s Session, key interface{}, creator func(SessionBase) Session) Session {
- if s == nil {
- s = NewSession()
- }
- return s.GetOrCreate(key, creator)
-}
-
-func (s *session) IsClosed() bool {
- s.base.RLock()
- defer s.base.RUnlock()
- return s.base.closed
-}
-
-func (s *session) Close() error {
- s.base.Lock()
- defer s.base.Unlock()
- return s.base.Close()
-}
-
-func (s *session) Closer(closer io.Closer, extra ...interface{}) (io.Closer, error) {
- for _, e := range extra {
- if err, ok := e.(error); ok && err != nil {
- return nil, err
- }
- }
- if closer == nil {
- return nil, nil
- }
- s.base.Lock()
- defer s.base.Unlock()
- s.base.AddCloser(closer)
-
- return closer, nil
-}
-
-func (s *session) AddCloser(closer io.Closer, callbacks ...accessio.CloserCallback) io.Closer {
- if closer == nil {
- return nil
- }
- s.base.Lock()
- defer s.base.Unlock()
- return s.base.AddCloser(closer, callbacks...)
-}
-
-func (s *session) GetOrCreate(key interface{}, creator func(SessionBase) Session) Session {
- s.base.Lock()
- defer s.base.Unlock()
- return s.base.GetOrCreate(key, creator)
-}
-
-func (s *sessionBase) Session() Session {
- return s.session
-}
-
-func (s *sessionBase) IsClosed() bool {
- return s.closed
-}
-
-func (s *sessionBase) Close() error {
- if s.closed {
- return nil
- }
- s.closed = true
- list := errors.ErrListf("closing session")
- for i := len(s.closer) - 1; i >= 0; i-- {
- list.Add(s.closer[i].Close())
- }
- return list.Result()
-}
-
-func (s *sessionBase) AddCloser(closer io.Closer, callbacks ...accessio.CloserCallback) io.Closer {
- s.closer = append(s.closer, accessio.OnceCloser(closer, callbacks...))
- return closer
-}
-
-func (s *sessionBase) GetOrCreate(key interface{}, creator func(SessionBase) Session) Session {
- cur := s.sessions[key]
- if cur == nil {
- cur = creator(s)
- s.sessions[key] = cur
- }
- return cur
-}
diff --git a/pkg/contexts/oci/action_test.go b/pkg/contexts/oci/action_test.go
deleted file mode 100644
index 4b1c6af4c..000000000
--- a/pkg/contexts/oci/action_test.go
+++ /dev/null
@@ -1,18 +0,0 @@
-package oci_test
-
-import (
- . "github.com/onsi/ginkgo/v2"
- . "github.com/onsi/gomega"
-
- "github.com/open-component-model/ocm/pkg/contexts/oci"
- oci_repository_prepare "github.com/open-component-model/ocm/pkg/contexts/oci/actions/oci-repository-prepare"
-)
-
-var _ = Describe("action registration", func() {
- It("registers oci prepare", func() {
- a := oci.DefaultContext().GetActions().GetActionTypes().GetAction(oci_repository_prepare.Type)
- Expect(a).NotTo(BeNil())
- v := a.GetVersion("v1")
- Expect(v).NotTo(BeNil())
- })
-})
diff --git a/pkg/contexts/oci/actions/init.go b/pkg/contexts/oci/actions/init.go
deleted file mode 100644
index 95a51189f..000000000
--- a/pkg/contexts/oci/actions/init.go
+++ /dev/null
@@ -1,5 +0,0 @@
-package actions
-
-import (
- _ "github.com/open-component-model/ocm/pkg/contexts/oci/actions/oci-repository-prepare"
-)
diff --git a/pkg/contexts/oci/actions/oci-repository-prepare/exec.go b/pkg/contexts/oci/actions/oci-repository-prepare/exec.go
deleted file mode 100644
index 450abfaad..000000000
--- a/pkg/contexts/oci/actions/oci-repository-prepare/exec.go
+++ /dev/null
@@ -1,12 +0,0 @@
-package oci_repository_prepare
-
-import (
- "github.com/mandelsoft/goutils/generics"
-
- "github.com/open-component-model/ocm/pkg/common"
- "github.com/open-component-model/ocm/pkg/contexts/datacontext/action/handlers"
-)
-
-func Execute(hdlrs handlers.Registry, host, repo string, creds common.Properties) (*ActionResult, error) {
- return generics.CastR[*ActionResult](hdlrs.Execute(Spec(host, repo), creds))
-}
diff --git a/pkg/contexts/oci/actions/oci-repository-prepare/type.go b/pkg/contexts/oci/actions/oci-repository-prepare/type.go
deleted file mode 100644
index 6637b9cbc..000000000
--- a/pkg/contexts/oci/actions/oci-repository-prepare/type.go
+++ /dev/null
@@ -1,81 +0,0 @@
-package oci_repository_prepare
-
-import (
- "path"
-
- "github.com/open-component-model/ocm/pkg/common"
- "github.com/open-component-model/ocm/pkg/contexts/credentials/builtin/oci/identity"
- "github.com/open-component-model/ocm/pkg/contexts/credentials/cpi"
- "github.com/open-component-model/ocm/pkg/contexts/datacontext/action/api"
- "github.com/open-component-model/ocm/pkg/runtime"
- "github.com/open-component-model/ocm/pkg/utils"
-)
-
-const Type = "oci.repository.prepare"
-
-func init() {
- api.RegisterAction(Type, "Prepare the usage of a repository in an OCI registry.", usage,
- []string{identity.ID_HOSTNAME, identity.ID_PORT, identity.ID_PATHPREFIX})
-
- api.RegisterType(api.NewActionType[*ActionSpecV1, *ActionResultV1](Type, "v1"))
-}
-
-var usage = `
-The hostname of the target repository is used as selector. The action should
-assure, that the requested repository is available on the target OCI registry.
-
-Spec version v1 uses the following specification fields:
-- hostname *string*: The hostname of the OCI registry.
-- repository *string*: The OCI repository name.
-`
-
-////////////////////////////////////////////////////////////////////////////////
-// internal version
-
-type ActionSpec = ActionSpecV1
-
-type ActionResult = ActionResultV1
-
-func Spec(host string, repo string) *ActionSpec {
- return &ActionSpec{
- ObjectVersionedType: runtime.ObjectVersionedType{runtime.TypeName(Type, "v1")},
- Hostname: host,
- Repository: repo,
- }
-}
-
-func Result(msg string) *ActionResult {
- return &ActionResult{
- CommonResult: api.CommonResult{
- ObjectVersionedType: runtime.ObjectVersionedType{runtime.TypeName(Type, "v1")},
- Message: msg,
- },
- }
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// serialization formats
-
-type ActionSpecV1 struct {
- runtime.ObjectVersionedType
- Hostname string `json:"hostname"`
- Repository string `json:"repository"`
-}
-
-func (s *ActionSpecV1) Selector() api.Selector {
- return api.Selector(s.Hostname)
-}
-
-func (s *ActionSpecV1) GetConsumerAttributes() common.Properties {
- host, port, base := utils.SplitLocator(s.Hostname)
- return common.Properties{
- cpi.ID_TYPE: identity.CONSUMER_TYPE,
- identity.ID_HOSTNAME: host,
- identity.ID_PATHPREFIX: path.Join(base, s.Repository),
- identity.ID_PORT: port,
- }
-}
-
-type ActionResultV1 struct {
- api.CommonResult `json:",inline"`
-}
diff --git a/pkg/contexts/oci/art_test.go b/pkg/contexts/oci/art_test.go
deleted file mode 100644
index 1e722090b..000000000
--- a/pkg/contexts/oci/art_test.go
+++ /dev/null
@@ -1,38 +0,0 @@
-package oci_test
-
-import (
- . "github.com/onsi/ginkgo/v2"
- . "github.com/onsi/gomega"
-
- "github.com/opencontainers/go-digest"
-
- "github.com/open-component-model/ocm/pkg/contexts/oci"
-)
-
-func CheckArt(ref string, exp *oci.ArtSpec) {
- spec, err := oci.ParseArt(ref)
- if exp == nil {
- Expect(err).To(HaveOccurred())
- } else {
- Expect(err).To(Succeed())
- Expect(spec).To(Equal(*exp))
- }
-}
-
-var _ = Describe("art parsing", func() {
- digest := digest.Digest("sha256:3d05e105e350edf5be64fe356f4906dd3f9bf442a279e4142db9879bba8e677a")
- tag := "v1"
-
- It("succeeds", func() {
- CheckArt("ubuntu", &oci.ArtSpec{Repository: "ubuntu"})
- CheckArt("ubuntu/test", &oci.ArtSpec{Repository: "ubuntu/test"})
- CheckArt("ubuntu/test@"+digest.String(), &oci.ArtSpec{Repository: "ubuntu/test", Digest: &digest})
- CheckArt("ubuntu/test:"+tag, &oci.ArtSpec{Repository: "ubuntu/test", Tag: &tag})
- CheckArt("ubuntu/test:"+tag+"@"+digest.String(), &oci.ArtSpec{Repository: "ubuntu/test", Digest: &digest, Tag: &tag})
- })
-
- It("fails", func() {
- CheckArt("ubu@ntu", nil)
- CheckArt("ubu@sha256:123", nil)
- })
-})
diff --git a/pkg/contexts/oci/artdesc/artifact.go b/pkg/contexts/oci/artdesc/artifact.go
deleted file mode 100644
index ad66c1253..000000000
--- a/pkg/contexts/oci/artdesc/artifact.go
+++ /dev/null
@@ -1,298 +0,0 @@
-package artdesc
-
-import (
- "encoding/json"
- out "fmt"
-
- "github.com/containerd/containerd/images"
- "github.com/mandelsoft/goutils/errors"
- "github.com/opencontainers/go-digest"
- ociv1 "github.com/opencontainers/image-spec/specs-go/v1"
-
- "github.com/open-component-model/ocm/pkg/blobaccess/blobaccess"
- "github.com/open-component-model/ocm/pkg/contexts/oci/artdesc/helper"
-)
-
-const SchemeVersion = helper.SchemeVersion
-
-const (
- MediaTypeImageManifest = ociv1.MediaTypeImageManifest
- MediaTypeImageIndex = ociv1.MediaTypeImageIndex
- MediaTypeImageLayer = ociv1.MediaTypeImageLayer
- MediaTypeImageLayerGzip = ociv1.MediaTypeImageLayerGzip
-
- MediaTypeDockerSchema2Manifest = images.MediaTypeDockerSchema2Manifest
- MediaTypeDockerSchema2ManifestList = images.MediaTypeDockerSchema2ManifestList
-
- MediaTypeImageConfig = ociv1.MediaTypeImageConfig
-)
-
-var legacy = false
-
-type (
- Descriptor = ociv1.Descriptor
- Platform = ociv1.Platform
-)
-
-type ArtifactDescriptor interface {
- IsManifest() bool
- IsIndex() bool
- IsValid() bool
-
- Digest() digest.Digest
- Blob() (blobaccess.BlobAccess, error)
- Artifact() *Artifact
- Manifest() (*Manifest, error)
- Index() (*Index, error)
-}
-
-type BlobDescriptorSource interface {
- GetBlobDescriptor(digest.Digest) *Descriptor
- MimeType() string
- IsValid() bool
-}
-
-// Artifact is the unified representation of an OCI artifact
-// according to https://github.com/opencontainers/image-spec/blob/main/manifest.md
-// It is either an image manifest or an image index manifest (fat image).
-type Artifact struct {
- manifest *Manifest
- index *Index
-}
-
-var (
- _ ArtifactDescriptor = (*Artifact)(nil)
- _ BlobDescriptorSource = (*Artifact)(nil)
- _ json.Marshaler = (*Artifact)(nil)
- _ json.Unmarshaler = (*Artifact)(nil)
-)
-
-func New() *Artifact {
- return &Artifact{}
-}
-
-func NewManifestArtifact() *Artifact {
- a := New()
- a.SetManifest(NewManifest())
- return a
-}
-
-func NewIndexArtifact() *Artifact {
- a := New()
- a.SetIndex(NewIndex())
- return a
-}
-
-func (d *Artifact) Digest() digest.Digest {
- var blob blobaccess.BlobAccess
- if d.manifest != nil {
- blob, _ = d.manifest.Blob()
- }
- if d.index != nil {
- blob, _ = d.index.Blob()
- }
- if blob != nil {
- return blob.Digest()
- }
- return ""
-}
-
-func (d *Artifact) Blob() (blobaccess.BlobAccess, error) {
- if d.manifest != nil {
- return d.manifest.Blob()
- }
- if d.index != nil {
- return d.index.Blob()
- }
- return nil, errors.ErrInvalid("oci artifact")
-}
-
-func (d *Artifact) Artifact() *Artifact {
- return d
-}
-
-func (d *Artifact) MimeType() string {
- if d.IsIndex() {
- return d.index.MimeType()
- }
- if d.IsManifest() {
- return d.manifest.MimeType()
- }
- return ""
-}
-
-func (d *Artifact) SetManifest(m *Manifest) error {
- if d.IsIndex() || d.IsManifest() {
- return errors.Newf("artifact descriptor already instantiated")
- }
- d.manifest = m
- return nil
-}
-
-func (d *Artifact) SetIndex(i *Index) error {
- if d.IsIndex() || d.IsManifest() {
- return errors.Newf("artifact descriptor already instantiated")
- }
- d.index = i
- return nil
-}
-
-func (d *Artifact) IsValid() bool {
- return d.manifest != nil || d.index != nil
-}
-
-func (d *Artifact) IsManifest() bool {
- return d.manifest != nil
-}
-
-func (d *Artifact) IsIndex() bool {
- return d.index != nil
-}
-
-func (d *Artifact) Index() (*Index, error) {
- if d.index != nil {
- return d.index, nil
- }
- return nil, errors.ErrInvalid()
-}
-
-func (d *Artifact) Manifest() (*Manifest, error) {
- if d.manifest != nil {
- return d.manifest, nil
- }
- return nil, errors.ErrInvalid()
-}
-
-func (d *Artifact) SetAnnotation(name, value string) error {
- return d.modifyAnnotation(func(annos *map[string]string) {
- if *annos == nil {
- *annos = map[string]string{}
- }
- (*annos)[name] = value
- })
-}
-
-func (d *Artifact) GetAnnotation(name string) string {
- var annos map[string]string
- switch {
- case d.manifest != nil:
- annos = d.manifest.Annotations
- case d.index != nil:
- annos = d.index.Annotations
- default:
- return ""
- }
- if len(annos) == 0 {
- return ""
- }
- return annos[name]
-}
-
-func (d *Artifact) DeleteAnnotation(name string) error {
- return d.modifyAnnotation(func(annos *map[string]string) {
- if *annos == nil {
- return
- }
- delete(*annos, name)
- if len(*annos) == 0 {
- *annos = nil
- }
- })
-}
-
-func (d *Artifact) modifyAnnotation(mod func(annos *map[string]string)) error {
- var annos map[string]string
-
- switch {
- case d.manifest != nil:
- annos = d.manifest.Annotations
- case d.index != nil:
- annos = d.index.Annotations
- default:
- return errors.Newf("void artifact access")
- }
- mod(&annos)
- if d.manifest != nil {
- d.manifest.Annotations = annos
- } else {
- d.index.Annotations = annos
- }
- return nil
-}
-
-func (d *Artifact) ToBlobAccess() (blobaccess.BlobAccess, error) {
- if d.IsManifest() {
- return d.manifest.Blob()
- }
- if d.IsIndex() {
- return d.index.Blob()
- }
- return nil, errors.ErrInvalid("artifact descriptor")
-}
-
-func (d *Artifact) GetBlobDescriptor(digest digest.Digest) *Descriptor {
- if d.IsManifest() {
- m, err := d.Manifest()
- if err != nil {
- out.Printf("manifest was empty for artifact digest %s", digest)
-
- return nil
- }
- return m.GetBlobDescriptor(digest)
- }
- if d.IsIndex() {
- i, _ := d.Index()
- return i.GetBlobDescriptor(digest)
- }
- return nil
-}
-
-func (d Artifact) MarshalJSON() ([]byte, error) {
- if d.manifest != nil {
- d.manifest.MediaType = ArtifactMimeType(d.manifest.MediaType, ociv1.MediaTypeImageManifest, legacy)
- return json.Marshal(d.manifest)
- }
- if d.index != nil {
- d.index.MediaType = ArtifactMimeType(d.index.MediaType, ociv1.MediaTypeImageIndex, legacy)
- return json.Marshal(d.index)
- }
- return []byte("null"), nil
-}
-
-func (d *Artifact) UnmarshalJSON(data []byte) error {
- if string(data) == "null" {
- return nil
- }
- var m helper.GenericDescriptor
-
- err := json.Unmarshal(data, &m)
- if err != nil {
- return err
- }
-
- err = m.Validate()
- if err != nil {
- return err
- }
- if m.IsManifest() {
- d.manifest = (*Manifest)(m.AsManifest())
- d.index = nil
- } else {
- d.index = (*Index)(m.AsIndex())
- d.manifest = nil
- }
- return nil
-}
-
-func Decode(data []byte) (*Artifact, error) {
- var d Artifact
-
- if err := json.Unmarshal(data, &d); err != nil {
- return nil, err
- }
- return &d, nil
-}
-
-func Encode(d *Artifact) ([]byte, error) {
- return json.Marshal(d)
-}
diff --git a/pkg/contexts/oci/artdesc/config.go b/pkg/contexts/oci/artdesc/config.go
deleted file mode 100644
index b0e990ee0..000000000
--- a/pkg/contexts/oci/artdesc/config.go
+++ /dev/null
@@ -1,25 +0,0 @@
-package artdesc
-
-import (
- "encoding/json"
-
- ociv1 "github.com/opencontainers/image-spec/specs-go/v1"
-
- "github.com/open-component-model/ocm/pkg/blobaccess/blobaccess"
-)
-
-type ImageConfig = ociv1.Image
-
-func ParseImageConfig(blob blobaccess.BlobAccess) (*ImageConfig, error) {
- var cfg ImageConfig
-
- data, err := blob.Get()
- if err != nil {
- return nil, err
- }
- err = json.Unmarshal(data, &cfg)
- if err != nil {
- return nil, err
- }
- return &cfg, nil
-}
diff --git a/pkg/contexts/oci/artdesc/index.go b/pkg/contexts/oci/artdesc/index.go
deleted file mode 100644
index 05b209ae0..000000000
--- a/pkg/contexts/oci/artdesc/index.go
+++ /dev/null
@@ -1,117 +0,0 @@
-package artdesc
-
-import (
- "encoding/json"
-
- "github.com/mandelsoft/goutils/errors"
- "github.com/opencontainers/go-digest"
- "github.com/opencontainers/image-spec/specs-go"
- ociv1 "github.com/opencontainers/image-spec/specs-go/v1"
-
- "github.com/open-component-model/ocm/pkg/blobaccess/blobaccess"
-)
-
-type Index ociv1.Index
-
-var _ BlobDescriptorSource = (*Index)(nil)
-
-func NewIndex() *Index {
- return &Index{
- Versioned: specs.Versioned{SchemeVersion},
- MediaType: MediaTypeImageIndex,
- Manifests: nil,
- Annotations: nil,
- }
-}
-
-var _ ArtifactDescriptor = (*Index)(nil)
-
-func (i *Index) IsManifest() bool {
- return false
-}
-
-func (i *Index) IsIndex() bool {
- return true
-}
-
-func (i *Index) Digest() digest.Digest {
- blob, _ := i.Blob()
- if blob != nil {
- return blob.Digest()
- }
- return ""
-}
-
-func (i *Index) Artifact() *Artifact {
- return &Artifact{index: i}
-}
-
-func (i *Index) Manifest() (*Manifest, error) {
- return nil, errors.ErrInvalid()
-}
-
-func (i *Index) Index() (*Index, error) {
- return i, nil
-}
-
-func (i *Index) IsValid() bool {
- return true
-}
-
-func (i *Index) GetBlobDescriptor(digest digest.Digest) *Descriptor {
- for _, m := range i.Manifests {
- if m.Digest == digest {
- return &m
- }
- }
- return nil
-}
-
-func (i *Index) MimeType() string {
- return ArtifactMimeType(i.MediaType, MediaTypeImageIndex, legacy)
-}
-
-func (i *Index) SetAnnotation(name, value string) {
- if i.Annotations == nil {
- i.Annotations = map[string]string{}
- }
- i.Annotations[name] = value
-}
-
-func (i *Index) DeleteAnnotation(name string) {
- if i.Annotations == nil {
- return
- }
- delete(i.Annotations, name)
- if len(i.Annotations) == 0 {
- i.Annotations = nil
- }
-}
-
-func (i *Index) Blob() (blobaccess.BlobAccess, error) {
- i.MediaType = i.MimeType()
- data, err := json.Marshal(i)
- if err != nil {
- return nil, err
- }
- return blobaccess.ForData(i.MediaType, data), nil
-}
-
-func (i *Index) AddManifest(d *Descriptor) {
- i.Manifests = append(i.Manifests, *d)
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-func DecodeIndex(data []byte) (*Index, error) {
- var d Index
-
- if err := json.Unmarshal(data, &d); err != nil {
- return nil, err
- }
- return &d, nil
-}
-
-func EncodeIndex(d *Index) ([]byte, error) {
- return json.Marshal(d)
-}
diff --git a/pkg/contexts/oci/artdesc/utils.go b/pkg/contexts/oci/artdesc/utils.go
deleted file mode 100644
index 8c0ea74b9..000000000
--- a/pkg/contexts/oci/artdesc/utils.go
+++ /dev/null
@@ -1,132 +0,0 @@
-package artdesc
-
-import (
- "strings"
-
- "github.com/opencontainers/go-digest"
-
- "github.com/open-component-model/ocm/pkg/blobaccess/blobaccess"
-)
-
-func DefaultBlobDescriptor(blob blobaccess.BlobAccess) *Descriptor {
- return &Descriptor{
- MediaType: blob.MimeType(),
- Digest: blob.Digest(),
- Size: blob.Size(),
- URLs: nil,
- Annotations: nil,
- Platform: nil,
- }
-}
-
-func IsDigest(version string) (bool, digest.Digest) {
- if strings.HasPrefix(version, "@") {
- return true, digest.Digest(version[1:])
- }
- if strings.Contains(version, ":") {
- return true, digest.Digest(version)
- }
- return false, ""
-}
-
-func ToContentMediaType(media string) string {
-loop:
- for {
- last := strings.LastIndex(media, "+")
- if last < 0 {
- break
- }
- switch media[last+1:] {
- case "tar":
- fallthrough
- case "gzip":
- fallthrough
- case "yaml":
- fallthrough
- case "json":
- media = media[:last]
- default:
- break loop
- }
- }
- return media
-}
-
-func ToDescriptorMediaType(media string) string {
- return ToContentMediaType(media) + "+json"
-}
-
-func ToArchiveMediaTypes(media string) []string {
- base := ToContentMediaType(media)
- return []string{base + "+tar", base + "+tar+gzip"}
-}
-
-func IsOCIMediaType(media string) bool {
- c := ToContentMediaType(media)
- for _, t := range ContentTypes() {
- if t == c {
- return true
- }
- }
- return false
-}
-
-func ContentTypes() []string {
- r := []string{}
- for _, t := range DescriptorTypes() {
- r = append(r, ToContentMediaType(t))
- }
- return r
-}
-
-func DescriptorTypes() []string {
- return []string{
- MediaTypeImageManifest,
- MediaTypeImageIndex,
- MediaTypeDockerSchema2Manifest,
- MediaTypeDockerSchema2ManifestList,
- }
-}
-
-func ArchiveBlobTypes() []string {
- r := []string{}
- for _, t := range ContentTypes() {
- r = append(r, ToArchiveMediaTypes(t)...)
- }
- return r
-}
-
-func ArtifactMimeType(cur, def string, legacy bool) string {
- if cur != "" {
- return cur
- }
- return MapArtifactMimeType(def, legacy)
-}
-
-func MapArtifactMimeType(mime string, legacy bool) string {
- if legacy {
- switch mime {
- case MediaTypeImageManifest:
- return MediaTypeDockerSchema2Manifest
- case MediaTypeImageIndex:
- return MediaTypeDockerSchema2ManifestList
- }
- } else {
- switch mime {
- case MediaTypeDockerSchema2Manifest:
- // return MediaTypeImageManifest
- case MediaTypeDockerSchema2ManifestList:
- // return MediaTypeImageIndex
- }
- }
- return mime
-}
-
-func MapArtifactBlobMimeType(blob blobaccess.BlobAccess, legacy bool) blobaccess.BlobAccess {
- mime := blob.MimeType()
- mapped := MapArtifactMimeType(mime, legacy)
- if mapped != mime {
- return blobaccess.WithMimeType(mapped, blob)
- }
- return blob
-}
diff --git a/pkg/contexts/oci/artdesc/utils_test.go b/pkg/contexts/oci/artdesc/utils_test.go
deleted file mode 100644
index 2a598a80a..000000000
--- a/pkg/contexts/oci/artdesc/utils_test.go
+++ /dev/null
@@ -1,20 +0,0 @@
-package artdesc_test
-
-import (
- . "github.com/onsi/ginkgo/v2"
- . "github.com/onsi/gomega"
-
- "github.com/open-component-model/ocm/pkg/contexts/oci/artdesc"
-)
-
-var _ = Describe("utils", func() {
- It("strips media type", func() {
- Expect(artdesc.ToContentMediaType(artdesc.MediaTypeImageManifest)).To(Equal("application/vnd.oci.image.manifest.v1"))
- Expect(artdesc.ToContentMediaType(artdesc.MediaTypeImageIndex)).To(Equal("application/vnd.oci.image.index.v1"))
- })
-
- It("maps to descriptor media typ", func() {
- Expect(artdesc.ToDescriptorMediaType(artdesc.ToContentMediaType(artdesc.MediaTypeImageManifest) + "+tar+gzip")).To(Equal(artdesc.MediaTypeImageManifest))
- Expect(artdesc.ToDescriptorMediaType(artdesc.ToContentMediaType(artdesc.MediaTypeImageIndex) + "+tar+gzip")).To(Equal(artdesc.MediaTypeImageIndex))
- })
-})
diff --git a/pkg/contexts/oci/attrs/cacheattr/attr.go b/pkg/contexts/oci/attrs/cacheattr/attr.go
deleted file mode 100644
index 1bea28b5f..000000000
--- a/pkg/contexts/oci/attrs/cacheattr/attr.go
+++ /dev/null
@@ -1,75 +0,0 @@
-package cacheattr
-
-import (
- "fmt"
- "os"
-
- "github.com/mandelsoft/goutils/errors"
-
- "github.com/open-component-model/ocm/pkg/common/accessio"
- "github.com/open-component-model/ocm/pkg/contexts/datacontext"
- "github.com/open-component-model/ocm/pkg/runtime"
- "github.com/open-component-model/ocm/pkg/utils"
-)
-
-const (
- ATTR_KEY = "github.com/mandelsoft/oci/cache"
- ATTR_SHORT = "cache"
-)
-
-func init() {
- datacontext.RegisterAttributeType(ATTR_KEY, AttributeType{}, ATTR_SHORT)
-}
-
-type AttributeType struct{}
-
-func (a AttributeType) Name() string {
- return ATTR_KEY
-}
-
-func (a AttributeType) Description() string {
- return `
-*string*
-Filesystem folder to use for caching OCI blobs
-`
-}
-
-func (a AttributeType) Encode(v interface{}, marshaller runtime.Marshaler) ([]byte, error) {
- if _, ok := v.(accessio.BlobCache); !ok {
- return nil, fmt.Errorf("accessio.BlobCache required")
- }
- return nil, nil
-}
-
-func (a AttributeType) Decode(data []byte, unmarshaller runtime.Unmarshaler) (interface{}, error) {
- var value string
- err := unmarshaller.Unmarshal(data, &value)
- if value != "" {
- value, err = utils.ResolvePath(value)
- if err != nil {
- return nil, err
- }
- // TODO: This should use the virtual filesystem.
- err = os.MkdirAll(value, 0o700)
- if err == nil {
- return accessio.NewStaticBlobCache(value)
- }
- } else if err == nil {
- err = errors.Newf("file path missing")
- }
- return value, err
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-func Get(ctx datacontext.Context) accessio.BlobCache {
- a := ctx.GetAttributes().GetAttribute(ATTR_KEY)
- if a == nil {
- return nil
- }
- return a.(accessio.BlobCache)
-}
-
-func Set(ctx datacontext.Context, cache accessio.BlobCache) error {
- return ctx.GetAttributes().SetAttribute(ATTR_KEY, cache)
-}
diff --git a/pkg/contexts/oci/attrs/cacheattr/attr_test.go b/pkg/contexts/oci/attrs/cacheattr/attr_test.go
deleted file mode 100644
index 0dac071db..000000000
--- a/pkg/contexts/oci/attrs/cacheattr/attr_test.go
+++ /dev/null
@@ -1,56 +0,0 @@
-package cacheattr_test
-
-import (
- "os"
- "reflect"
-
- . "github.com/onsi/ginkgo/v2"
- . "github.com/onsi/gomega"
-
- "github.com/open-component-model/ocm/pkg/common/accessio"
- "github.com/open-component-model/ocm/pkg/contexts/config"
- "github.com/open-component-model/ocm/pkg/contexts/credentials"
- "github.com/open-component-model/ocm/pkg/contexts/datacontext"
- "github.com/open-component-model/ocm/pkg/contexts/oci"
- "github.com/open-component-model/ocm/pkg/contexts/oci/attrs/cacheattr"
- "github.com/open-component-model/ocm/pkg/contexts/ocm"
- "github.com/open-component-model/ocm/pkg/runtime"
-)
-
-var _ = Describe("attribute", func() {
- var ctx ocm.Context
- var cfgctx config.Context
- var cache accessio.BlobCache
-
- BeforeEach(func() {
- var err error
- cfgctx = config.WithSharedAttributes(datacontext.New(nil)).New()
- credctx := credentials.WithConfigs(cfgctx).New()
- ocictx := oci.WithCredentials(credctx).New()
- ctx = ocm.WithOCIRepositories(ocictx).New()
- cache, err = accessio.NewDefaultBlobCache()
- Expect(err).To(Succeed())
- })
- AfterEach(func() {
- cache.Unref()
- })
-
- It("local setting", func() {
- Expect(cacheattr.Get(ctx)).To(BeNil())
- Expect(cacheattr.Set(ctx, cache)).To(Succeed())
- Expect(cacheattr.Get(ctx)).To(BeIdenticalTo(cache))
- })
-
- It("global setting", func() {
- Expect(cacheattr.Get(cfgctx)).To(BeNil())
- Expect(cacheattr.Set(ctx, cache)).To(Succeed())
- Expect(cacheattr.Get(ctx)).To(BeIdenticalTo(cache))
- })
-
- It("parses string", func() {
- dir := os.TempDir()
- cache, err := cacheattr.AttributeType{}.Decode([]byte(dir), runtime.DefaultYAMLEncoding)
- Expect(err).To(Succeed())
- Expect(reflect.TypeOf(cache).String()).To(Equal("*accessio.blobCache"))
- })
-})
diff --git a/pkg/contexts/oci/attrs/init.go b/pkg/contexts/oci/attrs/init.go
deleted file mode 100644
index 42dc1a55a..000000000
--- a/pkg/contexts/oci/attrs/init.go
+++ /dev/null
@@ -1,5 +0,0 @@
-package attrs
-
-import (
- _ "github.com/open-component-model/ocm/pkg/contexts/oci/attrs/cacheattr"
-)
diff --git a/pkg/contexts/oci/builder.go b/pkg/contexts/oci/builder.go
deleted file mode 100644
index a6c8f85d5..000000000
--- a/pkg/contexts/oci/builder.go
+++ /dev/null
@@ -1,29 +0,0 @@
-package oci
-
-import (
- "context"
-
- "github.com/open-component-model/ocm/pkg/contexts/credentials"
- "github.com/open-component-model/ocm/pkg/contexts/datacontext"
- "github.com/open-component-model/ocm/pkg/contexts/oci/internal"
-)
-
-func WithContext(ctx context.Context) internal.Builder {
- return internal.Builder{}.WithContext(ctx)
-}
-
-func WithCredentials(ctx credentials.Context) internal.Builder {
- return internal.Builder{}.WithCredentials(ctx)
-}
-
-func WithRepositoyTypeScheme(scheme RepositoryTypeScheme) internal.Builder {
- return internal.Builder{}.WithRepositoyTypeScheme(scheme)
-}
-
-func WithRepositorySpecHandlers(reg RepositorySpecHandlers) internal.Builder {
- return internal.Builder{}.WithRepositorySpecHandlers(reg)
-}
-
-func New(mode ...datacontext.BuilderMode) Context {
- return internal.Builder{}.New(mode...)
-}
diff --git a/pkg/contexts/oci/config/config_test.go b/pkg/contexts/oci/config/config_test.go
deleted file mode 100644
index 3cc1b311f..000000000
--- a/pkg/contexts/oci/config/config_test.go
+++ /dev/null
@@ -1,79 +0,0 @@
-package config_test
-
-import (
- "encoding/json"
-
- . "github.com/onsi/ginkgo/v2"
- . "github.com/onsi/gomega"
-
- "github.com/open-component-model/ocm/pkg/contexts/oci/config"
- "github.com/open-component-model/ocm/pkg/contexts/oci/cpi"
- "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/ocireg"
-)
-
-func normalize(i interface{}) ([]byte, error) {
- data, err := json.Marshal(i)
- if err != nil {
- return nil, err
- }
- var generic map[string]interface{}
- err = json.Unmarshal(data, &generic)
- if err != nil {
- return nil, err
- }
- return json.Marshal(generic)
-}
-
-var _ = Describe("oci config", func() {
- spec := ocireg.NewRepositorySpec("ghcr.io")
- data, err := normalize(spec)
- Expect(err).To(Succeed())
-
- specdata := "{\"aliases\":{\"alias\":" + string(data) + "},\"type\":\"" + config.ConfigType + "\"}"
-
- Context("serialize", func() {
- It("serializes config", func() {
- cfg := config.New()
- err := cfg.SetAlias("alias", spec)
- Expect(err).To(Succeed())
-
- data, err := normalize(cfg)
-
- Expect(err).To(Succeed())
- Expect(data).To(Equal([]byte(specdata)))
-
- cfg2 := config.New()
- err = json.Unmarshal(data, cfg2)
- Expect(err).To(Succeed())
- Expect(cfg2).To(Equal(cfg))
- })
- })
-
- Context("apply", func() {
- It("applies directly", func() {
- ctx := cpi.New()
-
- cfg := config.New()
- err := cfg.SetAlias("alias", spec)
- Expect(err).To(Succeed())
-
- Expect(cfg.ApplyTo(ctx.ConfigContext(), ctx)).To(Succeed())
-
- found := ctx.GetAlias("alias")
- Expect(found).To(Equal(cfg.Aliases["alias"]))
- })
-
- It("applies via config context", func() {
- ctx := cpi.New()
-
- cfg := config.New()
- err := cfg.SetAlias("alias", spec)
- Expect(err).To(Succeed())
-
- Expect(ctx.ConfigContext().ApplyConfig(cfg, "programmatic")).To(Succeed())
-
- found := ctx.GetAlias("alias")
- Expect(found).To(Equal(cfg.Aliases["alias"]))
- })
- })
-})
diff --git a/pkg/contexts/oci/config/type.go b/pkg/contexts/oci/config/type.go
deleted file mode 100644
index ad7fafbb1..000000000
--- a/pkg/contexts/oci/config/type.go
+++ /dev/null
@@ -1,70 +0,0 @@
-package config
-
-import (
- "github.com/open-component-model/ocm/pkg/contexts/config"
- cfgcpi "github.com/open-component-model/ocm/pkg/contexts/config/cpi"
- "github.com/open-component-model/ocm/pkg/contexts/oci/cpi"
- "github.com/open-component-model/ocm/pkg/runtime"
-)
-
-const (
- ConfigType = "oci" + cfgcpi.OCM_CONFIG_TYPE_SUFFIX
- ConfigTypeV1 = ConfigType + runtime.VersionSeparator + "v1"
-)
-
-func init() {
- cfgcpi.RegisterConfigType(cfgcpi.NewConfigType[*Config](ConfigType, usage))
- cfgcpi.RegisterConfigType(cfgcpi.NewConfigType[*Config](ConfigTypeV1, usage))
-}
-
-// Config describes a memory based config interface.
-type Config struct {
- runtime.ObjectVersionedType `json:",inline"`
- Aliases map[string]*cpi.GenericRepositorySpec `json:"aliases,omitempty"`
-}
-
-// New creates a new memory ConfigSpec.
-func New() *Config {
- return &Config{
- ObjectVersionedType: runtime.NewVersionedTypedObject(ConfigType),
- }
-}
-
-func (a *Config) GetType() string {
- return ConfigType
-}
-
-func (a *Config) SetAlias(name string, spec cpi.RepositorySpec) error {
- g, err := cpi.ToGenericRepositorySpec(spec)
- if err != nil {
- return err
- }
- if a.Aliases == nil {
- a.Aliases = map[string]*cpi.GenericRepositorySpec{}
- }
- a.Aliases[name] = g
- return nil
-}
-
-func (a *Config) ApplyTo(ctx config.Context, target interface{}) error {
- t, ok := target.(cpi.Context)
- if !ok {
- return config.ErrNoContext(ConfigType)
- }
- for n, s := range a.Aliases {
- t.SetAlias(n, s)
- }
- return nil
-}
-
-const usage = `
-The config type ` + ConfigType + ` can be used to define
-OCI registry aliases:
-
-
- type: ` + ConfigType + `
- aliases:
- <name>: <OCI registry specification>
- ...
-
-`
diff --git a/pkg/contexts/oci/cpi/interface.go b/pkg/contexts/oci/cpi/interface.go
deleted file mode 100644
index 8d372f2bf..000000000
--- a/pkg/contexts/oci/cpi/interface.go
+++ /dev/null
@@ -1,95 +0,0 @@
-package cpi
-
-// This is the Context Provider Interface for credential providers
-
-import (
- "github.com/opencontainers/go-digest"
- ociv1 "github.com/opencontainers/image-spec/specs-go/v1"
-
- "github.com/open-component-model/ocm/pkg/blobaccess/blobaccess"
- "github.com/open-component-model/ocm/pkg/contexts/datacontext"
- "github.com/open-component-model/ocm/pkg/contexts/oci/internal"
-)
-
-const CONTEXT_TYPE = internal.CONTEXT_TYPE
-
-const CommonTransportFormat = internal.CommonTransportFormat
-
-type (
- Context = internal.Context
- ContextProvider = internal.ContextProvider
- Repository = internal.Repository
- RepositorySpecHandlers = internal.RepositorySpecHandlers
- RepositorySpecHandler = internal.RepositorySpecHandler
- UniformRepositorySpec = internal.UniformRepositorySpec
- RepositoryType = internal.RepositoryType
- RepositoryTypeProvider = internal.RepositoryTypeProvider
- RepositoryTypeScheme = internal.RepositoryTypeScheme
- RepositorySpec = internal.RepositorySpec
- IntermediateRepositorySpecAspect = internal.IntermediateRepositorySpecAspect
- GenericRepositorySpec = internal.GenericRepositorySpec
- ArtifactAccess = internal.ArtifactAccess
- Artifact = internal.Artifact
- ArtifactSource = internal.ArtifactSource
- ArtifactSink = internal.ArtifactSink
- BlobSource = internal.BlobSource
- BlobSink = internal.BlobSink
- NamespaceLister = internal.NamespaceLister
- NamespaceAccess = internal.NamespaceAccess
- ManifestAccess = internal.ManifestAccess
- IndexAccess = internal.IndexAccess
- BlobAccess = internal.BlobAccess
- DataAccess = internal.DataAccess
- RepositorySource = internal.RepositorySource
- ConsumerIdentityProvider = internal.ConsumerIdentityProvider
-)
-
-type Descriptor = ociv1.Descriptor
-
-func DefaultContext() Context {
- return internal.DefaultContext
-}
-
-func New(m ...datacontext.BuilderMode) Context {
- return internal.Builder{}.New(m...)
-}
-
-func FromProvider(p ContextProvider) Context {
- return internal.FromProvider(p)
-}
-
-func RegisterRepositorySpecHandler(handler RepositorySpecHandler, types ...string) {
- internal.RegisterRepositorySpecHandler(handler, types...)
-}
-
-func ToGenericRepositorySpec(spec RepositorySpec) (*GenericRepositorySpec, error) {
- return internal.ToGenericRepositorySpec(spec)
-}
-
-func UniformRepositorySpecForHostURL(typ string, host string) *UniformRepositorySpec {
- return internal.UniformRepositorySpecForHostURL(typ, host)
-}
-
-const (
- KIND_OCIARTIFACT = internal.KIND_OCIARTIFACT
- KIND_MEDIATYPE = blobaccess.KIND_MEDIATYPE
- KIND_BLOB = blobaccess.KIND_BLOB
-)
-
-func ErrUnknownArtifact(name, version string) error {
- return internal.ErrUnknownArtifact(name, version)
-}
-
-func ErrBlobNotFound(digest digest.Digest) error {
- return blobaccess.ErrBlobNotFound(digest)
-}
-
-func IsErrBlobNotFound(err error) bool {
- return blobaccess.IsErrBlobNotFound(err)
-}
-
-// provide context interface for other files to avoid diffs in imports.
-var (
- newStrictRepositoryTypeScheme = internal.NewStrictRepositoryTypeScheme
- defaultRepositoryTypeScheme = internal.DefaultRepositoryTypeScheme
-)
diff --git a/pkg/contexts/oci/cpi/repotypes.go b/pkg/contexts/oci/cpi/repotypes.go
deleted file mode 100644
index 7633e3eb9..000000000
--- a/pkg/contexts/oci/cpi/repotypes.go
+++ /dev/null
@@ -1,36 +0,0 @@
-package cpi
-
-// this file is identical for contexts oci and credentials and similar for
-// ocm.
-
-import (
- "github.com/open-component-model/ocm/pkg/runtime"
-)
-
-type RepositoryTypeVersionScheme = runtime.TypeVersionScheme[RepositorySpec, RepositoryType]
-
-func NewRepositoryTypeVersionScheme(kind string) RepositoryTypeVersionScheme {
- return runtime.NewTypeVersionScheme[RepositorySpec, RepositoryType](kind, newStrictRepositoryTypeScheme())
-}
-
-func RegisterRepositoryType(rtype RepositoryType) {
- defaultRepositoryTypeScheme.Register(rtype)
-}
-
-func RegisterRepositoryTypeVersions(s RepositoryTypeVersionScheme) {
- defaultRepositoryTypeScheme.AddKnownTypes(s)
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-func NewRepositoryType[I RepositorySpec](name string) RepositoryType {
- return runtime.NewVersionedTypedObjectType[RepositorySpec, I](name)
-}
-
-func NewRepositoryTypeByConverter[I RepositorySpec, V runtime.TypedObject](name string, converter runtime.Converter[I, V]) RepositoryType {
- return runtime.NewVersionedTypedObjectTypeByConverter[RepositorySpec, I](name, converter)
-}
-
-func NewRepositoryTypeByFormatVersion(name string, fmt runtime.FormatVersion[RepositorySpec]) RepositoryType {
- return runtime.NewVersionedTypedObjectTypeByFormatVersion[RepositorySpec](name, fmt)
-}
diff --git a/pkg/contexts/oci/cpi/state.go b/pkg/contexts/oci/cpi/state.go
deleted file mode 100644
index 1abc4808a..000000000
--- a/pkg/contexts/oci/cpi/state.go
+++ /dev/null
@@ -1,84 +0,0 @@
-package cpi
-
-import (
- "reflect"
-
- "github.com/open-component-model/ocm/pkg/common/accessobj"
- "github.com/open-component-model/ocm/pkg/contexts/oci/artdesc"
-)
-
-type ManifestStateHandler struct{}
-
-var _ accessobj.StateHandler = &ManifestStateHandler{}
-
-func NewManifestStateHandler() accessobj.StateHandler {
- return &ManifestStateHandler{}
-}
-
-func (i ManifestStateHandler) Initial() interface{} {
- return artdesc.NewManifest()
-}
-
-func (i ManifestStateHandler) Encode(d interface{}) ([]byte, error) {
- return artdesc.EncodeManifest(d.(*artdesc.Manifest))
-}
-
-func (i ManifestStateHandler) Decode(data []byte) (interface{}, error) {
- return artdesc.DecodeManifest(data)
-}
-
-func (i ManifestStateHandler) Equivalent(a, b interface{}) bool {
- return reflect.DeepEqual(a, b)
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-type IndexStateHandler struct{}
-
-var _ accessobj.StateHandler = &IndexStateHandler{}
-
-func NewIndexStateHandler() accessobj.StateHandler {
- return &IndexStateHandler{}
-}
-
-func (i IndexStateHandler) Initial() interface{} {
- return artdesc.NewIndex()
-}
-
-func (i IndexStateHandler) Encode(d interface{}) ([]byte, error) {
- return artdesc.EncodeIndex(d.(*artdesc.Index))
-}
-
-func (i IndexStateHandler) Decode(data []byte) (interface{}, error) {
- return artdesc.DecodeIndex(data)
-}
-
-func (i IndexStateHandler) Equivalent(a, b interface{}) bool {
- return reflect.DeepEqual(a, b)
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-type ArtifactStateHandler struct{}
-
-var _ accessobj.StateHandler = &ArtifactStateHandler{}
-
-func NewArtifactStateHandler() accessobj.StateHandler {
- return &ArtifactStateHandler{}
-}
-
-func (i ArtifactStateHandler) Initial() interface{} {
- return artdesc.New()
-}
-
-func (i ArtifactStateHandler) Encode(d interface{}) ([]byte, error) {
- return artdesc.Encode(d.(*artdesc.Artifact))
-}
-
-func (i ArtifactStateHandler) Decode(data []byte) (interface{}, error) {
- return artdesc.Decode(data)
-}
-
-func (i ArtifactStateHandler) Equivalent(a, b interface{}) bool {
- return reflect.DeepEqual(a, b)
-}
diff --git a/pkg/contexts/oci/cpi/support/artifact.go b/pkg/contexts/oci/cpi/support/artifact.go
deleted file mode 100644
index a2ed0493f..000000000
--- a/pkg/contexts/oci/cpi/support/artifact.go
+++ /dev/null
@@ -1,271 +0,0 @@
-package support
-
-import (
- "compress/gzip"
- "fmt"
- "io"
-
- "github.com/mandelsoft/goutils/errors"
- "github.com/opencontainers/go-digest"
-
- "github.com/open-component-model/ocm/pkg/blobaccess/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/oci/artdesc"
- "github.com/open-component-model/ocm/pkg/contexts/oci/cpi"
- "github.com/open-component-model/ocm/pkg/contexts/oci/internal"
-)
-
-var ErrNoIndex = errors.New("manifest does not support access to subsequent artifacts")
-
-type ArtifactAccessImpl struct {
- cpi.ArtifactAccessImplBase
- artifactBase
-}
-
-var _ cpi.ArtifactAccessImpl = (*ArtifactAccessImpl)(nil)
-
-func NewArtifactForBlob(container NamespaceAccessImpl, blob blobaccess.BlobAccess, closer ...io.Closer) (cpi.ArtifactAccess, error) {
- mode := accessobj.ACC_WRITABLE
- if container.IsReadOnly() {
- mode = accessobj.ACC_READONLY
- }
- state, err := accessobj.NewBlobStateForBlob(mode, blob, cpi.NewArtifactStateHandler())
- if err != nil {
- return nil, err
- }
- return newArtifact(container, state, closer...)
-}
-
-func NewArtifact(container NamespaceAccessImpl, defs ...cpi.Artifact) (cpi.ArtifactAccess, error) {
- var def cpi.Artifact
- if len(defs) != 0 && defs[0] != nil && defs[0].IsValid() {
- def = defs[0].Artifact()
- }
- mode := accessobj.ACC_WRITABLE
- if container.IsReadOnly() {
- mode = accessobj.ACC_READONLY
- }
- state, err := accessobj.NewBlobStateForObject(mode, def, cpi.NewArtifactStateHandler())
- if err != nil {
- return nil, fmt.Errorf("failed to fetch new blob state: %w", err)
- }
- return newArtifact(container, state)
-}
-
-func newArtifact(container NamespaceAccessImpl, state accessobj.State, closer ...io.Closer) (cpi.ArtifactAccess, error) {
- base, err := cpi.NewArtifactAccessImplBase(container, closer...)
- if err != nil {
- return nil, err
- }
- impl := &ArtifactAccessImpl{
- ArtifactAccessImplBase: *base,
- artifactBase: newArtifactBase(container, state),
- }
- return cpi.NewArtifactAccess(impl), nil
-}
-
-func (a *ArtifactAccessImpl) AddBlob(access cpi.BlobAccess) error {
- return a.container.AddBlob(access)
-}
-
-func (a *ArtifactAccessImpl) NewArtifact(art ...cpi.Artifact) (cpi.ArtifactAccess, error) {
- if !a.IsIndex() {
- return nil, ErrNoIndex
- }
- if a.IsReadOnly() {
- return nil, accessio.ErrReadOnly
- }
- return NewArtifact(a.container, art...)
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-func (a *ArtifactAccessImpl) Artifact() *artdesc.Artifact {
- return a.GetDescriptor()
-}
-
-func (a *ArtifactAccessImpl) GetDescriptor() *artdesc.Artifact {
- d := a.state.GetState().(*artdesc.Artifact)
- if d.IsValid() {
- return d
- }
- return nil
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// from artdesc.Artifact
-
-func (a *ArtifactAccessImpl) GetBlobDescriptor(digest digest.Digest) *cpi.Descriptor {
- d := a.GetDescriptor().GetBlobDescriptor(digest)
- /*
- if d == nil {
- d = a.container.GetBlobDescriptor(digest)
- }
- */
- return d
-}
-
-func (a *ArtifactAccessImpl) Index() (*artdesc.Index, error) {
- a.lock.Lock()
- defer a.lock.Unlock()
- d, ok := a.state.GetState().(*artdesc.Artifact)
- if !ok {
- return nil, fmt.Errorf("failed to assert type %T to *artdesc.Artifact", a.state.GetState())
- }
- if !d.IsValid() {
- idx := artdesc.NewIndex()
- if err := d.SetIndex(idx); err != nil {
- return nil, errors.Newf("artifact is manifest")
- }
- }
- return d.Index()
-}
-
-func (a *ArtifactAccessImpl) Manifest() (*artdesc.Manifest, error) {
- a.lock.Lock()
- defer a.lock.Unlock()
- d := a.state.GetState().(*artdesc.Artifact)
- if !d.IsValid() {
- m := artdesc.NewManifest()
- if err := d.SetManifest(m); err != nil {
- return nil, errors.Newf("artifact is index")
- }
- }
- return d.Manifest()
-}
-
-func (a *ArtifactAccessImpl) ManifestAccess(v cpi.ArtifactAccess) internal.ManifestAccess {
- a.lock.Lock()
- defer a.lock.Unlock()
- d := a.state.GetState().(*artdesc.Artifact)
- if !d.IsManifest() {
- m := artdesc.NewManifest()
- if err := d.SetManifest(m); err != nil {
- return nil
- }
- }
- return NewManifestForArtifact(v, a)
-}
-
-func (a *ArtifactAccessImpl) IndexAccess(v cpi.ArtifactAccess) internal.IndexAccess {
- a.lock.Lock()
- defer a.lock.Unlock()
- d := a.state.GetState().(*artdesc.Artifact)
- if !d.IsIndex() {
- i := artdesc.NewIndex()
- if err := d.SetIndex(i); err != nil {
- return nil
- }
- }
- return NewIndexForArtifact(v, a)
-}
-
-func (a *ArtifactAccessImpl) GetArtifact(digest digest.Digest) (cpi.ArtifactAccess, error) {
- if !a.IsIndex() {
- return nil, ErrNoIndex
- }
- return a.container.GetArtifact("@" + digest.String())
-}
-
-func (a *ArtifactAccessImpl) GetBlobData(digest digest.Digest) (int64, cpi.DataAccess, error) {
- return a.container.GetBlobData(digest)
-}
-
-func (a *ArtifactAccessImpl) GetBlob(digest digest.Digest) (cpi.BlobAccess, error) {
- d := a.GetBlobDescriptor(digest)
- if d != nil {
- size, data, err := a.container.GetBlobData(digest)
- if err != nil {
- return nil, err
- }
- err = AdjustSize(d, size)
- if err != nil {
- return nil, err
- }
- return blobaccess.ForDataAccess(d.Digest, d.Size, d.MediaType, data), nil
- }
- return nil, cpi.ErrBlobNotFound(digest)
-}
-
-func (a *ArtifactAccessImpl) AddArtifact(art cpi.Artifact, platform *artdesc.Platform) (cpi.BlobAccess, error) {
- if a.IsReadOnly() {
- return nil, accessio.ErrReadOnly
- }
- d, err := a.Index()
- if err != nil {
- return nil, err
- }
-
- a.lock.Lock()
- defer a.lock.Unlock()
-
- blob, err := a.container.AddArtifact(art)
- if err != nil {
- return nil, err
- }
- d.Manifests = append(d.Manifests, cpi.Descriptor{
- MediaType: blob.MimeType(),
- Digest: blob.Digest(),
- Size: blob.Size(),
- URLs: nil,
- Annotations: nil,
- Platform: platform,
- })
- return blob, nil
-}
-
-func (a *ArtifactAccessImpl) AddLayer(blob cpi.BlobAccess, d *cpi.Descriptor) (int, error) {
- if a.IsReadOnly() {
- return -1, accessio.ErrReadOnly
- }
- m, err := a.Manifest()
- if err != nil {
- return -1, err
- }
-
- a.lock.Lock()
- defer a.lock.Unlock()
- if d == nil {
- d = &artdesc.Descriptor{}
- }
- d.Digest = blob.Digest()
- d.Size = blob.Size()
- if d.MediaType == "" {
- d.MediaType = blob.MimeType()
- if d.MediaType == "" {
- d.MediaType = artdesc.MediaTypeImageLayer
- r, err := blob.Reader()
- if err != nil {
- return -1, err
- }
- defer r.Close()
- zr, err := gzip.NewReader(r)
- if err == nil {
- err = zr.Close()
- if err == nil {
- d.MediaType = artdesc.MediaTypeImageLayerGzip
- }
- }
- }
- }
-
- err = a.container.AddBlob(blob)
- if err != nil {
- return -1, err
- }
-
- m.Layers = append(m.Layers, *d)
- return len(m.Layers) - 1, nil
-}
-
-func AdjustSize(d *artdesc.Descriptor, size int64) error {
- if size != blobaccess.BLOB_UNKNOWN_SIZE {
- if d.Size == blobaccess.BLOB_UNKNOWN_SIZE {
- d.Size = size
- } else if d.Size != size {
- return errors.Newf("blob size mismatch %d != %d", size, d.Size)
- }
- }
- return nil
-}
diff --git a/pkg/contexts/oci/cpi/support/namespace.go b/pkg/contexts/oci/cpi/support/namespace.go
deleted file mode 100644
index 99a78d743..000000000
--- a/pkg/contexts/oci/cpi/support/namespace.go
+++ /dev/null
@@ -1,113 +0,0 @@
-package support
-
-import (
- "github.com/mandelsoft/goutils/errors"
- "github.com/opencontainers/go-digest"
-
- "github.com/open-component-model/ocm/pkg/blobaccess/blobaccess"
- "github.com/open-component-model/ocm/pkg/common/accessio"
- "github.com/open-component-model/ocm/pkg/contexts/oci/cpi"
- "github.com/open-component-model/ocm/pkg/refmgmt"
-)
-
-// BlobProvider manages the technical access to blobs.
-type BlobProvider interface {
- refmgmt.Allocatable
- cpi.BlobSource
- cpi.BlobSink
-}
-
-// NamespaceContainer is the interface used by subsequent access objects
-// to access the base implementation.
-type NamespaceContainer interface {
- SetImplementation(impl NamespaceAccessImpl)
-
- IsReadOnly() bool
- // IsClosed() bool
-
- cpi.BlobSource
- cpi.BlobSink
-
- Close() error
-
- // GetBlobDescriptor(digest digest.Digest) *cpi.Descriptor
-
- GetArtifact(i NamespaceAccessImpl, vers string) (cpi.ArtifactAccess, error)
- NewArtifact(i NamespaceAccessImpl, arts ...cpi.Artifact) (cpi.ArtifactAccess, error)
-
- AddArtifact(artifact cpi.Artifact, tags ...string) (access blobaccess.BlobAccess, err error)
-
- AddTags(digest digest.Digest, tags ...string) error
- ListTags() ([]string, error)
- HasArtifact(vers string) (bool, error)
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-type NamespaceAccessImpl interface {
- cpi.NamespaceAccessImpl
-
- // GetBlobDescriptor(digest digest.Digest) *cpi.Descriptor
- IsReadOnly() bool
-
- WithContainer(container NamespaceContainer) NamespaceAccessImpl
-}
-
-type namespaceAccessImpl struct {
- *cpi.NamespaceAccessImplBase
- NamespaceContainer // inherit as many as possible methods for cpi.NamespaceAccessImpl
-}
-
-var _ NamespaceAccessImpl = (*namespaceAccessImpl)(nil)
-
-func NewNamespaceAccessImpl(namespace string, c NamespaceContainer, repo cpi.RepositoryViewManager) (NamespaceAccessImpl, error) {
- base, err := cpi.NewNamespaceAccessImplBase(namespace, repo)
- if err != nil {
- return nil, err
- }
- impl := &namespaceAccessImpl{
- NamespaceAccessImplBase: base,
- NamespaceContainer: c,
- }
-
- c.SetImplementation(impl)
- return impl, nil
-}
-
-func (n *namespaceAccessImpl) Close() error {
- return accessio.Close(n.NamespaceAccessImplBase, n.NamespaceContainer)
-}
-
-func NewNamespaceAccess(namespace string, c NamespaceContainer, repo cpi.RepositoryViewManager, kind ...string) (cpi.NamespaceAccess, error) {
- impl, err := NewNamespaceAccessImpl(namespace, c, repo)
- if err != nil {
- return nil, err
- }
- return cpi.NewNamespaceAccess(impl, kind...), nil
-}
-
-func GetArtifactSetContainer(i cpi.NamespaceAccessImpl) (NamespaceContainer, error) {
- if c, ok := i.(*namespaceAccessImpl); ok {
- return c.NamespaceContainer, nil
- }
- return nil, errors.ErrNotSupported()
-}
-
-func (i *namespaceAccessImpl) WithContainer(c NamespaceContainer) NamespaceAccessImpl {
- return &namespaceAccessImpl{
- NamespaceAccessImplBase: i.NamespaceAccessImplBase,
- NamespaceContainer: c,
- }
-}
-
-func (i *namespaceAccessImpl) GetArtifact(vers string) (cpi.ArtifactAccess, error) {
- return i.NamespaceContainer.GetArtifact(i, vers)
-}
-
-func (i *namespaceAccessImpl) AddArtifact(artifact cpi.Artifact, tags ...string) (access blobaccess.BlobAccess, err error) {
- return i.NamespaceContainer.AddArtifact(artifact, tags...)
-}
-
-func (i *namespaceAccessImpl) NewArtifact(arts ...cpi.Artifact) (cpi.ArtifactAccess, error) {
- return i.NamespaceContainer.NewArtifact(i, arts...)
-}
diff --git a/pkg/contexts/oci/cpi/utils.go b/pkg/contexts/oci/cpi/utils.go
deleted file mode 100644
index 5eec403f9..000000000
--- a/pkg/contexts/oci/cpi/utils.go
+++ /dev/null
@@ -1,63 +0,0 @@
-package cpi
-
-import (
- "strings"
-
- "github.com/open-component-model/ocm/pkg/contexts/oci/grammar"
-)
-
-type StringList []string
-
-func (s *StringList) Add(n string) {
- for _, e := range *s {
- if n == e {
- return
- }
- }
- *s = append(*s, n)
-}
-
-func FilterByNamespacePrefix(prefix string, list []string) []string {
- result := []string{}
- sub := prefix
- if prefix != "" && !strings.HasSuffix(prefix, grammar.RepositorySeparator) {
- sub = prefix + grammar.RepositorySeparator
- }
- for _, k := range list {
- if k == prefix || strings.HasPrefix(k, sub) {
- result = append(result, k)
- }
- }
- return result
-}
-
-func FilterChildren(closure bool, prefix string, list []string) []string {
- if closure {
- return FilterByNamespacePrefix(prefix, list)
- }
- sub := prefix
- if prefix != "" && !strings.HasSuffix(prefix, grammar.RepositorySeparator) {
- sub = prefix + grammar.RepositorySeparator
- }
- set := map[string]bool{}
- for _, n := range list {
- if n == prefix {
- set[n] = true
- } else if strings.HasPrefix(n, sub) {
- rest := n[len(sub):]
- i := strings.Index(rest, grammar.RepositorySeparator)
- if i < 0 {
- set[n] = true
- } else {
- set[n[:i+len(sub)]] = true
- }
- }
- }
- result := make([]string, 0, len(set))
- for _, n := range list {
- if set[n] {
- result = append(result, n)
- }
- }
- return result
-}
diff --git a/pkg/contexts/oci/cpi/utils_test.go b/pkg/contexts/oci/cpi/utils_test.go
deleted file mode 100644
index 7f5fa8347..000000000
--- a/pkg/contexts/oci/cpi/utils_test.go
+++ /dev/null
@@ -1,62 +0,0 @@
-package cpi_test
-
-import (
- . "github.com/onsi/ginkgo/v2"
- . "github.com/onsi/gomega"
-
- "github.com/open-component-model/ocm/pkg/contexts/oci/cpi"
-)
-
-var _ = Describe("OCI CPI utils", func() {
- list := []string{
- "a/b/c/d",
- "a/b/c",
- "a/b",
- "a/c/d",
- "a/c",
- "b/c",
- }
-
- It("calculates exclusive number", func() {
- Expect(cpi.FilterByNamespacePrefix("a/b/", list)).To(Equal([]string{
- "a/b/c/d",
- "a/b/c",
- }))
- })
- It("calculates inclusive number", func() {
- Expect(cpi.FilterByNamespacePrefix("a/b", list)).To(Equal([]string{
- "a/b/c/d",
- "a/b/c",
- "a/b",
- }))
- })
-
- It("calculates closure", func() {
- Expect(cpi.FilterChildren(true, "a/b", list)).To(Equal([]string{
- "a/b/c/d",
- "a/b/c",
- "a/b",
- }))
- })
-
- It("calculates children", func() {
- Expect(cpi.FilterChildren(false, "a/b/", list)).To(Equal([]string{
- "a/b/c",
- }))
- })
-
- It("calculates inclusive children", func() {
- Expect(cpi.FilterChildren(false, "a/b", list)).To(Equal([]string{
- "a/b/c",
- "a/b",
- }))
- })
-
- It("calculates children closure", func() {
- Expect(cpi.FilterChildren(true, "a/b", cpi.FilterByNamespacePrefix("a/b", list))).To(Equal([]string{
- "a/b/c/d",
- "a/b/c",
- "a/b",
- }))
- })
-})
diff --git a/pkg/contexts/oci/cpi/view.go b/pkg/contexts/oci/cpi/view.go
deleted file mode 100644
index 4c7bccc26..000000000
--- a/pkg/contexts/oci/cpi/view.go
+++ /dev/null
@@ -1,397 +0,0 @@
-package cpi
-
-import (
- "fmt"
- "io"
-
- "github.com/mandelsoft/goutils/errors"
- "github.com/opencontainers/go-digest"
-
- "github.com/open-component-model/ocm/pkg/contexts/credentials"
- "github.com/open-component-model/ocm/pkg/contexts/oci/artdesc"
- "github.com/open-component-model/ocm/pkg/contexts/oci/internal"
- "github.com/open-component-model/ocm/pkg/refmgmt/resource"
- "github.com/open-component-model/ocm/pkg/utils"
-)
-
-var ErrClosed = resource.ErrClosed
-
-////////////////////////////////////////////////////////////////////////////////
-
-type _RepositoryView interface {
- resource.ResourceViewInt[Repository] // here you have to redeclare
-}
-
-type RepositoryViewManager = resource.ViewManager[Repository] // here you have to use an alias
-
-type RepositoryImpl interface {
- internal.RepositoryImpl
- resource.ResourceImplementation[Repository]
-}
-
-type _RepositoryImplBase = resource.ResourceImplBase[Repository]
-
-type RepositoryImplBase struct {
- _RepositoryImplBase
- ctx Context
-}
-
-func (b *RepositoryImplBase) GetContext() Context {
- return b.ctx
-}
-
-func NewRepositoryImplBase(ctx Context) RepositoryImplBase {
- return RepositoryImplBase{
- _RepositoryImplBase: resource.ResourceImplBase[Repository]{},
- ctx: ctx,
- }
-}
-
-type repositoryView struct {
- _RepositoryView
- impl RepositoryImpl
-}
-
-var (
- _ Repository = (*repositoryView)(nil)
- _ internal.ConsumerIdentityProvider = (*repositoryView)(nil)
-)
-
-func GetRepositoryImplementation(n Repository) (RepositoryImpl, error) {
- if v, ok := n.(*repositoryView); ok {
- return v.impl, nil
- }
- return nil, errors.ErrNotSupported("repository implementation type", fmt.Sprintf("%T", n))
-}
-
-func repositoryViewCreator(i RepositoryImpl, v resource.CloserView, d RepositoryViewManager) Repository {
- return &repositoryView{
- _RepositoryView: resource.NewView[Repository](v, d),
- impl: i,
- }
-}
-
-func NewRepository(impl RepositoryImpl, name ...string) Repository {
- return resource.NewResource[Repository](impl, repositoryViewCreator, utils.OptionalDefaulted("OCI repo", name...), true)
-}
-
-func (r *repositoryView) GetConsumerId(uctx ...credentials.UsageContext) credentials.ConsumerIdentity {
- return credentials.GetProvidedConsumerId(r.impl, uctx...)
-}
-
-func (r *repositoryView) GetIdentityMatcher() string {
- return credentials.GetProvidedIdentityMatcher(r.impl)
-}
-
-func (r *repositoryView) GetSpecification() internal.RepositorySpec {
- return r.impl.GetSpecification()
-}
-
-func (r *repositoryView) GetContext() Context {
- return r.impl.GetContext()
-}
-
-func (r *repositoryView) NamespaceLister() (lister internal.NamespaceLister) {
- return r.impl.NamespaceLister()
-}
-
-func (r *repositoryView) ExistsArtifact(name string, ref string) (ok bool, err error) {
- err = r.Execute(func() error {
- ok, err = r.impl.ExistsArtifact(name, ref)
- return err
- })
- return ok, err
-}
-
-func (r *repositoryView) LookupArtifact(name string, ref string) (acc ArtifactAccess, err error) {
- err = r.Execute(func() error {
- acc, err = r.impl.LookupArtifact(name, ref)
- return err
- })
- return acc, err
-}
-
-func (r *repositoryView) LookupNamespace(name string) (acc NamespaceAccess, err error) {
- err = r.Execute(func() error {
- acc, err = r.impl.LookupNamespace(name)
- return err
- })
- return acc, err
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-type _NamespaceAccessView interface {
- resource.ResourceViewInt[NamespaceAccess] // here you have to redeclare
-}
-
-type NamespaceAccessViewManager = resource.ViewManager[NamespaceAccess] // here you have to use an alias
-
-type NamespaceAccessImpl interface {
- internal.NamespaceAccessImpl
-
- resource.ResourceImplementation[NamespaceAccess]
-
- GetNamespace() string
-}
-
-type _NamespaceAccessImplBase = resource.ResourceImplBase[NamespaceAccess]
-
-type NamespaceAccessImplBase struct {
- *_NamespaceAccessImplBase
- namespace string
-}
-
-func NewNamespaceAccessImplBase(namespace string, repo RepositoryViewManager, closer ...io.Closer) (*NamespaceAccessImplBase, error) {
- base, err := resource.NewResourceImplBase[NamespaceAccess](repo, closer...)
- if err != nil {
- return nil, err
- }
- return &NamespaceAccessImplBase{
- _NamespaceAccessImplBase: base,
- namespace: namespace,
- }, nil
-}
-
-func (b *NamespaceAccessImplBase) GetNamespace() string {
- return b.namespace
-}
-
-type namespaceAccessView struct {
- _NamespaceAccessView
- impl NamespaceAccessImpl
-}
-
-var _ NamespaceAccess = (*namespaceAccessView)(nil)
-
-func GetNamespaceAccessImplementation(n NamespaceAccess) (NamespaceAccessImpl, error) {
- if v, ok := n.(*namespaceAccessView); ok {
- return v.impl, nil
- }
- return nil, errors.ErrNotSupported("namespace implementation type", fmt.Sprintf("%T", n))
-}
-
-func namespaceAccessViewCreator(i NamespaceAccessImpl, v resource.CloserView, d NamespaceAccessViewManager) NamespaceAccess {
- return &namespaceAccessView{
- _NamespaceAccessView: resource.NewView[NamespaceAccess](v, d),
- impl: i,
- }
-}
-
-func NewNamespaceAccess(impl NamespaceAccessImpl, kind ...string) NamespaceAccess {
- return resource.NewResource[NamespaceAccess](impl, namespaceAccessViewCreator, fmt.Sprintf("%s %s", utils.OptionalDefaulted("namespace", kind...), impl.GetNamespace()), true)
-}
-
-func (n *namespaceAccessView) GetNamespace() string {
- return n.impl.GetNamespace()
-}
-
-func (n *namespaceAccessView) GetArtifact(version string) (acc internal.ArtifactAccess, err error) {
- err = n.Execute(func() error {
- acc, err = n.impl.GetArtifact(version)
- return err
- })
- return acc, err
-}
-
-func (n *namespaceAccessView) GetBlobData(digest digest.Digest) (size int64, acc internal.DataAccess, err error) {
- err = n.Execute(func() error {
- size, acc, err = n.impl.GetBlobData(digest)
- return err
- })
- return size, acc, err
-}
-
-func (n *namespaceAccessView) AddBlob(access internal.BlobAccess) error {
- return n.Execute(func() error {
- return n.impl.AddBlob(access)
- })
-}
-
-func (n *namespaceAccessView) HasArtifact(vers string) (ok bool, err error) {
- err = n.Execute(func() error {
- ok, err = n.impl.HasArtifact(vers)
- return err
- })
- return ok, err
-}
-
-func (n *namespaceAccessView) AddArtifact(a internal.Artifact, tags ...string) (acc internal.BlobAccess, err error) {
- err = n.Execute(func() error {
- acc, err = n.impl.AddArtifact(a, tags...)
- return err
- })
- return acc, err
-}
-
-func (n *namespaceAccessView) AddTags(digest digest.Digest, tags ...string) error {
- return n.Execute(func() error {
- return n.impl.AddTags(digest, tags...)
- })
-}
-
-func (n *namespaceAccessView) ListTags() (list []string, err error) {
- err = n.Execute(func() error {
- list, err = n.impl.ListTags()
- return err
- })
- return list, err
-}
-
-func (n *namespaceAccessView) NewArtifact(artifact ...Artifact) (acc internal.ArtifactAccess, err error) {
- err = n.Execute(func() error {
- acc, err = n.impl.NewArtifact(artifact...)
- return err
- })
- return acc, err
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-type _ArtifactAccessView interface {
- resource.ResourceViewInt[ArtifactAccess]
-}
-
-type ArtifactAccessViewManager = resource.ViewManager[ArtifactAccess]
-
-type ArtifactAccessImpl interface {
- internal.ArtifactAccessImpl
-
- resource.ResourceImplementation[ArtifactAccess]
-
- // creation of slave objects require the original view they are created for.
-
- ManifestAccess(ArtifactAccess) ManifestAccess
- IndexAccess(ArtifactAccess) IndexAccess
-}
-
-type ArtifactAccessImplBase = resource.ResourceImplBase[ArtifactAccess]
-
-func NewArtifactAccessImplBase(ns NamespaceAccessViewManager, closer ...io.Closer) (*ArtifactAccessImplBase, error) {
- return resource.NewResourceImplBase[ArtifactAccess](ns, closer...)
-}
-
-type artifactAccessView struct {
- _ArtifactAccessView
- impl ArtifactAccessImpl
-}
-
-var _ ArtifactAccess = (*artifactAccessView)(nil)
-
-func artifactAccessViewCreator(i ArtifactAccessImpl, v resource.CloserView, d resource.ViewManager[ArtifactAccess]) ArtifactAccess {
- return &artifactAccessView{
- _ArtifactAccessView: resource.NewView[ArtifactAccess](v, d),
- impl: i,
- }
-}
-
-func NewArtifactAccess(impl ArtifactAccessImpl) ArtifactAccess {
- return resource.NewResource[ArtifactAccess](impl, artifactAccessViewCreator, "artifact", true)
-}
-
-func (a *artifactAccessView) IsManifest() bool {
- return a.impl.IsManifest()
-}
-
-func (a *artifactAccessView) IsIndex() bool {
- return a.impl.IsIndex()
-}
-
-func (a *artifactAccessView) IsValid() bool {
- return a.impl.IsValid()
-}
-
-func (a *artifactAccessView) Digest() digest.Digest {
- return a.impl.Digest()
-}
-
-func (a *artifactAccessView) Blob() (internal.BlobAccess, error) {
- return a.impl.Blob()
-}
-
-func (a *artifactAccessView) GetDescriptor() *artdesc.Artifact {
- return a.impl.GetDescriptor()
-}
-
-func (a *artifactAccessView) Artifact() *artdesc.Artifact {
- return a.impl.Artifact()
-}
-
-func (a *artifactAccessView) Manifest() (*artdesc.Manifest, error) {
- return a.impl.Manifest()
-}
-
-func (a *artifactAccessView) ManifestAccess() internal.ManifestAccess {
- return a.impl.ManifestAccess(a)
-}
-
-func (a *artifactAccessView) Index() (*artdesc.Index, error) {
- return a.impl.Index()
-}
-
-func (a *artifactAccessView) IndexAccess() internal.IndexAccess {
- return a.impl.IndexAccess(a)
-}
-
-func (a *artifactAccessView) GetBlobData(digest digest.Digest) (size int64, acc internal.DataAccess, err error) {
- size = -1
- err = a.Execute(func() error {
- size, acc, err = a.impl.GetBlobData(digest)
- return err
- })
- return size, acc, err
-}
-
-func (a *artifactAccessView) AddBlob(access internal.BlobAccess) error {
- if err := utils.ValidateObject(access); err != nil {
- return err
- }
- return a.Execute(func() error {
- return a.impl.AddBlob(access)
- })
-}
-
-func (a *artifactAccessView) GetBlob(digest digest.Digest) (acc internal.BlobAccess, err error) {
- err = a.Execute(func() error {
- acc, err = a.impl.GetBlob(digest)
- return err
- })
- return acc, err
-}
-
-func (a *artifactAccessView) GetArtifact(digest digest.Digest) (acc internal.ArtifactAccess, err error) {
- err = a.Execute(func() error {
- acc, err = a.impl.GetArtifact(digest)
- return err
- })
- return acc, err
-}
-
-func (a *artifactAccessView) AddArtifact(artifact internal.Artifact, platform *artdesc.Platform) (acc internal.BlobAccess, err error) {
- err = a.Execute(func() error {
- acc, err = a.impl.AddArtifact(artifact, platform)
- return err
- })
- return acc, err
-}
-
-func (a *artifactAccessView) NewArtifact(art ...Artifact) (acc ArtifactAccess, err error) {
- err = a.Execute(func() error {
- acc, err = a.impl.NewArtifact(art...)
- return err
- })
- return acc, err
-}
-
-func (a *artifactAccessView) AddLayer(access internal.BlobAccess, descriptor *artdesc.Descriptor) (index int, err error) {
- if err := utils.ValidateObject(access); err != nil {
- return -1, err
- }
-
- index = -1
- err = a.Execute(func() error {
- index, err = a.impl.AddLayer(access, descriptor)
- return err
- })
- return index, err
-}
diff --git a/pkg/contexts/oci/gc_test.go b/pkg/contexts/oci/gc_test.go
deleted file mode 100644
index bc48501b9..000000000
--- a/pkg/contexts/oci/gc_test.go
+++ /dev/null
@@ -1,34 +0,0 @@
-package oci_test
-
-import (
- "runtime"
- "time"
-
- . "github.com/onsi/ginkgo/v2"
- . "github.com/onsi/gomega"
-
- me "github.com/open-component-model/ocm/pkg/contexts/oci"
- "github.com/open-component-model/ocm/pkg/runtimefinalizer"
-)
-
-var _ = Describe("area test", func() {
- It("can be garbage collected", func() {
- ctx := me.New()
-
- r := runtimefinalizer.GetRuntimeFinalizationRecorder(ctx)
- Expect(r).NotTo(BeNil())
-
- runtime.GC()
- time.Sleep(time.Second)
- ctx.GetType()
- Expect(r.Get()).To(BeNil())
-
- ctx = nil
- for i := 0; i < 100; i++ {
- runtime.GC()
- time.Sleep(time.Millisecond)
- }
-
- Expect(r.Get()).To(ContainElement(ContainSubstring(me.CONTEXT_TYPE)))
- })
-})
diff --git a/pkg/contexts/oci/identity/deprecated.go b/pkg/contexts/oci/identity/deprecated.go
deleted file mode 100644
index 6b61c4111..000000000
--- a/pkg/contexts/oci/identity/deprecated.go
+++ /dev/null
@@ -1,51 +0,0 @@
-package identity
-
-import (
- "github.com/open-component-model/ocm/pkg/contexts/credentials/builtin/oci/identity"
- "github.com/open-component-model/ocm/pkg/contexts/credentials/cpi"
-)
-
-// CONSUMER_TYPE is the OCT registry type.
-// Deprecated: use package github.com/open-component-model/ocm/contexts/credentials/builtin/oci/identity .
-const CONSUMER_TYPE = identity.CONSUMER_TYPE
-
-// used identity properties.
-const (
- // Deprecated: use package github.com/open-component-model/ocm/contexts/credentials/builtin/oci/identity .
- ID_TYPE = identity.ID_TYPE
- // Deprecated: use package github.com/open-component-model/ocm/contexts/credentials/builtin/oci/identity .
- ID_HOSTNAME = identity.ID_HOSTNAME
- // Deprecated: use package github.com/open-component-model/ocm/contexts/credentials/builtin/oci/identity .
- ID_PORT = identity.ID_PORT
- // Deprecated: use package github.com/open-component-model/ocm/contexts/credentials/builtin/oci/identity .
- ID_PATHPREFIX = identity.ID_PATHPREFIX
- // Deprecated: use package github.com/open-component-model/ocm/contexts/credentials/builtin/oci/identity .
- ID_SCHEME = identity.ID_SCHEME
-)
-
-// used credential properties.
-const (
- // Deprecated: use package github.com/open-component-model/ocm/contexts/credentials/builtin/oci/identity .
- ATTR_USERNAME = identity.ATTR_USERNAME
- // Deprecated: use package github.com/open-component-model/ocm/contexts/credentials/builtin/oci/identity .
- ATTR_PASSWORD = identity.ID_PORT
- // Deprecated: use package github.com/open-component-model/ocm/contexts/credentials/builtin/oci/identity .
- ATTR_IDENTITY_TOKEN = identity.ATTR_IDENTITY_TOKEN
- // Deprecated: use package github.com/open-component-model/ocm/contexts/credentials/builtin/oci/identity .
- ATTR_CERTIFICATE_AUTHORITY = identity.ATTR_CERTIFICATE_AUTHORITY
-)
-
-// Deprecated: use package github.com/open-component-model/ocm/contexts/credentials/builtin/oci/identity ..
-func IdentityMatcher(pattern, cur, id cpi.ConsumerIdentity) bool {
- return identity.IdentityMatcher(pattern, cur, id)
-}
-
-// Deprecated: use package github.com/open-component-model/ocm/contexts/credentials/builtin/oci/identity .
-func GetCredentials(ctx cpi.ContextProvider, locator, repo string) (cpi.Credentials, error) {
- return identity.GetCredentials(ctx, locator, repo)
-}
-
-// Deprecated: use package github.com/open-component-model/ocm/contexts/credentials/builtin/oci/identity .
-func GetConsumerId(locator, repo string) cpi.ConsumerIdentity {
- return identity.GetConsumerId(locator, repo)
-}
diff --git a/pkg/contexts/oci/init.go b/pkg/contexts/oci/init.go
deleted file mode 100644
index 97dbc0b28..000000000
--- a/pkg/contexts/oci/init.go
+++ /dev/null
@@ -1,8 +0,0 @@
-package oci
-
-import (
- _ "github.com/open-component-model/ocm/pkg/contexts/oci/actions"
- _ "github.com/open-component-model/ocm/pkg/contexts/oci/attrs"
- _ "github.com/open-component-model/ocm/pkg/contexts/oci/config"
- _ "github.com/open-component-model/ocm/pkg/contexts/oci/repositories"
-)
diff --git a/pkg/contexts/oci/interface.go b/pkg/contexts/oci/interface.go
deleted file mode 100644
index dac0af725..000000000
--- a/pkg/contexts/oci/interface.go
+++ /dev/null
@@ -1,64 +0,0 @@
-package oci
-
-import (
- "context"
-
- "github.com/open-component-model/ocm/pkg/blobaccess/blobaccess"
- "github.com/open-component-model/ocm/pkg/contexts/oci/internal"
-)
-
-const (
- KIND_OCIARTIFACT = internal.KIND_OCIARTIFACT
- KIND_MEDIATYPE = blobaccess.KIND_MEDIATYPE
- KIND_BLOB = blobaccess.KIND_BLOB
-)
-
-const CONTEXT_TYPE = internal.CONTEXT_TYPE
-
-const CommonTransportFormat = internal.CommonTransportFormat
-
-type (
- Context = internal.Context
- ContextProvider = internal.ContextProvider
- Repository = internal.Repository
- RepositorySpecHandlers = internal.RepositorySpecHandlers
- RepositorySpecHandler = internal.RepositorySpecHandler
- UniformRepositorySpec = internal.UniformRepositorySpec
- RepositoryTypeScheme = internal.RepositoryTypeScheme
- RepositorySpec = internal.RepositorySpec
- RepositoryType = internal.RepositoryType
- IntermediateRepositorySpecAspect = internal.IntermediateRepositorySpecAspect
- GenericRepositorySpec = internal.GenericRepositorySpec
- ArtifactAccess = internal.ArtifactAccess
- NamespaceLister = internal.NamespaceLister
- NamespaceAccess = internal.NamespaceAccess
- ManifestAccess = internal.ManifestAccess
- IndexAccess = internal.IndexAccess
- BlobAccess = internal.BlobAccess
- DataAccess = internal.DataAccess
- ConsumerIdentityProvider = internal.ConsumerIdentityProvider
-)
-
-func DefaultContext() internal.Context {
- return internal.DefaultContext
-}
-
-func FromContext(ctx context.Context) Context {
- return internal.ForContext(ctx)
-}
-
-func FromProvider(p ContextProvider) Context {
- return internal.FromProvider(p)
-}
-
-func DefinedForContext(ctx context.Context) (Context, bool) {
- return internal.DefinedForContext(ctx)
-}
-
-func IsErrBlobNotFound(err error) bool {
- return blobaccess.IsErrBlobNotFound(err)
-}
-
-func ToGenericRepositorySpec(spec RepositorySpec) (*GenericRepositorySpec, error) {
- return internal.ToGenericRepositorySpec(spec)
-}
diff --git a/pkg/contexts/oci/internal/builder.go b/pkg/contexts/oci/internal/builder.go
deleted file mode 100644
index c930d7ed5..000000000
--- a/pkg/contexts/oci/internal/builder.go
+++ /dev/null
@@ -1,92 +0,0 @@
-package internal
-
-import (
- "context"
-
- "github.com/open-component-model/ocm/pkg/contexts/credentials"
- "github.com/open-component-model/ocm/pkg/contexts/datacontext"
-)
-
-type Builder struct {
- ctx context.Context
- credentials credentials.Context
- reposcheme RepositoryTypeScheme
- spechandlers RepositorySpecHandlers
-}
-
-func (b *Builder) getContext() context.Context {
- if b.ctx == nil {
- return context.Background()
- }
- return b.ctx
-}
-
-func (b Builder) WithContext(ctx context.Context) Builder {
- b.ctx = ctx
- return b
-}
-
-func (b Builder) WithCredentials(ctx credentials.Context) Builder {
- b.credentials = ctx
- return b
-}
-
-func (b Builder) WithRepositoyTypeScheme(scheme RepositoryTypeScheme) Builder {
- b.reposcheme = scheme
- return b
-}
-
-func (b Builder) WithRepositorySpecHandlers(reg RepositorySpecHandlers) Builder {
- b.spechandlers = reg
- return b
-}
-
-func (b Builder) Bound() (Context, context.Context) {
- c := b.New()
- return c, context.WithValue(b.getContext(), key, c)
-}
-
-func (b Builder) New(m ...datacontext.BuilderMode) Context {
- mode := datacontext.Mode(m...)
- ctx := b.getContext()
-
- if b.credentials == nil {
- var ok bool
- b.credentials, ok = credentials.DefinedForContext(ctx)
- if !ok && mode != datacontext.MODE_SHARED {
- b.credentials = credentials.New(mode)
- } else {
- b.credentials = credentials.FromContext(ctx)
- }
- }
- if b.reposcheme == nil {
- switch mode {
- case datacontext.MODE_INITIAL:
- b.reposcheme = NewRepositoryTypeScheme(nil)
- case datacontext.MODE_CONFIGURED:
- b.reposcheme = NewRepositoryTypeScheme(nil)
- b.reposcheme.AddKnownTypes(DefaultRepositoryTypeScheme)
- case datacontext.MODE_EXTENDED:
- b.reposcheme = NewRepositoryTypeScheme(nil, DefaultRepositoryTypeScheme)
- case datacontext.MODE_DEFAULTED:
- fallthrough
- case datacontext.MODE_SHARED:
- b.reposcheme = DefaultRepositoryTypeScheme
- }
- }
- if b.spechandlers == nil {
- switch mode {
- case datacontext.MODE_INITIAL:
- b.spechandlers = NewRepositorySpecHandlers()
- case datacontext.MODE_CONFIGURED:
- b.spechandlers = DefaultRepositorySpecHandlers.Copy()
- case datacontext.MODE_EXTENDED:
- fallthrough
- case datacontext.MODE_DEFAULTED:
- fallthrough
- case datacontext.MODE_SHARED:
- b.spechandlers = DefaultRepositorySpecHandlers
- }
- }
- return datacontext.SetupContext(mode, newContext(b.credentials, b.reposcheme, b.spechandlers, b.credentials))
-}
diff --git a/pkg/contexts/oci/internal/builder_test.go b/pkg/contexts/oci/internal/builder_test.go
deleted file mode 100644
index ea13e485a..000000000
--- a/pkg/contexts/oci/internal/builder_test.go
+++ /dev/null
@@ -1,71 +0,0 @@
-package internal_test
-
-import (
- . "github.com/onsi/ginkgo/v2"
- . "github.com/onsi/gomega"
-
- "github.com/open-component-model/ocm/pkg/contexts/config"
- "github.com/open-component-model/ocm/pkg/contexts/credentials"
- "github.com/open-component-model/ocm/pkg/contexts/datacontext"
- local "github.com/open-component-model/ocm/pkg/contexts/oci/internal"
-)
-
-var _ = Describe("builder test", func() {
- It("creates local", func() {
- ctx := local.Builder{}.New(datacontext.MODE_SHARED)
-
- Expect(ctx.AttributesContext()).To(BeIdenticalTo(datacontext.DefaultContext))
- Expect(ctx).NotTo(BeIdenticalTo(local.DefaultContext))
- Expect(ctx.RepositoryTypes()).To(BeIdenticalTo(local.DefaultRepositoryTypeScheme))
-
- Expect(ctx.ConfigContext().GetId()).To(BeIdenticalTo(config.DefaultContext().GetId()))
-
- Expect(ctx.CredentialsContext()).To(BeIdenticalTo(credentials.DefaultContext()))
- })
-
- It("creates defaulted", func() {
- ctx := local.Builder{}.New(datacontext.MODE_DEFAULTED)
-
- Expect(ctx.AttributesContext()).NotTo(BeIdenticalTo(datacontext.DefaultContext))
- Expect(ctx).NotTo(BeIdenticalTo(local.DefaultContext))
- Expect(ctx.RepositoryTypes()).To(BeIdenticalTo(local.DefaultRepositoryTypeScheme))
-
- Expect(ctx.ConfigContext()).NotTo(BeIdenticalTo(config.DefaultContext()))
- Expect(ctx.ConfigContext().ConfigTypes()).To(BeIdenticalTo(config.DefaultContext().ConfigTypes()))
-
- Expect(ctx.CredentialsContext()).NotTo(BeIdenticalTo(credentials.DefaultContext()))
- Expect(ctx.CredentialsContext().RepositoryTypes()).To(BeIdenticalTo(credentials.DefaultContext().RepositoryTypes()))
- })
-
- It("creates configured", func() {
- ctx := local.Builder{}.New(datacontext.MODE_CONFIGURED)
-
- Expect(ctx.AttributesContext()).NotTo(BeIdenticalTo(datacontext.DefaultContext))
- Expect(ctx).NotTo(BeIdenticalTo(local.DefaultContext))
- Expect(ctx.RepositoryTypes()).NotTo(BeIdenticalTo(local.DefaultRepositoryTypeScheme))
- Expect(ctx.RepositoryTypes().KnownTypeNames()).To(Equal(local.DefaultRepositoryTypeScheme.KnownTypeNames()))
-
- Expect(ctx.ConfigContext()).NotTo(BeIdenticalTo(config.DefaultContext()))
- Expect(ctx.ConfigContext().ConfigTypes()).NotTo(BeIdenticalTo(config.DefaultContext().ConfigTypes()))
- Expect(ctx.ConfigContext().ConfigTypes().KnownTypeNames()).To(Equal(config.DefaultContext().ConfigTypes().KnownTypeNames()))
-
- Expect(ctx.CredentialsContext()).NotTo(BeIdenticalTo(config.DefaultContext()))
- Expect(ctx.CredentialsContext().RepositoryTypes()).NotTo(BeIdenticalTo(credentials.DefaultContext().RepositoryTypes()))
- Expect(ctx.CredentialsContext().RepositoryTypes().KnownTypeNames()).To(Equal(credentials.DefaultContext().RepositoryTypes().KnownTypeNames()))
- })
-
- It("creates iniial", func() {
- ctx := local.Builder{}.New(datacontext.MODE_INITIAL)
-
- Expect(ctx.AttributesContext()).NotTo(BeIdenticalTo(datacontext.DefaultContext))
- Expect(ctx).NotTo(BeIdenticalTo(local.DefaultContext))
- Expect(ctx.RepositoryTypes()).NotTo(BeIdenticalTo(local.DefaultRepositoryTypeScheme))
- Expect(len(ctx.RepositoryTypes().KnownTypeNames())).To(Equal(0))
-
- Expect(ctx.ConfigContext()).NotTo(BeIdenticalTo(config.DefaultContext()))
- Expect(len(ctx.ConfigContext().ConfigTypes().KnownTypeNames())).To(Equal(0))
-
- Expect(ctx.CredentialsContext()).NotTo(BeIdenticalTo(credentials.DefaultContext()))
- Expect(len(ctx.CredentialsContext().RepositoryTypes().KnownTypeNames())).To(Equal(0))
- })
-})
diff --git a/pkg/contexts/oci/internal/context.go b/pkg/contexts/oci/internal/context.go
deleted file mode 100644
index 36f279b16..000000000
--- a/pkg/contexts/oci/internal/context.go
+++ /dev/null
@@ -1,195 +0,0 @@
-package internal
-
-import (
- "context"
- "reflect"
- "strings"
-
- "github.com/open-component-model/ocm/pkg/contexts/config"
- cfgcpi "github.com/open-component-model/ocm/pkg/contexts/config/cpi"
- "github.com/open-component-model/ocm/pkg/contexts/credentials"
- "github.com/open-component-model/ocm/pkg/contexts/datacontext"
- "github.com/open-component-model/ocm/pkg/runtime"
- "github.com/open-component-model/ocm/pkg/utils"
-)
-
-const CONTEXT_TYPE = "oci" + datacontext.OCM_CONTEXT_SUFFIX
-
-const CommonTransportFormat = "CommonTransportFormat"
-
-type ContextProvider interface {
- OCIContext() Context
-}
-
-type Context interface {
- datacontext.Context
- config.ContextProvider
- credentials.ContextProvider
- ContextProvider
-
- RepositorySpecHandlers() RepositorySpecHandlers
- MapUniformRepositorySpec(u *UniformRepositorySpec) (RepositorySpec, error)
-
- RepositoryTypes() RepositoryTypeScheme
-
- RepositoryForSpec(spec RepositorySpec, creds ...credentials.CredentialsSource) (Repository, error)
- RepositoryForConfig(data []byte, unmarshaler runtime.Unmarshaler, creds ...credentials.CredentialsSource) (Repository, error)
- RepositorySpecForConfig(data []byte, unmarshaler runtime.Unmarshaler) (RepositorySpec, error)
-
- GetAlias(name string) RepositorySpec
- SetAlias(name string, spec RepositorySpec)
-}
-
-var key = reflect.TypeOf(_context{})
-
-// DefaultContext is the default context initialized by init functions.
-var DefaultContext = Builder{}.New(datacontext.MODE_SHARED)
-
-// ForContext returns the Context to use for context.Context.
-// This is either an explicit context or the default context.
-func ForContext(ctx context.Context) Context {
- c, _ := datacontext.ForContextByKey(ctx, key, DefaultContext)
- return c.(Context)
-}
-
-func FromProvider(p ContextProvider) Context {
- if p == nil {
- return nil
- }
- return p.OCIContext()
-}
-
-func DefinedForContext(ctx context.Context) (Context, bool) {
- c, ok := datacontext.ForContextByKey(ctx, key, DefaultContext)
- if c != nil {
- return c.(Context), ok
- }
- return nil, ok
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-type _InternalContext = datacontext.InternalContext
-
-type _context struct {
- _InternalContext
- updater cfgcpi.Updater
-
- credentials credentials.Context
-
- knownRepositoryTypes RepositoryTypeScheme
- specHandlers RepositorySpecHandlers
- aliases map[string]RepositorySpec
-}
-
-var (
- _ Context = (*_context)(nil)
- _ datacontext.ViewCreator[Context] = (*_context)(nil)
-)
-
-// gcWrapper is used as garbage collectable
-// wrapper for a context implementation
-// to establish a runtime finalizer.
-type gcWrapper struct {
- datacontext.GCWrapper
- *_context
-}
-
-func newView(c *_context, ref ...bool) Context {
- if utils.Optional(ref...) {
- return datacontext.FinalizedContext[gcWrapper](c)
- }
- return c
-}
-
-func (w *gcWrapper) SetContext(c *_context) {
- w._context = c
-}
-
-func newContext(credctx credentials.Context, reposcheme RepositoryTypeScheme, specHandlers RepositorySpecHandlers, delegates datacontext.Delegates) Context {
- c := &_context{
- credentials: datacontext.PersistentContextRef(credctx),
- knownRepositoryTypes: reposcheme,
- specHandlers: specHandlers,
- aliases: map[string]RepositorySpec{},
- }
- c._InternalContext = datacontext.NewContextBase(c, CONTEXT_TYPE, key, credctx.ConfigContext().GetAttributes(), delegates)
- c.updater = cfgcpi.NewUpdaterForFactory(credctx.ConfigContext(), c.OCIContext)
- return newView(c, true)
-}
-
-func (c *_context) CreateView() Context {
- return newView(c, true)
-}
-
-func (c *_context) OCIContext() Context {
- return newView(c)
-}
-
-func (c *_context) Update() error {
- return c.updater.Update()
-}
-
-func (c *_context) AttributesContext() datacontext.AttributesContext {
- return c.credentials.AttributesContext()
-}
-
-func (c *_context) ConfigContext() config.Context {
- return c.updater.GetContext()
-}
-
-func (c *_context) CredentialsContext() credentials.Context {
- return c.credentials
-}
-
-func (c *_context) RepositoryTypes() RepositoryTypeScheme {
- return c.knownRepositoryTypes
-}
-
-func (c *_context) RepositorySpecHandlers() RepositorySpecHandlers {
- return c.specHandlers
-}
-
-func (c *_context) MapUniformRepositorySpec(u *UniformRepositorySpec) (RepositorySpec, error) {
- return c.specHandlers.MapUniformRepositorySpec(c.OCIContext(), u)
-}
-
-func (c *_context) RepositorySpecForConfig(data []byte, unmarshaler runtime.Unmarshaler) (RepositorySpec, error) {
- return c.knownRepositoryTypes.Decode(data, unmarshaler)
-}
-
-func (c *_context) RepositoryForSpec(spec RepositorySpec, creds ...credentials.CredentialsSource) (Repository, error) {
- cred, err := credentials.CredentialsChain(creds).Credentials(c.CredentialsContext())
- if err != nil {
- return nil, err
- }
- return spec.Repository(c.OCIContext(), cred)
-}
-
-func (c *_context) RepositoryForConfig(data []byte, unmarshaler runtime.Unmarshaler, creds ...credentials.CredentialsSource) (Repository, error) {
- spec, err := c.knownRepositoryTypes.Decode(data, unmarshaler)
- if err != nil {
- return nil, err
- }
- return c.RepositoryForSpec(spec, creds...)
-}
-
-func (c *_context) GetAlias(name string) RepositorySpec {
- err := c.updater.Update()
- if err != nil {
- return nil
- }
- c.updater.RLock()
- defer c.updater.RUnlock()
- spec := c.aliases[name]
- if spec == nil && strings.HasSuffix(name, ".alias") {
- spec = c.aliases[name[:len(name)-6]]
- }
- return spec
-}
-
-func (c *_context) SetAlias(name string, spec RepositorySpec) {
- c.updater.Lock()
- defer c.updater.Unlock()
- c.aliases[name] = spec
-}
diff --git a/pkg/contexts/oci/internal/errors.go b/pkg/contexts/oci/internal/errors.go
deleted file mode 100644
index 8b537522b..000000000
--- a/pkg/contexts/oci/internal/errors.go
+++ /dev/null
@@ -1,19 +0,0 @@
-package internal
-
-import (
- "fmt"
-
- "github.com/mandelsoft/goutils/errors"
-
- "github.com/open-component-model/ocm/pkg/blobaccess/blobaccess"
-)
-
-const (
- KIND_OCIARTIFACT = "oci artifact"
- KIND_BLOB = blobaccess.KIND_BLOB
- KIND_MEDIATYPE = blobaccess.KIND_MEDIATYPE
-)
-
-func ErrUnknownArtifact(name, version string) error {
- return errors.ErrUnknown(KIND_OCIARTIFACT, fmt.Sprintf("%s:%s", name, version))
-}
diff --git a/pkg/contexts/oci/internal/repository.go b/pkg/contexts/oci/internal/repository.go
deleted file mode 100644
index 20335719e..000000000
--- a/pkg/contexts/oci/internal/repository.go
+++ /dev/null
@@ -1,157 +0,0 @@
-package internal
-
-import (
- "io"
-
- "github.com/opencontainers/go-digest"
-
- "github.com/open-component-model/ocm/pkg/blobaccess/blobaccess"
- "github.com/open-component-model/ocm/pkg/contexts/credentials"
- "github.com/open-component-model/ocm/pkg/contexts/oci/artdesc"
- "github.com/open-component-model/ocm/pkg/refmgmt/resource"
-)
-
-type RepositoryImpl interface {
- GetSpecification() RepositorySpec
- GetContext() Context
-
- NamespaceLister() NamespaceLister
- ExistsArtifact(name string, ref string) (bool, error)
- LookupArtifact(name string, ref string) (ArtifactAccess, error)
- LookupNamespace(name string) (NamespaceAccess, error)
-
- io.Closer
-}
-
-type Repository interface {
- resource.ResourceView[Repository]
-
- RepositoryImpl
-}
-
-// ConsumerIdentityProvider is an optional interface for repositories
-// to tell about their credential requests.
-type ConsumerIdentityProvider = credentials.ConsumerIdentityProvider
-
-type RepositorySource interface {
- GetRepository() Repository
-}
-
-type (
- BlobAccess = blobaccess.BlobAccess
- DataAccess = blobaccess.DataAccess
-)
-
-type BlobSource interface {
- GetBlobData(digest digest.Digest) (int64, DataAccess, error)
-}
-
-type BlobSink interface {
- AddBlob(BlobAccess) error
-}
-
-type ArtifactSink interface {
- AddBlob(BlobAccess) error
- AddArtifact(a Artifact, tags ...string) (BlobAccess, error)
- AddTags(digest digest.Digest, tags ...string) error
-}
-
-type ArtifactSource interface {
- GetArtifact(version string) (ArtifactAccess, error)
- GetBlobData(digest digest.Digest) (int64, DataAccess, error)
-}
-
-type NamespaceAccessImpl interface {
- ArtifactSource
- ArtifactSink
- GetNamespace() string
- ListTags() ([]string, error)
-
- HasArtifact(vers string) (bool, error)
-
- NewArtifact(...Artifact) (ArtifactAccess, error)
- io.Closer
-}
-
-type NamespaceAccess interface {
- resource.ResourceView[NamespaceAccess]
-
- NamespaceAccessImpl
-}
-
-type Artifact artdesc.ArtifactDescriptor
-
-type ArtifactAccessImpl interface {
- Artifact
- BlobSource
- BlobSink
-
- GetDescriptor() *artdesc.Artifact
- GetBlob(digest digest.Digest) (BlobAccess, error)
-
- GetArtifact(digest digest.Digest) (ArtifactAccess, error)
- AddBlob(BlobAccess) error
-
- AddArtifact(Artifact, *artdesc.Platform) (BlobAccess, error)
- AddLayer(BlobAccess, *artdesc.Descriptor) (int, error)
-
- NewArtifact(...Artifact) (ArtifactAccess, error)
-
- io.Closer
-}
-
-type ArtifactAccessSlaves interface {
- ManifestAccess() ManifestAccess
- IndexAccess() IndexAccess
-}
-
-type ArtifactAccess interface {
- resource.ResourceView[ArtifactAccess]
-
- ArtifactAccessImpl
- ArtifactAccessSlaves
-}
-
-type ManifestAccess interface {
- Artifact
-
- GetDescriptor() *artdesc.Manifest
- GetBlobDescriptor(digest digest.Digest) *artdesc.Descriptor
- GetConfigBlob() (BlobAccess, error)
- GetBlob(digest digest.Digest) (BlobAccess, error)
-
- AddBlob(BlobAccess) error
- AddLayer(BlobAccess, *artdesc.Descriptor) (int, error)
- SetConfigBlob(blob BlobAccess, d *artdesc.Descriptor) error
-}
-
-type IndexAccess interface {
- Artifact
-
- GetDescriptor() *artdesc.Index
- GetBlobDescriptor(digest digest.Digest) *artdesc.Descriptor
- GetBlob(digest digest.Digest) (BlobAccess, error)
-
- GetArtifact(digest digest.Digest) (ArtifactAccess, error)
- /*
- GetIndex(digest digest.Digest) (IndexAccess, error)
- GetManifest(digest digest.Digest) (ManifestAccess, error)
- */
-
- AddBlob(BlobAccess) error
- AddArtifact(Artifact, *artdesc.Platform) (BlobAccess, error)
-}
-
-// NamespaceLister provides the optional repository list functionality of
-// a repository.
-type NamespaceLister interface {
- // NumNamespaces returns the number of namespaces found for a prefix
- // If the given prefix does not end with a /, a repository with the
- // prefix name is included
- NumNamespaces(prefix string) (int, error)
-
- // GetNamespaces returns the name of namespaces found for a prefix
- // If the given prefix does not end with a /, a repository with the
- // prefix name is included
- GetNamespaces(prefix string, closure bool) ([]string, error)
-}
diff --git a/pkg/contexts/oci/internal/repotypes.go b/pkg/contexts/oci/internal/repotypes.go
deleted file mode 100644
index 550e0d4fd..000000000
--- a/pkg/contexts/oci/internal/repotypes.go
+++ /dev/null
@@ -1,160 +0,0 @@
-package internal
-
-import (
- "encoding/json"
-
- "github.com/mandelsoft/goutils/errors"
- "github.com/mandelsoft/goutils/generics"
- "github.com/modern-go/reflect2"
-
- "github.com/open-component-model/ocm/pkg/contexts/credentials"
- "github.com/open-component-model/ocm/pkg/runtime"
- "github.com/open-component-model/ocm/pkg/utils"
-)
-
-type RepositoryType interface {
- runtime.VersionedTypedObjectType[RepositorySpec]
-}
-
-type IntermediateRepositorySpecAspect interface {
- IsIntermediate() bool
-}
-
-type RepositorySpec interface {
- runtime.VersionedTypedObject
-
- Name() string
- UniformRepositorySpec() *UniformRepositorySpec
- Repository(Context, credentials.Credentials) (Repository, error)
-}
-
-type (
- RepositorySpecDecoder = runtime.TypedObjectDecoder[RepositorySpec]
- RepositoryTypeProvider = runtime.KnownTypesProvider[RepositorySpec, RepositoryType]
-)
-
-type RepositoryTypeScheme interface {
- runtime.TypeScheme[RepositorySpec, RepositoryType]
-}
-
-type _Scheme = runtime.TypeScheme[RepositorySpec, RepositoryType]
-
-type repositoryTypeScheme struct {
- _Scheme
-}
-
-func NewRepositoryTypeScheme(defaultDecoder RepositorySpecDecoder, base ...RepositoryTypeScheme) RepositoryTypeScheme {
- scheme := runtime.MustNewDefaultTypeScheme[RepositorySpec, RepositoryType](&UnknownRepositorySpec{}, true, defaultDecoder, utils.Optional(base...))
- return &repositoryTypeScheme{scheme}
-}
-
-func NewStrictRepositoryTypeScheme(base ...RepositoryTypeScheme) runtime.VersionedTypeRegistry[RepositorySpec, RepositoryType] {
- scheme := runtime.MustNewDefaultTypeScheme[RepositorySpec, RepositoryType](nil, false, nil, utils.Optional(base...))
- return &repositoryTypeScheme{scheme}
-}
-
-func (t *repositoryTypeScheme) KnownTypes() runtime.KnownTypes[RepositorySpec, RepositoryType] {
- return t._Scheme.KnownTypes()
-}
-
-// DefaultRepositoryTypeScheme contains all globally known access serializer.
-var DefaultRepositoryTypeScheme = NewRepositoryTypeScheme(nil)
-
-func RegisterRepositoryType(atype RepositoryType) {
- DefaultRepositoryTypeScheme.Register(atype)
-}
-
-func CreateRepositorySpec(t runtime.TypedObject) (RepositorySpec, error) {
- return DefaultRepositoryTypeScheme.Convert(t)
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-type UnknownRepositorySpec struct {
- runtime.UnstructuredVersionedTypedObject `json:",inline"`
-}
-
-var (
- _ RepositorySpec = &UnknownRepositorySpec{}
- _ runtime.Unknown = &UnknownRepositorySpec{}
-)
-
-func (r *UnknownRepositorySpec) IsUnknown() bool {
- return true
-}
-
-func (r *UnknownRepositorySpec) Name() string {
- return "unknown-" + r.GetKind()
-}
-
-func (r *UnknownRepositorySpec) UniformRepositorySpec() *UniformRepositorySpec {
- return UniformRepositorySpecForUnstructured(&r.UnstructuredVersionedTypedObject)
-}
-
-func (r *UnknownRepositorySpec) Repository(Context, credentials.Credentials) (Repository, error) {
- return nil, errors.ErrUnknown("repository type", r.GetType())
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-type GenericRepositorySpec struct {
- runtime.UnstructuredVersionedTypedObject `json:",inline"`
-}
-
-var _ RepositorySpec = &GenericRepositorySpec{}
-
-func ToGenericRepositorySpec(spec RepositorySpec) (*GenericRepositorySpec, error) {
- if reflect2.IsNil(spec) {
- return nil, nil
- }
- if g, ok := spec.(*GenericRepositorySpec); ok {
- return g, nil
- }
- data, err := json.Marshal(spec)
- if err != nil {
- return nil, err
- }
- return newGenericRepositorySpec(data, runtime.DefaultJSONEncoding)
-}
-
-func NewGenericRepositorySpec(data []byte, unmarshaler runtime.Unmarshaler) (RepositorySpec, error) {
- return generics.CastPointerR[RepositorySpec](newGenericRepositorySpec(data, unmarshaler))
-}
-
-func newGenericRepositorySpec(data []byte, unmarshaler runtime.Unmarshaler) (*GenericRepositorySpec, error) {
- unstr := &runtime.UnstructuredVersionedTypedObject{}
- if unmarshaler == nil {
- unmarshaler = runtime.DefaultYAMLEncoding
- }
- err := unmarshaler.Unmarshal(data, unstr)
- if err != nil {
- return nil, err
- }
- return &GenericRepositorySpec{*unstr}, nil
-}
-
-func (s *GenericRepositorySpec) Name() string {
- return "generic-" + s.GetKind()
-}
-
-func (s *GenericRepositorySpec) UniformRepositorySpec() *UniformRepositorySpec {
- return UniformRepositorySpecForUnstructured(&s.UnstructuredVersionedTypedObject)
-}
-
-func (s *GenericRepositorySpec) Evaluate(ctx Context) (RepositorySpec, error) {
- raw, err := s.GetRaw()
- if err != nil {
- return nil, err
- }
- return ctx.RepositoryTypes().Decode(raw, runtime.DefaultJSONEncoding)
-}
-
-func (s *GenericRepositorySpec) Repository(ctx Context, creds credentials.Credentials) (Repository, error) {
- spec, err := s.Evaluate(ctx)
- if err != nil {
- return nil, err
- }
- return spec.Repository(ctx, creds)
-}
-
-////////////////////////////////////////////////////////////////////////////////
diff --git a/pkg/contexts/oci/internal/uniform.go b/pkg/contexts/oci/internal/uniform.go
deleted file mode 100644
index d3ab3e296..000000000
--- a/pkg/contexts/oci/internal/uniform.go
+++ /dev/null
@@ -1,233 +0,0 @@
-package internal
-
-import (
- "encoding/json"
- "fmt"
- "net/url"
- "strings"
- "sync"
-
- "github.com/containerd/containerd/reference"
- "github.com/mandelsoft/goutils/errors"
- "github.com/sirupsen/logrus"
- "golang.org/x/exp/slices"
-
- "github.com/open-component-model/ocm/pkg/contexts/oci/grammar"
- "github.com/open-component-model/ocm/pkg/runtime"
-)
-
-const (
- dockerHubDomain = "docker.io"
- dockerHubLegacyDomain = "index.docker.io"
-)
-
-// UniformRepositorySpec is a generic specification of the repository
-// for handling as part of standard references.
-type UniformRepositorySpec struct {
- // Type
- Type string `json:"type,omitempty"`
- // Scheme
- Scheme string `json:"scheme,omitempty"`
- // Host is the hostname of an oci ref.
- Host string `json:"host,omitempty"`
- // Info is the file path used to host ctf component versions
- Info string `json:"filePath,omitempty"`
-
- // CreateIfMissing indicates whether a file based or dynamic repo should be created if it does not exist
- CreateIfMissing bool `json:"createIfMissing,omitempty"`
- // TypeHint should be set if CreateIfMissing is true to help to decide what kind of repo to create
- TypeHint string `json:"typeHint,omitempty"`
-}
-
-// CredHost fallback to legacy docker domain if applicable
-// this is how containerd translates the old domain for DockerHub to the new one, taken from containerd/reference/docker/reference.go:674.
-func (u *UniformRepositorySpec) CredHost() string {
- if u.Host == dockerHubDomain {
- return dockerHubLegacyDomain
- }
- return u.Host
-}
-
-func (u *UniformRepositorySpec) HostPort() (string, string) {
- i := strings.Index(u.Host, ":")
- if i < 0 {
- return u.Host, ""
- }
- return u.Host[:i], u.Host[i+1:]
-}
-
-// ComposeRef joins the actual repository spec and a given artifact spec.
-func (u *UniformRepositorySpec) ComposeRef(art string) string {
- if art == "" {
- return u.String()
- }
- sep := "/"
- if u.Info != "" {
- sep = "//"
- }
- return fmt.Sprintf("%s%s%s", u.String(), sep, art)
-}
-
-func (u *UniformRepositorySpec) RepositoryRef() string {
- t := u.Type
- if t != "" {
- t += "::"
- }
- if u.Info != "" {
- return fmt.Sprintf("%s%s", t, u.Info)
- }
- if u.Scheme == "" {
- return fmt.Sprintf("%s%s", t, u.Host)
- }
- return fmt.Sprintf("%s%s://%s", t, u.Scheme, u.Host)
-}
-
-func (u *UniformRepositorySpec) SetType(typ string) {
- t, _ := grammar.SplitTypeSpec(typ)
- u.Type = t
- u.TypeHint = typ
-}
-
-func (u *UniformRepositorySpec) String() string {
- return u.RepositoryRef()
-}
-
-func UniformRepositorySpecForHostURL(typ string, host string) *UniformRepositorySpec {
- s := ""
- h := host
- var parsed *url.URL
- ref, err := reference.Parse(host)
- if err == nil {
- parsed, err = url.Parse("https://" + ref.Locator)
- } else {
- parsed, err = url.Parse(host)
- }
- if err == nil {
- s = parsed.Scheme
- h = parsed.Host
- }
- u := &UniformRepositorySpec{
- Type: typ,
- Scheme: s,
- Host: h,
- }
- return u
-}
-
-func UniformRepositorySpecForUnstructured(un *runtime.UnstructuredVersionedTypedObject) *UniformRepositorySpec {
- m := un.Object.FlatCopy()
- delete(m, runtime.ATTR_TYPE)
-
- d, err := json.Marshal(m)
- if err != nil {
- logrus.Error(err)
- }
-
- return &UniformRepositorySpec{Type: un.Type, Info: string(d)}
-}
-
-type RepositorySpecHandler interface {
- MapReference(ctx Context, u *UniformRepositorySpec) (RepositorySpec, error)
-}
-
-type RepositorySpecHandlers interface {
- Register(hdlr RepositorySpecHandler, types ...string)
- Copy() RepositorySpecHandlers
- MapUniformRepositorySpec(ctx Context, u *UniformRepositorySpec) (RepositorySpec, error)
-}
-
-var DefaultRepositorySpecHandlers = NewRepositorySpecHandlers()
-
-func RegisterRepositorySpecHandler(hdlr RepositorySpecHandler, types ...string) {
- DefaultRepositorySpecHandlers.Register(hdlr, types...)
-}
-
-type specHandlers struct {
- lock sync.RWMutex
- handlers map[string][]RepositorySpecHandler
-}
-
-func NewRepositorySpecHandlers() RepositorySpecHandlers {
- return &specHandlers{handlers: map[string][]RepositorySpecHandler{}}
-}
-
-func (s *specHandlers) Register(hdlr RepositorySpecHandler, types ...string) {
- s.lock.Lock()
- defer s.lock.Unlock()
-
- if hdlr != nil {
- for _, typ := range types {
- s.handlers[typ] = append(s.handlers[typ], hdlr)
- }
- }
-}
-
-func (s *specHandlers) Copy() RepositorySpecHandlers {
- s.lock.RLock()
- defer s.lock.RUnlock()
-
- n := NewRepositorySpecHandlers().(*specHandlers)
- for typ, hdlrs := range s.handlers {
- n.handlers[typ] = slices.Clone(hdlrs)
- }
- return n
-}
-
-func (s *specHandlers) MapUniformRepositorySpec(ctx Context, u *UniformRepositorySpec) (RepositorySpec, error) {
- var err error
- s.lock.RLock()
- defer s.lock.RUnlock()
- deferr := errors.ErrNotSupported("uniform repository ref", u.String())
-
- if u.Info != "" && string(u.Info[0]) == "{" && u.Host == "" && u.Scheme == "" {
- data, err := runtime.CompleteSpecWithType(u.Type, []byte(u.Info))
- if err != nil {
- return nil, err
- }
- return ctx.RepositorySpecForConfig(data, runtime.DefaultJSONEncoding)
- }
-
- if u.Type == "" {
- if u.Info != "" {
- spec := ctx.GetAlias(u.Info)
- if spec != nil {
- return spec, nil
- }
- deferr = errors.ErrUnknown("repository", u.Info)
- }
- if u.Host != "" {
- spec := ctx.GetAlias(u.Host)
- if spec != nil {
- return spec, nil
- }
- deferr = errors.ErrUnknown("repository", u.Host)
- }
- }
- for _, h := range s.handlers[u.Type] {
- spec, err := h.MapReference(ctx, u)
- if err != nil || spec != nil {
- return spec, err
- }
- }
- if u.Info != "" {
- spec := &runtime.UnstructuredVersionedTypedObject{}
- err = runtime.DefaultJSONEncoding.Unmarshal([]byte(u.Info), spec)
- if err == nil {
- if spec.GetType() == spec.GetKind() && spec.GetVersion() == "v1" { // only type set, use it as version
- spec.SetType(u.Type + runtime.VersionSeparator + spec.GetType())
- }
- if spec.GetKind() != u.Type {
- return nil, errors.ErrInvalid()
- }
- return ctx.RepositoryTypes().Convert(spec)
- }
- }
- for _, h := range s.handlers["*"] {
- spec, err := h.MapReference(ctx, u)
- if err != nil || spec != nil {
- return spec, err
- }
- }
-
- return nil, deferr
-}
diff --git a/pkg/contexts/oci/ociutils/handler.go b/pkg/contexts/oci/ociutils/handler.go
deleted file mode 100644
index 05eec8140..000000000
--- a/pkg/contexts/oci/ociutils/handler.go
+++ /dev/null
@@ -1,30 +0,0 @@
-package ociutils
-
-import (
- "sync"
-
- "github.com/open-component-model/ocm/pkg/common"
- "github.com/open-component-model/ocm/pkg/contexts/oci/cpi"
-)
-
-type InfoHandler interface {
- Description(pr common.Printer, m cpi.ManifestAccess, config []byte)
- Info(m cpi.ManifestAccess, config []byte) interface{}
-}
-
-var (
- lock sync.Mutex
- handlers = map[string]InfoHandler{}
-)
-
-func RegisterInfoHandler(mime string, h InfoHandler) {
- lock.Lock()
- defer lock.Unlock()
- handlers[mime] = h
-}
-
-func getHandler(mime string) InfoHandler {
- lock.Lock()
- defer lock.Unlock()
- return handlers[mime]
-}
diff --git a/pkg/contexts/oci/ociutils/helm/art_test.go b/pkg/contexts/oci/ociutils/helm/art_test.go
deleted file mode 100644
index 2d497254d..000000000
--- a/pkg/contexts/oci/ociutils/helm/art_test.go
+++ /dev/null
@@ -1,115 +0,0 @@
-package helm_test
-
-import (
- "encoding/json"
- "os"
- "sort"
- "strings"
-
- . "github.com/mandelsoft/goutils/testutils"
- . "github.com/onsi/ginkgo/v2"
- . "github.com/onsi/gomega"
-
- "github.com/mandelsoft/vfs/pkg/osfs"
- "github.com/mandelsoft/vfs/pkg/vfs"
- "helm.sh/helm/v3/pkg/chart"
- "helm.sh/helm/v3/pkg/chartutil"
-
- "github.com/open-component-model/ocm/pkg/blobaccess/blobaccess"
- "github.com/open-component-model/ocm/pkg/common/accessobj"
- "github.com/open-component-model/ocm/pkg/contexts/oci/ociutils/helm"
- "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/artifactset"
- "github.com/open-component-model/ocm/pkg/env"
- "github.com/open-component-model/ocm/pkg/env/builder"
- "github.com/open-component-model/ocm/pkg/helm/loader"
-)
-
-type Files []*chart.File
-
-var _ sort.Interface = (Files)(nil)
-
-func (f Files) Len() int {
- return len(f)
-}
-
-func (f Files) Less(i, j int) bool {
- return strings.Compare(f[i].Name, f[j].Name) < 0
-}
-
-func (f Files) Swap(i, j int) {
- f[i], f[j] = f[j], f[i]
-}
-
-func norm(chart *chart.Chart) *chart.Chart {
- dir, err := os.MkdirTemp("", "helmchart-")
- Expect(err).To(Succeed())
- defer os.RemoveAll(dir)
-
- path, err := chartutil.Save(chart, dir)
- Expect(err).To(Succeed())
- chart, err = loader.Load(path, osfs.New())
- Expect(err).To(Succeed())
- // sort.Sort(Files(chart.Raw))
- // sort.Sort(Files(chart.Files))
- // sort.Sort(Files(chart.Templates))
- return chart
-}
-
-func get(blob blobaccess.DataAccess, expected []byte) []byte {
- data, err := blob.Get()
- ExpectWithOffset(1, err).To(Succeed())
- if expected != nil {
- ExpectWithOffset(1, string(data)).To(Equal(string(expected)))
- }
- return data
-}
-
-var _ = Describe("art parsing", func() {
- It("succeeds", func() {
- env := builder.NewBuilder(env.TestData())
- defer vfs.Cleanup(env)
-
- prov, err := env.ReadFile("/testdata/testchart.prov")
- Expect(err).To(Succeed())
- chart, err := loader.Load("/testdata/testchart", env)
- Expect(err).To(Succeed())
- meta, err := json.Marshal(chart.Metadata)
- Expect(err).To(Succeed())
-
- artblob, err := helm.SynthesizeArtifactBlob(loader.VFSLoader("/testdata/testchart", env))
- Expect(err).To(Succeed())
- defer Close(artblob)
- set, err := artifactset.OpenFromBlob(accessobj.ACC_READONLY, artblob)
- Expect(err).To(Succeed())
- defer Close(set)
- art, err := set.GetArtifact(set.GetMain().String())
- Expect(err).To(Succeed())
- defer Close(art)
-
- ma := art.ManifestAccess()
- m := ma.GetDescriptor()
- Expect(len(m.Layers)).To(Equal(2))
-
- config, err := art.ManifestAccess().GetConfigBlob()
- Expect(err).To(Succeed())
- get(config, meta)
-
- _, data, err := set.GetBlobData(m.Layers[1].Digest)
- Expect(err).To(Succeed())
- get(data, prov)
-
- _, data, err = set.GetBlobData(m.Layers[0].Digest)
- Expect(err).To(Succeed())
- r, err := data.Reader()
- Expect(err).To(Succeed())
-
- blob, err := ma.GetBlob(m.Layers[1].Digest)
- Expect(err).To(Succeed())
- get(blob, prov)
-
- // unfortunately charts are not directly comparable, because of the order in the arrays AND the modified Chart.yaml
- found, err := loader.LoadArchive(r)
- Expect(err).To(Succeed())
- Expect(norm(found)).To(Equal(norm(chart)))
- })
-})
diff --git a/pkg/contexts/oci/ociutils/helm/artifact.go b/pkg/contexts/oci/ociutils/helm/artifact.go
deleted file mode 100644
index d012c0162..000000000
--- a/pkg/contexts/oci/ociutils/helm/artifact.go
+++ /dev/null
@@ -1,109 +0,0 @@
-package helm
-
-import (
- "encoding/json"
- "fmt"
- "os"
-
- "github.com/mandelsoft/goutils/errors"
- "github.com/mandelsoft/vfs/pkg/osfs"
- "helm.sh/helm/v3/pkg/chart"
- "helm.sh/helm/v3/pkg/chartutil"
- "helm.sh/helm/v3/pkg/registry"
-
- "github.com/open-component-model/ocm/pkg/blobaccess/blobaccess"
- "github.com/open-component-model/ocm/pkg/blobaccess/file"
- "github.com/open-component-model/ocm/pkg/contexts/oci"
- "github.com/open-component-model/ocm/pkg/contexts/oci/artdesc"
- "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/artifactset"
- "github.com/open-component-model/ocm/pkg/helm/loader"
-)
-
-func SynthesizeArtifactBlob(loader loader.Loader) (artifactset.ArtifactBlob, error) {
- return artifactset.SythesizeArtifactSet(func(set *artifactset.ArtifactSet) (string, error) {
- chart, blob, err := TransferAsArtifact(loader, set)
- if err != nil {
- return "", fmt.Errorf("unable to transfer as artifact: %w", err)
- }
-
- if chart.Metadata.Version != "" {
- err = set.AddTags(blob.Digest, chart.Metadata.Version)
- if err != nil {
- return "", fmt.Errorf("unable to add tag: %w", err)
- }
- }
-
- set.Annotate(artifactset.MAINARTIFACT_ANNOTATION, blob.Digest.String())
-
- return artdesc.MediaTypeImageManifest, nil
- })
-}
-
-func TransferAsArtifact(loader loader.Loader, ns oci.NamespaceAccess) (*chart.Chart, *artdesc.Descriptor, error) {
- chart, err := loader.Chart()
- if err != nil {
- return nil, nil, err
- }
- err = chart.Validate()
- if err != nil {
- return nil, nil, errors.ErrInvalidWrap(err, "helm chart")
- }
-
- provData, err := loader.Provenance()
- if err != nil {
- return nil, nil, err
- }
-
- var blob blobaccess.BlobAccess
- blob, err = loader.ChartArchive()
- if err != nil {
- return nil, nil, err
- }
- if blob == nil {
- dir, err := os.MkdirTemp("", "helmchart-")
- if err != nil {
- return chart, nil, errors.Wrapf(err, "cannot create temporary directory for helm chart")
- }
- defer os.RemoveAll(dir)
- path, err := chartutil.Save(chart, dir)
- if err != nil {
- return chart, nil, err
- }
- blob = file.BlobAccess(registry.ChartLayerMediaType, path, osfs.New())
- } else {
- defer blob.Close()
- }
- meta := chart.Metadata
-
- configData, err := json.Marshal(meta)
- if err != nil {
- return chart, nil, err
- }
-
- art, err := ns.NewArtifact()
- if err != nil {
- return chart, nil, err
- }
- defer art.Close()
- m := art.ManifestAccess()
-
- err = m.SetConfigBlob(blobaccess.ForData(registry.ConfigMediaType, configData), nil)
- if err != nil {
- return chart, nil, err
- }
- _, err = m.AddLayer(blob, nil)
- if err != nil {
- return chart, nil, err
- }
- if provData != nil {
- _, err = m.AddLayer(blobaccess.ForData(registry.ProvLayerMediaType, provData), nil)
- if err != nil {
- return chart, nil, err
- }
- }
- blob, err = ns.AddArtifact(art)
- if err != nil {
- return chart, nil, err
- }
- return chart, artdesc.DefaultBlobDescriptor(blob), err
-}
diff --git a/pkg/contexts/oci/ociutils/info.go b/pkg/contexts/oci/ociutils/info.go
deleted file mode 100644
index f8dfdb175..000000000
--- a/pkg/contexts/oci/ociutils/info.go
+++ /dev/null
@@ -1,212 +0,0 @@
-package ociutils
-
-import (
- "archive/tar"
- "encoding/json"
- "errors"
- "fmt"
- "io"
-
- "github.com/opencontainers/go-digest"
- "sigs.k8s.io/yaml"
-
- "github.com/open-component-model/ocm/pkg/blobaccess/blobaccess"
- "github.com/open-component-model/ocm/pkg/common"
- "github.com/open-component-model/ocm/pkg/common/compression"
- "github.com/open-component-model/ocm/pkg/contexts/oci/artdesc"
- "github.com/open-component-model/ocm/pkg/contexts/oci/cpi"
- "github.com/open-component-model/ocm/pkg/mime"
-)
-
-type BlobInfo struct {
- Error string `json:"error,omitempty"`
- Unparsed string `json:"unparsed,omitempty"`
- Content json.RawMessage `json:"content,omitempty"`
- Type string `json:"type,omitempty"`
- Digest digest.Digest `json:"digest,omitempty"`
- Size int64 `json:"size,omitempty"`
- Info interface{} `json:"info,omitempty"`
-}
-type ArtifactInfo struct {
- Digest digest.Digest `json:"digest"`
- Type string `json:"type"`
- Descriptor interface{} `json:"descriptor"`
- Config *BlobInfo `json:"config,omitempty"`
- Layers []*BlobInfo `json:"layers,omitempty"`
- Manifests []*BlobInfo `json:"manifests,omitempty"`
-}
-
-func GetArtifactInfo(art cpi.ArtifactAccess, layerFiles bool) *ArtifactInfo {
- if art.IsManifest() {
- return GetManifestInfo(art.ManifestAccess(), layerFiles)
- }
- if art.IsIndex() {
- return GetIndexInfo(art.IndexAccess(), layerFiles)
- }
- return &ArtifactInfo{Type: "unspecific"}
-}
-
-func GetManifestInfo(m cpi.ManifestAccess, layerFiles bool) *ArtifactInfo {
- info := &ArtifactInfo{
- Type: artdesc.MediaTypeImageManifest,
- Descriptor: m.GetDescriptor(),
- }
- b, err := m.Blob()
- if err == nil {
- info.Digest = b.Digest()
- }
- man := m.GetDescriptor()
- cfg := &BlobInfo{
- Content: nil,
- Type: man.Config.MediaType,
- Digest: man.Config.Digest,
- Size: man.Config.Size,
- }
- info.Config = cfg
-
- config, err := blobaccess.BlobData(m.GetBlob(man.Config.Digest))
- if err != nil {
- cfg.Error = "error getting config blob: " + err.Error()
- } else {
- cfg.Content = json.RawMessage(config)
- }
- h := getHandler(man.Config.MediaType)
-
- if h != nil {
- pr, buf := common.NewBufferedPrinter()
- h.Description(pr, m, config)
- cfg.Info = buf.String()
- }
- for _, l := range man.Layers {
- blobinfo := &BlobInfo{
- Type: l.MediaType,
- Digest: l.Digest,
- Size: l.Size,
- }
- blob, err := m.GetBlob(l.Digest)
- if err != nil {
- blobinfo.Error = "error getting blob: " + err.Error()
- } else {
- blobinfo.Info = GetLayerInfo(blob, layerFiles)
- }
- info.Layers = append(info.Layers, blobinfo)
- }
- return info
-}
-
-type LayerInfo struct {
- Description string `json:"description,omitempty"`
- Error string `json:"error,omitempty"`
- Unparsed string `json:"unparsed,omitempty"`
- Content interface{} `json:"content,omitempty"`
-}
-
-func GetLayerInfo(blob blobaccess.BlobAccess, layerFiles bool) *LayerInfo {
- info := &LayerInfo{}
-
- if mime.IsJSON(blob.MimeType()) {
- info.Description = "json document"
- data, err := blob.Get()
- if err != nil {
- info.Error = "cannot read blob: " + err.Error()
- return info
- }
- var j interface{}
- err = json.Unmarshal(data, &j)
- if err != nil {
- if len(data) < 10000 {
- info.Unparsed = string(data)
- }
- info.Error = "invalid json: " + err.Error()
- return info
- }
- info.Content = j
- return info
- }
- if mime.IsYAML(blob.MimeType()) {
- info.Description = "yaml document"
- data, err := blob.Get()
- if err != nil {
- info.Error = "cannot read blob: " + err.Error()
- return info
- }
- var j interface{}
- err = yaml.Unmarshal(data, &j)
- if err != nil {
- if len(data) < 10000 {
- info.Unparsed = string(data)
- }
- info.Error = "invalid yaml: " + err.Error()
- return info
- }
- info.Content = j
- return info
- }
- if !layerFiles {
- return nil
- }
- reader, err := blob.Reader()
- if err != nil {
- info.Error = "cannot read blob: " + err.Error()
- return info
- }
- defer reader.Close()
- reader, _, err = compression.AutoDecompress(reader)
- if err != nil {
- info.Error = "cannot decompress blob: " + err.Error()
- return info
- }
- var files []string
- tr := tar.NewReader(reader)
- for {
- header, err := tr.Next()
- if err != nil {
- if errors.Is(err, io.EOF) {
- info.Content = files
- return info
- }
- if len(files) == 0 {
- info.Description = "no tar"
- return info
- }
- info.Error = fmt.Sprintf("tar error: %s", err)
- return info
- }
- if len(files) == 0 {
- info.Description = "tar file"
- }
-
- switch header.Typeflag {
- case tar.TypeDir:
- files = append(files, fmt.Sprintf("dir: %s\n", header.Name))
- case tar.TypeReg:
- files = append(files, fmt.Sprintf("file: %s\n", header.Name))
- }
- }
-}
-
-func GetIndexInfo(i cpi.IndexAccess, layerFiles bool) *ArtifactInfo {
- info := &ArtifactInfo{
- Type: artdesc.MediaTypeImageIndex,
- Descriptor: i.GetDescriptor(),
- }
- b, err := i.Blob()
- if err == nil {
- info.Digest = b.Digest()
- }
- for _, l := range i.GetDescriptor().Manifests {
- blobinfo := &BlobInfo{
- Type: l.MediaType,
- Digest: l.Digest,
- Size: l.Size,
- }
- a, err := i.GetArtifact(l.Digest)
- if err != nil {
- blobinfo.Error = fmt.Sprintf("cannot get artifact: %s\n", err)
- } else {
- blobinfo.Info = GetArtifactInfo(a, layerFiles)
- }
- info.Layers = append(info.Layers, blobinfo)
- }
- return info
-}
diff --git a/pkg/contexts/oci/ref.go b/pkg/contexts/oci/ref.go
deleted file mode 100644
index 553af5a8a..000000000
--- a/pkg/contexts/oci/ref.go
+++ /dev/null
@@ -1,306 +0,0 @@
-package oci
-
-import (
- "fmt"
- "strings"
-
- "github.com/mandelsoft/goutils/errors"
- "github.com/opencontainers/go-digest"
-
- "github.com/open-component-model/ocm/pkg/contexts/oci/grammar"
-)
-
-// to find a suitable secret for images on Docker Hub, we need its two domains to do matching.
-const (
- dockerHubDomain = "docker.io"
- dockerHubLegacyDomain = "index.docker.io"
-
- KIND_OCI_REFERENCE = "oci reference"
- KIND_ARETEFACT_REFERENCE = "artifact reference"
-)
-
-// ParseRepo parses a standard oci repository reference into an internal representation.
-func ParseRepo(ref string) (UniformRepositorySpec, error) {
- create := false
- if strings.HasPrefix(ref, "+") {
- create = true
- ref = ref[1:]
- }
- uspec := UniformRepositorySpec{}
- match := grammar.AnchoredRegistryRegexp.FindSubmatch([]byte(ref))
- if match == nil {
- match = grammar.AnchoredGenericRegistryRegexp.FindSubmatch([]byte(ref))
- if match == nil {
- return uspec, errors.ErrInvalid(KIND_OCI_REFERENCE, ref)
- }
- uspec.SetType(string(match[1]))
- uspec.Info = string(match[2])
- uspec.CreateIfMissing = create
- return uspec, nil
- }
- uspec.SetType(string(match[1]))
- uspec.Scheme = string(match[2])
- uspec.Host = string(match[3])
- uspec.CreateIfMissing = create
- return uspec, nil
-}
-
-// RefSpec is a go internal representation of an oci reference.
-type RefSpec struct {
- UniformRepositorySpec `json:",inline"`
- ArtSpec `json:",inline"`
-}
-
-func pointer(b []byte) *string {
- if len(b) == 0 {
- return nil
- }
- s := string(b)
- return &s
-}
-
-func dig(b []byte) *digest.Digest {
- if len(b) == 0 {
- return nil
- }
- s := digest.Digest(b)
- return &s
-}
-
-// ParseRef parses a oci reference into a internal representation.
-func ParseRef(ref string) (RefSpec, error) {
- create := false
- if strings.HasPrefix(ref, "+") {
- create = true
- ref = ref[1:]
- }
-
- spec := RefSpec{UniformRepositorySpec: UniformRepositorySpec{CreateIfMissing: create}}
- match := grammar.AnchoredTypedSchemedHostPortArtifactRegexp.FindSubmatch([]byte(ref))
- if match != nil {
- spec.SetType(string(match[1]))
- spec.Scheme = string(match[2])
- spec.Host = string(match[3])
- spec.Repository = string(match[4])
- spec.Tag = pointer(match[5])
- spec.Digest = dig(match[6])
- return spec, nil
- }
-
- match = grammar.AnchoredTypedOptSchemedReqHostReqPortArtifactRegexp.FindSubmatch([]byte(ref))
- if match != nil {
- spec.SetType(string(match[1]))
- spec.Scheme = string(match[2])
- spec.Host = string(match[3])
- spec.Repository = string(match[4])
- spec.Tag = pointer(match[5])
- spec.Digest = dig(match[6])
- return spec, nil
- }
- match = grammar.FileReferenceRegexp.FindSubmatch([]byte(ref))
- if match != nil {
- spec.SetType(string(match[1]))
- spec.Info = string(match[2])
- spec.Repository = string(match[3])
- spec.Tag = pointer(match[4])
- spec.Digest = dig(match[5])
- return spec, nil
- }
- match = grammar.DockerLibraryReferenceRegexp.FindSubmatch([]byte(ref))
- if match != nil {
- spec.Host = dockerHubDomain
- spec.Repository = "library" + grammar.RepositorySeparator + string(match[1])
- spec.Tag = pointer(match[2])
- spec.Digest = dig(match[3])
- return spec, nil
- }
- match = grammar.DockerReferenceRegexp.FindSubmatch([]byte(ref))
- if match != nil {
- spec.Host = dockerHubDomain
- spec.Repository = string(match[1])
- spec.Tag = pointer(match[2])
- spec.Digest = dig(match[3])
- return spec, nil
- }
- match = grammar.ReferenceRegexp.FindSubmatch([]byte(ref))
- if match != nil {
- spec.Scheme = string(match[1])
- spec.Host = string(match[2])
- spec.Repository = string(match[3])
- spec.Tag = pointer(match[4])
- spec.Digest = dig(match[5])
- return spec, nil
- }
- match = grammar.TypedReferenceRegexp.FindSubmatch([]byte(ref))
- if match != nil {
- spec.SetType(string(match[1]))
- spec.Scheme = string(match[2])
- spec.Host = string(match[3])
- spec.Repository = string(match[4])
- spec.Tag = pointer(match[5])
- spec.Digest = dig(match[6])
- return spec, nil
- }
- match = grammar.TypedURIRegexp.FindSubmatch([]byte(ref))
- if match != nil {
- spec.SetType(string(match[1]))
- spec.Scheme = string(match[2])
- spec.Host = string(match[3])
- spec.Repository = string(match[4])
- spec.Tag = pointer(match[5])
- spec.Digest = dig(match[6])
- return spec, nil
- }
- match = grammar.TypedGenericReferenceRegexp.FindSubmatch([]byte(ref))
- if match != nil {
- spec.SetType(string(match[1]))
- spec.Info = string(match[2])
- spec.Repository = string(match[3])
- spec.Tag = pointer(match[4])
- spec.Digest = dig(match[5])
- return spec, nil
- }
- match = grammar.AnchoredRegistryRegexp.FindSubmatch([]byte(ref))
- if match != nil {
- spec.SetType(string(match[1]))
- spec.Info = string(match[2])
- spec.Repository = string(match[3])
- spec.Tag = pointer(match[4])
- spec.Digest = dig(match[5])
- return spec, nil
- }
-
- match = grammar.AnchoredGenericRegistryRegexp.FindSubmatch([]byte(ref))
- if match != nil {
- spec.SetType(string(match[1]))
- spec.Info = string(match[2])
-
- match = grammar.ErrorCheckRegexp.FindSubmatch([]byte(ref))
- if match != nil {
- if len(match[3]) != 0 || len(match[4]) != 0 {
- return RefSpec{}, errors.ErrInvalid(KIND_OCI_REFERENCE, ref)
- }
- }
- return spec, nil
- }
- return RefSpec{}, errors.ErrInvalid(KIND_OCI_REFERENCE, ref)
-}
-
-func (r *RefSpec) Name() string {
- return r.UniformRepositorySpec.ComposeRef(r.Repository)
-}
-
-func (r *RefSpec) String() string {
- art := r.Repository
- if r.Tag != nil {
- art = fmt.Sprintf("%s:%s", art, *r.Tag)
- }
- if r.Digest != nil {
- art = fmt.Sprintf("%s@%s", art, r.Digest.String())
- }
- return r.UniformRepositorySpec.ComposeRef(art)
-}
-
-// CredHost fallback to legacy docker domain if applicable
-// this is how containerd translates the old domain for DockerHub to the new one, taken from containerd/reference/docker/reference.go:674.
-func (r *RefSpec) CredHost() string {
- if r.Host == dockerHubDomain {
- return dockerHubLegacyDomain
- }
- return r.Host
-}
-
-func (r RefSpec) DeepCopy() RefSpec {
- if r.Tag != nil {
- tag := *r.Tag
- r.Tag = &tag
- }
- if r.Digest != nil {
- dig := *r.Digest
- r.Digest = &dig
- }
- return r
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-func ParseArt(art string) (ArtSpec, error) {
- match := grammar.AnchoredArtifactVersionRegexp.FindSubmatch([]byte(art))
-
- if match == nil {
- return ArtSpec{}, errors.ErrInvalid(KIND_ARETEFACT_REFERENCE, art)
- }
- var tag *string
- var dig *digest.Digest
-
- if match[2] != nil {
- t := string(match[2])
- tag = &t
- }
- if match[3] != nil {
- t := string(match[3])
- d, err := digest.Parse(t)
- if err != nil {
- return ArtSpec{}, errors.ErrInvalidWrap(err, KIND_ARETEFACT_REFERENCE, art)
- }
- dig = &d
- }
- return ArtSpec{
- Repository: string(match[1]),
- Tag: tag,
- Digest: dig,
- }, nil
-}
-
-// ArtSpec is a go internal representation of a oci reference.
-type ArtSpec struct {
- // Repository is the part of a reference without its hostname
- Repository string `json:"repository"`
- // +optional
- Tag *string `json:"tag,omitempty"`
- // +optional
- Digest *digest.Digest `json:"digest,omitempty"`
-}
-
-func (r *ArtSpec) Version() string {
- if r.Tag != nil {
- return *r.Tag
- }
- if r.Digest != nil {
- return "@" + string(*r.Digest)
- }
- return "latest"
-}
-
-func (r *ArtSpec) IsRegistry() bool {
- return r.Repository == ""
-}
-
-func (r *ArtSpec) IsVersion() bool {
- return r.Tag != nil || r.Digest != nil
-}
-
-func (r *ArtSpec) IsTagged() bool {
- return r.Tag != nil
-}
-
-func (r *ArtSpec) Reference() string {
- if r.Tag != nil {
- return *r.Tag
- }
- if r.Digest != nil {
- return "@" + string(*r.Digest)
- }
- return "latest"
-}
-
-func (r *ArtSpec) String() string {
- s := r.Repository
- if r.Tag != nil {
- s += fmt.Sprintf(":%s", *r.Tag)
- }
- if r.Digest != nil {
- s += fmt.Sprintf("@%s", r.Digest.String())
- }
- return s
-}
diff --git a/pkg/contexts/oci/ref_test.go b/pkg/contexts/oci/ref_test.go
deleted file mode 100644
index ba64f812a..000000000
--- a/pkg/contexts/oci/ref_test.go
+++ /dev/null
@@ -1,829 +0,0 @@
-package oci_test
-
-import (
- "strings"
-
- . "github.com/mandelsoft/goutils/testutils"
- . "github.com/onsi/ginkgo/v2"
- . "github.com/onsi/gomega"
-
- godigest "github.com/opencontainers/go-digest"
-
- "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/oci"
- "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/ctf"
- "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/ocireg"
- "github.com/open-component-model/ocm/pkg/runtime"
-)
-
-func Type(t string) string {
- if t == "" {
- return t
- }
- return t + "::"
-}
-
-func FileFormat(t, f string) string {
- if t == "" {
- return f
- }
- if f == "" {
- return t
- }
- return t + "+" + f
-}
-
-func FileType(t, f string) string {
- if t != "" {
- return t
- } else {
- return f
- }
-}
-
-func Scheme(s string) string {
- if s == "" {
- return s
- }
- return s + "://"
-}
-
-func Sub(t string) string {
- if t == "" {
- return t
- }
- return "/" + t
-}
-
-func Vers(t, d string) string {
- if t == "" && d == "" {
- return ""
- }
- if t == "" {
- return "@" + d
- }
- if d == "" {
- return ":" + t
- }
- return ":" + t + "@" + d
-}
-
-func Dig(b []byte) *godigest.Digest {
- if len(b) == 0 {
- return nil
- }
- s := godigest.Digest(b)
- return &s
-}
-
-func Pointer(b []byte) *string {
- if len(b) == 0 {
- return nil
- }
- s := string(b)
- return &s
-}
-
-func CheckRef(ref string, exp *oci.RefSpec) {
- spec, err := oci.ParseRef(ref)
- if exp == nil {
- ExpectWithOffset(1, err).To(HaveOccurred())
- } else {
- ExpectWithOffset(1, err).To(Succeed())
- ExpectWithOffset(1, spec).To(Equal(*exp))
- }
-}
-
-func CheckRepo(ref string, exp *oci.UniformRepositorySpec) {
- spec, err := oci.ParseRepo(ref)
- if exp == nil {
- ExpectWithOffset(1, err).To(HaveOccurred())
- } else {
- ExpectWithOffset(1, err).To(Succeed())
- ExpectWithOffset(1, spec).To(Equal(*exp))
- }
-}
-
-var _ = Describe("ref parsing", func() {
- digest := godigest.Digest("sha256:3d05e105e350edf5be64fe356f4906dd3f9bf442a279e4142db9879bba8e677a")
- tag := "v1"
-
- ghcr := oci.UniformRepositorySpec{Host: "ghcr.io"}
- docker := oci.UniformRepositorySpec{Host: "docker.io"}
-
- Context("parse file path refs", func() {
- t := "ctf"
- p := "file/path"
- r := "github.com/mandelsoft/ocm"
- v := "v1"
- d := "sha256:3d05e105e350edf5be64fe356f4906dd3f9bf442a279e4142db9879bba8e677a"
-
- Context("[+][::][./][//[:]", func() {
- for _, cm := range []string{"", "+"} {
- for _, ut := range []string{"", t} {
- for _, uf := range []string{"", "directory", "tar", "tgz"} {
- for _, up := range []string{p, "./" + p} {
- for _, uv := range []string{"", v, v + ".1.1", v + "-rc.1", v + ".1.2-rc.1"} {
- for _, ud := range []string{"", d} {
- ref := cm + Type(FileFormat(ut, uf)) + up + "//" + r + Vers(uv, ud)
- ut, uf, uv, up, ud := ut, uf, uv, up, ud
-
- // tests parsing of all permutations of
- // [+][::][./][//[:][@]
- It("parses ref "+ref, func() {
- CheckRef(ref, &oci.RefSpec{
- UniformRepositorySpec: oci.UniformRepositorySpec{
- Type: FileType(ut, uf),
- Scheme: "",
- Host: "",
- Info: up,
- CreateIfMissing: ref[0] == '+',
- TypeHint: FileFormat(ut, uf),
- },
- ArtSpec: oci.ArtSpec{
- Repository: r,
- Tag: Pointer([]byte(uv)),
- Digest: Dig([]byte(ud)),
- },
- })
- })
- }
- }
- }
- }
- }
- }
- })
- })
-
- Context("parse domain refs", func() {
- t := "oci"
- h := "ghcr.io"
- r := "github.com/mandelsoft/ocm"
- v := "v1"
- d := "sha256:3d05e105e350edf5be64fe356f4906dd3f9bf442a279e4142db9879bba8e677a"
-
- // Notice that the file formats (directory, tar, tgz) CAN BE PARSED in this notation, BUT for non file based
- // implementations like oci, this information is not used.
- Context("[+][::][://][:][/]/[:][@]", func() {
- for _, cm := range []string{"", "+"} {
- for _, ut := range []string{"", t} {
- for _, uf := range []string{"", "directory", "tar", "tgz"} {
- for _, ush := range []string{"", "http", "https"} {
- for _, uh := range []string{h, h + ":3030"} {
- for _, uv := range []string{"", v, v + ".1.1", v + "-rc.1", v + ".1.2-rc.1"} {
- for _, ud := range []string{"", d} {
- for _, sep := range []string{"/", "//"} {
- ref := cm + Type(FileFormat(ut, uf)) + Scheme(ush) + uh + sep + r + Vers(uv, ud)
- ut, uf, ush, uh, uv, ud := ut, uf, ush, uh, uv, ud
-
- // tests parsing of all permutations of
- // [::][://][:][/]/[:][@]
- It("parses ref "+ref, func() {
- CheckRef(ref, &oci.RefSpec{
- UniformRepositorySpec: oci.UniformRepositorySpec{
- Type: FileType(ut, uf),
- Scheme: ush,
- Host: uh,
- Info: "",
- CreateIfMissing: ref[0] == '+',
- TypeHint: FileFormat(ut, uf),
- },
- ArtSpec: oci.ArtSpec{
- Repository: r,
- Tag: Pointer([]byte(uv)),
- Digest: Dig([]byte(ud)),
- },
- })
- })
- }
- }
- }
- }
- }
- }
- }
- }
- })
-
- It("repository creation from parsed repo", func() {
- ctx := oci.New()
- aliasreg := ocireg.NewRepositorySpec("http://ghcr.io")
- ctx.SetAlias("myalias", aliasreg)
- repo := Must(oci.ParseRef("myalias//repository:1.0.0"))
- spec := Must(ctx.MapUniformRepositorySpec(&repo.UniformRepositorySpec))
- Expect(spec).To(Equal(aliasreg))
- })
- })
-
- Context("parse host port refs", func() {
- t := "oci"
- h := "localhost"
- r := "github.com/mandelsoft/ocm"
- v := "v1"
- d := "sha256:3d05e105e350edf5be64fe356f4906dd3f9bf442a279e4142db9879bba8e677a"
-
- // localhost (with and without port) (and other host names) are a special case since these are not formally
- // valid domains
- // the combination of this test and the test below test parsing of all permutations of
- // [::][://]:/[:][@]
- Context("[+][