REORG/MAJOR: returning flat object in response

3 months ago · 0226e75744
parent 3524234130
commit 0226e75744
357 changed files with 2247 additions and 12815 deletions
--- a/e2e/libs/resource_client.bash
+++ b/e2e/libs/resource_client.bash
@ -15,12 +15,13 @@
 # limitations under the License.
 #

+
 function resource_post() {
  local endpoint;  endpoint="$1"; shift
  local data;      data="$1"; shift
 	local qs_params; qs_params="$1"
-
-	run dpa_curl POST "$endpoint?$qs_params&version=$(version)" "$data"
+	get_version
+	run dpa_curl POST "$endpoint?$qs_params&version=${VERSION}" "$data"
 	assert_success
 	dpa_curl_status_body '$output'
 }
@ -29,8 +30,8 @@ function resource_put() {
  local endpoint;  endpoint="$1"; shift
  local data;      data="$1"; shift
 	local qs_params; qs_params="$1"
-
-	run dpa_curl PUT "$endpoint?$qs_params&version=$(version)" "$data"
+   	get_version
+	run dpa_curl PUT "$endpoint?$qs_params&version=${VERSION}" "$data"
 	assert_success
 	dpa_curl_status_body '$output'
 }
@ -38,8 +39,8 @@ function resource_put() {
 function resource_delete() {
  local endpoint;  endpoint="$1"; shift
 	local qs_params; qs_params="$1"
-
-	run dpa_curl DELETE "$endpoint?$qs_params&version=$(version)" "$data"
+    get_version
+	run dpa_curl DELETE "$endpoint?$qs_params&version=${VERSION}" "$data"
 	assert_success
 	dpa_curl_status_body '$output'
 }
@ -47,7 +48,6 @@ function resource_delete() {
 function resource_get() {
  local endpoint;  endpoint="$1"; shift
  local qs_params; qs_params="$1"
-
  run dpa_curl GET "$endpoint?$qs_params"
 	assert_success
 	dpa_curl_status_body '$output'
--- a/e2e/libs/version.bash
+++ b/e2e/libs/version.bash
@ -36,16 +36,8 @@ function deprecated_auth_curl() {
  echo "$status_code $response"
 }

-# version return the current HAProxy configuration file version, useful to
-# avoid keeping track of it at each POST/PUT call.
-#
-# Any argument is required.
-#
-# Example:
-# version
-# >>> 10
-function version() {
-  read -r SC RES < <(deprecated_auth_curl GET "/v3/services/haproxy/configuration/global")
-  V="$(RES=${RES} jq -n 'env.RES | fromjson | ._version')"
-  echo "$V"
+
+function get_version() {
+  resource_get "/services/haproxy/configuration/version"
+  eval VERSION="'$BODY'"
 }
--- a/e2e/libs/version_spoe.bash
+++ b/e2e/libs/version_spoe.bash
@ -36,7 +36,7 @@ function deprecated_auth_curl() {
  echo "$status_code $response"
 }

-function version() {
-  read -r SC RES < <(deprecated_auth_curl GET "/v3/services/haproxy/spoe/version?spoe=$SPOE_FILE")
-  echo "$RES"
+function get_version() {
+  resource_get "/services/haproxy/spoe/version" "spoe=$SPOE_FILE"
+  eval VERSION="'$BODY'"
 }
--- a/e2e/tests/acl_files/acl_file.bats
+++ b/e2e/tests/acl_files/acl_file.bats
@ -19,6 +19,8 @@ load '../../libs/dataplaneapi'
 load "../../libs/get_json_path"
 load '../../libs/haproxy_config_setup'
 load '../../libs/resource_client'
+load '../../libs/version'
+

 load 'utils/_helpers'

--- a/e2e/tests/acl_files/acl_file_entries.bats
+++ b/e2e/tests/acl_files/acl_file_entries.bats
@ -20,6 +20,7 @@ load "../../libs/get_json_path"
 load '../../libs/haproxy_config_setup'
 load '../../libs/resource_client'
 load '../../libs/haproxy_version'
+load '../../libs/version'

 load 'utils/_helpers'

--- a/e2e/tests/acls/add.bats
+++ b/e2e/tests/acls/add.bats
@ -32,5 +32,5 @@ load 'utils/_helpers'
    resource_get "$_ACL_BASE_PATH/2" "parent_name=fe_acl&parent_type=frontend"
    assert_equal "$SC" 200

-    assert_equal "$(get_json_path "${BODY}" ".data")" "$(cat ${BATS_TEST_DIRNAME}/data/post.json)"
+    assert_equal "$(get_json_path "${BODY}" ".")" "$(cat ${BATS_TEST_DIRNAME}/data/post.json)"
 }
--- a/e2e/tests/acls/get.bats
+++ b/e2e/tests/acls/get.bats
@ -27,10 +27,10 @@ load 'utils/_helpers'
    resource_get "$_ACL_BASE_PATH/2" "parent_name=fe_acl&parent_type=frontend"
    assert_equal "$SC" 200

-    assert_equal "$(get_json_path "$BODY" " .data.acl_name")" "local_dst"
-    assert_equal "$(get_json_path "$BODY" " .data.criterion")" "hdr(host)"
-    assert_equal "$(get_json_path "$BODY" " .data.index")" "2"
-    assert_equal "$(get_json_path "$BODY" " .data.value")" "-i localhost"
+    assert_equal "$(get_json_path "$BODY" " .acl_name")" "local_dst"
+    assert_equal "$(get_json_path "$BODY" " .criterion")" "hdr(host)"
+    assert_equal "$(get_json_path "$BODY" " .index")" "2"
+    assert_equal "$(get_json_path "$BODY" " .value")" "-i localhost"
 }

@test "acls: Return an error when ACL doesn't exists at a given index" {
--- a/e2e/tests/acls/list.bats
+++ b/e2e/tests/acls/list.bats
@ -26,18 +26,18 @@ load 'utils/_helpers'
    resource_get "$_ACL_BASE_PATH" "parent_name=fe_acl&parent_type=frontend"
    assert_equal $SC "200"

-    assert_equal "$(get_json_path "$BODY" " .data | .[2].acl_name" )" "local_dst"
-    assert_equal "$(get_json_path "$BODY" " .data | .[2].criterion" )" "hdr(host)"
-    assert_equal "$(get_json_path "$BODY" " .data | .[2].index" )" "2"
-    assert_equal "$(get_json_path "$BODY" " .data | .[2].value" )" "-i localhost"
+    assert_equal "$(get_json_path "$BODY" " . | .[2].acl_name" )" "local_dst"
+    assert_equal "$(get_json_path "$BODY" " . | .[2].criterion" )" "hdr(host)"
+    assert_equal "$(get_json_path "$BODY" " . | .[2].index" )" "2"
+    assert_equal "$(get_json_path "$BODY" " . | .[2].value" )" "-i localhost"
 }

@test "acls: Return ACL list by its name" {
    resource_get "$_ACL_BASE_PATH" "parent_name=fe_acl&parent_type=frontend&acl_name=invalid_src"
    assert_equal "$SC" 200

-    assert_equal "$(get_json_path "$BODY" " .data | .[1].acl_name" )" "invalid_src"
-    assert_equal "$(get_json_path "$BODY" " .data | .[1].criterion" )" "src_port"
-    assert_equal "$(get_json_path "$BODY" " .data | .[1].index" )" "1"
-    assert_equal "$(get_json_path "$BODY" " .data | .[1].value" )" "0:1023"
+    assert_equal "$(get_json_path "$BODY" " . | .[1].acl_name" )" "invalid_src"
+    assert_equal "$(get_json_path "$BODY" " . | .[1].criterion" )" "src_port"
+    assert_equal "$(get_json_path "$BODY" " . | .[1].index" )" "1"
+    assert_equal "$(get_json_path "$BODY" " . | .[1].value" )" "0:1023"
 }
--- a/e2e/tests/acls/replace.bats
+++ b/e2e/tests/acls/replace.bats
@ -32,7 +32,7 @@ load 'utils/_helpers'
    resource_get "$_ACL_BASE_PATH/2" "parent_name=fe_acl&parent_type=frontend"
    assert_equal "$SC" 200

-    assert_equal "$(get_json_path "$BODY" " .data" )" "$(cat "$BATS_TEST_DIRNAME/data/put.json")"
+    assert_equal "$(get_json_path "$BODY" " ." )" "$(cat "$BATS_TEST_DIRNAME/data/put.json")"
 }

@test "acls: Return an error when trying to replace non existing ACL" {
--- a/e2e/tests/backend_switching_rules/add.bats
+++ b/e2e/tests/backend_switching_rules/add.bats
@ -30,5 +30,5 @@ load 'utils/_helpers'
  # Checking the presence of applied backend switching rule
  #
 	resource_get "$_BSR_BASE_PATH/0" "frontend=test_frontend"
-	assert_equal "$(get_json_path "$BODY" ".data")" "$(get_json_path "$(cat $BATS_TEST_DIRNAME/data/post.json)" ".")"
+	assert_equal "$(get_json_path "$BODY" ".")" "$(get_json_path "$(cat $BATS_TEST_DIRNAME/data/post.json)" ".")"
 }
--- a/e2e/tests/backend_switching_rules/get.bats
+++ b/e2e/tests/backend_switching_rules/get.bats
@ -29,13 +29,13 @@ load 'utils/_helpers'
  #
  resource_get "$_BSR_BASE_PATH/0" "frontend=test_frontend"
 	assert_equal "$SC" 200
-	assert_equal "$(get_json_path "$BODY" ".data.cond_test")" "{ req_ssl_sni -i first.example.com }"
+	assert_equal "$(get_json_path "$BODY" ".cond_test")" "{ req_ssl_sni -i first.example.com }"
  #
  # Retrieving the second
  #
 	resource_get "$_BSR_BASE_PATH/1" "frontend=test_frontend"
 	assert_equal "$SC" 200
-	assert_equal "$(get_json_path "$BODY" ".data.cond_test")" "{ req_ssl_sni -i second.example.com }"
+	assert_equal "$(get_json_path "$BODY" ".cond_test")" "{ req_ssl_sni -i second.example.com }"
  #
  # Not found for non existing
  #
--- a/e2e/tests/backend_switching_rules/list.bats
+++ b/e2e/tests/backend_switching_rules/list.bats
@ -26,7 +26,7 @@ load 'utils/_helpers'
@test "backend_switching_rules: Replace a Backend Switching Rule" {
  resource_get "$_BSR_BASE_PATH" "frontend=test_frontend"
 	assert_equal "$SC" 200
-	assert_equal "$(get_json_path "$BODY" ".data | length")" 2
-	assert_equal "$(get_json_path "$BODY" ".data[0].cond_test")" "{ req_ssl_sni -i first.example.com }"
-	assert_equal "$(get_json_path "$BODY" ".data[1].cond_test")" "{ req_ssl_sni -i second.example.com }"
+	assert_equal "$(get_json_path "$BODY" ". | length")" 2
+	assert_equal "$(get_json_path "$BODY" ".[0].cond_test")" "{ req_ssl_sni -i first.example.com }"
+	assert_equal "$(get_json_path "$BODY" ".[1].cond_test")" "{ req_ssl_sni -i second.example.com }"
 }
--- a/e2e/tests/backends/test.bats
+++ b/e2e/tests/backends/test.bats
@ -27,10 +27,10 @@ load 'utils/_helpers'
  assert_equal "$SC" "201"

  resource_get "$_BACKEND_BASE_PATH/test_backend"  assert_equal "$SC" 200
-  assert_equal "$(get_json_path "$BODY" ".data.adv_check")" "httpchk"
-  assert_equal "$(get_json_path "$BODY" ".data.httpchk_params.method")" "GET"
-  assert_equal "$(get_json_path "$BODY" ".data.httpchk_params.uri")" "/check"
-  assert_equal "$(get_json_path "$BODY" ".data.httpchk_params.version")" "HTTP/1.1"
+  assert_equal "$(get_json_path "$BODY" ".adv_check")" "httpchk"
+  assert_equal "$(get_json_path "$BODY" ".httpchk_params.method")" "GET"
+  assert_equal "$(get_json_path "$BODY" ".httpchk_params.uri")" "/check"
+  assert_equal "$(get_json_path "$BODY" ".httpchk_params.version")" "HTTP/1.1"
 }

@test "backends: fail adding a backend (invalid send method in httpchk_params)" {
@ -48,7 +48,7 @@ load 'utils/_helpers'
@test "backends: Return a backend" {
 	resource_get "$_BACKEND_BASE_PATH/test_backend"
 	assert_equal "$SC" 200
-	assert_equal "test_backend" "$(get_json_path "$BODY" '.data.name')"
+	assert_equal "test_backend" "$(get_json_path "$BODY" '.name')"
 }

@test "backends: Replace a backend" {
@ -56,16 +56,16 @@ load 'utils/_helpers'
 	assert_equal "$SC" 200

 	resource_get "$_BACKEND_BASE_PATH/test_backend"  assert_equal "$SC" 200
-    assert_equal "$(get_json_path "$BODY" ".data.adv_check")" "httpchk"
-    assert_equal "$(get_json_path "$BODY" ".data.httpchk_params.method")" "GET"
-    assert_equal "$(get_json_path "$BODY" ".data.httpchk_params.uri")" "/healthz"
-    assert_equal "$(get_json_path "$BODY" ".data.httpchk_params.version")" "HTTP/1.1"
+    assert_equal "$(get_json_path "$BODY" ".adv_check")" "httpchk"
+    assert_equal "$(get_json_path "$BODY" ".httpchk_params.method")" "GET"
+    assert_equal "$(get_json_path "$BODY" ".httpchk_params.uri")" "/healthz"
+    assert_equal "$(get_json_path "$BODY" ".httpchk_params.version")" "HTTP/1.1"
 }

@test "backends: Return an array of backends" {
 	resource_get "$_BACKEND_BASE_PATH"
 	assert_equal "$SC" 200
-	assert_equal "test_backend" "$(get_json_path "$BODY" '.data[0].name')"
+	assert_equal "test_backend" "$(get_json_path "$BODY" '.[0].name')"
 }

@test "backends: Delete a backend" {
--- a/e2e/tests/backends/test_2.2.bats
+++ b/e2e/tests/backends/test_2.2.bats
@ -31,13 +31,13 @@ load 'utils/_helpers'
  assert_equal "$SC" "201"

  resource_get "$_BACKEND_BASE_PATH/test_backend"  assert_equal "$SC" 200
-  assert_equal "$(get_json_path "$BODY" ".data.\"http-check\".method")" "OPTIONS"
-  assert_equal "$(get_json_path "$BODY" ".data.\"http-check\".uri")" "/"
-  assert_equal "$(get_json_path "$BODY" ".data.\"http-check\".version")" "HTTP/1.1"
-  assert_equal "$(get_json_path "$BODY" ".data.adv_check")" "httpchk"
-  assert_equal "$(get_json_path "$BODY" ".data.httpchk_params.method")" "GET"
-  assert_equal "$(get_json_path "$BODY" ".data.httpchk_params.uri")" "/check"
-  assert_equal "$(get_json_path "$BODY" ".data.httpchk_params.version")" "HTTP/1.1"
+  assert_equal "$(get_json_path "$BODY" ".\"http-check\".method")" "OPTIONS"
+  assert_equal "$(get_json_path "$BODY" ".\"http-check\".uri")" "/"
+  assert_equal "$(get_json_path "$BODY" ".\"http-check\".version")" "HTTP/1.1"
+  assert_equal "$(get_json_path "$BODY" ".adv_check")" "httpchk"
+  assert_equal "$(get_json_path "$BODY" ".httpchk_params.method")" "GET"
+  assert_equal "$(get_json_path "$BODY" ".httpchk_params.uri")" "/check"
+  assert_equal "$(get_json_path "$BODY" ".httpchk_params.version")" "HTTP/1.1"
  fi
 }

@ -48,13 +48,13 @@ load 'utils/_helpers'
 	assert_equal "$SC" 200

 	resource_get "$_BACKEND_BASE_PATH/test_backend"  assert_equal "$SC" 200
-    assert_equal "$(get_json_path "$BODY" ".data.\"http-check\".method")" "OPTIONS"
-    assert_equal "$(get_json_path "$BODY" ".data.\"http-check\".uri")" "/"
-    assert_equal "$(get_json_path "$BODY" ".data.\"http-check\".version")" "HTTP/1.1"
-    assert_equal "$(get_json_path "$BODY" ".data.adv_check")" "httpchk"
-    assert_equal "$(get_json_path "$BODY" ".data.httpchk_params.method")" "GET"
-    assert_equal "$(get_json_path "$BODY" ".data.httpchk_params.uri")" "/healthz"
-    assert_equal "$(get_json_path "$BODY" ".data.httpchk_params.version")" "HTTP/1.1"
+    assert_equal "$(get_json_path "$BODY" ".\"http-check\".method")" "OPTIONS"
+    assert_equal "$(get_json_path "$BODY" ".\"http-check\".uri")" "/"
+    assert_equal "$(get_json_path "$BODY" ".\"http-check\".version")" "HTTP/1.1"
+    assert_equal "$(get_json_path "$BODY" ".adv_check")" "httpchk"
+    assert_equal "$(get_json_path "$BODY" ".httpchk_params.method")" "GET"
+    assert_equal "$(get_json_path "$BODY" ".httpchk_params.uri")" "/healthz"
+    assert_equal "$(get_json_path "$BODY" ".httpchk_params.version")" "HTTP/1.1"
  fi
 }

--- a/e2e/tests/binds/add.bats
+++ b/e2e/tests/binds/add.bats
@ -36,8 +36,8 @@ load 'utils/_helpers'
  then
    resource_get "$_BIND_BASE_PATH/test_bind" "frontend=test_frontend&force_reload=true"
    assert_equal "$SC" 200
-    assert_equal "$(get_json_path "$BODY" '.data.name')" "test_bind"
-    assert_equal "1/all" "$(get_json_path "$BODY" ".data.thread")"
-    assert_equal "$(get_json_path "$BODY" '.data.ca_verify_file')" "/certs/ca-verify.pem"
+    assert_equal "$(get_json_path "$BODY" '.name')" "test_bind"
+    assert_equal "1/all" "$(get_json_path "$BODY" ".thread")"
+    assert_equal "$(get_json_path "$BODY" '.ca_verify_file')" "/certs/ca-verify.pem"
  fi
 }
--- a/e2e/tests/binds/add_2.8.bats
+++ b/e2e/tests/binds/add_2.8.bats
@ -32,8 +32,8 @@ load 'utils/_helpers'

    resource_get "$_BIND_BASE_PATH/test_bind" "frontend=test_frontend&force_reload=true"
    assert_equal "$SC" 200
-    assert_equal "$(get_json_path "$BODY" '.data.name')" "test_bind"
-    assert_equal "$(get_json_path "$BODY" ".data.no_alpn")" "true"
-    assert_equal "$(get_json_path "$BODY" '.data.ca_verify_file')" "/certs/ca-verify.pem"
+    assert_equal "$(get_json_path "$BODY" '.name')" "test_bind"
+    assert_equal "$(get_json_path "$BODY" ".no_alpn")" "true"
+    assert_equal "$(get_json_path "$BODY" '.ca_verify_file')" "/certs/ca-verify.pem"
  fi
 }
--- a/e2e/tests/binds/get.bats
+++ b/e2e/tests/binds/get.bats
@ -27,10 +27,10 @@ load 'utils/_helpers'
@test "binds: Return one bind" {
  resource_get "$_BIND_BASE_PATH/fixture" "frontend=test_frontend&force_reload=true"
  assert_equal "$SC" 200
-  assert_equal "$(get_json_path "$BODY" '.data.name')" "fixture"
+  assert_equal "$(get_json_path "$BODY" '.name')" "fixture"
  if haproxy_version_ge "2.5"
  then
-    assert_equal "all" "$(get_json_path "$BODY" ".data.thread")"
-    assert_equal "$(get_json_path "$BODY" '.data.ca_verify_file')" "/certs/ca-verify.pem"
+    assert_equal "all" "$(get_json_path "$BODY" ".thread")"
+    assert_equal "$(get_json_path "$BODY" '.ca_verify_file')" "/certs/ca-verify.pem"
  fi
 }
--- a/e2e/tests/binds/list.bats
+++ b/e2e/tests/binds/list.bats
@ -30,17 +30,17 @@ load 'utils/_helpers'

  if haproxy_version_ge "2.5"
  then
-    assert_equal 3 "$(get_json_path "$BODY" ".data | length")"
+    assert_equal 3 "$(get_json_path "$BODY" ". | length")"
  else
-    assert_equal 2 "$(get_json_path "$BODY" ".data | length")"
+    assert_equal 2 "$(get_json_path "$BODY" ". | length")"
  fi
-  assert_equal "fixture" "$(get_json_path "$BODY" ".data[0].name")"
-  assert_equal "loopback" "$(get_json_path "$BODY" ".data[1].name")"
+  assert_equal "fixture" "$(get_json_path "$BODY" ".[0].name")"
+  assert_equal "loopback" "$(get_json_path "$BODY" ".[1].name")"
  if haproxy_version_ge "2.5"
  then
-    assert_equal "all" "$(get_json_path "$BODY" ".data[0].thread")"
-    assert_equal "1/1" "$(get_json_path "$BODY" ".data[1].thread")"
-    assert_equal "loopback1" "$(get_json_path "$BODY" ".data[2].name")"
-    assert_equal "1/1-1" "$(get_json_path "$BODY" ".data[2].thread")"
+    assert_equal "all" "$(get_json_path "$BODY" ".[0].thread")"
+    assert_equal "1/1" "$(get_json_path "$BODY" ".[1].thread")"
+    assert_equal "loopback1" "$(get_json_path "$BODY" ".[2].name")"
+    assert_equal "1/1-1" "$(get_json_path "$BODY" ".[2].thread")"
  fi
 }
--- a/e2e/tests/binds/replace.bats
+++ b/e2e/tests/binds/replace.bats
@ -29,5 +29,5 @@ load 'utils/_helpers'

 	resource_get "$_BIND_BASE_PATH/fixture" "frontend=test_frontend&force_reload=true"
 	assert_equal "$SC" 200
-	assert_equal "$(get_json_path "$BODY" '.data')" "$(cat "$BATS_TEST_DIRNAME/data/put.json")"
+	assert_equal "$(get_json_path "$BODY" '.')" "$(cat "$BATS_TEST_DIRNAME/data/put.json")"
 }
--- a/e2e/tests/binds/replace_2.8.bats
+++ b/e2e/tests/binds/replace_2.8.bats
@ -34,6 +34,6 @@ load 'utils/_helpers'

 	resource_get "$_BIND_BASE_PATH/fixture" "frontend=test_frontend&force_reload=true"
 	assert_equal "$SC" 200
-	assert_equal "$(get_json_path "$BODY" '.data')" "$(cat "$BATS_TEST_DIRNAME/$PUT_FILE")"
+	assert_equal "$(get_json_path "$BODY" '.')" "$(cat "$BATS_TEST_DIRNAME/$PUT_FILE")"
  fi
 }
--- a/e2e/tests/cache/create.bats
+++ b/e2e/tests/cache/create.bats
@ -29,9 +29,9 @@ load 'utils/_helpers'

  resource_get "$_CACHE_BASE_PATH/cache_created"
  assert_equal "$SC" 200
-  assert_equal "cache_created" "$(get_json_path "$BODY" ".data.name")"
-  assert_equal 1 "$(get_json_path "$BODY" ".data.max_object_size")"
-  assert_equal 1000 "$(get_json_path "$BODY" ".data.total_max_size")"
+  assert_equal "cache_created" "$(get_json_path "$BODY" ".name")"
+  assert_equal 1 "$(get_json_path "$BODY" ".max_object_size")"
+  assert_equal 1000 "$(get_json_path "$BODY" ".total_max_size")"
 }


