opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-27 13:38:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

APIv2 review corrections #3

Browse Source 
The third pass of corrections for the APIv2.

Signed-off-by: Brent Baude <bbaude@redhat.com>
This commit is contained in:
Brent Baude
2020-01-24 08:59:20 -06:00
parent 81e59a742b
commit 5da70b04dd
20 changed files with 300 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
pkg/api/handlers/libpod/pods.go
View File

@ -268,7 +268,7 @@ func PodDelete(w http.ResponseWriter, r *http.Request) {
decoder = r.Context().Value("decoder").(*schema.Decoder)
)
query := struct {
force bool `schema:"force"`
Force bool `schema:"force"`
}{
// override any golang type defaults
}
@ -284,7 +284,7 @@ func PodDelete(w http.ResponseWriter, r *http.Request) {
utils.PodNotFound(w, name, err)
return
}
if err := runtime.RemovePod(r.Context(), pod, true, query.force); err != nil {
if err := runtime.RemovePod(r.Context(), pod, true, query.Force); err != nil {
utils.Error(w, "Something went wrong", http.StatusInternalServerError, err)
return
}
@ -309,43 +309,14 @@ func PodRestart(w http.ResponseWriter, r *http.Request) {
func PodPrune(w http.ResponseWriter, r *http.Request) {
var (
err error
pods []*libpod.Pod
runtime = r.Context().Value("runtime").(*libpod.Runtime)
decoder = r.Context().Value("decoder").(*schema.Decoder)
)
query := struct {
force bool `schema:"force"`
}{
// override any golang type defaults
}
if err := decoder.Decode(&query, r.URL.Query()); err != nil {
utils.Error(w, http.StatusText(http.StatusBadRequest), http.StatusBadRequest,
errors.Wrapf(err, "Failed to parse parameters for %s", r.URL.String()))
pruned, err := runtime.PrunePods()
if err != nil {
utils.InternalServerError(w, err)
return
}
if query.force {
pods, err = runtime.GetAllPods()
if err != nil {
utils.Error(w, "Something went wrong", http.StatusInternalServerError, err)
return
}
} else {
// TODO We need to make a libpod.PruneVolumes or this code will be a mess. Volumes
// already does this right. It will also help clean this code path up with less
// conditionals. We do this when we integrate with libpod again.
utils.Error(w, "not implemented", http.StatusInternalServerError, errors.New("not implemented"))
return
}
for _, p := range pods {
if err := runtime.RemovePod(r.Context(), p, true, query.force); err != nil {
utils.Error(w, "Something went wrong", http.StatusInternalServerError, err)
return
}
}
utils.WriteResponse(w, http.StatusNoContent, "")
utils.WriteResponse(w, http.StatusOK, pruned)
}
func PodPause(w http.ResponseWriter, r *http.Request) {