TEST/MINOR: haproxy_2.5: various fixes for haproxy 2.5

Author: mjuraga

e2e/libs/haproxy_version.bash

@@ -26,6 +26,8 @@
 function haproxy_version() {
     read -r SC RES < <(deprecated_auth_curl GET "/v2/services/haproxy/runtime/info")
     V="$(get_json_path "$RES" ".[0].info.version")"
+    debug $RES
+    debug $V
     echo "$V"
 }
 

e2e/tests/sites/data/post.json

@@ -37,7 +37,7 @@
       {
         "address": "127.0.0.1",
         "name": "site_listener_2",
-        "port": 8080
+        "port": 8081
       }
     ],
     "maxconn": 2000,

e2e/tests/sites/data/put.json

@@ -32,12 +32,12 @@
       {
         "address": "127.0.0.1",
         "name": "site_listener_1",
-        "port": 8080
+        "port": 8081
       },
       {
         "address": "127.0.0.1",
         "name": "site_listener_2",
-        "port": 8081
+        "port": 8082
       }
     ],
     "maxconn": 3000,

e2e/tests/storage_ssl_certificates/data/haproxy.cfg

@@ -34,4 +34,3 @@ frontend test_storage_ssl_certificates
 
 backend test_storage_ssl_certificates
   server appx 127.0.0.1:8080 check disabled
-

e2e/tests/storage_ssl_certificates/test.bats

@@ -19,6 +19,8 @@ load '../../libs/dataplaneapi'
 load "../../libs/get_json_path"
 load '../../libs/resource_client'
 load '../../libs/version'
+load '../../libs/haproxy_config_setup'
+load '../../libs/haproxy_version'
 
 load 'utils/_helpers'
 
@@ -127,6 +129,8 @@ load 'utils/_helpers'
 }
 
 @test "storage_ssl_certificates: Add a ssl certificate file with force reload" {
+    run docker cp "${BATS_TEST_DIRNAME}/data/3.pem" "${DOCKER_CONTAINER_NAME}:/etc/haproxy/ssl/"
+    assert_success
 
     refute dpa_docker_exec 'ls /etc/haproxy/ssl/1.pem?force_reload=true'
 
@@ -148,10 +152,17 @@ load 'utils/_helpers'
     new_logs=$(docker logs dataplaneapi-e2e 2>&1 | tail -n $new_logs_count)
 
     echo -e "$new_logs" # this will help debugging if the test fails
-    assert echo -e "$new_logs" | head -n 1 | grep -q "Reexecuting Master process"
+    if haproxy_version_ge "2.5"
+    then
+        assert echo -e "$new_logs" | grep -q "Loading success"
+    else
+        assert echo -e "$new_logs" | head -n 1 | grep -q "Reexecuting Master process"
+    fi
 }
 
 @test "storage_ssl_certificates: Replace a ssl certificate file contents with force reload" {
+    run docker cp "${BATS_TEST_DIRNAME}/data/3.pem" "${DOCKER_CONTAINER_NAME}:/etc/haproxy/ssl/"
+    assert_success
 
     pre_logs_count=$(docker logs dataplaneapi-e2e 2>&1 | wc -l)
 
@@ -167,7 +178,12 @@ load 'utils/_helpers'
     new_logs=$(docker logs dataplaneapi-e2e 2>&1 | tail -n $new_logs_count)
 
     echo -e "$new_logs" # this will help debugging if the test fails
-    assert echo -e "$new_logs" | head -n 1 | grep -q "Reexecuting Master process"
+    if haproxy_version_ge "2.5"
+    then
+        assert echo -e "$new_logs" | grep -q "Loading success"
+    else
+        assert echo -e "$new_logs" | head -n 1 | grep -q "Reexecuting Master process"
+    fi
 
     # clean up after the test
     dpa_docker_exec 'rm /etc/haproxy/ssl/1.pem'

e2e/tests/transactions/commit.bats

@@ -18,6 +18,7 @@
 load '../../libs/dataplaneapi'
 load '../../libs/get_json_path'
 load '../../libs/resource_client'
+load '../../libs/haproxy_config_setup'
 load '../../libs/version'
 
 load 'utils/_helpers'
@@ -39,7 +40,7 @@ load 'utils/_helpers'
 
 	# retrieve other transactions
 	resource_get "$_TRANSACTIONS_BASE_PATH"
-  assert_equal "$SC" 200
+  	assert_equal "$SC" 200
 	# iterate over them, should fail with 406 status code
 	for tx in $(echo "${BODY}" | jq -r '.[].id'); do
 		resource_put "$_TRANSACTIONS_BASE_PATH/${tx}" ""