Skip to content

Commit 6333db7

Browse files
fuweidfuweid
authored
Merge pull request containerd#9891 from dmcgowan/move-events-plugin
Move events to plugins and core
2 parents 1f69774 + 72f2183 commit 6333db7

File tree

30 files changed

+35
-34
lines changed

30 files changed

+35
-34
lines changed

‎client/client.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ import (
4242
"github.com/containerd/containerd/v2/core/containers"
4343
"github.com/containerd/containerd/v2/core/content"
4444
contentproxy "github.com/containerd/containerd/v2/core/content/proxy"
45+
"github.com/containerd/containerd/v2/core/events"
4546
"github.com/containerd/containerd/v2/core/images"
4647
"github.com/containerd/containerd/v2/core/leases"
4748
leasesproxy "github.com/containerd/containerd/v2/core/leases/proxy"
@@ -53,7 +54,6 @@ import (
5354
snproxy "github.com/containerd/containerd/v2/core/snapshots/proxy"
5455
"github.com/containerd/containerd/v2/defaults"
5556
"github.com/containerd/containerd/v2/pkg/dialer"
56-
"github.com/containerd/containerd/v2/pkg/events"
5757
"github.com/containerd/containerd/v2/pkg/namespaces"
5858
"github.com/containerd/containerd/v2/plugins"
5959
"github.com/containerd/containerd/v2/plugins/services/introspection"

‎client/events.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121

2222
eventsapi "github.com/containerd/containerd/v2/api/services/events/v1"
2323
"github.com/containerd/containerd/v2/api/types"
24-
"github.com/containerd/containerd/v2/pkg/events"
24+
"github.com/containerd/containerd/v2/core/events"
2525
"github.com/containerd/containerd/v2/protobuf"
2626
"github.com/containerd/errdefs"
2727
"github.com/containerd/typeurl/v2"

‎cmd/containerd/builtins/builtins.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ package builtins
1919
// register containerd builtins here
2020
import (
2121
_ "github.com/containerd/containerd/v2/core/runtime/v2"
22-
_ "github.com/containerd/containerd/v2/pkg/events/plugin"
2322
_ "github.com/containerd/containerd/v2/pkg/nri/plugin"
23+
_ "github.com/containerd/containerd/v2/plugins/events"
2424
_ "github.com/containerd/containerd/v2/plugins/gc"
2525
_ "github.com/containerd/containerd/v2/plugins/imageverifier"
2626
_ "github.com/containerd/containerd/v2/plugins/leases"

‎cmd/ctr/commands/events/events.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"fmt"
2222

2323
"github.com/containerd/containerd/v2/cmd/ctr/commands"
24-
"github.com/containerd/containerd/v2/pkg/events"
24+
"github.com/containerd/containerd/v2/core/events"
2525
"github.com/containerd/log"
2626
"github.com/containerd/typeurl/v2"
2727
"github.com/urfave/cli/v2"

‎contrib/fuzz/builtins.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ package fuzz
1919
import (
2020
// base containerd imports
2121
_ "github.com/containerd/containerd/v2/core/runtime/v2"
22-
_ "github.com/containerd/containerd/v2/pkg/events/plugin"
2322
_ "github.com/containerd/containerd/v2/pkg/nri/plugin"
2423
_ "github.com/containerd/containerd/v2/plugins/cri"
2524
_ "github.com/containerd/containerd/v2/plugins/cri/images"
2625
_ "github.com/containerd/containerd/v2/plugins/cri/runtime"
2726
_ "github.com/containerd/containerd/v2/plugins/diff/walking/plugin"
27+
_ "github.com/containerd/containerd/v2/plugins/events"
2828
_ "github.com/containerd/containerd/v2/plugins/gc"
2929
_ "github.com/containerd/containerd/v2/plugins/imageverifier"
3030
_ "github.com/containerd/containerd/v2/plugins/leases"

‎contrib/fuzz/exchange_fuzzer.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ import (
2020

2121
fuzz "github.com/AdaLogics/go-fuzz-headers"
2222
eventstypes "github.com/containerd/containerd/v2/api/events"
23-
"github.com/containerd/containerd/v2/pkg/events"
24-
"github.com/containerd/containerd/v2/pkg/events/exchange"
23+
"github.com/containerd/containerd/v2/core/events"
24+
"github.com/containerd/containerd/v2/core/events/exchange"
2525
"github.com/containerd/containerd/v2/pkg/namespaces"
2626
)
2727

‎contrib/v2-migrate.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ for GOFILE in $(find . -name "*.go" | grep -v "./vendor/" ); do
3434
perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/snapshots/$1$2"github.com\/containerd\/containerd\/v2\/core\/snapshots/g' $GOFILE
3535
perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/archive/$1$2"github.com\/containerd\/containerd\/v2\/pkg\/archive/g' $GOFILE
3636
perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/cio/$1$2"github.com\/containerd\/containerd\/v2\/pkg\/cio/g' $GOFILE
37-
perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/events/$1$2"github.com\/containerd\/containerd\/v2\/pkg\/events/g' $GOFILE
37+
perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/events\/plugin/$1$2"github.com\/containerd\/containerd\/v2\/plugins\/events/g' $GOFILE
38+
perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/events/$1$2"github.com\/containerd\/containerd\/v2\/core\/events/g' $GOFILE
3839
perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/errdefs/$1$2"github.com\/containerd\/containerd\/v2\/pkg\/errdefs/g' $GOFILE
3940
perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/filters/$1$2"github.com\/containerd\/containerd\/v2\/pkg\/filters/g' $GOFILE
4041
perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/gc\/scheduler/$1$2"github.com\/containerd\/containerd\/v2\/plugins\/gc/g' $GOFILE

‎pkg/events/events.go renamed to ‎core/events/events.go

File renamed without changes.

‎pkg/events/exchange/exchange.go renamed to ‎core/events/exchange/exchange.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"strings"
2323
"time"
2424

25-
"github.com/containerd/containerd/v2/pkg/events"
25+
"github.com/containerd/containerd/v2/core/events"
2626
"github.com/containerd/containerd/v2/pkg/filters"
2727
"github.com/containerd/containerd/v2/pkg/identifiers"
2828
"github.com/containerd/containerd/v2/pkg/namespaces"

‎pkg/events/exchange/exchange_test.go renamed to ‎core/events/exchange/exchange_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"time"
2424

2525
eventstypes "github.com/containerd/containerd/v2/api/events"
26-
"github.com/containerd/containerd/v2/pkg/events"
26+
"github.com/containerd/containerd/v2/core/events"
2727
"github.com/containerd/containerd/v2/pkg/namespaces"
2828
"github.com/containerd/containerd/v2/protobuf"
2929
"github.com/containerd/errdefs"

0 commit comments

Comments
 (0)