Merge pull request #2603 from mtrmac/untrusted-digest-flag

giuseppe · web-flow · commit 94563a7fc975 · 2024-10-24T22:28:37.000+02:00
Consistently use a string type for expectedLayerDiffIDFlag
diff --git a/storage/storage_dest.go b/storage/storage_dest.go
@@ -930,7 +930,7 @@ func (s *storageImageDestination) createNewLayer(index int, layerDigest digest.D
 
 		flags := make(map[string]interface{})
 		if untrustedUncompressedDigest != "" {
-			flags[expectedLayerDiffIDFlag] = untrustedUncompressedDigest
+			flags[expectedLayerDiffIDFlag] = untrustedUncompressedDigest.String()
 			logrus.Debugf("Setting uncompressed digest to %q for layer %q", untrustedUncompressedDigest, newLayerID)
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -930,7 +930,7 @@ func (s *storageImageDestination) createNewLayer(index int, layerDigest digest.D`
`930`	`930`
`931`	`931`	`flags := make(map[string]interface{})`
`932`	`932`	`if untrustedUncompressedDigest != "" {`
`933`		`- flags[expectedLayerDiffIDFlag] = untrustedUncompressedDigest`
	`933`	`+ flags[expectedLayerDiffIDFlag] = untrustedUncompressedDigest.String()`
`934`	`934`	`logrus.Debugf("Setting uncompressed digest to %q for layer %q", untrustedUncompressedDigest, newLayerID)`
`935`	`935`	`}`
`936`	`936`