github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Lint fixes

Browse Source 
Signed-off-by: Derek McGowan <derek@mcg.dev>
This commit is contained in:
Derek McGowan
2022-09-13 22:10:34 -07:00
parent 28ea754565
commit 478f1c934d
10 changed files with 28 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/transfer/local/pull.go
View File

@@ -32,7 +32,7 @@ import (
"github.com/sirupsen/logrus"
)
func (ts *localTransferService) pull(ctx context.Context, ir transfer.ImageFetcher, is transfer.ImageStorer, tops *transfer.TransferOpts) error {
func (ts *localTransferService) pull(ctx context.Context, ir transfer.ImageFetcher, is transfer.ImageStorer, tops *transfer.Config) error {
ctx, done, err := ts.withLease(ctx)
if err != nil {
return err
@@ -146,7 +146,7 @@ func (ts *localTransferService) pull(ctx context.Context, ir transfer.ImageFetch
handler = images.Handlers(append(baseHandlers,
fetchHandler(store, fetcher, progressTracker),
checkNeedsFix,
childrenHandler, // List children to track hierachy
childrenHandler, // List children to track hierarchy
appendDistSrcLabelHandler,
)...)

2
pkg/transfer/local/push.go
View File

@@ -25,7 +25,7 @@ import (
"github.com/containerd/containerd/remotes"
)
func (ts *localTransferService) push(ctx context.Context, ig transfer.ImageGetter, p transfer.ImagePusher, tops *transfer.TransferOpts) error {
func (ts *localTransferService) push(ctx context.Context, ig transfer.ImageGetter, p transfer.ImagePusher, tops *transfer.Config) error {
/*
// TODO: Platform matching
if pushCtx.PlatformMatcher == nil {

4
pkg/transfer/local/transfer.go
View File

@@ -58,7 +58,7 @@ func NewTransferService(lm leases.Manager, cs content.Store, is images.Store) tr
}
func (ts *localTransferService) Transfer(ctx context.Context, src interface{}, dest interface{}, opts ...transfer.Opt) error {
topts := &transfer.TransferOpts{}
topts := &transfer.Config{}
for _, opt := range opts {
opt(topts)
}
@@ -100,7 +100,7 @@ func name(t interface{}) string {
// echo is mostly used for testing, it implements an import->export which is
// a no-op which only roundtrips the bytes.
func (ts *localTransferService) echo(ctx context.Context, i transfer.ImageImportStreamer, e transfer.ImageExportStreamer, tops *transfer.TransferOpts) error {
func (ts *localTransferService) echo(ctx context.Context, i transfer.ImageImportStreamer, e transfer.ImageExportStreamer, tops *transfer.Config) error {
r, err := i.ImportStream(ctx)
if err != nil {
return err