mirror of
https://github.com/moby/moby.git
synced 2026-01-11 18:51:37 +00:00
17315a20ee
Update to containerd 1.7.18, which now migrated to the errdefs module. The
existing errdefs package is now an alias for the module, and should no longer
be used directly.
This patch:
- updates the containerd dependency: https://github.com/containerd/containerd/compare/v1.7.17...v1.7.18
- replaces uses of the old package in favor of the new module
- adds a linter check to prevent accidental re-introduction of the old package
- adds a linter check to prevent using the "log" package, which was also
migrated to a separate module.
There are still some uses of the old package in (indirect) dependencies,
which should go away over time.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 86f7762d48)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
47 lines
1.5 KiB
Go
47 lines
1.5 KiB
Go
package containerd
|
|
|
|
import (
|
|
"context"
|
|
|
|
"github.com/containerd/containerd/content"
|
|
containerdimages "github.com/containerd/containerd/images"
|
|
cerrdefs "github.com/containerd/errdefs"
|
|
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
|
|
)
|
|
|
|
// walkPresentChildren is a simple wrapper for containerdimages.Walk with presentChildrenHandler.
|
|
// This is only a convenient helper to reduce boilerplate.
|
|
func (i *ImageService) walkPresentChildren(ctx context.Context, target ocispec.Descriptor, f func(context.Context, ocispec.Descriptor) error) error {
|
|
return containerdimages.Walk(ctx, presentChildrenHandler(i.content, containerdimages.HandlerFunc(
|
|
func(ctx context.Context, desc ocispec.Descriptor) ([]ocispec.Descriptor, error) {
|
|
return nil, f(ctx, desc)
|
|
})), target)
|
|
}
|
|
|
|
// presentChildrenHandler is a handler wrapper which traverses all children
|
|
// descriptors that are present in the store and calls specified handler.
|
|
func presentChildrenHandler(store content.Store, h containerdimages.HandlerFunc) containerdimages.HandlerFunc {
|
|
return func(ctx context.Context, desc ocispec.Descriptor) ([]ocispec.Descriptor, error) {
|
|
_, err := store.Info(ctx, desc.Digest)
|
|
if err != nil {
|
|
if cerrdefs.IsNotFound(err) {
|
|
return nil, nil
|
|
}
|
|
return nil, err
|
|
}
|
|
|
|
children, err := h(ctx, desc)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
c, err := containerdimages.Children(ctx, store, desc)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
children = append(children, c...)
|
|
|
|
return children, nil
|
|
}
|
|
}
|