--- a/e2e/tests/cache/get.bats
+++ b/e2e/tests/cache/get.bats
@ -26,10 +26,10 @@ load 'utils/_helpers'
@test "cache: Return one cache by name" {
  resource_get "$_CACHE_BASE_PATH/test_cache"
  assert_equal "$SC" 200
-  assert_equal "test_cache" "$(get_json_path "$BODY" ".data.name")"
-  assert_equal 60 "$(get_json_path "$BODY" ".data.max_age")"
-  assert_equal 8 "$(get_json_path "$BODY" ".data.max_object_size")"
-  assert_equal 1024 "$(get_json_path "$BODY" ".data.total_max_size")"
+  assert_equal "test_cache" "$(get_json_path "$BODY" ".name")"
+  assert_equal 60 "$(get_json_path "$BODY" ".max_age")"
+  assert_equal 8 "$(get_json_path "$BODY" ".max_object_size")"
+  assert_equal 1024 "$(get_json_path "$BODY" ".total_max_size")"
 }


--- a/e2e/tests/cache/list.bats
+++ b/e2e/tests/cache/list.bats
@ -26,18 +26,18 @@ load 'utils/_helpers'
@test "cache: Return an array of caches" {
  resource_get "$_CACHE_BASE_PATH"
  assert_equal "$SC" 200
-  assert_equal 2 "$(get_json_path "$BODY" ".data | length")"
+  assert_equal 2 "$(get_json_path "$BODY" ". | length")"

  for (( i=0; i<=1; i++ ))
  do
-    if [ "$(get_json_path "$BODY" ".data[$i].name")" == "test_cache" ]
+    if [ "$(get_json_path "$BODY" ".[$i].name")" == "test_cache" ]
    then
-      assert_equal 60 "$(get_json_path "$BODY" ".data[$i].max_age")"
-      assert_equal 8 "$(get_json_path "$BODY" ".data[$i].max_object_size")"
-      assert_equal 1024 "$(get_json_path "$BODY" ".data[$i].total_max_size")"
-    elif [ "$(get_json_path "$BODY" ".data[$i].name")" == "test_cache2" ]
+      assert_equal 60 "$(get_json_path "$BODY" ".[$i].max_age")"
+      assert_equal 8 "$(get_json_path "$BODY" ".[$i].max_object_size")"
+      assert_equal 1024 "$(get_json_path "$BODY" ".[$i].total_max_size")"
+    elif [ "$(get_json_path "$BODY" ".[$i].name")" == "test_cache2" ]
 	then
-      assert_equal 1024 "$(get_json_path "$BODY" ".data[$i].total_max_size")"
+      assert_equal 1024 "$(get_json_path "$BODY" ".[$i].total_max_size")"
    else
      assert_failure
    fi
--- a/e2e/tests/cache/replace.bats
+++ b/e2e/tests/cache/replace.bats
@ -29,9 +29,9 @@ load 'utils/_helpers'

  resource_get "$_CACHE_BASE_PATH/test_cache"
  assert_equal "$SC" 200
-  assert_equal "test_cache" "$(get_json_path "$BODY" ".data.name")"
-  assert_equal 1 "$(get_json_path "$BODY" ".data.max_object_size")"
-  assert_equal 1000 "$(get_json_path "$BODY" ".data.total_max_size")"
+  assert_equal "test_cache" "$(get_json_path "$BODY" ".name")"
+  assert_equal 1 "$(get_json_path "$BODY" ".max_object_size")"
+  assert_equal 1000 "$(get_json_path "$BODY" ".total_max_size")"
 }


--- a/e2e/tests/captures/get.bats
+++ b/e2e/tests/captures/get.bats
@ -26,15 +26,15 @@ load 'utils/_helpers'
@test "captures: Get one declare capture request" {
    resource_get "$_CAPTURES_BASE_PATH/0" "frontend=test"
    assert_equal "$SC" 200
-    assert_equal "$(get_json_path "${BODY}" ".data.type")" "request"
-    assert_equal "$(get_json_path "${BODY}" ".data.length")" 1
+    assert_equal "$(get_json_path "${BODY}" ".type")" "request"
+    assert_equal "$(get_json_path "${BODY}" ".length")" 1
 }

@test "captures: Get one declare capture response" {
    resource_get "$_CAPTURES_BASE_PATH/1" "frontend=test"
    assert_equal "$SC" 200
-    assert_equal "$(get_json_path "${BODY}" ".data.type")" "response"
-    assert_equal "$(get_json_path "${BODY}" ".data.length")" 2
+    assert_equal "$(get_json_path "${BODY}" ".type")" "response"
+    assert_equal "$(get_json_path "${BODY}" ".length")" 2
 }

@test "captures: Get one non existing declare capture" {
@ -50,29 +50,29 @@ load 'utils/_helpers'
@test "captures: Get first declare capture request" {
    resource_get "$_CAPTURES_BASE_PATH/0" "frontend=test_second"
    assert_equal "$SC" 200
-    assert_equal "$(get_json_path "${BODY}" ".data.type")" "request"
-    assert_equal "$(get_json_path "${BODY}" ".data.length")" 111
+    assert_equal "$(get_json_path "${BODY}" ".type")" "request"
+    assert_equal "$(get_json_path "${BODY}" ".length")" 111
 }

@test "captures: Get second declare capture request" {
    resource_get "$_CAPTURES_BASE_PATH/1" "frontend=test_second"
    assert_equal "$SC" 200
-    assert_equal "$(get_json_path "${BODY}" ".data.type")" "response"
-    assert_equal "$(get_json_path "${BODY}" ".data.length")" 222
+    assert_equal "$(get_json_path "${BODY}" ".type")" "response"
+    assert_equal "$(get_json_path "${BODY}" ".length")" 222
 }

@test "captures: Get third declare capture request" {
    resource_get "$_CAPTURES_BASE_PATH/2" "frontend=test_second"
    assert_equal "$SC" 200
-    assert_equal "$(get_json_path "${BODY}" ".data.type")" "request"
-    assert_equal "$(get_json_path "${BODY}" ".data.length")" 8888
+    assert_equal "$(get_json_path "${BODY}" ".type")" "request"
+    assert_equal "$(get_json_path "${BODY}" ".length")" 8888
 }

@test "captures: Get fourth declare capture request" {
    resource_get "$_CAPTURES_BASE_PATH/3" "frontend=test_second"
    assert_equal "$SC" 200
-    assert_equal "$(get_json_path "${BODY}" ".data.type")" "response"
-    assert_equal "$(get_json_path "${BODY}" ".data.length")" 9999
+    assert_equal "$(get_json_path "${BODY}" ".type")" "response"
+    assert_equal "$(get_json_path "${BODY}" ".length")" 9999
 }

@test "captures: Get fifth declare capture request" {
--- a/e2e/tests/captures/list.bats
+++ b/e2e/tests/captures/list.bats
@ -26,19 +26,19 @@ load 'utils/_helpers'
@test "captures: Return an array of all declare captures from the test frontend" {
  resource_get "$_CAPTURES_BASE_PATH" "frontend=test"
 	assert_equal "$SC" 200
-  assert_equal "$(get_json_path "${BODY}" ".data | length")" 2
+  assert_equal "$(get_json_path "${BODY}" ". | length")" 2
 }

@test "captures: Return an array of all declare captures from the test_second frontend" {
  resource_get "$_CAPTURES_BASE_PATH" "frontend=test_second"
 	assert_equal "$SC" 200
-  assert_equal "$(get_json_path "${BODY}" ".data | length")" 4
+  assert_equal "$(get_json_path "${BODY}" ". | length")" 4
 }

@test "captures: Return an array of all declare captures from the test_empty frontend" {
  resource_get "$_CAPTURES_BASE_PATH" "frontend=test_empty"
 	assert_equal "$SC" 200
-  assert_equal "$(get_json_path "${BODY}" ".data | length")" 0
+  assert_equal "$(get_json_path "${BODY}" ". | length")" 0
 }

@test "captures: Return an array of all declare captures from a non existing frontend" {
--- a/e2e/tests/defaults/create.bats
+++ b/e2e/tests/defaults/create.bats
@ -32,10 +32,10 @@ load 'utils/_helpers'
  resource_get "$_NAMED_DEFAULTS_BASE_PATH/created"
  assert_equal "$SC" 200

-  assert_equal "$(get_json_path "$BODY" '.data.name')" "created"
-  assert_equal "$(get_json_path "$BODY" '.data.server_timeout')" "20000"
-  assert_equal "$(get_json_path "$BODY" '.data.client_timeout')" "20000"
-  assert_equal "$(get_json_path "$BODY" '.data.mode')" "http"
+  assert_equal "$(get_json_path "$BODY" '.name')" "created"
+  assert_equal "$(get_json_path "$BODY" '.server_timeout')" "20000"
+  assert_equal "$(get_json_path "$BODY" '.client_timeout')" "20000"
+  assert_equal "$(get_json_path "$BODY" '.mode')" "http"
 }

@test "defaults: Create a named defaults configuration that already exists" {
@ -58,9 +58,9 @@ load 'utils/_helpers'
  resource_get "$_NAMED_DEFAULTS_BASE_PATH/created_with_from"
  assert_equal "$SC" 200

-  assert_equal "$(get_json_path "$BODY" '.data.name')" "created_with_from"
-  assert_equal "$(get_json_path "$BODY" '.data.from')" "created"
-  assert_equal "$(get_json_path "$BODY" '.data.server_timeout')" "20000"
-  assert_equal "$(get_json_path "$BODY" '.data.client_timeout')" "20000"
-  assert_equal "$(get_json_path "$BODY" '.data.mode')" "http"
+  assert_equal "$(get_json_path "$BODY" '.name')" "created_with_from"
+  assert_equal "$(get_json_path "$BODY" '.from')" "created"
+  assert_equal "$(get_json_path "$BODY" '.server_timeout')" "20000"
+  assert_equal "$(get_json_path "$BODY" '.client_timeout')" "20000"
+  assert_equal "$(get_json_path "$BODY" '.mode')" "http"
 }
--- a/e2e/tests/defaults/get.bats
+++ b/e2e/tests/defaults/get.bats
@ -26,21 +26,21 @@ load 'utils/_helpers'
@test "defaults: Return a defaults configuration" {
  resource_get "$_DEFAULTS_BASE_PATH"
  assert_equal "$SC" 200
-  assert_equal "$(get_json_path "$BODY" '.data.mode')" "http"
-  assert_equal "$(get_json_path "$BODY" '.data.balance.algorithm')" "roundrobin"
-  assert_equal "$(get_json_path "$BODY" '.data.client_timeout')" "30000"
+  assert_equal "$(get_json_path "$BODY" '.mode')" "http"
+  assert_equal "$(get_json_path "$BODY" '.balance.algorithm')" "roundrobin"
+  assert_equal "$(get_json_path "$BODY" '.client_timeout')" "30000"
 }

@test "defaults: Return a list of named defaults configurations" {
  resource_get "$_NAMED_DEFAULTS_BASE_PATH"
  assert_equal "$SC" 200
-  assert_equal "$(get_json_path "$BODY" '.data[0].name')" "unnamed_defaults_1"
+  assert_equal "$(get_json_path "$BODY" '.[0].name')" "unnamed_defaults_1"
 }

@test "defaults: Return a named defaults configuration" {
  resource_get "$_NAMED_DEFAULTS_BASE_PATH/unnamed_defaults_1"
  assert_equal "$SC" 200
-  assert_equal "$(get_json_path "$BODY" '.data.name')" "unnamed_defaults_1"
+  assert_equal "$(get_json_path "$BODY" '.name')" "unnamed_defaults_1"
 }

@test "defaults: Return a named defaults configuration that does not exist" {
--- a/e2e/tests/defaults/replace.bats
+++ b/e2e/tests/defaults/replace.bats
@ -30,9 +30,9 @@ load 'utils/_helpers'
  resource_get "$_DEFAULTS_BASE_PATH" ""
  assert_equal "$SC" 200

-  assert_equal "$(get_json_path "$BODY" '.data.server_timeout')" "25000"
-  assert_equal "$(get_json_path "$BODY" '.data.client_timeout')" "25000"
-  assert_equal "$(get_json_path "$BODY" '.data.mode')" "tcp"
+  assert_equal "$(get_json_path "$BODY" '.server_timeout')" "25000"
+  assert_equal "$(get_json_path "$BODY" '.client_timeout')" "25000"
+  assert_equal "$(get_json_path "$BODY" '.mode')" "tcp"
 }

@test "defaults: Replace a named defaults configuration" {
@ -42,10 +42,10 @@ load 'utils/_helpers'
  resource_get "$_NAMED_DEFAULTS_BASE_PATH/unnamed_defaults_1"
  assert_equal "$SC" 200

-  assert_equal "$(get_json_path "$BODY" '.data.name')" "unnamed_defaults_1"
-  assert_equal "$(get_json_path "$BODY" '.data.server_timeout')" "25000"
-  assert_equal "$(get_json_path "$BODY" '.data.client_timeout')" "25000"
-  assert_equal "$(get_json_path "$BODY" '.data.mode')" "tcp"
+  assert_equal "$(get_json_path "$BODY" '.name')" "unnamed_defaults_1"
+  assert_equal "$(get_json_path "$BODY" '.server_timeout')" "25000"
+  assert_equal "$(get_json_path "$BODY" '.client_timeout')" "25000"
+  assert_equal "$(get_json_path "$BODY" '.mode')" "tcp"
 }

@test "defaults: Replace a named defaults configuration that does not exist" {
--- a/e2e/tests/dgram_binds/test.bats
+++ b/e2e/tests/dgram_binds/test.bats
@ -37,7 +37,7 @@ load 'utils/_helpers'
  then
    resource_get "$_DGRAMBIND_BASE_PATH/test_dgram_bind" "log_forward=sylog-loadb"
    assert_equal "$SC" 200
-    assert_equal "test_dgram_bind" "$(get_json_path "$BODY" '.data.name')"
+    assert_equal "test_dgram_bind" "$(get_json_path "$BODY" '.name')"
  fi
 }

@ -54,7 +54,7 @@ load 'utils/_helpers'
  then
    resource_get "$_DGRAMBIND_BASE_PATH" "log_forward=sylog-loadb"
    assert_equal "$SC" 200
-    assert_equal "test_dgram_bind" "$(get_json_path "$BODY" '.data[0].name')"
+    assert_equal "test_dgram_bind" "$(get_json_path "$BODY" '.[0].name')"
  fi
 }

--- a/e2e/tests/fcgi_app/create.bats
+++ b/e2e/tests/fcgi_app/create.bats
@ -29,8 +29,8 @@ load 'utils/_helpers'

  resource_get "$_FCGIAPP_BASE_PATH/app_created"
  assert_equal "$SC" 200
-  assert_equal "app_created" "$(get_json_path "$BODY" ".data.name")"
-  assert_equal "/path/to/chroot" "$(get_json_path "$BODY" ".data.docroot")"
+  assert_equal "app_created" "$(get_json_path "$BODY" ".name")"
+  assert_equal "/path/to/chroot" "$(get_json_path "$BODY" ".docroot")"
 }

