Move client to subpackage

Signed-off-by: Derek McGowan <derek@mcg.dev>

integration/client/benchmark_test.go

@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"testing"
 
-	. "github.com/containerd/containerd/v2"
+	. "github.com/containerd/containerd/v2/client"
 	"github.com/containerd/containerd/v2/containers"
 	"github.com/containerd/containerd/v2/oci"
 )

integration/client/client.go

@@ -23,7 +23,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/containerd/containerd/v2"
+	containerd "github.com/containerd/containerd/v2/client"
 	"github.com/containerd/containerd/v2/defaults"
 	"github.com/containerd/containerd/v2/namespaces"
 	"github.com/containerd/log/logtest"

integration/client/client_test.go

@@ -32,7 +32,7 @@ import (
 	"go.opentelemetry.io/otel"
 	exec "golang.org/x/sys/execabs"
 
-	. "github.com/containerd/containerd/v2"
+	. "github.com/containerd/containerd/v2/client"
 	"github.com/containerd/containerd/v2/defaults"
 	"github.com/containerd/containerd/v2/errdefs"
 	"github.com/containerd/containerd/v2/images"

integration/client/client_unix_test.go

@@ -21,7 +21,7 @@ package client
 import (
 	"testing"
 
-	. "github.com/containerd/containerd/v2"
+	. "github.com/containerd/containerd/v2/client"
 	"github.com/containerd/containerd/v2/integration/images"
 	"github.com/containerd/containerd/v2/platforms"
 )

integration/client/container_checkpoint_test.go

@@ -29,8 +29,8 @@ import (
 	"syscall"
 	"testing"
 
-	. "github.com/containerd/containerd/v2"
 	"github.com/containerd/containerd/v2/cio"
+	. "github.com/containerd/containerd/v2/client"
 	"github.com/containerd/containerd/v2/oci"
 )
 

integration/client/container_fuzzer.go

@@ -30,7 +30,7 @@ import (
 	"time"
 
 	fuzz "github.com/AdaLogics/go-fuzz-headers"
-	"github.com/containerd/containerd/v2"
+	containerd "github.com/containerd/containerd/v2/client"
 	"github.com/containerd/containerd/v2/oci"
 	exec "golang.org/x/sys/execabs"
 )

integration/client/container_idmapped_linux_test.go

@@ -22,7 +22,7 @@ import (
 	"syscall"
 	"testing"
 
-	"github.com/containerd/containerd/v2"
+	containerd "github.com/containerd/containerd/v2/client"
 	"github.com/containerd/containerd/v2/oci"
 	"github.com/containerd/containerd/v2/snapshots/overlay/overlayutils"
 	"github.com/opencontainers/runtime-spec/specs-go"

integration/client/container_linux_test.go

@@ -33,8 +33,8 @@ import (
 	"github.com/containerd/cgroups/v3"
 	"github.com/containerd/cgroups/v3/cgroup1"
 	cgroupsv2 "github.com/containerd/cgroups/v3/cgroup2"
-	. "github.com/containerd/containerd/v2"
 	"github.com/containerd/containerd/v2/cio"
+	. "github.com/containerd/containerd/v2/client"
 	"github.com/containerd/containerd/v2/containers"
 	"github.com/containerd/containerd/v2/errdefs"
 	"github.com/containerd/containerd/v2/oci"

integration/client/container_test.go

@@ -30,9 +30,9 @@ import (
 	"testing"
 	"time"
 
-	. "github.com/containerd/containerd/v2"
 	apievents "github.com/containerd/containerd/v2/api/events"
 	"github.com/containerd/containerd/v2/cio"
+	. "github.com/containerd/containerd/v2/client"
 	"github.com/containerd/containerd/v2/containers"
 	"github.com/containerd/containerd/v2/errdefs"
 	"github.com/containerd/containerd/v2/images"

integration/client/content_test.go

@@ -22,7 +22,7 @@ import (
 	"sync/atomic"
 	"testing"
 
-	. "github.com/containerd/containerd/v2"
+	. "github.com/containerd/containerd/v2/client"
 	"github.com/containerd/containerd/v2/content"
 	"github.com/containerd/containerd/v2/content/testsuite"
 	"github.com/containerd/containerd/v2/errdefs"

integration/client/convert_test.go

@@ -19,7 +19,7 @@ package client
 import (
 	"testing"
 
-	. "github.com/containerd/containerd/v2"
+	. "github.com/containerd/containerd/v2/client"
 	"github.com/containerd/containerd/v2/images"
 	"github.com/containerd/containerd/v2/images/converter"
 	"github.com/containerd/containerd/v2/images/converter/uncompress"

integration/client/daemon.go

@@ -26,7 +26,7 @@ import (
 	"syscall"
 	"time"
 
-	. "github.com/containerd/containerd/v2"
+	. "github.com/containerd/containerd/v2/client"
 	exec "golang.org/x/sys/execabs"
 )
 

integration/client/daemon_config_linux_test.go

@@ -27,7 +27,7 @@ import (
 	"time"
 
 	"github.com/containerd/cgroups/v3"
-	. "github.com/containerd/containerd/v2"
+	. "github.com/containerd/containerd/v2/client"
 	"github.com/containerd/containerd/v2/oci"
 	"github.com/containerd/containerd/v2/plugins"
 	"github.com/containerd/containerd/v2/runtime/v2/runc/options"

integration/client/export_test.go

@@ -24,7 +24,7 @@ import (
 	"os"
 	"testing"
 
-	. "github.com/containerd/containerd/v2"
+	. "github.com/containerd/containerd/v2/client"
 	"github.com/containerd/containerd/v2/content"
 	"github.com/containerd/containerd/v2/images"
 	"github.com/containerd/containerd/v2/images/archive"

integration/client/image_test.go

@@ -23,7 +23,7 @@ import (
 	"strings"
 	"testing"
 
-	. "github.com/containerd/containerd/v2"
+	. "github.com/containerd/containerd/v2/client"
 	"github.com/containerd/containerd/v2/errdefs"
 	"github.com/containerd/containerd/v2/images"
 	imagelist "github.com/containerd/containerd/v2/integration/images"

integration/client/import_test.go

@@ -32,9 +32,9 @@ import (
 	"testing"
 	"time"
 
-	. "github.com/containerd/containerd/v2"
 	"github.com/containerd/containerd/v2/archive/compression"
 	"github.com/containerd/containerd/v2/archive/tartest"
+	. "github.com/containerd/containerd/v2/client"
 	"github.com/containerd/containerd/v2/images"
 	"github.com/containerd/containerd/v2/images/archive"
 	"github.com/containerd/containerd/v2/leases"

integration/client/lease_test.go

@@ -20,7 +20,7 @@ import (
 	"runtime"
 	"testing"
 
-	. "github.com/containerd/containerd/v2"
+	. "github.com/containerd/containerd/v2/client"
 	"github.com/containerd/containerd/v2/errdefs"
 	"github.com/containerd/containerd/v2/images"
 	imagelist "github.com/containerd/containerd/v2/integration/images"

integration/client/restart_monitor_test.go

@@ -30,8 +30,8 @@ import (
 	"testing"
 	"time"
 
-	. "github.com/containerd/containerd/v2"
 	eventtypes "github.com/containerd/containerd/v2/api/events"
+	. "github.com/containerd/containerd/v2/client"
 	"github.com/containerd/containerd/v2/oci"
 	"github.com/containerd/containerd/v2/pkg/testutil"
 	"github.com/containerd/containerd/v2/runtime/restart"

integration/client/signals_test.go

@@ -21,7 +21,7 @@ import (
 	"syscall"
 	"testing"
 
-	. "github.com/containerd/containerd/v2"
+	. "github.com/containerd/containerd/v2/client"
 )
 
 func TestParseSignal(t *testing.T) {

integration/client/snapshot_test.go

@@ -20,7 +20,7 @@ import (
 	"context"
 	"testing"
 
-	. "github.com/containerd/containerd/v2"
+	. "github.com/containerd/containerd/v2/client"
 	"github.com/containerd/containerd/v2/snapshots"
 	"github.com/containerd/containerd/v2/snapshots/testsuite"
 )

integration/client/transfer_test.go

@@ -23,7 +23,7 @@ import (
 	"io"
 	"testing"
 
-	"github.com/containerd/containerd/v2"
+	containerd "github.com/containerd/containerd/v2/client"
 	"github.com/containerd/containerd/v2/pkg/transfer/archive"
 )