containers
/
storage
mirror of https://github.com/containers/storage.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve error handling a bit 

Include more details in the returned error text.

Don't continue in tests when we fail to obtain a TOC.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
This commit is contained in:
Miloslav Trmač 2024-04-23 22:55:36 +02:00
parent b5413c2bd6
commit 70b2454cde
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/chunked/compression_linux.go
View File

@ -201,7 +201,7 @@ func readZstdChunkedManifest(blobStream ImageSourceSeekable, tocDigest digest.Di
decodedBlob, err := decodeAndValidateBlob(manifest, manifestLengthUncompressed, tocDigest.String()) decodedBlob, err := decodeAndValidateBlob(manifest, manifestLengthUncompressed, tocDigest.String())
if err != nil { if err != nil {
return nil, nil, nil, 0, err return nil, nil, nil, 0, fmt.Errorf("validating and decompressing TOC: %w", err)
} }
toc, err := unmarshalToc(decodedBlob) toc, err := unmarshalToc(decodedBlob)
if err != nil { if err != nil {
@ -217,7 +217,7 @@ func readZstdChunkedManifest(blobStream ImageSourceSeekable, tocDigest digest.Di
decodedTarSplit, err = decodeAndValidateBlob(tarSplit, tarSplitLengthUncompressed, toc.TarSplitDigest.String()) decodedTarSplit, err = decodeAndValidateBlob(tarSplit, tarSplitLengthUncompressed, toc.TarSplitDigest.String())
if err != nil { if err != nil {
return nil, nil, nil, 0, err return nil, nil, nil, 0, fmt.Errorf("validating and decompressing tar-split: %w", err)
} }
} }
return decodedBlob, toc, decodedTarSplit, int64(manifestChunk.Offset), err return decodedBlob, toc, decodedTarSplit, int64(manifestChunk.Offset), err
@ -226,7 +226,7 @@ func readZstdChunkedManifest(blobStream ImageSourceSeekable, tocDigest digest.Di
func decodeAndValidateBlob(blob []byte, lengthUncompressed uint64, expectedCompressedChecksum string) ([]byte, error) { func decodeAndValidateBlob(blob []byte, lengthUncompressed uint64, expectedCompressedChecksum string) ([]byte, error) {
d, err := digest.Parse(expectedCompressedChecksum) d, err := digest.Parse(expectedCompressedChecksum)
if err != nil { if err != nil {
return nil, err return nil, fmt.Errorf("invalid digest %q: %w", expectedCompressedChecksum, err)
} }
blobDigester := d.Algorithm().Digester() blobDigester := d.Algorithm().Digester()

4
pkg/chunked/zstdchunked_test.go
View File

@ -155,9 +155,7 @@ func TestGenerateAndParseManifest(t *testing.T) {
require.NoError(t, err) require.NoError(t, err)
require.NotNil(t, tocDigest) require.NotNil(t, tocDigest)
manifest, decodedTOC, _, _, err := readZstdChunkedManifest(s, *tocDigest, annotations) manifest, decodedTOC, _, _, err := readZstdChunkedManifest(s, *tocDigest, annotations)
if err != nil { require.NoError(t, err)
t.Error(err)
}
var toc internal.TOC var toc internal.TOC
if err := json.Unmarshal(manifest, &toc); err != nil { if err := json.Unmarshal(manifest, &toc); err != nil {