Moving up the logic for skip upgrade (#7373)

* Moving up the logic to skip upgrade * Moving up the logic to check the existence of old application * Modified code as per review comments
microsoft · Jun 6, 2018 · eff31b7 · eff31b7
1 parent a1b9ff5
commit eff31b7
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 44 deletions.
diff --git a/Tasks/ServiceFabricDeploy/ServiceFabricSDK/Publish-UpgradedServiceFabricApplication.ps1 b/Tasks/ServiceFabricDeploy/ServiceFabricSDK/Publish-UpgradedServiceFabricApplication.ps1
@@ -146,6 +146,45 @@ function Publish-UpgradedServiceFabricApplication
         throw $errMsg
     }
 
+    $ApplicationManifestPath = "$AppPkgPathToUse\ApplicationManifest.xml"
+
+    $names = Get-NamesFromApplicationManifest -ApplicationManifestPath $ApplicationManifestPath
+    if (!$names)
+    {
+        return
+    }
+
+    # If ApplicationName is not specified on command line get application name from Application parameter file.
+    if (!$ApplicationName)
+    {
+        $ApplicationName = Get-ApplicationNameFromApplicationParameterFile $ApplicationParameterFilePath
+    }
+
+    if (!$ApplicationName)
+    {
+        Write-Error (Get-VstsLocString -Key EmptyApplicationName)
+    }
+
+    $oldApplication = Get-ServiceFabricApplication -ApplicationName $ApplicationName
+    ## Check existence of the application
+    if (!$oldApplication)
+    {
+        $errMsg = (Get-VstsLocString -Key SFSDK_AppDoesNotExist -ArgumentList $ApplicationName)
+        throw $errMsg
+    }
+
+    if ($oldApplication.ApplicationTypeName -ne $names.ApplicationTypeName)
+    {
+        $errMsg = (Get-VstsLocString -Key SFSDK_AppTypeMismatch -ArgumentList $ApplicationName)
+        throw $errMsg
+    }
+
+    if ($SkipUpgradeSameTypeAndVersion -And $oldApplication.ApplicationTypeVersion -eq $names.ApplicationTypeVersion)
+    {
+        Write-Warning (Get-VstsLocString -Key SFSDK_SkipUpgradeWarning -ArgumentList @($names.ApplicationTypeName, $names.ApplicationTypeVersion))
+        return
+    }
+
     # Get image store connection string
     $clusterManifestText = Get-ServiceFabricClusterManifest
     $imageStoreConnectionString = Get-ImageStoreConnectionStringFromClusterManifest ([xml] $clusterManifestText)
@@ -160,8 +199,6 @@ function Publish-UpgradedServiceFabricApplication
         }
     }
 
-    $ApplicationManifestPath = "$AppPkgPathToUse\ApplicationManifest.xml"
-
     try
     {
         [void](Test-ServiceFabricClusterConnection)
@@ -172,49 +209,9 @@ function Publish-UpgradedServiceFabricApplication
         throw
     }
 
-    # If ApplicationName is not specified on command line get application name from Application parameter file.
-    if (!$ApplicationName)
-    {
-        $ApplicationName = Get-ApplicationNameFromApplicationParameterFile $ApplicationParameterFilePath
-    }
-
-    if (!$ApplicationName)
-    {
-        Write-Error (Get-VstsLocString -Key EmptyApplicationName)
-    }
-
-    $names = Get-NamesFromApplicationManifest -ApplicationManifestPath $ApplicationManifestPath
-    if (!$names)
-    {
-        return
-    }
-
     $ApplicationTypeAlreadyRegistered = $false
     if ($Action.Equals('RegisterAndUpgrade') -or $Action.Equals('Register'))
     {
-        ## Check existence of the application
-        $oldApplication = Get-ServiceFabricApplication -ApplicationName $ApplicationName
-
-        if (!$oldApplication)
-        {
-            $errMsg = (Get-VstsLocString -Key SFSDK_AppDoesNotExist -ArgumentList $ApplicationName)
-            throw $errMsg
-        }
-        else
-        {
-            if ($oldApplication.ApplicationTypeName -ne $names.ApplicationTypeName)
-            {
-                $errMsg = (Get-VstsLocString -Key SFSDK_AppTypeMismatch -ArgumentList $ApplicationName)
-                throw $errMsg
-            }
-
-            if ($SkipUpgradeSameTypeAndVersion -And $oldApplication.ApplicationTypeVersion -eq $names.ApplicationTypeVersion)
-            {
-                Write-Warning (Get-VstsLocString -Key SFSDK_SkipUpgradeWarning -ArgumentList @($names.ApplicationTypeName, $names.ApplicationTypeVersion))
-                return
-            }
-        }
-
         ## Check upgrade status
         $upgradeStatus = Get-ServiceFabricApplicationUpgrade -ApplicationName $ApplicationName
         if ($upgradeStatus.UpgradeState -ne "RollingBackCompleted" -and $upgradeStatus.UpgradeState -ne "RollingForwardCompleted")

diff --git a/Tasks/ServiceFabricDeploy/task.json b/Tasks/ServiceFabricDeploy/task.json
@@ -17,7 +17,7 @@
     "version": {
         "Major": 1,
         "Minor": 7,
-        "Patch": 10
+        "Patch": 11
     },
     "demands": [
         "Cmd"

diff --git a/Tasks/ServiceFabricDeploy/task.loc.json b/Tasks/ServiceFabricDeploy/task.loc.json
@@ -17,7 +17,7 @@
   "version": {
     "Major": 1,
     "Minor": 7,
-    "Patch": 10
+    "Patch": 11
   },
   "demands": [
     "Cmd"