Refactors helper scripts

Author: Yoichi Kawasaki

scripts/docker-run-mini.sh

@@ -9,6 +9,8 @@ expr "$0" : "/.*" > /dev/null || cwd=`(cd "$cwd" && pwd)`
 #############################################################
 DOCKER_ID="<Docker ID>"
 CONTAINER_IMAGE_NAME="<Container Image Name>"
+RESOURCE_GROUP="<RESOURCE GROUP>"
+STORAGE_ACCOUNT_NAME="<STORAGE ACCOUNT NAME>"
 #############################################################
 
 FUNC_PROJECT_DIR="$cwd/../v2functions"
@@ -21,5 +23,4 @@ STORAGE_CONNECTION_STRING=$(az storage account show-connection-string \
 
 docker run -p 8080:80 -it \
   -e AzureWebJobsStorage="$STORAGE_CONNECTION_STRING" \
-  -e MyStorageConnectionString="$STORAGE_CONNECTION_STRING"
   $DOCKER_ID/$CONTAINER_IMAGE_NAME:$TAG

scripts/docker-run.sh

@@ -13,12 +13,11 @@ RESOURCE_GROUP="<RESOURCE GROUPP MAME>"
 REGION="<REGION NAME: eastus>"
 STORAGE_ACCOUNT_NAME="<STORAGE ACCOUNT NAME>"
 COSMOSDB_ACCOUNT_NAME="<COSMOSDB ACCOUNT NAME>"
-COMPUTER_VSION_API_SUBSCRIPTION="<COMPUTER VISION API SUBSCRIPTION>"
-COMPUTER_VSION_API_ENDPOINT="<COMPUTER VSION API ENDPOINT>"
-## example: COMPUTER_VSION_API_ENDPOINT="https://westus.api.cognitive.microsoft.com/"
+COGNITIVE_ACCOUNT_NAME="<COGNITIVE ACCOUNT NAME>"
+COGNITIVE_RESOURCE_GROUP="<COGNITIVE RESOURCE GROUP>"
 #############################################################
 
-FUNC_PROJECT_DIR="$cwd/../v2functions.working"
+FUNC_PROJECT_DIR="$cwd/../v2functions"
 
 TAG=`cat $FUNC_PROJECT_DIR/VERSION`
 
@@ -29,6 +28,13 @@ COSMOSDB_CONNECTION_STRING=$(az cosmosdb list-connection-strings \
 --resource-group $RESOURCE_GROUP --name $COSMOSDB_ACCOUNT_NAME \
 --query connectionStrings --output tsv | head -1 |  awk '{print $1}')
 
+COMPUTER_VSION_API_ENDPOINT=$(az cognitiveservices account show \
+-n $COGNITIVE_ACCOUNT_NAME -g $COGNITIVE_RESOURCE_GROUP --output tsv |awk '{print $1}')
+
+COMPUTER_VSION_API_SUBSCRIPTION=$(az cognitiveservices account keys list \
+-n $COGNITIVE_ACCOUNT_NAME -g $COGNITIVE_RESOURCE_GROUP --output tsv |awk '{print $1}')
+
+
 docker run -p 8080:80 -it \
   -e AzureWebJobsStorage="$STORAGE_CONNECTION_STRING" \
   -e MyStorageConnectionString="$STORAGE_CONNECTION_STRING" \

scripts/update-azfunc-app-settings.sh

@@ -2,18 +2,26 @@
 set -e -x
 
 RESOURCE_GROUP="<RESOURCE GROUPP MAME>"
-APP_NAME="<FUNCTION APP NAME>" #  the name needs to be unique across all apps in Azure.
+APP_NAME="<FUNCTION APP NAME>" 
 STORAGE_ACCOUNT_NAME="<STORAGE ACCOUNT NAME>"
 COSMOSDB_ACCOUNT_NAME="<COSMOSDB ACCOUNT NAME>"
 COGNITIVE_ACCOUNT_NAME="<COGNITIVE ACCOUNT NAME>"
 COGNITIVE_RESOURCE_GROUP="<COGNITIVE RESOURCE GROUP>"
 
-STORAGE_ACCOUNT_KEY=$(az storage account keys list --account-name $STORAGE_ACCOUNT_NAME --resource-group $RESOURCE_GROUP --output tsv |head -1 | awk '{print $3}')
-COSMOSDB_ACCOUNT_KEY=$(az cosmosdb list-keys --name $COSMOSDB_ACCOUNT_NAME --resource-group $RESOURCE_GROUP --output tsv |awk '{print $1}')
-MY_STORAGE_CONNECTION="DefaultEndpointsProtocol=https;AccountName=$STORAGE_ACCOUNT_NAME;AccountKey=$STORAGE_ACCOUNT_KEY;EndpointSuffix=core.windows.net"
-MY_COSMOS_DB_CONNECTION="AccountEndpoint=https://$COSMOSDB_ACCOUNT_NAME.documents.azure.com:443/;AccountKey=$COSMOSDB_ACCOUNT_KEY;"
-MY_COMPUTER_VISION_ENDPOINT=$(az cognitiveservices account show -n $COGNITIVE_ACCOUNT_NAME -g $COGNITIVE_RESOURCE_GROUP --output tsv |awk '{print $1}')
-MY_COMPUTER_VISION_APIKEY=$(az cognitiveservices account keys list -n $COGNITIVE_ACCOUNT_NAME -g $COGNITIVE_RESOURCE_GROUP --output tsv |awk '{print $1}')
+
+STORAGE_CONNECTION_STRING=$(az storage account show-connection-string \
+--resource-group $RESOURCE_GROUP --name $STORAGE_ACCOUNT_NAME \
+--query connectionString --output tsv)
+
+COSMOSDB_CONNECTION_STRING=$(az cosmosdb list-connection-strings \
+--resource-group $RESOURCE_GROUP --name $COSMOSDB_ACCOUNT_NAME \
+--query connectionStrings --output tsv | head -1 |  awk '{print $1}')
+
+COMPUTER_VSION_API_ENDPOINT=$(az cognitiveservices account show \
+-n $COGNITIVE_ACCOUNT_NAME -g $COGNITIVE_RESOURCE_GROUP --output tsv |awk '{print $1}')
+
+COMPUTER_VSION_API_SUBSCRIPTION=$(az cognitiveservices account keys list \
+-n $COGNITIVE_ACCOUNT_NAME -g $COGNITIVE_RESOURCE_GROUP --output tsv |awk '{print $1}')
 
 az webapp config appsettings set \
   -n $APP_NAME \