Merge pull request #7684 from cormacpayne/fix-disconnect

Fix issue where Disconnect-AzureRmAccount would throw if not connected

Author: markcowl

src/ResourceManager/Profile/Commands.Profile/Account/DisconnectAzureRmAccount.cs

@@ -38,8 +38,8 @@ public class DisconnectAzureRmAccountCommand : AzureContextModificationCmdlet
         private const string ContextNameParameterSet = "ContextName";
 
 
-        
-        [Parameter(ParameterSetName = UserIdParameterSet, 
+
+        [Parameter(ParameterSetName = UserIdParameterSet,
                     Mandatory = true, HelpMessage = "User name of the form [email protected]", Position = 0)]
         [ValidateNotNullOrEmpty]
         [Alias("Id", "UserId")]
@@ -56,24 +56,32 @@ public class DisconnectAzureRmAccountCommand : AzureContextModificationCmdlet
         [ValidateNotNullOrEmpty]
         public string TenantId { get; set; }
 
-        [Parameter(ParameterSetName = InputObjectParametrSet, 
+        [Parameter(ParameterSetName = InputObjectParametrSet,
                     Mandatory = true, ValueFromPipeline=true, Position = 0, HelpMessage = "Account")]
         [ValidateNotNull]
         public PSAzureRmAccount InputObject { get; set; }
-        
-        [Parameter(ParameterSetName = ContextParameterSet, 
+
+        [Parameter(ParameterSetName = ContextParameterSet,
                     Mandatory = true, HelpMessage = "Context", ValueFromPipeline =true, Position = 0)]
         [ValidateNotNull]
         public PSAzureContext AzureContext { get; set; }
 
-        
-        [Parameter(ParameterSetName = ContextNameParameterSet, 
+
+        [Parameter(ParameterSetName = ContextNameParameterSet,
                     Mandatory = false, HelpMessage = "Name of the context to log out of")]
         [ValidateNotNullOrEmpty]
         public string ContextName { get; set; }
 
         public override void ExecuteCmdlet()
         {
+            if (DefaultProfile != null && DefaultProfile.DefaultContext == null)
+            {
+                WriteVerbose(string.Format("No accounts were found to disconnect from. Ending call to Disconnect-{0}Account.",
+                    ResourceManager.Common.AzureRMConstants.AzureRMPrefix));
+                WriteObject(null);
+                return;
+            }
+
             IAzureAccount azureAccount = null;
             switch(ParameterSetName)
             {

src/ResourceManager/Profile/Commands.Profile/ChangeLog.md

@@ -27,6 +27,8 @@
     - https://github.com/Azure/azure-powershell/issues/7453
 * Fix issue with DataLake endpoints when using MSI
     - https://github.com/Azure/azure-powershell/issues/7462
+* Fix issue where `Disconnect-AzureRmAccount` would throw if not connected
+    - https://github.com/Azure/azure-powershell/issues/7167
 
 ## Version 5.7.0
 * Fix issue with Get-AzureRmSubscription in CloudShell