daniel
/
distribution
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1367 from aaronlehmann/signed-manifest-content-type 

Fix content type for schema1 signed manifests
master
Richard Scothern 2016-01-19 11:00:47 -08:00
parent 3cb403ae5b 8c1a000799
commit 47a064d419
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifest/schema1/manifest.go
View File

@ -39,11 +39,11 @@ func init() {
desc := distribution.Descriptor{ desc := distribution.Descriptor{
Digest: digest.FromBytes(sm.Canonical), Digest: digest.FromBytes(sm.Canonical),
Size: int64(len(sm.Canonical)), Size: int64(len(sm.Canonical)),
MediaType: MediaTypeManifest, MediaType: MediaTypeSignedManifest,
} }
return sm, desc, err return sm, desc, err
} }
err := distribution.RegisterManifestSchema(MediaTypeManifest, schema1Func) err := distribution.RegisterManifestSchema(MediaTypeSignedManifest, schema1Func)
if err != nil { if err != nil {
panic(fmt.Sprintf("Unable to register manifest: %s", err)) panic(fmt.Sprintf("Unable to register manifest: %s", err))
} }
@ -167,7 +167,7 @@ func (sm *SignedManifest) MarshalJSON() ([]byte, error) {
// Payload returns the signed content of the signed manifest. // Payload returns the signed content of the signed manifest.
func (sm SignedManifest) Payload() (string, []byte, error) { func (sm SignedManifest) Payload() (string, []byte, error) {
return MediaTypeManifest, sm.all, nil return MediaTypeSignedManifest, sm.all, nil
} }
// Signatures returns the signatures as provided by // Signatures returns the signatures as provided by

4
notifications/event_test.go
View File

@ -21,7 +21,7 @@ func TestEventEnvelopeJSONFormat(t *testing.T) {
"timestamp": "2006-01-02T15:04:05Z", "timestamp": "2006-01-02T15:04:05Z",
"action": "push", "action": "push",
"target": { "target": {
"mediaType": "application/vnd.docker.distribution.manifest.v1+json", "mediaType": "application/vnd.docker.distribution.manifest.v1+prettyjws",
"size": 1, "size": 1,
"digest": "sha256:0123456789abcdef0", "digest": "sha256:0123456789abcdef0",
"length": 1, "length": 1,
@ -120,7 +120,7 @@ func TestEventEnvelopeJSONFormat(t *testing.T) {
manifestPush.Target.Digest = "sha256:0123456789abcdef0" manifestPush.Target.Digest = "sha256:0123456789abcdef0"
manifestPush.Target.Length = 1 manifestPush.Target.Length = 1
manifestPush.Target.Size = 1 manifestPush.Target.Size = 1
manifestPush.Target.MediaType = schema1.MediaTypeManifest manifestPush.Target.MediaType = schema1.MediaTypeSignedManifest
manifestPush.Target.Repository = "library/test" manifestPush.Target.Repository = "library/test"
manifestPush.Target.URL = "http://example.com/v2/library/test/manifests/latest" manifestPush.Target.URL = "http://example.com/v2/library/test/manifests/latest"

4
notifications/http_test.go
View File

@ -75,12 +75,12 @@ func TestHTTPSink(t *testing.T) {
{ {
statusCode: http.StatusOK, statusCode: http.StatusOK,
events: []Event{ events: []Event{
createTestEvent("push", "library/test", schema1.MediaTypeManifest)}, createTestEvent("push", "library/test", schema1.MediaTypeSignedManifest)},
}, },
{ {
statusCode: http.StatusOK, statusCode: http.StatusOK,
events: []Event{ events: []Event{
createTestEvent("push", "library/test", schema1.MediaTypeManifest), createTestEvent("push", "library/test", schema1.MediaTypeSignedManifest),
createTestEvent("push", "library/test", layerMediaType), createTestEvent("push", "library/test", layerMediaType),
createTestEvent("push", "library/test", layerMediaType), createTestEvent("push", "library/test", layerMediaType),
}, },

8
registry/client/repository_test.go
View File

@ -592,7 +592,7 @@ func addTestManifestWithEtag(repo, reference string, content []byte, m *testutil
Headers: http.Header(map[string][]string{ Headers: http.Header(map[string][]string{
"Content-Length": {"0"}, "Content-Length": {"0"},
"Last-Modified": {time.Now().Add(-1 * time.Second).Format(time.ANSIC)}, "Last-Modified": {time.Now().Add(-1 * time.Second).Format(time.ANSIC)},
"Content-Type": {schema1.MediaTypeManifest}, "Content-Type": {schema1.MediaTypeSignedManifest},
}), }),
} }
} else { } else {
@ -602,7 +602,7 @@ func addTestManifestWithEtag(repo, reference string, content []byte, m *testutil
Headers: http.Header(map[string][]string{ Headers: http.Header(map[string][]string{
"Content-Length": {fmt.Sprint(len(content))}, "Content-Length": {fmt.Sprint(len(content))},
"Last-Modified": {time.Now().Add(-1 * time.Second).Format(time.ANSIC)}, "Last-Modified": {time.Now().Add(-1 * time.Second).Format(time.ANSIC)},
"Content-Type": {schema1.MediaTypeManifest}, "Content-Type": {schema1.MediaTypeSignedManifest},
}), }),
} }
@ -622,7 +622,7 @@ func addTestManifest(repo, reference string, content []byte, m *testutil.Request
Headers: http.Header(map[string][]string{ Headers: http.Header(map[string][]string{
"Content-Length": {fmt.Sprint(len(content))}, "Content-Length": {fmt.Sprint(len(content))},
"Last-Modified": {time.Now().Add(-1 * time.Second).Format(time.ANSIC)}, "Last-Modified": {time.Now().Add(-1 * time.Second).Format(time.ANSIC)},
"Content-Type": {schema1.MediaTypeManifest}, "Content-Type": {schema1.MediaTypeSignedManifest},
}), }),
}, },
}) })
@ -636,7 +636,7 @@ func addTestManifest(repo, reference string, content []byte, m *testutil.Request
Headers: http.Header(map[string][]string{ Headers: http.Header(map[string][]string{
"Content-Length": {fmt.Sprint(len(content))}, "Content-Length": {fmt.Sprint(len(content))},
"Last-Modified": {time.Now().Add(-1 * time.Second).Format(time.ANSIC)}, "Last-Modified": {time.Now().Add(-1 * time.Second).Format(time.ANSIC)},
"Content-Type": {schema1.MediaTypeManifest}, "Content-Type": {schema1.MediaTypeSignedManifest},
}), }),
}, },
}) })