@test "fcgi-app: Fail creating app with same name" {
--- a/e2e/tests/fcgi_app/get.bats
+++ b/e2e/tests/fcgi_app/get.bats
@ -26,8 +26,8 @@ load 'utils/_helpers'
@test "fcgi-app: Return one app by name" {
  resource_get "$_FCGIAPP_BASE_PATH/test_1"
  assert_equal "$SC" 200
-  assert_equal "test_1" "$(get_json_path "$BODY" ".data.name")"
-  assert_equal "index.php" "$(get_json_path "$BODY" ".data.index")"
+  assert_equal "test_1" "$(get_json_path "$BODY" ".name")"
+  assert_equal "index.php" "$(get_json_path "$BODY" ".index")"
 }

@test "fcgi-app: Fail returning app that doesn't exist" {
--- a/e2e/tests/fcgi_app/list.bats
+++ b/e2e/tests/fcgi_app/list.bats
@ -26,5 +26,5 @@ load 'utils/_helpers'
@test "fcgi-app: Return an array of caches" {
  resource_get "$_FCGIAPP_BASE_PATH"
  assert_equal "$SC" 200
-  assert_equal 2 "$(get_json_path "$BODY" ".data | length")"
+  assert_equal 2 "$(get_json_path "$BODY" ". | length")"
 }
--- a/e2e/tests/fcgi_app/replace.bats
+++ b/e2e/tests/fcgi_app/replace.bats
@ -29,8 +29,8 @@ load 'utils/_helpers'

  resource_get "$_FCGIAPP_BASE_PATH/test_1"
  assert_equal "$SC" 200
-  assert_equal "test_1" "$(get_json_path "$BODY" ".data.name")"
-  assert_equal "$(get_json_path "${BODY}" ".data.log_stder | length")" 0
+  assert_equal "test_1" "$(get_json_path "$BODY" ".name")"
+  assert_equal "$(get_json_path "${BODY}" ".log_stder | length")" 0
 }

@test "fcgi-app: Fail replacing cache that doesn't exist" {
--- a/e2e/tests/frontends/test.bats
+++ b/e2e/tests/frontends/test.bats
@ -30,7 +30,7 @@ load 'utils/_helpers'
@test "frontends: Return a frontend" {
  resource_get "$_FRONTEND_BASE_PATH/test_frontend"
  assert_equal "$SC" 200
-  assert_equal "test_frontend" "$(get_json_path "$BODY" '.data.name')"
+  assert_equal "test_frontend" "$(get_json_path "$BODY" '.name')"
 }

@test "frontends: Replace a frontend" {
@ -40,14 +40,14 @@ load 'utils/_helpers'
  # Retrieving the current data
  #
 	resource_get "$_FRONTEND_BASE_PATH/test_frontend"
-	assert_equal "http-keep-alive" "$(get_json_path "$BODY" '.data.http_connection_mode')"
-	assert_equal "http" "$(get_json_path "$BODY" '.data.mode')"
+	assert_equal "http-keep-alive" "$(get_json_path "$BODY" '.http_connection_mode')"
+	assert_equal "http" "$(get_json_path "$BODY" '.mode')"
 }

@test "frontends: Return an array of frontends" {
  resource_get "$_FRONTEND_BASE_PATH"
 	assert_equal "$SC" 200
-	assert_equal "$(get_json_path "$BODY" '.data[0].name')" "test_frontend"
+	assert_equal "$(get_json_path "$BODY" '.[0].name')" "test_frontend"
 }

@test "frontends: Delete a frontend" {
--- a/e2e/tests/global/get.bats
+++ b/e2e/tests/global/get.bats
@ -27,19 +27,19 @@ load 'utils/_helpers'
@test "global: Return a global configuration" {
  resource_get "$_GLOBAL_BASE_PATH"
  assert_equal "$SC" 200
-  assert_equal "$(get_json_path "$BODY" '.data.chroot')" "/var/lib/haproxy"
-  assert_equal "$(get_json_path "$BODY" '.data.user')" "haproxy"
-  assert_equal "$(get_json_path "$BODY" '.data.group')" "haproxy"
-  assert_equal "$(get_json_path "$BODY" '.data.maxconn')" "4000"
-  assert_equal "$(get_json_path "$BODY" '.data.pidfile')" "/var/run/haproxy.pid"
-  assert_equal "$(get_json_path "$BODY" '.data.runtime_apis[0].address')" "/var/lib/haproxy/stats"
-  assert_equal "$(get_json_path "$BODY" '.data.runtime_apis[0].level')" "admin"
+  assert_equal "$(get_json_path "$BODY" '.chroot')" "/var/lib/haproxy"
+  assert_equal "$(get_json_path "$BODY" '.user')" "haproxy"
+  assert_equal "$(get_json_path "$BODY" '.group')" "haproxy"
+  assert_equal "$(get_json_path "$BODY" '.maxconn')" "4000"
+  assert_equal "$(get_json_path "$BODY" '.pidfile')" "/var/run/haproxy.pid"
+  assert_equal "$(get_json_path "$BODY" '.runtime_apis[0].address')" "/var/lib/haproxy/stats"
+  assert_equal "$(get_json_path "$BODY" '.runtime_apis[0].level')" "admin"
  if haproxy_version_ge "2.8"; then
-      assert_equal "$(get_json_path "$BODY" '.data.tune_options.ssl_ocsp_update_min_delay')" "10"
-      assert_equal "$(get_json_path "$BODY" '.data.tune_options.stick_counters')" "50"
-      assert_equal "$(get_json_path "$BODY" '.data.tune_options.h2_be_initial_window_size')" "10"
-      assert_equal "$(get_json_path "$BODY" '.data.tune_options.h2_be_max_concurrent_streams')" "11"
-      assert_equal "$(get_json_path "$BODY" '.data.tune_options.h2_fe_initial_window_size')" "12"
-      assert_equal "$(get_json_path "$BODY" '.data.tune_options.h2_fe_max_concurrent_streams')" "13"
+      assert_equal "$(get_json_path "$BODY" '.tune_options.ssl_ocsp_update_min_delay')" "10"
+      assert_equal "$(get_json_path "$BODY" '.tune_options.stick_counters')" "50"
+      assert_equal "$(get_json_path "$BODY" '.tune_options.h2_be_initial_window_size')" "10"
+      assert_equal "$(get_json_path "$BODY" '.tune_options.h2_be_max_concurrent_streams')" "11"
+      assert_equal "$(get_json_path "$BODY" '.tune_options.h2_fe_initial_window_size')" "12"
+      assert_equal "$(get_json_path "$BODY" '.tune_options.h2_fe_max_concurrent_streams')" "13"
  fi
 }
--- a/e2e/tests/global/replace.bats
+++ b/e2e/tests/global/replace.bats
@ -29,11 +29,11 @@ load 'utils/_helpers'

 	resource_get "$_GLOBAL_BASE_PATH" ""
 	assert_equal "$SC" 200
-	assert_equal "$(get_json_path "$BODY" '.data.maxconn')" "5000"
-	assert_equal "$(get_json_path "$BODY" '.data.daemon')" "enabled"
-	assert_equal "$(get_json_path "$BODY" '.data.pidfile')" "/var/run/haproxy.pid"
-	assert_equal "$(get_json_path "$BODY" '.data.runtime_apis[0].address')" "/var/lib/haproxy/stats"
-	assert_equal "$(get_json_path "$BODY" '.data.runtime_apis[0].level')" "admin"
+	assert_equal "$(get_json_path "$BODY" '.maxconn')" "5000"
+	assert_equal "$(get_json_path "$BODY" '.daemon')" "enabled"
+	assert_equal "$(get_json_path "$BODY" '.pidfile')" "/var/run/haproxy.pid"
+	assert_equal "$(get_json_path "$BODY" '.runtime_apis[0].address')" "/var/lib/haproxy/stats"
+	assert_equal "$(get_json_path "$BODY" '.runtime_apis[0].level')" "admin"
 }


@ -43,11 +43,11 @@ load 'utils/_helpers'

 	resource_get "$_GLOBAL_BASE_PATH" ""
 	assert_equal "$SC" 200
-	assert_equal "$(get_json_path "$BODY" '.data.maxconn')" "5000"
-	assert_equal "$(get_json_path "$BODY" '.data.daemon')" "enabled"
-	assert_equal "$(get_json_path "$BODY" '.data.pidfile')" "/var/run/haproxy.pid"
-	assert_equal "$(get_json_path "$BODY" '.data.runtime_apis[0].address')" "/var/lib/haproxy/stats-new"
-	assert_equal "$(get_json_path "$BODY" '.data.runtime_apis[0].level')" "admin"
+	assert_equal "$(get_json_path "$BODY" '.maxconn')" "5000"
+	assert_equal "$(get_json_path "$BODY" '.daemon')" "enabled"
+	assert_equal "$(get_json_path "$BODY" '.pidfile')" "/var/run/haproxy.pid"
+	assert_equal "$(get_json_path "$BODY" '.runtime_apis[0].address')" "/var/lib/haproxy/stats-new"
+	assert_equal "$(get_json_path "$BODY" '.runtime_apis[0].level')" "admin"

 	# check that runtime client has been reconfigured with the new socket
 	sleep 5
@ -74,11 +74,11 @@ load 'utils/_helpers'
    # check configuration has been applied
 	resource_get "$_GLOBAL_BASE_PATH" ""
 	assert_equal "$SC" 200
-	assert_equal "$(get_json_path "$BODY" '.data.maxconn')" "5000"
-	assert_equal "$(get_json_path "$BODY" '.data.daemon')" "enabled"
-	assert_equal "$(get_json_path "$BODY" '.data.pidfile')" "/var/run/haproxy.pid"
-	assert_equal "$(get_json_path "$BODY" '.data.runtime_apis[0].address')" "/var/lib/haproxy/stats-new"
-	assert_equal "$(get_json_path "$BODY" '.data.runtime_apis[0].level')" "admin"
+	assert_equal "$(get_json_path "$BODY" '.maxconn')" "5000"
+	assert_equal "$(get_json_path "$BODY" '.daemon')" "enabled"
+	assert_equal "$(get_json_path "$BODY" '.pidfile')" "/var/run/haproxy.pid"
+	assert_equal "$(get_json_path "$BODY" '.runtime_apis[0].address')" "/var/lib/haproxy/stats-new"
+	assert_equal "$(get_json_path "$BODY" '.runtime_apis[0].level')" "admin"

 	# check that runtime client has been reconfigured with the new socket
 	sleep 5
@ -91,7 +91,7 @@ load 'utils/_helpers'
    # check HAPRoxy is configured with the expected socket
 	resource_get "$_GLOBAL_BASE_PATH" ""
 	assert_equal "$SC" 200
-	assert_equal "$(get_json_path "$BODY" '.data.runtime_apis[0].address')" "/var/lib/haproxy/stats"
+	assert_equal "$(get_json_path "$BODY" '.runtime_apis[0].address')" "/var/lib/haproxy/stats"

    pre_logs_count=$(dpa_docker_exec 'cat /var/log/dataplaneapi.log' | wc -l)

@ -102,7 +102,7 @@ load 'utils/_helpers'
    # check configuration has been reloaded
    resource_get "$_GLOBAL_BASE_PATH" ""
 	assert_equal "$SC" 200
-	assert_equal "$(get_json_path "$BODY" '.data.runtime_apis[0].address')" "/var/lib/haproxy/stats-new"
+	assert_equal "$(get_json_path "$BODY" '.runtime_apis[0].address')" "/var/lib/haproxy/stats-new"

    # check that runtime client has been reconfigured with the new socket
    post_logs_count=$(dpa_docker_exec 'sh /var/log/dataplaneapi.log' | wc -l)
--- a/e2e/tests/global/replace_2.8.bats
+++ b/e2e/tests/global/replace_2.8.bats
@ -32,14 +32,14 @@ load 'utils/_helpers'

 	resource_get "$_GLOBAL_BASE_PATH" ""
 	assert_equal "$SC" 200
-	assert_equal "$(get_json_path "$BODY" '.data.maxconn')" "5000"
-	assert_equal "$(get_json_path "$BODY" '.data.daemon')" "enabled"
-	assert_equal "$(get_json_path "$BODY" '.data.pidfile')" "/var/run/haproxy.pid"
-	assert_equal "$(get_json_path "$BODY" '.data.runtime_apis[0].address')" "/var/lib/haproxy/stats"
-	assert_equal "$(get_json_path "$BODY" '.data.runtime_apis[0].level')" "admin"
-	assert_equal "$(get_json_path "$BODY" '.data.tune_options.h2_be_initial_window_size')" "20"
-    assert_equal "$(get_json_path "$BODY" '.data.tune_options.h2_be_max_concurrent_streams')" "21"
-	assert_equal "$(get_json_path "$BODY" '.data.tune_options.h2_fe_initial_window_size')" "22"
-    assert_equal "$(get_json_path "$BODY" '.data.tune_options.h2_fe_max_concurrent_streams')" "23"
+	assert_equal "$(get_json_path "$BODY" '.maxconn')" "5000"
+	assert_equal "$(get_json_path "$BODY" '.daemon')" "enabled"
+	assert_equal "$(get_json_path "$BODY" '.pidfile')" "/var/run/haproxy.pid"
+	assert_equal "$(get_json_path "$BODY" '.runtime_apis[0].address')" "/var/lib/haproxy/stats"
+	assert_equal "$(get_json_path "$BODY" '.runtime_apis[0].level')" "admin"
+	assert_equal "$(get_json_path "$BODY" '.tune_options.h2_be_initial_window_size')" "20"
+    assert_equal "$(get_json_path "$BODY" '.tune_options.h2_be_max_concurrent_streams')" "21"
+	assert_equal "$(get_json_path "$BODY" '.tune_options.h2_fe_initial_window_size')" "22"
+    assert_equal "$(get_json_path "$BODY" '.tune_options.h2_fe_max_concurrent_streams')" "23"
  fi
 }
--- a/e2e/tests/groups/get.bats
+++ b/e2e/tests/groups/get.bats
@ -26,15 +26,15 @@ load 'utils/_helpers'
@test "groups: Return group G1 from a userlist" {
 	resource_get "$_GROUPS_BASE_PATH/G1" "userlist=first"
 	assert_equal "$SC" 200
-	assert_equal "$(get_json_path "$BODY" ".data.name")" "G1"
-    assert_equal "$(get_json_path "$BODY" ".data.users")" "tiger,scott"
+	assert_equal "$(get_json_path "$BODY" ".name")" "G1"
+    assert_equal "$(get_json_path "$BODY" ".users")" "tiger,scott"
 }

@test "groups: Return group G2 from a userlist" {
 	resource_get "$_GROUPS_BASE_PATH/G2" "userlist=first"
 	assert_equal "$SC" 200
-	assert_equal "$(get_json_path "$BODY" ".data.name")" "G2"
-    assert_equal "$(get_json_path "$BODY" ".data.users")" "scott"
+	assert_equal "$(get_json_path "$BODY" ".name")" "G2"
+    assert_equal "$(get_json_path "$BODY" ".users")" "scott"
 }

@test "groups: Return a non existing group from a userlist" {
@ -50,20 +50,20 @@ load 'utils/_helpers'
@test "groups: Return group one from a userlist" {
 	resource_get "$_GROUPS_BASE_PATH/one" "userlist=second"
 	assert_equal "$SC" 200
-	assert_equal "$(get_json_path "$BODY" ".data.name")" "one"
-    assert_equal "$(get_json_path "$BODY" ".data.users")" null
+	assert_equal "$(get_json_path "$BODY" ".name")" "one"
+    assert_equal "$(get_json_path "$BODY" ".users")" null
 }

@test "groups: Return group two from a userlist" {
 	resource_get "$_GROUPS_BASE_PATH/two" "userlist=second"
 	assert_equal "$SC" 200
-	assert_equal "$(get_json_path "$BODY" ".data.name")" "two"
-    assert_equal "$(get_json_path "$BODY" ".data.users")" null
+	assert_equal "$(get_json_path "$BODY" ".name")" "two"
+    assert_equal "$(get_json_path "$BODY" ".users")" null
 }

@test "groups: Return group three from a userlist" {
 	resource_get "$_GROUPS_BASE_PATH/three" "userlist=second"
 	assert_equal "$SC" 200
-	assert_equal "$(get_json_path "$BODY" ".data.name")" "three"
-    assert_equal "$(get_json_path "$BODY" ".data.users")" null
+	assert_equal "$(get_json_path "$BODY" ".name")" "three"
+    assert_equal "$(get_json_path "$BODY" ".users")" null
 }
--- a/e2e/tests/groups/list.bats
+++ b/e2e/tests/groups/list.bats
@ -26,34 +26,34 @@ load 'utils/_helpers'
@test "groups: Return an array of groups from userlist first" {
  resource_get "$_GROUPS_BASE_PATH" "userlist=first"
 	assert_equal "$SC" 200
-    assert_equal "$(get_json_path "${BODY}" ".data | length")" 2
+    assert_equal "$(get_json_path "${BODY}" ". | length")" 2

-    assert_equal "$(get_json_path "${BODY}" ".data[0].name" )" "G1"
-    assert_equal "$(get_json_path "${BODY}" ".data[0].users" )" "tiger,scott"
+    assert_equal "$(get_json_path "${BODY}" ".[0].name" )" "G1"
+    assert_equal "$(get_json_path "${BODY}" ".[0].users" )" "tiger,scott"

-    assert_equal "$(get_json_path "${BODY}" ".data[1].name" )" "G2"
-    assert_equal "$(get_json_path "${BODY}" ".data[1].users" )" "scott"
+    assert_equal "$(get_json_path "${BODY}" ".[1].name" )" "G2"
+    assert_equal "$(get_json_path "${BODY}" ".[1].users" )" "scott"
 }

@test "groups: Return an array of groups from userlist second" {
  resource_get "$_GROUPS_BASE_PATH" "userlist=second"
 	assert_equal "$SC" 200
-    assert_equal "$(get_json_path "${BODY}" ".data | length")" 3
+    assert_equal "$(get_json_path "${BODY}" ". | length")" 3

-    assert_equal "$(get_json_path "${BODY}" ".data[0].name" )" "one"
-    assert_equal "$(get_json_path "${BODY}" ".data[0].users" )" null
+    assert_equal "$(get_json_path "${BODY}" ".[0].name" )" "one"
+    assert_equal "$(get_json_path "${BODY}" ".[0].users" )" null

-    assert_equal "$(get_json_path "${BODY}" ".data[1].name" )" "two"
-    assert_equal "$(get_json_path "${BODY}" ".data[1].users" )" null
+    assert_equal "$(get_json_path "${BODY}" ".[1].name" )" "two"
+    assert_equal "$(get_json_path "${BODY}" ".[1].users" )" null

-    assert_equal "$(get_json_path "${BODY}" ".data[2].name" )" "three"
-    assert_equal "$(get_json_path "${BODY}" ".data[2].users" )" null
+    assert_equal "$(get_json_path "${BODY}" ".[2].name" )" "three"
+    assert_equal "$(get_json_path "${BODY}" ".[2].users" )" null
 }

@test "groups: Return an array of groups from userlist empty" {
  resource_get "$_GROUPS_BASE_PATH" "userlist=empty"
 	assert_equal "$SC" 200
-    assert_equal "$(get_json_path "${BODY}" ".data | length")" 0
+    assert_equal "$(get_json_path "${BODY}" ". | length")" 0
 }

@test "groups: Return an array of groups from non existing userlist" {
--- a/e2e/tests/http_after_response_rules/get.bats
+++ b/e2e/tests/http_after_response_rules/get.bats
@ -30,17 +30,17 @@ load 'utils/_helpers'

 	resource_get "$_RES_RULES_BASE_PATH/0" "parent_type=frontend&parent_name=test_frontend"
 	assert_equal "$SC" 200
-	assert_equal "$(get_json_path "$BODY" ".data.type")" "add-header"
-	assert_equal "$(get_json_path "$BODY" ".data.hdr_name")" "X-Add-Frontend"
-	assert_equal "$(get_json_path "$BODY" ".data.cond")" "unless"
-	assert_equal "$(get_json_path "$BODY" ".data.cond_test")" "{ src 192.168.0.0/16 }"
+	assert_equal "$(get_json_path "$BODY" ".type")" "add-header"
+	assert_equal "$(get_json_path "$BODY" ".hdr_name")" "X-Add-Frontend"
+	assert_equal "$(get_json_path "$BODY" ".cond")" "unless"
+	assert_equal "$(get_json_path "$BODY" ".cond_test")" "{ src 192.168.0.0/16 }"

 	resource_get "$_RES_RULES_BASE_PATH/1" "parent_type=frontend&parent_name=test_frontend"
 	assert_equal "$SC" 200
-	assert_equal "$(get_json_path "$BODY" ".data.type")" "del-header"
-	assert_equal "$(get_json_path "$BODY" ".data.hdr_name")" "X-Del-Frontend"
-	assert_equal "$(get_json_path "$BODY" ".data.cond")" "if"
-	assert_equal "$(get_json_path "$BODY" ".data.cond_test")" "{ src 10.1.0.0/16 }"
+	assert_equal "$(get_json_path "$BODY" ".type")" "del-header"
+	assert_equal "$(get_json_path "$BODY" ".hdr_name")" "X-Del-Frontend"
+	assert_equal "$(get_json_path "$BODY" ".cond")" "if"
+	assert_equal "$(get_json_path "$BODY" ".cond_test")" "{ src 10.1.0.0/16 }"
 }

@test "http_after_response_rules: Return one HTTP After Response Rule from backend" {
@ -50,15 +50,15 @@ load 'utils/_helpers'

 	resource_get "$_RES_RULES_BASE_PATH/0" "parent_type=backend&parent_name=test_backend"
 	assert_equal "$SC" 200
-	assert_equal "$(get_json_path "$BODY" ".data.type")" "add-header"
-	assert_equal "$(get_json_path "$BODY" ".data.hdr_name")" "X-Add-Backend"
-	assert_equal "$(get_json_path "$BODY" ".data.cond")" "unless"
-	assert_equal "$(get_json_path "$BODY" ".data.cond_test")" "{ src 192.168.0.0/16 }"
+	assert_equal "$(get_json_path "$BODY" ".type")" "add-header"
+	assert_equal "$(get_json_path "$BODY" ".hdr_name")" "X-Add-Backend"
+	assert_equal "$(get_json_path "$BODY" ".cond")" "unless"
+	assert_equal "$(get_json_path "$BODY" ".cond_test")" "{ src 192.168.0.0/16 }"

 	resource_get "$_RES_RULES_BASE_PATH/1" "parent_type=backend&parent_name=test_backend"
 	assert_equal "$SC" 200
-	assert_equal "$(get_json_path "$BODY" ".data.type")" "del-header"
-	assert_equal "$(get_json_path "$BODY" ".data.hdr_name")" "X-Del-Backend"
-	assert_equal "$(get_json_path "$BODY" ".data.cond")" "if"
-	assert_equal "$(get_json_path "$BODY" ".data.cond_test")" "{ src 10.1.0.0/16 }"
+	assert_equal "$(get_json_path "$BODY" ".type")" "del-header"
+	assert_equal "$(get_json_path "$BODY" ".hdr_name")" "X-Del-Backend"
+	assert_equal "$(get_json_path "$BODY" ".cond")" "if"
+	assert_equal "$(get_json_path "$BODY" ".cond_test")" "{ src 10.1.0.0/16 }"
 }
--- a/e2e/tests/http_after_response_rules/list.bats
+++ b/e2e/tests/http_after_response_rules/list.bats
@ -32,57 +32,57 @@ load 'utils/_helpers'
 	resource_get "$_RES_RULES_BASE_PATH" "parent_type=frontend&parent_name=test_frontend"
 	assert_equal "$SC" 200
 	if haproxy_version_ge "2.8"; then
-	    assert_equal "$(get_json_path "$BODY" ".data | length")" 11
+	    assert_equal "$(get_json_path "$BODY" ". | length")" 11
    else
-        assert_equal "$(get_json_path "$BODY" ".data | length")" 2
+        assert_equal "$(get_json_path "$BODY" ". | length")" 2
    fi
-	assert_equal "$(get_json_path "$BODY" ".data[0].type")" "add-header"
-	assert_equal "$(get_json_path "$BODY" ".data[0].hdr_name")" "X-Add-Frontend"
-	assert_equal "$(get_json_path "$BODY" ".data[0].cond")" "unless"
-	assert_equal "$(get_json_path "$BODY" ".data[0].cond_test")" "{ src 192.168.0.0/16 }"
-	assert_equal "$(get_json_path "$BODY" ".data[1].type")" "del-header"
-	assert_equal "$(get_json_path "$BODY" ".data[1].hdr_name")" "X-Del-Frontend"
-	assert_equal "$(get_json_path "$BODY" ".data[1].cond")" "if"
-	assert_equal "$(get_json_path "$BODY" ".data[1].cond_test")" "{ src 10.1.0.0/16 }"
+	assert_equal "$(get_json_path "$BODY" ".[0].type")" "add-header"
+	assert_equal "$(get_json_path "$BODY" ".[0].hdr_name")" "X-Add-Frontend"
+	assert_equal "$(get_json_path "$BODY" ".[0].cond")" "unless"
+	assert_equal "$(get_json_path "$BODY" ".[0].cond_test")" "{ src 192.168.0.0/16 }"
+	assert_equal "$(get_json_path "$BODY" ".[1].type")" "del-header"
+	assert_equal "$(get_json_path "$BODY" ".[1].hdr_name")" "X-Del-Frontend"
+	assert_equal "$(get_json_path "$BODY" ".[1].cond")" "if"
+	assert_equal "$(get_json_path "$BODY" ".[1].cond_test")" "{ src 10.1.0.0/16 }"
 	if haproxy_version_ge "2.8"; then
-        assert_equal "$(get_json_path "$BODY" ".data[2].type")" "set-map"
-        assert_equal "$(get_json_path "$BODY" ".data[2].map_file")" "map.lst"
-        assert_equal "$(get_json_path "$BODY" ".data[2].map_keyfmt")" "%[src]"
-        assert_equal "$(get_json_path "$BODY" ".data[2].map_valuefmt")" "%[res.hdr(X-Value)]"
-        assert_equal "$(get_json_path "$BODY" ".data[3].type")" "del-map"
-        assert_equal "$(get_json_path "$BODY" ".data[3].map_file")" "map.lst"
-        assert_equal "$(get_json_path "$BODY" ".data[3].map_keyfmt")" "%[src]"
-        assert_equal "$(get_json_path "$BODY" ".data[3].cond")" "if"
-        assert_equal "$(get_json_path "$BODY" ".data[3].cond_test")" "FALSE"
-        assert_equal "$(get_json_path "$BODY" ".data[4].type")" "del-acl"
-        assert_equal "$(get_json_path "$BODY" ".data[4].acl_file")" "map.lst"
-        assert_equal "$(get_json_path "$BODY" ".data[4].acl_keyfmt")" "%[src]"
-        assert_equal "$(get_json_path "$BODY" ".data[4].cond")" "if"
-        assert_equal "$(get_json_path "$BODY" ".data[4].cond_test")" "FALSE"
-        assert_equal "$(get_json_path "$BODY" ".data[5].type")" "sc-inc-gpc"
-        assert_equal "$(get_json_path "$BODY" ".data[5].sc_id")" "1"
-        assert_equal "$(get_json_path "$BODY" ".data[5].cond")" "if"
-        assert_equal "$(get_json_path "$BODY" ".data[5].cond_test")" "FALSE"
-        assert_equal "$(get_json_path "$BODY" ".data[6].type")" "sc-inc-gpc0"
-        assert_equal "$(get_json_path "$BODY" ".data[6].cond")" "if"
-        assert_equal "$(get_json_path "$BODY" ".data[6].cond_test")" "FALSE"
-        assert_equal "$(get_json_path "$BODY" ".data[7].type")" "sc-inc-gpc1"
-        assert_equal "$(get_json_path "$BODY" ".data[7].cond")" "if"
-        assert_equal "$(get_json_path "$BODY" ".data[7].cond_test")" "FALSE"
-        assert_equal "$(get_json_path "$BODY" ".data[8].type")" "sc-set-gpt0"
-        assert_equal "$(get_json_path "$BODY" ".data[8].sc_id")" "1"
-        assert_equal "$(get_json_path "$BODY" ".data[8].sc_expr")" "hdr(Host),lower"
-        assert_equal "$(get_json_path "$BODY" ".data[8].cond")" "if"
-        assert_equal "$(get_json_path "$BODY" ".data[8].cond_test")" "FALSE"
-        assert_equal "$(get_json_path "$BODY" ".data[9].type")" "sc-set-gpt0"
-        assert_equal "$(get_json_path "$BODY" ".data[9].sc_id")" "1"
-        assert_equal "$(get_json_path "$BODY" ".data[9].sc_int")" "20"
-        assert_equal "$(get_json_path "$BODY" ".data[9].cond")" "if"
-        assert_equal "$(get_json_path "$BODY" ".data[9].cond_test")" "FALSE"
-        assert_equal "$(get_json_path "$BODY" ".data[10].type")" "set-log-level"
-        assert_equal "$(get_json_path "$BODY" ".data[10].log_level")" "silent"
-        assert_equal "$(get_json_path "$BODY" ".data[10].cond")" "if"
-        assert_equal "$(get_json_path "$BODY" ".data[10].cond_test")" "FALSE"
+        assert_equal "$(get_json_path "$BODY" ".[2].type")" "set-map"
+        assert_equal "$(get_json_path "$BODY" ".[2].map_file")" "map.lst"
+        assert_equal "$(get_json_path "$BODY" ".[2].map_keyfmt")" "%[src]"
+        assert_equal "$(get_json_path "$BODY" ".[2].map_valuefmt")" "%[res.hdr(X-Value)]"
+        assert_equal "$(get_json_path "$BODY" ".[3].type")" "del-map"
+        assert_equal "$(get_json_path "$BODY" ".[3].map_file")" "map.lst"
+        assert_equal "$(get_json_path "$BODY" ".[3].map_keyfmt")" "%[src]"
+        assert_equal "$(get_json_path "$BODY" ".[3].cond")" "if"
+        assert_equal "$(get_json_path "$BODY" ".[3].cond_test")" "FALSE"
+        assert_equal "$(get_json_path "$BODY" ".[4].type")" "del-acl"
+        assert_equal "$(get_json_path "$BODY" ".[4].acl_file")" "map.lst"
+        assert_equal "$(get_json_path "$BODY" ".[4].acl_keyfmt")" "%[src]"
+        assert_equal "$(get_json_path "$BODY" ".[4].cond")" "if"
+        assert_equal "$(get_json_path "$BODY" ".[4].cond_test")" "FALSE"
+        assert_equal "$(get_json_path "$BODY" ".[5].type")" "sc-inc-gpc"
+        assert_equal "$(get_json_path "$BODY" ".[5].sc_id")" "1"
+        assert_equal "$(get_json_path "$BODY" ".[5].cond")" "if"
+        assert_equal "$(get_json_path "$BODY" ".[5].cond_test")" "FALSE"
+        assert_equal "$(get_json_path "$BODY" ".[6].type")" "sc-inc-gpc0"
+        assert_equal "$(get_json_path "$BODY" ".[6].cond")" "if"
+        assert_equal "$(get_json_path "$BODY" ".[6].cond_test")" "FALSE"
+        assert_equal "$(get_json_path "$BODY" ".[7].type")" "sc-inc-gpc1"
+        assert_equal "$(get_json_path "$BODY" ".[7].cond")" "if"
+        assert_equal "$(get_json_path "$BODY" ".[7].cond_test")" "FALSE"
+        assert_equal "$(get_json_path "$BODY" ".[8].type")" "sc-set-gpt0"
+        assert_equal "$(get_json_path "$BODY" ".[8].sc_id")" "1"
+        assert_equal "$(get_json_path "$BODY" ".[8].sc_expr")" "hdr(Host),lower"
+        assert_equal "$(get_json_path "$BODY" ".[8].cond")" "if"
+        assert_equal "$(get_json_path "$BODY" ".[8].cond_test")" "FALSE"
+        assert_equal "$(get_json_path "$BODY" ".[9].type")" "sc-set-gpt0"
+        assert_equal "$(get_json_path "$BODY" ".[9].sc_id")" "1"
+        assert_equal "$(get_json_path "$BODY" ".[9].sc_int")" "20"
+        assert_equal "$(get_json_path "$BODY" ".[9].cond")" "if"
+        assert_equal "$(get_json_path "$BODY" ".[9].cond_test")" "FALSE"
+        assert_equal "$(get_json_path "$BODY" ".[10].type")" "set-log-level"
+        assert_equal "$(get_json_path "$BODY" ".[10].log_level")" "silent"
+        assert_equal "$(get_json_path "$BODY" ".[10].cond")" "if"
+        assert_equal "$(get_json_path "$BODY" ".[10].cond_test")" "FALSE"
    fi
 }

@ -93,13 +93,13 @@ load 'utils/_helpers'

 	resource_get "$_RES_RULES_BASE_PATH" "parent_type=backend&parent_name=test_backend"
 	assert_equal "$SC" 200
-	assert_equal 2 "$(get_json_path "$BODY" ".data | length")"
-	assert_equal "$(get_json_path "$BODY" ".data[0].type")" "add-header"
-	assert_equal "$(get_json_path "$BODY" ".data[0].hdr_name")" "X-Add-Backend"
-	assert_equal "$(get_json_path "$BODY" ".data[0].cond")" "unless"
-	assert_equal "$(get_json_path "$BODY" ".data[0].cond_test")" "{ src 192.168.0.0/16 }"
-	assert_equal "$(get_json_path "$BODY" ".data[1].type")" "del-header"
-	assert_equal "$(get_json_path "$BODY" ".data[1].hdr_name")" "X-Del-Backend"
-	assert_equal "$(get_json_path "$BODY" ".data[1].cond")" "if"
-	assert_equal "$(get_json_path "$BODY" ".data[1].cond_test")" "{ src 10.1.0.0/16 }"
+	assert_equal 2 "$(get_json_path "$BODY" ". | length")"
+	assert_equal "$(get_json_path "$BODY" ".[0].type")" "add-header"
+	assert_equal "$(get_json_path "$BODY" ".[0].hdr_name")" "X-Add-Backend"
+	assert_equal "$(get_json_path "$BODY" ".[0].cond")" "unless"
+	assert_equal "$(get_json_path "$BODY" ".[0].cond_test")" "{ src 192.168.0.0/16 }"
+	assert_equal "$(get_json_path "$BODY" ".[1].type")" "del-header"
+	assert_equal "$(get_json_path "$BODY" ".[1].hdr_name")" "X-Del-Backend"
+	assert_equal "$(get_json_path "$BODY" ".[1].cond")" "if"
+	assert_equal "$(get_json_path "$BODY" ".[1].cond_test")" "{ src 10.1.0.0/16 }"
 }
