Update defaults for clean

Azure-App-Service · Sep 8, 2020 · 168ee47 · 168ee47
1 parent 4ddc443
commit 168ee47
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/Kudu.Services/Deployment/PushDeploymentController.cs b/Kudu.Services/Deployment/PushDeploymentController.cs
@@ -294,6 +294,7 @@ public async Task<IActionResult> OneDeploy(
                     DoFullBuildByDefault = false,
                     Message = Constants.OneDeploy,
                     WatchedFileEnabled = false,
+                    CleanupTargetDirectory = clean.GetValueOrDefault(false),
                     RestartAllowed = restart.GetValueOrDefault(true),
                 };
 
@@ -320,6 +321,9 @@ public async Task<IActionResult> OneDeploy(
 
                             deploymentInfo.TargetRootPath = Path.Combine(_environment.WebRootPath, path);
                             deploymentInfo.Fetch = LocalZipHandler;
+
+                            // Legacy war deployment is equivalent to wardeploy
+                            // So always do clean deploy.
                             deploymentInfo.CleanupTargetDirectory = true;
                             artifactType = ArtifactType.Zip;
                         }
@@ -357,13 +361,11 @@ public async Task<IActionResult> OneDeploy(
 
                         deploymentInfo.TargetRootPath = OneDeployHelper.GetLibsDirectoryAbsolutePath(_environment);
                         OneDeployHelper.SetTargetSubDirectoyAndFileNameFromPath(deploymentInfo, path);
-                        deploymentInfo.CleanupTargetDirectory = clean.GetValueOrDefault(false);
                         break;
 
                     case ArtifactType.Startup:
                         deploymentInfo.TargetRootPath = OneDeployHelper.GetScriptsDirectoryAbsolutePath(_environment);
                         OneDeployHelper.SetTargetSubDirectoyAndFileNameFromPath(deploymentInfo, OneDeployHelper.GetStartupFileName());
-                        deploymentInfo.CleanupTargetDirectory = clean.GetValueOrDefault(false);
                         break;
 
                     case ArtifactType.Script:
@@ -374,7 +376,6 @@ public async Task<IActionResult> OneDeploy(
 
                         deploymentInfo.TargetRootPath = OneDeployHelper.GetScriptsDirectoryAbsolutePath(_environment);
                         OneDeployHelper.SetTargetSubDirectoyAndFileNameFromPath(deploymentInfo, path);
-                        deploymentInfo.CleanupTargetDirectory = clean.GetValueOrDefault(false);
 
                         break;
 
@@ -385,13 +386,14 @@ public async Task<IActionResult> OneDeploy(
                         }
 
                         OneDeployHelper.SetTargetSubDirectoyAndFileNameFromPath(deploymentInfo, path);
-                        deploymentInfo.CleanupTargetDirectory = clean.GetValueOrDefault(false);
 
                         break;
 
                     case ArtifactType.Zip:
                         deploymentInfo.Fetch = LocalZipHandler;
                         deploymentInfo.TargetSubDirectoryRelativePath = path;
+
+                        // Deployments for type=zip default to clean=true
                         deploymentInfo.CleanupTargetDirectory = clean.GetValueOrDefault(true);
 
                         break;