bash review

Author: RazvanLiviuVarzaru

configuration/steps/commands/scripts/mtr_reporter.sh

@@ -10,27 +10,38 @@ PLATFORM="$4"
 BBNUM="$5"
 DIR="$6"          # Directory containing .xml files
 
+err() {
+  set +x
+  echo >&2 "ERROR: $*"
+  exit 1
+}
+
+bb_log_info() {
+  set +x
+  echo >&1 "INFO: $*"
+  set -x
+}
+
 UPLOAD_URL="${BASE_URL}/upload-test-results/"
 HEALTH_URL="${BASE_URL}/health"
 
 # Step 1: Health check before uploads
-echo "Checking service health at $HEALTH_URL..."
+command -v curl >/dev/null || err "curl not found"
+bb_log_info "Checking service health at $HEALTH_URL..."
 if ! curl "$HEALTH_URL" \
   --max-time 5 \
   --retry 3 \
   --retry-max-time 0 \
   --retry-delay 5 \
   --retry-connrefused \
   --fail-with-body; then
-    echo "Service health check failed. Aborting uploads."
-    exit 1
+    err "Service health check failed. Aborting uploads."
 fi
-echo "Service is healthy. Proceeding with uploads."
+bb_log_info "Service is healthy. Proceeding with uploads."
 
 # Step 2: Validate directory
 if [[ ! -d "$DIR" ]]; then
-  echo "Error: directory '$DIR' does not exist"
-  exit 1
+  err "Error: directory '$DIR' does not exist"
 fi
 
 # Step 3: Find XML files
@@ -39,8 +50,7 @@ XML_FILES=("$DIR"/*.xml)
 shopt -u nullglob
 
 if [[ ${#XML_FILES[@]} -eq 0 ]]; then
-  echo "Error: no .xml files found in directory '$DIR'"
-  exit 1
+  err "Error: no .xml files found in directory '$DIR'"
 fi
 
 # Step 4: Upload files and track failures
@@ -49,7 +59,7 @@ ANY_FAILED=0
 for FILE in "${XML_FILES[@]}"; do
   # Extract filename without extension for 'typ'
   BASENAME="$(basename "$FILE" .xml)"
-  echo "Uploading $FILE (typ=$BASENAME)..."
+  bb_log_info "Uploading $FILE (typ=$BASENAME)..."
 
   if ! curl --max-time 120 --connect-timeout 10 --fail-with-body \
     -X POST "$UPLOAD_URL" \
@@ -59,18 +69,16 @@ for FILE in "${XML_FILES[@]}"; do
     -F "bbnum=${BBNUM}" \
     -F "typ=${BASENAME}" \
     -F "file=@${FILE};type=application/xml"; then
-      echo "Upload failed for $FILE"
+      bb_log_info "Upload failed for $FILE"
       ANY_FAILED=1
   else
-    echo "Upload succeeded for $FILE"
+    bb_log_info "Upload succeeded for $FILE"
   fi
 done
 
 # Step 5: Final result
 if [[ $ANY_FAILED -ne 0 ]]; then
-  echo "One or more uploads failed."
-  exit 1
+  err "One or more uploads failed."
 else
-  echo "All uploads succeeded."
-  exit 0
+  bb_log_info "All uploads succeeded."
 fi