--- a/e2e/tests/http_after_response_rules/replace.bats
+++ b/e2e/tests/http_after_response_rules/replace.bats
@ -33,11 +33,11 @@ load 'utils/_helpers'

 	resource_get "$_RES_RULES_BASE_PATH/0" "parent_type=frontend&parent_name=test_frontend&force_reload=true"
 	assert_equal "$SC" 200
-	assert_equal "$(get_json_path "$BODY" ".data.cond")" "if"
-	assert_equal "$(get_json_path "$BODY" ".data.cond_test")" "{ src 192.168.0.0/16 }"
-	assert_equal "$(get_json_path "$BODY" ".data.type")" "add-header"
-	assert_equal "$(get_json_path "$BODY" ".data.hdr_name")" "X-Haproxy-Current-Date"
-	assert_equal "$(get_json_path "$BODY" ".data.hdr_format")" "%T"
+	assert_equal "$(get_json_path "$BODY" ".cond")" "if"
+	assert_equal "$(get_json_path "$BODY" ".cond_test")" "{ src 192.168.0.0/16 }"
+	assert_equal "$(get_json_path "$BODY" ".type")" "add-header"
+	assert_equal "$(get_json_path "$BODY" ".hdr_name")" "X-Haproxy-Current-Date"
+	assert_equal "$(get_json_path "$BODY" ".hdr_format")" "%T"
 }

@test "http_after_response_rules: Replace a HTTP After Response Rule of backend" {
@ -50,9 +50,9 @@ load 'utils/_helpers'

 	resource_get "$_RES_RULES_BASE_PATH/0" "parent_type=backend&parent_name=test_backend&force_reload=true"
 	assert_equal "$SC" 200
-	assert_equal "$(get_json_path "$BODY" ".data.cond")" "if"
-	assert_equal "$(get_json_path "$BODY" ".data.cond_test")" "{ src 192.168.0.0/16 }"
-	assert_equal "$(get_json_path "$BODY" ".data.type")" "add-header"
-	assert_equal "$(get_json_path "$BODY" ".data.hdr_name")" "X-Haproxy-Current-Date"
-	assert_equal "$(get_json_path "$BODY" ".data.hdr_format")" "%T"
+	assert_equal "$(get_json_path "$BODY" ".cond")" "if"
+	assert_equal "$(get_json_path "$BODY" ".cond_test")" "{ src 192.168.0.0/16 }"
+	assert_equal "$(get_json_path "$BODY" ".type")" "add-header"
+	assert_equal "$(get_json_path "$BODY" ".hdr_name")" "X-Haproxy-Current-Date"
+	assert_equal "$(get_json_path "$BODY" ".hdr_format")" "%T"
 }
--- a/e2e/tests/http_checks/add.bats
+++ b/e2e/tests/http_checks/add.bats
@ -29,7 +29,7 @@ load 'utils/_helpers'

    resource_get "$_CHECKS_BASE_PATH/2" "parent_type=defaults"
    assert_equal "$SC" 200
-    assert_equal "$(get_json_path "$BODY" ".data.type")" "disable-on-404"
+    assert_equal "$(get_json_path "$BODY" ".type")" "disable-on-404"
 }

@test "http_checks: Add a new HTTP Check to backend" {
@ -38,7 +38,7 @@ load 'utils/_helpers'

    resource_get "$_CHECKS_BASE_PATH/2" "parent_type=backend&parent_name=test_backend"
    assert_equal "$SC" 200
-    assert_equal "$(get_json_path "$BODY" ".data.type")" "disable-on-404"
+    assert_equal "$(get_json_path "$BODY" ".type")" "disable-on-404"
 }

@test "http_checks: fail adding an unvalid HTTP Check to backend" {
--- a/e2e/tests/http_checks/add_2.2.bats
+++ b/e2e/tests/http_checks/add_2.2.bats
@ -32,9 +32,9 @@ load 'utils/_helpers'

    resource_get "$_CHECKS_BASE_PATH/2" "parent_type=defaults"
    assert_equal "$SC" 200
-    assert_equal "$(get_json_path "$BODY" ".data.method")" "OPTIONS"
-	assert_equal "$(get_json_path "$BODY" ".data.uri")" "/"
-	assert_equal "$(get_json_path "$BODY" ".data.version")" "HTTP/1.1"
+    assert_equal "$(get_json_path "$BODY" ".method")" "OPTIONS"
+	assert_equal "$(get_json_path "$BODY" ".uri")" "/"
+	assert_equal "$(get_json_path "$BODY" ".version")" "HTTP/1.1"
    fi
 }

@ -47,9 +47,9 @@ load 'utils/_helpers'

    resource_get "$_CHECKS_BASE_PATH/0" "parent_type=backend&parent_name=test_backend_2"
    assert_equal "$SC" 200
-    assert_equal "$(get_json_path "$BODY" ".data.method")" "OPTIONS"
-	assert_equal "$(get_json_path "$BODY" ".data.uri")" "/"
-	assert_equal "$(get_json_path "$BODY" ".data.version")" "HTTP/1.1"
+    assert_equal "$(get_json_path "$BODY" ".method")" "OPTIONS"
+	assert_equal "$(get_json_path "$BODY" ".uri")" "/"
+	assert_equal "$(get_json_path "$BODY" ".version")" "HTTP/1.1"
    fi
 }

--- a/e2e/tests/http_checks/get.bats
+++ b/e2e/tests/http_checks/get.bats
@ -26,24 +26,24 @@ load 'utils/_helpers'
@test "http_checks: Return one HTTP Check from defaults" {
  	resource_get "$_CHECKS_BASE_PATH/0" "parent_type=defaults"
 	assert_equal "$SC" 200
-	assert_equal "$(get_json_path "$BODY" ".data.type")" "send-state"
+	assert_equal "$(get_json_path "$BODY" ".type")" "send-state"

 	resource_get "$_CHECKS_BASE_PATH/1" "parent_type=defaults"
 	assert_equal "$SC" 200
-	assert_equal "$(get_json_path "$BODY" ".data.type")" "disable-on-404"
+	assert_equal "$(get_json_path "$BODY" ".type")" "disable-on-404"
 }

@test "http_checks: Return one HTTP Check from backend" {
 	resource_get "$_CHECKS_BASE_PATH/0" "parent_type=backend&parent_name=test_backend"
-    assert_equal "$(get_json_path "$BODY" ".data.type")" "send"
-    assert_equal 1 "$(get_json_path "$BODY" ".data.headers | length")"
-    assert_equal "$(get_json_path "$BODY" ".data.headers[0].name")" "host"
-    assert_equal "$(get_json_path "$BODY" ".data.headers[0].fmt")" "haproxy.1wt.eu"
+    assert_equal "$(get_json_path "$BODY" ".type")" "send"
+    assert_equal 1 "$(get_json_path "$BODY" ".headers | length")"
+    assert_equal "$(get_json_path "$BODY" ".headers[0].name")" "host"
+    assert_equal "$(get_json_path "$BODY" ".headers[0].fmt")" "haproxy.1wt.eu"

 	resource_get "$_CHECKS_BASE_PATH/1" "parent_type=backend&parent_name=test_backend"
-    assert_equal "$(get_json_path "$BODY" ".data.type")" "expect"
-    assert_equal "$(get_json_path "$BODY" ".data.match")" "status"
-    assert_equal "$(get_json_path "$BODY" ".data.pattern")" "200-399"
+    assert_equal "$(get_json_path "$BODY" ".type")" "expect"
+    assert_equal "$(get_json_path "$BODY" ".match")" "status"
+    assert_equal "$(get_json_path "$BODY" ".pattern")" "200-399"
 }

@test "http_checks: Return 422 when fetching HTTP Check from frontend" {
--- a/e2e/tests/http_checks/get_2.2.bats
+++ b/e2e/tests/http_checks/get_2.2.bats
@ -29,17 +29,17 @@ load 'utils/_helpers'
 	if haproxy_version_ge "2.2"
    then
 	resource_get "$_CHECKS_BASE_PATH/0" "parent_type=backend&parent_name=test_backend"
-    assert_equal "$(get_json_path "$BODY" ".data.type")" "send"
-    assert_equal 1 "$(get_json_path "$BODY" ".data.headers | length")"
-    assert_equal "$(get_json_path "$BODY" ".data.headers[0].name")" "host"
-    assert_equal "$(get_json_path "$BODY" ".data.headers[0].fmt")" "haproxy.1wt.eu"
-    assert_equal "$(get_json_path "$BODY" ".data.method")" "OPTIONS"
-	assert_equal "$(get_json_path "$BODY" ".data.uri")" "/"
-	assert_equal "$(get_json_path "$BODY" ".data.version")" "HTTP/1.1"
+    assert_equal "$(get_json_path "$BODY" ".type")" "send"
+    assert_equal 1 "$(get_json_path "$BODY" ".headers | length")"
+    assert_equal "$(get_json_path "$BODY" ".headers[0].name")" "host"
+    assert_equal "$(get_json_path "$BODY" ".headers[0].fmt")" "haproxy.1wt.eu"
+    assert_equal "$(get_json_path "$BODY" ".method")" "OPTIONS"
+	assert_equal "$(get_json_path "$BODY" ".uri")" "/"
+	assert_equal "$(get_json_path "$BODY" ".version")" "HTTP/1.1"

 	resource_get "$_CHECKS_BASE_PATH/1" "parent_type=backend&parent_name=test_backend"
-    assert_equal "$(get_json_path "$BODY" ".data.type")" "expect"
-    assert_equal "$(get_json_path "$BODY" ".data.match")" "status"
-    assert_equal "$(get_json_path "$BODY" ".data.pattern")" "200-399"
+    assert_equal "$(get_json_path "$BODY" ".type")" "expect"
+    assert_equal "$(get_json_path "$BODY" ".match")" "status"
+    assert_equal "$(get_json_path "$BODY" ".pattern")" "200-399"
 	fi
 }
--- a/e2e/tests/http_checks/list.bats
+++ b/e2e/tests/http_checks/list.bats
@ -26,26 +26,26 @@ load 'utils/_helpers'
@test "http_checks: Return an array of all HTTP Checks from defaults" {
    resource_get "$_CHECKS_BASE_PATH" "parent_type=defaults"
 	assert_equal "$SC" 200
-    assert_equal 2 "$(get_json_path "$BODY" ".data | length")"
+    assert_equal 2 "$(get_json_path "$BODY" ". | length")"

-    assert_equal "$(get_json_path "$BODY" ".data[0].type")" "send-state"
+    assert_equal "$(get_json_path "$BODY" ".[0].type")" "send-state"

-    assert_equal "$(get_json_path "$BODY" ".data[1].type")" "disable-on-404"
+    assert_equal "$(get_json_path "$BODY" ".[1].type")" "disable-on-404"
 }

@test "http_checks: Return an array of HTTP Checks from backend" {
    resource_get "$_CHECKS_BASE_PATH" "parent_type=backend&parent_name=test_backend"
 	assert_equal "$SC" 200
-	assert_equal 2 "$(get_json_path "$BODY" ".data | length")"
+	assert_equal 2 "$(get_json_path "$BODY" ". | length")"

-    assert_equal "$(get_json_path "$BODY" ".data[0].type")" "send"
-    assert_equal 1 "$(get_json_path "$BODY" ".data[0].headers | length")"
-    assert_equal "$(get_json_path "$BODY" ".data[0].headers[0].name")" "host"
-    assert_equal "$(get_json_path "$BODY" ".data[0].headers[0].fmt")" "haproxy.1wt.eu"
+    assert_equal "$(get_json_path "$BODY" ".[0].type")" "send"
+    assert_equal 1 "$(get_json_path "$BODY" ".[0].headers | length")"
+    assert_equal "$(get_json_path "$BODY" ".[0].headers[0].name")" "host"
+    assert_equal "$(get_json_path "$BODY" ".[0].headers[0].fmt")" "haproxy.1wt.eu"

-    assert_equal "$(get_json_path "$BODY" ".data[1].type")" "expect"
-    assert_equal "$(get_json_path "$BODY" ".data[1].match")" "status"
-    assert_equal "$(get_json_path "$BODY" ".data[1].pattern")" "200-399"
+    assert_equal "$(get_json_path "$BODY" ".[1].type")" "expect"
+    assert_equal "$(get_json_path "$BODY" ".[1].match")" "status"
+    assert_equal "$(get_json_path "$BODY" ".[1].pattern")" "200-399"
 }

@test "http_checks: Return 422 for frontend" {
--- a/e2e/tests/http_checks/replace.bats
+++ b/e2e/tests/http_checks/replace.bats
@ -29,7 +29,7 @@ load 'utils/_helpers'

 	resource_get "$_CHECKS_BASE_PATH/1" "parent_type=defaults"
 	assert_equal "$SC" 200
-	assert_equal "$(get_json_path "$BODY" ".data.type")" "send-state"
+	assert_equal "$(get_json_path "$BODY" ".type")" "send-state"
 }

@test "http_checks: Replace a HTTP Check of backend" {
@ -38,7 +38,7 @@ load 'utils/_helpers'

 	resource_get "$_CHECKS_BASE_PATH/1" "parent_type=backend&parent_name=test_backend"
 	assert_equal "$SC" 200
-	assert_equal "$(get_json_path "$BODY" ".data.type")" "send-state"
+	assert_equal "$(get_json_path "$BODY" ".type")" "send-state"
 }

@test "http_checks: Fail replacing a HTTP Check of unexisting backend" {
--- a/e2e/tests/http_error_rules/add.bats
+++ b/e2e/tests/http_error_rules/add.bats
@ -29,10 +29,10 @@ load 'utils/_helpers'

 	resource_post "$_ERR_RULES_BASE_PATH" "data/post.json" "parent_type=frontend&parent_name=test_frontend&force_reload=true"
 	assert_equal "$SC" 201
-	
+
 	resource_get "$_ERR_RULES_BASE_PATH/0" "parent_type=frontend&parent_name=test_frontend"
 	assert_equal "$SC" 200
-	assert_equal "$(get_json_path "$BODY" ".data.status")" 425 
+	assert_equal "$(get_json_path "$BODY" ".status")" 425
 }

@test "http_error_rules: Add a new HTTP Error Rule to backend" {
@ -40,12 +40,12 @@ load 'utils/_helpers'

 	resource_post "$_ERR_RULES_BASE_PATH" "data/post.json" "parent_type=backend&parent_name=test_backend&force_reload=true"
 	assert_equal "$SC" 201
-	
+
 	resource_get "$_ERR_RULES_BASE_PATH/0" "parent_type=backend&parent_name=test_backend"
 	assert_equal "$SC" 200
-	assert_equal "$(get_json_path "$BODY" ".data.status")" 425 
+	assert_equal "$(get_json_path "$BODY" ".status")" 425
 }
- 
+
@test "http_error_rules: Add a new HTTP Error Rule to defaults" {
 	haproxy_version_ge $_ERR_SUPPORTED_HAPROXY_VERSION || skip "requires HAProxy $_ERR_SUPPORTED_HAPROXY_VERSION+"

@ -54,7 +54,7 @@ load 'utils/_helpers'

 	resource_get "$_ERR_RULES_BASE_PATH/0" "parent_type=defaults"
 	assert_equal "$SC" 200
-	assert_equal "$(get_json_path "$BODY" ".data.status")" 425
+	assert_equal "$(get_json_path "$BODY" ".status")" 425
 }