4
registry/handlers/api_test.go
View File

@ -957,7 +957,7 @@ func testManifestAPISchema1(t *testing.T, env *testEnv, imageName string) manife
// Re-push with a few different Content-Types. The official schema1 // Re-push with a few different Content-Types. The official schema1
// content type should work, as should application/json with/without a // content type should work, as should application/json with/without a
// charset. // charset.
resp = putManifest(t, "re-putting signed manifest", manifestDigestURL, schema1.MediaTypeManifest, sm2) resp = putManifest(t, "re-putting signed manifest", manifestDigestURL, schema1.MediaTypeSignedManifest, sm2)
checkResponse(t, "re-putting signed manifest", resp, http.StatusCreated) checkResponse(t, "re-putting signed manifest", resp, http.StatusCreated)
resp = putManifest(t, "re-putting signed manifest", manifestDigestURL, "application/json; charset=utf-8", sm2) resp = putManifest(t, "re-putting signed manifest", manifestDigestURL, "application/json; charset=utf-8", sm2)
checkResponse(t, "re-putting signed manifest", resp, http.StatusCreated) checkResponse(t, "re-putting signed manifest", resp, http.StatusCreated)
@ -1486,7 +1486,7 @@ func testManifestAPIManifestList(t *testing.T, env *testEnv, args manifestArgs)
t.Fatalf("Error constructing request: %s", err) t.Fatalf("Error constructing request: %s", err)
} }
req.Header.Set("Accept", manifestlist.MediaTypeManifestList) req.Header.Set("Accept", manifestlist.MediaTypeManifestList)
req.Header.Add("Accept", schema1.MediaTypeManifest) req.Header.Add("Accept", schema1.MediaTypeSignedManifest)
req.Header.Add("Accept", schema2.MediaTypeManifest) req.Header.Add("Accept", schema2.MediaTypeManifest)
resp, err = http.DefaultClient.Do(req) resp, err = http.DefaultClient.Do(req)
if err != nil { if err != nil {