Fix removal of docker password setting #13865

Noort · Noort · commit 4be56e39627e · 2021-01-06T14:27:13.000+01:00
diff --git a/src/Websites/Websites/ChangeLog.md b/src/Websites/Websites/ChangeLog.md
@@ -22,7 +22,7 @@
     - New Cmdlets
         - New-AzWebAppCertificate
         - Remove-AzWebAppCertificate
-    
+* Fix bug that causes Docker Password to be removed from appsettings in `Set-AzWebApp` and `Set-AzWebAppSlot`
 ## Version 2.1.1
 * Prevent duplicate access restriction rules
 
diff --git a/src/Websites/Websites/Cmdlets/DeploymentSlots/SetAzureWebAppSlot.cs b/src/Websites/Websites/Cmdlets/DeploymentSlots/SetAzureWebAppSlot.cs
@@ -234,11 +234,13 @@ public override void ExecuteCmdlet()
                         }
                     }
 
-                    appSettings.Remove(CmdletHelpers.DockerRegistryServerPassword);
-
                     if (ContainerRegistryPassword != null)
                     {
-                        appSettings[CmdletHelpers.DockerRegistryServerPassword] = ContainerRegistryPassword.ConvertToString();
+                        appSettings.Remove(CmdletHelpers.DockerRegistryServerPassword);
+                        if (ContainerRegistryPassword.ConvertToString() != string.Empty)
+                        {
+                            appSettings[CmdletHelpers.DockerRegistryServerPassword] = ContainerRegistryPassword.ConvertToString();
+                        }
                     }
 
                     if (parameters.Contains("EnableContainerContinuousDeployment"))
diff --git a/src/Websites/Websites/Cmdlets/WebApps/SetAzureWebApp.cs b/src/Websites/Websites/Cmdlets/WebApps/SetAzureWebApp.cs
@@ -236,14 +236,16 @@ public override void ExecuteCmdlet()
                         if (ContainerRegistryUser != string.Empty)
                         {
                             appSettings[CmdletHelpers.DockerRegistryServerUserName] = ContainerRegistryUser;
-                        }                        
+                        }
                     }
 
-                    appSettings.Remove(CmdletHelpers.DockerRegistryServerPassword);
-
                     if (ContainerRegistryPassword != null)
                     {
-                        appSettings[CmdletHelpers.DockerRegistryServerPassword] = ContainerRegistryPassword.ConvertToString();
+                        appSettings.Remove(CmdletHelpers.DockerRegistryServerPassword);
+                        if (ContainerRegistryPassword.ConvertToString() != string.Empty)
+                        {
+                            appSettings[CmdletHelpers.DockerRegistryServerPassword] = ContainerRegistryPassword.ConvertToString();
+                        }
                     }
 
                     if (parameters.Contains("EnableContainerContinuousDeployment"))

Original file line number	Diff line number	Diff line change
`@@ -234,11 +234,13 @@ public override void ExecuteCmdlet()`
`234`	`234`	`}`
`235`	`235`	`}`
`236`	`236`
`237`		`- appSettings.Remove(CmdletHelpers.DockerRegistryServerPassword);`
`238`		`-`
`239`	`237`	`if (ContainerRegistryPassword != null)`
`240`	`238`	`{`
`241`		`- appSettings[CmdletHelpers.DockerRegistryServerPassword] = ContainerRegistryPassword.ConvertToString();`
	`239`	`+ appSettings.Remove(CmdletHelpers.DockerRegistryServerPassword);`
	`240`	`+ if (ContainerRegistryPassword.ConvertToString() != string.Empty)`
	`241`	`+ {`
	`242`	`+ appSettings[CmdletHelpers.DockerRegistryServerPassword] = ContainerRegistryPassword.ConvertToString();`
	`243`	`+ }`
`242`	`244`	`}`
`243`	`245`
`244`	`246`	`if (parameters.Contains("EnableContainerContinuousDeployment"))`
Original file line number	Diff line number	Diff line change
`@@ -236,14 +236,16 @@ public override void ExecuteCmdlet()`
`236`	`236`	`if (ContainerRegistryUser != string.Empty)`
`237`	`237`	`{`
`238`	`238`	`appSettings[CmdletHelpers.DockerRegistryServerUserName] = ContainerRegistryUser;`
`239`		`- }`
	`239`	`+ }`
`240`	`240`	`}`
`241`	`241`
`242`		`- appSettings.Remove(CmdletHelpers.DockerRegistryServerPassword);`
`243`		`-`
`244`	`242`	`if (ContainerRegistryPassword != null)`
`245`	`243`	`{`
`246`		`- appSettings[CmdletHelpers.DockerRegistryServerPassword] = ContainerRegistryPassword.ConvertToString();`
	`244`	`+ appSettings.Remove(CmdletHelpers.DockerRegistryServerPassword);`
	`245`	`+ if (ContainerRegistryPassword.ConvertToString() != string.Empty)`
	`246`	`+ {`
	`247`	`+ appSettings[CmdletHelpers.DockerRegistryServerPassword] = ContainerRegistryPassword.ConvertToString();`
	`248`	`+ }`
`247`	`249`	`}`
`248`	`250`
`249`	`251`	`if (parameters.Contains("EnableContainerContinuousDeployment"))`