@test "http_error_rules: Fail to add a new HTTP Error Rule without status code to backend" {
--- a/e2e/tests/http_error_rules/get.bats
+++ b/e2e/tests/http_error_rules/get.bats
@ -23,14 +23,14 @@ load '../../libs/resource_client'
 load '../../libs/version'

 load 'utils/_helpers'
- 
+
@test "http_error_rules: Return one HTTP Error Rule from frontend" {
 	haproxy_version_ge $_ERR_SUPPORTED_HAPROXY_VERSION || skip "requires HAProxy $_ERR_SUPPORTED_HAPROXY_VERSION+"

 	resource_get "$_ERR_RULES_BASE_PATH/0" "parent_type=frontend&parent_name=test_frontend"
 	assert_equal "$SC" 200
-	assert_equal "$(get_json_path "$BODY" ".data.type")" "status"
-	assert_equal "$(get_json_path "$BODY" ".data.status")" 400
+	assert_equal "$(get_json_path "$BODY" ".type")" "status"
+	assert_equal "$(get_json_path "$BODY" ".status")" 400
 }

@test "http_error_rules: Return one HTTP Error Rule from backend" {
@ -38,25 +38,25 @@ load 'utils/_helpers'

 	resource_get "$_ERR_RULES_BASE_PATH/0" "parent_type=backend&parent_name=test_backend"
 	assert_equal "$SC" 200
-	assert_equal "$(get_json_path "$BODY" ".data.type")" "status"
-	assert_equal "$(get_json_path "$BODY" ".data.status")" 200
-	assert_equal "$(get_json_path "$BODY" ".data.return_content_type")" "\"text/plain\""
-	assert_equal "$(get_json_path "$BODY" ".data.return_content_format")" "string"
-	assert_equal "$(get_json_path "$BODY" ".data.return_content")" "\"My content\""
-	assert_equal "$(get_json_path "$BODY" ".data.return_hdrs[0].name")" "Some-Header"
-	assert_equal "$(get_json_path "$BODY" ".data.return_hdrs[0].fmt")" "value"
+	assert_equal "$(get_json_path "$BODY" ".type")" "status"
+	assert_equal "$(get_json_path "$BODY" ".status")" 200
+	assert_equal "$(get_json_path "$BODY" ".return_content_type")" "\"text/plain\""
+	assert_equal "$(get_json_path "$BODY" ".return_content_format")" "string"
+	assert_equal "$(get_json_path "$BODY" ".return_content")" "\"My content\""
+	assert_equal "$(get_json_path "$BODY" ".return_hdrs[0].name")" "Some-Header"
+	assert_equal "$(get_json_path "$BODY" ".return_hdrs[0].fmt")" "value"

 	resource_get "$_ERR_RULES_BASE_PATH/1" "parent_type=backend&parent_name=test_backend"
 	assert_equal "$SC" 200
-	assert_equal "$(get_json_path "$BODY" ".data.type")" "status"
-	assert_equal "$(get_json_path "$BODY" ".data.status")" 503
-	assert_equal "$(get_json_path "$BODY" ".data.return_content_type")" "application/json"
-	assert_equal "$(get_json_path "$BODY" ".data.return_content_format")" "string"
-	assert_equal "$(get_json_path "$BODY" ".data.return_content")" "\"My content\""
-	assert_equal "$(get_json_path "$BODY" ".data.return_hdrs[0].name")" "Additional-Header"
-	assert_equal "$(get_json_path "$BODY" ".data.return_hdrs[0].fmt")" "value1"
-	assert_equal "$(get_json_path "$BODY" ".data.return_hdrs[1].name")" "Some-Header"
-	assert_equal "$(get_json_path "$BODY" ".data.return_hdrs[1].fmt")" "value"
+	assert_equal "$(get_json_path "$BODY" ".type")" "status"
+	assert_equal "$(get_json_path "$BODY" ".status")" 503
+	assert_equal "$(get_json_path "$BODY" ".return_content_type")" "application/json"
+	assert_equal "$(get_json_path "$BODY" ".return_content_format")" "string"
+	assert_equal "$(get_json_path "$BODY" ".return_content")" "\"My content\""
+	assert_equal "$(get_json_path "$BODY" ".return_hdrs[0].name")" "Additional-Header"
+	assert_equal "$(get_json_path "$BODY" ".return_hdrs[0].fmt")" "value1"
+	assert_equal "$(get_json_path "$BODY" ".return_hdrs[1].name")" "Some-Header"
+	assert_equal "$(get_json_path "$BODY" ".return_hdrs[1].fmt")" "value"
 }

@test "http_error_rules: Return one HTTP Error Rule from defaults" {
@ -64,13 +64,13 @@ load 'utils/_helpers'

 	resource_get "$_ERR_RULES_BASE_PATH/0" "parent_type=defaults"
 	assert_equal "$SC" 200
-	assert_equal "$(get_json_path "$BODY" ".data.type")" "status"
-	assert_equal "$(get_json_path "$BODY" ".data.status")" 503
-	assert_equal "$(get_json_path "$BODY" ".data.return_content_type")" "\"application/json\""
-	assert_equal "$(get_json_path "$BODY" ".data.return_content_format")" "string"
-	assert_equal "$(get_json_path "$BODY" ".data.return_content")" "\"Default 503 content\""
+	assert_equal "$(get_json_path "$BODY" ".type")" "status"
+	assert_equal "$(get_json_path "$BODY" ".status")" 503
+	assert_equal "$(get_json_path "$BODY" ".return_content_type")" "\"application/json\""
+	assert_equal "$(get_json_path "$BODY" ".return_content_format")" "string"
+	assert_equal "$(get_json_path "$BODY" ".return_content")" "\"Default 503 content\""
 }
- 
+
@test "http_error_rules: Fail to return a HTTP Error Rule when backend does not exist" {
 	haproxy_version_ge $_ERR_SUPPORTED_HAPROXY_VERSION || skip "requires HAProxy $_ERR_SUPPORTED_HAPROXY_VERSION+"

--- a/e2e/tests/http_error_rules/list.bats
+++ b/e2e/tests/http_error_rules/list.bats
@ -29,12 +29,12 @@ load 'utils/_helpers'

 	resource_get "$_ERR_RULES_BASE_PATH" "parent_type=defaults"
 	assert_equal "$SC" 200
-	assert_equal 1 "$(get_json_path "$BODY" ".data | length")"
-	assert_equal "$(get_json_path "$BODY" ".data[0].type")" "status"
-	assert_equal "$(get_json_path "$BODY" ".data[0].status")" 503
-	assert_equal "$(get_json_path "$BODY" ".data[0].return_content_type")" "\"application/json\""
-	assert_equal "$(get_json_path "$BODY" ".data[0].return_content_format")" "string"
-	assert_equal "$(get_json_path "$BODY" ".data[0].return_content")" "\"Default 503 content\""
+	assert_equal 1 "$(get_json_path "$BODY" ". | length")"
+	assert_equal "$(get_json_path "$BODY" ".[0].type")" "status"
+	assert_equal "$(get_json_path "$BODY" ".[0].status")" 503
+	assert_equal "$(get_json_path "$BODY" ".[0].return_content_type")" "\"application/json\""
+	assert_equal "$(get_json_path "$BODY" ".[0].return_content_format")" "string"
+	assert_equal "$(get_json_path "$BODY" ".[0].return_content")" "\"Default 503 content\""
 }

@test "http_error_rules: Return an array of all HTTP Error Rules from frontend" {
@ -42,9 +42,9 @@ load 'utils/_helpers'

 	resource_get "$_ERR_RULES_BASE_PATH" "parent_type=frontend&parent_name=test_frontend"
 	assert_equal "$SC" 200
-	assert_equal 1 "$(get_json_path "$BODY" ".data | length")"
-	assert_equal "$(get_json_path "$BODY" ".data[0].type")" "status"
-	assert_equal "$(get_json_path "$BODY" ".data[0].status")" 400
+	assert_equal 1 "$(get_json_path "$BODY" ". | length")"
+	assert_equal "$(get_json_path "$BODY" ".[0].type")" "status"
+	assert_equal "$(get_json_path "$BODY" ".[0].status")" 400
 }

@test "http_error_rules: Return an array of all HTTP Error Rules from backend" {
@ -52,21 +52,21 @@ load 'utils/_helpers'

 	resource_get "$_ERR_RULES_BASE_PATH" "parent_type=backend&parent_name=test_backend"
 	assert_equal "$SC" 200
-	assert_equal 2 "$(get_json_path "$BODY" ".data | length")"
-	assert_equal "$(get_json_path "$BODY" ".data[0].type")" "status"
-	assert_equal "$(get_json_path "$BODY" ".data[0].status")" 200
-	assert_equal "$(get_json_path "$BODY" ".data[0].return_content_type")" "\"text/plain\""
-	assert_equal "$(get_json_path "$BODY" ".data[0].return_content_format")" "string"
-	assert_equal "$(get_json_path "$BODY" ".data[0].return_content")" "\"My content\""
-	assert_equal "$(get_json_path "$BODY" ".data[0].return_hdrs[0].name")" "Some-Header"
-	assert_equal "$(get_json_path "$BODY" ".data[0].return_hdrs[0].fmt")" "value"
-	assert_equal "$(get_json_path "$BODY" ".data[1].type")" "status"
-	assert_equal "$(get_json_path "$BODY" ".data[1].status")" 503
-	assert_equal "$(get_json_path "$BODY" ".data[1].return_content_type")" "application/json"
-	assert_equal "$(get_json_path "$BODY" ".data[1].return_content_format")" "string"
-	assert_equal "$(get_json_path "$BODY" ".data[1].return_content")" "\"My content\""
-	assert_equal "$(get_json_path "$BODY" ".data[1].return_hdrs[0].name")" "Additional-Header"
-	assert_equal "$(get_json_path "$BODY" ".data[1].return_hdrs[0].fmt")" "value1"
-	assert_equal "$(get_json_path "$BODY" ".data[1].return_hdrs[1].name")" "Some-Header"
-	assert_equal "$(get_json_path "$BODY" ".data[1].return_hdrs[1].fmt")" "value"
+	assert_equal 2 "$(get_json_path "$BODY" ". | length")"
+	assert_equal "$(get_json_path "$BODY" ".[0].type")" "status"
+	assert_equal "$(get_json_path "$BODY" ".[0].status")" 200
+	assert_equal "$(get_json_path "$BODY" ".[0].return_content_type")" "\"text/plain\""
+	assert_equal "$(get_json_path "$BODY" ".[0].return_content_format")" "string"
+	assert_equal "$(get_json_path "$BODY" ".[0].return_content")" "\"My content\""
+	assert_equal "$(get_json_path "$BODY" ".[0].return_hdrs[0].name")" "Some-Header"
+	assert_equal "$(get_json_path "$BODY" ".[0].return_hdrs[0].fmt")" "value"
+	assert_equal "$(get_json_path "$BODY" ".[1].type")" "status"
+	assert_equal "$(get_json_path "$BODY" ".[1].status")" 503
+	assert_equal "$(get_json_path "$BODY" ".[1].return_content_type")" "application/json"
+	assert_equal "$(get_json_path "$BODY" ".[1].return_content_format")" "string"
+	assert_equal "$(get_json_path "$BODY" ".[1].return_content")" "\"My content\""
+	assert_equal "$(get_json_path "$BODY" ".[1].return_hdrs[0].name")" "Additional-Header"
+	assert_equal "$(get_json_path "$BODY" ".[1].return_hdrs[0].fmt")" "value1"
+	assert_equal "$(get_json_path "$BODY" ".[1].return_hdrs[1].name")" "Some-Header"
+	assert_equal "$(get_json_path "$BODY" ".[1].return_hdrs[1].fmt")" "value"
 }
--- a/e2e/tests/http_error_rules/replace.bats
+++ b/e2e/tests/http_error_rules/replace.bats
@ -32,15 +32,15 @@ load 'utils/_helpers'

 	resource_get "$_ERR_RULES_BASE_PATH/0" "parent_type=frontend&parent_name=test_frontend&force_reload=true"
 	assert_equal "$SC" 200
-	assert_equal "$(get_json_path "$BODY" ".data.type")" "status"
-	assert_equal "$(get_json_path "$BODY" ".data.status")" 429
-	assert_equal "$(get_json_path "$BODY" ".data.return_content_type")" "application/json"
-	assert_equal "$(get_json_path "$BODY" ".data.return_content_format")" "string"
-	assert_equal "$(get_json_path "$BODY" ".data.return_content")" "\"My content\""
-	assert_equal "$(get_json_path "$BODY" ".data.return_hdrs[0].name")" "Additional-Header"
-	assert_equal "$(get_json_path "$BODY" ".data.return_hdrs[0].fmt")" "value1"
-	assert_equal "$(get_json_path "$BODY" ".data.return_hdrs[1].name")" "Some-Header"
-	assert_equal "$(get_json_path "$BODY" ".data.return_hdrs[1].fmt")" "value"
+	assert_equal "$(get_json_path "$BODY" ".type")" "status"
+	assert_equal "$(get_json_path "$BODY" ".status")" 429
+	assert_equal "$(get_json_path "$BODY" ".return_content_type")" "application/json"
+	assert_equal "$(get_json_path "$BODY" ".return_content_format")" "string"
+	assert_equal "$(get_json_path "$BODY" ".return_content")" "\"My content\""
+	assert_equal "$(get_json_path "$BODY" ".return_hdrs[0].name")" "Additional-Header"
+	assert_equal "$(get_json_path "$BODY" ".return_hdrs[0].fmt")" "value1"
+	assert_equal "$(get_json_path "$BODY" ".return_hdrs[1].name")" "Some-Header"
+	assert_equal "$(get_json_path "$BODY" ".return_hdrs[1].fmt")" "value"
 }

@test "http_error_rules: Replace a HTTP Error Rule of backend" {
@ -51,15 +51,15 @@ load 'utils/_helpers'

 	resource_get "$_ERR_RULES_BASE_PATH/1" "parent_type=backend&parent_name=test_backend&force_reload=true"
 	assert_equal "$SC" 200
-	assert_equal "$(get_json_path "$BODY" ".data.type")" "status"
-	assert_equal "$(get_json_path "$BODY" ".data.status")" 429
-	assert_equal "$(get_json_path "$BODY" ".data.return_content_type")" "application/json"
-	assert_equal "$(get_json_path "$BODY" ".data.return_content_format")" "string"
-	assert_equal "$(get_json_path "$BODY" ".data.return_content")" "\"My content\""
-	assert_equal "$(get_json_path "$BODY" ".data.return_hdrs[0].name")" "Additional-Header"
-	assert_equal "$(get_json_path "$BODY" ".data.return_hdrs[0].fmt")" "value1"
-	assert_equal "$(get_json_path "$BODY" ".data.return_hdrs[1].name")" "Some-Header"
-	assert_equal "$(get_json_path "$BODY" ".data.return_hdrs[1].fmt")" "value"
+	assert_equal "$(get_json_path "$BODY" ".type")" "status"
+	assert_equal "$(get_json_path "$BODY" ".status")" 429
+	assert_equal "$(get_json_path "$BODY" ".return_content_type")" "application/json"
+	assert_equal "$(get_json_path "$BODY" ".return_content_format")" "string"
+	assert_equal "$(get_json_path "$BODY" ".return_content")" "\"My content\""
+	assert_equal "$(get_json_path "$BODY" ".return_hdrs[0].name")" "Additional-Header"
+	assert_equal "$(get_json_path "$BODY" ".return_hdrs[0].fmt")" "value1"
+	assert_equal "$(get_json_path "$BODY" ".return_hdrs[1].name")" "Some-Header"
+	assert_equal "$(get_json_path "$BODY" ".return_hdrs[1].fmt")" "value"
 }

@test "http_error_rules: Replace a HTTP Error Rule of defaults" {
@ -70,15 +70,15 @@ load 'utils/_helpers'

 	resource_get "$_ERR_RULES_BASE_PATH/0" "parent_type=defaults"
 	assert_equal "$SC" 200
-	assert_equal "$(get_json_path "$BODY" ".data.type")" "status"
-	assert_equal "$(get_json_path "$BODY" ".data.status")" 429
-	assert_equal "$(get_json_path "$BODY" ".data.return_content_type")" "application/json"
-	assert_equal "$(get_json_path "$BODY" ".data.return_content_format")" "string"
-	assert_equal "$(get_json_path "$BODY" ".data.return_content")" "\"My content\""
-	assert_equal "$(get_json_path "$BODY" ".data.return_hdrs[0].name")" "Additional-Header"
-	assert_equal "$(get_json_path "$BODY" ".data.return_hdrs[0].fmt")" "value1"
-	assert_equal "$(get_json_path "$BODY" ".data.return_hdrs[1].name")" "Some-Header"
-	assert_equal "$(get_json_path "$BODY" ".data.return_hdrs[1].fmt")" "value"
+	assert_equal "$(get_json_path "$BODY" ".type")" "status"
+	assert_equal "$(get_json_path "$BODY" ".status")" 429
+	assert_equal "$(get_json_path "$BODY" ".return_content_type")" "application/json"
+	assert_equal "$(get_json_path "$BODY" ".return_content_format")" "string"
+	assert_equal "$(get_json_path "$BODY" ".return_content")" "\"My content\""
+	assert_equal "$(get_json_path "$BODY" ".return_hdrs[0].name")" "Additional-Header"
+	assert_equal "$(get_json_path "$BODY" ".return_hdrs[0].fmt")" "value1"
+	assert_equal "$(get_json_path "$BODY" ".return_hdrs[1].name")" "Some-Header"
+	assert_equal "$(get_json_path "$BODY" ".return_hdrs[1].fmt")" "value"
 }

@test "http_error_rules: Fail to replace a HTTP Error rule when backend does not exist" {
--- a/e2e/tests/http_errors/http_errors.bats
+++ b/e2e/tests/http_errors/http_errors.bats
@ -30,7 +30,7 @@ load 'utils/_helpers'
  resource_get "$_ERR_SECTIONS_BASE_PATH"
  assert_equal "$SC" 200

-	assert_equal "$(get_json_path "$BODY" ".data | length")" 2
+	assert_equal "$(get_json_path "$BODY" ". | length")" 2
 }

@test "http_error_sections: Return one section by name" {
@ -39,14 +39,14 @@ load 'utils/_helpers'
  resource_get "$_ERR_SECTIONS_BASE_PATH/website-2"
  assert_equal "$SC" 200

-  assert_equal "$(get_json_path "$BODY" ".data.name")" "website-2"
-  assert_equal "$(get_json_path "$BODY" ".data.error_files | length")" 3
-  assert_equal "$(get_json_path "$BODY" ".data.error_files[0].code")" 500 
-  assert_equal "$(get_json_path "$BODY" ".data.error_files[0].file")" "/dev/null"
-  assert_equal "$(get_json_path "$BODY" ".data.error_files[1].code")" 404 
-  assert_equal "$(get_json_path "$BODY" ".data.error_files[1].file")" "/dev/null"
-  assert_equal "$(get_json_path "$BODY" ".data.error_files[2].code")" 503 
-  assert_equal "$(get_json_path "$BODY" ".data.error_files[2].file")" "/dev/null"
+  assert_equal "$(get_json_path "$BODY" ".name")" "website-2"
+  assert_equal "$(get_json_path "$BODY" ".error_files | length")" 3
+  assert_equal "$(get_json_path "$BODY" ".error_files[0].code")" 500
+  assert_equal "$(get_json_path "$BODY" ".error_files[0].file")" "/dev/null"
+  assert_equal "$(get_json_path "$BODY" ".error_files[1].code")" 404
+  assert_equal "$(get_json_path "$BODY" ".error_files[1].file")" "/dev/null"
+  assert_equal "$(get_json_path "$BODY" ".error_files[2].code")" 503
+  assert_equal "$(get_json_path "$BODY" ".error_files[2].file")" "/dev/null"
 }

@test "http_error_sections: Fail to return a section that does not exist" {
@ -78,14 +78,14 @@ load 'utils/_helpers'

  resource_post "$_ERR_SECTIONS_BASE_PATH" "data/section.json" "force_reload=true"
  assert_equal "$SC" 201
-  
+
  resource_get "$_ERR_SECTIONS_BASE_PATH/website-3"
  assert_equal "$SC" 200
-  assert_equal "$(get_json_path "$BODY" ".data.error_files | length")" 2
-  assert_equal "$(get_json_path "$BODY" ".data.error_files[0].code")" 500 
-  assert_equal "$(get_json_path "$BODY" ".data.error_files[0].file")" "/dev/null"
-  assert_equal "$(get_json_path "$BODY" ".data.error_files[1].code")" 502
-  assert_equal "$(get_json_path "$BODY" ".data.error_files[1].file")" "/dev/null"
+  assert_equal "$(get_json_path "$BODY" ".error_files | length")" 2
+  assert_equal "$(get_json_path "$BODY" ".error_files[0].code")" 500
+  assert_equal "$(get_json_path "$BODY" ".error_files[0].file")" "/dev/null"
+  assert_equal "$(get_json_path "$BODY" ".error_files[1].code")" 502
+  assert_equal "$(get_json_path "$BODY" ".error_files[1].file")" "/dev/null"
 }

@test "http_error_sections: Fail to create a section with an existing name" {
@ -126,12 +126,12 @@ load 'utils/_helpers'

  resource_get "$_ERR_SECTIONS_BASE_PATH/website-1"
  assert_equal "$SC" 200
-  assert_equal "$(get_json_path "$BODY" ".data.name")" "website-1"
-  assert_equal "$(get_json_path "$BODY" ".data.error_files | length")" 2
-  assert_equal "$(get_json_path "$BODY" ".data.error_files[0].code")" 500 
-  assert_equal "$(get_json_path "$BODY" ".data.error_files[0].file")" "/dev/null"
-  assert_equal "$(get_json_path "$BODY" ".data.error_files[1].code")" 502 
-  assert_equal "$(get_json_path "$BODY" ".data.error_files[1].file")" "/dev/null"
+  assert_equal "$(get_json_path "$BODY" ".name")" "website-1"
+  assert_equal "$(get_json_path "$BODY" ".error_files | length")" 2
+  assert_equal "$(get_json_path "$BODY" ".error_files[0].code")" 500
+  assert_equal "$(get_json_path "$BODY" ".error_files[0].file")" "/dev/null"
+  assert_equal "$(get_json_path "$BODY" ".error_files[1].code")" 502
+  assert_equal "$(get_json_path "$BODY" ".error_files[1].file")" "/dev/null"
 }

@test "http_error_sections: Fail to replace a section that does not exist" {
@ -162,4 +162,4 @@ load 'utils/_helpers'

  resource_put "$_ERR_SECTIONS_BASE_PATH/website-1" "data/section_replace_errorfile_unsupported_code.json" "force_reload=true"
  assert_equal "$SC" 422
-}
+}
--- a/e2e/tests/http_request_rules/add_2.8.bats
+++ b/e2e/tests/http_request_rules/add_2.8.bats
@ -34,12 +34,12 @@ load 'utils/_helpers'

  resource_get "$_REQ_RULES_BASE_PATH/0" "parent_type=backend&parent_name=test_sticksc"
 	assert_equal "$SC" 200
-	assert_equal "$(get_json_path "$BODY" ".data.type")" "track-sc"
-	assert_equal "$(get_json_path "$BODY" ".data.cond")" "if"
-	assert_equal "$(get_json_path "$BODY" ".data.cond_test")" "TRUE"
-	assert_equal "$(get_json_path "$BODY" ".data.track_sc_key")" "src"
-	assert_equal "$(get_json_path "$BODY" ".data.track_sc_table")" "test_sticksc"
-	assert_equal "$(get_json_path "$BODY" ".data.track_sc_stick_counter")" 5
+	assert_equal "$(get_json_path "$BODY" ".type")" "track-sc"
+	assert_equal "$(get_json_path "$BODY" ".cond")" "if"
+	assert_equal "$(get_json_path "$BODY" ".cond_test")" "TRUE"
+	assert_equal "$(get_json_path "$BODY" ".track_sc_key")" "src"
+	assert_equal "$(get_json_path "$BODY" ".track_sc_table")" "test_sticksc"
+	assert_equal "$(get_json_path "$BODY" ".track_sc_stick_counter")" 5
  fi
 }

@ -52,12 +52,12 @@ load 'utils/_helpers'

  resource_get "$_REQ_RULES_BASE_PATH/0" "parent_type=backend&parent_name=test_sticksc"
 	assert_equal "$SC" 200
-	assert_equal "$(get_json_path "$BODY" ".data.type")" "track-sc"
-	assert_equal "$(get_json_path "$BODY" ".data.cond")" "if"
-	assert_equal "$(get_json_path "$BODY" ".data.cond_test")" "TRUE"
-	assert_equal "$(get_json_path "$BODY" ".data.track_sc_key")" "src"
-	assert_equal "$(get_json_path "$BODY" ".data.track_sc_table")" "test_sticksc"
-	assert_equal "$(get_json_path "$BODY" ".data.track_sc_stick_counter")" 0
+	assert_equal "$(get_json_path "$BODY" ".type")" "track-sc"
+	assert_equal "$(get_json_path "$BODY" ".cond")" "if"
+	assert_equal "$(get_json_path "$BODY" ".cond_test")" "TRUE"
+	assert_equal "$(get_json_path "$BODY" ".track_sc_key")" "src"
+	assert_equal "$(get_json_path "$BODY" ".track_sc_table")" "test_sticksc"
+	assert_equal "$(get_json_path "$BODY" ".track_sc_stick_counter")" 0
  fi
 }

--- a/e2e/tests/http_request_rules/get.bats
+++ b/e2e/tests/http_request_rules/get.bats
@ -26,31 +26,31 @@ load 'utils/_helpers'
@test "http_request_rules: Return one HTTP Request Rule from frontend" {
  resource_get "$_REQ_RULES_BASE_PATH/0" "parent_type=frontend&parent_name=test_frontend"
 	assert_equal "$SC" 200
-	assert_equal "$(get_json_path "$BODY" ".data.type")" "add-header"
-	assert_equal "$(get_json_path "$BODY" ".data.hdr_name")" "X-Add-Frontend"
-	assert_equal "$(get_json_path "$BODY" ".data.cond")" "unless"
-	assert_equal "$(get_json_path "$BODY" ".data.cond_test")" "{ src 192.168.0.0/16 }"
+	assert_equal "$(get_json_path "$BODY" ".type")" "add-header"
+	assert_equal "$(get_json_path "$BODY" ".hdr_name")" "X-Add-Frontend"
+	assert_equal "$(get_json_path "$BODY" ".cond")" "unless"
+	assert_equal "$(get_json_path "$BODY" ".cond_test")" "{ src 192.168.0.0/16 }"

 	resource_get "$_REQ_RULES_BASE_PATH/1" "parent_type=frontend&parent_name=test_frontend"
 	assert_equal "$SC" 200
-	assert_equal "$(get_json_path "$BODY" ".data.type")" "del-header"
-	assert_equal "$(get_json_path "$BODY" ".data.hdr_name")" "X-Del-Frontend"
-	assert_equal "$(get_json_path "$BODY" ".data.cond")" "if"
-	assert_equal "$(get_json_path "$BODY" ".data.cond_test")" "{ src 10.1.0.0/16 }"
+	assert_equal "$(get_json_path "$BODY" ".type")" "del-header"
+	assert_equal "$(get_json_path "$BODY" ".hdr_name")" "X-Del-Frontend"
+	assert_equal "$(get_json_path "$BODY" ".cond")" "if"
+	assert_equal "$(get_json_path "$BODY" ".cond_test")" "{ src 10.1.0.0/16 }"
 }

@test "http_request_rules: Return one HTTP Request Rule from backend" {
 	resource_get "$_REQ_RULES_BASE_PATH/0" "parent_type=backend&parent_name=test_backend"
 	assert_equal "$SC" 200
-	assert_equal "$(get_json_path "$BODY" ".data.type")" "add-header"
-	assert_equal "$(get_json_path "$BODY" ".data.hdr_name")" "X-Add-Backend"
-	assert_equal "$(get_json_path "$BODY" ".data.cond")" "unless"
-	assert_equal "$(get_json_path "$BODY" ".data.cond_test")" "{ src 192.168.0.0/16 }"
+	assert_equal "$(get_json_path "$BODY" ".type")" "add-header"
+	assert_equal "$(get_json_path "$BODY" ".hdr_name")" "X-Add-Backend"
+	assert_equal "$(get_json_path "$BODY" ".cond")" "unless"
+	assert_equal "$(get_json_path "$BODY" ".cond_test")" "{ src 192.168.0.0/16 }"

 	resource_get "$_REQ_RULES_BASE_PATH/1" "parent_type=backend&parent_name=test_backend"
 	assert_equal "$SC" 200
-	assert_equal "$(get_json_path "$BODY" ".data.type")" "del-header"
-	assert_equal "$(get_json_path "$BODY" ".data.hdr_name")" "X-Del-Backend"
-	assert_equal "$(get_json_path "$BODY" ".data.cond")" "if"
-	assert_equal "$(get_json_path "$BODY" ".data.cond_test")" "{ src 10.1.0.0/16 }"
+	assert_equal "$(get_json_path "$BODY" ".type")" "del-header"
+	assert_equal "$(get_json_path "$BODY" ".hdr_name")" "X-Del-Backend"
+	assert_equal "$(get_json_path "$BODY" ".cond")" "if"
+	assert_equal "$(get_json_path "$BODY" ".cond_test")" "{ src 10.1.0.0/16 }"
 }
--- a/e2e/tests/http_request_rules/get_2.8.bats
+++ b/e2e/tests/http_request_rules/get_2.8.bats
@ -29,21 +29,21 @@ load 'utils/_helpers'
  then
  resource_get "$_REQ_RULES_BASE_PATH/0" "parent_type=frontend&parent_name=test_sticksc"
 	assert_equal "$SC" 200
