add targets support for EU and CA apis

.gitignore

@@ -1,5 +1,5 @@
-.ovhApplication
+.ovhApplication*
-.ovhConsumerKey
+.ovhConsumerKey*
 libs/
 
 

ovh-api-bash-client.sh

@@ -9,23 +9,60 @@ CONSUMER_KEY_FILE=".ovhConsumerKey"
 OVH_APPLICATION_FILE=".ovhApplication"
 LIBS="libs"
 
-API_URL="https://api.ovh.com/1.0"
+TARGETS=(CA EU)
-API_CREAT_APP_URL="https://api.ovh.com/createApp/"
+
+declare -A API_URLS
+API_URLS[CA]="https://ca.api.ovh.com/1.0"
+API_URLS[EU]="https://api.ovh.com/1.0"
+
+declare -A API_CREATE_APP_URLS
+API_CREATE_APP_URLS[CA]="https://ca.api.ovh.com/createApp/"
+API_CREATE_APP_URLS[EU]="https://api.ovh.com/createApp/"
 CURRENT_PATH="$(pwd)"
 
 
 # THESE VARS WILL BE USED LATER
 METHOD="GET"
 URL="/me"
+TARGET="EU"
 TIME=""
 SIGDATA=""
 POST_DATA=""
 
 
+isTargetValid()
+{
+    VALID=0
+    for i in ${TARGETS[@]}
+    do
+        if [ $i == "$TARGET" ]
+        then
+            VALID=1
+        fi
+    done
+
+    if [ $VALID -eq 0 ]
+    then
+        echo "then"
+        echo "Error: $TARGET is not a valid target, accepted values are: ${TARGETS[@]}"
+        echo
+        help
+        exit 1
+    fi
+}
 
 createApp()
 {
-    echo -e "In order to create an API Application, please visit the link below:\n$API_CREAT_APP_URL"
+    echo "For which OVH API do you want to create a new API Application? (EU/CA)"
+    while [ -z "$NEXT" ]
+    do
+        read NEXT
+    done
+    TARGET=$( echo $NEXT | tr [:lower:] [:upper:] )
+    isTargetValid
+
+    echo
+    echo -e "In order to create an API Application, please visit the link below:\n${API_CREATE_APP_URLS[$TARGET]}"
     echo
     echo "Once your application is created, we will configure this script for this application"
     echo -n "Enter the Application Key: "
@@ -33,8 +70,8 @@ createApp()
     echo -n "Enter the Application Secret: "
     read OVH_APP_SECRET
     echo "OK!"
-    echo "These informations will be stored in the following file: $CURRENT_PATH/$OVH_APPLICATION_FILE"
+    echo "These informations will be stored in the following file: $CURRENT_PATH/${OVH_APPLICATION_FILE}_${TARGET}"
-    echo -e "${OVH_APP_KEY}\n${OVH_APP_SECRET}" > $CURRENT_PATH/$OVH_APPLICATION_FILE
+    echo -e "${OVH_APP_KEY}\n${OVH_APP_SECRET}" > $CURRENT_PATH/${OVH_APPLICATION_FILE}_${TARGET}
 
     echo
     echo "Do you also need to create a consumer key? (y/n)"
@@ -55,26 +92,26 @@ createConsumerKey()
     POST_DATA='{ "accessRules": [ { "method": "GET", "path": "/*"}, { "method": "PUT", "path": "/*"}, { "method": "POST", "path": "/*"}, { "method": "DELETE", "path": "/*"} ] }'
 
     ANSWER=$(requestNoAuth)
-    getJSONFieldString "$ANSWER" 'consumerKey' > $CURRENT_PATH/$CONSUMER_KEY_FILE
+    getJSONFieldString "$ANSWER" 'consumerKey' > $CURRENT_PATH/${CONSUMER_KEY_FILE}_${TARGET}
     echo -e "In order to validate the generated consumerKey, visit the validation url at:\n$(getJSONFieldString "$ANSWER" 'validationUrl')"
 }
 
 initConsumerKey()
 {
-    cat $CURRENT_PATH/$CONSUMER_KEY_FILE &> /dev/null
+    cat $CURRENT_PATH/${CONSUMER_KEY_FILE}_${TARGET} &> /dev/null
     if [ $? -eq 0 ]
     then
-        OVH_CONSUMER_KEY="$(cat $CURRENT_PATH/$CONSUMER_KEY_FILE)"
+        OVH_CONSUMER_KEY="$(cat $CURRENT_PATH/${CONSUMER_KEY_FILE}_${TARGET})"
     fi
 }
 
 initApplication()
 {
-    cat $CURRENT_PATH/$OVH_APPLICATION_FILE &> /dev/null
+    cat $CURRENT_PATH/${OVH_APPLICATION_FILE}_${TARGET} &> /dev/null
     if [ $? -eq 0 ]
     then
-        OVH_APP_KEY=$(sed -n 1p $CURRENT_PATH/$OVH_APPLICATION_FILE)
+        OVH_APP_KEY=$(sed -n 1p $CURRENT_PATH/${OVH_APPLICATION_FILE}_${TARGET})
-        OVH_APP_SECRET=$(sed -n 2p $CURRENT_PATH/$OVH_APPLICATION_FILE)
+        OVH_APP_SECRET=$(sed -n 2p $CURRENT_PATH/${OVH_APPLICATION_FILE}_${TARGET})
     fi
 }
 
