From f2225933bbdb62bd7e9b39796375911f361d188c Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Thu, 8 Jul 2021 13:12:13 +0200 Subject: [PATCH] API: ensure empty build cache is represented as empty JSON array Ensure empty `BuildCache` field is represented as empty JSON array(`[]`) instead of `null` to be consistent with `Images`, `Containers` etc. Signed-off-by: Roman Volosatovs --- api/server/router/system/system_routes.go | 5 +++++ api/swagger.yaml | 1 + 2 files changed, 6 insertions(+) diff --git a/api/server/router/system/system_routes.go b/api/server/router/system/system_routes.go index 27063fc0ff..246cc67415 100644 --- a/api/server/router/system/system_routes.go +++ b/api/server/router/system/system_routes.go @@ -120,6 +120,11 @@ func (s *systemRouter) getDiskUsage(ctx context.Context, w http.ResponseWriter, du.BuilderSize = builderSize du.BuildCache = buildCache + if buildCache == nil { + // Ensure empty `BuildCache` field is represented as empty JSON array(`[]`) + // instead of `null` to be consistent with `Images`, `Containers` etc. + du.BuildCache = []*types.BuildCache{} + } return httputils.WriteJSON(w, http.StatusOK, du) } diff --git a/api/swagger.yaml b/api/swagger.yaml index 40beae7a32..ddb8544bcc 100644 --- a/api/swagger.yaml +++ b/api/swagger.yaml @@ -8339,6 +8339,7 @@ paths: UsageData: Size: 10920104 RefCount: 2 + BuildCache: [] 500: description: "server error" schema: