From ad2f868da5c7f64707d5f4b12732a6e5366f36c4 Mon Sep 17 00:00:00 2001
From: Sayantan Saha <saysa@microsoft.com>
Date: Mon, 20 Nov 2017 17:48:37 +0530
Subject: [PATCH 1/2] Updating upgrade scripts to follow changed sfctl upgrade
 norm

---
 Actors/ActorCounter/Scripts/upgrade.sh               |  8 +++++++-
 Actors/VisualObjectActor/Scripts/upgrade.sh          | 11 ++++++++---
 Services/EchoServer/EchoServer1.0/Scripts/upgrade.sh | 12 +++++++++---
 Services/EchoServer/EchoServer2.0/Scripts/upgrade.sh | 12 +++++++++---
 Services/Gateway/Scripts/upgrade.sh                  | 12 +++++++++---
 Services/JenkinsDocker/Scripts/upgrade.sh            |  8 +++++++-
 Services/WatchDog/Scripts/upgrade.sh                 | 11 ++++++++---
 7 files changed, 57 insertions(+), 17 deletions(-)
 mode change 100644 => 100755 Actors/ActorCounter/Scripts/upgrade.sh
 mode change 100644 => 100755 Actors/VisualObjectActor/Scripts/upgrade.sh
 mode change 100644 => 100755 Services/EchoServer/EchoServer1.0/Scripts/upgrade.sh
 mode change 100644 => 100755 Services/EchoServer/EchoServer2.0/Scripts/upgrade.sh
 mode change 100644 => 100755 Services/Gateway/Scripts/upgrade.sh
 mode change 100644 => 100755 Services/JenkinsDocker/Scripts/upgrade.sh
 mode change 100644 => 100755 Services/WatchDog/Scripts/upgrade.sh

diff --git a/Actors/ActorCounter/Scripts/upgrade.sh b/Actors/ActorCounter/Scripts/upgrade.sh
old mode 100644
new mode 100755
index 7369219..39d11b3
--- a/Actors/ActorCounter/Scripts/upgrade.sh
+++ b/Actors/ActorCounter/Scripts/upgrade.sh
@@ -4,6 +4,12 @@ set -x
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 appPkg="$DIR/../CounterActorApplication"
 
+if [[ "$#" != "0" ]];then
+        version="$1"
+else
+        version="1.0.0"
+fi
+
 sfctl application upload --path $appPkg --show-progress
 if [ $? -ne 0 ]; then
     echo "Application copy failed."
@@ -17,7 +23,7 @@ if [ $? -ne 0 ]; then
 fi
 
 version=$(sed -e "s/xmlns/ignore/" $appPkg/ApplicationManifest.xml | xmllint --xpath "string(//ApplicationManifest/@ApplicationTypeVersion)" -)
-eval sfctl application upgrade --app-id CounterActorApplication --app-version ${version} --parameters "" --mode "Monitored"
+eval sfctl application upgrade --app-id fabric:/CounterActorApplication --app-version ${version} --parameters [] --mode "Monitored"
 if [ $? -ne 0 ]; then
     echo "Upgrade of application failed."
     exit 1
diff --git a/Actors/VisualObjectActor/Scripts/upgrade.sh b/Actors/VisualObjectActor/Scripts/upgrade.sh
old mode 100644
new mode 100755
index 060aa06..0aec39c
--- a/Actors/VisualObjectActor/Scripts/upgrade.sh
+++ b/Actors/VisualObjectActor/Scripts/upgrade.sh
@@ -4,6 +4,12 @@ set -x
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 appPkg="$DIR/../VisualObjectApplication"
 
+if [[ "$#" != "0" ]];then
+        version="$1"
+else
+        version="1.0.0"
+fi
+
 sfctl application upload --path $appPkg --show-progress
 if [ $? -ne 0 ]; then
     echo "Application copy failed."
@@ -18,11 +24,10 @@ fi
 
 # Check parameters to see if InstanceCount was previously specified
 params=$(sfctl application info --application-id VisualObjectApplication --query "parameters[].[key, value][]")
-version=$(sed -e "s/xmlns/ignore/" $appPkg/ApplicationManifest.xml | xmllint --xpath "string(//ApplicationManifest/@ApplicationTypeVersion)" -)
 if [[ $params =~ "InstanceCount" ]]; then
-    sfctl application upgrade --app-id VisualObjectApplication --app-version ${version} --parameters "{\"InstanceCount\":\"-1\"}" --mode "Monitored"
+    sfctl application upgrade --app-id fabric:/VisualObjectApplication --app-version ${version} --parameters "{\"InstanceCount\":\"-1\"}" --mode "Monitored"
 else
-    sfctl application upgrade --app-id VisualObjectApplication --app-version ${version} --parameters "" --mode "Monitored"
+    sfctl application upgrade --app-id fabric:/VisualObjectApplication --app-version ${version} --parameters [] --mode "Monitored"
 fi
 if [ $? -ne 0 ]; then
     echo "Upgrade of application failed."
diff --git a/Services/EchoServer/EchoServer1.0/Scripts/upgrade.sh b/Services/EchoServer/EchoServer1.0/Scripts/upgrade.sh
old mode 100644
new mode 100755
index 8acda07..0ead9bb
--- a/Services/EchoServer/EchoServer1.0/Scripts/upgrade.sh
+++ b/Services/EchoServer/EchoServer1.0/Scripts/upgrade.sh
@@ -4,6 +4,12 @@ set -x
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 appPkg="$DIR/../EchoServerApplication"
 
+if [[ "$#" != "0" ]];then
+        version="$1"
+else
+        version="1.0.0"
+fi
+
 sfctl application upload --path $appPkg --show-progress
 if [ $? -ne 0 ]; then
     echo "Application copy failed."
@@ -18,12 +24,12 @@ fi
 
 # Check parameters to see if InstanceCount was previously specified
 params=$(sfctl application info --application-id EchoServerApplication --query "parameters[].[key, value][]")
-version=$(sed -e "s/xmlns/ignore/" $appPkg/ApplicationManifest.xml | xmllint --xpath "string(//ApplicationManifest/@ApplicationTypeVersion)" -)
 if [[ $params =~ "InstanceCount" ]]; then
-    sfctl application upgrade --app-id EchoServerApplication --app-version ${version} --parameters "{\"InstanceCount\":\"-1\"}" --mode "Monitored"
+    sfctl application upgrade --app-id fabric:/EchoServerApplication --app-version ${version} --parameters "{\"InstanceCount\":\"-1\"}" --mode Monitored
 else
-    sfctl application upgrade --app-id EchoServerApplication --app-version ${version} --parameters "" --mode "Monitored"
+    sfctl application upgrade --app-id fabric:/EchoServerApplication --app-version ${version} --parameters [] --mode "Monitored"
 fi
+
 if [ $? -ne 0 ]; then
     echo "Upgrade of application failed."
     exit 1
diff --git a/Services/EchoServer/EchoServer2.0/Scripts/upgrade.sh b/Services/EchoServer/EchoServer2.0/Scripts/upgrade.sh
old mode 100644
new mode 100755
index ecd0e47..6a94d22
--- a/Services/EchoServer/EchoServer2.0/Scripts/upgrade.sh
+++ b/Services/EchoServer/EchoServer2.0/Scripts/upgrade.sh
@@ -4,6 +4,12 @@ set -x
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 appPkg="$DIR/../EchoServerApplication2"
 
+if [[ "$#" != "0" ]];then
+        version="$1"
+else
+        version="1.0.0"
+fi
+
 sfctl application upload --path $appPkg --show-progress
 if [ $? -ne 0 ]; then
     echo "Application copy failed."
@@ -18,12 +24,12 @@ fi
 
 # Check parameters to see if InstanceCount was previously specified
 params=$(sfctl application info --application-id EchoServerApplication --query "parameters[].[key, value][]")
-version=$(sed -e "s/xmlns/ignore/" $appPkg/ApplicationManifest.xml | xmllint --xpath "string(//ApplicationManifest/@ApplicationTypeVersion)" -)
 if [[ $params =~ "InstanceCount" ]]; then
