vbatts/registry
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1001 from RichardScothern/fix-atrocity

Browse source 
Don't return nil, nil from functions
This commit is contained in:
Aaron Lehmann 2015-09-28 13:34:11 -07:00
commit 14a4b4d9d6
4 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
errors.go
View file

@ -1,15 +1,20 @@
package distribution package distribution
import ( import (
"errors"
"fmt" "fmt"
"strings" "strings"
"github.com/docker/distribution/digest" "github.com/docker/distribution/digest"
) )
// ErrManifestNotModified is returned when a conditional manifest GetByTag
// returns nil due to the client indicating it has the latest version
var ErrManifestNotModified = errors.New("manifest not modified")
// ErrUnsupported is returned when an unimplemented or unsupported action is // ErrUnsupported is returned when an unimplemented or unsupported action is
// performed // performed
var ErrUnsupported = fmt.Errorf("operation unsupported") var ErrUnsupported = errors.New("operation unsupported")
// ErrRepositoryUnknown is returned if the named repository is not known by // ErrRepositoryUnknown is returned if the named repository is not known by
// the registry. // the registry.

4
registry/client/repository.go
View file

@ -211,8 +211,6 @@ func (ms *manifests) Tags() ([]string, error) {
} }
return tagsResponse.Tags, nil return tagsResponse.Tags, nil
} else if resp.StatusCode == http.StatusNotFound {
return nil, nil
} }
return nil, handleErrorResponse(resp) return nil, handleErrorResponse(resp)
} }
@ -288,7 +286,7 @@ func (ms *manifests) GetByTag(tag string, options ...distribution.ManifestServic
} }
defer resp.Body.Close() defer resp.Body.Close()
if resp.StatusCode == http.StatusNotModified { if resp.StatusCode == http.StatusNotModified {
return nil, nil return nil, distribution.ErrManifestNotModified
} else if SuccessStatus(resp.StatusCode) { } else if SuccessStatus(resp.StatusCode) {
var sm schema1.SignedManifest var sm schema1.SignedManifest
decoder := json.NewDecoder(resp.Body) decoder := json.NewDecoder(resp.Body)

7
registry/client/repository_test.go
View file

@ -603,13 +603,10 @@ func TestManifestFetchWithEtag(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
m2, err := ms.GetByTag("latest", AddEtagToTag("latest", d1.String())) _, err = ms.GetByTag("latest", AddEtagToTag("latest", d1.String()))
if err != nil { if err != distribution.ErrManifestNotModified {
t.Fatal(err) t.Fatal(err)
} }
if m2 != nil {
t.Fatal("Expected empty manifest for matching etag")
}
} }
func TestManifestDelete(t *testing.T) { func TestManifestDelete(t *testing.T) {

4
registry/proxy/proxymanifeststore.go
View file

@ -102,11 +102,11 @@ func (pms proxyManifestStore) GetByTag(tag string, options ...distribution.Manif
fromremote: fromremote:
var sm *schema1.SignedManifest var sm *schema1.SignedManifest
sm, err = pms.remoteManifests.GetByTag(tag, client.AddEtagToTag(tag, localDigest.String())) sm, err = pms.remoteManifests.GetByTag(tag, client.AddEtagToTag(tag, localDigest.String()))
if err != nil { if err != nil && err != distribution.ErrManifestNotModified {
return nil, err return nil, err
} }
if sm == nil { if err == distribution.ErrManifestNotModified {
context.GetLogger(pms.ctx).Debugf("Local manifest for %q is latest, dgst=%s", tag, localDigest.String()) context.GetLogger(pms.ctx).Debugf("Local manifest for %q is latest, dgst=%s", tag, localDigest.String())
return localManifest, nil return localManifest, nil
} }