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

core/transfer/local: remove logrus import

Browse Source 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2024-06-17 12:37:14 +02:00
parent 75fd7a5a7f
commit ea8265fb1e
No known key found for this signature in database
GPG Key ID: 76698F39D527CE8C
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
core/transfer/local/pull.go
View File

@ -30,7 +30,6 @@ import (
"github.com/containerd/errdefs" "github.com/containerd/errdefs"
"github.com/containerd/log" "github.com/containerd/log"
ocispec "github.com/opencontainers/image-spec/specs-go/v1" ocispec "github.com/opencontainers/image-spec/specs-go/v1"
"github.com/sirupsen/logrus"
) )
func (ts *localTransferService) pull(ctx context.Context, ir transfer.ImageFetcher, is transfer.ImageStorer, tops *transfer.Config) error { func (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
// Verify image before pulling. // Verify image before pulling.
for vfName, vf := range ts.config.Verifiers { for vfName, vf := range ts.config.Verifiers {
log := log.G(ctx).WithFields(logrus.Fields{ logger := log.G(ctx).WithFields(log.Fields{
"name": name, "name": name,
"digest": desc.Digest.String(), "digest": desc.Digest.String(),
"verifier": vfName, "verifier": vfName,
}) })
log.Debug("Verifying image pull") logger.Debug("Verifying image pull")
jdg, err := vf.VerifyImage(ctx, name, desc) jdg, err := vf.VerifyImage(ctx, name, desc)
if err != nil { if err != nil {
log.WithError(err).Error("No judgement received from verifier") logger.WithError(err).Error("No judgement received from verifier")
return fmt.Errorf("blocking pull of %v with digest %v: image verifier %v returned error: %w", name, desc.Digest.String(), vfName, err) return fmt.Errorf("blocking pull of %v with digest %v: image verifier %v returned error: %w", name, desc.Digest.String(), vfName, err)
} }
log = log.WithFields(logrus.Fields{ logger = logger.WithFields(log.Fields{
"ok": jdg.OK, "ok": jdg.OK,
"reason": jdg.Reason, "reason": jdg.Reason,
}) })
if !jdg.OK { if !jdg.OK {
log.Warn("Image verifier blocked pull") logger.Warn("Image verifier blocked pull")
return fmt.Errorf("image verifier %s blocked pull of %v with digest %v for reason: %v", vfName, name, desc.Digest.String(), jdg.Reason) return fmt.Errorf("image verifier %s blocked pull of %v with digest %v for reason: %v", vfName, name, desc.Digest.String(), jdg.Reason)
} }
log.Debug("Image verifier allowed pull") logger.Debug("Image verifier allowed pull")
} }
// TODO: Handle already exists // TODO: Handle already exists
@ -89,7 +88,7 @@ func (ts *localTransferService) pull(ctx context.Context, ir transfer.ImageFetch
tops.Progress(transfer.Progress{ tops.Progress(transfer.Progress{
Event: "fetching image content", Event: "fetching image content",
Name: name, Name: name,
//Digest: img.Target.Digest.String(), // Digest: img.Target.Digest.String(),
}) })
} }
@ -114,7 +113,7 @@ func (ts *localTransferService) pull(ctx context.Context, ir transfer.ImageFetch
ctx, cancel := context.WithCancel(ctx) ctx, cancel := context.WithCancel(ctx)
if tops.Progress != nil { if tops.Progress != nil {
progressTracker = NewProgressTracker(name, "downloading") //Pass in first name as root progressTracker = NewProgressTracker(name, "downloading") // Pass in first name as root
go progressTracker.HandleProgress(ctx, tops.Progress, NewContentStatusTracker(store)) go progressTracker.HandleProgress(ctx, tops.Progress, NewContentStatusTracker(store))
defer progressTracker.Wait() defer progressTracker.Wait()
} }