Merge pull request #42607 from rvolosatovs/fix_build_cache_formatting

thaJeztah · web-flow · commit c81abefdb1f9 · 2021-07-09T15:01:37.000+02:00
Ensure empty build cache is represented as empty JSON array
diff --git 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
@@ -8339,6 +8339,29 @@ paths:
                   UsageData:
                     Size: 10920104
                     RefCount: 2
+              BuildCache:
+                -
+                  ID: "hw53o5aio51xtltp5xjp8v7fx"
+                  Parent: ""
+                  Type: "regular"
+                  Description: "pulled from docker.io/library/debian@sha256:234cb88d3020898631af0ccbbcca9a66ae7306ecd30c9720690858c1b007d2a0"
+                  InUse: false
+                  Shared: true
+                  Size: 0
+                  CreatedAt: "2021-06-28T13:31:01.474619385Z"
+                  LastUsedAt: "2021-07-07T22:02:32.738075951Z"
+                  UsageCount: 26
+                -
+                  ID: "ndlpt0hhvkqcdfkputsk4cq9c"
+                  Parent: "hw53o5aio51xtltp5xjp8v7fx"
+                  Type: "regular"
+                  Description: "mount / from exec /bin/sh -c echo 'Binary::apt::APT::Keep-Downloaded-Packages \"true\";' > /etc/apt/apt.conf.d/keep-cache"
+                  InUse: false
+                  Shared: true
+                  Size: 51
+                  CreatedAt: "2021-06-28T13:31:03.002625487Z"
+                  LastUsedAt: "2021-07-07T22:02:32.773909517Z"
+                  UsageCount: 26
         500:
           description: "server error"
           schema:
