Skip to content

Commit c9ea816

Browse files
estespestesp
authored
Merge pull request #2351 from crosbymichael/pkg
Move top level packages into pkg or specific sub pkgs
2 parents d1435e6 + 8e97da0 commit c9ea816

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+30
-102
lines changed

‎archive/issues_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626
"testing"
2727

2828
"github.com/containerd/containerd/archive/compression"
29-
"github.com/containerd/containerd/testutil"
29+
"github.com/containerd/containerd/pkg/testutil"
3030
)
3131

3232
// TestPrefixHeaderReadable tests that files that could be created with the

‎client.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@ import (
3939
"github.com/containerd/containerd/containers"
4040
"github.com/containerd/containerd/content"
4141
"github.com/containerd/containerd/defaults"
42-
"github.com/containerd/containerd/dialer"
4342
"github.com/containerd/containerd/errdefs"
4443
"github.com/containerd/containerd/events"
4544
"github.com/containerd/containerd/images"
4645
"github.com/containerd/containerd/namespaces"
46+
"github.com/containerd/containerd/pkg/dialer"
4747
"github.com/containerd/containerd/plugin"
4848
"github.com/containerd/containerd/remotes"
4949
"github.com/containerd/containerd/remotes/docker"

‎client_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ import (
3333
"github.com/containerd/containerd/images"
3434
"github.com/containerd/containerd/log"
3535
"github.com/containerd/containerd/namespaces"
36+
"github.com/containerd/containerd/pkg/testutil"
3637
"github.com/containerd/containerd/platforms"
3738
"github.com/containerd/containerd/sys"
38-
"github.com/containerd/containerd/testutil"
3939
"github.com/sirupsen/logrus"
4040
)
4141

‎cmd/containerd/builtins.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ package main
2020
import (
2121
_ "github.com/containerd/containerd/diff/walking/plugin"
2222
_ "github.com/containerd/containerd/gc/scheduler"
23-
_ "github.com/containerd/containerd/restart/monitor"
23+
_ "github.com/containerd/containerd/runtime/restart/monitor"
2424
_ "github.com/containerd/containerd/services/containers"
2525
_ "github.com/containerd/containerd/services/content"
2626
_ "github.com/containerd/containerd/services/diff"

‎cmd/containerd/command/config.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"os"
2222

2323
"github.com/BurntSushi/toml"
24-
"github.com/containerd/containerd/server"
24+
"github.com/containerd/containerd/services/server"
2525
"github.com/urfave/cli"
2626
)
2727

‎cmd/containerd/command/config_linux.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ package command
1818

1919
import (
2020
"github.com/containerd/containerd/defaults"
21-
"github.com/containerd/containerd/server"
21+
"github.com/containerd/containerd/services/server"
2222
)
2323

2424
func defaultConfig() *server.Config {

‎cmd/containerd/command/config_unsupported.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ package command
2020

2121
import (
2222
"github.com/containerd/containerd/defaults"
23-
"github.com/containerd/containerd/server"
23+
"github.com/containerd/containerd/services/server"
2424
)
2525

2626
func defaultConfig() *server.Config {

‎cmd/containerd/command/config_windows.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ package command
1818

1919
import (
2020
"github.com/containerd/containerd/defaults"
21-
"github.com/containerd/containerd/server"
21+
"github.com/containerd/containerd/services/server"
2222
)
2323

2424
func defaultConfig() *server.Config {

‎cmd/containerd/command/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import (
2929

3030
"github.com/containerd/containerd/log"
3131
"github.com/containerd/containerd/mount"
32-
"github.com/containerd/containerd/server"
32+
"github.com/containerd/containerd/services/server"
3333
"github.com/containerd/containerd/sys"
3434
"github.com/containerd/containerd/version"
3535
"github.com/pkg/errors"

‎cmd/containerd/command/main_unix.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"runtime"
2525

2626
"github.com/containerd/containerd/log"
27-
"github.com/containerd/containerd/server"
27+
"github.com/containerd/containerd/services/server"
2828
"github.com/sirupsen/logrus"
2929
"golang.org/x/sys/unix"
3030
)

‎cmd/containerd/command/main_windows.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"path/filepath"
2323

2424
"github.com/containerd/containerd/log"
25-
"github.com/containerd/containerd/server"
25+
"github.com/containerd/containerd/services/server"
2626

2727
"golang.org/x/sys/windows"
2828
)

‎cmd/containerd/command/publish.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ import (
2525
"time"
2626

2727
eventsapi "github.com/containerd/containerd/api/services/events/v1"
28-
"github.com/containerd/containerd/dialer"
2928
"github.com/containerd/containerd/errdefs"
3029
"github.com/containerd/containerd/namespaces"
30+
"github.com/containerd/containerd/pkg/dialer"
3131
"github.com/gogo/protobuf/types"
3232
"github.com/pkg/errors"
3333
"github.com/urfave/cli"

‎cmd/ctr/commands/content/fetch.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import (
3131
"github.com/containerd/containerd/errdefs"
3232
"github.com/containerd/containerd/images"
3333
"github.com/containerd/containerd/log"
34-
"github.com/containerd/containerd/progress"
34+
"github.com/containerd/containerd/pkg/progress"
3535
"github.com/containerd/containerd/remotes"
3636
digest "github.com/opencontainers/go-digest"
3737
ocispec "github.com/opencontainers/image-spec/specs-go/v1"

‎cmd/ctr/commands/images/images.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ import (
2727
"github.com/containerd/containerd/errdefs"
2828
"github.com/containerd/containerd/images"
2929
"github.com/containerd/containerd/log"
30+
"github.com/containerd/containerd/pkg/progress"
3031
"github.com/containerd/containerd/platforms"
31-
"github.com/containerd/containerd/progress"
3232
"github.com/pkg/errors"
3333
"github.com/urfave/cli"
3434
)

‎cmd/ctr/commands/images/push.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828
"github.com/containerd/containerd/cmd/ctr/commands/content"
2929
"github.com/containerd/containerd/images"
3030
"github.com/containerd/containerd/log"
31-
"github.com/containerd/containerd/progress"
31+
"github.com/containerd/containerd/pkg/progress"
3232
"github.com/containerd/containerd/remotes"
3333
"github.com/containerd/containerd/remotes/docker"
3434
digest "github.com/opencontainers/go-digest"

‎cmd/ctr/commands/snapshots/snapshots.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import (
3030
"github.com/containerd/containerd/diff"
3131
"github.com/containerd/containerd/log"
3232
"github.com/containerd/containerd/mount"
33-
"github.com/containerd/containerd/progress"
33+
"github.com/containerd/containerd/pkg/progress"
3434
"github.com/containerd/containerd/rootfs"
3535
"github.com/containerd/containerd/snapshots"
3636
digest "github.com/opencontainers/go-digest"

‎content/local/store_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ import (
3636

3737
"github.com/containerd/containerd/content"
3838
"github.com/containerd/containerd/content/testsuite"
39-
"github.com/containerd/containerd/testutil"
39+
"github.com/containerd/containerd/pkg/testutil"
4040
"github.com/gotestyourself/gotestyourself/assert"
4141
"github.com/opencontainers/go-digest"
4242
)

‎content/testsuite/testsuite.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import (
3030
"time"
3131

3232
"github.com/containerd/containerd/content"
33-
"github.com/containerd/containerd/testutil"
33+
"github.com/containerd/containerd/pkg/testutil"
3434
"github.com/gotestyourself/gotestyourself/assert"
3535
digest "github.com/opencontainers/go-digest"
3636
"github.com/pkg/errors"

‎daemon_config_linux_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ import (
2929
"time"
3030

3131
"github.com/containerd/containerd/oci"
32-
"github.com/containerd/containerd/server"
33-
"github.com/containerd/containerd/testutil"
32+
"github.com/containerd/containerd/pkg/testutil"
33+
"github.com/containerd/containerd/services/server"
3434
)
3535

3636
// the following nolint is for shutting up gometalinter on non-linux.

‎debug/debug.go

-72
This file was deleted.

‎metadata/snapshot_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ import (
2424
"testing"
2525

2626
"github.com/boltdb/bolt"
27+
"github.com/containerd/containerd/pkg/testutil"
2728
"github.com/containerd/containerd/snapshots"
2829
"github.com/containerd/containerd/snapshots/native"
2930
"github.com/containerd/containerd/snapshots/testsuite"
30-
"github.com/containerd/containerd/testutil"
3131
)
3232

3333
func newTestSnapshotter(ctx context.Context, root string) (snapshots.Snapshotter, func() error, error) {

‎mount/lookup_test/lookup_linux_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
// FIXME: we can't put this test to the mount package:
2020
// import cycle not allowed in test
2121
// package github.com/containerd/containerd/mount (test)
22-
// imports github.com/containerd/containerd/testutil
22+
// imports github.com/containerd/containerd/pkg/testutil
2323
// imports github.com/containerd/containerd/mount
2424
//
2525
// NOTE: we can't have this as lookup_test (compilation fails)
@@ -35,7 +35,7 @@ import (
3535
"testing"
3636

3737
"github.com/containerd/containerd/mount"
38-
"github.com/containerd/containerd/testutil"
38+
"github.com/containerd/containerd/pkg/testutil"
3939
"github.com/gotestyourself/gotestyourself/assert"
4040
)
4141

‎dialer/dialer.go ‎pkg/dialer/dialer.go

File renamed without changes.

‎dialer/dialer_unix.go ‎pkg/dialer/dialer_unix.go

File renamed without changes.

‎dialer/dialer_windows.go ‎pkg/dialer/dialer_windows.go

File renamed without changes.

‎progress/bar.go ‎pkg/progress/bar.go

File renamed without changes.

‎progress/doc.go ‎pkg/progress/doc.go

File renamed without changes.

‎progress/escape.go ‎pkg/progress/escape.go

File renamed without changes.

‎progress/humaans.go ‎pkg/progress/humaans.go

File renamed without changes.

‎progress/writer.go ‎pkg/progress/writer.go

File renamed without changes.

‎testutil/helpers.go ‎pkg/testutil/helpers.go

File renamed without changes.

‎testutil/helpers_unix.go ‎pkg/testutil/helpers_unix.go

File renamed without changes.

‎testutil/helpers_windows.go ‎pkg/testutil/helpers_windows.go

File renamed without changes.

‎testutil/loopback_linux.go ‎pkg/testutil/loopback_linux.go

File renamed without changes.

‎testutil/mount_linux.go ‎pkg/testutil/mount_linux.go

File renamed without changes.

‎testutil/mount_other.go ‎pkg/testutil/mount_other.go

File renamed without changes.

‎restart/monitor/change.go ‎runtime/restart/monitor/change.go

File renamed without changes.

‎restart/monitor/monitor.go ‎runtime/restart/monitor/monitor.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import (
3131
"github.com/containerd/containerd/content"
3232
"github.com/containerd/containerd/namespaces"
3333
"github.com/containerd/containerd/plugin"
34-
"github.com/containerd/containerd/restart"
34+
"github.com/containerd/containerd/runtime/restart"
3535
"github.com/containerd/containerd/services"
3636
"github.com/containerd/containerd/snapshots"
3737
"github.com/pkg/errors"

‎restart/restart.go ‎runtime/restart/restart.go

File renamed without changes.

‎server/config.go ‎services/server/config.go

File renamed without changes.

‎server/server.go ‎services/server/server.go

File renamed without changes.

‎server/server_linux.go ‎services/server/server_linux.go

File renamed without changes.

‎server/server_solaris.go ‎services/server/server_solaris.go

File renamed without changes.

‎server/server_test.go ‎services/server/server_test.go

File renamed without changes.

‎server/server_unsupported.go ‎services/server/server_unsupported.go

File renamed without changes.

‎server/server_windows.go ‎services/server/server_windows.go

File renamed without changes.

‎snapshots/btrfs/btrfs_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ import (
2828
"testing"
2929

3030
"github.com/containerd/containerd/mount"
31+
"github.com/containerd/containerd/pkg/testutil"
3132
"github.com/containerd/containerd/snapshots"
3233
"github.com/containerd/containerd/snapshots/testsuite"
33-
"github.com/containerd/containerd/testutil"
3434
"github.com/pkg/errors"
3535
"golang.org/x/sys/unix"
3636
)

‎snapshots/native/native_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ import (
2121
"runtime"
2222
"testing"
2323

24+
"github.com/containerd/containerd/pkg/testutil"
2425
"github.com/containerd/containerd/snapshots"
2526
"github.com/containerd/containerd/snapshots/testsuite"
26-
"github.com/containerd/containerd/testutil"
2727
)
2828

2929
func newSnapshotter(ctx context.Context, root string) (snapshots.Snapshotter, func() error, error) {

‎snapshots/overlay/check_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"os/exec"
2525
"testing"
2626

27-
"github.com/containerd/containerd/testutil"
27+
"github.com/containerd/containerd/pkg/testutil"
2828
)
2929

3030
func testOverlaySupported(t testing.TB, expected bool, mkfs ...string) {

‎snapshots/overlay/overlay_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ import (
2828
"testing"
2929

3030
"github.com/containerd/containerd/mount"
31+
"github.com/containerd/containerd/pkg/testutil"
3132
"github.com/containerd/containerd/snapshots"
3233
"github.com/containerd/containerd/snapshots/storage"
3334
"github.com/containerd/containerd/snapshots/testsuite"
34-
"github.com/containerd/containerd/testutil"
3535
)
3636

3737
func newSnapshotter(ctx context.Context, root string) (snapshots.Snapshotter, func() error, error) {

‎snapshots/storage/bolt_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222

2323
// Does not require root but flag must be defined for snapshot tests
2424

25-
_ "github.com/containerd/containerd/testutil"
25+
_ "github.com/containerd/containerd/pkg/testutil"
2626
)
2727

2828
func TestMetastore(t *testing.T) {

‎snapshots/testsuite/testsuite.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ import (
2929
"github.com/containerd/containerd/errdefs"
3030
"github.com/containerd/containerd/mount"
3131
"github.com/containerd/containerd/namespaces"
32+
"github.com/containerd/containerd/pkg/testutil"
3233
"github.com/containerd/containerd/snapshots"
33-
"github.com/containerd/containerd/testutil"
3434
"github.com/containerd/continuity/fs/fstest"
3535
"github.com/gotestyourself/gotestyourself/assert"
3636
is "github.com/gotestyourself/gotestyourself/assert/cmp"

0 commit comments

Comments
 (0)