containers
/
automation-tests
mirror of https://github.com/containers/automation-tests.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed the unnecessary code 

removed defaulting of  query.Size
amended types.LibpodToContainer, removed hard coded true from inspect call

Signed-off-by: Steve Taylor <steven@taylormuff.co.uk>
This commit is contained in:
Steve Taylor 2020-03-06 12:12:17 +00:00
parent 83e52cf787
commit 920d09c174
2 changed files with 3 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/api/handlers/generic/containers.go
View File

@ -58,9 +58,6 @@ func ListContainers(w http.ResponseWriter, r *http.Request) {
// override any golang type defaults
}
// Default Size to false
query.Size = false
if err := decoder.Decode(&query, r.URL.Query()); err != nil {
utils.Error(w, "Something went wrong.", http.StatusBadRequest, errors.Wrapf(err, "Failed to parse parameters for %s", r.URL.String()))
return
@ -108,9 +105,6 @@ func GetContainer(w http.ResponseWriter, r *http.Request) {
// override any golang type defaults
}
// Default Size to false
query.Size = false
if err := decoder.Decode(&query, r.URL.Query()); err != nil {
utils.Error(w, "Something went wrong.", http.StatusBadRequest, errors.Wrapf(err, "Failed to parse parameters for %s", r.URL.String()))
return

23
pkg/api/handlers/types.go
View File

@ -403,13 +403,8 @@ func LibpodToContainer(l *libpod.Container, infoData []define.InfoData, sz bool)
}
func LibpodToContainerJSON(l *libpod.Container, sz bool) (*docker.ContainerJSON, error) {
var (
sizeRootFs int64
sizeRW int64
)
_, imageName := l.Image()
inspect, err := l.Inspect(true)
inspect, err := l.Inspect(sz)
if err != nil {
return nil, err
}
@ -444,18 +439,6 @@ func LibpodToContainerJSON(l *libpod.Container, sz bool) (*docker.ContainerJSON,
return nil, err
}
if sz {
if sizeRW, err = l.RWSize(); err != nil {
return nil, err
}
if sizeRootFs, err = l.RootFsSize(); err != nil {
return nil, err
}
} else {
sizeRW = 0
sizeRootFs = 0
}
cb := docker.ContainerJSONBase{
ID: l.ID(),
Created: l.CreatedTime().String(),
@ -478,8 +461,8 @@ func LibpodToContainerJSON(l *libpod.Container, sz bool) (*docker.ContainerJSON,
ExecIDs: inspect.ExecIDs,
HostConfig: &hc,
GraphDriver: graphDriver,
SizeRw: &sizeRW,
SizeRootFs: &sizeRootFs,
SizeRw: inspect.SizeRw,
SizeRootFs: &inspect.SizeRootFs,
}
stopTimeout := int(l.StopTimeout())