Merge pull request #2351 from crosbymichael/pkg

Move top level packages into pkg or specific sub pkgs

archive/issues_test.go

@@ -26,7 +26,7 @@ import (
 	"testing"
 
 	"github.com/containerd/containerd/archive/compression"
-	"github.com/containerd/containerd/testutil"
+	"github.com/containerd/containerd/pkg/testutil"
 )
 
 // TestPrefixHeaderReadable tests that files that could be created with the

client.go

@@ -39,11 +39,11 @@ import (
 	"github.com/containerd/containerd/containers"
 	"github.com/containerd/containerd/content"
 	"github.com/containerd/containerd/defaults"
-	"github.com/containerd/containerd/dialer"
 	"github.com/containerd/containerd/errdefs"
 	"github.com/containerd/containerd/events"
 	"github.com/containerd/containerd/images"
 	"github.com/containerd/containerd/namespaces"
+	"github.com/containerd/containerd/pkg/dialer"
 	"github.com/containerd/containerd/plugin"
 	"github.com/containerd/containerd/remotes"
 	"github.com/containerd/containerd/remotes/docker"

client_test.go

@@ -33,9 +33,9 @@ import (
 	"github.com/containerd/containerd/images"
 	"github.com/containerd/containerd/log"
 	"github.com/containerd/containerd/namespaces"
+	"github.com/containerd/containerd/pkg/testutil"
 	"github.com/containerd/containerd/platforms"
 	"github.com/containerd/containerd/sys"
-	"github.com/containerd/containerd/testutil"
 	"github.com/sirupsen/logrus"
 )
 

cmd/containerd/builtins.go

@@ -20,7 +20,7 @@ package main
 import (
 	_ "github.com/containerd/containerd/diff/walking/plugin"
 	_ "github.com/containerd/containerd/gc/scheduler"
-	_ "github.com/containerd/containerd/restart/monitor"
+	_ "github.com/containerd/containerd/runtime/restart/monitor"
 	_ "github.com/containerd/containerd/services/containers"
 	_ "github.com/containerd/containerd/services/content"
 	_ "github.com/containerd/containerd/services/diff"

cmd/containerd/command/config.go

@@ -21,7 +21,7 @@ import (
 	"os"
 
 	"github.com/BurntSushi/toml"
-	"github.com/containerd/containerd/server"
+	"github.com/containerd/containerd/services/server"
 	"github.com/urfave/cli"
 )
 

cmd/containerd/command/config_linux.go

@@ -18,7 +18,7 @@ package command
 
 import (
 	"github.com/containerd/containerd/defaults"
-	"github.com/containerd/containerd/server"
+	"github.com/containerd/containerd/services/server"
 )
 
 func defaultConfig() *server.Config {

cmd/containerd/command/config_unsupported.go

@@ -20,7 +20,7 @@ package command
 
 import (
 	"github.com/containerd/containerd/defaults"
-	"github.com/containerd/containerd/server"
+	"github.com/containerd/containerd/services/server"
 )
 
 func defaultConfig() *server.Config {

cmd/containerd/command/config_windows.go

@@ -18,7 +18,7 @@ package command
 
 import (
 	"github.com/containerd/containerd/defaults"
-	"github.com/containerd/containerd/server"
+	"github.com/containerd/containerd/services/server"
 )
 
 func defaultConfig() *server.Config {

cmd/containerd/command/main.go

@@ -29,7 +29,7 @@ import (
 
 	"github.com/containerd/containerd/log"
 	"github.com/containerd/containerd/mount"
-	"github.com/containerd/containerd/server"
+	"github.com/containerd/containerd/services/server"
 	"github.com/containerd/containerd/sys"
 	"github.com/containerd/containerd/version"
 	"github.com/pkg/errors"

cmd/containerd/command/main_unix.go

@@ -24,7 +24,7 @@ import (
 	"runtime"
 
 	"github.com/containerd/containerd/log"
-	"github.com/containerd/containerd/server"
+	"github.com/containerd/containerd/services/server"
 	"github.com/sirupsen/logrus"
 	"golang.org/x/sys/unix"
 )

cmd/containerd/command/main_windows.go

@@ -22,7 +22,7 @@ import (
 	"path/filepath"
 
 	"github.com/containerd/containerd/log"
-	"github.com/containerd/containerd/server"
+	"github.com/containerd/containerd/services/server"
 
 	"golang.org/x/sys/windows"
 )

cmd/containerd/command/publish.go

@@ -25,9 +25,9 @@ import (
 	"time"
 
 	eventsapi "github.com/containerd/containerd/api/services/events/v1"
-	"github.com/containerd/containerd/dialer"
 	"github.com/containerd/containerd/errdefs"
 	"github.com/containerd/containerd/namespaces"
+	"github.com/containerd/containerd/pkg/dialer"
 	"github.com/gogo/protobuf/types"
 	"github.com/pkg/errors"
 	"github.com/urfave/cli"

cmd/ctr/commands/content/fetch.go

@@ -31,7 +31,7 @@ import (
 	"github.com/containerd/containerd/errdefs"
 	"github.com/containerd/containerd/images"
 	"github.com/containerd/containerd/log"
-	"github.com/containerd/containerd/progress"
+	"github.com/containerd/containerd/pkg/progress"
 	"github.com/containerd/containerd/remotes"
 	digest "github.com/opencontainers/go-digest"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"

cmd/ctr/commands/images/images.go

@@ -27,8 +27,8 @@ import (
 	"github.com/containerd/containerd/errdefs"
 	"github.com/containerd/containerd/images"
 	"github.com/containerd/containerd/log"
+	"github.com/containerd/containerd/pkg/progress"
 	"github.com/containerd/containerd/platforms"
-	"github.com/containerd/containerd/progress"
 	"github.com/pkg/errors"
 	"github.com/urfave/cli"
 )

cmd/ctr/commands/images/push.go

@@ -28,7 +28,7 @@ import (
 	"github.com/containerd/containerd/cmd/ctr/commands/content"
 	"github.com/containerd/containerd/images"
 	"github.com/containerd/containerd/log"
-	"github.com/containerd/containerd/progress"
+	"github.com/containerd/containerd/pkg/progress"
 	"github.com/containerd/containerd/remotes"
 	"github.com/containerd/containerd/remotes/docker"
 	digest "github.com/opencontainers/go-digest"

cmd/ctr/commands/snapshots/snapshots.go

@@ -30,7 +30,7 @@ import (
 	"github.com/containerd/containerd/diff"
 	"github.com/containerd/containerd/log"
 	"github.com/containerd/containerd/mount"
-	"github.com/containerd/containerd/progress"
+	"github.com/containerd/containerd/pkg/progress"
 	"github.com/containerd/containerd/rootfs"
 	"github.com/containerd/containerd/snapshots"
 	digest "github.com/opencontainers/go-digest"

content/local/store_test.go

@@ -36,7 +36,7 @@ import (
 
 	"github.com/containerd/containerd/content"
 	"github.com/containerd/containerd/content/testsuite"
-	"github.com/containerd/containerd/testutil"
+	"github.com/containerd/containerd/pkg/testutil"
 	"github.com/gotestyourself/gotestyourself/assert"
 	"github.com/opencontainers/go-digest"
 )

content/testsuite/testsuite.go

@@ -30,7 +30,7 @@ import (
 	"time"
 
 	"github.com/containerd/containerd/content"
-	"github.com/containerd/containerd/testutil"
+	"github.com/containerd/containerd/pkg/testutil"
 	"github.com/gotestyourself/gotestyourself/assert"
 	digest "github.com/opencontainers/go-digest"
 	"github.com/pkg/errors"

daemon_config_linux_test.go

@@ -29,8 +29,8 @@ import (
 	"time"
 
 	"github.com/containerd/containerd/oci"
-	"github.com/containerd/containerd/server"
+	"github.com/containerd/containerd/pkg/testutil"
-	"github.com/containerd/containerd/testutil"
+	"github.com/containerd/containerd/services/server"
 )
 
 // the following nolint is for shutting up gometalinter on non-linux.

debug/debug.go

@@ -1,72 +0,0 @@
-/*
-   Copyright The containerd Authors.
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-*/
-
-package debug
-
-import (
-	"bufio"
-	"fmt"
-	"os"
-	"strconv"
-	"strings"
-)
-
-// Smaps prints the smaps to a file
-func Smaps(note, file string) error {
-	smaps, err := getMaps(os.Getpid())
-	if err != nil {
-		return err
-	}
-	f, err := os.OpenFile(file, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0666)
-	if err != nil {
-		return err
-	}
-	defer f.Close()
-	fmt.Fprintf(f, "%s: rss %d\n", note, smaps["rss"])
-	fmt.Fprintf(f, "%s: pss %d\n", note, smaps["pss"])
-	return nil
-}
-
-func getMaps(pid int) (map[string]int, error) {
-	f, err := os.Open(fmt.Sprintf("/proc/%d/smaps", pid))
-	if err != nil {
-		return nil, err
-	}
-	defer f.Close()
-	var (
-		smaps = make(map[string]int)
-		s     = bufio.NewScanner(f)
-	)
-	for s.Scan() {
-		var (
-			fields = strings.Fields(s.Text())
-			name   = fields[0]
-		)
-		name = strings.TrimSuffix(strings.ToLower(name), ":")
-		if len(fields) < 2 {
-			continue
-		}
-		n, err := strconv.Atoi(fields[1])
-		if err != nil {
-			continue
-		}
-		smaps[name] += n
-	}
-	if err := s.Err(); err != nil {
-		return nil, err
-	}
-	return smaps, nil
-}

metadata/snapshot_test.go

@@ -24,10 +24,10 @@ import (
 	"testing"
 
 	"github.com/boltdb/bolt"
+	"github.com/containerd/containerd/pkg/testutil"
 	"github.com/containerd/containerd/snapshots"
 	"github.com/containerd/containerd/snapshots/native"
 	"github.com/containerd/containerd/snapshots/testsuite"
-	"github.com/containerd/containerd/testutil"
 )
 
 func newTestSnapshotter(ctx context.Context, root string) (snapshots.Snapshotter, func() error, error) {

mount/lookup_test/lookup_linux_test.go

@@ -19,7 +19,7 @@
 // FIXME: we can't put this test to the mount package:
 // import cycle not allowed in test
 // package github.com/containerd/containerd/mount (test)
-//         imports github.com/containerd/containerd/testutil
+//         imports github.com/containerd/containerd/pkg/testutil
 //         imports github.com/containerd/containerd/mount
 //
 // NOTE: we can't have this as lookup_test (compilation fails)
@@ -35,7 +35,7 @@ import (
 	"testing"
 
 	"github.com/containerd/containerd/mount"
-	"github.com/containerd/containerd/testutil"
+	"github.com/containerd/containerd/pkg/testutil"
 	"github.com/gotestyourself/gotestyourself/assert"
 )
 

runtime/restart/monitor/monitor.go

@@ -31,7 +31,7 @@ import (
 	"github.com/containerd/containerd/content"
 	"github.com/containerd/containerd/namespaces"
 	"github.com/containerd/containerd/plugin"
-	"github.com/containerd/containerd/restart"
+	"github.com/containerd/containerd/runtime/restart"
 	"github.com/containerd/containerd/services"
 	"github.com/containerd/containerd/snapshots"
 	"github.com/pkg/errors"

snapshots/btrfs/btrfs_test.go

@@ -28,9 +28,9 @@ import (
 	"testing"
 
 	"github.com/containerd/containerd/mount"
+	"github.com/containerd/containerd/pkg/testutil"
 	"github.com/containerd/containerd/snapshots"
 	"github.com/containerd/containerd/snapshots/testsuite"
-	"github.com/containerd/containerd/testutil"
 	"github.com/pkg/errors"
 	"golang.org/x/sys/unix"
 )

snapshots/native/native_test.go

@@ -21,9 +21,9 @@ import (
 	"runtime"
 	"testing"
 
+	"github.com/containerd/containerd/pkg/testutil"
 	"github.com/containerd/containerd/snapshots"
 	"github.com/containerd/containerd/snapshots/testsuite"
-	"github.com/containerd/containerd/testutil"
 )
 
 func newSnapshotter(ctx context.Context, root string) (snapshots.Snapshotter, func() error, error) {

snapshots/overlay/check_test.go

@@ -24,7 +24,7 @@ import (
 	"os/exec"
 	"testing"
 
-	"github.com/containerd/containerd/testutil"
+	"github.com/containerd/containerd/pkg/testutil"
 )
 
 func testOverlaySupported(t testing.TB, expected bool, mkfs ...string) {

snapshots/overlay/overlay_test.go

@@ -28,10 +28,10 @@ import (
 	"testing"
 
 	"github.com/containerd/containerd/mount"
+	"github.com/containerd/containerd/pkg/testutil"
 	"github.com/containerd/containerd/snapshots"
 	"github.com/containerd/containerd/snapshots/storage"
 	"github.com/containerd/containerd/snapshots/testsuite"
-	"github.com/containerd/containerd/testutil"
 )
 
 func newSnapshotter(ctx context.Context, root string) (snapshots.Snapshotter, func() error, error) {

snapshots/storage/bolt_test.go

@@ -22,7 +22,7 @@ import (
 
 	// Does not require root but flag must be defined for snapshot tests
 
-	_ "github.com/containerd/containerd/testutil"
+	_ "github.com/containerd/containerd/pkg/testutil"
 )
 
 func TestMetastore(t *testing.T) {

snapshots/testsuite/testsuite.go

@@ -29,8 +29,8 @@ import (
 	"github.com/containerd/containerd/errdefs"
 	"github.com/containerd/containerd/mount"
 	"github.com/containerd/containerd/namespaces"
+	"github.com/containerd/containerd/pkg/testutil"
 	"github.com/containerd/containerd/snapshots"
-	"github.com/containerd/containerd/testutil"
 	"github.com/containerd/continuity/fs/fstest"
 	"github.com/gotestyourself/gotestyourself/assert"
 	is "github.com/gotestyourself/gotestyourself/assert/cmp"