errors: fix representation of empty lists

sapcc · Mar 26, 2020 · e87d5af · e87d5af
1 parent bf2c1db
commit e87d5af
Showing 1 changed file with 10 additions and 11 deletions.
diff --git a/internal/api/errors.go b/internal/api/errors.go
@@ -73,17 +73,15 @@ func (h handler) GetResourceScrapeErrors(w http.ResponseWriter, r *http.Request)
 		return
 	}
 
-	var result struct {
-		ResourceScrapeErrors []ResourceScrapeError `json:"resource_scrape_errors"`
-	}
+	resScrapeErrs := []ResourceScrapeError{}
 	for _, res := range dbResources {
 		projectID := ""
 		// .ScopeUUID is either a domain- or project UUID.
 		if res.ScopeUUID != res.DomainUUID {
 			projectID = res.ScopeUUID
 		}
 
-		result.ResourceScrapeErrors = append(result.ResourceScrapeErrors,
+		resScrapeErrs = append(resScrapeErrs,
 			ResourceScrapeError{
 				ProjectUUID: projectID,
 				DomainUUID:  res.DomainUUID,
@@ -95,7 +93,9 @@ func (h handler) GetResourceScrapeErrors(w http.ResponseWriter, r *http.Request)
 			})
 	}
 
-	respondwith.JSON(w, http.StatusOK, result)
+	respondwith.JSON(w, http.StatusOK, struct {
+		ResourceScrapeErrors []ResourceScrapeError `json:"resource_scrape_errors,keepempty"`
+	}{resScrapeErrs})
 }
 
 func (h handler) GetAssetScrapeErrors(w http.ResponseWriter, r *http.Request) {
@@ -108,17 +108,14 @@ func (h handler) GetAssetScrapeErrors(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	var result struct {
-		AssetScrapeErrors []AssetError `json:"asset_scrape_errors"`
-	}
-
 	var dbResources []db.Resource
 	_, err := h.DB.Select(&dbResources,
 		`SELECT * FROM resources ORDER BY id`)
 	if respondwith.ErrorText(w, err) {
 		return
 	}
 
+	assetScrapeErrs := []AssetError{}
 	for _, res := range dbResources {
 		var dbAssets []db.Asset
 		_, err := h.DB.Select(&dbAssets, `
@@ -137,7 +134,7 @@ func (h handler) GetAssetScrapeErrors(w http.ResponseWriter, r *http.Request) {
 		}
 
 		for _, a := range dbAssets {
-			result.AssetScrapeErrors = append(result.AssetScrapeErrors,
+			assetScrapeErrs = append(assetScrapeErrs,
 				AssetError{
 					AssetUUID:   a.UUID,
 					ProjectUUID: projectID,
@@ -151,7 +148,9 @@ func (h handler) GetAssetScrapeErrors(w http.ResponseWriter, r *http.Request) {
 		}
 	}
 
-	respondwith.JSON(w, http.StatusOK, result)
+	respondwith.JSON(w, http.StatusOK, struct {
+		AssetScrapeErrors []AssetError `json:"asset_scrape_errors,keepempty"`
+	}{assetScrapeErrs})
 }
 
 func (h handler) GetAssetResizeErrors(w http.ResponseWriter, r *http.Request) {