-	assert_equal "$(get_json_path "$BODY" ".data.type")" "track-sc"
-	assert_equal "$(get_json_path "$BODY" ".data.cond")" "if"
-	assert_equal "$(get_json_path "$BODY" ".data.cond_test")" "TRUE"
-	assert_equal "$(get_json_path "$BODY" ".data.track_sc_key")" "src"
-	assert_equal "$(get_json_path "$BODY" ".data.track_sc_table")" "test_sticksc"
-	assert_equal "$(get_json_path "$BODY" ".data.track_sc_stick_counter")" 0
+	assert_equal "$(get_json_path "$BODY" ".type")" "track-sc"
+	assert_equal "$(get_json_path "$BODY" ".cond")" "if"
+	assert_equal "$(get_json_path "$BODY" ".cond_test")" "TRUE"
+	assert_equal "$(get_json_path "$BODY" ".track_sc_key")" "src"
+	assert_equal "$(get_json_path "$BODY" ".track_sc_table")" "test_sticksc"
+	assert_equal "$(get_json_path "$BODY" ".track_sc_stick_counter")" 0

  resource_get "$_REQ_RULES_BASE_PATH/1" "parent_type=frontend&parent_name=test_sticksc"
 	assert_equal "$SC" 200
-	assert_equal "$(get_json_path "$BODY" ".data.type")" "track-sc"
-	assert_equal "$(get_json_path "$BODY" ".data.cond")" "if"
-	assert_equal "$(get_json_path "$BODY" ".data.cond_test")" "TRUE"
-	assert_equal "$(get_json_path "$BODY" ".data.track_sc_key")" "src"
-	assert_equal "$(get_json_path "$BODY" ".data.track_sc_table")" "test_sticksc"
-	assert_equal "$(get_json_path "$BODY" ".data.track_sc_stick_counter")" 5
+	assert_equal "$(get_json_path "$BODY" ".type")" "track-sc"
+	assert_equal "$(get_json_path "$BODY" ".cond")" "if"
+	assert_equal "$(get_json_path "$BODY" ".cond_test")" "TRUE"
+	assert_equal "$(get_json_path "$BODY" ".track_sc_key")" "src"
+	assert_equal "$(get_json_path "$BODY" ".track_sc_table")" "test_sticksc"
+	assert_equal "$(get_json_path "$BODY" ".track_sc_stick_counter")" 5
  fi
 }

@ -52,20 +52,20 @@ load 'utils/_helpers'
  then
  resource_get "$_REQ_RULES_BASE_PATH/0" "parent_type=backend&parent_name=test_sticksc"
 	assert_equal "$SC" 200
-	assert_equal "$(get_json_path "$BODY" ".data.type")" "track-sc"
-	assert_equal "$(get_json_path "$BODY" ".data.cond")" "if"
-	assert_equal "$(get_json_path "$BODY" ".data.cond_test")" "TRUE"
-	assert_equal "$(get_json_path "$BODY" ".data.track_sc_key")" "src"
-	assert_equal "$(get_json_path "$BODY" ".data.track_sc_table")" "test_sticksc"
-	assert_equal "$(get_json_path "$BODY" ".data.track_sc_stick_counter")" 0
+	assert_equal "$(get_json_path "$BODY" ".type")" "track-sc"
+	assert_equal "$(get_json_path "$BODY" ".cond")" "if"
+	assert_equal "$(get_json_path "$BODY" ".cond_test")" "TRUE"
+	assert_equal "$(get_json_path "$BODY" ".track_sc_key")" "src"
+	assert_equal "$(get_json_path "$BODY" ".track_sc_table")" "test_sticksc"
+	assert_equal "$(get_json_path "$BODY" ".track_sc_stick_counter")" 0

  resource_get "$_REQ_RULES_BASE_PATH/1" "parent_type=backend&parent_name=test_sticksc"
 	assert_equal "$SC" 200
-	assert_equal "$(get_json_path "$BODY" ".data.type")" "track-sc"
-	assert_equal "$(get_json_path "$BODY" ".data.cond")" "if"
-	assert_equal "$(get_json_path "$BODY" ".data.cond_test")" "TRUE"
-	assert_equal "$(get_json_path "$BODY" ".data.track_sc_key")" "src"
-	assert_equal "$(get_json_path "$BODY" ".data.track_sc_table")" "test_sticksc"
-	assert_equal "$(get_json_path "$BODY" ".data.track_sc_stick_counter")" 5
+	assert_equal "$(get_json_path "$BODY" ".type")" "track-sc"
+	assert_equal "$(get_json_path "$BODY" ".cond")" "if"
+	assert_equal "$(get_json_path "$BODY" ".cond_test")" "TRUE"
+	assert_equal "$(get_json_path "$BODY" ".track_sc_key")" "src"
+	assert_equal "$(get_json_path "$BODY" ".track_sc_table")" "test_sticksc"
+	assert_equal "$(get_json_path "$BODY" ".track_sc_stick_counter")" 5
  fi
 }
--- a/e2e/tests/http_request_rules/list.bats
+++ b/e2e/tests/http_request_rules/list.bats
@ -28,38 +28,38 @@ load 'utils/_helpers'
    resource_get "$_REQ_RULES_BASE_PATH" "parent_type=frontend&parent_name=test_frontend"
    assert_equal "$SC" 200
    if haproxy_version_ge "2.8"; then
-        assert_equal "$(get_json_path "$BODY" ".data | length")" 3
+        assert_equal "$(get_json_path "$BODY" ". | length")" 3
    else
-        assert_equal "$(get_json_path "$BODY" ".data | length")" 2
+        assert_equal "$(get_json_path "$BODY" ". | length")" 2
    fi
-    assert_equal "$(get_json_path "$BODY" ".data[0].type")" "add-header"
-	assert_equal "$(get_json_path "$BODY" ".data[0].hdr_name")" "X-Add-Frontend"
-	assert_equal "$(get_json_path "$BODY" ".data[0].cond")" "unless"
-	assert_equal "$(get_json_path "$BODY" ".data[0].cond_test")" "{ src 192.168.0.0/16 }"
-    assert_equal "$(get_json_path "$BODY" ".data[1].type")" "del-header"
-	assert_equal "$(get_json_path "$BODY" ".data[1].hdr_name")" "X-Del-Frontend"
-	assert_equal "$(get_json_path "$BODY" ".data[1].cond")" "if"
-	assert_equal "$(get_json_path "$BODY" ".data[1].cond_test")" "{ src 10.1.0.0/16 }"
+    assert_equal "$(get_json_path "$BODY" ".[0].type")" "add-header"
+	assert_equal "$(get_json_path "$BODY" ".[0].hdr_name")" "X-Add-Frontend"
+	assert_equal "$(get_json_path "$BODY" ".[0].cond")" "unless"
+	assert_equal "$(get_json_path "$BODY" ".[0].cond_test")" "{ src 192.168.0.0/16 }"
+    assert_equal "$(get_json_path "$BODY" ".[1].type")" "del-header"
+	assert_equal "$(get_json_path "$BODY" ".[1].hdr_name")" "X-Del-Frontend"
+	assert_equal "$(get_json_path "$BODY" ".[1].cond")" "if"
+	assert_equal "$(get_json_path "$BODY" ".[1].cond_test")" "{ src 10.1.0.0/16 }"
 	if haproxy_version_ge "2.8"; then
-        assert_equal "$(get_json_path "$BODY" ".data[2].type")" "sc-add-gpc"
-        assert_equal "$(get_json_path "$BODY" ".data[2].index")" "2"
-        assert_equal "$(get_json_path "$BODY" ".data[2].sc_id")" "1"
-        assert_equal "$(get_json_path "$BODY" ".data[2].sc_int")" "1"
-        assert_equal "$(get_json_path "$BODY" ".data[2].cond")" "if"
-        assert_equal "$(get_json_path "$BODY" ".data[2].cond_test")" "FALSE"
+        assert_equal "$(get_json_path "$BODY" ".[2].type")" "sc-add-gpc"
+        assert_equal "$(get_json_path "$BODY" ".[2].index")" "2"
+        assert_equal "$(get_json_path "$BODY" ".[2].sc_id")" "1"
+        assert_equal "$(get_json_path "$BODY" ".[2].sc_int")" "1"
+        assert_equal "$(get_json_path "$BODY" ".[2].cond")" "if"
+        assert_equal "$(get_json_path "$BODY" ".[2].cond_test")" "FALSE"
    fi
 }

@test "http_request_rules: Return one HTTP Request Rule from backend" {
    resource_get "$_REQ_RULES_BASE_PATH" "parent_type=backend&parent_name=test_backend"
 	assert_equal "$SC" 200
-	assert_equal 2 "$(get_json_path "$BODY" ".data | length")"
-    assert_equal "$(get_json_path "$BODY" ".data[0].type")" "add-header"
-	assert_equal "$(get_json_path "$BODY" ".data[0].hdr_name")" "X-Add-Backend"
-	assert_equal "$(get_json_path "$BODY" ".data[0].cond")" "unless"
-	assert_equal "$(get_json_path "$BODY" ".data[0].cond_test")" "{ src 192.168.0.0/16 }"
-    assert_equal "$(get_json_path "$BODY" ".data[1].type")" "del-header"
-	assert_equal "$(get_json_path "$BODY" ".data[1].hdr_name")" "X-Del-Backend"
-	assert_equal "$(get_json_path "$BODY" ".data[1].cond")" "if"
-	assert_equal "$(get_json_path "$BODY" ".data[1].cond_test")" "{ src 10.1.0.0/16 }"
+	assert_equal 2 "$(get_json_path "$BODY" ". | length")"
+    assert_equal "$(get_json_path "$BODY" ".[0].type")" "add-header"
+	assert_equal "$(get_json_path "$BODY" ".[0].hdr_name")" "X-Add-Backend"
+	assert_equal "$(get_json_path "$BODY" ".[0].cond")" "unless"
+	assert_equal "$(get_json_path "$BODY" ".[0].cond_test")" "{ src 192.168.0.0/16 }"
+    assert_equal "$(get_json_path "$BODY" ".[1].type")" "del-header"
+	assert_equal "$(get_json_path "$BODY" ".[1].hdr_name")" "X-Del-Backend"
+	assert_equal "$(get_json_path "$BODY" ".[1].cond")" "if"
+	assert_equal "$(get_json_path "$BODY" ".[1].cond_test")" "{ src 10.1.0.0/16 }"
 }
--- a/e2e/tests/http_request_rules/replace.bats
+++ b/e2e/tests/http_request_rules/replace.bats
@ -29,11 +29,11 @@ load 'utils/_helpers'

 	resource_get "$_REQ_RULES_BASE_PATH/0" "parent_type=frontend&parent_name=test_frontend&force_reload=true"
 	assert_equal "$SC" 200
-	assert_equal "$(get_json_path "$BODY" ".data.cond")" "if"
-	assert_equal "$(get_json_path "$BODY" ".data.cond_test")" "{ src 192.168.0.0/16 }"
-	assert_equal "$(get_json_path "$BODY" ".data.hdr_format")" "%T"
-	assert_equal "$(get_json_path "$BODY" ".data.hdr_name")" "X-Haproxy-Current-Date"
-	assert_equal "$(get_json_path "$BODY" ".data.type")" "add-header"
+	assert_equal "$(get_json_path "$BODY" ".cond")" "if"
+	assert_equal "$(get_json_path "$BODY" ".cond_test")" "{ src 192.168.0.0/16 }"
+	assert_equal "$(get_json_path "$BODY" ".hdr_format")" "%T"
+	assert_equal "$(get_json_path "$BODY" ".hdr_name")" "X-Haproxy-Current-Date"
+	assert_equal "$(get_json_path "$BODY" ".type")" "add-header"
 }

@test "http_request_rules: Replace a HTTP Request Rule of backend" {
@ -42,9 +42,9 @@ load 'utils/_helpers'

 	resource_get "$_REQ_RULES_BASE_PATH/0" "parent_type=backend&parent_name=test_backend&force_reload=true"
 	assert_equal "$SC" 200
-	assert_equal "$(get_json_path "$BODY" ".data.cond")" "if"
-	assert_equal "$(get_json_path "$BODY" ".data.cond_test")" "{ src 192.168.0.0/16 }"
-	assert_equal "$(get_json_path "$BODY" ".data.hdr_format")" "%T"
-	assert_equal "$(get_json_path "$BODY" ".data.hdr_name")" "X-Haproxy-Current-Date"
-	assert_equal "$(get_json_path "$BODY" ".data.type")" "add-header"
+	assert_equal "$(get_json_path "$BODY" ".cond")" "if"
+	assert_equal "$(get_json_path "$BODY" ".cond_test")" "{ src 192.168.0.0/16 }"
+	assert_equal "$(get_json_path "$BODY" ".hdr_format")" "%T"
+	assert_equal "$(get_json_path "$BODY" ".hdr_name")" "X-Haproxy-Current-Date"
+	assert_equal "$(get_json_path "$BODY" ".type")" "add-header"
 }
--- a/e2e/tests/http_response_rules/add_2.8.bats
+++ b/e2e/tests/http_response_rules/add_2.8.bats
@ -34,12 +34,12 @@ load 'utils/_helpers'

  resource_get "$_RES_RULES_BASE_PATH/0" "parent_type=backend&parent_name=test_sticksc"
 	assert_equal "$SC" 200
-	assert_equal "$(get_json_path "$BODY" ".data.type")" "track-sc"
-	assert_equal "$(get_json_path "$BODY" ".data.cond")" "if"
-	assert_equal "$(get_json_path "$BODY" ".data.cond_test")" "TRUE"
-	assert_equal "$(get_json_path "$BODY" ".data.track_sc_key")" "src"
-	assert_equal "$(get_json_path "$BODY" ".data.track_sc_table")" "test_sticksc"
-	assert_equal "$(get_json_path "$BODY" ".data.track_sc_stick_counter")" 5
+	assert_equal "$(get_json_path "$BODY" ".type")" "track-sc"
+	assert_equal "$(get_json_path "$BODY" ".cond")" "if"
+	assert_equal "$(get_json_path "$BODY" ".cond_test")" "TRUE"
+	assert_equal "$(get_json_path "$BODY" ".track_sc_key")" "src"
+	assert_equal "$(get_json_path "$BODY" ".track_sc_table")" "test_sticksc"
+	assert_equal "$(get_json_path "$BODY" ".track_sc_stick_counter")" 5
  fi
 }

@ -52,12 +52,12 @@ load 'utils/_helpers'

  resource_get "$_RES_RULES_BASE_PATH/0" "parent_type=backend&parent_name=test_sticksc"
 	assert_equal "$SC" 200
-	assert_equal "$(get_json_path "$BODY" ".data.type")" "track-sc"
-	assert_equal "$(get_json_path "$BODY" ".data.cond")" "if"
-	assert_equal "$(get_json_path "$BODY" ".data.cond_test")" "TRUE"
-	assert_equal "$(get_json_path "$BODY" ".data.track_sc_key")" "src"
-	assert_equal "$(get_json_path "$BODY" ".data.track_sc_table")" "test_sticksc"
-	assert_equal "$(get_json_path "$BODY" ".data.track_sc_stick_counter")" 0
+	assert_equal "$(get_json_path "$BODY" ".type")" "track-sc"
+	assert_equal "$(get_json_path "$BODY" ".cond")" "if"
+	assert_equal "$(get_json_path "$BODY" ".cond_test")" "TRUE"
+	assert_equal "$(get_json_path "$BODY" ".track_sc_key")" "src"
+	assert_equal "$(get_json_path "$BODY" ".track_sc_table")" "test_sticksc"
+	assert_equal "$(get_json_path "$BODY" ".track_sc_stick_counter")" 0
  fi
 }

--- a/e2e/tests/http_response_rules/get.bats
+++ b/e2e/tests/http_response_rules/get.bats
@ -26,31 +26,31 @@ load 'utils/_helpers'
@test "http_response_rules: Return one HTTP Response Rule from frontend" {
  resource_get "$_RES_RULES_BASE_PATH/0" "parent_type=frontend&parent_name=test_frontend"
 	assert_equal "$SC" 200
-  assert_equal "$(get_json_path "$BODY" ".data.type")" "add-header"
-	assert_equal "$(get_json_path "$BODY" ".data.hdr_name")" "X-Add-Frontend"
-	assert_equal "$(get_json_path "$BODY" ".data.cond")" "unless"
-	assert_equal "$(get_json_path "$BODY" ".data.cond_test")" "{ src 192.168.0.0/16 }"
+  assert_equal "$(get_json_path "$BODY" ".type")" "add-header"
+	assert_equal "$(get_json_path "$BODY" ".hdr_name")" "X-Add-Frontend"
+	assert_equal "$(get_json_path "$BODY" ".cond")" "unless"
+	assert_equal "$(get_json_path "$BODY" ".cond_test")" "{ src 192.168.0.0/16 }"

 	resource_get "$_RES_RULES_BASE_PATH/1" "parent_type=frontend&parent_name=test_frontend"
 	assert_equal "$SC" 200
-  assert_equal "$(get_json_path "$BODY" ".data.type")" "del-header"
-	assert_equal "$(get_json_path "$BODY" ".data.hdr_name")" "X-Del-Frontend"
-	assert_equal "$(get_json_path "$BODY" ".data.cond")" "if"
-	assert_equal "$(get_json_path "$BODY" ".data.cond_test")" "{ src 10.1.0.0/16 }"
+  assert_equal "$(get_json_path "$BODY" ".type")" "del-header"
+	assert_equal "$(get_json_path "$BODY" ".hdr_name")" "X-Del-Frontend"
+	assert_equal "$(get_json_path "$BODY" ".cond")" "if"
+	assert_equal "$(get_json_path "$BODY" ".cond_test")" "{ src 10.1.0.0/16 }"
 }

@test "http_response_rules: Return one HTTP Response Rule from backend" {
  resource_get "$_RES_RULES_BASE_PATH/0" "parent_type=backend&parent_name=test_backend"
 	assert_equal "$SC" 200
-	assert_equal "$(get_json_path "$BODY" ".data.type")" "add-header"
-	assert_equal "$(get_json_path "$BODY" ".data.hdr_name")" "X-Add-Backend"
-	assert_equal "$(get_json_path "$BODY" ".data.cond")" "unless"
-	assert_equal "$(get_json_path "$BODY" ".data.cond_test")" "{ src 192.168.0.0/16 }"
+	assert_equal "$(get_json_path "$BODY" ".type")" "add-header"
+	assert_equal "$(get_json_path "$BODY" ".hdr_name")" "X-Add-Backend"
+	assert_equal "$(get_json_path "$BODY" ".cond")" "unless"
+	assert_equal "$(get_json_path "$BODY" ".cond_test")" "{ src 192.168.0.0/16 }"

 	resource_get "$_RES_RULES_BASE_PATH/1" "parent_type=backend&parent_name=test_backend"
 	assert_equal "$SC" 200
-  assert_equal "$(get_json_path "$BODY" ".data.type")" "del-header"
-	assert_equal "$(get_json_path "$BODY" ".data.hdr_name")" "X-Del-Backend"
-	assert_equal "$(get_json_path "$BODY" ".data.cond")" "if"
-	assert_equal "$(get_json_path "$BODY" ".data.cond_test")" "{ src 10.1.0.0/16 }"
+  assert_equal "$(get_json_path "$BODY" ".type")" "del-header"
+	assert_equal "$(get_json_path "$BODY" ".hdr_name")" "X-Del-Backend"
+	assert_equal "$(get_json_path "$BODY" ".cond")" "if"
+	assert_equal "$(get_json_path "$BODY" ".cond_test")" "{ src 10.1.0.0/16 }"
 }
--- a/e2e/tests/http_response_rules/get_2.8.bats
+++ b/e2e/tests/http_response_rules/get_2.8.bats
@ -30,21 +30,21 @@ load 'utils/_helpers'
  then
  resource_get "$_RES_RULES_BASE_PATH/0" "parent_type=frontend&parent_name=test_sticksc"
 	assert_equal "$SC" 200
-	assert_equal "$(get_json_path "$BODY" ".data.type")" "track-sc"
-	assert_equal "$(get_json_path "$BODY" ".data.cond")" "if"
-	assert_equal "$(get_json_path "$BODY" ".data.cond_test")" "TRUE"
-	assert_equal "$(get_json_path "$BODY" ".data.track_sc_key")" "src"
-	assert_equal "$(get_json_path "$BODY" ".data.track_sc_table")" "test_sticksc"
-	assert_equal "$(get_json_path "$BODY" ".data.track_sc_stick_counter")" 0
+	assert_equal "$(get_json_path "$BODY" ".type")" "track-sc"
+	assert_equal "$(get_json_path "$BODY" ".cond")" "if"
+	assert_equal "$(get_json_path "$BODY" ".cond_test")" "TRUE"
+	assert_equal "$(get_json_path "$BODY" ".track_sc_key")" "src"
+	assert_equal "$(get_json_path "$BODY" ".track_sc_table")" "test_sticksc"
+	assert_equal "$(get_json_path "$BODY" ".track_sc_stick_counter")" 0

  resource_get "$_RES_RULES_BASE_PATH/1" "parent_type=frontend&parent_name=test_sticksc"
 	assert_equal "$SC" 200
-	assert_equal "$(get_json_path "$BODY" ".data.type")" "track-sc"
-	assert_equal "$(get_json_path "$BODY" ".data.cond")" "if"
-	assert_equal "$(get_json_path "$BODY" ".data.cond_test")" "TRUE"
-	assert_equal "$(get_json_path "$BODY" ".data.track_sc_key")" "src"
-	assert_equal "$(get_json_path "$BODY" ".data.track_sc_table")" "test_sticksc"
-	assert_equal "$(get_json_path "$BODY" ".data.track_sc_stick_counter")" 5
+	assert_equal "$(get_json_path "$BODY" ".type")" "track-sc"
+	assert_equal "$(get_json_path "$BODY" ".cond")" "if"
+	assert_equal "$(get_json_path "$BODY" ".cond_test")" "TRUE"
+	assert_equal "$(get_json_path "$BODY" ".track_sc_key")" "src"
+	assert_equal "$(get_json_path "$BODY" ".track_sc_table")" "test_sticksc"
+	assert_equal "$(get_json_path "$BODY" ".track_sc_stick_counter")" 5
  fi
 }

@ -53,20 +53,20 @@ load 'utils/_helpers'
  then
  resource_get "$_RES_RULES_BASE_PATH/0" "parent_type=backend&parent_name=test_sticksc"
 	assert_equal "$SC" 200
-	assert_equal "$(get_json_path "$BODY" ".data.type")" "track-sc"
-	assert_equal "$(get_json_path "$BODY" ".data.cond")" "if"
-	assert_equal "$(get_json_path "$BODY" ".data.cond_test")" "TRUE"
-	assert_equal "$(get_json_path "$BODY" ".data.track_sc_key")" "src"
-	assert_equal "$(get_json_path "$BODY" ".data.track_sc_table")" "test_sticksc"
-	assert_equal "$(get_json_path "$BODY" ".data.track_sc_stick_counter")" 0
+	assert_equal "$(get_json_path "$BODY" ".type")" "track-sc"
+	assert_equal "$(get_json_path "$BODY" ".cond")" "if"
+	assert_equal "$(get_json_path "$BODY" ".cond_test")" "TRUE"
+	assert_equal "$(get_json_path "$BODY" ".track_sc_key")" "src"
+	assert_equal "$(get_json_path "$BODY" ".track_sc_table")" "test_sticksc"
+	assert_equal "$(get_json_path "$BODY" ".track_sc_stick_counter")" 0

  resource_get "$_RES_RULES_BASE_PATH/1" "parent_type=backend&parent_name=test_sticksc"
 	assert_equal "$SC" 200
-	assert_equal "$(get_json_path "$BODY" ".data.type")" "track-sc"
-	assert_equal "$(get_json_path "$BODY" ".data.cond")" "if"
-	assert_equal "$(get_json_path "$BODY" ".data.cond_test")" "TRUE"
-	assert_equal "$(get_json_path "$BODY" ".data.track_sc_key")" "src"
-	assert_equal "$(get_json_path "$BODY" ".data.track_sc_table")" "test_sticksc"
-	assert_equal "$(get_json_path "$BODY" ".data.track_sc_stick_counter")" 5
+	assert_equal "$(get_json_path "$BODY" ".type")" "track-sc"
+	assert_equal "$(get_json_path "$BODY" ".cond")" "if"
+	assert_equal "$(get_json_path "$BODY" ".cond_test")" "TRUE"
+	assert_equal "$(get_json_path "$BODY" ".track_sc_key")" "src"
+	assert_equal "$(get_json_path "$BODY" ".track_sc_table")" "test_sticksc"
+	assert_equal "$(get_json_path "$BODY" ".track_sc_stick_counter")" 5
  fi
 }
