dns_huaweicloud.sh minor bug fixes
1. Match zone name in response in case multiple items return. 2. Use string '"id"' (single quotation marks added) to check if zone/record exist in _get_zoneid() & _get_recordset_id(). Fix domain can't contain string "id".
This commit is contained in:
parent
188274277a
commit
3de712a7b0
@ -129,14 +129,27 @@ _get_zoneid() {
|
||||
fi
|
||||
_debug "$h"
|
||||
response=$(_get "${dns_api}/v2/zones?name=${h}")
|
||||
|
||||
if _contains "${response}" "id"; then
|
||||
_debug "Get Zone ID Success."
|
||||
_zoneid=$(echo "${response}" | _egrep_o "\"id\": *\"[^\"]*\"" | cut -d : -f 2 | tr -d \" | tr -d " ")
|
||||
printf "%s" "${_zoneid}"
|
||||
return 0
|
||||
_debug "$response"
|
||||
if _contains "${response}" '"id"'; then
|
||||
zoneidlist=$(echo "${response}" | _egrep_o "\"id\": *\"[^\"]*\"" | cut -d : -f 2 | tr -d \" | tr -d " ")
|
||||
zonenamelist=$(echo "${response}" | _egrep_o "\"name\": *\"[^\"]*\"" | cut -d : -f 2 | tr -d \" | tr -d " ")
|
||||
_debug "Return Zone ID(s):"
|
||||
_debug "${zoneidlist}"
|
||||
_debug "Return Zone Name(s):"
|
||||
_debug "${zonenamelist}"
|
||||
zoneidnum=0
|
||||
while read -r zonename; do
|
||||
let zoneidnum++
|
||||
_debug "Check Zone Name $zonename"
|
||||
if [[ $zonename == $h. ]]; then
|
||||
_debug "Get Zone ID Success."
|
||||
_zoneid=$(echo "${zoneidlist}" | sed -n $zoneidnum"p")
|
||||
_debug "ZoneID:"$_zoneid
|
||||
printf "%s" "${_zoneid}"
|
||||
return 0
|
||||
fi
|
||||
done <<< "$zonenamelist"
|
||||
fi
|
||||
|
||||
i=$(_math "$i" + 1)
|
||||
done
|
||||
return 1
|
||||
@ -149,7 +162,7 @@ _get_recordset_id() {
|
||||
export _H1="X-Auth-Token: ${_token}"
|
||||
|
||||
response=$(_get "${dns_api}/v2/zones/${_zoneid}/recordsets?name=${_domain}")
|
||||
if _contains "${response}" "id"; then
|
||||
if _contains "${response}" '"id"'; then
|
||||
_id="$(echo "${response}" | _egrep_o "\"id\": *\"[^\"]*\"" | cut -d : -f 2 | tr -d \" | tr -d " ")"
|
||||
printf "%s" "${_id}"
|
||||
return 0
|
||||
|
||||
Loading…
Reference in New Issue
Block a user