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

Avoid returning nil, nil when fetching a manifest by tag by introducing a new

Browse source 
error ErrManifestNotModified which can be checked by clients.

Signed-off-by: Richard Scothern <richard.scothern@gmail.com>
This commit is contained in:
Richard Scothern 2015-09-18 11:00:44 -07:00
parent 5a8fabfee3
commit b8a1ec4155
3 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/client/repository.go
View file

@ -288,7 +288,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
docs/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
docs/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
} }