From 766e7953ab29fdbd62154e2d495c14c80b8ca9f7 Mon Sep 17 00:00:00 2001
From: Shiming Zhang <wzshiming@foxmail.com>
Date: Mon, 15 Mar 2021 16:44:11 +0800
Subject: [PATCH] Change dgst to digest in debug

Signed-off-by: Shiming Zhang <wzshiming@foxmail.com>
---
 cmd/ctr/commands/content/prune.go | 5 ++++-
 diff/apply/apply.go               | 8 ++++----
 diff/lcow/lcow.go                 | 8 ++++----
 diff/windows/windows.go           | 8 ++++----
 4 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/cmd/ctr/commands/content/prune.go b/cmd/ctr/commands/content/prune.go
index 1297732a4..3f86a2063 100644
--- a/cmd/ctr/commands/content/prune.go
+++ b/cmd/ctr/commands/content/prune.go
@@ -81,7 +81,10 @@ var pruneReferencesCommand = cli.Command{
 
 			for k := range info.Labels {
 				if isLayerLabel(k) {
-					log.G(ctx).WithField("dgst", info.Digest).WithField("label", k).Debug("Removing label")
+					log.G(ctx).WithFields(logrus.Fields{
+						"digest": info.Digest,
+						"label":  k,
+					}).Debug("Removing label")
 					if dryRun {
 						continue
 					}
diff --git a/diff/apply/apply.go b/diff/apply/apply.go
index ce89daaf2..1d0a95e6c 100644
--- a/diff/apply/apply.go
+++ b/diff/apply/apply.go
@@ -54,10 +54,10 @@ func (s *fsApplier) Apply(ctx context.Context, desc ocispec.Descriptor, mounts [
 	defer func() {
 		if err == nil {
 			log.G(ctx).WithFields(logrus.Fields{
-				"d":     time.Since(t1),
-				"dgst":  desc.Digest,
-				"size":  desc.Size,
-				"media": desc.MediaType,
+				"d":      time.Since(t1),
+				"digest": desc.Digest,
+				"size":   desc.Size,
+				"media":  desc.MediaType,
 			}).Debugf("diff applied")
 		}
 	}()
diff --git a/diff/lcow/lcow.go b/diff/lcow/lcow.go
index 95739cf0f..3a3ead414 100644
--- a/diff/lcow/lcow.go
+++ b/diff/lcow/lcow.go
@@ -100,10 +100,10 @@ func (s windowsLcowDiff) Apply(ctx context.Context, desc ocispec.Descriptor, mou
 	defer func() {
 		if err == nil {
 			log.G(ctx).WithFields(logrus.Fields{
-				"d":     time.Since(t1),
-				"dgst":  desc.Digest,
-				"size":  desc.Size,
-				"media": desc.MediaType,
+				"d":      time.Since(t1),
+				"digest": desc.Digest,
+				"size":   desc.Size,
+				"media":  desc.MediaType,
 			}).Debugf("diff applied")
 		}
 	}()
diff --git a/diff/windows/windows.go b/diff/windows/windows.go
index 3de358683..16ecb5bff 100644
--- a/diff/windows/windows.go
+++ b/diff/windows/windows.go
@@ -90,10 +90,10 @@ func (s windowsDiff) Apply(ctx context.Context, desc ocispec.Descriptor, mounts
 	defer func() {
 		if err == nil {
 			log.G(ctx).WithFields(logrus.Fields{
-				"d":     time.Since(t1),
-				"dgst":  desc.Digest,
-				"size":  desc.Size,
-				"media": desc.MediaType,
+				"d":      time.Since(t1),
+				"digest": desc.Digest,
+				"size":   desc.Size,
+				"media":  desc.MediaType,
 			}).Debugf("diff applied")
 		}
 	}()