Only attempt to mount for MountableLayer (#401)

google · Mar 8, 2019 · 88208fd · 88208fd
1 parent fcd5acb
commit 88208fd
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/pkg/v1/remote/write.go b/pkg/v1/remote/write.go
@@ -200,10 +200,9 @@ func (w *writer) checkExistingManifest(h v1.Hash, mt types.MediaType) (bool, err
 func (w *writer) initiateUpload(from, mount string) (location string, mounted bool, err error) {
 	u := w.url(fmt.Sprintf("/v2/%s/blobs/uploads/", w.ref.Context().RepositoryStr()))
 	uv := url.Values{}
-	if mount != "" {
+	if mount != "" && from != "" {
+		// Quay will fail if we specify a "mount" without a "from".
 		uv["mount"] = []string{mount}
-	}
-	if from != "" {
 		uv["from"] = []string{from}
 	}
 	u.RawQuery = uv.Encode()

diff --git a/pkg/v1/remote/write_test.go b/pkg/v1/remote/write_test.go
@@ -229,6 +229,7 @@ func TestInitiateUploadNoMountsExists(t *testing.T) {
 	expectedPath := fmt.Sprintf("/v2/%s/blobs/uploads/", expectedRepo)
 	expectedQuery := url.Values{
 		"mount": []string{h.String()},
+		"from":  []string{"baz/bar"},
 	}.Encode()
 
 	w, closer, err := setupWriter(expectedRepo, http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
@@ -248,7 +249,7 @@ func TestInitiateUploadNoMountsExists(t *testing.T) {
 	}
 	defer closer.Close()
 
-	_, mounted, err := w.initiateUpload("", h.String())
+	_, mounted, err := w.initiateUpload("baz/bar", h.String())
 	if err != nil {
 		t.Errorf("intiateUpload() = %v", err)
 	}
@@ -264,6 +265,7 @@ func TestInitiateUploadNoMountsInitiated(t *testing.T) {
 	expectedPath := fmt.Sprintf("/v2/%s/blobs/uploads/", expectedRepo)
 	expectedQuery := url.Values{
 		"mount": []string{h.String()},
+		"from":  []string{"baz/bar"},
 	}.Encode()
 	expectedLocation := "https://somewhere.io/upload?foo=bar"
 
@@ -285,7 +287,7 @@ func TestInitiateUploadNoMountsInitiated(t *testing.T) {
 	}
 	defer closer.Close()
 
-	location, mounted, err := w.initiateUpload("", h.String())
+	location, mounted, err := w.initiateUpload("baz/bar", h.String())
 	if err != nil {
 		t.Errorf("intiateUpload() = %v", err)
 	}
@@ -304,6 +306,7 @@ func TestInitiateUploadNoMountsBadStatus(t *testing.T) {
 	expectedPath := fmt.Sprintf("/v2/%s/blobs/uploads/", expectedRepo)
 	expectedQuery := url.Values{
 		"mount": []string{h.String()},
+		"from":  []string{"baz/bar"},
 	}.Encode()
 
 	w, closer, err := setupWriter(expectedRepo, http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
@@ -323,7 +326,7 @@ func TestInitiateUploadNoMountsBadStatus(t *testing.T) {
 	}
 	defer closer.Close()
 
-	location, mounted, err := w.initiateUpload("", h.String())
+	location, mounted, err := w.initiateUpload("baz/bar", h.String())
 	if err == nil {
 		t.Errorf("intiateUpload() = %v, %v; wanted error", location, mounted)
 	}
@@ -337,6 +340,7 @@ func TestInitiateUploadMountsWithMountFromDifferentRegistry(t *testing.T) {
 	expectedPath := fmt.Sprintf("/v2/%s/blobs/uploads/", expectedRepo)
 	expectedQuery := url.Values{
 		"mount": []string{h.String()},
+		"from":  []string{"baz/bar"},
 	}.Encode()
 
 	img = &mountableImage{
@@ -361,7 +365,7 @@ func TestInitiateUploadMountsWithMountFromDifferentRegistry(t *testing.T) {
 	}
 	defer closer.Close()
 
-	_, mounted, err := w.initiateUpload("", h.String())
+	_, mounted, err := w.initiateUpload("baz/bar", h.String())
 	if err != nil {
 		t.Errorf("intiateUpload() = %v", err)
 	}