From f88162587b3b4ae388c7638880ac4463ffe001b1 Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Wed, 30 Nov 2022 11:28:17 -0800 Subject: [PATCH] Rename transferer to transferrer Signed-off-by: Derek McGowan --- .golangci.yml | 4 ---- docs/transfer.md | 2 +- pkg/transfer/local/transfer.go | 2 +- pkg/transfer/proxy/transfer.go | 12 ++++++------ pkg/transfer/transfer.go | 2 +- services/transfer/service.go | 10 +++++----- transfer.go | 2 +- 7 files changed, 15 insertions(+), 19 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index b75d8d2db..08699988a 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -41,10 +41,6 @@ linters-settings: - G306 - G402 - G404 - misspell: - ignore-words: - - transferer - - transferers run: timeout: 8m diff --git a/docs/transfer.md b/docs/transfer.md index 0bb272f2f..1063dec6b 100644 --- a/docs/transfer.md +++ b/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 } ``` diff --git a/pkg/transfer/local/transfer.go b/pkg/transfer/local/transfer.go index ca360cde0..d95e04e89 100644 --- a/pkg/transfer/local/transfer.go +++ b/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, diff --git a/pkg/transfer/proxy/transfer.go b/pkg/transfer/proxy/transfer.go index 657492821..c1fa0c7e8 100644 --- a/pkg/transfer/proxy/transfer.go +++ b/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 { - return &proxyTransferer{ +func NewTransferrer(client transferapi.TransferClient, sc streaming.StreamCreator) transfer.Transferrer { + 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) diff --git a/pkg/transfer/transfer.go b/pkg/transfer/transfer.go index 0d024449b..0440facf7 100644 --- a/pkg/transfer/transfer.go +++ b/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 } diff --git a/services/transfer/service.go b/services/transfer/service.go index 7cea394f1..e9195a3e2 100644 --- a/services/transfer/service.go +++ b/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) { diff --git a/transfer.go b/transfer.go index 520931d94..27a88b9f6 100644 --- a/transfer.go +++ b/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 {