github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Move filters to pkg/filters

Browse Source 
Signed-off-by: Derek McGowan <derek@mcg.dev>
This commit is contained in:
Derek McGowan
2024-01-17 09:54:54 -08:00
parent 44a836c9b5
commit c38f2ab724
23 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/content/adaptor.go
View File

@@ -19,7 +19,7 @@ package content
import ( import (
"strings" "strings"
"github.com/containerd/containerd/v2/filters" "github.com/containerd/containerd/v2/pkg/filters"
) )
// AdaptInfo returns `filters.Adaptor` that handles `content.Info`. // AdaptInfo returns `filters.Adaptor` that handles `content.Info`.

2
core/metadata/adaptors.go
View File

@@ -25,7 +25,7 @@ import (
"github.com/containerd/containerd/v2/core/leases" "github.com/containerd/containerd/v2/core/leases"
"github.com/containerd/containerd/v2/core/sandbox" "github.com/containerd/containerd/v2/core/sandbox"
"github.com/containerd/containerd/v2/core/snapshots" "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 { func adaptImage(o interface{}) filters.Adaptor {

2
core/metadata/containers.go
View File

@@ -25,11 +25,11 @@ import (
"github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/core/metadata/boltutil" "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/identifiers"
"github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/labels"
"github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/namespaces"
"github.com/containerd/containerd/v2/pkg/errdefs" "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/proto"
"github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/containerd/v2/protobuf/types"
"github.com/containerd/typeurl/v2" "github.com/containerd/typeurl/v2"

2
core/metadata/containers_test.go
View File

@@ -26,9 +26,9 @@ import (
"time" "time"
"github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/filters"
"github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/namespaces"
"github.com/containerd/containerd/v2/pkg/errdefs" "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"
"github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/containerd/v2/protobuf/types"
"github.com/containerd/log/logtest" "github.com/containerd/log/logtest"

2
core/metadata/content.go
View File

@@ -27,10 +27,10 @@ import (
"github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/core/metadata/boltutil" "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/labels"
"github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/namespaces"
"github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/errdefs"
"github.com/containerd/containerd/v2/pkg/filters"
"github.com/containerd/log" "github.com/containerd/log"
digest "github.com/opencontainers/go-digest" digest "github.com/opencontainers/go-digest"
ocispec "github.com/opencontainers/image-spec/specs-go/v1" ocispec "github.com/opencontainers/image-spec/specs-go/v1"

2
core/metadata/images.go
View File

@@ -27,11 +27,11 @@ import (
"github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/images"
"github.com/containerd/containerd/v2/core/metadata/boltutil" "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/labels"
"github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/namespaces"
"github.com/containerd/containerd/v2/pkg/epoch" "github.com/containerd/containerd/v2/pkg/epoch"
"github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/errdefs"
"github.com/containerd/containerd/v2/pkg/filters"
digest "github.com/opencontainers/go-digest" digest "github.com/opencontainers/go-digest"
ocispec "github.com/opencontainers/image-spec/specs-go/v1" ocispec "github.com/opencontainers/image-spec/specs-go/v1"
bolt "go.etcd.io/bbolt" bolt "go.etcd.io/bbolt"

2
core/metadata/images_test.go
View File

@@ -24,8 +24,8 @@ import (
"time" "time"
"github.com/containerd/containerd/v2/core/images" "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/errdefs"
"github.com/containerd/containerd/v2/pkg/filters"
"github.com/opencontainers/go-digest" "github.com/opencontainers/go-digest"
ocispec "github.com/opencontainers/image-spec/specs-go/v1" ocispec "github.com/opencontainers/image-spec/specs-go/v1"
) )

2
core/metadata/leases.go
View File

@@ -26,9 +26,9 @@ import (
"github.com/containerd/containerd/v2/core/leases" "github.com/containerd/containerd/v2/core/leases"
"github.com/containerd/containerd/v2/core/metadata/boltutil" "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/namespaces"
"github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/errdefs"
"github.com/containerd/containerd/v2/pkg/filters"
digest "github.com/opencontainers/go-digest" digest "github.com/opencontainers/go-digest"
bolt "go.etcd.io/bbolt" bolt "go.etcd.io/bbolt"
) )

2
core/metadata/sandbox.go
View File

@@ -25,10 +25,10 @@ import (
"github.com/containerd/containerd/v2/core/metadata/boltutil" "github.com/containerd/containerd/v2/core/metadata/boltutil"
api "github.com/containerd/containerd/v2/core/sandbox" 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/identifiers"
"github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/namespaces"
"github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/errdefs"
"github.com/containerd/containerd/v2/pkg/filters"
"github.com/containerd/typeurl/v2" "github.com/containerd/typeurl/v2"
"go.etcd.io/bbolt" "go.etcd.io/bbolt"
) )

2
core/metadata/snapshot.go
View File

@@ -28,10 +28,10 @@ import (
"github.com/containerd/containerd/v2/core/metadata/boltutil" "github.com/containerd/containerd/v2/core/metadata/boltutil"
"github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/core/mount"
"github.com/containerd/containerd/v2/core/snapshots" "github.com/containerd/containerd/v2/core/snapshots"
"github.com/containerd/containerd/v2/filters"
"github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/labels"
"github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/namespaces"
"github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/errdefs"
"github.com/containerd/containerd/v2/pkg/filters"
"github.com/containerd/log" "github.com/containerd/log"
bolt "go.etcd.io/bbolt" bolt "go.etcd.io/bbolt"
) )

2
core/metadata/snapshot_test.go
View File

@@ -30,9 +30,9 @@ import (
"github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/core/mount"
"github.com/containerd/containerd/v2/core/snapshots" "github.com/containerd/containerd/v2/core/snapshots"
"github.com/containerd/containerd/v2/core/snapshots/testsuite" "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/namespaces"
"github.com/containerd/containerd/v2/pkg/errdefs" "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/pkg/testutil"
"github.com/containerd/containerd/v2/plugins/snapshots/native" "github.com/containerd/containerd/v2/plugins/snapshots/native"
bolt "go.etcd.io/bbolt" bolt "go.etcd.io/bbolt"

2
core/snapshots/storage/bolt.go
View File

@@ -27,8 +27,8 @@ import (
"github.com/containerd/containerd/v2/core/metadata/boltutil" "github.com/containerd/containerd/v2/core/metadata/boltutil"
"github.com/containerd/containerd/v2/core/snapshots" "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/errdefs"
"github.com/containerd/containerd/v2/pkg/filters"
bolt "go.etcd.io/bbolt" bolt "go.etcd.io/bbolt"
) )

2
pkg/events/exchange/exchange.go
View File

@@ -22,11 +22,11 @@ import (
"strings" "strings"
"time" "time"
"github.com/containerd/containerd/v2/filters"
"github.com/containerd/containerd/v2/identifiers" "github.com/containerd/containerd/v2/identifiers"
"github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/namespaces"
"github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/errdefs"
"github.com/containerd/containerd/v2/pkg/events" "github.com/containerd/containerd/v2/pkg/events"
"github.com/containerd/containerd/v2/pkg/filters"
"github.com/containerd/log" "github.com/containerd/log"
"github.com/containerd/typeurl/v2" "github.com/containerd/typeurl/v2"
goevents "github.com/docker/go-events" goevents "github.com/docker/go-events"

0
filters/adaptor.go → pkg/filters/adaptor.go
View File

0
filters/filter.go → pkg/filters/filter.go
View File

0
filters/filter_test.go → pkg/filters/filter_test.go
View File

0
filters/parser.go → pkg/filters/parser.go
View File

0
filters/quote.go → pkg/filters/quote.go
View File

0
filters/scanner.go → pkg/filters/scanner.go
View File

0
filters/scanner_test.go → pkg/filters/scanner_test.go
View File

2
plugins/content/local/store.go
View File

@@ -28,8 +28,8 @@ import (
"time" "time"
"github.com/containerd/containerd/v2/core/content" "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/errdefs"
"github.com/containerd/containerd/v2/pkg/filters"
"github.com/containerd/log" "github.com/containerd/log"
"github.com/opencontainers/go-digest" "github.com/opencontainers/go-digest"

2
plugins/services/introspection/local.go
View File

@@ -32,8 +32,8 @@ import (
api "github.com/containerd/containerd/v2/api/services/introspection/v1" api "github.com/containerd/containerd/v2/api/services/introspection/v1"
"github.com/containerd/containerd/v2/api/types" "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/errdefs"
"github.com/containerd/containerd/v2/pkg/filters"
"github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins"
"github.com/containerd/containerd/v2/plugins/services" "github.com/containerd/containerd/v2/plugins/services"
"github.com/containerd/containerd/v2/plugins/services/warning" "github.com/containerd/containerd/v2/plugins/services/warning"

2
plugins/services/tasks/local.go
View File

@@ -34,11 +34,11 @@ import (
"github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/images"
"github.com/containerd/containerd/v2/core/metadata" "github.com/containerd/containerd/v2/core/metadata"
"github.com/containerd/containerd/v2/core/mount" "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/archive"
"github.com/containerd/containerd/v2/pkg/blockio" "github.com/containerd/containerd/v2/pkg/blockio"
"github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/errdefs"
"github.com/containerd/containerd/v2/pkg/events" "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/rdt"
"github.com/containerd/containerd/v2/pkg/timeout" "github.com/containerd/containerd/v2/pkg/timeout"
"github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins"