Move leases to core/leases

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

client/client.go

@@ -43,11 +43,11 @@ import (
 	"github.com/containerd/containerd/v2/core/content"
 	contentproxy "github.com/containerd/containerd/v2/core/content/proxy"
 	"github.com/containerd/containerd/v2/core/images"
+	"github.com/containerd/containerd/v2/core/leases"
+	leasesproxy "github.com/containerd/containerd/v2/core/leases/proxy"
 	"github.com/containerd/containerd/v2/defaults"
 	"github.com/containerd/containerd/v2/errdefs"
 	"github.com/containerd/containerd/v2/events"
-	"github.com/containerd/containerd/v2/leases"
-	leasesproxy "github.com/containerd/containerd/v2/leases/proxy"
 	"github.com/containerd/containerd/v2/namespaces"
 	"github.com/containerd/containerd/v2/pkg/dialer"
 	"github.com/containerd/containerd/v2/platforms"

client/lease.go

@@ -20,7 +20,7 @@ import (
 	"context"
 	"time"
 
-	"github.com/containerd/containerd/v2/leases"
+	"github.com/containerd/containerd/v2/core/leases"
 )
 
 // WithLease attaches a lease on the context

client/services.go

@@ -28,7 +28,7 @@ import (
 	"github.com/containerd/containerd/v2/core/containers"
 	"github.com/containerd/containerd/v2/core/content"
 	"github.com/containerd/containerd/v2/core/images"
-	"github.com/containerd/containerd/v2/leases"
+	"github.com/containerd/containerd/v2/core/leases"
 	"github.com/containerd/containerd/v2/namespaces"
 	"github.com/containerd/containerd/v2/plugins"
 	"github.com/containerd/containerd/v2/sandbox"

cmd/ctr/commands/content/prune.go

@@ -23,7 +23,7 @@ import (
 
 	"github.com/containerd/containerd/v2/cmd/ctr/commands"
 	"github.com/containerd/containerd/v2/core/content"
-	"github.com/containerd/containerd/v2/leases"
+	"github.com/containerd/containerd/v2/core/leases"
 	"github.com/containerd/log"
 	"github.com/urfave/cli"
 )

cmd/ctr/commands/images/mount.go

@@ -22,9 +22,9 @@ import (
 
 	containerd "github.com/containerd/containerd/v2/client"
 	"github.com/containerd/containerd/v2/cmd/ctr/commands"
+	"github.com/containerd/containerd/v2/core/leases"
 	"github.com/containerd/containerd/v2/defaults"
 	"github.com/containerd/containerd/v2/errdefs"
-	"github.com/containerd/containerd/v2/leases"
 	"github.com/containerd/containerd/v2/mount"
 	"github.com/containerd/containerd/v2/platforms"
 	"github.com/opencontainers/image-spec/identity"

cmd/ctr/commands/images/unmount.go

@@ -20,8 +20,8 @@ import (
 	"fmt"
 
 	"github.com/containerd/containerd/v2/cmd/ctr/commands"
+	"github.com/containerd/containerd/v2/core/leases"
 	"github.com/containerd/containerd/v2/errdefs"
-	"github.com/containerd/containerd/v2/leases"
 	"github.com/containerd/containerd/v2/mount"
 	"github.com/urfave/cli"
 )

cmd/ctr/commands/leases/leases.go

@@ -25,7 +25,7 @@ import (
 	"time"
 
 	"github.com/containerd/containerd/v2/cmd/ctr/commands"
-	"github.com/containerd/containerd/v2/leases"
+	"github.com/containerd/containerd/v2/core/leases"
 	"github.com/urfave/cli"
 )
 

contrib/fuzz/metadata_fuzzer.go

@@ -29,7 +29,7 @@ import (
 	"github.com/containerd/containerd/v2/core/containers"
 	"github.com/containerd/containerd/v2/core/content"
 	"github.com/containerd/containerd/v2/core/images"
-	"github.com/containerd/containerd/v2/leases"
+	"github.com/containerd/containerd/v2/core/leases"
 	"github.com/containerd/containerd/v2/metadata"
 	"github.com/containerd/containerd/v2/namespaces"
 	"github.com/containerd/containerd/v2/plugins/content/local"

core/images/converter/converter.go

@@ -22,7 +22,7 @@ import (
 
 	"github.com/containerd/containerd/v2/core/content"
 	"github.com/containerd/containerd/v2/core/images"
-	"github.com/containerd/containerd/v2/leases"
+	"github.com/containerd/containerd/v2/core/leases"
 	"github.com/containerd/containerd/v2/platforms"
 )
 

core/leases/proxy/manager.go

@@ -20,8 +20,8 @@ import (
 	"context"
 
 	leasesapi "github.com/containerd/containerd/v2/api/services/leases/v1"
+	"github.com/containerd/containerd/v2/core/leases"
 	"github.com/containerd/containerd/v2/errdefs"
-	"github.com/containerd/containerd/v2/leases"
 	"github.com/containerd/containerd/v2/protobuf"
 )
 

integration/client/client_test.go

@@ -34,10 +34,10 @@ import (
 
 	. "github.com/containerd/containerd/v2/client"
 	"github.com/containerd/containerd/v2/core/images"
+	"github.com/containerd/containerd/v2/core/leases"
 	"github.com/containerd/containerd/v2/defaults"
 	"github.com/containerd/containerd/v2/errdefs"
 	imagelist "github.com/containerd/containerd/v2/integration/images"
-	"github.com/containerd/containerd/v2/leases"
 	"github.com/containerd/containerd/v2/namespaces"
 	"github.com/containerd/containerd/v2/pkg/testutil"
 	"github.com/containerd/containerd/v2/platforms"

integration/client/import_test.go

@@ -38,7 +38,7 @@ import (
 	"github.com/containerd/containerd/v2/core/content"
 	"github.com/containerd/containerd/v2/core/images"
 	"github.com/containerd/containerd/v2/core/images/archive"
-	"github.com/containerd/containerd/v2/leases"
+	"github.com/containerd/containerd/v2/core/leases"
 	"github.com/containerd/containerd/v2/namespaces"
 	"github.com/containerd/containerd/v2/oci"
 	"github.com/containerd/containerd/v2/pkg/transfer"

integration/client/lease_test.go

@@ -22,9 +22,9 @@ import (
 
 	. "github.com/containerd/containerd/v2/client"
 	"github.com/containerd/containerd/v2/core/images"
+	"github.com/containerd/containerd/v2/core/leases"
 	"github.com/containerd/containerd/v2/errdefs"
 	imagelist "github.com/containerd/containerd/v2/integration/images"
-	"github.com/containerd/containerd/v2/leases"
 	"github.com/opencontainers/image-spec/identity"
 )
 

integration/image_pull_timeout_test.go

@@ -40,8 +40,8 @@ import (
 
 	containerd "github.com/containerd/containerd/v2/client"
 	"github.com/containerd/containerd/v2/core/content"
+	"github.com/containerd/containerd/v2/core/leases"
 	"github.com/containerd/containerd/v2/defaults"
-	"github.com/containerd/containerd/v2/leases"
 	"github.com/containerd/containerd/v2/namespaces"
 	criconfig "github.com/containerd/containerd/v2/pkg/cri/config"
 	criserver "github.com/containerd/containerd/v2/pkg/cri/server"

metadata/adaptors.go

@@ -22,8 +22,8 @@ import (
 	"github.com/containerd/containerd/v2/core/containers"
 	"github.com/containerd/containerd/v2/core/content"
 	"github.com/containerd/containerd/v2/core/images"
+	"github.com/containerd/containerd/v2/core/leases"
 	"github.com/containerd/containerd/v2/filters"
-	"github.com/containerd/containerd/v2/leases"
 	"github.com/containerd/containerd/v2/sandbox"
 	"github.com/containerd/containerd/v2/snapshots"
 )

metadata/content_test.go

@@ -27,9 +27,9 @@ import (
 
 	"github.com/containerd/containerd/v2/core/content"
 	"github.com/containerd/containerd/v2/core/content/testsuite"
+	"github.com/containerd/containerd/v2/core/leases"
 	"github.com/containerd/containerd/v2/errdefs"
 	"github.com/containerd/containerd/v2/labels"
-	"github.com/containerd/containerd/v2/leases"
 	"github.com/containerd/containerd/v2/namespaces"
 	"github.com/containerd/containerd/v2/plugins/content/local"
 	"github.com/opencontainers/go-digest"

metadata/db_test.go

@@ -32,9 +32,9 @@ import (
 	"github.com/containerd/containerd/v2/core/containers"
 	"github.com/containerd/containerd/v2/core/content"
 	"github.com/containerd/containerd/v2/core/images"
+	"github.com/containerd/containerd/v2/core/leases"
 	"github.com/containerd/containerd/v2/errdefs"
 	"github.com/containerd/containerd/v2/gc"
-	"github.com/containerd/containerd/v2/leases"
 	"github.com/containerd/containerd/v2/namespaces"
 	"github.com/containerd/containerd/v2/plugins/content/local"
 	"github.com/containerd/containerd/v2/protobuf/types"

metadata/leases.go

@@ -24,9 +24,9 @@ import (
 	"sync/atomic"
 	"time"
 
+	"github.com/containerd/containerd/v2/core/leases"
 	"github.com/containerd/containerd/v2/errdefs"
 	"github.com/containerd/containerd/v2/filters"
-	"github.com/containerd/containerd/v2/leases"
 	"github.com/containerd/containerd/v2/metadata/boltutil"
 	"github.com/containerd/containerd/v2/namespaces"
 	digest "github.com/opencontainers/go-digest"

metadata/leases_test.go

@@ -22,8 +22,8 @@ import (
 	"fmt"
 	"testing"
 
+	"github.com/containerd/containerd/v2/core/leases"
 	"github.com/containerd/containerd/v2/errdefs"
-	"github.com/containerd/containerd/v2/leases"
 	bolt "go.etcd.io/bbolt"
 )
 

pkg/transfer/local/transfer.go

@@ -27,8 +27,8 @@ import (
 
 	"github.com/containerd/containerd/v2/core/content"
 	"github.com/containerd/containerd/v2/core/images"
+	"github.com/containerd/containerd/v2/core/leases"
 	"github.com/containerd/containerd/v2/errdefs"
-	"github.com/containerd/containerd/v2/leases"
 	"github.com/containerd/containerd/v2/pkg/imageverifier"
 	"github.com/containerd/containerd/v2/pkg/kmutex"
 	"github.com/containerd/containerd/v2/pkg/transfer"

plugins/leases/local.go

@@ -19,8 +19,8 @@ package plugin
 import (
 	"context"
 
+	"github.com/containerd/containerd/v2/core/leases"
 	"github.com/containerd/containerd/v2/gc"
-	"github.com/containerd/containerd/v2/leases"
 	"github.com/containerd/containerd/v2/metadata"
 	"github.com/containerd/containerd/v2/plugins"
 	"github.com/containerd/plugin"

plugins/streaming/manager.go

@@ -21,9 +21,9 @@ import (
 	"errors"
 	"sync"
 
+	"github.com/containerd/containerd/v2/core/leases"
 	"github.com/containerd/containerd/v2/errdefs"
 	"github.com/containerd/containerd/v2/gc"
-	"github.com/containerd/containerd/v2/leases"
 	"github.com/containerd/containerd/v2/metadata"
 	"github.com/containerd/containerd/v2/namespaces"
 	"github.com/containerd/containerd/v2/pkg/streaming"

plugins/transfer/plugin.go

@@ -20,9 +20,9 @@ import (
 	"fmt"
 
 	"github.com/containerd/containerd/v2/core/diff"
+	"github.com/containerd/containerd/v2/core/leases"
 	"github.com/containerd/containerd/v2/defaults"
 	"github.com/containerd/containerd/v2/errdefs"
-	"github.com/containerd/containerd/v2/leases"
 	"github.com/containerd/containerd/v2/metadata"
 	"github.com/containerd/containerd/v2/pkg/imageverifier"
 	"github.com/containerd/containerd/v2/pkg/transfer/local"

services/leases/service.go

@@ -20,8 +20,8 @@ import (
 	"context"
 
 	api "github.com/containerd/containerd/v2/api/services/leases/v1"
+	"github.com/containerd/containerd/v2/core/leases"
 	"github.com/containerd/containerd/v2/errdefs"
-	"github.com/containerd/containerd/v2/leases"
 	"github.com/containerd/containerd/v2/plugins"
 	"github.com/containerd/containerd/v2/protobuf"
 	ptypes "github.com/containerd/containerd/v2/protobuf/types"