Skip to content

Commit

Permalink
Fix compat networks endpoint for a empty result
Browse files Browse the repository at this point in the history
The networks list compat api endpoint must return `[]`
and not `null` if no networks are found.

Fixes containers#9293

Signed-off-by: Paul Holzinger <[email protected]>
  • Loading branch information
Paul Holzinger committed Feb 9, 2021
1 parent f98605e commit f2a8562
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
2 changes: 1 addition & 1 deletion pkg/api/handlers/compat/networks.go
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ func ListNetworks(w http.ResponseWriter, r *http.Request) {
return
}

var reports []*types.NetworkResource
reports := []*types.NetworkResource{}
logrus.Debugf("netNames: %q", strings.Join(netNames, ", "))
for _, name := range netNames {
report, err := getNetworkResourceByNameOrID(name, runtime, query.Filters)
Expand Down
3 changes: 3 additions & 0 deletions test/apiv2/35-networks.at
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@ length=1 \
# invalid filter filters={"dangling":["1"]}
t GET networks?filters=%7B%22dangling%22%3A%5B%221%22%5D%7D 500 \
.cause='invalid filter "dangling"'
# (#9293 with no networks the endpoint should return empty array instead of null)
t GET networks?filters=%7B%22name%22%3A%5B%22doesnotexists%22%5D%7D 200 \
"[]"

# network inspect docker
t GET networks/a7662f44d65029fd4635c91feea3d720a57cef52e2a9fcc7772b69072cc1ccd1 200 \
Expand Down

0 comments on commit f2a8562

Please sign in to comment.