From bf72536440f960a43838f26b0f18914898939159 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Tue, 8 Nov 2022 13:51:11 +0100 Subject: [PATCH] Remove uses of deprecated go-digest.NewDigestFromHex, go-digest.Digest.Hex Both of these were deprecated in https://github.com/opencontainers/go-digest/commit/55f675811a1b915549933c64571fd86b2676ba76, but the format of the GoDoc comments didn't follow the correct format, which caused them not being picked up by tools as "deprecated". This patch updates uses in the codebase to use the alternatives. Signed-off-by: Sebastiaan van Stijn --- manifest/schema1/config_builder.go | 14 +++++++------- registry/storage/linkedblobstore_test.go | 2 +- registry/storage/paths.go | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/manifest/schema1/config_builder.go b/manifest/schema1/config_builder.go index 8d7221ed..fac177b8 100644 --- a/manifest/schema1/config_builder.go +++ b/manifest/schema1/config_builder.go @@ -132,7 +132,7 @@ func (mb *configManifestBuilder) Build(ctx context.Context) (m distribution.Mani layerCounter++ } - v1ID := digest.FromBytes([]byte(blobsum.Hex() + " " + parent)).Hex() + v1ID := digest.FromBytes([]byte(blobsum.Encoded() + " " + parent)).Encoded() if i == 0 && img.RootFS.BaseLayer != "" { // windows-only baselayer setup @@ -140,18 +140,18 @@ func (mb *configManifestBuilder) Build(ctx context.Context) (m distribution.Mani parent = fmt.Sprintf("%x", baseID[:32]) } - v1Compatibility := v1Compatibility{ + v1Compat := v1Compatibility{ ID: v1ID, Parent: parent, Comment: h.Comment, Created: h.Created, Author: h.Author, } - v1Compatibility.ContainerConfig.Cmd = []string{img.History[i].CreatedBy} + v1Compat.ContainerConfig.Cmd = []string{img.History[i].CreatedBy} if h.EmptyLayer { - v1Compatibility.ThrowAway = true + v1Compat.ThrowAway = true } - jsonBytes, err := json.Marshal(&v1Compatibility) + jsonBytes, err := json.Marshal(&v1Compat) if err != nil { return nil, err } @@ -178,11 +178,11 @@ func (mb *configManifestBuilder) Build(ctx context.Context) (m distribution.Mani } fsLayerList[0] = FSLayer{BlobSum: blobsum} - dgst := digest.FromBytes([]byte(blobsum.Hex() + " " + parent + " " + string(mb.configJSON))) + dgst := digest.FromBytes([]byte(blobsum.Encoded() + " " + parent + " " + string(mb.configJSON))) // Top-level v1compatibility string should be a modified version of the // image config. - transformedConfig, err := MakeV1ConfigFromConfig(mb.configJSON, dgst.Hex(), parent, latestHistory.EmptyLayer) + transformedConfig, err := MakeV1ConfigFromConfig(mb.configJSON, dgst.Encoded(), parent, latestHistory.EmptyLayer) if err != nil { return nil, err } diff --git a/registry/storage/linkedblobstore_test.go b/registry/storage/linkedblobstore_test.go index b08d4dce..57bb8eb7 100644 --- a/registry/storage/linkedblobstore_test.go +++ b/registry/storage/linkedblobstore_test.go @@ -150,7 +150,7 @@ func TestLinkedBlobStoreCreateWithMountFrom(t *testing.T) { // cross-repo mount them into a nm/baz and provide a prepopulated blob descriptor for dgst := range testLayers { fooCanonical, _ := reference.WithDigest(fooRepoName, dgst) - size, err := strconv.ParseInt("0x"+dgst.Hex()[:8], 0, 64) + size, err := strconv.ParseInt("0x"+dgst.Encoded()[:8], 0, 64) if err != nil { t.Fatal(err) } diff --git a/registry/storage/paths.go b/registry/storage/paths.go index f739616e..dab39424 100644 --- a/registry/storage/paths.go +++ b/registry/storage/paths.go @@ -451,7 +451,7 @@ func digestPathComponents(dgst digest.Digest, multilevel bool) ([]string, error) } algorithm := blobAlgorithmReplacer.Replace(string(dgst.Algorithm())) - hex := dgst.Hex() + hex := dgst.Encoded() prefix := []string{algorithm} var suffix []string @@ -480,6 +480,6 @@ func digestFromPath(digestPath string) (digest.Digest, error) { algo = next } - dgst := digest.NewDigestFromHex(algo, hex) + dgst := digest.NewDigestFromEncoded(digest.Algorithm(algo), hex) return dgst, dgst.Validate() }