-    sfctl application upgrade --app-id EchoServerApplication --app-version ${version} --parameters "{\"InstanceCount\":\"-1\"}" --mode "Monitored"
+    sfctl application upgrade --app-id fabric:/EchoServerApplication --app-version ${version} --parameters "{\"InstanceCount\":\"-1\"}" --mode "Monitored"
 else
-    sfctl application upgrade --app-id EchoServerApplication --app-version ${version} --parameters "" --mode "Monitored"
+    sfctl application upgrade --app-id fabric:/EchoServerApplication --app-version ${version} --parameters [] --mode "Monitored"
 fi
+
 if [ $? -ne 0 ]; then
     echo "Upgrade of application failed."
     exit 1
diff --git a/Services/Gateway/Scripts/upgrade.sh b/Services/Gateway/Scripts/upgrade.sh
old mode 100644
new mode 100755
index a5f5732..b9d9392
--- a/Services/Gateway/Scripts/upgrade.sh
+++ b/Services/Gateway/Scripts/upgrade.sh
@@ -4,6 +4,12 @@ set -x
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 appPkg="$DIR/../GatewayApplication"
 
+if [[ "$#" != "0" ]];then
+        version="$1"
+else
+        version="1.0.0"
+fi
+
 sfctl application upload --path $appPkg --show-progress
 if [ $? -ne 0 ]; then
     echo "Application copy failed."
@@ -18,12 +24,12 @@ fi
 
 # Check parameters to see if InstanceCount was previously specified
 params=$(sfctl application info --application-id GatewayApplication --query "parameters[].[key, value][]")
-version=$(sed -e "s/xmlns/ignore/" $appPkg/ApplicationManifest.xml | xmllint --xpath "string(//ApplicationManifest/@ApplicationTypeVersion)" -)
 if [[ $params =~ "InstanceCount" ]]; then
-    sfctl application upgrade --app-id GatewayApplication --app-version ${version} --parameters "{\"InstanceCount\":\"-1\"}" --mode "Monitored"
+    sfctl application upgrade --app-id fabric:/GatewayApplication --app-version ${version} --parameters "{\"InstanceCount\":\"-1\"}" --mode "Monitored"
 else
-    sfctl application upgrade --app-id GatewayApplication --app-version ${version} --parameters "" --mode "Monitored"
+    sfctl application upgrade --app-id fabric:/GatewayApplication --app-version ${version} --parameters [] --mode "Monitored"
 fi
+
 if [ $? -ne 0 ]; then
     echo "Upgrade of application failed."
     exit 1
diff --git a/Services/JenkinsDocker/Scripts/upgrade.sh b/Services/JenkinsDocker/Scripts/upgrade.sh
old mode 100644
new mode 100755
index 87db81d..0b52c95
--- a/Services/JenkinsDocker/Scripts/upgrade.sh
+++ b/Services/JenkinsDocker/Scripts/upgrade.sh
@@ -4,6 +4,12 @@ set -x
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 appPkg="$DIR/../JenkinsSF"
 
+if [[ "$#" != "0" ]];then
+        version="$1"
+else
+        version="1.0.0"
+fi
+
 sfctl application upload --path $appPkg --show-progress
 if [ $? -ne 0 ]; then
     echo "Application copy failed."
@@ -17,7 +23,7 @@ if [ $? -ne 0 ]; then
 fi
 
 version=$(sed -e "s/xmlns/ignore/" $appPkg/ApplicationManifest.xml | xmllint --xpath "string(//ApplicationManifest/@ApplicationTypeVersion)" -)
-eval sfctl application upgrade --app-id JenkinsSF --app-version ${version} --parameters "" --mode "Monitored"
+eval sfctl application upgrade --app-id fabric:/JenkinsSF --app-version ${version} --parameters [] --mode "Monitored"
 if [ $? -ne 0 ]; then
     echo "Upgrade of application failed."
     exit 1