--- a/e2e/tests/http_response_rules/list.bats
+++ b/e2e/tests/http_response_rules/list.bats
@ -28,38 +28,38 @@ load 'utils/_helpers'
  resource_get "$_RES_RULES_BASE_PATH" "parent_type=frontend&parent_name=test_frontend"
 	assert_equal "$SC" 200
 	if haproxy_version_ge "2.8"; then
-	    assert_equal "$(get_json_path "$BODY" ".data | length")" 3
+	    assert_equal "$(get_json_path "$BODY" ". | length")" 3
 	else
-	    assert_equal "$(get_json_path "$BODY" ".data | length")" 2
+	    assert_equal "$(get_json_path "$BODY" ". | length")" 2
 	fi
-    assert_equal "$(get_json_path "$BODY" ".data[0].type")" "add-header"
-	assert_equal "$(get_json_path "$BODY" ".data[0].hdr_name")" "X-Add-Frontend"
-	assert_equal "$(get_json_path "$BODY" ".data[0].cond")" "unless"
-	assert_equal "$(get_json_path "$BODY" ".data[0].cond_test")" "{ src 192.168.0.0/16 }"
-    assert_equal "$(get_json_path "$BODY" ".data[1].type")" "del-header"
-	assert_equal "$(get_json_path "$BODY" ".data[1].hdr_name")" "X-Del-Frontend"
-	assert_equal "$(get_json_path "$BODY" ".data[1].cond")" "if"
-	assert_equal "$(get_json_path "$BODY" ".data[1].cond_test")" "{ src 10.1.0.0/16 }"
+    assert_equal "$(get_json_path "$BODY" ".[0].type")" "add-header"
+	assert_equal "$(get_json_path "$BODY" ".[0].hdr_name")" "X-Add-Frontend"
+	assert_equal "$(get_json_path "$BODY" ".[0].cond")" "unless"
+	assert_equal "$(get_json_path "$BODY" ".[0].cond_test")" "{ src 192.168.0.0/16 }"
+    assert_equal "$(get_json_path "$BODY" ".[1].type")" "del-header"
+	assert_equal "$(get_json_path "$BODY" ".[1].hdr_name")" "X-Del-Frontend"
+	assert_equal "$(get_json_path "$BODY" ".[1].cond")" "if"
+	assert_equal "$(get_json_path "$BODY" ".[1].cond_test")" "{ src 10.1.0.0/16 }"
 	if haproxy_version_ge "2.8"; then
-        assert_equal "$(get_json_path "$BODY" ".data[2].type")" "sc-add-gpc"
-        assert_equal "$(get_json_path "$BODY" ".data[2].index")" "2"
-        assert_equal "$(get_json_path "$BODY" ".data[2].sc_id")" "1"
-        assert_equal "$(get_json_path "$BODY" ".data[2].sc_int")" "1"
-        assert_equal "$(get_json_path "$BODY" ".data[2].cond")" "if"
-        assert_equal "$(get_json_path "$BODY" ".data[2].cond_test")" "FALSE"
+        assert_equal "$(get_json_path "$BODY" ".[2].type")" "sc-add-gpc"
+        assert_equal "$(get_json_path "$BODY" ".[2].index")" "2"
+        assert_equal "$(get_json_path "$BODY" ".[2].sc_id")" "1"
+        assert_equal "$(get_json_path "$BODY" ".[2].sc_int")" "1"
+        assert_equal "$(get_json_path "$BODY" ".[2].cond")" "if"
+        assert_equal "$(get_json_path "$BODY" ".[2].cond_test")" "FALSE"
    fi
 }

@test "http_response_rules: Return one HTTP Response Rule from backend" {
 	resource_get "$_RES_RULES_BASE_PATH" "parent_type=backend&parent_name=test_backend"
 	assert_equal "$SC" 200
-	assert_equal 2 "$(get_json_path "$BODY" ".data | length")"
-    assert_equal "$(get_json_path "$BODY" ".data[0].type")" "add-header"
-	assert_equal "$(get_json_path "$BODY" ".data[0].hdr_name")" "X-Add-Backend"
-	assert_equal "$(get_json_path "$BODY" ".data[0].cond")" "unless"
-	assert_equal "$(get_json_path "$BODY" ".data[0].cond_test")" "{ src 192.168.0.0/16 }"
-    assert_equal "$(get_json_path "$BODY" ".data[1].type")" "del-header"
-	assert_equal "$(get_json_path "$BODY" ".data[1].hdr_name")" "X-Del-Backend"
-	assert_equal "$(get_json_path "$BODY" ".data[1].cond")" "if"
-	assert_equal "$(get_json_path "$BODY" ".data[1].cond_test")" "{ src 10.1.0.0/16 }"
+	assert_equal 2 "$(get_json_path "$BODY" ". | length")"
+    assert_equal "$(get_json_path "$BODY" ".[0].type")" "add-header"
+	assert_equal "$(get_json_path "$BODY" ".[0].hdr_name")" "X-Add-Backend"
+	assert_equal "$(get_json_path "$BODY" ".[0].cond")" "unless"
+	assert_equal "$(get_json_path "$BODY" ".[0].cond_test")" "{ src 192.168.0.0/16 }"
+    assert_equal "$(get_json_path "$BODY" ".[1].type")" "del-header"
+	assert_equal "$(get_json_path "$BODY" ".[1].hdr_name")" "X-Del-Backend"
+	assert_equal "$(get_json_path "$BODY" ".[1].cond")" "if"
+	assert_equal "$(get_json_path "$BODY" ".[1].cond_test")" "{ src 10.1.0.0/16 }"
 }
--- a/e2e/tests/http_response_rules/replace.bats
+++ b/e2e/tests/http_response_rules/replace.bats
@ -29,11 +29,11 @@ load 'utils/_helpers'

 	resource_get "$_RES_RULES_BASE_PATH/0" "parent_type=frontend&parent_name=test_frontend&force_reload=true"
 	assert_equal "$SC" 200
-	assert_equal "$(get_json_path "$BODY" ".data.cond")" "if"
-	assert_equal "$(get_json_path "$BODY" ".data.cond_test")" "{ src 192.168.0.0/16 }"
-  assert_equal "$(get_json_path "$BODY" ".data.type")" "add-header"
-	assert_equal "$(get_json_path "$BODY" ".data.hdr_name")" "X-Haproxy-Current-Date"
-	assert_equal "$(get_json_path "$BODY" ".data.hdr_format")" "%T"
+	assert_equal "$(get_json_path "$BODY" ".cond")" "if"
+	assert_equal "$(get_json_path "$BODY" ".cond_test")" "{ src 192.168.0.0/16 }"
+  assert_equal "$(get_json_path "$BODY" ".type")" "add-header"
+	assert_equal "$(get_json_path "$BODY" ".hdr_name")" "X-Haproxy-Current-Date"
+	assert_equal "$(get_json_path "$BODY" ".hdr_format")" "%T"
 }

@test "http_response_rules: Replace a HTTP Response Rule of backend" {
@ -42,9 +42,9 @@ load 'utils/_helpers'

  resource_get "$_RES_RULES_BASE_PATH/0" "parent_type=backend&parent_name=test_backend&force_reload=true"
 	assert_equal "$SC" 200
-	assert_equal "$(get_json_path "$BODY" ".data.cond")" "if"
-	assert_equal "$(get_json_path "$BODY" ".data.cond_test")" "{ src 192.168.0.0/16 }"
-  assert_equal "$(get_json_path "$BODY" ".data.type")" "add-header"
-	assert_equal "$(get_json_path "$BODY" ".data.hdr_name")" "X-Haproxy-Current-Date"
-	assert_equal "$(get_json_path "$BODY" ".data.hdr_format")" "%T"
+	assert_equal "$(get_json_path "$BODY" ".cond")" "if"
+	assert_equal "$(get_json_path "$BODY" ".cond_test")" "{ src 192.168.0.0/16 }"
+  assert_equal "$(get_json_path "$BODY" ".type")" "add-header"
+	assert_equal "$(get_json_path "$BODY" ".hdr_name")" "X-Haproxy-Current-Date"
+	assert_equal "$(get_json_path "$BODY" ".hdr_format")" "%T"
 }
--- a/e2e/tests/log_forwards/test.bats
+++ b/e2e/tests/log_forwards/test.bats
@ -37,7 +37,7 @@ load 'utils/_helpers'
  then
    resource_get "$_LOG_FORWARD_BASE_PATH/sylog-loadb"
    assert_equal "$SC" 200
-  	assert_equal "sylog-loadb" "$(get_json_path "$BODY" '.data.name')"
+  	assert_equal "sylog-loadb" "$(get_json_path "$BODY" '.name')"
  fi
 }

@ -54,7 +54,7 @@ load 'utils/_helpers'
  then
    resource_get "$_LOG_FORWARD_BASE_PATH"
    assert_equal "$SC" 200
-    assert_equal "sylog-loadb" "$(get_json_path "$BODY" '.data[0].name')"
+    assert_equal "sylog-loadb" "$(get_json_path "$BODY" '.[0].name')"
  fi
 }

--- a/e2e/tests/log_targets/get.bats
+++ b/e2e/tests/log_targets/get.bats
@ -26,31 +26,31 @@ load 'utils/_helpers'
@test "log_targets: Return one Log Target from frontend" {
  resource_get "$_LOG_TRAGET_BASE_PATH/0" "parent_type=frontend&parent_name=test_frontend"
 	assert_equal "$SC" 200
-	assert_equal "$(get_json_path "$BODY" ".data.address")" "localhost"
-	assert_equal "$(get_json_path "$BODY" ".data.facility")" "user"
-	assert_equal "$(get_json_path "$BODY" ".data.format")" "raw"
-	assert_equal "$(get_json_path "$BODY" ".data.level")" "warning"
+	assert_equal "$(get_json_path "$BODY" ".address")" "localhost"
+	assert_equal "$(get_json_path "$BODY" ".facility")" "user"
+	assert_equal "$(get_json_path "$BODY" ".format")" "raw"
+	assert_equal "$(get_json_path "$BODY" ".level")" "warning"

 	resource_get "$_LOG_TRAGET_BASE_PATH/1" "parent_type=frontend&parent_name=test_frontend"
 	assert_equal "$SC" 200
-  assert_equal "$(get_json_path "${BODY}" ".data.address")" "10.0.0.1"
-	assert_equal "$(get_json_path "${BODY}" ".data.facility")" "user"
-	assert_equal "$(get_json_path "${BODY}" ".data.format")" "raw"
-	assert_equal "$(get_json_path "${BODY}" ".data.level")" "info"
+  assert_equal "$(get_json_path "${BODY}" ".address")" "10.0.0.1"
+	assert_equal "$(get_json_path "${BODY}" ".facility")" "user"
+	assert_equal "$(get_json_path "${BODY}" ".format")" "raw"
+	assert_equal "$(get_json_path "${BODY}" ".level")" "info"
 }

@test "log_targets: Return one Log Target from backend" {
  resource_get "$_LOG_TRAGET_BASE_PATH/0" "parent_type=backend&parent_name=test_backend"
 	assert_equal "$SC" 200
-	assert_equal "$(get_json_path "$BODY" ".data.address")" "localhost"
-	assert_equal "$(get_json_path "$BODY" ".data.facility")" "user"
-	assert_equal "$(get_json_path "$BODY" ".data.format")" "raw"
-	assert_equal "$(get_json_path "$BODY" ".data.level")" "warning"
+	assert_equal "$(get_json_path "$BODY" ".address")" "localhost"
+	assert_equal "$(get_json_path "$BODY" ".facility")" "user"
+	assert_equal "$(get_json_path "$BODY" ".format")" "raw"
+	assert_equal "$(get_json_path "$BODY" ".level")" "warning"

 	resource_get "$_LOG_TRAGET_BASE_PATH/1" "parent_type=backend&parent_name=test_backend"
 	assert_equal "$SC" 200
-  assert_equal "$(get_json_path "$BODY" ".data.address")" "10.0.0.1"
-	assert_equal "$(get_json_path "$BODY" ".data.facility")" "user"
-	assert_equal "$(get_json_path "$BODY" ".data.format")" "raw"
-	assert_equal "$(get_json_path "$BODY" ".data.level")" "info"
+  assert_equal "$(get_json_path "$BODY" ".address")" "10.0.0.1"
+	assert_equal "$(get_json_path "$BODY" ".facility")" "user"
+	assert_equal "$(get_json_path "$BODY" ".format")" "raw"
+	assert_equal "$(get_json_path "$BODY" ".level")" "info"
 }
--- a/e2e/tests/log_targets/list.bats
+++ b/e2e/tests/log_targets/list.bats
@ -27,32 +27,32 @@ load 'utils/_helpers'
  resource_get "$_LOG_TRAGET_BASE_PATH" "parent_type=frontend&parent_name=test_frontend"
 	assert_equal "$SC" 200

-	assert_equal "$(get_json_path "${BODY}" ".data | length")" 2
+	assert_equal "$(get_json_path "${BODY}" ". | length")" 2

-	assert_equal "$(get_json_path "${BODY}" ".data[0].address")" "localhost"
-	assert_equal "$(get_json_path "${BODY}" ".data[0].facility")" "user"
-	assert_equal "$(get_json_path "${BODY}" ".data[0].format")" "raw"
-	assert_equal "$(get_json_path "${BODY}" ".data[0].level")" "warning"
+	assert_equal "$(get_json_path "${BODY}" ".[0].address")" "localhost"
+	assert_equal "$(get_json_path "${BODY}" ".[0].facility")" "user"
+	assert_equal "$(get_json_path "${BODY}" ".[0].format")" "raw"
+	assert_equal "$(get_json_path "${BODY}" ".[0].level")" "warning"

-	assert_equal "$(get_json_path "${BODY}" ".data[1].address")" "10.0.0.1"
-	assert_equal "$(get_json_path "${BODY}" ".data[1].facility")" "user"
-	assert_equal "$(get_json_path "${BODY}" ".data[1].format")" "raw"
-	assert_equal "$(get_json_path "${BODY}" ".data[1].level")" "info"
+	assert_equal "$(get_json_path "${BODY}" ".[1].address")" "10.0.0.1"
+	assert_equal "$(get_json_path "${BODY}" ".[1].facility")" "user"
+	assert_equal "$(get_json_path "${BODY}" ".[1].format")" "raw"
+	assert_equal "$(get_json_path "${BODY}" ".[1].level")" "info"
 }

@test "log_targets: Return an array of all Log Targets from backend" {
  resource_get "$_LOG_TRAGET_BASE_PATH" "parent_type=backend&parent_name=test_backend"
  assert_equal "$SC" 200

-  assert_equal "$(get_json_path "${BODY}" ".data | length")" 2
+  assert_equal "$(get_json_path "${BODY}" ". | length")" 2

-	assert_equal "$(get_json_path "${BODY}" ".data[0].address")" "localhost"
-	assert_equal "$(get_json_path "${BODY}" ".data[0].facility")" "user"
-	assert_equal "$(get_json_path "${BODY}" ".data[0].format")" "raw"
-	assert_equal "$(get_json_path "${BODY}" ".data[0].level")" "warning"
+	assert_equal "$(get_json_path "${BODY}" ".[0].address")" "localhost"
+	assert_equal "$(get_json_path "${BODY}" ".[0].facility")" "user"
+	assert_equal "$(get_json_path "${BODY}" ".[0].format")" "raw"
+	assert_equal "$(get_json_path "${BODY}" ".[0].level")" "warning"

-	assert_equal "$(get_json_path "${BODY}" ".data[1].address")" "10.0.0.1"
-	assert_equal "$(get_json_path "${BODY}" ".data[1].facility")" "user"
-	assert_equal "$(get_json_path "${BODY}" ".data[1].format")" "raw"
-	assert_equal "$(get_json_path "${BODY}" ".data[1].level")" "info"
+	assert_equal "$(get_json_path "${BODY}" ".[1].address")" "10.0.0.1"
+	assert_equal "$(get_json_path "${BODY}" ".[1].facility")" "user"
+	assert_equal "$(get_json_path "${BODY}" ".[1].format")" "raw"
+	assert_equal "$(get_json_path "${BODY}" ".[1].level")" "info"
 }
--- a/e2e/tests/log_targets/replace.bats
+++ b/e2e/tests/log_targets/replace.bats
@ -29,10 +29,10 @@ load 'utils/_helpers'

 	resource_get "$_LOG_TRAGET_BASE_PATH/0" "parent_type=frontend&parent_name=test_frontend&force_reload=true"
 	assert_equal "$SC" 200
-	assert_equal "$(get_json_path "$BODY" ".data.address")" "localhost"
-	assert_equal "$(get_json_path "$BODY" ".data.format")" "raw"
-	assert_equal "$(get_json_path "$BODY" ".data.facility")" "user"
-	assert_equal "$(get_json_path "$BODY" ".data.level")" "warning"
+	assert_equal "$(get_json_path "$BODY" ".address")" "localhost"
+	assert_equal "$(get_json_path "$BODY" ".format")" "raw"
+	assert_equal "$(get_json_path "$BODY" ".facility")" "user"
+	assert_equal "$(get_json_path "$BODY" ".level")" "warning"
 }

@test "log_targets: Replace a Log Target of backend" {
@ -41,8 +41,8 @@ load 'utils/_helpers'

 	resource_get "$_LOG_TRAGET_BASE_PATH/0" "parent_type=backend&parent_name=test_backend&force_reload=true"
 	assert_equal "$SC" 200
-	assert_equal "$(get_json_path "$BODY" ".data.address")" "localhost"
-	assert_equal "$(get_json_path "$BODY" ".data.format")" "raw"
-	assert_equal "$(get_json_path "$BODY" ".data.facility")" "user"
-	assert_equal "$(get_json_path "$BODY" ".data.level")" "warning"
+	assert_equal "$(get_json_path "$BODY" ".address")" "localhost"
+	assert_equal "$(get_json_path "$BODY" ".format")" "raw"
+	assert_equal "$(get_json_path "$BODY" ".facility")" "user"
+	assert_equal "$(get_json_path "$BODY" ".level")" "warning"
 }
--- a/e2e/tests/mailers/mailers.bats
+++ b/e2e/tests/mailers/mailers.bats
@ -34,21 +34,21 @@ load 'utils/_helpers'
@test "mailers: get a section" {
  resource_get "$_MAILERS_SECTION_PATH/$_SECTION_NAME"
  assert_equal "$SC" "200"
-  assert_equal "$_SECTION_NAME" "$(get_json_path "$BODY" .data.name)"
-  assert_equal "15000" "$(get_json_path "$BODY" .data.timeout)"
+  assert_equal "$_SECTION_NAME" "$(get_json_path "$BODY" .name)"
+  assert_equal "15000" "$(get_json_path "$BODY" .timeout)"
 }

@test "mailers: edit a section" {
  resource_put "$_MAILERS_SECTION_PATH/$_SECTION_NAME" "data/put_section.json" "force_reload=true"
  assert_equal "$SC" "200"
  resource_get "$_MAILERS_SECTION_PATH/$_SECTION_NAME"
-  assert_equal "30000" "$(get_json_path "$BODY" .data.timeout)"
+  assert_equal "30000" "$(get_json_path "$BODY" .timeout)"
 }

@test "mailers: get a list of sections" {
  resource_get "$_MAILERS_SECTION_PATH"
  assert_equal "$SC" "200"
-  assert_equal "$_SECTION_NAME" "$(get_json_path "$BODY" .data[0].name)"
+  assert_equal "$_SECTION_NAME" "$(get_json_path "$BODY" .[0].name)"
 }

@test "mailers: add entries" {
@ -61,17 +61,17 @@ load 'utils/_helpers'
@test "mailers: get an entry" {
  resource_get "$_MAILER_ENTRIES_PATH/smtp1" "mailers_section=$_SECTION_NAME"
  assert_equal "$SC" "200"
-  assert_equal "smtp1" "$(get_json_path "$BODY" .data.name)"
-  assert_equal "10.0.10.1" "$(get_json_path "$BODY" .data.address)"
-  assert_equal "587" "$(get_json_path "$BODY" .data.port)"
+  assert_equal "smtp1" "$(get_json_path "$BODY" .name)"
+  assert_equal "10.0.10.1" "$(get_json_path "$BODY" .address)"
+  assert_equal "587" "$(get_json_path "$BODY" .port)"
 }

@test "mailers: get all entries" {
  resource_get "$_MAILER_ENTRIES_PATH" "mailers_section=$_SECTION_NAME"
  assert_equal "$SC" "200"
-  assert_equal "2" "$(get_json_path "$BODY" '.data|length')"
-  assert_equal "smtp1" "$(get_json_path "$BODY" .data[0].name)"
-  assert_equal "smtp2" "$(get_json_path "$BODY" .data[1].name)"
+  assert_equal "2" "$(get_json_path "$BODY" '.|length')"
+  assert_equal "smtp1" "$(get_json_path "$BODY" .[0].name)"
+  assert_equal "smtp2" "$(get_json_path "$BODY" .[1].name)"
 }

@test "mailers: modify an entry" {
@ -79,9 +79,9 @@ load 'utils/_helpers'
    "mailers_section=$_SECTION_NAME" "force_reload=true"
  assert_equal "$SC" "202"
  resource_get "$_MAILER_ENTRIES_PATH/smtp2" "mailers_section=$_SECTION_NAME"
-  assert_equal "smtp2" "$(get_json_path "$BODY" .data.name)"
-  assert_equal "10.0.10.88" "$(get_json_path "$BODY" .data.address)"
-  assert_equal "8587" "$(get_json_path "$BODY" .data.port)"
+  assert_equal "smtp2" "$(get_json_path "$BODY" .name)"
+  assert_equal "10.0.10.88" "$(get_json_path "$BODY" .address)"
+  assert_equal "8587" "$(get_json_path "$BODY" .port)"
 }

@test "mailers: delete an entry" {
--- a/e2e/tests/process_manager/create.bats
+++ b/e2e/tests/process_manager/create.bats
@ -29,9 +29,9 @@ load 'utils/_helpers'

  resource_get "$_PROGRAMS_BASE_PATH/test"
  assert_equal "$SC" 200
-  assert_equal "test" "$(get_json_path "$BODY" ".data.name")"
-  assert_equal "haproxy" "$(get_json_path "$BODY" ".data.user")"
-  assert_equal "haproxy" "$(get_json_path "$BODY" ".data.group")"
+  assert_equal "test" "$(get_json_path "$BODY" ".name")"
+  assert_equal "haproxy" "$(get_json_path "$BODY" ".user")"
+  assert_equal "haproxy" "$(get_json_path "$BODY" ".group")"
 }

@test "process-manager: Fail creating program with same name" {
--- a/e2e/tests/process_manager/get.bats
+++ b/e2e/tests/process_manager/get.bats
@ -26,7 +26,7 @@ load 'utils/_helpers'
@test "process-manager: Return one program by name" {
  resource_get "$_PROGRAMS_BASE_PATH/echo"
  assert_equal "$SC" 200
-  assert_equal "echo" "$(get_json_path "$BODY" ".data.name")"
+  assert_equal "echo" "$(get_json_path "$BODY" ".name")"
 }

@test "process-manager: Fail returning program that doesn't exist" {
--- a/e2e/tests/process_manager/list.bats
+++ b/e2e/tests/process_manager/list.bats
@ -26,5 +26,5 @@ load 'utils/_helpers'
@test "process-manager: Return an array of programs" {
  resource_get "$_PROGRAMS_BASE_PATH"
  assert_equal "$SC" 200
-  assert_equal 1 "$(get_json_path "$BODY" ".data | length")"
+  assert_equal 1 "$(get_json_path "$BODY" ". | length")"
 }
--- a/e2e/tests/process_manager/replace.bats
+++ b/e2e/tests/process_manager/replace.bats
@ -29,8 +29,8 @@ load 'utils/_helpers'

  resource_get "$_PROGRAMS_BASE_PATH/echo"
  assert_equal "$SC" 200
-  assert_equal "echo" "$(get_json_path "$BODY" ".data.name")"
-  assert_equal "echo \"Hello Universe\"" "$(get_json_path "$BODY" ".data.command")"
+  assert_equal "echo" "$(get_json_path "$BODY" ".name")"
+  assert_equal "echo \"Hello Universe\"" "$(get_json_path "$BODY" ".command")"
 }

@test "process-manager: Fail replacing program that doesn't exist" {
--- a/e2e/tests/raw/get.bats
+++ b/e2e/tests/raw/get.bats
@ -25,6 +25,6 @@ load 'utils/_helpers'
@test "raw: Download configuration" {
  resource_get "$_RAW_BASE_PATH"
  assert_equal "$SC" 200
-  test -n "$(get_json_path "$BODY" .data)" ||
+  test -n "$(get_json_path "$BODY" .)" ||
    fail "failed to download raw config. BODY: '$BODY'"
 }
--- a/e2e/tests/raw/post.bats
+++ b/e2e/tests/raw/post.bats
@ -56,4 +56,4 @@ load 'utils/_helpers'
 	sleep 5
 	resource_get "$_RUNTIME_MAP_FILES_BASE_PATH" ""
    assert_equal "$SC" 200
-}
+}
--- a/e2e/tests/raw/utils/_helpers.bash
+++ b/e2e/tests/raw/utils/_helpers.bash
@ -20,10 +20,11 @@ _RAW_BASE_PATH="/services/haproxy/configuration/raw"
 # Identical to resource_post() but with the text/plain content type.
 function resource_post_text() {
  local endpoint="$1" data="@${BATS_TEST_DIRNAME}/$2" qs_params="$3"
-
+  resource_get "/services/haproxy/configuration/version"
+	version=${BODY}
  run curl -m 10 -s -H 'content-type: text/plain' --user dataplaneapi:mypassword \
    "-XPOST" -w "\n%{http_code}" "-d${data}" \
-    "http://${LOCAL_IP_ADDRESS}:${E2E_PORT}${BASE_PATH}${endpoint}?$qs_params&version=$(version)"
+    "http://${LOCAL_IP_ADDRESS}:${E2E_PORT}${BASE_PATH}${endpoint}?$qs_params&version=$version"
 	assert_success
 	dpa_curl_status_body '$output'
 }
--- a/e2e/tests/rings/test.bats
+++ b/e2e/tests/rings/test.bats
@ -39,7 +39,7 @@ load 'utils/_helpers'
  then
 	resource_get "$_RING_BASE_PATH/test_ring"
 	assert_equal "$SC" 200
-	assert_equal "test_ring" "$(get_json_path "$BODY" '.data.name')"
+	assert_equal "test_ring" "$(get_json_path "$BODY" '.name')"
  fi
 }

