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

Merge pull request #298 from nalind/bydigest2 

Fix checks for storage.Errors and tests for them
This commit is contained in:
Antonio Murdaca 2017-07-13 16:36:26 +02:00 committed by GitHub
parent fa92702d91 8b65a2b2fa
commit 98012c4cec
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
storage/storage_image.go
View File

@ -174,11 +174,11 @@ func (s *storageImageDestination) putBlob(stream io.Reader, blobinfo types.BlobI
}
// Attempt to create the identified layer and import its contents.
layer, uncompressedSize, err := s.imageRef.transport.store.PutLayer(id, parentLayer, nil, "", true, multi)
if err != nil && err != storage.ErrDuplicateID {
if err != nil && errors.Cause(err) != storage.ErrDuplicateID {
logrus.Debugf("error importing layer blob %q as %q: %v", blobinfo.Digest, id, err)
return errorBlobInfo, err
}
if err == storage.ErrDuplicateID {
if errors.Cause(err) == storage.ErrDuplicateID {
// We specified an ID, and there's already a layer with
// the same ID. Drain the input so that we can look at
// its length and digest.
@ -291,7 +291,7 @@ func (s *storageImageDestination) PutBlob(stream io.Reader, blobinfo types.BlobI
// it returns a non-nil error only on an unexpected failure.
func (s *storageImageDestination) HasBlob(blobinfo types.BlobInfo) (bool, int64, error) {
if blobinfo.Digest == "" {
return false, -1, errors.Errorf(`"Can not check for a blob with unknown digest`)
return false, -1, errors.Errorf(`Can not check for a blob with unknown digest`)
}
for _, blob := range s.BlobList {
if blob.Digest == blobinfo.Digest {
@ -331,7 +331,7 @@ func (s *storageImageDestination) Commit() error {
}
img, err := s.imageRef.transport.store.CreateImage(s.ID, nil, lastLayer, "", nil)
if err != nil {
if err != storage.ErrDuplicateID {
if errors.Cause(err) != storage.ErrDuplicateID {
logrus.Debugf("error creating image: %q", err)
return errors.Wrapf(err, "error creating image %q", s.ID)
}
@ -340,8 +340,8 @@ func (s *storageImageDestination) Commit() error {
return errors.Wrapf(err, "error reading image %q", s.ID)
}
if img.TopLayer != lastLayer {
logrus.Debugf("error creating image: image with ID %q exists, but uses different layers", err)
return errors.Wrapf(err, "image with ID %q already exists, but uses a different top layer", s.ID)
logrus.Debugf("error creating image: image with ID %q exists, but uses different layers", s.ID)
return errors.Wrapf(storage.ErrDuplicateID, "image with ID %q already exists, but uses a different top layer", s.ID)
}
logrus.Debugf("reusing image ID %q", img.ID)
} else {

12
storage/storage_test.go
View File

@ -23,6 +23,7 @@ import (
"github.com/containers/storage/pkg/ioutils"
"github.com/containers/storage/pkg/reexec"
ddigest "github.com/opencontainers/go-digest"
"github.com/pkg/errors"
)
var (
@ -498,6 +499,7 @@ func TestDuplicateName(t *testing.T) {
if dest == nil {
t.Fatalf("NewImageDestination(%q, second pass) returned no destination", ref.StringWithinTransport())
}
digest, _, size, blob = makeLayer(t, archive.Gzip)
if _, err := dest.PutBlob(bytes.NewBuffer(blob), types.BlobInfo{
Size: int64(size),
Digest: digest,
@ -551,17 +553,18 @@ func TestDuplicateID(t *testing.T) {
if dest == nil {
t.Fatalf("NewImageDestination(%q, second pass) returned no destination", ref.StringWithinTransport())
}
digest, _, size, blob = makeLayer(t, archive.Gzip)
if _, err := dest.PutBlob(bytes.NewBuffer(blob), types.BlobInfo{
Size: int64(size),
Digest: digest,
}); err != nil {
t.Fatalf("Error saving randomly-generated layer to destination, second pass: %v", err)
}
if err := dest.Commit(); err != storage.ErrDuplicateID {
if err := dest.Commit(); errors.Cause(err) != storage.ErrDuplicateID {
if err != nil {
t.Fatalf("Wrong error committing changes to destination, second pass: %v", err)
}
t.Fatalf("Incorrectly succeeded committing changes to destination, second pass: %v", err)
t.Fatal("Incorrectly succeeded committing changes to destination, second pass: no error")
}
dest.Close()
}
@ -607,17 +610,18 @@ func TestDuplicateNameID(t *testing.T) {
if dest == nil {
t.Fatalf("NewImageDestination(%q, second pass) returned no destination", ref.StringWithinTransport())
}
digest, _, size, blob = makeLayer(t, archive.Gzip)
if _, err := dest.PutBlob(bytes.NewBuffer(blob), types.BlobInfo{
Size: int64(size),
Digest: digest,
}); err != nil {
t.Fatalf("Error saving randomly-generated layer to destination, second pass: %v", err)
}
if err := dest.Commit(); err != storage.ErrDuplicateID {
if err := dest.Commit(); errors.Cause(err) != storage.ErrDuplicateID {
if err != nil {
t.Fatalf("Wrong error committing changes to destination, second pass: %v", err)
}
t.Fatalf("Incorrectly succeeded committing changes to destination, second pass: %v", err)
t.Fatal("Incorrectly succeeded committing changes to destination, second pass: no error")
}
dest.Close()
}