daniel
/
distribution
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3781 from thaJeztah/fix_usage_of_deprecated_funcs 

Remove uses of deprecated go-digest.NewDigestFromHex, go-digest.Digest.Hex
master
Wang Yan 2022-11-09 11:03:33 +08:00 committed by GitHub
parent 9bb63e6e46 bf72536440
commit 0071e46eee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
manifest/schema1/config_builder.go
View File

@ -132,7 +132,7 @@ func (mb *configManifestBuilder) Build(ctx context.Context) (m distribution.Mani
layerCounter++ layerCounter++
} }
v1ID := digest.FromBytes([]byte(blobsum.Hex() + " " + parent)).Hex() v1ID := digest.FromBytes([]byte(blobsum.Encoded() + " " + parent)).Encoded()
if i == 0 && img.RootFS.BaseLayer != "" { if i == 0 && img.RootFS.BaseLayer != "" {
// windows-only baselayer setup // windows-only baselayer setup
@ -140,18 +140,18 @@ func (mb *configManifestBuilder) Build(ctx context.Context) (m distribution.Mani
parent = fmt.Sprintf("%x", baseID[:32]) parent = fmt.Sprintf("%x", baseID[:32])
} }
v1Compatibility := v1Compatibility{ v1Compat := v1Compatibility{
ID: v1ID, ID: v1ID,
Parent: parent, Parent: parent,
Comment: h.Comment, Comment: h.Comment,
Created: h.Created, Created: h.Created,
Author: h.Author, Author: h.Author,
} }
v1Compatibility.ContainerConfig.Cmd = []string{img.History[i].CreatedBy} v1Compat.ContainerConfig.Cmd = []string{img.History[i].CreatedBy}
if h.EmptyLayer { if h.EmptyLayer {
v1Compatibility.ThrowAway = true v1Compat.ThrowAway = true
} }
jsonBytes, err := json.Marshal(&v1Compatibility) jsonBytes, err := json.Marshal(&v1Compat)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -178,11 +178,11 @@ func (mb *configManifestBuilder) Build(ctx context.Context) (m distribution.Mani
} }
fsLayerList[0] = FSLayer{BlobSum: blobsum} 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 // Top-level v1compatibility string should be a modified version of the
// image config. // 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 { if err != nil {
return nil, err return nil, err
} }

2
registry/storage/linkedblobstore_test.go
View File

@ -150,7 +150,7 @@ func TestLinkedBlobStoreCreateWithMountFrom(t *testing.T) {
// cross-repo mount them into a nm/baz and provide a prepopulated blob descriptor // cross-repo mount them into a nm/baz and provide a prepopulated blob descriptor
for dgst := range testLayers { for dgst := range testLayers {
fooCanonical, _ := reference.WithDigest(fooRepoName, dgst) 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 { if err != nil {
t.Fatal(err) t.Fatal(err)
} }

4
registry/storage/paths.go
View File

@ -451,7 +451,7 @@ func digestPathComponents(dgst digest.Digest, multilevel bool) ([]string, error)
} }
algorithm := blobAlgorithmReplacer.Replace(string(dgst.Algorithm())) algorithm := blobAlgorithmReplacer.Replace(string(dgst.Algorithm()))
hex := dgst.Hex() hex := dgst.Encoded()
prefix := []string{algorithm} prefix := []string{algorithm}
var suffix []string var suffix []string
@ -480,6 +480,6 @@ func digestFromPath(digestPath string) (digest.Digest, error) {
algo = next algo = next
} }
dgst := digest.NewDigestFromHex(algo, hex) dgst := digest.NewDigestFromEncoded(digest.Algorithm(algo), hex)
return dgst, dgst.Validate() return dgst, dgst.Validate()
} }