@ -56,8 +56,8 @@ load 'utils/_helpers'
  then
 	resource_get "$_RING_BASE_PATH"
 	assert_equal "$SC" 200
-	assert_equal "$(get_json_path "$BODY" ".data | length")" 2
-	assert_equal "$(get_json_path "$BODY" ".data[] | select(.name | contains(\"test_ring_2\") ).name")" "test_ring_2"
+	assert_equal "$(get_json_path "$BODY" ". | length")" 2
+	assert_equal "$(get_json_path "$BODY" ".[] | select(.name | contains(\"test_ring_2\") ).name")" "test_ring_2"
  fi
 }

--- a/e2e/tests/server_templates/create.bats
+++ b/e2e/tests/server_templates/create.bats
@ -30,10 +30,10 @@ load 'utils/_helpers'
  resource_get "$_SERVER_TEMPLATE_BASE_PATH/first" "backend=test_backend"
  assert_equal "$SC" 200

-  assert_equal "first" "$(get_json_path "$BODY" '.data.prefix')"
-  assert_equal "1-50" "$(get_json_path "$BODY" '.data.num_or_range')"
-  assert_equal "first.com" "$(get_json_path "$BODY" '.data.fqdn')"
-  assert_equal "443" "$(get_json_path "$BODY" '.data.port')"
+  assert_equal "first" "$(get_json_path "$BODY" '.prefix')"
+  assert_equal "1-50" "$(get_json_path "$BODY" '.num_or_range')"
+  assert_equal "first.com" "$(get_json_path "$BODY" '.fqdn')"
+  assert_equal "443" "$(get_json_path "$BODY" '.port')"
 }

@test "server_templates: Add a new server template 2" {
@ -43,10 +43,10 @@ load 'utils/_helpers'
  resource_get "$_SERVER_TEMPLATE_BASE_PATH/second" "backend=test_backend"
  assert_equal "$SC" 200

-  assert_equal "second" "$(get_json_path "$BODY" '.data.prefix')"
-  assert_equal "1-3" "$(get_json_path "$BODY" '.data.num_or_range')"
-  assert_equal "second.com" "$(get_json_path "$BODY" '.data.fqdn')"
-  assert_equal "8080" "$(get_json_path "$BODY" '.data.port')"
+  assert_equal "second" "$(get_json_path "$BODY" '.prefix')"
+  assert_equal "1-3" "$(get_json_path "$BODY" '.num_or_range')"
+  assert_equal "second.com" "$(get_json_path "$BODY" '.fqdn')"
+  assert_equal "8080" "$(get_json_path "$BODY" '.port')"
 }

@test "server_templates: Add a new server template when missing frontend" {
--- a/e2e/tests/server_templates/get.bats
+++ b/e2e/tests/server_templates/get.bats
@ -27,18 +27,18 @@ load 'utils/_helpers'
  resource_get "$_SERVER_TEMPLATE_BASE_PATH/srv_google" "backend=test_backend"
  assert_equal "$SC" 200

-  assert_equal "srv_google" "$(get_json_path "$BODY" '.data.prefix')"
-  assert_equal "0-9" "$(get_json_path "$BODY" '.data.num_or_range')"
-  assert_equal "google.com" "$(get_json_path "$BODY" '.data.fqdn')"
-  assert_equal "443" "$(get_json_path "$BODY" '.data.port')"
+  assert_equal "srv_google" "$(get_json_path "$BODY" '.prefix')"
+  assert_equal "0-9" "$(get_json_path "$BODY" '.num_or_range')"
+  assert_equal "google.com" "$(get_json_path "$BODY" '.fqdn')"
+  assert_equal "443" "$(get_json_path "$BODY" '.port')"

  resource_get "$_SERVER_TEMPLATE_BASE_PATH/srv_bing" "backend=test_backend"
  assert_equal "$SC" 200

-  assert_equal "srv_bing" "$(get_json_path "$BODY" '.data.prefix')"
-  assert_equal "10-19" "$(get_json_path "$BODY" '.data.num_or_range')"
-  assert_equal "bing.com" "$(get_json_path "$BODY" '.data.fqdn')"
-  assert_equal "8080" "$(get_json_path "$BODY" '.data.port')"
+  assert_equal "srv_bing" "$(get_json_path "$BODY" '.prefix')"
+  assert_equal "10-19" "$(get_json_path "$BODY" '.num_or_range')"
+  assert_equal "bing.com" "$(get_json_path "$BODY" '.fqdn')"
+  assert_equal "8080" "$(get_json_path "$BODY" '.port')"
 }

@test "server_templates: Return a non existing server template" {
--- a/e2e/tests/server_templates/replace.bats
+++ b/e2e/tests/server_templates/replace.bats
@ -30,10 +30,10 @@ load 'utils/_helpers'
 	resource_get "$_SERVER_TEMPLATE_BASE_PATH/srv_google" "backend=test_backend"
  assert_equal "$SC" 200

-  assert_equal "srv_google" "$(get_json_path "$BODY" '.data.prefix')"
-  assert_equal "1-100" "$(get_json_path "$BODY" '.data.num_or_range')"
-  assert_equal "google.com" "$(get_json_path "$BODY" '.data.fqdn')"
-  assert_equal "8080" "$(get_json_path "$BODY" '.data.port')"
+  assert_equal "srv_google" "$(get_json_path "$BODY" '.prefix')"
+  assert_equal "1-100" "$(get_json_path "$BODY" '.num_or_range')"
+  assert_equal "google.com" "$(get_json_path "$BODY" '.fqdn')"
+  assert_equal "8080" "$(get_json_path "$BODY" '.port')"
 }

@test "server_templates: Replacing a non existing server template" {
--- a/e2e/tests/servers/get.bats
+++ b/e2e/tests/servers/get.bats
@ -27,7 +27,7 @@ load 'utils/_helpers'
  for name in "server_01" "server_02" "server_03"; do
    resource_get "$_SERVER_BASE_PATH/$name" "backend=test_backend"
    assert_equal "$SC" 200
-    assert_equal "$(get_json_path "$BODY" '.data.name')" "$name"
+    assert_equal "$(get_json_path "$BODY" '.name')" "$name"
  done
 }

@ -35,8 +35,8 @@ load 'utils/_helpers'
@test "servers: Return one IPv6 server" {
    resource_get "$_SERVER_BASE_PATH/server_ipv6" "backend=test_backend"
    assert_equal "$SC" 200
-    assert_equal "$(get_json_path "$BODY" '.data.address')" "fd00:6:48:c85:deb:f:62:4"
-    assert_equal "$(get_json_path "$BODY" '.data.check')" "enabled"
-    assert_equal "$(get_json_path "$BODY" '.data.name')" "server_ipv6"
-    assert_equal "$(get_json_path "$BODY" '.data.port')" "80"
+    assert_equal "$(get_json_path "$BODY" '.address')" "fd00:6:48:c85:deb:f:62:4"
+    assert_equal "$(get_json_path "$BODY" '.check')" "enabled"
+    assert_equal "$(get_json_path "$BODY" '.name')" "server_ipv6"
+    assert_equal "$(get_json_path "$BODY" '.port')" "80"
 }
--- a/e2e/tests/servers/list.bats
+++ b/e2e/tests/servers/list.bats
@ -27,15 +27,15 @@ load 'utils/_helpers'
  resource_get "$_SERVER_BASE_PATH" "backend=test_backend"
 	assert_equal "$SC" 200

-	assert_equal "$(get_json_path "$BODY" ".data | length")" "5"
+	assert_equal "$(get_json_path "$BODY" ". | length")" "5"

    INDEX=0
 	for name in "server_01" "server_02" "server_03" "server_ipv6" "server_04"; do
-  	assert_equal "$(get_json_path "$BODY" ".data[] | select(.name | contains(\"$name\") ).name")" "$name"
-  	if [[ "$(get_json_path "$BODY" ".data[] | select(.name | contains(\"$name\") ).name")" == "server_04" ]]; then
-  	    assert_equal "$(get_json_path "$BODY" ".data[${INDEX}].check")" "enabled"
-  	    assert_equal "$(get_json_path "$BODY" ".data[${INDEX}].resolve_opts")" "allow-dup-ip,ignore-weight"
-  	    assert_equal "$(get_json_path "$BODY" ".data[${INDEX}].\"resolve-net\"")" "10.0.0.0/8,10.200.200.0/12"
+  	assert_equal "$(get_json_path "$BODY" ".[] | select(.name | contains(\"$name\") ).name")" "$name"
+  	if [[ "$(get_json_path "$BODY" ".[] | select(.name | contains(\"$name\") ).name")" == "server_04" ]]; then
+  	    assert_equal "$(get_json_path "$BODY" ".[${INDEX}].check")" "enabled"
+  	    assert_equal "$(get_json_path "$BODY" ".[${INDEX}].resolve_opts")" "allow-dup-ip,ignore-weight"
+  	    assert_equal "$(get_json_path "$BODY" ".[${INDEX}].\"resolve-net\"")" "10.0.0.0/8,10.200.200.0/12"
    fi
    let INDEX=${INDEX}+1
  done
--- a/e2e/tests/servers/replace.bats
+++ b/e2e/tests/servers/replace.bats
@ -29,5 +29,5 @@ load 'utils/_helpers'

 	resource_get "$_SERVER_BASE_PATH/server_01" "backend=test_backend"
  assert_equal "$SC" 200
-  assert_equal "$(get_json_path "$BODY" ".data")" "$(get_json_path "$(cat $BATS_TEST_DIRNAME/data/put.json)" ".")"
+  assert_equal "$(get_json_path "$BODY" ".")" "$(get_json_path "$(cat $BATS_TEST_DIRNAME/data/put.json)" ".")"
 }
--- a/e2e/tests/sites/create.bats
+++ b/e2e/tests/sites/create.bats
@ -31,5 +31,5 @@ load 'utils/_helpers'
  #
  resource_get "$_SITE_BASE_PATH/site"
  assert_equal "$SC" 200
-  assert_equal "$(get_json_path "$BODY" ".data")" "$(get_json_path "$(cat "$BATS_TEST_DIRNAME/data/post.json")" ".")"
+  assert_equal "$(get_json_path "$BODY" ".")" "$(get_json_path "$(cat "$BATS_TEST_DIRNAME/data/post.json")" ".")"
 }
--- a/e2e/tests/sites/list.bats
+++ b/e2e/tests/sites/list.bats
@ -30,6 +30,6 @@ load 'utils/_helpers'
 	resource_get "$_SITE_BASE_PATH"
 	assert_equal "$SC" 200

-	assert_equal "$(get_json_path "$BODY" " .data[] | select(.name | contains(\"myfrontend\") ).name" )" "myfrontend"
-	assert_equal "$(get_json_path "$BODY" " .data[] | select(.name | contains(\"site\") ).name" )" "site"
+	assert_equal "$(get_json_path "$BODY" " .[] | select(.name | contains(\"myfrontend\") ).name" )" "myfrontend"
+	assert_equal "$(get_json_path "$BODY" " .[] | select(.name | contains(\"site\") ).name" )" "site"
 }
--- a/e2e/tests/sites/replace.bats
+++ b/e2e/tests/sites/replace.bats
@ -34,5 +34,5 @@ load 'utils/_helpers'
  #
  resource_get "$_SITE_BASE_PATH/site"
  assert_equal "$SC" 200
-  assert_equal "$(get_json_path "$BODY" ".data")" "$(get_json_path "$(cat "$BATS_TEST_DIRNAME/data/put.json")" ".")"
+  assert_equal "$(get_json_path "$BODY" ".")" "$(get_json_path "$(cat "$BATS_TEST_DIRNAME/data/put.json")" ".")"
 }
--- a/e2e/tests/spoe/test.bats
+++ b/e2e/tests/spoe/test.bats
@ -19,6 +19,7 @@ load '../../libs/dataplaneapi'
 load "../../libs/get_json_path"
 load '../../libs/resource_client'
 load "../../libs/run_only"
+load '../../libs/version'

 load 'utils/_helpers'

--- a/e2e/tests/spoe_agents/add.bats
+++ b/e2e/tests/spoe_agents/add.bats
@ -22,6 +22,7 @@ load "../../libs/run_only"
 load '../../libs/version_spoe'

 load 'utils/_helpers'
+load '../../libs/debug'

 setup() {
    SPOE_FILE="spoefile_example.cfg"
@ -48,7 +49,7 @@ teardown() {
    resource_get "$_SPOE_AGENTS_BASE_PATH/post_agent1" "scope=\[ip-reputation\]&spoe=spoefile_example.cfg"
    assert_equal "$SC" 200

-    assert_equal "$(get_json_path "$BODY" ".data")" "$(get_json_path "$(cat "$BATS_TEST_DIRNAME"/data/post.json)" ".")"
+    assert_equal "$(get_json_path "$BODY" ".")" "$(get_json_path "$(cat "$BATS_TEST_DIRNAME"/data/post.json)" ".")"

    # refuse adding an existing spoe agent
    resource_post "$_SPOE_AGENTS_BASE_PATH" "/data/post.json" "spoe=spoefile_example.cfg&scope=%5Bip-reputation%5D"
--- a/e2e/tests/spoe_agents/get.bats
+++ b/e2e/tests/spoe_agents/get.bats
@ -45,7 +45,7 @@ teardown() {
    resource_get "$_SPOE_AGENTS_BASE_PATH/iprep-agent" "scope=\[ip-reputation\]&spoe=spoefile_example2.cfg"
    assert_equal "$SC" 200

-    assert_equal $(get_json_path "$BODY" ".data | .[]") $(cat ${BATS_TEST_DIRNAME}/data/post.json)
+    assert_equal $(get_json_path "$BODY" ". | .[]") $(cat ${BATS_TEST_DIRNAME}/data/post.json)
 }

@test "spoe_agents: Return an error when trying to get non existing spoe agent" {
--- a/e2e/tests/spoe_agents/list.bats
+++ b/e2e/tests/spoe_agents/list.bats
@ -43,5 +43,5 @@ teardown() {
    resource_get "$_SPOE_AGENTS_BASE_PATH" "scope=\[ip-reputation\]&spoe=spoefile_example2.cfg"
    assert_equal "$SC" 200

-    assert_equal "$(get_json_path "${BODY}" ".data | length")" 2
+    assert_equal "$(get_json_path "${BODY}" ". | length")" 2
 }
--- a/e2e/tests/spoe_agents/replace.bats
+++ b/e2e/tests/spoe_agents/replace.bats
@ -48,5 +48,5 @@ teardown() {
    resource_get "$_SPOE_AGENTS_BASE_PATH/iprep-agent" "spoe=spoefile_example2.cfg&scope=\[ip-reputation\]"
    assert_equal "$SC" 200

-    assert_equal $(get_json_path "${BODY}" ".data | .[]") $(cat ${BATS_TEST_DIRNAME}/data/put.json)
+    assert_equal $(get_json_path "${BODY}" ". | .[]") $(cat ${BATS_TEST_DIRNAME}/data/put.json)
 }
--- a/e2e/tests/spoe_groups/add.bats
+++ b/e2e/tests/spoe_groups/add.bats
@ -48,7 +48,7 @@ teardown() {
    resource_get "$_SPOE_GROUPS_BASE_PATH/group1" "scope=\[ip-reputation\]&spoe=spoefile_example.cfg"
    assert_equal "$SC" 200

-    assert_equal "$(get_json_path "${BODY}" ".data")" "$(cat ${BATS_TEST_DIRNAME}/data/post.json)"
+    assert_equal "$(get_json_path "${BODY}" ".")" "$(cat ${BATS_TEST_DIRNAME}/data/post.json)"

    # refuse adding an existing spoe group
    resource_post "$_SPOE_GROUPS_BASE_PATH" "/data/post.json" "spoe=spoefile_example.cfg&scope=%5Bip-reputation%5D"
--- a/e2e/tests/spoe_groups/get.bats
+++ b/e2e/tests/spoe_groups/get.bats
@ -45,7 +45,7 @@ teardown() {
    resource_get "$_SPOE_GROUPS_BASE_PATH/newgroup" "scope=\[ip-reputation\]&spoe=spoefile_example2.cfg"
    assert_equal "$SC" 200

-    assert_equal "$(get_json_path "$BODY" ".data")" "$(cat "${BATS_TEST_DIRNAME}"/data/get.json)"
+    assert_equal "$(get_json_path "$BODY" ".")" "$(cat "${BATS_TEST_DIRNAME}"/data/get.json)"
 }

@test "spoe_groups: Return an error when trying to get non existing spoe group" {
--- a/e2e/tests/spoe_groups/list.bats
+++ b/e2e/tests/spoe_groups/list.bats
@ -45,5 +45,5 @@ teardown() {
    resource_get "$_SPOE_GROUPS_BASE_PATH" "scope=\[ip-reputation\]&spoe=spoefile_example2.cfg"
    assert_equal "$SC" 200

-    assert_equal "$(get_json_path "${BODY}" ".data | length")" 1
+    assert_equal "$(get_json_path "${BODY}" ". | length")" 1
 }
--- a/e2e/tests/spoe_groups/replace.bats
+++ b/e2e/tests/spoe_groups/replace.bats
@ -48,5 +48,5 @@ teardown() {
    resource_get "$_SPOE_GROUPS_BASE_PATH/newgroup" "scope=\[ip-reputation\]&spoe=spoefile_example2.cfg"
    assert_equal "$SC" 200

-    assert_equal "$(get_json_path "${BODY}" ".data")" "$(cat ${BATS_TEST_DIRNAME}/data/put.json)"
+    assert_equal "$(get_json_path "${BODY}" ".")" "$(cat ${BATS_TEST_DIRNAME}/data/put.json)"
 }
--- a/e2e/tests/spoe_messages/add.bats
+++ b/e2e/tests/spoe_messages/add.bats
@ -48,7 +48,7 @@ teardown() {
    resource_get "$_SPOE_MESSAGES_BASE_PATH/message1" "spoe=spoefile_example.cfg&scope=\[ip-reputation\]"
    assert_equal "$SC" 200

-    assert_equal "$(get_json_path "${BODY}" ".data")" "$(cat ${BATS_TEST_DIRNAME}/data/post.json)"
+    assert_equal "$(get_json_path "${BODY}" ".")" "$(cat ${BATS_TEST_DIRNAME}/data/post.json)"

    # refuse adding an existing spoe message
    resource_post "$_SPOE_MESSAGES_BASE_PATH" "/data/post.json" "spoe=spoefile_example.cfg&scope=%5Bip-reputation%5D"
--- a/e2e/tests/spoe_messages/get.bats
+++ b/e2e/tests/spoe_messages/get.bats
@ -45,7 +45,7 @@ teardown() {
    resource_get "$_SPOE_MESSAGES_BASE_PATH/check-ip" "scope=\[ip-reputation\]&spoe=spoefile_example2.cfg"
    assert_equal "$SC" 200

-    assert_equal "$(get_json_path "$BODY" ".data")" "$(cat "${BATS_TEST_DIRNAME}"/data/get.json)"
+    assert_equal "$(get_json_path "$BODY" ".")" "$(cat "${BATS_TEST_DIRNAME}"/data/get.json)"
 }

@test "spoe_messages: Return an error when trying to get non existing spoe message" {
--- a/e2e/tests/spoe_messages/list.bats
+++ b/e2e/tests/spoe_messages/list.bats
@ -45,5 +45,5 @@ teardown() {
    resource_get "$_SPOE_MESSAGES_BASE_PATH" "scope=\[ip-reputation\]&spoe=spoefile_example2.cfg"
    assert_equal "$SC" 200

-    assert_equal "$(get_json_path "${BODY}" ".data | length")" 1
+    assert_equal "$(get_json_path "${BODY}" ". | length")" 1
 }
--- a/e2e/tests/spoe_messages/replace.bats
+++ b/e2e/tests/spoe_messages/replace.bats
@ -48,5 +48,5 @@ teardown() {
    resource_get "$_SPOE_MESSAGES_BASE_PATH/check-ip" "spoe=spoefile_example2.cfg&version=1&scope=\[ip-reputation\]"
    assert_equal "$SC" 200

-    assert_equal "$(get_json_path "${BODY}" ".data")" "$(cat ${BATS_TEST_DIRNAME}/data/put.json)"
+    assert_equal "$(get_json_path "${BODY}" ".")" "$(cat ${BATS_TEST_DIRNAME}/data/put.json)"
 }
--- a/e2e/tests/spoe_scopes/get.bats
+++ b/e2e/tests/spoe_scopes/get.bats
@ -45,7 +45,7 @@ teardown() {
    resource_get "$_SPOE_SCOPES_BASE_PATH/%5Bip-reputation%5D" "spoe=spoefile_example2.cfg"
    assert_equal "$SC" 200

-    assert_equal "$(get_json_path "${BODY}" ".data")" "[ip-reputation]"
+    assert_equal "$(get_json_path "${BODY}" ".")" "[ip-reputation]"
 }

@test "spoe_scopes: Return an error when trying to get non existing spoe scope" {
--- a/Show More
+++ b/Show More