Skip to content

(fix) Improve error handling and output #781

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
HarK-github wants to merge 5 commits into
base: main
Choose a base branch
from
Open

(fix) Improve error handling and output #781

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7a37f47
(fix) Improve error handling and output
HarK-github Jul 1, 2026
712fdfe
Merge branch 'main' into fix_error_messages
HarK-github Jul 3, 2026
98fa7af
style: revert indentation in config.ts and update snapshots for error…
HarK-github Jul 3, 2026
dd59ff6
fix(cli): resolve command argument forwarding issue in executeFabloCo…
HarK-github Jul 8, 2026
3e22fd2
test: clean up obsolete snapshot for ccaas-tls sample
HarK-github Jul 8, 2026
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
6 changes: 3 additions & 3 deletions docs/fablo.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,10 +327,10 @@ executeFabloCommand() {
if [ -f "$FABLO_TARGET/fabric-docker.sh" ]; then
echo "Executing Fablo Docker command: $1"
chmod +x "$FABLO_TARGET/fabric-docker.sh" || true
"$FABLO_TARGET/fabric-docker.sh" "$1" "$2" "$3" "$4" "$5" "$6" "$7" "$8"
"$FABLO_TARGET/fabric-docker.sh" "$@"
elif [ -f "$FABLO_TARGET/fabric-k8s.sh" ]; then
echo "Executing Fablo Kubernetes command: $1"
"$FABLO_TARGET/fabric-k8s.sh" "$1" "$2" "$3" "$4" "$5" "$6" "$7" "$8"
"$FABLO_TARGET/fabric-k8s.sh" "$@"
else
echo "Error: Corrupted Fablo target directory ($FABLO_TARGET)"
echo "Cannot execute command $1"
Expand Down Expand Up @@ -421,5 +421,5 @@ elif [ "$COMMAND" = "restore" ]; then
restoreSnapshot "$2" "${3:-""}"

else
executeFabloCommand "$COMMAND" "$2" "$3" "$4" "$5" "$6" "$7" "$8"
executeFabloCommand "$COMMAND" "${@:2}"
fi
15 changes: 8 additions & 7 deletions e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode-peer-dev-mode.json.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1481,17 +1481,17 @@ elif [ "$1" = "stop" ]; then
elif [ "$1" = "chaincodes" ] && [ "$2" = "install" ]; then
installChaincodes
elif [ "$1" = "chaincode" ] && [ "$2" = "install" ]; then
installChaincode "$3" "$4"
installChaincode "\${@:3}"
elif [ "$1" = "chaincode" ] && [ "$2" = "upgrade" ]; then
upgradeChaincode "$3" "$4"
upgradeChaincode "\${@:3}"
elif [ "$1" = "chaincode" ] && [ "$2" = "dev" ]; then
runDevModeChaincode "$3" "$4"
runDevModeChaincode "\${@:3}"
elif [ "$1" = "chaincode" ] && [ "$2" = "invoke" ]; then
chaincodeInvoke "$3" "$4" "$5" "$6" "$7"
chaincodeInvoke "\${@:3}"
elif [ "$1" = "chaincode" ] && [ "$2" = "query" ]; then
chaincodeQuery "$3" "$4" "$5" "$6" "$7"
chaincodeQuery "\${@:3}"
elif [ "$1" = "chaincodes" ] && [ "$2" = "list" ]; then
chaincodeList "$3" "$4"
chaincodeList "\${@:3}"
elif [ "$1" = "channel" ]; then
channelQuery "\${@:2}"
elif [ "$1" = "snapshot" ]; then
Expand All @@ -1508,6 +1508,7 @@ else
echo "To list channel query helper commands type: 'fablo channel --help'"
echo "Also check: 'chaincode install'"
echo "Use 'help' or '--help' for more information"
exit 1
fi
"
`;
Expand Down Expand Up @@ -1584,7 +1585,7 @@ chaincodeList() {
# 5. transient data (optional)
chaincodeInvoke() {
if [ "$#" -ne 4 ] && [ "$#" -ne 5 ]; then
echo "Expected 4 or 5 parameters for chaincode list, but got: $*"
echo "Expected 4 or 5 parameters for chaincode invoke, but got: $*"
echo "Usage: fablo chaincode invoke <peer_domains_comma_separated> <channel_name> <chaincode_name> <command> [transient]"
exit 1
fi
Expand Down
15 changes: 8 additions & 7 deletions e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode.json.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1488,17 +1488,17 @@ elif [ "$1" = "stop" ]; then
elif [ "$1" = "chaincodes" ] && [ "$2" = "install" ]; then
installChaincodes
elif [ "$1" = "chaincode" ] && [ "$2" = "install" ]; then
installChaincode "$3" "$4"
installChaincode "\${@:3}"
elif [ "$1" = "chaincode" ] && [ "$2" = "upgrade" ]; then
upgradeChaincode "$3" "$4"
upgradeChaincode "\${@:3}"
elif [ "$1" = "chaincode" ] && [ "$2" = "dev" ]; then
runDevModeChaincode "$3" "$4"
runDevModeChaincode "\${@:3}"
elif [ "$1" = "chaincode" ] && [ "$2" = "invoke" ]; then
chaincodeInvoke "$3" "$4" "$5" "$6" "$7"
chaincodeInvoke "\${@:3}"
elif [ "$1" = "chaincode" ] && [ "$2" = "query" ]; then
chaincodeQuery "$3" "$4" "$5" "$6" "$7"
chaincodeQuery "\${@:3}"
elif [ "$1" = "chaincodes" ] && [ "$2" = "list" ]; then
chaincodeList "$3" "$4"
chaincodeList "\${@:3}"
elif [ "$1" = "channel" ]; then
channelQuery "\${@:2}"
elif [ "$1" = "snapshot" ]; then
Expand All @@ -1515,6 +1515,7 @@ else
echo "To list channel query helper commands type: 'fablo channel --help'"
echo "Also check: 'chaincode install'"
echo "Use 'help' or '--help' for more information"
exit 1
fi
"
`;
Expand Down Expand Up @@ -1595,7 +1596,7 @@ chaincodeList() {
# 5. transient data (optional)
chaincodeInvoke() {
if [ "$#" -ne 4 ] && [ "$#" -ne 5 ]; then
echo "Expected 4 or 5 parameters for chaincode list, but got: $*"
echo "Expected 4 or 5 parameters for chaincode invoke, but got: $*"
echo "Usage: fablo chaincode invoke <peer_domains_comma_separated> <channel_name> <chaincode_name> <command> [transient]"
exit 1
fi
Expand Down
15 changes: 8 additions & 7 deletions e2e/__snapshots__/fablo-config-hlf2-1org-2chaincode-raft-ccaas.json.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1564,17 +1564,17 @@ elif [ "$1" = "stop" ]; then
elif [ "$1" = "chaincodes" ] && [ "$2" = "install" ]; then
installChaincodes
elif [ "$1" = "chaincode" ] && [ "$2" = "install" ]; then
installChaincode "$3" "$4"
installChaincode "\${@:3}"
elif [ "$1" = "chaincode" ] && [ "$2" = "upgrade" ]; then
upgradeChaincode "$3" "$4"
upgradeChaincode "\${@:3}"
elif [ "$1" = "chaincode" ] && [ "$2" = "dev" ]; then
runDevModeChaincode "$3" "$4"
runDevModeChaincode "\${@:3}"
elif [ "$1" = "chaincode" ] && [ "$2" = "invoke" ]; then
chaincodeInvoke "$3" "$4" "$5" "$6" "$7"
chaincodeInvoke "\${@:3}"
elif [ "$1" = "chaincode" ] && [ "$2" = "query" ]; then
chaincodeQuery "$3" "$4" "$5" "$6" "$7"
chaincodeQuery "\${@:3}"
elif [ "$1" = "chaincodes" ] && [ "$2" = "list" ]; then
chaincodeList "$3" "$4"
chaincodeList "\${@:3}"
elif [ "$1" = "channel" ]; then
channelQuery "\${@:2}"
elif [ "$1" = "snapshot" ]; then
Expand All @@ -1591,6 +1591,7 @@ else
echo "To list channel query helper commands type: 'fablo channel --help'"
echo "Also check: 'chaincode install'"
echo "Use 'help' or '--help' for more information"
exit 1
fi
"
`;
Expand Down Expand Up @@ -1667,7 +1668,7 @@ chaincodeList() {
# 5. transient data (optional)
chaincodeInvoke() {
if [ "$#" -ne 4 ] && [ "$#" -ne 5 ]; then
echo "Expected 4 or 5 parameters for chaincode list, but got: $*"
echo "Expected 4 or 5 parameters for chaincode invoke, but got: $*"
echo "Usage: fablo chaincode invoke <peer_domains_comma_separated> <channel_name> <chaincode_name> <command> [transient]"
exit 1
fi
Expand Down
15 changes: 8 additions & 7 deletions e2e/__snapshots__/fablo-config-hlf2-2orgs-2chaincodes-private-data.yaml.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2170,17 +2170,17 @@ elif [ "$1" = "stop" ]; then
elif [ "$1" = "chaincodes" ] && [ "$2" = "install" ]; then
installChaincodes
elif [ "$1" = "chaincode" ] && [ "$2" = "install" ]; then
installChaincode "$3" "$4"
installChaincode "\${@:3}"
elif [ "$1" = "chaincode" ] && [ "$2" = "upgrade" ]; then
upgradeChaincode "$3" "$4"
upgradeChaincode "\${@:3}"
elif [ "$1" = "chaincode" ] && [ "$2" = "dev" ]; then
runDevModeChaincode "$3" "$4"
runDevModeChaincode "\${@:3}"
elif [ "$1" = "chaincode" ] && [ "$2" = "invoke" ]; then
chaincodeInvoke "$3" "$4" "$5" "$6" "$7"
chaincodeInvoke "\${@:3}"
elif [ "$1" = "chaincode" ] && [ "$2" = "query" ]; then
chaincodeQuery "$3" "$4" "$5" "$6" "$7"
chaincodeQuery "\${@:3}"
elif [ "$1" = "chaincodes" ] && [ "$2" = "list" ]; then
chaincodeList "$3" "$4"
chaincodeList "\${@:3}"
elif [ "$1" = "channel" ]; then
channelQuery "\${@:2}"
elif [ "$1" = "snapshot" ]; then
Expand All @@ -2197,6 +2197,7 @@ else
echo "To list channel query helper commands type: 'fablo channel --help'"
echo "Also check: 'chaincode install'"
echo "Use 'help' or '--help' for more information"
exit 1
fi
"
`;
Expand Down Expand Up @@ -2284,7 +2285,7 @@ chaincodeList() {
# 5. transient data (optional)
chaincodeInvoke() {
if [ "$#" -ne 4 ] && [ "$#" -ne 5 ]; then
echo "Expected 4 or 5 parameters for chaincode list, but got: $*"
echo "Expected 4 or 5 parameters for chaincode invoke, but got: $*"
echo "Usage: fablo chaincode invoke <peer_domains_comma_separated> <channel_name> <chaincode_name> <command> [transient]"
exit 1
fi
Expand Down
15 changes: 8 additions & 7 deletions e2e/__snapshots__/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3539,17 +3539,17 @@ elif [ "$1" = "stop" ]; then
elif [ "$1" = "chaincodes" ] && [ "$2" = "install" ]; then
installChaincodes
elif [ "$1" = "chaincode" ] && [ "$2" = "install" ]; then
installChaincode "$3" "$4"
installChaincode "\${@:3}"
elif [ "$1" = "chaincode" ] && [ "$2" = "upgrade" ]; then
upgradeChaincode "$3" "$4"
upgradeChaincode "\${@:3}"
elif [ "$1" = "chaincode" ] && [ "$2" = "dev" ]; then
runDevModeChaincode "$3" "$4"
runDevModeChaincode "\${@:3}"
elif [ "$1" = "chaincode" ] && [ "$2" = "invoke" ]; then
chaincodeInvoke "$3" "$4" "$5" "$6" "$7"
chaincodeInvoke "\${@:3}"
elif [ "$1" = "chaincode" ] && [ "$2" = "query" ]; then
chaincodeQuery "$3" "$4" "$5" "$6" "$7"
chaincodeQuery "\${@:3}"
elif [ "$1" = "chaincodes" ] && [ "$2" = "list" ]; then
chaincodeList "$3" "$4"
chaincodeList "\${@:3}"
elif [ "$1" = "channel" ]; then
channelQuery "\${@:2}"
elif [ "$1" = "snapshot" ]; then
Expand All @@ -3566,6 +3566,7 @@ else
echo "To list channel query helper commands type: 'fablo channel --help'"
echo "Also check: 'chaincode install'"
echo "Use 'help' or '--help' for more information"
exit 1
fi
"
`;
Expand Down Expand Up @@ -3660,7 +3661,7 @@ chaincodeList() {
# 5. transient data (optional)
chaincodeInvoke() {
if [ "$#" -ne 4 ] && [ "$#" -ne 5 ]; then
echo "Expected 4 or 5 parameters for chaincode list, but got: $*"
echo "Expected 4 or 5 parameters for chaincode invoke, but got: $*"
echo "Usage: fablo chaincode invoke <peer_domains_comma_separated> <channel_name> <chaincode_name> <command> [transient]"
exit 1
fi
Expand Down
15 changes: 8 additions & 7 deletions e2e/__snapshots__/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3968,17 +3968,17 @@ elif [ "$1" = "stop" ]; then
elif [ "$1" = "chaincodes" ] && [ "$2" = "install" ]; then
installChaincodes
elif [ "$1" = "chaincode" ] && [ "$2" = "install" ]; then
installChaincode "$3" "$4"
installChaincode "\${@:3}"
elif [ "$1" = "chaincode" ] && [ "$2" = "upgrade" ]; then
upgradeChaincode "$3" "$4"
upgradeChaincode "\${@:3}"
elif [ "$1" = "chaincode" ] && [ "$2" = "dev" ]; then
runDevModeChaincode "$3" "$4"
runDevModeChaincode "\${@:3}"
elif [ "$1" = "chaincode" ] && [ "$2" = "invoke" ]; then
chaincodeInvoke "$3" "$4" "$5" "$6" "$7"
chaincodeInvoke "\${@:3}"
elif [ "$1" = "chaincode" ] && [ "$2" = "query" ]; then
chaincodeQuery "$3" "$4" "$5" "$6" "$7"
chaincodeQuery "\${@:3}"
elif [ "$1" = "chaincodes" ] && [ "$2" = "list" ]; then
chaincodeList "$3" "$4"
chaincodeList "\${@:3}"
elif [ "$1" = "channel" ]; then
channelQuery "\${@:2}"
elif [ "$1" = "snapshot" ]; then
Expand All @@ -3995,6 +3995,7 @@ else
echo "To list channel query helper commands type: 'fablo channel --help'"
echo "Also check: 'chaincode install'"
echo "Use 'help' or '--help' for more information"
exit 1
fi
"
`;
Expand Down Expand Up @@ -4097,7 +4098,7 @@ chaincodeList() {
# 5. transient data (optional)
chaincodeInvoke() {
if [ "$#" -ne 4 ] && [ "$#" -ne 5 ]; then
echo "Expected 4 or 5 parameters for chaincode list, but got: $*"
echo "Expected 4 or 5 parameters for chaincode invoke, but got: $*"
echo "Usage: fablo chaincode invoke <peer_domains_comma_separated> <channel_name> <chaincode_name> <command> [transient]"
exit 1
fi
Expand Down
15 changes: 8 additions & 7 deletions e2e/__snapshots__/fablo-config-hlf3-1orgs-2chaincodes.json.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1690,17 +1690,17 @@ elif [ "$1" = "stop" ]; then
elif [ "$1" = "chaincodes" ] && [ "$2" = "install" ]; then
installChaincodes
elif [ "$1" = "chaincode" ] && [ "$2" = "install" ]; then
installChaincode "$3" "$4"
installChaincode "\${@:3}"
elif [ "$1" = "chaincode" ] && [ "$2" = "upgrade" ]; then
upgradeChaincode "$3" "$4"
upgradeChaincode "\${@:3}"
elif [ "$1" = "chaincode" ] && [ "$2" = "dev" ]; then
runDevModeChaincode "$3" "$4"
runDevModeChaincode "\${@:3}"
elif [ "$1" = "chaincode" ] && [ "$2" = "invoke" ]; then
chaincodeInvoke "$3" "$4" "$5" "$6" "$7"
chaincodeInvoke "\${@:3}"
elif [ "$1" = "chaincode" ] && [ "$2" = "query" ]; then
chaincodeQuery "$3" "$4" "$5" "$6" "$7"
chaincodeQuery "\${@:3}"
elif [ "$1" = "chaincodes" ] && [ "$2" = "list" ]; then
chaincodeList "$3" "$4"
chaincodeList "\${@:3}"
elif [ "$1" = "channel" ]; then
channelQuery "\${@:2}"
elif [ "$1" = "snapshot" ]; then
Expand All @@ -1717,6 +1717,7 @@ else
echo "To list channel query helper commands type: 'fablo channel --help'"
echo "Also check: 'chaincode install'"
echo "Use 'help' or '--help' for more information"
exit 1
fi
"
`;
Expand Down Expand Up @@ -1797,7 +1798,7 @@ chaincodeList() {
# 5. transient data (optional)
chaincodeInvoke() {
if [ "$#" -ne 4 ] && [ "$#" -ne 5 ]; then
echo "Expected 4 or 5 parameters for chaincode list, but got: $*"
echo "Expected 4 or 5 parameters for chaincode invoke, but got: $*"
echo "Usage: fablo chaincode invoke <peer_domains_comma_separated> <channel_name> <chaincode_name> <command> [transient]"
exit 1
fi
Expand Down
15 changes: 8 additions & 7 deletions e2e/__snapshots__/fablo-config-hlf3-2orgs-1chaincode-raft-ccaas.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2253,17 +2253,17 @@ elif [ "$1" = "stop" ]; then
elif [ "$1" = "chaincodes" ] && [ "$2" = "install" ]; then
installChaincodes
elif [ "$1" = "chaincode" ] && [ "$2" = "install" ]; then
installChaincode "$3" "$4"
installChaincode "\${@:3}"
elif [ "$1" = "chaincode" ] && [ "$2" = "upgrade" ]; then
upgradeChaincode "$3" "$4"
upgradeChaincode "\${@:3}"
elif [ "$1" = "chaincode" ] && [ "$2" = "dev" ]; then
runDevModeChaincode "$3" "$4"
runDevModeChaincode "\${@:3}"
elif [ "$1" = "chaincode" ] && [ "$2" = "invoke" ]; then
chaincodeInvoke "$3" "$4" "$5" "$6" "$7"
chaincodeInvoke "\${@:3}"
elif [ "$1" = "chaincode" ] && [ "$2" = "query" ]; then
chaincodeQuery "$3" "$4" "$5" "$6" "$7"
chaincodeQuery "\${@:3}"
elif [ "$1" = "chaincodes" ] && [ "$2" = "list" ]; then
chaincodeList "$3" "$4"
chaincodeList "\${@:3}"
elif [ "$1" = "channel" ]; then
channelQuery "\${@:2}"
elif [ "$1" = "snapshot" ]; then
Expand All @@ -2280,6 +2280,7 @@ else
echo "To list channel query helper commands type: 'fablo channel --help'"
echo "Also check: 'chaincode install'"
echo "Use 'help' or '--help' for more information"
exit 1
fi
"
`;
Expand Down Expand Up @@ -2363,7 +2364,7 @@ chaincodeList() {
# 5. transient data (optional)
chaincodeInvoke() {
if [ "$#" -ne 4 ] && [ "$#" -ne 5 ]; then
echo "Expected 4 or 5 parameters for chaincode list, but got: $*"
echo "Expected 4 or 5 parameters for chaincode invoke, but got: $*"
echo "Usage: fablo chaincode invoke <peer_domains_comma_separated> <channel_name> <chaincode_name> <command> [transient]"
exit 1
fi
Expand Down
15 changes: 8 additions & 7 deletions e2e/__snapshots__/fablo-config-hlf3-bft-1orgs-1chaincode.json.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1710,17 +1710,17 @@ elif [ "$1" = "stop" ]; then
elif [ "$1" = "chaincodes" ] && [ "$2" = "install" ]; then
installChaincodes
elif [ "$1" = "chaincode" ] && [ "$2" = "install" ]; then
installChaincode "$3" "$4"
installChaincode "\${@:3}"
elif [ "$1" = "chaincode" ] && [ "$2" = "upgrade" ]; then
upgradeChaincode "$3" "$4"
upgradeChaincode "\${@:3}"
elif [ "$1" = "chaincode" ] && [ "$2" = "dev" ]; then
runDevModeChaincode "$3" "$4"
runDevModeChaincode "\${@:3}"
elif [ "$1" = "chaincode" ] && [ "$2" = "invoke" ]; then
chaincodeInvoke "$3" "$4" "$5" "$6" "$7"
chaincodeInvoke "\${@:3}"
elif [ "$1" = "chaincode" ] && [ "$2" = "query" ]; then
chaincodeQuery "$3" "$4" "$5" "$6" "$7"
chaincodeQuery "\${@:3}"
elif [ "$1" = "chaincodes" ] && [ "$2" = "list" ]; then
chaincodeList "$3" "$4"
chaincodeList "\${@:3}"
elif [ "$1" = "channel" ]; then
channelQuery "\${@:2}"
elif [ "$1" = "snapshot" ]; then
Expand All @@ -1737,6 +1737,7 @@ else
echo "To list channel query helper commands type: 'fablo channel --help'"
echo "Also check: 'chaincode install'"
echo "Use 'help' or '--help' for more information"
exit 1
fi
"
`;
Expand Down Expand Up @@ -1817,7 +1818,7 @@ chaincodeList() {
# 5. transient data (optional)
chaincodeInvoke() {
if [ "$#" -ne 4 ] && [ "$#" -ne 5 ]; then
echo "Expected 4 or 5 parameters for chaincode list, but got: $*"
echo "Expected 4 or 5 parameters for chaincode invoke, but got: $*"
echo "Usage: fablo chaincode invoke <peer_domains_comma_separated> <channel_name> <chaincode_name> <command> [transient]"
exit 1
fi
Expand Down
Loading
Loading