plantroon/acme.sh
1
0
Fork 0
mirror of https://github.com/plantroon/acme.sh.git synced 2024-12-25 22:51:39 +00:00
Code Issues Projects Releases Wiki Activity

Fixed shfmt (dns_gcloud)

Browse Source
This commit is contained in:
Janos Lenart 2018-05-25 19:22:40 +01:00
parent 0a3ac1f5c3
commit 167758003c
1 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
dnsapi/dns_gcloud.sh
View File

@ -18,7 +18,7 @@ dns_gcloud_add() {
_dns_gcloud_start_tr || return $? _dns_gcloud_start_tr || return $?
_dns_gcloud_get_rrdatas || return $? _dns_gcloud_get_rrdatas || return $?
echo "$rrdatas" | _dns_gcloud_remove_rrs || return $? echo "$rrdatas" | _dns_gcloud_remove_rrs || return $?
echo -e "$rrdatas\n\"$txtvalue\"" | grep -v '^$' | _dns_gcloud_add_rrs || return $? printf "%s\n%s\n" "$rrdatas" "\"$txtvalue\"" | grep -v '^$' | _dns_gcloud_add_rrs || return $?
_dns_gcloud_execute_tr || return $? _dns_gcloud_execute_tr || return $?
_info "$fulldomain record added" _info "$fulldomain record added"
@ -39,7 +39,7 @@ dns_gcloud_rm() {
_dns_gcloud_start_tr || return $? _dns_gcloud_start_tr || return $?
_dns_gcloud_get_rrdatas || return $? _dns_gcloud_get_rrdatas || return $?
echo "$rrdatas" | _dns_gcloud_remove_rrs || return $? echo "$rrdatas" | _dns_gcloud_remove_rrs || return $?
echo "$rrdatas" | fgrep -v "\"$txtvalue\"" | _dns_gcloud_add_rrs || return $? echo "$rrdatas" | grep -F -v "\"$txtvalue\"" | _dns_gcloud_add_rrs || return $?
_dns_gcloud_execute_tr || return $? _dns_gcloud_execute_tr || return $?
_info "$fulldomain record added" _info "$fulldomain record added"
@ -48,7 +48,7 @@ dns_gcloud_rm() {
#################### Private functions below ################################## #################### Private functions below ##################################
_dns_gcloud_start_tr() { _dns_gcloud_start_tr() {
if ! trd=`mktemp -d`; then if ! trd=$(mktemp -d); then
_err "_dns_gcloud_start_tr: failed to create temporary directory" _err "_dns_gcloud_start_tr: failed to create temporary directory"
return 1 return 1
fi fi
@ -56,8 +56,8 @@ _dns_gcloud_start_tr() {
_debug tr "$tr" _debug tr "$tr"
if ! gcloud dns record-sets transaction start \ if ! gcloud dns record-sets transaction start \
--transaction-file="$tr" \ --transaction-file="$tr" \
--zone="$managedZone"; then --zone="$managedZone"; then
rm -r "$trd" rm -r "$trd"
_err "_dns_gcloud_start_tr: failed to execute transaction" _err "_dns_gcloud_start_tr: failed to execute transaction"
return 1 return 1
@ -66,22 +66,22 @@ _dns_gcloud_start_tr() {
_dns_gcloud_execute_tr() { _dns_gcloud_execute_tr() {
if ! gcloud dns record-sets transaction execute \ if ! gcloud dns record-sets transaction execute \
--transaction-file="$tr" \ --transaction-file="$tr" \
--zone="$managedZone"; then --zone="$managedZone"; then
_debug tr "`cat \"$tr\"`" _debug tr "$(cat "$tr")"
rm -r "$trd" rm -r "$trd"
_err "_dns_gcloud_execute_tr: failed to execute transaction" _err "_dns_gcloud_execute_tr: failed to execute transaction"
return 1 return 1
fi fi
rm -r "$trd" rm -r "$trd"
for i in `seq 1 120`; do for i in $(seq 1 120); do
if gcloud dns record-sets changes list \ if gcloud dns record-sets changes list \
--zone=lenart \ --zone=lenart \
--filter='status != done' \ --filter='status != done' \
| grep -q '.*'; then | grep -q '^.*'; then
_info "_dns_gcloud_execute_tr: waiting for transaction to be comitted ..." _info "_dns_gcloud_execute_tr: waiting for transaction to be comitted ($i/120)..."
sleep 5 sleep 5
else else
return 0 return 0
fi fi
@ -94,12 +94,12 @@ _dns_gcloud_execute_tr() {
_dns_gcloud_remove_rrs() { _dns_gcloud_remove_rrs() {
if ! xargs --no-run-if-empty gcloud dns record-sets transaction remove \ if ! xargs --no-run-if-empty gcloud dns record-sets transaction remove \
--name="$fulldomain." \ --name="$fulldomain." \
--ttl="$ttl" \ --ttl="$ttl" \
--type=TXT \ --type=TXT \
--zone="$managedZone" \ --zone="$managedZone" \
--transaction-file="$tr"; then --transaction-file="$tr"; then
_debug tr "`cat \"$tr\"`" _debug tr "$(cat "$tr")"
rm -r "$trd" rm -r "$trd"
_err "_dns_gcloud_remove_rrs: failed to remove RRs" _err "_dns_gcloud_remove_rrs: failed to remove RRs"
return 1 return 1
@ -109,12 +109,12 @@ _dns_gcloud_remove_rrs() {
_dns_gcloud_add_rrs() { _dns_gcloud_add_rrs() {
ttl=60 ttl=60
if ! xargs --no-run-if-empty gcloud dns record-sets transaction add \ if ! xargs --no-run-if-empty gcloud dns record-sets transaction add \
--name="$fulldomain." \ --name="$fulldomain." \
--ttl="$ttl" \ --ttl="$ttl" \
--type=TXT \ --type=TXT \
--zone="$managedZone" \ --zone="$managedZone" \
--transaction-file="$tr"; then --transaction-file="$tr"; then
_debug tr "`cat \"$tr\"`" _debug tr "$(cat "$tr")"
rm -r "$trd" rm -r "$trd"
_err "_dns_gcloud_add_rrs: failed to add RRs" _err "_dns_gcloud_add_rrs: failed to add RRs"
return 1 return 1
@ -129,19 +129,19 @@ _dns_gcloud_find_zone() {
filter="dnsName=( " filter="dnsName=( "
while [ "$part" != "" ]; do while [ "$part" != "" ]; do
filter="$filter$part. " filter="$filter$part. "
part="`echo \"$part\" | sed 's/[^.]*\.*//'`" part="$(echo "$part" | sed 's/[^.]*\.*//')"
done done
filter="$filter)" filter="$filter)"
_debug filter "$filter" _debug filter "$filter"
# List domains and find the longest match (in case of some levels of delegation) # List domains and find the longest match (in case of some levels of delegation)
if ! match=$(gcloud dns managed-zones list \ if ! match=$(gcloud dns managed-zones list \
--format="value(name, dnsName)" \ --format="value(name, dnsName)" \
--filter="$filter" \ --filter="$filter" \
| while read dnsName name; do | while read -r dnsName name; do
echo -e "${#dnsName}\t$dnsName\t$name" printf "%s\t%s\t%s\n" "${#dnsName}" "$dnsName" "$name"
done \ done \
| sort -n -r | head -n1 | cut -f2,3 | grep '.*'); then | sort -n -r | head -n1 | cut -f2,3 | grep '^.*'); then
_err "_dns_gcloud_find_zone: Can't find a matching managed zone! Perhaps wrong project or gcloud credentials?" _err "_dns_gcloud_find_zone: Can't find a matching managed zone! Perhaps wrong project or gcloud credentials?"
return 1 return 1
fi fi
@ -154,10 +154,10 @@ _dns_gcloud_find_zone() {
_dns_gcloud_get_rrdatas() { _dns_gcloud_get_rrdatas() {
if ! rrdatas=$(gcloud dns record-sets list \ if ! rrdatas=$(gcloud dns record-sets list \
--zone="$managedZone" \ --zone="$managedZone" \
--name="$fulldomain." \ --name="$fulldomain." \
--type=TXT \ --type=TXT \
--format="value(ttl,rrdatas)"); then --format="value(ttl,rrdatas)"); then
_err "_dns_gcloud_get_rrdatas: Failed to list record-sets" _err "_dns_gcloud_get_rrdatas: Failed to list record-sets"
rm -r "$trd" rm -r "$trd"
return 1 return 1