forked from HomeLab/unraid-mcp
fix: address 54 MEDIUM/LOW priority PR review issues
Comprehensive fixes across Python code, shell scripts, and documentation addressing all remaining MEDIUM and LOW priority review comments. Python Code Fixes (27 fixes): - tools/info.py: Simplified dispatch with lookup tables, defensive guards, CPU fallback formatting, !s conversion flags, module-level sync assertion - tools/docker.py: Case-insensitive container ID regex, keyword-only confirm, module-level ALL_ACTIONS constant - tools/virtualization.py: Normalized single-VM dict responses, unified list/details queries - core/client.py: Fixed HTTP client singleton race condition, compound key substring matching for sensitive data redaction - subscriptions/: Extracted SSL context creation to shared helper in utils.py, replaced deprecated ssl._create_unverified_context API - tools/array.py: Renamed parity_history to parity_status, hoisted ALL_ACTIONS - tools/storage.py: Fixed dict(None) risks, temperature 0 falsiness bug - tools/notifications.py, keys.py, rclone.py: Fixed dict(None) TypeError risks - tests/: Fixed generator type annotations, added coverage for compound keys Shell Script Fixes (13 fixes): - dashboard.sh: Dynamic server discovery, conditional debug output, null-safe jq, notification count guard order, removed unused variables - unraid-query.sh: Proper JSON escaping via jq, --ignore-errors and --insecure CLI flags, TLS verification now on by default - validate-marketplace.sh: Removed unused YELLOW variable, defensive jq, simplified repository URL output Documentation Fixes (24+ fixes): - Version consistency: Updated all references to v0.2.0 across pyproject.toml, plugin.json, marketplace.json, MARKETPLACE.md, __init__.py, README files - Tool count updates: Changed all "26 tools" references to "10 tools, 90 actions" - Markdown lint: Fixed MD022, MD031, MD047 issues across multiple files - Research docs: Fixed auth headers, removed web artifacts, corrected stale info - Skills docs: Fixed query examples, endpoint counts, env var references All 227 tests pass, ruff and ty checks clean.
This commit is contained in:
@@ -16,6 +16,8 @@ OPTIONS:
|
||||
-k, --key KEY API key (required)
|
||||
-q, --query QUERY GraphQL query (required)
|
||||
-f, --format FORMAT Output format: json (default), raw, pretty
|
||||
--ignore-errors Continue if GraphQL returns data alongside errors
|
||||
--insecure Disable TLS certificate verification
|
||||
-h, --help Show this help message
|
||||
|
||||
ENVIRONMENT VARIABLES:
|
||||
@@ -43,6 +45,8 @@ URL="${UNRAID_URL:-}"
|
||||
API_KEY="${UNRAID_API_KEY:-}"
|
||||
QUERY=""
|
||||
FORMAT="json"
|
||||
IGNORE_ERRORS="${IGNORE_ERRORS:-false}"
|
||||
INSECURE="false"
|
||||
|
||||
# Parse arguments
|
||||
while [[ $# -gt 0 ]]; do
|
||||
@@ -63,6 +67,14 @@ while [[ $# -gt 0 ]]; do
|
||||
FORMAT="$2"
|
||||
shift 2
|
||||
;;
|
||||
--ignore-errors)
|
||||
IGNORE_ERRORS="true"
|
||||
shift
|
||||
;;
|
||||
--insecure)
|
||||
INSECURE="true"
|
||||
shift
|
||||
;;
|
||||
-h|--help)
|
||||
usage
|
||||
;;
|
||||
@@ -89,15 +101,22 @@ if [[ -z "$QUERY" ]]; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Build JSON payload with proper escaping
|
||||
PAYLOAD=$(jq -n --arg q "$QUERY" '{"query": $q}')
|
||||
|
||||
# Build curl flags
|
||||
CURL_FLAGS=("-sL" "-X" "POST")
|
||||
[[ "$INSECURE" == "true" ]] && CURL_FLAGS+=("-k")
|
||||
|
||||
# Make the request
|
||||
RESPONSE=$(curl -skL -X POST "$URL" \
|
||||
RESPONSE=$(curl "${CURL_FLAGS[@]}" "$URL" \
|
||||
-H "Content-Type: application/json" \
|
||||
-H "x-api-key: $API_KEY" \
|
||||
-d "{\"query\":\"$QUERY\"}")
|
||||
-d "$PAYLOAD")
|
||||
|
||||
# Check for errors
|
||||
if echo "$RESPONSE" | jq -e '.errors' > /dev/null 2>&1; then
|
||||
# If we have data despite errors, and --ignore-errors is set, continue
|
||||
# If we have data despite errors and --ignore-errors was passed, continue
|
||||
if [[ "$IGNORE_ERRORS" == "true" ]] && echo "$RESPONSE" | jq -e '.data' > /dev/null 2>&1; then
|
||||
echo "GraphQL Warning:" >&2
|
||||
echo "$RESPONSE" | jq -r '.errors[0].message' >&2
|
||||
|
||||
Reference in New Issue
Block a user