Skip to content

🧪 Add tests and fix payload dictionary validation in idstack-manifest-merge #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
savvides wants to merge 1 commit into
base: main
Choose a base branch
from
Open

🧪 Add tests and fix payload dictionary validation in idstack-manifest-merge #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion bin/idstack-manifest-merge
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,12 @@ def load_payload(payload_arg):
except Exception as exc:
die(6, f"failed to read payload file {payload_arg!r}: {exc}")
try:
return json.loads(text)
data = json.loads(text)
except json.JSONDecodeError as exc:
die(1, f"payload is not valid JSON: {exc}")
if not isinstance(data, dict):
die(1, f"payload root must be a JSON object: got {type(data).__name__}")
return data


def load_manifest(manifest_path):
Expand Down
20 changes: 20 additions & 0 deletions test/test-manifest-merge.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,26 @@ EC=$?
set -e
assert "manifest with string root exits 2" "[ $EC -eq 2 ]"

echo ""

# --- Test 13: payload with non-dict root (list) rejected with exit 1 ---
seed_manifest
echo '[]' > "$WORK/payload.json"
set +e
"$MERGE" --section red_team_audit --payload "$WORK/payload.json" --manifest "$WORK/project.json" --quiet 2>/dev/null
EC=$?
set -e
assert "payload with list root exits 1" "[ $EC -eq 1 ]"

# --- Test 14: payload with non-dict root (string) rejected with exit 1 ---
seed_manifest
echo '"a string"' > "$WORK/payload.json"
set +e
"$MERGE" --section red_team_audit --payload "$WORK/payload.json" --manifest "$WORK/project.json" --quiet 2>/dev/null
EC=$?
set -e
assert "payload with string root exits 1" "[ $EC -eq 1 ]"

echo ""
echo "manifest-merge: $PASS/$TOTAL passed, $FAIL failed"
[ "$FAIL" -eq 0 ] && exit 0 || exit 1