Reverting, as this change was making API LESS RESTful. My bad.

Revert "Make snapshot creation API more RESTful: accept snapshot name from URL. #116"

This reverts commit 06dc1ef9a4.
This commit is contained in:
Andrey Smirnov
2015-02-28 19:55:09 +03:00
parent 06dc1ef9a4
commit e33a2a6f96
3 changed files with 35 additions and 9 deletions

View File

@@ -36,6 +36,15 @@ func apiSnapshotsCreateFromMirror(c *gin.Context) {
snapshot *deb.Snapshot
)
var b struct {
Name string `binding:"required"`
Description string
}
if !c.Bind(&b) {
return
}
collection := context.CollectionFactory().RemoteRepoCollection()
collection.RLock()
defer collection.RUnlock()
@@ -62,12 +71,16 @@ func apiSnapshotsCreateFromMirror(c *gin.Context) {
return
}
snapshot, err = deb.NewSnapshotFromRepository(c.Params.ByName("snapname"), repo)
snapshot, err = deb.NewSnapshotFromRepository(b.Name, repo)
if err != nil {
c.Fail(400, err)
return
}
if b.Description != "" {
snapshot.Description = b.Description
}
err = snapshotCollection.Add(snapshot)
if err != nil {
c.Fail(400, err)
@@ -162,6 +175,15 @@ func apiSnapshotsCreateFromRepository(c *gin.Context) {
snapshot *deb.Snapshot
)
var b struct {
Name string `binding:"required"`
Description string
}
if !c.Bind(&b) {
return
}
collection := context.CollectionFactory().LocalRepoCollection()
collection.RLock()
defer collection.RUnlock()
@@ -182,12 +204,16 @@ func apiSnapshotsCreateFromRepository(c *gin.Context) {
return
}
snapshot, err = deb.NewSnapshotFromLocalRepo(c.Params.ByName("snapname"), repo)
snapshot, err = deb.NewSnapshotFromLocalRepo(b.Name, repo)
if err != nil {
c.Fail(400, err)
return
}
if b.Description != "" {
snapshot.Description = b.Description
}
err = snapshotCollection.Add(snapshot)
if err != nil {
c.Fail(400, err)