deploy: require jq for shell JSON parsing

Author: benvinegar

README.md

@@ -52,6 +52,8 @@ Baudbot is designed as shared engineering infrastructure, not a single-user desk
 | **CPU** | 2 vCPU | 4 vCPU |
 | **Disk** | 20 GB | 40 GB+ (repos, dependencies, Docker images) |
 
+System package dependencies (installed by `baudbot install`): `git`, `curl`, `tmux`, `iptables`, `docker`, `gh`, `jq`, `sudo`.
+
 ## Quick Start
 
 ```bash

bin/doctor.sh

@@ -71,6 +71,12 @@ else
   fail "varlock not found"
 fi
 
+if command -v jq &>/dev/null; then
+  pass "jq is installed"
+else
+  fail "jq not found (required for shell JSON parsing)"
+fi
+
 if command -v docker &>/dev/null; then
   pass "docker is available"
 else

bin/lib/json-common.sh

@@ -1,102 +1,48 @@
 #!/bin/bash
 # Shared JSON parsing helpers for shell scripts.
 #
+# jq is a required runtime dependency.
+#
 # Return codes:
 #   0 => key found and value printed
 #   1 => JSON parsed, but key missing/non-string
-#   2 => JSON/file/tool error
+#   2 => JSON/file/tool error (including missing jq)
 
 _json_filter='if (type == "object") and has($k) and (.[$k] | type == "string") then .[$k] else empty end'
 
+json_require_jq() {
+  command -v jq >/dev/null 2>&1
+}
+
 json_get_string() {
   local file="$1"
   local key="$2"
 
   [ -n "$file" ] || return 2
   [ -n "$key" ] || return 2
   [ -r "$file" ] || return 2
-
-  if command -v jq >/dev/null 2>&1; then
-    jq -er --arg k "$key" "$_json_filter" "$file" 2>/dev/null
-    case "$?" in
-      0) return 0 ;;
-      1) return 1 ;;
-      *) return 2 ;;
-    esac
-  fi
-
-  if ! command -v python3 >/dev/null 2>&1; then
-    return 2
-  fi
-
-  python3 - "$file" "$key" <<'PY'
-import json
-import sys
-
-if len(sys.argv) != 3:
-    sys.exit(2)
-
-path = sys.argv[1]
-key = sys.argv[2]
-
-try:
-    with open(path, "r", encoding="utf-8") as f:
-        data = json.load(f)
-except Exception:
-    sys.exit(2)
-
-if not isinstance(data, dict):
-    sys.exit(1)
-
-value = data.get(key)
-if not isinstance(value, str):
-    sys.exit(1)
-
-sys.stdout.write(value)
-PY
+  json_require_jq || return 2
+
+  jq -er --arg k "$key" "$_json_filter" "$file" 2>/dev/null
+  case "$?" in
+    0) return 0 ;;
+    1) return 1 ;;
+    *) return 2 ;;
+  esac
 }
 
 json_get_string_stdin() {
   local key="$1"
 
   [ -n "$key" ] || return 2
-
-  if command -v jq >/dev/null 2>&1; then
-    jq -er --arg k "$key" "$_json_filter" 2>/dev/null
-    case "$?" in
-      0) return 0 ;;
-      1) return 1 ;;
-      *) return 2 ;;
-    esac
-  fi
-
-  if ! command -v python3 >/dev/null 2>&1; then
-    return 2
-  fi
-
-  python3 - "$key" <<'PY'
-import json
-import sys
-
-if len(sys.argv) != 2:
-    sys.exit(2)
-
-key = sys.argv[1]
-
-try:
-    data = json.load(sys.stdin)
-except Exception:
-    sys.exit(2)
-
-if not isinstance(data, dict):
-    sys.exit(1)
-
-value = data.get(key)
-if not isinstance(value, str):
-    sys.exit(1)
-
-sys.stdout.write(value)
-PY
+  json_require_jq || return 2
+
+  jq -er --arg k "$key" "$_json_filter" 2>/dev/null
+  case "$?" in
+    0) return 0 ;;
+    1) return 1 ;;
+    *) return 2 ;;
+  esac
 }
 
 json_get_string_or_empty() {

install.sh

@@ -163,7 +163,7 @@ install_prereqs_ubuntu() {
 
   for attempt in $(seq 1 5); do
     if DEBIAN_FRONTEND=noninteractive apt-get -o DPkg::Lock::Timeout=120 update -qq \
-      && DEBIAN_FRONTEND=noninteractive apt-get -o DPkg::Lock::Timeout=120 install -y -qq git curl tmux iptables docker.io gh sudo 2>&1 | tail -3; then
+      && DEBIAN_FRONTEND=noninteractive apt-get -o DPkg::Lock::Timeout=120 install -y -qq git curl tmux iptables docker.io gh jq sudo 2>&1 | tail -3; then
       return 0
     fi
 
@@ -179,10 +179,10 @@ install_prereqs_ubuntu() {
 }
 
 install_prereqs_arch() {
-  pacman -Syu --noconfirm --needed git curl tmux iptables docker github-cli sudo 2>&1 | tail -5
+  pacman -Syu --noconfirm --needed git curl tmux iptables docker github-cli jq sudo 2>&1 | tail -5
 }
 
-info "Installing: git, curl, tmux, iptables, docker, gh, sudo"
+info "Installing: git, curl, tmux, iptables, docker, gh, jq, sudo"
 "install_prereqs_$DISTRO"
 info "Prerequisites installed"