diff options
author | Sebastiaan van Stijn <github@gone.nl> | 2022-11-08 16:42:13 +0100 |
---|---|---|
committer | Sebastiaan van Stijn <github@gone.nl> | 2022-11-08 16:42:13 +0100 |
commit | 0f7c9cd27e37bab1a89f3b341ef7e88e09a3fb97 (patch) | |
tree | 87825511bacf363681aa42aac8061f1d6a9eb39a /layer | |
parent | 4f3c5b2568c28a4e0fd1b69ec6f2e0a0715d8cf5 (diff) | |
download | docker-0f7c9cd27e37bab1a89f3b341ef7e88e09a3fb97.tar.gz |
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 <github@gone.nl>
Diffstat (limited to 'layer')
-rw-r--r-- | layer/filestore.go | 4 | ||||
-rw-r--r-- | layer/layer_store.go | 2 | ||||
-rw-r--r-- | layer/layer_test.go | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/layer/filestore.go b/layer/filestore.go index ce3a309d8d..f2465b3b04 100644 --- a/layer/filestore.go +++ b/layer/filestore.go @@ -49,7 +49,7 @@ func newFSMetadataStore(root string) (*fileMetadataStore, error) { func (fms *fileMetadataStore) getLayerDirectory(layer ChainID) string { dgst := digest.Digest(layer) - return filepath.Join(fms.root, string(dgst.Algorithm()), dgst.Hex()) + return filepath.Join(fms.root, string(dgst.Algorithm()), dgst.Encoded()) } func (fms *fileMetadataStore) getLayerFilename(layer ChainID, filename string) string { @@ -364,7 +364,7 @@ func (fms *fileMetadataStore) List() ([]ChainID, []string, error) { for _, fi := range fileInfos { if fi.IsDir() && fi.Name() != "mounts" { - dgst := digest.NewDigestFromHex(string(algorithm), fi.Name()) + dgst := digest.NewDigestFromEncoded(algorithm, fi.Name()) if err := dgst.Validate(); err != nil { logrus.Debugf("Ignoring invalid digest %s:%s", algorithm, fi.Name()) } else { diff --git a/layer/layer_store.go b/layer/layer_store.go index 623d494012..342a885049 100644 --- a/layer/layer_store.go +++ b/layer/layer_store.go @@ -397,7 +397,7 @@ func (ls *layerStore) deleteLayer(layer *roLayer, metadata *Metadata) error { var dir string for { dgst := digest.Digest(layer.chainID) - tmpID := fmt.Sprintf("%s-%s-removing", dgst.Hex(), stringid.GenerateRandomID()) + tmpID := fmt.Sprintf("%s-%s-removing", dgst.Encoded(), stringid.GenerateRandomID()) dir = filepath.Join(ls.store.root, string(dgst.Algorithm()), tmpID) err := os.Rename(ls.store.getLayerDirectory(layer.chainID), dir) if os.IsExist(err) { diff --git a/layer/layer_test.go b/layer/layer_test.go index 6161e48751..8eeb90f8df 100644 --- a/layer/layer_test.go +++ b/layer/layer_test.go @@ -717,13 +717,13 @@ func TestTarStreamVerification(t *testing.T) { id2 := digest.Digest(layer2.ChainID()) // Replace tar data files - src, err := os.Open(filepath.Join(tmpdir, id1.Algorithm().String(), id1.Hex(), "tar-split.json.gz")) + src, err := os.Open(filepath.Join(tmpdir, id1.Algorithm().String(), id1.Encoded(), "tar-split.json.gz")) if err != nil { t.Fatal(err) } defer src.Close() - dst, err := os.Create(filepath.Join(tmpdir, id2.Algorithm().String(), id2.Hex(), "tar-split.json.gz")) + dst, err := os.Create(filepath.Join(tmpdir, id2.Algorithm().String(), id2.Encoded(), "tar-split.json.gz")) if err != nil { t.Fatal(err) } |