Use a common function to set auth header and make curl requests

Author: pawanpinjarkar

data/data/agent/files/usr/local/bin/add-node.sh

@@ -2,15 +2,15 @@
 set -e
 
 # shellcheck disable=SC1091
-source issue_status.sh
-
-BASE_URL="${SERVICE_BASE_URL}api/assisted-install/v2"
+source "common.sh"
+# shellcheck disable=SC1091
+source "issue_status.sh"
 
 cluster_id=""
 while [[ "${cluster_id}" = "" ]]
 do
     # Get cluster id
-    cluster_id=$(curl -s -S "${BASE_URL}/clusters" -H "Authorization: ${AGENT_AUTH_TOKEN}" | jq -r .[].id)
+    cluster_id=$(curl_assisted_service "/clusters" | jq -r .[].id)
     if [[ "${cluster_id}" = "" ]]; then
         sleep 2
     fi
@@ -24,7 +24,7 @@ status_issue="90_add-node"
 host_ready=false
 while [[ $host_ready == false ]]
 do
-    host_status=$(curl -s -S "${BASE_URL}/infra-envs/${INFRA_ENV_ID}/hosts" -H "Authorization: ${AGENT_AUTH_TOKEN}" | jq -r ".[].status")
+    host_status=$(curl_assisted_service "/infra-envs/${INFRA_ENV_ID}/hosts" | jq -r ".[].status")
     if [[ "${host_status}" != "known" ]]; then
         printf '\\e{yellow}Waiting for the host to be ready' | set_issue "${status_issue}"
         sleep 10
@@ -33,12 +33,12 @@ do
     fi
 done
 
-HOST_ID=$(curl -s "${BASE_URL}/infra-envs/${INFRA_ENV_ID}/hosts" -H "Authorization: ${AGENT_AUTH_TOKEN}" | jq -r '.[].id')
+HOST_ID=$(curl_assisted_service "/infra-envs/${INFRA_ENV_ID}/hosts" | jq -r '.[].id')
 printf '\nHost %s is ready for installation\n' "${HOST_ID}" 1>&2
 clear_issue "${status_issue}"
 
 # Add the current host to the cluster
-res=$(curl -X POST -s -S -w "%{http_code}\\n" -o /dev/null "${BASE_URL}/infra-envs/${INFRA_ENV_ID}/hosts/${HOST_ID}/actions/install" -H "Authorization:  ${AGENT_AUTH_TOKEN}")
+res=$(curl_assisted_service "/infra-envs/${INFRA_ENV_ID}/hosts/${HOST_ID}/actions/install" POST -w "%{http_code}" -o /dev/null)
 if [[ $res = "202" ]]; then 
     printf '\nHost installation started\n' 1>&2
 else

data/data/agent/files/usr/local/bin/common.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+
+curl_assisted_service() {
+    local endpoint=$1
+    local method=${2:-GET}
+    local additional_options=("${@:3}")  # Capture all arguments starting from the third one
+    local baseURL="${SERVICE_BASE_URL}api/assisted-install/v2"
+
+    case "${method}" in
+        "POST")
+            curl -s -S -X POST "${additional_options[@]}" "${baseURL}${endpoint}" \
+            -H "Authorization: ${AGENT_AUTH_TOKEN}" \
+            -H "accept: application/json" \
+            -H "Content-Type: application/json" \
+            ;;
+        "GET")
+            curl -s -S -X GET "${additional_options[@]}" "${baseURL}${endpoint}" \
+            -H "Authorization: ${AGENT_AUTH_TOKEN}" \
+            -H "Accept: application/json"
+            ;;
+    esac
+}

data/data/agent/files/usr/local/bin/start-cluster-installation.sh

@@ -2,15 +2,15 @@
 set -e
 
 # shellcheck disable=SC1091
-source issue_status.sh
-
-BASE_URL="${SERVICE_BASE_URL}api/assisted-install/v2"
+source "common.sh"
+# shellcheck disable=SC1091
+source "issue_status.sh"
 
 cluster_id=""
 while [[ "${cluster_id}" = "" ]]
 do
     # Get cluster id
-    cluster_id=$(curl -s -S "${BASE_URL}/clusters" -H "Authorization: ${AGENT_AUTH_TOKEN}" | jq -r .[].id)
+    cluster_id=$(curl_assisted_service "/clusters" GET | jq -r .[].id)
     if [[ "${cluster_id}" = "" ]]; then
         sleep 2
     fi
@@ -28,7 +28,7 @@ status_issue="90_start-install"
 num_known_hosts() {
     local known_hosts=0
     local insufficient_hosts=0
-    host_status=$(curl -s -S "${BASE_URL}/infra-envs/${INFRA_ENV_ID}/hosts" -H "Authorization: ${AGENT_AUTH_TOKEN}" | jq -r .[].status)
+    host_status=$(curl_assisted_service "/infra-envs/${INFRA_ENV_ID}/hosts" GET | jq -r .[].status)
     if [[ -n ${host_status} ]]; then
         for status in ${host_status}; do
             if [[ "${status}" == "known" ]]; then
@@ -58,18 +58,17 @@ clear_issue "${status_issue}"
 while [[ "${cluster_status}" != "installed" ]]
 do
     sleep 5
-    cluster_status=$(curl -s -S "${BASE_URL}/clusters" -H "Authorization: ${AGENT_AUTH_TOKEN}" | jq -r .[].status)
+    cluster_status=$(curl_assisted_service "/clusters" GET | jq -r .[].status)
     echo "Cluster status: ${cluster_status}" 1>&2
     # Start the cluster install, if it transitions back to Ready due to a failure,
     # then it will be restarted
     case "${cluster_status}" in
         "ready")
             echo "Starting cluster installation..." 1>&2
-            curl -s -S -X POST "${BASE_URL}/clusters/${cluster_id}/actions/install" \
-                -H "Authorization: ${AGENT_AUTH_TOKEN}" \
-                -H 'accept: application/json' \
-                -d ''
-            echo "Cluster installation started" 1>&2
+            res=$(curl_assisted_service "/clusters/${cluster_id}/actions/install" POST -w "%{http_code}" -o /dev/null)
+            if [[ $res = "202" ]]; then 
+                printf '\nCluster installation started\n' 1>&2
+            fi
             ;&
         "installed" | "preparing-for-installation" | "installing")
             printf '\\e{lightgreen}Cluster installation in progress\\e{reset}' | set_issue "${status_issue}"

data/data/agent/files/usr/local/bin/wait-for-assisted-service.sh

@@ -1,8 +1,12 @@
 #!/bin/bash
 set -e
 
+# shellcheck disable=SC1091
+source "common.sh"
+
 echo "Waiting for assisted-service to be ready"
-until curl --output /dev/null --silent --fail "${SERVICE_BASE_URL}/api/assisted-install/v2/infra-envs" -H "Authorization: ${AGENT_AUTH_TOKEN}"; do
+
+until curl_assisted_service "/infra-envs" GET -o /dev/null --silent --fail; do
     printf '.'
     sleep 5
 done

pkg/asset/agent/image/ignition_test.go

@@ -393,6 +393,7 @@ func commonFiles() []string {
 		"/usr/local/bin/load-config-iso.sh",
 		"/etc/udev/rules.d/80-agent-config-image.rules",
 		"/usr/local/bin/add-node.sh",
+		"/usr/local/bin/common.sh",
 	}
 }