Merge pull request #19183 from eriksjolund/add_missing_return

Add missing return after utils.InternalServerError()
containers · Jul 13, 2023 · eb2bf7a · eb2bf7a
2 parents 0285bc1 + 6ec261e
commit eb2bf7a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/pkg/api/handlers/libpod/pods.go b/pkg/api/handlers/libpod/pods.go
@@ -561,6 +561,7 @@ func PodStats(w http.ResponseWriter, r *http.Request) {
 	options := entities.PodStatsOptions{All: query.All}
 	if err := entities.ValidatePodStatsOptions(query.NamesOrIDs, &options); err != nil {
 		utils.InternalServerError(w, err)
+		return
 	}
 
 	var flush = func() {}

diff --git a/test/apiv2/40-pods.at b/test/apiv2/40-pods.at
@@ -118,6 +118,10 @@ t GET libpod/pods/stats?namesOrIDs=fakename 404 \
   .cause="no such pod" \
   .message="unable to get list of pods: no pod with name or ID fakename found: no such pod"
 
+t GET "libpod/pods/stats?all=true&namesOrIDs=foo" 500 \
+  .cause="--all, --latest and arguments cannot be used together" \
+  .message="--all, --latest and arguments cannot be used together"
+
 t DELETE  libpod/pods/bar?force=true 200
 
 # test the fake name