yacloud/acme.sh
1
0
Fork 0
mirror of https://github.com/acmesh-official/acme.sh.git synced 2025-05-05 23:34:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update logging to be be more verbose

Browse Source
This commit is contained in:
Alex Cazacu 2021-06-02 15:00:55 +02:00
parent e32bdd054a
commit af9e830289
No known key found for this signature in database
GPG Key ID: ACFF0A10AFC48850
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dnsapi/dns_gcloud.sh
View File

@ -67,24 +67,22 @@ _dns_gcloud_authenticate() {
return 0 return 0
fi fi
_debug "_dns_gcloud_authenticate: attempting to authenticate using service account key" _debug "_dns_gcloud_authenticate: unauthenticated"
_debug "_dns_gcloud_authenticate: authenticating using service account key"
GCLOUD_Service_Account_Key="${GCLOUD_Service_Account_Key:-$(_readaccountconf_mutable GCLOUD_Service_Account_Key)}" GCLOUD_Service_Account_Key="${GCLOUD_Service_Account_Key:-$(_readaccountconf_mutable GCLOUD_Service_Account_Key)}"
GCLOUD_Project_ID="${GCLOUD_Project_ID:-$(_readaccountconf_mutable GCLOUD_Project_ID)}" GCLOUD_Project_ID="${GCLOUD_Project_ID:-$(_readaccountconf_mutable GCLOUD_Project_ID)}"
if [ -z "$GCLOUD_Service_Account_Key" ]; then if [ -z "$GCLOUD_Service_Account_Key" ] || [ -z "$GCLOUD_Project_ID" ]; then
GCLOUD_Service_Account_Key="" GCLOUD_Service_Account_Key=""
GCLOUD_Project_ID="" GCLOUD_Project_ID=""
_err "_dns_gcloud_authenticate: missing Google Cloud service account key" _err "_dns_gcloud_authenticate: missing Google Cloud service account key and or project ID"
return 1 return 1
fi fi
if [ -z "$GCLOUD_Project_ID" ]; then #save the service account api key and project ID to the account conf file.
GCLOUD_Service_Account_Key="" _saveaccountconf_mutable GCLOUD_Service_Account_Key "$GCLOUD_Service_Account_Key"
GCLOUD_Project_ID="" _saveaccountconf_mutable GCLOUD_Project_ID "$GCLOUD_Project_ID"
_err "_dns_gcloud_authenticate: missing Google Cloud project ID"
return 1
fi
if ! echo "$GCLOUD_Service_Account_Key" | gcloud auth activate-service-account --key-file -; then if ! echo "$GCLOUD_Service_Account_Key" | gcloud auth activate-service-account --key-file -; then
_err "_dns_gcloud_authenticate: failed to authenticate with service account key" _err "_dns_gcloud_authenticate: failed to authenticate with service account key"
@ -96,10 +94,6 @@ _dns_gcloud_authenticate() {
gcloud config set project "$GCLOUD_Project_ID" gcloud config set project "$GCLOUD_Project_ID"
_info "_dns_gcloud_authenticate: configured gcloud project" _info "_dns_gcloud_authenticate: configured gcloud project"
#save the service account api key and project ID to the account conf file.
_saveaccountconf_mutable GCLOUD_Service_Account_Key "$GCLOUD_Service_Account_Key"
_saveaccountconf_mutable GCLOUD_Project_ID "$GCLOUD_Project_ID"
} }
_dns_gcloud_start_tr() { _dns_gcloud_start_tr() {