@@ -30,7 +30,6 @@ import (
3030 "github.com/containerd/errdefs"
3131 "github.com/containerd/log"
3232 ocispec "github.com/opencontainers/image-spec/specs-go/v1"
33- "github.com/sirupsen/logrus"
3433)
3534
3635func (ts * localTransferService ) pull (ctx context.Context , ir transfer.ImageFetcher , is transfer.ImageStorer , tops * transfer.Config ) error {
@@ -57,28 +56,28 @@ func (ts *localTransferService) pull(ctx context.Context, ir transfer.ImageFetch
5756
5857 // Verify image before pulling.
5958 for vfName , vf := range ts .config .Verifiers {
60- log := log .G (ctx ).WithFields (logrus .Fields {
59+ logger := log .G (ctx ).WithFields (log .Fields {
6160 "name" : name ,
6261 "digest" : desc .Digest .String (),
6362 "verifier" : vfName ,
6463 })
65- log .Debug ("Verifying image pull" )
64+ logger .Debug ("Verifying image pull" )
6665
6766 jdg , err := vf .VerifyImage (ctx , name , desc )
6867 if err != nil {
69- log .WithError (err ).Error ("No judgement received from verifier" )
68+ logger .WithError (err ).Error ("No judgement received from verifier" )
7069 return fmt .Errorf ("blocking pull of %v with digest %v: image verifier %v returned error: %w" , name , desc .Digest .String (), vfName , err )
7170 }
72- log = log .WithFields (logrus .Fields {
71+ logger = logger .WithFields (log .Fields {
7372 "ok" : jdg .OK ,
7473 "reason" : jdg .Reason ,
7574 })
7675
7776 if ! jdg .OK {
78- log .Warn ("Image verifier blocked pull" )
77+ logger .Warn ("Image verifier blocked pull" )
7978 return fmt .Errorf ("image verifier %s blocked pull of %v with digest %v for reason: %v" , vfName , name , desc .Digest .String (), jdg .Reason )
8079 }
81- log .Debug ("Image verifier allowed pull" )
80+ logger .Debug ("Image verifier allowed pull" )
8281 }
8382
8483 // TODO: Handle already exists
@@ -89,7 +88,7 @@ func (ts *localTransferService) pull(ctx context.Context, ir transfer.ImageFetch
8988 tops .Progress (transfer.Progress {
9089 Event : "fetching image content" ,
9190 Name : name ,
92- //Digest: img.Target.Digest.String(),
91+ // Digest: img.Target.Digest.String(),
9392 })
9493 }
9594
@@ -114,7 +113,7 @@ func (ts *localTransferService) pull(ctx context.Context, ir transfer.ImageFetch
114113
115114 ctx , cancel := context .WithCancel (ctx )
116115 if tops .Progress != nil {
117- progressTracker = NewProgressTracker (name , "downloading" ) //Pass in first name as root
116+ progressTracker = NewProgressTracker (name , "downloading" ) // Pass in first name as root
118117 go progressTracker .HandleProgress (ctx , tops .Progress , NewContentStatusTracker (store ))
119118 defer progressTracker .Wait ()
120119 }
0 commit comments