BUG/MINOR: e2e: fix dependency between spoe tests

Since setup and teardown functions run before and after every test,
one test would fail if running in isolation for spoe tests.
Bug fixed for test cases when API should return an error for trying adding existing resource.
Additionally, version qs param is now dynamically obtained - previously tests passed because of
wrong version number.

Author: amelhusic

e2e/tests/spoe_agents/add.bats

@@ -49,10 +49,9 @@ teardown() {
     assert_equal "$SC" 200
 
     assert_equal "$(get_json_path "$BODY" ".data")" "$(get_json_path "$(cat "$BATS_TEST_DIRNAME"/data/post.json)" ".")"
-}
 
-@test "spoe_agents: Refuse adding an existing spoe agent" {
-    run dpa_curl POST "$_SPOE_AGENTS_BASE_PATH?spoe=spoefile_example.cfg&version=2&scope=%5Bip-reputation%5D" /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"
     assert_success
 
     dpa_curl_status_body '$output'

e2e/tests/spoe_groups/add.bats

@@ -49,10 +49,9 @@ teardown() {
     assert_equal "$SC" 200
 
     assert_equal "$(get_json_path "${BODY}" ".data")" "$(cat ${BATS_TEST_DIRNAME}/data/post.json)"
-}
 
-@test "spoe_groups: Refuse adding an existing spoe group" {
-    run dpa_curl POST "$_SPOE_GROUPS_BASE_PATH?spoe=spoefile_example.cfg&version=2&scope=%5Bip-reputation%5D" /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"
     assert_success
 
     dpa_curl_status_body '$output'

e2e/tests/spoe_messages/add.bats

@@ -49,10 +49,9 @@ teardown() {
     assert_equal "$SC" 200
 
     assert_equal "$(get_json_path "${BODY}" ".data")" "$(cat ${BATS_TEST_DIRNAME}/data/post.json)"
-}
 
-@test "spoe_messages: Refuse adding an existing spoe message" {
-    run dpa_curl POST "$_SPOE_MESSAGES_BASE_PATH?spoe=spoefile_example.cfg&version=2&scope=%5Bip-reputation%5D" /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"
     assert_success
 
     dpa_curl_status_body '$output'

e2e/tests/spoe_scopes/add.bats

@@ -43,10 +43,9 @@ teardown() {
 @test "spoe_scopes: Add a spoe scope" {
     resource_post "$_SPOE_SCOPES_BASE_PATH" "data/add_scope.txt" "spoe=spoefile_example.cfg"
     assert_equal "$SC" 201
-}
 
-@test "spoe_scopes: Refuse adding an existing spoe scope" {
-    run dpa_curl POST "/services/haproxy/spoe/spoe_scopes?spoe=spoefile_example.cfg&version=2" /data/add_scope.txt
+    # refuse adding an existing spoe scope
+    resource_post "$_SPOE_SCOPES_BASE_PATH" "/data/add_scope.txt" "spoe=spoefile_example.cfg"
     assert_success
 
     dpa_curl_status_body '$output'