From 0fdd23b7fe4df100310ec5cac32dcb05e77dfcc2 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Fri, 6 Aug 2021 15:52:37 +0200 Subject: [PATCH] API: discard `/system/df` `type` parameter pre-1.42 The parameter is introduced in API version 1.42 Signed-off-by: Roman Volosatovs --- api/server/router/system/system_routes.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/api/server/router/system/system_routes.go b/api/server/router/system/system_routes.go index 3d2efb6052..d25d92204c 100644 --- a/api/server/router/system/system_routes.go +++ b/api/server/router/system/system_routes.go @@ -94,8 +94,11 @@ func (s *systemRouter) getDiskUsage(ctx context.Context, w http.ResponseWriter, return err } + version := httputils.VersionFromContext(ctx) + var getContainers, getImages, getVolumes, getBuildCache bool - if typeStrs, ok := r.Form["type"]; !ok { + typeStrs, ok := r.Form["type"] + if versions.LessThan(version, "1.42") || !ok { getContainers, getImages, getVolumes, getBuildCache = true, true, true, true } else { for _, typ := range typeStrs { @@ -151,7 +154,7 @@ func (s *systemRouter) getDiskUsage(ctx context.Context, w http.ResponseWriter, } var builderSize int64 - if versions.LessThan(httputils.VersionFromContext(ctx), "1.42") { + if versions.LessThan(version, "1.42") { for _, b := range buildCache { builderSize += b.Size }