even better node_list implementation

Author: DenysGonchar

ci/helper.sh

@@ -74,22 +74,17 @@ function get_nodes() {
 function get_status() {
     local servise="$1"
     local port="$(amoc_container_port "$servise")"
-    echo -e "\nstatus ${1}:" >/dev/tty
-    curl -s -X GET "http://localhost:${port}/status" -H  "accept: application/json" | tee /dev/tty
-    echo -e "\n" >/dev/tty
+    curl -s -X GET "http://localhost:${port}/status" -H  "accept: application/json"
+}
+
+function json_list() {
+    jq -n -c --args '$ARGS.positional' "$@"
 }
 
 function node_list() {
-    local nodes_json="" node=""
-    if [ "$#" -gt "0" ]; then
-        nodes_json+='"nodes": ["'"$1"'"'
-        shift 1
-        for node in "$@"; do
-            nodes_json+=', "'"$node"'"'
-        done
-        nodes_json+='], '
+    if [ "$#" -gt '0' ]; then
+        echo "\"nodes\": $(json_list "$@"), "
     fi
-    echo -n "$nodes_json"
 }
 
 #################################

ci/test_add_and_remove_users.sh

@@ -11,8 +11,9 @@ function add_users() {
     local port="$(amoc_container_port "$1")" # $1 - where to send request
     local n="$2" # $2 - number of users to add
     shift 2
-    local nodes="$(node_list "$@")"
-    local json_body="{ ${nodes} \"users\": $n}"
+    local maybe_nodes="$(node_list "$@")"
+    local json_body="{ ${maybe_nodes} \"users\": ${n}}"
+    echo "${json_body}" >&2
     curl -X PATCH --header 'Content-Type: application/json' --header 'Accept: application/json' \
          -s  -w " %{http_code}" -d "$json_body" "http://localhost:${port}/execution/add_users"
 }
@@ -21,8 +22,9 @@ function remove_users() {
     local port="$(amoc_container_port "$1")" # $1 - where to send request
     local n="$2" # $2 - number of users to add
     shift 2
-    local nodes="$(node_list "$@")"
-    local json_body="{ ${nodes} \"users\": $n}"
+    local maybe_nodes="$(node_list "$@")"
+    local json_body="{ ${maybe_nodes} \"users\": ${n}}"
+    echo "${json_body}" >&2
     curl -X PATCH --header 'Content-Type: application/json' --header 'Accept: application/json' \
          -s  -w " %{http_code}" -d "$json_body" "http://localhost:${port}/execution/remove_users"
 }

ci/test_run_scenario.sh

@@ -8,7 +8,7 @@ enable_strict_mode
 #############################
 run_scenario() {
     local port="$(amoc_container_port "$1")"
-    local json_body='{ "scenario": "'"$2"'", "users": '"$3"' , "settings" : { "test" : "<<\"test_value\">>" } }'
+    local json_body='{ "scenario": "'"$2"'", "users": '"$3"', "settings" : { "test" : "<<\"test_value\">>" } }'
     curl -X PATCH --header 'Content-Type: application/json' --header 'Accept: application/json' \
          -s  -w "%{http_code}" -o /dev/null -d "$json_body" "http://localhost:${port}/execution/start"
 }

ci/test_update_settings.sh

@@ -11,9 +11,8 @@ function update_settings() {
     local port="$(amoc_container_port "$1")" # $1 - where to send request
     local settings="$2" # $2 - settings
     shift 2
-    local nodes="$(node_list "$@")"
-    local json_body="{ ${nodes} \"settings\": ${settings} }"
-    echo "json_body = '$json_body'" >&2
+    local maybe_nodes="$(node_list "$@")"
+    local json_body="{ ${maybe_nodes} \"settings\": ${settings} }"
     curl -X PATCH --header 'Content-Type: application/json' --header 'Accept: application/json' \
          -s  -w " %{http_code}" -d "$json_body" "http://localhost:${port}/execution/update_settings"
 }