7b56d10076
This commit locks down the set of http error codes that will be part of the inital V2 specification, proposed in docker/docker#9015. The naming order has been slightly changed and there are few tweaks to ensure all conditions are captured but this will be set the docker core will be impleemnted against. To support this, the errors have been moved into an api/errors package. A new type, ErrorDescriptor, has been defined to centralize the code, message and definitions used with each type. The information therein can be used to generate documentation and response code mappings (yet to come...). In addition to the refactoring that came along with this change, several tests have been added to ensure serialization round trips are reliable. This allows better support for using these error types on the client and server side. This is coupled with some tweaks in the client code to fix issues with error reporting. Other fixes in the client include moving client-specific errors out of the base package and ensuring that we have correct parameters for finishing uploads.
402 lines
9.6 KiB
Go
402 lines
9.6 KiB
Go
package client
|
|
|
|
import (
|
|
"encoding/json"
|
|
"fmt"
|
|
"io/ioutil"
|
|
"net/http"
|
|
"net/http/httptest"
|
|
"sync"
|
|
"testing"
|
|
|
|
"github.com/docker/docker-registry/common/testutil"
|
|
"github.com/docker/docker-registry/digest"
|
|
"github.com/docker/docker-registry/storage"
|
|
)
|
|
|
|
type testBlob struct {
|
|
digest digest.Digest
|
|
contents []byte
|
|
}
|
|
|
|
func TestPush(t *testing.T) {
|
|
name := "hello/world"
|
|
tag := "sometag"
|
|
testBlobs := []testBlob{
|
|
{
|
|
digest: "12345",
|
|
contents: []byte("some contents"),
|
|
},
|
|
{
|
|
digest: "98765",
|
|
contents: []byte("some other contents"),
|
|
},
|
|
}
|
|
uploadLocations := make([]string, len(testBlobs))
|
|
blobs := make([]storage.FSLayer, len(testBlobs))
|
|
history := make([]storage.ManifestHistory, len(testBlobs))
|
|
|
|
for i, blob := range testBlobs {
|
|
// TODO(bbland): this is returning the same location for all uploads,
|
|
// because we can't know which blob will get which location.
|
|
// It's sort of okay because we're using unique digests, but this needs
|
|
// to change at some point.
|
|
uploadLocations[i] = fmt.Sprintf("/v2/%s/blob/test-uuid", name)
|
|
blobs[i] = storage.FSLayer{BlobSum: blob.digest}
|
|
history[i] = storage.ManifestHistory{V1Compatibility: blob.digest.String()}
|
|
}
|
|
|
|
manifest := &storage.SignedManifest{
|
|
Manifest: storage.Manifest{
|
|
Name: name,
|
|
Tag: tag,
|
|
Architecture: "x86",
|
|
FSLayers: blobs,
|
|
History: history,
|
|
Versioned: storage.Versioned{
|
|
SchemaVersion: 1,
|
|
},
|
|
},
|
|
}
|
|
var err error
|
|
manifest.Raw, err = json.Marshal(manifest)
|
|
|
|
blobRequestResponseMappings := make([]testutil.RequestResponseMapping, 2*len(testBlobs))
|
|
for i, blob := range testBlobs {
|
|
blobRequestResponseMappings[2*i] = testutil.RequestResponseMapping{
|
|
Request: testutil.Request{
|
|
Method: "POST",
|
|
Route: "/v2/" + name + "/blob/upload/",
|
|
},
|
|
Response: testutil.Response{
|
|
StatusCode: http.StatusAccepted,
|
|
Headers: http.Header(map[string][]string{
|
|
"Location": {uploadLocations[i]},
|
|
}),
|
|
},
|
|
}
|
|
blobRequestResponseMappings[2*i+1] = testutil.RequestResponseMapping{
|
|
Request: testutil.Request{
|
|
Method: "PUT",
|
|
Route: uploadLocations[i],
|
|
QueryParams: map[string][]string{
|
|
"length": {fmt.Sprint(len(blob.contents))},
|
|
"digest": {blob.digest.String()},
|
|
},
|
|
Body: blob.contents,
|
|
},
|
|
Response: testutil.Response{
|
|
StatusCode: http.StatusCreated,
|
|
},
|
|
}
|
|
}
|
|
|
|
handler := testutil.NewHandler(append(blobRequestResponseMappings, testutil.RequestResponseMapping{
|
|
Request: testutil.Request{
|
|
Method: "PUT",
|
|
Route: "/v2/" + name + "/manifest/" + tag,
|
|
Body: manifest.Raw,
|
|
},
|
|
Response: testutil.Response{
|
|
StatusCode: http.StatusOK,
|
|
},
|
|
}))
|
|
var server *httptest.Server
|
|
|
|
// HACK(stevvooe): Super hack to follow: the request response map approach
|
|
// above does not let us correctly format the location header to the
|
|
// server url. This handler intercepts and re-writes the location header
|
|
// to the server url.
|
|
|
|
hack := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
|
w = &headerInterceptingResponseWriter{ResponseWriter: w, serverURL: server.URL}
|
|
handler.ServeHTTP(w, r)
|
|
})
|
|
|
|
server = httptest.NewServer(hack)
|
|
client := New(server.URL)
|
|
objectStore := &memoryObjectStore{
|
|
mutex: new(sync.Mutex),
|
|
manifestStorage: make(map[string]*storage.SignedManifest),
|
|
layerStorage: make(map[digest.Digest]Layer),
|
|
}
|
|
|
|
for _, blob := range testBlobs {
|
|
l, err := objectStore.Layer(blob.digest)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
writer, err := l.Writer()
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
writer.SetSize(len(blob.contents))
|
|
writer.Write(blob.contents)
|
|
writer.Close()
|
|
}
|
|
|
|
objectStore.WriteManifest(name, tag, manifest)
|
|
|
|
err = Push(client, objectStore, name, tag)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
}
|
|
|
|
func TestPull(t *testing.T) {
|
|
name := "hello/world"
|
|
tag := "sometag"
|
|
testBlobs := []testBlob{
|
|
{
|
|
digest: "12345",
|
|
contents: []byte("some contents"),
|
|
},
|
|
{
|
|
digest: "98765",
|
|
contents: []byte("some other contents"),
|
|
},
|
|
}
|
|
blobs := make([]storage.FSLayer, len(testBlobs))
|
|
history := make([]storage.ManifestHistory, len(testBlobs))
|
|
|
|
for i, blob := range testBlobs {
|
|
blobs[i] = storage.FSLayer{BlobSum: blob.digest}
|
|
history[i] = storage.ManifestHistory{V1Compatibility: blob.digest.String()}
|
|
}
|
|
|
|
manifest := &storage.SignedManifest{
|
|
Manifest: storage.Manifest{
|
|
Name: name,
|
|
Tag: tag,
|
|
Architecture: "x86",
|
|
FSLayers: blobs,
|
|
History: history,
|
|
Versioned: storage.Versioned{
|
|
SchemaVersion: 1,
|
|
},
|
|
},
|
|
}
|
|
manifestBytes, err := json.Marshal(manifest)
|
|
|
|
blobRequestResponseMappings := make([]testutil.RequestResponseMapping, len(testBlobs))
|
|
for i, blob := range testBlobs {
|
|
blobRequestResponseMappings[i] = testutil.RequestResponseMapping{
|
|
Request: testutil.Request{
|
|
Method: "GET",
|
|
Route: "/v2/" + name + "/blob/" + blob.digest.String(),
|
|
},
|
|
Response: testutil.Response{
|
|
StatusCode: http.StatusOK,
|
|
Body: blob.contents,
|
|
},
|
|
}
|
|
}
|
|
|
|
handler := testutil.NewHandler(append(blobRequestResponseMappings, testutil.RequestResponseMapping{
|
|
Request: testutil.Request{
|
|
Method: "GET",
|
|
Route: "/v2/" + name + "/manifest/" + tag,
|
|
},
|
|
Response: testutil.Response{
|
|
StatusCode: http.StatusOK,
|
|
Body: manifestBytes,
|
|
},
|
|
}))
|
|
server := httptest.NewServer(handler)
|
|
client := New(server.URL)
|
|
objectStore := &memoryObjectStore{
|
|
mutex: new(sync.Mutex),
|
|
manifestStorage: make(map[string]*storage.SignedManifest),
|
|
layerStorage: make(map[digest.Digest]Layer),
|
|
}
|
|
|
|
err = Pull(client, objectStore, name, tag)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
m, err := objectStore.Manifest(name, tag)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
mBytes, err := json.Marshal(m)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
if string(mBytes) != string(manifestBytes) {
|
|
t.Fatal("Incorrect manifest")
|
|
}
|
|
|
|
for _, blob := range testBlobs {
|
|
l, err := objectStore.Layer(blob.digest)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
reader, err := l.Reader()
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
defer reader.Close()
|
|
|
|
blobBytes, err := ioutil.ReadAll(reader)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
if string(blobBytes) != string(blob.contents) {
|
|
t.Fatal("Incorrect blob")
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestPullResume(t *testing.T) {
|
|
name := "hello/world"
|
|
tag := "sometag"
|
|
testBlobs := []testBlob{
|
|
{
|
|
digest: "12345",
|
|
contents: []byte("some contents"),
|
|
},
|
|
{
|
|
digest: "98765",
|
|
contents: []byte("some other contents"),
|
|
},
|
|
}
|
|
layers := make([]storage.FSLayer, len(testBlobs))
|
|
history := make([]storage.ManifestHistory, len(testBlobs))
|
|
|
|
for i, layer := range testBlobs {
|
|
layers[i] = storage.FSLayer{BlobSum: layer.digest}
|
|
history[i] = storage.ManifestHistory{V1Compatibility: layer.digest.String()}
|
|
}
|
|
|
|
manifest := &storage.Manifest{
|
|
Name: name,
|
|
Tag: tag,
|
|
Architecture: "x86",
|
|
FSLayers: layers,
|
|
History: history,
|
|
Versioned: storage.Versioned{
|
|
SchemaVersion: 1,
|
|
},
|
|
}
|
|
manifestBytes, err := json.Marshal(manifest)
|
|
|
|
layerRequestResponseMappings := make([]testutil.RequestResponseMapping, 2*len(testBlobs))
|
|
for i, blob := range testBlobs {
|
|
layerRequestResponseMappings[2*i] = testutil.RequestResponseMapping{
|
|
Request: testutil.Request{
|
|
Method: "GET",
|
|
Route: "/v2/" + name + "/blob/" + blob.digest.String(),
|
|
},
|
|
Response: testutil.Response{
|
|
StatusCode: http.StatusOK,
|
|
Body: blob.contents[:len(blob.contents)/2],
|
|
Headers: http.Header(map[string][]string{
|
|
"Content-Length": {fmt.Sprint(len(blob.contents))},
|
|
}),
|
|
},
|
|
}
|
|
layerRequestResponseMappings[2*i+1] = testutil.RequestResponseMapping{
|
|
Request: testutil.Request{
|
|
Method: "GET",
|
|
Route: "/v2/" + name + "/blob/" + blob.digest.String(),
|
|
},
|
|
Response: testutil.Response{
|
|
StatusCode: http.StatusOK,
|
|
Body: blob.contents[len(blob.contents)/2:],
|
|
},
|
|
}
|
|
}
|
|
|
|
for i := 0; i < 3; i++ {
|
|
layerRequestResponseMappings = append(layerRequestResponseMappings, testutil.RequestResponseMapping{
|
|
Request: testutil.Request{
|
|
Method: "GET",
|
|
Route: "/v2/" + name + "/manifest/" + tag,
|
|
},
|
|
Response: testutil.Response{
|
|
StatusCode: http.StatusOK,
|
|
Body: manifestBytes,
|
|
},
|
|
})
|
|
}
|
|
|
|
handler := testutil.NewHandler(layerRequestResponseMappings)
|
|
server := httptest.NewServer(handler)
|
|
client := New(server.URL)
|
|
objectStore := &memoryObjectStore{
|
|
mutex: new(sync.Mutex),
|
|
manifestStorage: make(map[string]*storage.SignedManifest),
|
|
layerStorage: make(map[digest.Digest]Layer),
|
|
}
|
|
|
|
for attempts := 0; attempts < 3; attempts++ {
|
|
err = Pull(client, objectStore, name, tag)
|
|
if err == nil {
|
|
break
|
|
}
|
|
}
|
|
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
m, err := objectStore.Manifest(name, tag)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
mBytes, err := json.Marshal(m)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
if string(mBytes) != string(manifestBytes) {
|
|
t.Fatal("Incorrect manifest")
|
|
}
|
|
|
|
for _, blob := range testBlobs {
|
|
l, err := objectStore.Layer(blob.digest)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
reader, err := l.Reader()
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
defer reader.Close()
|
|
|
|
layerBytes, err := ioutil.ReadAll(reader)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
if string(layerBytes) != string(blob.contents) {
|
|
t.Fatal("Incorrect blob")
|
|
}
|
|
}
|
|
}
|
|
|
|
// headerInterceptingResponseWriter is a hacky workaround to re-write the
|
|
// location header to have the server url.
|
|
type headerInterceptingResponseWriter struct {
|
|
http.ResponseWriter
|
|
serverURL string
|
|
}
|
|
|
|
func (hirw *headerInterceptingResponseWriter) WriteHeader(status int) {
|
|
location := hirw.Header().Get("Location")
|
|
if location != "" {
|
|
hirw.Header().Set("Location", hirw.serverURL+location)
|
|
}
|
|
|
|
hirw.ResponseWriter.WriteHeader(status)
|
|
}
|