Rename transferer to transferrer

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

.golangci.yml

@@ -41,10 +41,6 @@ linters-settings:
       - G306
       - G402
       - G404
-  misspell:
-    ignore-words:
-      - transferer
-      - transferers
 
 run:
   timeout: 8m

docs/transfer.md

@@ -10,7 +10,7 @@ The transfer API consists of a single operation which can be called with various
 
 In Go the API looks like,
 ```go
-type Transferer interface {
+type Transferrer interface {
 	Transfer(ctx context.Context, source interface{}, destination interface{}, opts ...Opt) error
 }
 ```

pkg/transfer/local/transfer.go

@@ -49,7 +49,7 @@ type localTransferService struct {
 	//  - Platform -> snapshotter defaults?
 }
 
-func NewTransferService(lm leases.Manager, cs content.Store, is images.Store) transfer.Transferer {
+func NewTransferService(lm leases.Manager, cs content.Store, is images.Store) transfer.Transferrer {
 	return &localTransferService{
 		leases:  lm,
 		content: cs,

pkg/transfer/proxy/transfer.go

@@ -31,21 +31,21 @@ import (
 	"google.golang.org/protobuf/types/known/anypb"
 )
 
-type proxyTransferer struct {
+type proxyTransferrer struct {
 	client        transferapi.TransferClient
 	streamCreator streaming.StreamCreator
 }
 
-// NewTransferer returns a new transferr which communicates over a GRPC
+// NewTransferrer returns a new transferr which communicates over a GRPC
 // connection using the containerd transfer API
-func NewTransferer(client transferapi.TransferClient, sc streaming.StreamCreator) transfer.Transferer {
+func NewTransferrer(client transferapi.TransferClient, sc streaming.StreamCreator) transfer.Transferrer {
-	return &proxyTransferer{
+	return &proxyTransferrer{
 		client:        client,
 		streamCreator: sc,
 	}
 }
 
-func (p *proxyTransferer) Transfer(ctx context.Context, src interface{}, dst interface{}, opts ...transfer.Opt) error {
+func (p *proxyTransferrer) Transfer(ctx context.Context, src interface{}, dst interface{}, opts ...transfer.Opt) error {
 	o := &transfer.Config{}
 	for _, opt := range opts {
 		opt(o)
@@ -108,7 +108,7 @@ func (p *proxyTransferer) Transfer(ctx context.Context, src interface{}, dst int
 	_, err = p.client.Transfer(ctx, req)
 	return err
 }
-func (p *proxyTransferer) marshalAny(ctx context.Context, i interface{}) (typeurl.Any, error) {
+func (p *proxyTransferrer) marshalAny(ctx context.Context, i interface{}) (typeurl.Any, error) {
 	switch m := i.(type) {
 	case streamMarshaler:
 		return m.MarshalAny(ctx, p.streamCreator)

pkg/transfer/transfer.go

@@ -26,7 +26,7 @@ import (
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 )
 
-type Transferer interface {
+type Transferrer interface {
 	Transfer(ctx context.Context, source interface{}, destination interface{}, opts ...Opt) error
 }
 

services/transfer/service.go

@@ -48,7 +48,7 @@ func init() {
 }
 
 type service struct {
-	transferers   []transfer.Transferer
+	transferrers  []transfer.Transferrer
 	streamManager streaming.StreamManager
 	transferapi.UnimplementedTransferServer
 }
@@ -60,20 +60,20 @@ func newService(ic *plugin.InitContext) (interface{}, error) {
 	}
 
 	// TODO: how to determine order?
-	t := make([]transfer.Transferer, 0, len(plugins))
+	t := make([]transfer.Transferrer, 0, len(plugins))
 	for _, p := range plugins {
 		i, err := p.Instance()
 		if err != nil {
 			return nil, err
 		}
-		t = append(t, i.(transfer.Transferer))
+		t = append(t, i.(transfer.Transferrer))
 	}
 	sp, err := ic.GetByID(plugin.StreamingPlugin, "manager")
 	if err != nil {
 		return nil, err
 	}
 	return &service{
-		transferers:   t,
+		transferrers:  t,
 		streamManager: sp.(streaming.StreamManager),
 	}, nil
 }
@@ -123,7 +123,7 @@ func (s *service) Transfer(ctx context.Context, req *transferapi.TransferRequest
 		return nil, errdefs.ToGRPC(err)
 	}
 
-	for _, t := range s.transferers {
+	for _, t := range s.transferrers {
 		if err := t.Transfer(ctx, src, dst, transferOpts...); err == nil {
 			return &ptypes.Empty{}, nil
 		} else if !errdefs.IsNotImplemented(err) {

transfer.go

@@ -29,7 +29,7 @@ import (
 )
 
 func (c *Client) Transfer(ctx context.Context, src interface{}, dest interface{}, opts ...transfer.Opt) error {
-	return proxy.NewTransferer(transferapi.NewTransferClient(c.conn), c.streamCreator()).Transfer(ctx, src, dest, opts...)
+	return proxy.NewTransferrer(transferapi.NewTransferClient(c.conn), c.streamCreator()).Transfer(ctx, src, dest, opts...)
 }
 
 func (c *Client) streamCreator() streaming.StreamCreator {