Add leases manager interface

Add leases manager to the leases package and use the
interface on the client and service.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>

services/leases/local.go

@@ -18,19 +18,12 @@ package leases
 
 import (
 	"context"
-	"encoding/base64"
-	"fmt"
-	"math/rand"
-	"time"
-
-	"google.golang.org/grpc"
 
 	"github.com/boltdb/bolt"
-	api "github.com/containerd/containerd/api/services/leases/v1"
+	"github.com/containerd/containerd/leases"
 	"github.com/containerd/containerd/metadata"
 	"github.com/containerd/containerd/plugin"
 	"github.com/containerd/containerd/services"
-	ptypes "github.com/gogo/protobuf/types"
 )
 
 func init() {
@@ -54,67 +47,32 @@ type local struct {
 	db *metadata.DB
 }
 
-func (l *local) Create(ctx context.Context, r *api.CreateRequest, _ ...grpc.CallOption) (*api.CreateResponse, error) {
-	lid := r.ID
-	if lid == "" {
-		lid = generateLeaseID()
-	}
-	var trans metadata.Lease
+func (l *local) Create(ctx context.Context, opts ...leases.Opt) (leases.Lease, error) {
+	var lease leases.Lease
 	if err := l.db.Update(func(tx *bolt.Tx) error {
 		var err error
-		trans, err = metadata.NewLeaseManager(tx).Create(ctx, lid, r.Labels)
+		lease, err = metadata.NewLeaseManager(tx).Create(ctx, opts...)
 		return err
 	}); err != nil {
-		return nil, err
+		return leases.Lease{}, err
 	}
-	return &api.CreateResponse{
-		Lease: txToGRPC(trans),
-	}, nil
+	return lease, nil
 }
 
-func (l *local) Delete(ctx context.Context, r *api.DeleteRequest, _ ...grpc.CallOption) (*ptypes.Empty, error) {
-	if err := l.db.Update(func(tx *bolt.Tx) error {
-		return metadata.NewLeaseManager(tx).Delete(ctx, r.ID)
-	}); err != nil {
-		return nil, err
-	}
-	return &ptypes.Empty{}, nil
+func (l *local) Delete(ctx context.Context, lease leases.Lease) error {
+	return l.db.Update(func(tx *bolt.Tx) error {
+		return metadata.NewLeaseManager(tx).Delete(ctx, lease)
+	})
 }
 
-func (l *local) List(ctx context.Context, r *api.ListRequest, _ ...grpc.CallOption) (*api.ListResponse, error) {
-	var leases []metadata.Lease
+func (l *local) List(ctx context.Context, filters ...string) ([]leases.Lease, error) {
+	var ll []leases.Lease
 	if err := l.db.View(func(tx *bolt.Tx) error {
 		var err error
-		leases, err = metadata.NewLeaseManager(tx).List(ctx, false, r.Filters...)
+		ll, err = metadata.NewLeaseManager(tx).List(ctx, filters...)
 		return err
 	}); err != nil {
 		return nil, err
 	}
-
-	apileases := make([]*api.Lease, len(leases))
-	for i := range leases {
-		apileases[i] = txToGRPC(leases[i])
-	}
-
-	return &api.ListResponse{
-		Leases: apileases,
-	}, nil
-}
-
-func txToGRPC(tx metadata.Lease) *api.Lease {
-	return &api.Lease{
-		ID:        tx.ID,
-		Labels:    tx.Labels,
-		CreatedAt: tx.CreatedAt,
-		// TODO: Snapshots
-		// TODO: Content
-	}
-}
-
-func generateLeaseID() string {
-	t := time.Now()
-	var b [3]byte
-	// Ignore read failures, just decreases uniqueness
-	rand.Read(b[:])
-	return fmt.Sprintf("%d-%s", t.Nanosecond(), base64.URLEncoding.EncodeToString(b[:]))
+	return ll, nil
 }

services/leases/service.go

@@ -22,6 +22,7 @@ import (
 	"google.golang.org/grpc"
 
 	api "github.com/containerd/containerd/api/services/leases/v1"
+	"github.com/containerd/containerd/leases"
 	"github.com/containerd/containerd/plugin"
 	"github.com/containerd/containerd/services"
 	ptypes "github.com/gogo/protobuf/types"
@@ -48,13 +49,13 @@ func init() {
 			if err != nil {
 				return nil, err
 			}
-			return &service{local: i.(api.LeasesClient)}, nil
+			return &service{lm: i.(leases.Manager)}, nil
 		},
 	})
 }
 
 type service struct {
-	local api.LeasesClient
+	lm leases.Manager
 }
 
 func (s *service) Register(server *grpc.Server) error {
@@ -63,13 +64,54 @@ func (s *service) Register(server *grpc.Server) error {
 }
 
 func (s *service) Create(ctx context.Context, r *api.CreateRequest) (*api.CreateResponse, error) {
-	return s.local.Create(ctx, r)
+	opts := []leases.Opt{
+		leases.WithLabels(r.Labels),
+	}
+	if r.ID == "" {
+		opts = append(opts, leases.WithRandomID())
+	} else {
+		opts = append(opts, leases.WithID(r.ID))
+	}
+
+	l, err := s.lm.Create(ctx, opts...)
+	if err != nil {
+		return nil, err
+	}
+
+	return &api.CreateResponse{
+		Lease: leaseToGRPC(l),
+	}, nil
 }
 
 func (s *service) Delete(ctx context.Context, r *api.DeleteRequest) (*ptypes.Empty, error) {
-	return s.local.Delete(ctx, r)
+	if err := s.lm.Delete(ctx, leases.Lease{
+		ID: r.ID,
+	}); err != nil {
+		return nil, err
+	}
+	return &ptypes.Empty{}, nil
 }
 
 func (s *service) List(ctx context.Context, r *api.ListRequest) (*api.ListResponse, error) {
-	return s.local.List(ctx, r)
+	l, err := s.lm.List(ctx, r.Filters...)
+	if err != nil {
+		return nil, err
+	}
+
+	apileases := make([]*api.Lease, len(l))
+	for i := range l {
+		apileases[i] = leaseToGRPC(l[i])
+	}
+
+	return &api.ListResponse{
+		Leases: apileases,
+	}, nil
+}
+
+func leaseToGRPC(l leases.Lease) *api.Lease {
+	return &api.Lease{
+		ID:        l.ID,
+		Labels:    l.Labels,
+		CreatedAt: l.CreatedAt,
+	}
 }