opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-05-30 15:15:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

podmanv2 volumes

Browse Source 
add volume commands: create, inspect, ls, prune, and rm

Signed-off-by: Brent Baude <bbaude@redhat.com>
This commit is contained in:
Brent Baude
2020-03-21 14:29:30 -05:00
parent 0c084d9719
commit ae614920bf
21 changed files with 716 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

140
pkg/api/handlers/libpod/volumes.go
View File

@ -3,16 +3,15 @@ package libpod
import (
"encoding/json"
"net/http"
"strings"
"github.com/containers/libpod/cmd/podman/shared"
"github.com/containers/libpod/libpod"
"github.com/containers/libpod/libpod/define"
"github.com/containers/libpod/pkg/api/handlers/utils"
"github.com/containers/libpod/pkg/domain/entities"
"github.com/containers/libpod/pkg/domain/filters"
"github.com/gorilla/schema"
"github.com/pkg/errors"
log "github.com/sirupsen/logrus"
)
func CreateVolume(w http.ResponseWriter, r *http.Request) {
@ -65,14 +64,14 @@ func CreateVolume(w http.ResponseWriter, r *http.Request) {
return
}
volResponse := entities.VolumeConfigResponse{
Name: config.Name,
Labels: config.Labels,
Driver: config.Driver,
MountPoint: config.MountPoint,
CreatedTime: config.CreatedTime,
Options: config.Options,
UID: config.UID,
GID: config.GID,
Name: config.Name,
Driver: config.Driver,
Mountpoint: config.MountPoint,
CreatedAt: config.CreatedTime,
Labels: config.Labels,
Options: config.Options,
UID: config.UID,
GID: config.GID,
}
utils.WriteResponse(w, http.StatusOK, volResponse)
}
@ -85,21 +84,27 @@ func InspectVolume(w http.ResponseWriter, r *http.Request) {
vol, err := runtime.GetVolume(name)
if err != nil {
utils.VolumeNotFound(w, name, err)
return
}
inspect, err := vol.Inspect()
if err != nil {
utils.InternalServerError(w, err)
volResponse := entities.VolumeConfigResponse{
Name: vol.Name(),
Driver: vol.Driver(),
Mountpoint: vol.MountPoint(),
CreatedAt: vol.CreatedTime(),
Labels: vol.Labels(),
Scope: vol.Scope(),
Options: vol.Options(),
UID: vol.UID(),
GID: vol.GID(),
}
utils.WriteResponse(w, http.StatusOK, inspect)
utils.WriteResponse(w, http.StatusOK, volResponse)
}
func ListVolumes(w http.ResponseWriter, r *http.Request) {
var (
decoder = r.Context().Value("decoder").(*schema.Decoder)
err error
runtime = r.Context().Value("runtime").(*libpod.Runtime)
volumeConfigs []*libpod.VolumeConfig
volumeFilters []libpod.VolumeFilter
volumeConfigs []*entities.VolumeListReport
)
query := struct {
Filters map[string][]string `schema:"filters"`
@ -113,25 +118,30 @@ func ListVolumes(w http.ResponseWriter, r *http.Request) {
return
}
if len(query.Filters) > 0 {
volumeFilters, err = generateVolumeFilters(query.Filters)
if err != nil {
utils.InternalServerError(w, err)
return
}
volumeFilters, err := filters.GenerateVolumeFilters(query.Filters)
if err != nil {
utils.InternalServerError(w, err)
return
}
vols, err := runtime.Volumes(volumeFilters...)
if err != nil {
utils.InternalServerError(w, err)
return
}
for _, v := range vols {
config, err := v.Config()
if err != nil {
utils.InternalServerError(w, err)
return
config := entities.VolumeConfigResponse{
Name: v.Name(),
Driver: v.Driver(),
Mountpoint: v.MountPoint(),
CreatedAt: v.CreatedTime(),
Labels: v.Labels(),
Scope: v.Scope(),
Options: v.Options(),
UID: v.UID(),
GID: v.GID(),
}
volumeConfigs = append(volumeConfigs, config)
volumeConfigs = append(volumeConfigs, &entities.VolumeListReport{VolumeConfigResponse: config})
}
utils.WriteResponse(w, http.StatusOK, volumeConfigs)
}
@ -140,14 +150,10 @@ func PruneVolumes(w http.ResponseWriter, r *http.Request) {
var (
runtime = r.Context().Value("runtime").(*libpod.Runtime)
)
pruned, errs := runtime.PruneVolumes(r.Context())
if errs != nil {
if len(errs) > 1 {
for _, err := range errs {
log.Infof("Request Failed(%s): %s", http.StatusText(http.StatusInternalServerError), err.Error())
}
}
utils.InternalServerError(w, errs[len(errs)-1])
pruned, err := runtime.PruneVolumes(r.Context())
if err != nil {
utils.InternalServerError(w, err)
return
}
utils.WriteResponse(w, http.StatusOK, pruned)
}
@ -184,65 +190,3 @@ func RemoveVolume(w http.ResponseWriter, r *http.Request) {
}
utils.WriteResponse(w, http.StatusNoContent, "")
}
func generateVolumeFilters(filters map[string][]string) ([]libpod.VolumeFilter, error) {
var vf []libpod.VolumeFilter
for filter, v := range filters {
for _, val := range v {
switch filter {
case "name":
nameVal := val
vf = append(vf, func(v *libpod.Volume) bool {
return nameVal == v.Name()
})
case "driver":
driverVal := val
vf = append(vf, func(v *libpod.Volume) bool {
return v.Driver() == driverVal
})
case "scope":
scopeVal := val
vf = append(vf, func(v *libpod.Volume) bool {
return v.Scope() == scopeVal
})
case "label":
filterArray := strings.SplitN(val, "=", 2)
filterKey := filterArray[0]
var filterVal string
if len(filterArray) > 1 {
filterVal = filterArray[1]
} else {
filterVal = ""
}
vf = append(vf, func(v *libpod.Volume) bool {
for labelKey, labelValue := range v.Labels() {
if labelKey == filterKey && ("" == filterVal || labelValue == filterVal) {
return true
}
}
return false
})
case "opt":
filterArray := strings.SplitN(val, "=", 2)
filterKey := filterArray[0]
var filterVal string
if len(filterArray) > 1 {
filterVal = filterArray[1]
} else {
filterVal = ""
}
vf = append(vf, func(v *libpod.Volume) bool {
for labelKey, labelValue := range v.Options() {
if labelKey == filterKey && ("" == filterVal || labelValue == filterVal) {
return true
}
}
return false
})
default:
return nil, errors.Errorf("%q is in an invalid volume filter", filter)
}
}
}
return vf, nil
}

10
pkg/api/server/register_volumes.go
View File

@ -53,8 +53,8 @@ func (s *APIServer) registerVolumeHandlers(r *mux.Router) error {
// produces:
// - application/json
// responses:
// '204':
// description: no error
// '200':
// "$ref": "#/responses/VolumePruneResponse"
// '500':
// "$ref": "#/responses/InternalError"
r.Handle(VersionedPath("/libpod/volumes/prune"), s.APIHandler(libpod.PruneVolumes)).Methods(http.MethodPost)
@ -71,11 +71,11 @@ func (s *APIServer) registerVolumeHandlers(r *mux.Router) error {
// - application/json
// responses:
// '200':
// "$ref": "#/responses/InspectVolumeResponse"
// "$ref": "#/responses/VolumeCreateResponse"
// '404':
// "$ref": "#/responses/NoSuchVolume"
// "$ref": "#/responses/NoSuchVolume"
// '500':
// "$ref": "#/responses/InternalError"
// "$ref": "#/responses/InternalError"
r.Handle(VersionedPath("/libpod/volumes/{name}/json"), s.APIHandler(libpod.InspectVolume)).Methods(http.MethodGet)
// swagger:operation DELETE /libpod/volumes/{name} volumes removeVolume
// ---

7
pkg/api/server/swagger.go
View File

@ -151,6 +151,13 @@ type ok struct {
}
}
// Volume prune response
// swagger:response VolumePruneResponse
type swagVolumePruneResponse struct {
// in:body
Body []entities.VolumePruneReport
}
// Volume create response
// swagger:response VolumeCreateResponse
type swagVolumeCreateResponse struct {