diff --git a/Services/WatchDog/Scripts/upgrade.sh b/Services/WatchDog/Scripts/upgrade.sh
old mode 100644
new mode 100755
index ec1b9cf..716cb71
--- a/Services/WatchDog/Scripts/upgrade.sh
+++ b/Services/WatchDog/Scripts/upgrade.sh
@@ -4,6 +4,12 @@ set -x
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 appPkg="$DIR/../WatchdogApplication"
 
+if [[ "$#" != "0" ]];then
+        version="$1"
+else
+        version="1.0.0"
+fi
+
 sfctl application upload --path $appPkg --show-progress
 if [ $? -ne 0 ]; then
     echo "Application copy failed."
@@ -18,11 +24,10 @@ fi
 
 # Check parameters to see if InstanceCount was previously specified
 params=$(sfctl application info --application-id WatchdogApplication --query "parameters[].[key, value][]")
-version=$(sed -e "s/xmlns/ignore/" $appPkg/ApplicationManifest.xml | xmllint --xpath "string(//ApplicationManifest/@ApplicationTypeVersion)" -)
 if [[ $params =~ "InstanceCount" ]]; then
-    sfctl application upgrade --app-id WatchdogApplication --app-version ${version} --parameters "{\"InstanceCount\":\"-1\"}" --mode "Monitored"
+    sfctl application upgrade --app-id fabric:/WatchdogApplication --app-version ${version} --parameters "{\"InstanceCount\":\"-1\"}" --mode "Monitored"
 else
-    sfctl application upgrade --app-id WatchdogApplication --app-version ${version} --parameters "" --mode "Monitored"
+    sfctl application upgrade --app-id fabric:/WatchdogApplication --app-version ${version} --parameters [] --mode "Monitored"
 fi
 if [ $? -ne 0 ]; then
     echo "Upgrade of application failed."

From 0cbb90ef1861ce9c7af421f8a614d42896fd2109 Mon Sep 17 00:00:00 2001
From: Sayantan Saha <saysa@microsoft.com>
Date: Tue, 21 Nov 2017 14:22:17 +0530
Subject: [PATCH 2/2] Remove xmllint dependency from couple of missing places

---
 Actors/ActorCounter/Scripts/upgrade.sh    | 3 +--
 Services/JenkinsDocker/Scripts/upgrade.sh | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/Actors/ActorCounter/Scripts/upgrade.sh b/Actors/ActorCounter/Scripts/upgrade.sh
index 39d11b3..1190bad 100755
--- a/Actors/ActorCounter/Scripts/upgrade.sh
+++ b/Actors/ActorCounter/Scripts/upgrade.sh
@@ -22,9 +22,8 @@ if [ $? -ne 0 ]; then
     exit 1
 fi
 
-version=$(sed -e "s/xmlns/ignore/" $appPkg/ApplicationManifest.xml | xmllint --xpath "string(//ApplicationManifest/@ApplicationTypeVersion)" -)
 eval sfctl application upgrade --app-id fabric:/CounterActorApplication --app-version ${version} --parameters [] --mode "Monitored"
 if [ $? -ne 0 ]; then
     echo "Upgrade of application failed."
     exit 1
-fi
\ No newline at end of file
+fi
diff --git a/Services/JenkinsDocker/Scripts/upgrade.sh b/Services/JenkinsDocker/Scripts/upgrade.sh
index 0b52c95..83c2dbf 100755
--- a/Services/JenkinsDocker/Scripts/upgrade.sh
+++ b/Services/JenkinsDocker/Scripts/upgrade.sh
@@ -22,7 +22,6 @@ if [ $? -ne 0 ]; then
     exit 1
 fi
 
-version=$(sed -e "s/xmlns/ignore/" $appPkg/ApplicationManifest.xml | xmllint --xpath "string(//ApplicationManifest/@ApplicationTypeVersion)" -)
 eval sfctl application upgrade --app-id fabric:/JenkinsSF --app-version ${version} --parameters [] --mode "Monitored"
 if [ $? -ne 0 ]; then
     echo "Upgrade of application failed."