Fix bug causing Docker Password to be removed from appsettings in Set…

…-AzWebApp(Slot) (#13866) * Fix removal of docker password setting #13865 * minor adjustment to changelog to make sure the versioning script will handle it correctly Co-authored-by: Noort <[email protected]> Co-authored-by: Yeming Liu <[email protected]>
Azure · Jan 7, 2021 · 3042f43 · 3042f43
1 parent 71e05a6
commit 3042f43
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/src/Websites/Websites/ChangeLog.md b/src/Websites/Websites/ChangeLog.md
@@ -22,7 +22,8 @@
     - 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"))