BUG/MEDIUM: maps: return an empty list instead of nil for an empty maps file

Author: gorangalinec

e2e/tests/runtime_maps_entries/data/container/tmp/maps/empty.map

@@ -0,0 +1 @@
+# this is an empty map file

e2e/tests/runtime_maps_entries/data/haproxy.cfg

@@ -25,3 +25,7 @@ frontend fe_map
 frontend fe_map2
   bind *:2358
   use_backend %[str(example.com),map(/tmp/maps/mapfile2.map)]
+
+frontend fe_map_empty
+  bind *:5678
+  use_backend %[str(example.com),map(/tmp/maps/empty.map)]

e2e/tests/runtime_maps_entries/get_entries.bats

@@ -38,3 +38,9 @@ load 'utils/_helpers'
     resource_get "$_RUNTIME_MAP_ENTRIES_BASE_PATH" "map=not-exists.map"
     assert_equal "$SC" 404
 }
+
+@test "runtime_maps_entries: https://github.com/haproxytech/dataplaneapi/issues/234" {
+    resource_get "$_RUNTIME_MAP_ENTRIES_BASE_PATH" "map=empty.map"
+    assert_equal "$SC" 200
+    assert_equal "$($BODY)" ""
+}

e2e/tests/storage_maps/data/haproxy.cfg

@@ -27,6 +27,9 @@ defaults
     timeout check           10s
     maxconn                 3000
 
+frontend test_empty_storage_map
+  use_backend %[str(active),map(/etc/haproxy/maps/mapfile_empty.map)]
+
 frontend test_storage_maps
   bind *:1337 crt
   #use_backend %[str(active),map(/etc/haproxy/maps/mapfile_example2.map)]
@@ -36,4 +39,3 @@ frontend test_storage_maps
 
 backend test_storage_maps
   server appx 127.0.0.1:8080 check disabled
-

go.mod

@@ -22,8 +22,8 @@ require (
 	github.com/go-openapi/validate v0.19.8
 	github.com/google/renameio v1.0.1
 	github.com/google/uuid v1.2.0
-	github.com/haproxytech/client-native/v2 v2.5.5
-	github.com/haproxytech/config-parser/v4 v4.0.0-rc2.0.20220107093215-b580bd3a8a90
+	github.com/haproxytech/client-native/v2 v2.5.6
+	github.com/haproxytech/config-parser/v4 v4.0.0-rc2.0.20220215134434-54d66ef01d26
 	github.com/hashicorp/consul/api v1.6.0
 	github.com/hashicorp/hcl v1.0.0
 	github.com/jessevdk/go-flags v1.4.0

go.sum

@@ -177,10 +177,11 @@ github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+
 github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.2.0 h1:qJYtXnJRWmpe7m/3XlyhrsLrEURqHRM2kxzoxXqyUDs=
 github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/haproxytech/client-native/v2 v2.5.5 h1:1s0oxyNJhKFvC2BZzHaqCjibaTyjZHU84XJ3/HtMHag=
-github.com/haproxytech/client-native/v2 v2.5.5/go.mod h1:S7CBbMb7hP8nxiL+PE2edFVMOMO7Uvptvr7hAQw5IJk=
-github.com/haproxytech/config-parser/v4 v4.0.0-rc2.0.20220107093215-b580bd3a8a90 h1:OSCqtgyvhMVgAA9aIX1zN8FkiQwL/gp9h7Eqvt58hfg=
+github.com/haproxytech/client-native/v2 v2.5.6 h1:qxxm3SMKXC3UITSrdShjQE+0dfGjMJQ2eXKpGUi81IM=
+github.com/haproxytech/client-native/v2 v2.5.6/go.mod h1:S7CBbMb7hP8nxiL+PE2edFVMOMO7Uvptvr7hAQw5IJk=
 github.com/haproxytech/config-parser/v4 v4.0.0-rc2.0.20220107093215-b580bd3a8a90/go.mod h1:pEuHx+aFhn0lIdvAg1OaawQfeRkpq1I8HzjtZN4/PLI=
+github.com/haproxytech/config-parser/v4 v4.0.0-rc2.0.20220215134434-54d66ef01d26 h1:IWU3pWA4MzYzi0N5NDUgMf06V6bmXCsHok0hBMM1Zik=
+github.com/haproxytech/config-parser/v4 v4.0.0-rc2.0.20220215134434-54d66ef01d26/go.mod h1:pEuHx+aFhn0lIdvAg1OaawQfeRkpq1I8HzjtZN4/PLI=
 github.com/haproxytech/go-logger v1.0.1-0.20211022075555-178f1cdf4d84 h1:rSLHjJ4VGvMZcGAGQ9GaXuhvdswu1iLVXTThLX6OKN8=
 github.com/haproxytech/go-logger v1.0.1-0.20211022075555-178f1cdf4d84/go.mod h1:OekUd8HCb7ubxMplzHUPBTHNxZmddOWfOjWclZsqIeM=
 github.com/hashicorp/consul/api v1.6.0 h1:SZB2hQW8AcTOpfDmiVblQbijxzsRuiyy0JpHfabvHio=