diff --git a/core/content/adaptor.go b/core/content/adaptor.go index 4f4c76013..4ba6cc74d 100644 --- a/core/content/adaptor.go +++ b/core/content/adaptor.go @@ -19,7 +19,7 @@ package content import ( "strings" - "github.com/containerd/containerd/v2/filters" + "github.com/containerd/containerd/v2/pkg/filters" ) // AdaptInfo returns `filters.Adaptor` that handles `content.Info`. diff --git a/core/metadata/adaptors.go b/core/metadata/adaptors.go index 9adaf9882..16c63a035 100644 --- a/core/metadata/adaptors.go +++ b/core/metadata/adaptors.go @@ -25,7 +25,7 @@ import ( "github.com/containerd/containerd/v2/core/leases" "github.com/containerd/containerd/v2/core/sandbox" "github.com/containerd/containerd/v2/core/snapshots" - "github.com/containerd/containerd/v2/filters" + "github.com/containerd/containerd/v2/pkg/filters" ) func adaptImage(o interface{}) filters.Adaptor { diff --git a/core/metadata/containers.go b/core/metadata/containers.go index 4be150206..0c65489bd 100644 --- a/core/metadata/containers.go +++ b/core/metadata/containers.go @@ -25,11 +25,11 @@ import ( "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/metadata/boltutil" - "github.com/containerd/containerd/v2/filters" "github.com/containerd/containerd/v2/identifiers" "github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/errdefs" + "github.com/containerd/containerd/v2/pkg/filters" "github.com/containerd/containerd/v2/protobuf/proto" "github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/typeurl/v2" diff --git a/core/metadata/containers_test.go b/core/metadata/containers_test.go index 0e5a0f4af..30b6d7b76 100644 --- a/core/metadata/containers_test.go +++ b/core/metadata/containers_test.go @@ -26,9 +26,9 @@ import ( "time" "github.com/containerd/containerd/v2/core/containers" - "github.com/containerd/containerd/v2/filters" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/errdefs" + "github.com/containerd/containerd/v2/pkg/filters" "github.com/containerd/containerd/v2/protobuf" "github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/log/logtest" diff --git a/core/metadata/content.go b/core/metadata/content.go index e386f3a5d..1e9751aa7 100644 --- a/core/metadata/content.go +++ b/core/metadata/content.go @@ -27,10 +27,10 @@ import ( "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/metadata/boltutil" - "github.com/containerd/containerd/v2/filters" "github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/errdefs" + "github.com/containerd/containerd/v2/pkg/filters" "github.com/containerd/log" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/core/metadata/images.go b/core/metadata/images.go index 5fe46f629..1a3b3ce67 100644 --- a/core/metadata/images.go +++ b/core/metadata/images.go @@ -27,11 +27,11 @@ import ( "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/metadata/boltutil" - "github.com/containerd/containerd/v2/filters" "github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/epoch" "github.com/containerd/containerd/v2/pkg/errdefs" + "github.com/containerd/containerd/v2/pkg/filters" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" bolt "go.etcd.io/bbolt" diff --git a/core/metadata/images_test.go b/core/metadata/images_test.go index 4264db6ba..e4a574c0e 100644 --- a/core/metadata/images_test.go +++ b/core/metadata/images_test.go @@ -24,8 +24,8 @@ import ( "time" "github.com/containerd/containerd/v2/core/images" - "github.com/containerd/containerd/v2/filters" "github.com/containerd/containerd/v2/pkg/errdefs" + "github.com/containerd/containerd/v2/pkg/filters" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/core/metadata/leases.go b/core/metadata/leases.go index b3dab806b..f8e8cd1a1 100644 --- a/core/metadata/leases.go +++ b/core/metadata/leases.go @@ -26,9 +26,9 @@ import ( "github.com/containerd/containerd/v2/core/leases" "github.com/containerd/containerd/v2/core/metadata/boltutil" - "github.com/containerd/containerd/v2/filters" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/errdefs" + "github.com/containerd/containerd/v2/pkg/filters" digest "github.com/opencontainers/go-digest" bolt "go.etcd.io/bbolt" ) diff --git a/core/metadata/sandbox.go b/core/metadata/sandbox.go index bfad58eec..dd377edad 100644 --- a/core/metadata/sandbox.go +++ b/core/metadata/sandbox.go @@ -25,10 +25,10 @@ import ( "github.com/containerd/containerd/v2/core/metadata/boltutil" api "github.com/containerd/containerd/v2/core/sandbox" - "github.com/containerd/containerd/v2/filters" "github.com/containerd/containerd/v2/identifiers" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/errdefs" + "github.com/containerd/containerd/v2/pkg/filters" "github.com/containerd/typeurl/v2" "go.etcd.io/bbolt" ) diff --git a/core/metadata/snapshot.go b/core/metadata/snapshot.go index 85c47b335..68aebfc18 100644 --- a/core/metadata/snapshot.go +++ b/core/metadata/snapshot.go @@ -28,10 +28,10 @@ import ( "github.com/containerd/containerd/v2/core/metadata/boltutil" "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/core/snapshots" - "github.com/containerd/containerd/v2/filters" "github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/errdefs" + "github.com/containerd/containerd/v2/pkg/filters" "github.com/containerd/log" bolt "go.etcd.io/bbolt" ) diff --git a/core/metadata/snapshot_test.go b/core/metadata/snapshot_test.go index 745b24d80..1adc7cf9f 100644 --- a/core/metadata/snapshot_test.go +++ b/core/metadata/snapshot_test.go @@ -30,9 +30,9 @@ import ( "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/core/snapshots" "github.com/containerd/containerd/v2/core/snapshots/testsuite" - "github.com/containerd/containerd/v2/filters" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/errdefs" + "github.com/containerd/containerd/v2/pkg/filters" "github.com/containerd/containerd/v2/pkg/testutil" "github.com/containerd/containerd/v2/plugins/snapshots/native" bolt "go.etcd.io/bbolt" diff --git a/core/snapshots/storage/bolt.go b/core/snapshots/storage/bolt.go index afd5abae9..e1add50b8 100644 --- a/core/snapshots/storage/bolt.go +++ b/core/snapshots/storage/bolt.go @@ -27,8 +27,8 @@ import ( "github.com/containerd/containerd/v2/core/metadata/boltutil" "github.com/containerd/containerd/v2/core/snapshots" - "github.com/containerd/containerd/v2/filters" "github.com/containerd/containerd/v2/pkg/errdefs" + "github.com/containerd/containerd/v2/pkg/filters" bolt "go.etcd.io/bbolt" ) diff --git a/pkg/events/exchange/exchange.go b/pkg/events/exchange/exchange.go index 1b09b3661..c77e5ff21 100644 --- a/pkg/events/exchange/exchange.go +++ b/pkg/events/exchange/exchange.go @@ -22,11 +22,11 @@ import ( "strings" "time" - "github.com/containerd/containerd/v2/filters" "github.com/containerd/containerd/v2/identifiers" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/events" + "github.com/containerd/containerd/v2/pkg/filters" "github.com/containerd/log" "github.com/containerd/typeurl/v2" goevents "github.com/docker/go-events" diff --git a/filters/adaptor.go b/pkg/filters/adaptor.go similarity index 100% rename from filters/adaptor.go rename to pkg/filters/adaptor.go diff --git a/filters/filter.go b/pkg/filters/filter.go similarity index 100% rename from filters/filter.go rename to pkg/filters/filter.go diff --git a/filters/filter_test.go b/pkg/filters/filter_test.go similarity index 100% rename from filters/filter_test.go rename to pkg/filters/filter_test.go diff --git a/filters/parser.go b/pkg/filters/parser.go similarity index 100% rename from filters/parser.go rename to pkg/filters/parser.go diff --git a/filters/quote.go b/pkg/filters/quote.go similarity index 100% rename from filters/quote.go rename to pkg/filters/quote.go diff --git a/filters/scanner.go b/pkg/filters/scanner.go similarity index 100% rename from filters/scanner.go rename to pkg/filters/scanner.go diff --git a/filters/scanner_test.go b/pkg/filters/scanner_test.go similarity index 100% rename from filters/scanner_test.go rename to pkg/filters/scanner_test.go diff --git a/plugins/content/local/store.go b/plugins/content/local/store.go index d51229b1f..02f8a6a11 100644 --- a/plugins/content/local/store.go +++ b/plugins/content/local/store.go @@ -28,8 +28,8 @@ import ( "time" "github.com/containerd/containerd/v2/core/content" - "github.com/containerd/containerd/v2/filters" "github.com/containerd/containerd/v2/pkg/errdefs" + "github.com/containerd/containerd/v2/pkg/filters" "github.com/containerd/log" "github.com/opencontainers/go-digest" diff --git a/plugins/services/introspection/local.go b/plugins/services/introspection/local.go index bd977a8ba..9c78c4d62 100644 --- a/plugins/services/introspection/local.go +++ b/plugins/services/introspection/local.go @@ -32,8 +32,8 @@ import ( api "github.com/containerd/containerd/v2/api/services/introspection/v1" "github.com/containerd/containerd/v2/api/types" - "github.com/containerd/containerd/v2/filters" "github.com/containerd/containerd/v2/pkg/errdefs" + "github.com/containerd/containerd/v2/pkg/filters" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins/services" "github.com/containerd/containerd/v2/plugins/services/warning" diff --git a/plugins/services/tasks/local.go b/plugins/services/tasks/local.go index 0b2d72b56..fabd16046 100644 --- a/plugins/services/tasks/local.go +++ b/plugins/services/tasks/local.go @@ -34,11 +34,11 @@ import ( "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/metadata" "github.com/containerd/containerd/v2/core/mount" - "github.com/containerd/containerd/v2/filters" "github.com/containerd/containerd/v2/pkg/archive" "github.com/containerd/containerd/v2/pkg/blockio" "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/events" + "github.com/containerd/containerd/v2/pkg/filters" "github.com/containerd/containerd/v2/pkg/rdt" "github.com/containerd/containerd/v2/pkg/timeout" "github.com/containerd/containerd/v2/plugins"