refactor: centralize result server JSON fetch [skip-ci]

Author: yoshifuminakamura

scripts/estimate_common.sh

@@ -9,6 +9,8 @@
 
 set -euo pipefail
 
+source "$(dirname "${BASH_SOURCE[0]}")/result_server_client.sh"
+
 # ---------------------------------------------------------------------------
 # Global variables — populated by read_values
 # ---------------------------------------------------------------------------
@@ -364,15 +366,6 @@ fetch_current_fom() {
   local code="$2"
   local exp="${3:-}"
 
-  if [[ -z "${RESULT_SERVER:-}" ]]; then
-    echo "ERROR: RESULT_SERVER is not set" >&2
-    exit 1
-  fi
-  if [[ -z "${RESULT_SERVER_KEY:-}" ]]; then
-    echo "ERROR: RESULT_SERVER_KEY is not set" >&2
-    exit 1
-  fi
-
   local url="${RESULT_SERVER}/api/query/result?system=${system}&code=${code}"
   if [[ -n "$exp" ]]; then
     url="${url}&exp=${exp}"
@@ -381,7 +374,7 @@ fetch_current_fom() {
   local response
   local curl_exit
   set +e
-  response=$(curl -sf -H "X-API-Key: ${RESULT_SERVER_KEY}" "$url")
+  response=$(bk_result_server_get_json "/api/query/result?system=${system}&code=${code}${exp:+&exp=${exp}}")
   curl_exit=$?
   set -e
   if [[ $curl_exit -ne 0 || -z "$response" ]]; then

scripts/fetch_result_by_uuid.sh

@@ -10,6 +10,8 @@
 #   RESULT_SERVER  - Base URL of the result server
 set -euo pipefail
 
+source "$(dirname "$0")/result_server_client.sh"
+
 if [[ -z "${code:-}" ]]; then
   echo "ERROR: code must be specified" >&2
   exit 1
@@ -21,9 +23,9 @@ resolved_result_uuid="${result_uuid:-}"
 
 if [[ -z "$resolved_result_uuid" && -n "${estimate_result_uuid:-}" ]]; then
   echo "Fetching estimate for UUID: $estimate_result_uuid"
-  curl --fail -L -sS -H "X-API-Key: ${RESULT_SERVER_KEY}" \
-    -o "results/source_estimate.json" \
-    "${RESULT_SERVER}/api/query/estimate?uuid=${estimate_result_uuid}"
+  bk_result_server_get_json_to_file \
+    "/api/query/estimate?uuid=${estimate_result_uuid}" \
+    "results/source_estimate.json"
 
   resolved_result_uuid="$(jq -r '.estimate_metadata.source_result_uuid // empty' results/source_estimate.json)"
   if [[ -z "$resolved_result_uuid" ]]; then
@@ -44,6 +46,7 @@ if [[ -z "$resolved_result_uuid" ]]; then
 fi
 
 echo "Fetching result for UUID: $resolved_result_uuid"
-curl --fail -L -sS -H "X-API-Key: ${RESULT_SERVER_KEY}" -o "results/result0.json" \
-  "${RESULT_SERVER}/api/query/result?uuid=${resolved_result_uuid}"
+bk_result_server_get_json_to_file \
+  "/api/query/result?uuid=${resolved_result_uuid}" \
+  "results/result0.json"
 echo "Fetched result to results/result0.json"

scripts/result_server_client.sh

@@ -0,0 +1,31 @@
+#!/bin/bash
+# Shared helpers for reading JSON from the result server.
+
+set -euo pipefail
+
+bk_result_server_require_env() {
+  if [[ -z "${RESULT_SERVER:-}" ]]; then
+    echo "ERROR: RESULT_SERVER is not set" >&2
+    exit 1
+  fi
+  if [[ -z "${RESULT_SERVER_KEY:-}" ]]; then
+    echo "ERROR: RESULT_SERVER_KEY is not set" >&2
+    exit 1
+  fi
+}
+
+bk_result_server_get_json() {
+  local path_and_query="$1"
+  bk_result_server_require_env
+  curl --fail -L -sS -H "X-API-Key: ${RESULT_SERVER_KEY}" \
+    "${RESULT_SERVER}${path_and_query}"
+}
+
+bk_result_server_get_json_to_file() {
+  local path_and_query="$1"
+  local output_path="$2"
+  bk_result_server_require_env
+  curl --fail -L -sS -H "X-API-Key: ${RESULT_SERVER_KEY}" \
+    -o "$output_path" \
+    "${RESULT_SERVER}${path_and_query}"
+}