ervin/acme.sh
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change against shellcheck

Browse Source
This commit is contained in:
xxxinliActive 2021-08-08 17:20:07 +08:00
parent 7060031b4b
commit cce4d3b551
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
dnsapi/dns_azure.sh
View File

@ -13,8 +13,7 @@ dns_azure_add() {
fulldomain=$1 fulldomain=$1
txtvalue=$2 txtvalue=$2
_azure_env_get_and_validate if ! _azure_env_get_and_validate; then
if [ $? -ne 0 ]; then
_debug "The service principle environment is not properly set, please check the error details" _debug "The service principle environment is not properly set, please check the error details"
return 1 return 1
fi fi
@ -75,14 +74,12 @@ dns_azure_rm() {
fulldomain=$1 fulldomain=$1
txtvalue=$2 txtvalue=$2
_azure_service_principle_env_get_and_validate if ! _azure_env_get_and_validate; then
ret = $?
if [ $ret -ne 0 ]; then
_debug "The service principle environment is not properly set, please check the error details" _debug "The service principle environment is not properly set, please check the error details"
return ret return 1
fi fi
accesstoken=$(_azure_service_principle_token "$AZUREDNS_TENANTID" "$AZUREDNS_APPID" "$AZUREDNS_CLIENTSECRET") accesstoken=$(_azure_get_access_token)
if ! _get_root "$fulldomain" "$AZUREDNS_SUBSCRIPTIONID" "$accesstoken"; then if ! _get_root "$fulldomain" "$AZUREDNS_SUBSCRIPTIONID" "$accesstoken"; then
_err "invalid domain" _err "invalid domain"
@ -136,7 +133,7 @@ _azure_env_get_and_validate() {
AZUREDNS_USEMSI="${AZUREDNS_USEMSI:-$(_readaccountconf_mutable AZUREDNS_USEMSI)}" AZUREDNS_USEMSI="${AZUREDNS_USEMSI:-$(_readaccountconf_mutable AZUREDNS_USEMSI)}"
# Azure resources which has managed identity could detect and acquire client id automatically by default. # Azure resources which has managed identity could detect and acquire client id automatically by default.
# We skip check the environment variables for this case # We skip check the environment variables for this case
if [ "$AZUREDNS_USEMSI" == "true" ]; then if [ "$AZUREDNS_USEMSI" = "true" ]; then
_azure_msi_env_get_and_validate _azure_msi_env_get_and_validate
return 0 return 0
fi fi
@ -265,8 +262,8 @@ _azure_rest() {
} }
_azure_get_access_token() { _azure_get_access_token() {
if [ $AZUREDNS_USEMSI == "true" ]; then if [ "$AZUREDNS_USEMSI" = "true" ]; then
_azure_msi_token $AZUREDNS_MSIOBJECTID _azure_msi_token "$AZUREDNS_MSIOBJECTID"
return 0 return 0
fi fi
@ -275,8 +272,8 @@ _azure_get_access_token() {
_azure_msi_token() { _azure_msi_token() {
objectId=$1 objectId=$1
local url="" url=""
if [ -z $objectId ]; then if [ -z "$objectId" ]; then
url="http://169.254.169.254/metadata/identity/oauth2/token?api-version=2018-02-01&resource=https%3A%2F%2Fmanagement.azure.com%2F" url="http://169.254.169.254/metadata/identity/oauth2/token?api-version=2018-02-01&resource=https%3A%2F%2Fmanagement.azure.com%2F"
else else
url="http://169.254.169.254/metadata/identity/oauth2/token?api-version=2018-02-01&resource=https%3A%2F%2Fmanagement.azure.com%2F&object_id=$objectId" url="http://169.254.169.254/metadata/identity/oauth2/token?api-version=2018-02-01&resource=https%3A%2F%2Fmanagement.azure.com%2F&object_id=$objectId"