7x31
/
aliyun-openapi-bash-sdk
mirror of https://github.com/Hill-98/aliyun-openapi-bash-sdk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve error messages

This commit is contained in:
Zhong Lufan 2022-06-20 01:31:45 +08:00
parent 0d06b2ac8b
commit 731434bc05
No known key found for this signature in database
GPG Key ID: BE2B3A1E76AD7D04
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
AliyunOpenApiSDK.sh
View File

@ -16,7 +16,7 @@ aliapi_rpc() {
fi fi
if [[ $# -lt 4 ]];then if [[ $# -lt 4 ]];then
echo "Aliyun OpenAPI SDK: aliapi_rpc() not enough parameters" >&2 echo "aliapi_rpc: not enough parameters" >&2
return 2 return 2
fi fi
@ -45,14 +45,14 @@ aliapi_rpc() {
case $1 in case $1 in
--*) --*)
if [[ $# -le 1 ]]; then if [[ $# -le 1 ]]; then
echo "Aliyun OpenAPI SDK: aliapi_rpc() '$1' has no value" >&2 echo "aliapi_rpc: '$1' has no value" >&2
return 2 return 2
fi fi
_api_params[${1:2}]="$2" _api_params[${1:2}]="$2"
shift 2 shift 2
;; ;;
*) *)
echo "Aliyun OpenAPI SDK: aliapi_rpc() Unknown parameter: $1" >&2 echo "aliapi_rpc: '$1' is unknown parameter" >&2
return 2 return 2
;; ;;
esac esac
@ -63,7 +63,7 @@ aliapi_rpc() {
for _key in "${!_api_params[@]}"; do for _key in "${!_api_params[@]}"; do
_value=${_api_params[$_key]} _value=${_api_params[$_key]}
# 参数值如果是以 () 结束，代表需要执行函数获取值，如果函数不存在，使用原始值。 # 参数值如果是以 () 结束，代表需要执行函数获取值，如果函数不存在，使用原始值。
[[ ($_value =~ .+\(\)$ && $(type -t "${_value:0:-2}") == "function") ]] && _value=$(${_value:0:-2}) [[ $_value =~ .+\(\)$ && $(type -t "${_value:0:-2}") == "function" ]] && _value=$(${_value:0:-2})
_value=$(_aliapi_urlencode "$_value") _value=$(_aliapi_urlencode "$_value")
_query_str+="$_key=$_value&" _query_str+="$_key=$_value&"
done done

8
test.bats.sh
View File

@ -46,7 +46,7 @@ test_urlencode() { #@test
[[ $output == "new%0Aline%0Atest" ]] [[ $output == "new%0Aline%0Atest" ]]
} }
test_api_rpc() { #@test test_rpc_api() { #@test
if [[ ! -v AliAccessKeyId || ! -v AliAccessKeySecret ]]; then if [[ ! -v AliAccessKeyId || ! -v AliAccessKeySecret ]]; then
skip "'AliAccessKeyId' or 'AliAccessKeySecret' environment variable not found" skip "'AliAccessKeyId' or 'AliAccessKeySecret' environment variable not found"
fi fi
@ -62,15 +62,15 @@ test_api_rpc() { #@test
run aliapi_rpc GET api.test 0 run aliapi_rpc GET api.test 0
[[ $status -eq 2 ]] [[ $status -eq 2 ]]
[[ $output == "Aliyun OpenAPI SDK: aliapi_rpc() not enough parameters" ]] [[ $output == "aliapi_rpc: not enough parameters" ]]
run aliapi_rpc GET api.test 0 api unknown run aliapi_rpc GET api.test 0 api unknown
[[ $status -eq 2 ]] [[ $status -eq 2 ]]
[[ $output == "Aliyun OpenAPI SDK: aliapi_rpc() Unknown parameter: unknown" ]] [[ $output == "aliapi_rpc: 'unknown' is unknown parameter" ]]
run aliapi_rpc GET api.test 0 api --unknown run aliapi_rpc GET api.test 0 api --unknown
[[ $status -eq 2 ]] [[ $status -eq 2 ]]
[[ $output == "Aliyun OpenAPI SDK: aliapi_rpc() '--unknown' has no value" ]] [[ $output == "aliapi_rpc: '--unknown' has no value" ]]
run aliapi_rpc GET sts.aliyuncs.com 2015-04-01 GetCallerIdentity run aliapi_rpc GET sts.aliyuncs.com 2015-04-01 GetCallerIdentity
[[ $status -eq 0 ]] [[ $status -eq 0 ]]