@@ -85,7 +122,7 @@ updateTime()
 
 updateSignData()
 {
-    SIGDATA="$OVH_APP_SECRET+$OVH_CONSUMER_KEY+$1+${API_URL}$2+$3+$TIME"
+    SIGDATA="$OVH_APP_SECRET+$OVH_CONSUMER_KEY+$1+${API_URLS[$TARGET]}$2+$3+$TIME"
     SIG='$1$'$(echo -n $SIGDATA | sha1sum - | cut -d' ' -f1)
 }
 
@@ -96,6 +133,7 @@ help()
     echo "  --url <url>         : the API URL to call, for example /domains (default is /me)"
     echo "  --method <method>   : the HTTP method to use, for example POST (default is GET)"
     echo "  --data <JSON data>  : the data body to send with the request"
+    echo "  --target <EU|CA>    : the target API (default is EU)"
     echo "  --init              : to initialize the consumer key"
     echo "  --initApp           : to initialize the API application"
     echo
@@ -127,6 +165,11 @@ parseArguments()
             shift
             URL=$1
             ;;
+        --target)
+            shift
+            TARGET=$1
+            isTargetValid
+            ;;
         *)
             echo "Unknow parameter $1"
             help
@@ -141,7 +184,7 @@ parseArguments()
 requestNoAuth()
 {
     updateTime
-    curl -s -X $METHOD --header 'Content-Type:application/json;charset=utf-8' --header "X-Ovh-Application:$OVH_APP_KEY" --header "X-Ovh-Timestamp:$TIME" --data "$POST_DATA" ${API_URL}$URL
+    curl -s -X $METHOD --header 'Content-Type:application/json;charset=utf-8' --header "X-Ovh-Application:$OVH_APP_KEY" --header "X-Ovh-Timestamp:$TIME" --data "$POST_DATA" ${API_URLS[$TARGET]}$URL
 }
 
 request()
@@ -149,7 +192,7 @@ request()
     updateTime
     updateSignData "$METHOD" "$URL" "$POST_DATA"
     
-    RESPONSE=$(curl -s -w "\n%{http_code}\n" -X $METHOD --header 'Content-Type:application/json;charset=utf-8' --header "X-Ovh-Application:$OVH_APP_KEY" --header "X-Ovh-Timestamp:$TIME" --header "X-Ovh-Signature:$SIG" --header "X-Ovh-Consumer:$OVH_CONSUMER_KEY" --data "$POST_DATA" ${API_URL}$URL)
+    RESPONSE=$(curl -s -w "\n%{http_code}\n" -X $METHOD --header 'Content-Type:application/json;charset=utf-8' --header "X-Ovh-Application:$OVH_APP_KEY" --header "X-Ovh-Timestamp:$TIME" --header "X-Ovh-Signature:$SIG" --header "X-Ovh-Consumer:$OVH_CONSUMER_KEY" --data "$POST_DATA" ${API_URLS[$TARGET]}$URL)
     RESPONSE_STATUS=$(echo "$RESPONSE" | sed -n '$p')
     RESPONSE_CONTENT=$(echo "$RESPONSE" | sed '$d')
     echo "$RESPONSE_STATUS $RESPONSE_CONTENT"
@@ -172,10 +215,10 @@ main()
     
     if [ -z $OVH_APP_KEY ] && [ -z $OVH_APP_SECRET ]
     then
-        echo -e "No application is defined, please call to initialize it:\n$0 --initApp"
+        echo -e "No application is defined for target $TARGET, please call to initialize it:\n$0 --initApp"
     elif [ -z $OVH_CONSUMER_KEY ]
     then
-        echo -e "No consumer key, please call to initialize it:\n$0 --init"
+        echo -e "No consumer key for target $TARGET, please call to initialize it:\n$0 --init"
     else
         request $METHOD $URL
     fi