daemon: fix /v2/snapshots import handling

ernestl · Oct 1, 2020 · 07e063a · 07e063a
1 parent 8299169
commit 07e063a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 18 deletions.
diff --git a/daemon/api.go b/daemon/api.go
@@ -107,7 +107,6 @@ var api = []*Command{
 	debugCmd,
 	snapshotCmd,
 	snapshotExportCmd,
-	snapshotImportCmd,
 	connectionsCmd,
 	modelCmd,
 	cohortsCmd,

diff --git a/daemon/api_snapshots.go b/daemon/api_snapshots.go
@@ -88,6 +88,11 @@ func (action snapshotAction) String() string {
 }
 
 func changeSnapshots(c *Command, r *http.Request, user *auth.UserState) Response {
+	contentType := r.Header.Get("Content-Type")
+	if contentType == "application/x.snapd.snapshot-v1" {
+		return doSnapshotImport(c, r, user)
+	}
+
 	var action snapshotAction
 	decoder := json.NewDecoder(r.Body)
 	if err := decoder.Decode(&action); err != nil {
@@ -174,16 +179,7 @@ func getSnapshotExport(c *Command, r *http.Request, user *auth.UserState) Respon
 	return &snapshotExportResponse{SnapshotExport: export}
 }
 
-var snapshotImportCmd = &Command{
-	Path: "/v2/snapshot",
-	POST: postSnapshots,
-}
-
-func postSnapshots(c *Command, r *http.Request, user *auth.UserState) Response {
-	contentType := r.Header.Get("Content-Type")
-	if contentType != "application/x.snapd.snapshot-v1" {
-		return BadRequest("cannot use content type %v", contentType)
-	}
+func doSnapshotImport(c *Command, r *http.Request, user *auth.UserState) Response {
 
 	// XXX: check that we have enough space to import the compressed snapshots
 

diff --git a/daemon/api_snapshots_test.go b/daemon/api_snapshots_test.go
@@ -398,7 +398,7 @@ func (s *snapshotSuite) TestImportSnapshot(c *check.C) {
 	c.Assert(err, check.IsNil)
 	req.Header.Set("Content-Type", "application/x.snapd.snapshot-v1")
 
-	rsp := daemon.PostSnapshots(daemon.SnapshotImportCmd, req, nil)
+	rsp := daemon.ChangeSnapshots(daemon.SnapshotCmd, req, nil)
 	c.Check(rsp.Type, check.Equals, daemon.ResponseTypeSync)
 	c.Check(rsp.Status, check.Equals, 200)
 	c.Check(rsp.Result, check.DeepEquals, map[string]interface{}{"set-id": setID, "snaps": snapNames})
@@ -416,7 +416,7 @@ func (s *snapshotSuite) TestImportSnapshotError(c *check.C) {
 	c.Assert(err, check.IsNil)
 	req.Header.Set("Content-Type", "application/x.snapd.snapshot-v1")
 
-	rsp := daemon.PostSnapshots(daemon.SnapshotImportCmd, req, nil)
+	rsp := daemon.ChangeSnapshots(daemon.SnapshotCmd, req, nil)
 	c.Assert(rsp.Type, check.Equals, daemon.ResponseTypeError)
 	c.Check(rsp.Status, check.Equals, 400)
 	c.Check(rsp.ErrorResult().Message, check.Equals, "no")

diff --git a/daemon/export_api_snapshots_test.go b/daemon/export_api_snapshots_test.go
@@ -121,15 +121,10 @@ func ExportSnapshot(c *Command, r *http.Request, user *auth.UserState) interface
 	return getSnapshotExport(c, r, user)
 }
 
-func PostSnapshots(c *Command, r *http.Request, user *auth.UserState) *resp {
-	return postSnapshots(c, r, user).(*resp)
-}
-
 var (
 	SnapshotMany      = snapshotMany
 	SnapshotCmd       = snapshotCmd
 	SnapshotExportCmd = snapshotExportCmd
-	SnapshotImportCmd = snapshotImportCmd
 )
 
 type SnapshotExportResponse = snapshotExportResponse