From 1c2ff27dcd23f2e911050a698d9e3d79e3ec43b4 Mon Sep 17 00:00:00 2001 From: Hilmar Falkenberg Date: Fri, 10 Jan 2025 17:40:37 +0100 Subject: [PATCH 01/15] mark as deprecated --- api/helper/builder/ocm_comparch.go | 2 + .../handlers/ocm/comparch/blobhandler.go | 4 ++ .../repositories/comparch/componentarchive.go | 30 +++++++++++++ .../repositories/comparch/format.go | 17 +++++++ .../repositories/comparch/repository.go | 44 +++++++++++++++++++ .../extensions/repositories/comparch/type.go | 9 ++++ .../repositories/comparch/uniform.go | 2 + cmds/ocm/app/app.go | 2 +- .../commands/ocmcmds/componentarchive/cmd.go | 2 + .../ocmcmds/componentarchive/create/cmd.go | 9 +++- .../ocmcmds/componentarchive/transfer/cmd.go | 8 +++- cmds/ocm/commands/ocmcmds/names/names.go | 1 + examples/make/Makefile | 7 +-- 13 files changed, 131 insertions(+), 6 deletions(-) diff --git a/api/helper/builder/ocm_comparch.go b/api/helper/builder/ocm_comparch.go index 45b14789c8..792d0e2569 100644 --- a/api/helper/builder/ocm_comparch.go +++ b/api/helper/builder/ocm_comparch.go @@ -7,8 +7,10 @@ import ( "ocm.software/ocm/api/utils/accessobj" ) +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 const T_COMPARCH = "component archive" +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 func (b *Builder) ComponentArchive(path string, fmt accessio.FileFormat, name, vers string, f ...func()) { r, err := comparch.Open(b.OCMContext(), accessobj.ACC_WRITABLE|accessobj.ACC_CREATE, path, 0o777, accessio.PathFileSystem(b.FileSystem())) b.failOn(err) diff --git a/api/ocm/extensions/blobhandler/handlers/ocm/comparch/blobhandler.go b/api/ocm/extensions/blobhandler/handlers/ocm/comparch/blobhandler.go index a057a1666d..9e05b22440 100644 --- a/api/ocm/extensions/blobhandler/handlers/ocm/comparch/blobhandler.go +++ b/api/ocm/extensions/blobhandler/handlers/ocm/comparch/blobhandler.go @@ -15,19 +15,23 @@ import ( common "ocm.software/ocm/api/utils/misc" ) +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 func init() { cpi.RegisterBlobHandler(NewBlobHandler(), cpi.ForRepo(cpi.CONTEXT_TYPE, comparch.Type)) } //////////////////////////////////////////////////////////////////////////////// +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 // blobHandler is the default handling to store local blobs as local blobs. type blobHandler struct{} +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 func NewBlobHandler() cpi.BlobHandler { return &blobHandler{} } +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 func (b *blobHandler) StoreBlob(blob cpi.BlobAccess, artType, hint string, global cpi.AccessSpec, ctx cpi.StorageContext) (cpi.AccessSpec, error) { ocmctx, ok := ctx.(storagecontext.StorageContext) if !ok { diff --git a/api/ocm/extensions/repositories/comparch/componentarchive.go b/api/ocm/extensions/repositories/comparch/componentarchive.go index aab4b1020a..f291bcd9d8 100644 --- a/api/ocm/extensions/repositories/comparch/componentarchive.go +++ b/api/ocm/extensions/repositories/comparch/componentarchive.go @@ -20,8 +20,10 @@ import ( //////////////////////////////////////////////////////////////////////////////// +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 type _componentVersionAccess = cpi.ComponentVersionAccess +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 // ComponentArchive is the go representation for a component artifact. type ComponentArchive struct { _componentVersionAccess @@ -31,6 +33,7 @@ type ComponentArchive struct { nonref cpi.Repository } +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 // New returns a new representation based element. func New(ctx cpi.Context, acc accessobj.AccessMode, fs vfs.FileSystem, setup accessobj.Setup, closer accessobj.Closer, mode vfs.FileMode) (*ComponentArchive, error) { obj, err := accessobj.NewAccessObject(accessObjectInfo, acc, fs, setup, closer, mode) @@ -41,6 +44,7 @@ func New(ctx cpi.Context, acc accessobj.AccessMode, fs vfs.FileSystem, setup acc return _Wrap(ctx, obj, spec, err) } +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 func _Wrap(ctx cpi.ContextProvider, obj *accessobj.AccessObject, spec *RepositorySpec, err error) (*ComponentArchive, error) { if err != nil { return nil, err @@ -67,41 +71,50 @@ func _Wrap(ctx cpi.ContextProvider, obj *accessobj.AccessObject, spec *Repositor //////////////////////////////////////////////////////////////////////////////// +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 var _ cpi.ComponentVersionAccess = &ComponentArchive{} +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 func (c *ComponentArchive) Close() error { return c.main.Close() } +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 func (c *ComponentArchive) IsReadOnly() bool { return c.container.IsReadOnly() } +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 func (c *ComponentArchive) SetReadOnly() { c.container.SetReadOnly() } +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 // Repository returns a non referencing repository which does not // close the archive. func (c *ComponentArchive) Repository() cpi.Repository { return c.nonref } +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 // AsRepository returns a repository view closing the archive. func (c *ComponentArchive) AsRepository() cpi.Repository { return c.main } +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 func (c *ComponentArchive) SetName(n string) { c.GetDescriptor().Name = n } +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 func (c *ComponentArchive) SetVersion(v string) { c.GetDescriptor().Version = v } //////////////////////////////////////////////////////////////////////////////// +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 type componentArchiveContainer struct { ctx cpi.Context base repocpi.ComponentVersionAccessBridge @@ -110,42 +123,52 @@ type componentArchiveContainer struct { repo cpi.Repository } +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 var _ repocpi.ComponentVersionAccessImpl = (*componentArchiveContainer)(nil) +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 func (c *componentArchiveContainer) SetBridge(base repocpi.ComponentVersionAccessBridge) { c.base = base } +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 func (c *componentArchiveContainer) GetParentBridge() repocpi.ComponentAccessBridge { return nil } +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 func (c *componentArchiveContainer) Close() error { var list errors.ErrorList _, err := c.Update() return list.Add(err, c.fsacc.Close()).Result() } +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 func (c *componentArchiveContainer) GetContext() cpi.Context { return c.ctx } +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 func (c *componentArchiveContainer) Repository() cpi.Repository { return c.repo } +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 func (c *componentArchiveContainer) IsReadOnly() bool { return c.fsacc.IsReadOnly() } +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 func (c *componentArchiveContainer) SetReadOnly() { c.fsacc.SetReadOnly() } +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 func (c *componentArchiveContainer) Update() (bool, error) { return c.fsacc.Update() } +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 func (c *componentArchiveContainer) SetDescriptor(cd *compdesc.ComponentDescriptor) (bool, error) { if c.fsacc.IsReadOnly() { return false, accessobj.ErrReadOnly @@ -155,6 +178,7 @@ func (c *componentArchiveContainer) SetDescriptor(cd *compdesc.ComponentDescript return c.fsacc.Update() } +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 func (c *componentArchiveContainer) GetDescriptor() *compdesc.ComponentDescriptor { if c.fsacc.IsReadOnly() { return c.fsacc.GetState().GetOriginalState().(*compdesc.ComponentDescriptor) @@ -162,18 +186,22 @@ func (c *componentArchiveContainer) GetDescriptor() *compdesc.ComponentDescripto return c.fsacc.GetState().GetState().(*compdesc.ComponentDescriptor) } +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 func (c *componentArchiveContainer) GetBlob(name string) (cpi.DataAccess, error) { return c.fsacc.GetBlobDataByName(name) } +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 func (c *componentArchiveContainer) GetStorageContext() cpi.StorageContext { return ocmhdlr.New(c.Repository(), c.base.GetName(), &BlobSink{c.fsacc}, Type) } +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 type BlobSink struct { Sink ocicpi.BlobSink } +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 func (s *BlobSink) AddBlob(blob blobaccess.BlobAccess) (string, error) { err := s.Sink.AddBlob(blob) if err != nil { @@ -182,6 +210,7 @@ func (s *BlobSink) AddBlob(blob blobaccess.BlobAccess) (string, error) { return blob.Digest().String(), nil } +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 func (c *componentArchiveContainer) AddBlob(blob cpi.BlobAccess, refName string, global cpi.AccessSpec) (cpi.AccessSpec, error) { if blob == nil { return nil, errors.New("a resource has to be defined") @@ -193,6 +222,7 @@ func (c *componentArchiveContainer) AddBlob(blob cpi.BlobAccess, refName string, return localblob.New(common.DigestToFileName(blob.Digest()), refName, blob.MimeType(), global), nil } +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 func (c *componentArchiveContainer) AccessMethod(a cpi.AccessSpec, cv refmgmt.ExtendedAllocatable) (cpi.AccessMethod, error) { if a.GetKind() == localblob.Type || a.GetKind() == localfsblob.Type { accessSpec, err := c.GetContext().AccessSpecForSpec(a) diff --git a/api/ocm/extensions/repositories/comparch/format.go b/api/ocm/extensions/repositories/comparch/format.go index de3548141d..005714d295 100644 --- a/api/ocm/extensions/repositories/comparch/format.go +++ b/api/ocm/extensions/repositories/comparch/format.go @@ -13,12 +13,15 @@ import ( "ocm.software/ocm/api/utils/accessobj" ) +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 // ComponentDescriptorFileName is the name of the component-descriptor file. const ComponentDescriptorFileName = compdesc.ComponentDescriptorFileName +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 // BlobsDirectoryName is the name of the blob directory in the tar. const BlobsDirectoryName = "blobs" +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 var accessObjectInfo = &accessobj.DefaultAccessObjectInfo{ DescriptorFileName: ComponentDescriptorFileName, ObjectTypeName: "component archive", @@ -28,13 +31,16 @@ var accessObjectInfo = &accessobj.DefaultAccessObjectInfo{ DescriptorValidator: validateDescriptor, } +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 func validateDescriptor(data []byte) error { _, err := compdesc.Decode(data) return err } +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 type Object = ComponentArchive +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 type FormatHandler interface { accessio.Option @@ -45,10 +51,12 @@ type FormatHandler interface { Write(obj *Object, path string, opts accessio.Options, mode vfs.FileMode) error } +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 type formatHandler struct { accessobj.FormatHandler } +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 var ( FormatDirectory = RegisterFormat(accessobj.FormatDirectory) FormatTAR = RegisterFormat(accessobj.FormatTAR) @@ -57,11 +65,13 @@ var ( //////////////////////////////////////////////////////////////////////////////// +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 var ( fileFormats = map[accessio.FileFormat]*formatHandler{} lock sync.RWMutex ) +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 func RegisterFormat(f accessobj.FormatHandler) *formatHandler { lock.Lock() defer lock.Unlock() @@ -70,12 +80,14 @@ func RegisterFormat(f accessobj.FormatHandler) *formatHandler { return h } +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 func GetFormats() []string { lock.RLock() defer lock.RUnlock() return accessio.GetFormatsFor(fileFormats) } +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 func GetFormat(name accessio.FileFormat) FormatHandler { lock.RLock() defer lock.RUnlock() @@ -88,6 +100,7 @@ func GetFormat(name accessio.FileFormat) FormatHandler { //////////////////////////////////////////////////////////////////////////////// +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 func Open(ctx cpi.ContextProvider, acc accessobj.AccessMode, path string, mode vfs.FileMode, olist ...accessio.Option) (*Object, error) { opts, err := accessio.AccessOptions(&accessio.StandardOptions{PathFileSystem: vfsattr.Get(ctx.OCMContext())}, olist...) if err != nil { @@ -107,6 +120,7 @@ func Open(ctx cpi.ContextProvider, acc accessobj.AccessMode, path string, mode v return h.Open(ctx, acc, path, o) } +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 func Create(ctx cpi.ContextProvider, acc accessobj.AccessMode, path string, mode vfs.FileMode, opts ...accessio.Option) (*Object, error) { o, err := accessio.AccessOptions(nil, opts...) if err != nil { @@ -122,6 +136,7 @@ func Create(ctx cpi.ContextProvider, acc accessobj.AccessMode, path string, mode //////////////////////////////////////////////////////////////////////////////// +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 func (h *formatHandler) Open(ctx cpi.ContextProvider, acc accessobj.AccessMode, path string, opts accessio.Options) (*Object, error) { obj, err := h.FormatHandler.Open(accessObjectInfo, acc, path, opts) if err != nil { @@ -131,6 +146,7 @@ func (h *formatHandler) Open(ctx cpi.ContextProvider, acc accessobj.AccessMode, return _Wrap(ctx, obj, spec, err) } +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 func (h *formatHandler) Create(ctx cpi.ContextProvider, path string, opts accessio.Options, mode vfs.FileMode) (*Object, error) { obj, err := h.FormatHandler.Create(accessObjectInfo, path, opts, mode) if err != nil { @@ -140,6 +156,7 @@ func (h *formatHandler) Create(ctx cpi.ContextProvider, path string, opts access return _Wrap(ctx, obj, spec, err) } +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 // WriteToFilesystem writes the current object to a filesystem. func (h *formatHandler) Write(obj *Object, path string, opts accessio.Options, mode vfs.FileMode) error { return h.FormatHandler.Write(obj.container.fsacc.Access(), path, opts, mode) diff --git a/api/ocm/extensions/repositories/comparch/repository.go b/api/ocm/extensions/repositories/comparch/repository.go index 8ce509bf96..92d2ac0f0b 100644 --- a/api/ocm/extensions/repositories/comparch/repository.go +++ b/api/ocm/extensions/repositories/comparch/repository.go @@ -22,6 +22,7 @@ import ( "ocm.software/ocm/api/utils/refmgmt" ) +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 type RepositoryImpl struct { lock sync.RWMutex bridge repocpi.RepositoryBridge @@ -29,8 +30,10 @@ type RepositoryImpl struct { nonref cpi.Repository } +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 var _ repocpi.RepositoryImpl = (*RepositoryImpl)(nil) +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 func NewRepository(ctxp cpi.ContextProvider, s *RepositorySpec) (cpi.Repository, error) { ctx := datacontext.InternalContextRef(ctxp.OCMContext()) if s.GetPathFileSystem() == nil { @@ -52,31 +55,38 @@ func newRepository(a *ComponentArchive) (main, nonref cpi.Repository) { return r, impl.nonref } +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 func (r *RepositoryImpl) Close() error { return r.arch.container.Close() } +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 func (r *RepositoryImpl) IsReadOnly() bool { return r.arch.IsReadOnly() } +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 func (r *RepositoryImpl) SetReadOnly() { r.arch.SetReadOnly() } +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 func (r *RepositoryImpl) SetBridge(base repocpi.RepositoryBridge) { r.bridge = base r.nonref = repocpi.NewNoneRefRepositoryView(base) } +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 func (r *RepositoryImpl) GetContext() cpi.Context { return r.arch.GetContext() } +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 func (r *RepositoryImpl) ComponentLister() cpi.ComponentLister { return r } +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 func (r *RepositoryImpl) matchPrefix(prefix string, closure bool) bool { if r.arch.GetName() != prefix { if prefix != "" && !strings.HasSuffix(prefix, "/") { @@ -89,6 +99,7 @@ func (r *RepositoryImpl) matchPrefix(prefix string, closure bool) bool { return true } +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 func (r *RepositoryImpl) NumComponents(prefix string) (int, error) { r.lock.RLock() defer r.lock.RUnlock() @@ -101,6 +112,7 @@ func (r *RepositoryImpl) NumComponents(prefix string) (int, error) { return 1, nil } +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 func (r *RepositoryImpl) GetComponents(prefix string, closure bool) ([]string, error) { r.lock.RLock() defer r.lock.RUnlock() @@ -113,6 +125,7 @@ func (r *RepositoryImpl) GetComponents(prefix string, closure bool) ([]string, e return []string{r.arch.GetName()}, nil } +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 func (r *RepositoryImpl) Get() *ComponentArchive { r.lock.RLock() defer r.lock.RUnlock() @@ -122,10 +135,12 @@ func (r *RepositoryImpl) Get() *ComponentArchive { return nil } +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 func (r *RepositoryImpl) GetSpecification() cpi.RepositorySpec { return r.arch.spec } +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 func (r *RepositoryImpl) ExistsComponentVersion(name string, ref string) (bool, error) { r.lock.RLock() defer r.lock.RUnlock() @@ -135,6 +150,7 @@ func (r *RepositoryImpl) ExistsComponentVersion(name string, ref string) (bool, return r.arch.GetName() == name && r.arch.GetVersion() == ref, nil } +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 func (r *RepositoryImpl) LookupComponent(name string) (*repocpi.ComponentAccessInfo, error) { r.lock.RLock() defer r.lock.RUnlock() @@ -149,11 +165,13 @@ func (r *RepositoryImpl) LookupComponent(name string) (*repocpi.ComponentAccessI //////////////////////////////////////////////////////////////////////////////// +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 type ComponentAccessImpl struct { base repocpi.ComponentAccessBridge repo *RepositoryImpl } +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 var _ repocpi.ComponentAccessImpl = (*ComponentAccessImpl)(nil) func newComponentAccess(r *RepositoryImpl) (*repocpi.ComponentAccessInfo, error) { @@ -163,38 +181,47 @@ func newComponentAccess(r *RepositoryImpl) (*repocpi.ComponentAccessInfo, error) return &repocpi.ComponentAccessInfo{impl, "component archive", true}, nil } +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 func (c *ComponentAccessImpl) Close() error { return nil } +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 func (c *ComponentAccessImpl) SetBridge(base repocpi.ComponentAccessBridge) { c.base = base } +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 func (c *ComponentAccessImpl) GetParentBridge() repocpi.RepositoryViewManager { return c.repo.bridge } +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 func (c *ComponentAccessImpl) GetContext() cpi.Context { return c.repo.GetContext() } +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 func (c *ComponentAccessImpl) GetName() string { return c.repo.arch.GetName() } +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 func (c *ComponentAccessImpl) IsReadOnly() bool { return c.repo.arch.IsReadOnly() } +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 func (c *ComponentAccessImpl) ListVersions() ([]string, error) { return []string{c.repo.arch.GetVersion()}, nil } +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 func (c *ComponentAccessImpl) HasVersion(vers string) (bool, error) { return vers == c.repo.arch.GetVersion(), nil } +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 func (c *ComponentAccessImpl) LookupVersion(version string) (*repocpi.ComponentVersionAccessInfo, error) { if version != c.repo.arch.GetVersion() { return nil, errors.ErrNotFound(cpi.KIND_COMPONENTVERSION, fmt.Sprintf("%s:%s", c.GetName(), c.repo.arch.GetVersion())) @@ -202,6 +229,7 @@ func (c *ComponentAccessImpl) LookupVersion(version string) (*repocpi.ComponentV return newComponentVersionAccess(c, version, false) } +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 func (c *ComponentAccessImpl) NewVersion(version string, overrides ...bool) (*repocpi.ComponentVersionAccessInfo, error) { if version != c.repo.arch.GetVersion() { return nil, errors.ErrNotSupported(cpi.KIND_COMPONENTVERSION, version, fmt.Sprintf("component archive %s:%s", c.GetName(), c.repo.arch.GetVersion())) @@ -214,6 +242,7 @@ func (c *ComponentAccessImpl) NewVersion(version string, overrides ...bool) (*re //////////////////////////////////////////////////////////////////////////////// +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 type ComponentVersionContainer struct { impl repocpi.ComponentVersionAccessBridge @@ -222,6 +251,7 @@ type ComponentVersionContainer struct { descriptor *compdesc.ComponentDescriptor } +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 var _ repocpi.ComponentVersionAccessImpl = (*ComponentVersionContainer)(nil) func newComponentVersionAccess(comp *ComponentAccessImpl, version string, persistent bool) (*repocpi.ComponentVersionAccessInfo, error) { @@ -239,57 +269,70 @@ func newComponentVersionContainer(comp *ComponentAccessImpl) (*ComponentVersionC }, nil } +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 func (c *ComponentVersionContainer) SetBridge(impl repocpi.ComponentVersionAccessBridge) { c.impl = impl } +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 func (c *ComponentVersionContainer) GetParentBridge() repocpi.ComponentAccessBridge { return c.comp.base } +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 func (c *ComponentVersionContainer) Close() error { return nil } +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 func (c *ComponentVersionContainer) GetContext() cpi.Context { return c.comp.GetContext() } +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 func (c *ComponentVersionContainer) Repository() cpi.Repository { return c.comp.repo.arch.nonref } +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 func (c *ComponentVersionContainer) IsReadOnly() bool { return c.comp.repo.arch.IsReadOnly() } +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 func (c *ComponentVersionContainer) SetReadOnly() { c.comp.repo.arch.SetReadOnly() } +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 func (c *ComponentVersionContainer) Update() (bool, error) { desc := c.comp.repo.arch.GetDescriptor() *desc = *c.descriptor.Copy() return c.comp.repo.arch.container.Update() } +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 func (c *ComponentVersionContainer) SetDescriptor(cd *compdesc.ComponentDescriptor) (bool, error) { *c.descriptor = *cd return c.Update() } +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 func (c *ComponentVersionContainer) GetDescriptor() *compdesc.ComponentDescriptor { return c.descriptor } +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 func (c *ComponentVersionContainer) GetBlob(name string) (cpi.DataAccess, error) { return c.comp.repo.arch.container.GetBlob(name) } +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 func (c *ComponentVersionContainer) GetStorageContext() cpi.StorageContext { return ocmhdlr.New(c.Repository(), c.comp.GetName(), &BlobSink{c.comp.repo.arch.container.fsacc}, Type) } +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 func (c *ComponentVersionContainer) AddBlob(blob cpi.BlobAccess, refName string, global cpi.AccessSpec) (cpi.AccessSpec, error) { if blob == nil { return nil, errors.New("a resource has to be defined") @@ -301,6 +344,7 @@ func (c *ComponentVersionContainer) AddBlob(blob cpi.BlobAccess, refName string, return localblob.New(common.DigestToFileName(blob.Digest()), refName, blob.MimeType(), global), nil } +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 func (c *ComponentVersionContainer) AccessMethod(a cpi.AccessSpec, cv refmgmt.ExtendedAllocatable) (cpi.AccessMethod, error) { if a.GetKind() == localblob.Type || a.GetKind() == localfsblob.Type { accessSpec, err := c.GetContext().AccessSpecForSpec(a) diff --git a/api/ocm/extensions/repositories/comparch/type.go b/api/ocm/extensions/repositories/comparch/type.go index 00af926f0b..626683ff4e 100644 --- a/api/ocm/extensions/repositories/comparch/type.go +++ b/api/ocm/extensions/repositories/comparch/type.go @@ -11,6 +11,7 @@ import ( "ocm.software/ocm/api/utils/runtime" ) +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 const ( Type = "ComponentArchive" TypeV1 = Type + runtime.VersionSeparator + "v1" @@ -21,6 +22,7 @@ func init() { cpi.RegisterRepositoryType(cpi.NewRepositoryType[*RepositorySpec](TypeV1, nil)) } +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 type RepositorySpec struct { runtime.ObjectVersionedType `json:",inline"` accessio.StandardOptions `json:",omitempty"` @@ -31,12 +33,14 @@ type RepositorySpec struct { AccessMode accessobj.AccessMode `json:"accessMode,omitempty"` } +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 var ( _ accessio.Option = (*RepositorySpec)(nil) _ cpi.RepositorySpec = (*RepositorySpec)(nil) _ cpi.IntermediateRepositorySpecAspect = (*RepositorySpec)(nil) ) +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 // NewRepositorySpec creates a new RepositorySpec. func NewRepositorySpec(acc accessobj.AccessMode, filePath string, opts ...accessio.Option) (*RepositorySpec, error) { spec := &RepositorySpec{ @@ -52,18 +56,22 @@ func NewRepositorySpec(acc accessobj.AccessMode, filePath string, opts ...access return spec, nil } +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 func (a *RepositorySpec) IsIntermediate() bool { return true } +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 func (a *RepositorySpec) GetType() string { return Type } +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 func (a *RepositorySpec) Repository(ctx cpi.Context, creds credentials.Credentials) (cpi.Repository, error) { return NewRepository(ctx, a) } +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 func (a *RepositorySpec) AsUniformSpec(ctx cpi.Context) *cpi.UniformRepositorySpec { opts := a.StandardOptions opts.Default(vfsattr.Get(ctx)) @@ -75,6 +83,7 @@ func (a *RepositorySpec) AsUniformSpec(ctx cpi.Context) *cpi.UniformRepositorySp return &cpi.UniformRepositorySpec{Type: a.GetKind(), SubPath: p} } +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 func (a *RepositorySpec) Validate(ctx cpi.Context, creds credentials.Credentials, context ...credentials.UsageContext) error { opts := a.StandardOptions opts.Default(vfsattr.Get(ctx)) diff --git a/api/ocm/extensions/repositories/comparch/uniform.go b/api/ocm/extensions/repositories/comparch/uniform.go index 00a3ca2154..a1d998debd 100644 --- a/api/ocm/extensions/repositories/comparch/uniform.go +++ b/api/ocm/extensions/repositories/comparch/uniform.go @@ -7,6 +7,7 @@ import ( "ocm.software/ocm/api/utils/accessobj" ) +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 const AltType = "ca" func init() { @@ -25,6 +26,7 @@ func explicit(t string) bool { return t == Type || t == AltType } +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 func (h *repospechandler) MapReference(ctx cpi.Context, u *cpi.UniformRepositorySpec) (cpi.RepositorySpec, error) { path := u.Info if u.Info == "" { diff --git a/cmds/ocm/app/app.go b/cmds/ocm/app/app.go index d0266a7f4d..fed42c1677 100644 --- a/cmds/ocm/app/app.go +++ b/cmds/ocm/app/app.go @@ -86,7 +86,7 @@ type CLIOptions struct { var desc = ` The Open Component Model command line client supports the work with OCM -artifacts, like Component Archives, Common Transport Archive, +artifacts, like Common Transport Archive, Component Repositories, and Component Versions. Additionally it provides some limited support for the docker daemon, OCI artifacts and diff --git a/cmds/ocm/commands/ocmcmds/componentarchive/cmd.go b/cmds/ocm/commands/ocmcmds/componentarchive/cmd.go index a053aa71e3..e80ebfd44a 100644 --- a/cmds/ocm/commands/ocmcmds/componentarchive/cmd.go +++ b/cmds/ocm/commands/ocmcmds/componentarchive/cmd.go @@ -10,8 +10,10 @@ import ( "ocm.software/ocm/cmds/ocm/common/utils" ) +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 var Names = names.ComponentArchive +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 // NewCommand creates a new command. func NewCommand(ctx clictx.Context) *cobra.Command { cmd := utils.MassageCommand(&cobra.Command{ diff --git a/cmds/ocm/commands/ocmcmds/componentarchive/create/cmd.go b/cmds/ocm/commands/ocmcmds/componentarchive/create/cmd.go index a999bc6852..467e0f3982 100644 --- a/cmds/ocm/commands/ocmcmds/componentarchive/create/cmd.go +++ b/cmds/ocm/commands/ocmcmds/componentarchive/create/cmd.go @@ -25,11 +25,13 @@ import ( "ocm.software/ocm/cmds/ocm/common/utils" ) +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 var ( Names = names.ComponentArchive Verb = verbs.Create ) +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 type Command struct { utils.BaseCommand @@ -46,16 +48,18 @@ type Command struct { Labels metav1.Labels } +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 // NewCommand creates a new ctf command. func NewCommand(ctx clictx.Context, names ...string) *cobra.Command { return utils.SetupCommand(&Command{BaseCommand: utils.NewBaseCommand(ctx, formatoption.New(comparch.GetFormats()...), fileoption.NewCompArch(), schemaoption.New(compdesc.DefaultSchemeVersion))}, utils.Names(Names, names...)...) } +// Deprecated: Component Archive (CA) - https://kubernetes.slack.com/archives/C05UWBE8R1D/p1734357630853489 func (o *Command) ForName(name string) *cobra.Command { return &cobra.Command{ Use: "[] --provider {--provider