Fix lock retry interval, help message typos in profile cmdlets

Author: markcowl

src/ResourceManager/Common/Commands.Common.Authentication.ResourceManager/ProtectedFileProvider.cs

@@ -33,8 +33,8 @@ public enum FileProtection
     /// </summary>
     public abstract class ProtectedFileProvider : IFileProvider, IDisposable
     {
-        const int MaxTries = 3;
-        static readonly TimeSpan RetryInterval = TimeSpan.FromSeconds(5);
+        public const int MaxTries = 30;
+        static readonly TimeSpan RetryInterval = TimeSpan.FromMilliseconds(500);
         protected Stream _stream;
         object _initializationLock = new object();
         public string FilePath { get; set; }
@@ -117,7 +117,7 @@ static bool TryGetStreamLock(Func<string, Stream> acquireLock, string filePath,
                 catch (IOException)
                 {
                     tries++;
-                    // TestMockSupport.Delay(RetryInterval);
+                    TestMockSupport.Delay(RetryInterval);
                 }
             }
             while (tries <= MaxTries && stream == null);

src/ResourceManager/Common/Commands.ResourceManager.Common/AzureRMCmdlet.cs

@@ -45,7 +45,7 @@ public AzureRMCmdlet()
         /// <summary>
         /// Gets or sets the global profile for ARM cmdlets.
         /// </summary>
-        [Parameter(Mandatory =false, HelpMessage="The credeetnails, tenant and subscription used for communication with azure")]
+        [Parameter(Mandatory =false, HelpMessage= "The credentials, account, tenant, and subscription used for communication with azure.")]
         [Alias("AzureRmContext", "AzureCredential")]
         public IAzureContextContainer DefaultProfile
         {

src/ResourceManager/Profile/AzureRM.Profile.psd1

@@ -85,7 +85,7 @@ CmdletsToExport = 'Disable-AzureRmDataCollection', 'Disable-AzureRmContextAutosa
 # VariablesToExport = @()
 
 # Aliases to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no aliases to export.
-AliasesToExport = 'Login-AzureRmAccount', 'Select-AzureRmSubscription', 'Resolve-Error', 'Logout-AzAccount', 'Logout-AzureRmAccount', 'Logout-AzAccount'
+AliasesToExport = 'Login-AzureRmAccount', 'Select-AzureRmSubscription', 'Resolve-Error', 'Logout-AzAccount', 'Logout-AzureRmAccount', 'Login-AzAccount'
 
 # DSC resources to export from this module
 # DscResourcesToExport = @()

src/ResourceManager/Profile/Commands.Profile.Test/ProtectedFileProviderTests.cs

@@ -107,9 +107,9 @@ public void LockFailureThrowsGoodException()
             {
 
                 Assert.Contains(protectedFile, Assert.Throws<UnauthorizedAccessException>(() => ProtectedFileProvider.CreateFileProvider(protectedFile, FileProtection.SharedRead, store.Object).Stream).Message);
-                store.Verify(d => d.OpenForSharedRead(It.IsAny<string>()), Times.Exactly(4));
+                store.Verify(d => d.OpenForSharedRead(It.IsAny<string>()), Times.Exactly(ProtectedFileProvider.MaxTries + 1));
                 Assert.Contains(protectedFile, Assert.Throws<UnauthorizedAccessException>(() => ProtectedFileProvider.CreateFileProvider(protectedFile, FileProtection.ExclusiveWrite, store.Object).Stream).Message);
-                store.Verify(d => d.OpenForExclusiveWrite(It.IsAny<string>()), Times.Exactly(4));
+                store.Verify(d => d.OpenForExclusiveWrite(It.IsAny<string>()), Times.Exactly(ProtectedFileProvider.MaxTries + 1));
             }
             finally
             {

src/ResourceManager/Profile/Commands.Profile/AzureRmProfileStartup.ps1

@@ -18,5 +18,8 @@
 	"Save-AzureRmProfile" = "Save-AzureRmContext";
 	"Select-AzureRmProfile" = "Import-AzureRmContext";
 	"Resolve-Error" = "Resolve-AzureRmError";
+	"Logout-AzAccount" = "Remove-AzureRmAccount";
+	"Logout-AzureRmAccount" = "Remove-AzureRmAccount";
+	"Login-AzAccount" = "Add-AzureRmAccount";
 }.GetEnumerator() | Select @{Name='Name'; Expression={$_.Key}}, @{Name='Value'; Expression={$_.Value}} | New-Alias -Description "AzureAlias" | Out-Null
 

src/ResourceManager/Profile/Commands.Profile/Common/AzureContextModificationCmdlet.cs

@@ -31,7 +31,7 @@ namespace Microsoft.Azure.Commands.Profile.Common
     /// </summary>
     public class AzureContextModificationCmdlet : AzureRMCmdlet
     {
-        [Parameter(Mandatory = false, HelpMessage = "Determines the scope of context changes, for example, wheher changes apply only to the cusrrent process, or to all sessions started by this user")]
+        [Parameter(Mandatory = false, HelpMessage = "Determines the scope of context changes, for example, whether changes apply only to the current process, or to all sessions started by this user.")]
         public ContextModificationScope Scope { get; set; }
 
 

src/ResourceManager/Profile/Commands.Profile/help/Add-AzureRmAccount.md

@@ -215,7 +215,7 @@ Accept wildcard characters: False
 ```
 
 ### -DefaultProfile
-The credeetnails, tenant and subscription used for communication with azure
+The credentials, account, tenant, and subscription used for communication with azure.
 
 ```yaml
 Type: IAzureContextContainer

src/ResourceManager/Profile/Commands.Profile/help/Add-AzureRmEnvironment.md

@@ -369,7 +369,7 @@ Accept wildcard characters: False
 ```
 
 ### -Scope
-Determines the scope of context changes, for example, wheher changes apply only to the cusrrent process, or to all sessions started by this user
+Determines the scope of context changes, for example, whether changes apply only to the current process, or to all sessions started by this user.
 
 ```yaml
 Type: ContextModificationScope

src/ResourceManager/Profile/Commands.Profile/help/AzureRM.Profile.md

@@ -40,7 +40,7 @@ Gets the metadata used to authenticate Azure Resource Manager requests.
 
 ### [Get-AzureRmContextAutosaveSetting](Get-AzureRmContextAutosaveSetting.md)
 Display metadata about the context autosave feature, including whterh the context is 
-automaticallys aved, and where saved context and credential information cna be found.
+automatically saved, and where saved context and credential information can be found.
 
 ### [Get-AzureRmEnvironment](Get-AzureRmEnvironment.md)
 Get endpoints and metadata for an instance of Azure services.

src/ResourceManager/Profile/Commands.Profile/help/Disable-AzureRmDataCollection.md

@@ -40,7 +40,7 @@ This example shows how to disable data collection for the current user.
 ## PARAMETERS
 
 ### -DefaultProfile
-The credeetnails, tenant and subscription used for communication with azure.
+The credentials, account, tenant and subscription used for communication with azure.
 
 ```yaml
 Type: IAzureContextContainer

src/ResourceManager/Profile/Commands.Profile/help/Enable-AzureRmDataCollection.md

@@ -41,7 +41,7 @@ This example shows how to enable data collection for the current user.
 ## PARAMETERS
 
 ### -DefaultProfile
-The credeetnails, tenant and subscription used for communication with azure.
+The credentials, account, tenant and subscription used for communication with azure.
 
 ```yaml
 Type: IAzureContextContainer

src/ResourceManager/Profile/Commands.Profile/help/Get-AzureRmContext.md

@@ -71,7 +71,7 @@ In this example, all currently available contexts are displayed.  The user may s
 ## PARAMETERS
 
 ### -DefaultProfile
-The credentials, tenant and subscription used for communication with azure
+The credentials, account, tenant and subscription used for communication with azure
 
 ```yaml
 Type: IAzureContextContainer

src/ResourceManager/Profile/Commands.Profile/help/Get-AzureRmContextAutosaveSetting.md

@@ -18,8 +18,8 @@ Get-AzureRmContextAutosaveSetting [-Scope <ContextModificationScope>]
 ```
 
 ## DESCRIPTION
-Display metadata about the context autosave feature, including whterh the context is 
-automaticallys aved, and where saved context and credential information cna be found.
+Display metadata about the context autosave feature, including whether the context is 
+automatically saved, and where saved context and credential information can be found.
 
 ## EXAMPLES
 
@@ -56,7 +56,7 @@ to the default location.
 ## PARAMETERS
 
 ### -DefaultProfile
-The credentials, tenant and subscription used for communication with azure
+The credentials, account, tenant and subscription used for communication with azure
 
 ```yaml
 Type: IAzureContextContainer
@@ -71,7 +71,7 @@ Accept wildcard characters: False
 ```
 
 ### -Scope
-Determines the scope of context changes, for example, wheher changes apply only to the cusrrent process, or to all sessions started by this user
+Determines the scope of context changes, for example, whether changes apply only to the current process, or to all sessions started by this user.
 
 ```yaml
 Type: ContextModificationScope

src/ResourceManager/Profile/Commands.Profile/help/Get-AzureRmEnvironment.md

@@ -104,7 +104,7 @@ This example shows how to get the endpoints and metadata for the AzureUSGovernme
 ## PARAMETERS
 
 ### -DefaultProfile
-The credeetnails, tenant and subscription used for communication with azure.
+The credentials, account, tenant and subscription used for communication with azure.
 
 ```yaml
 Type: IAzureContextContainer

src/ResourceManager/Profile/Commands.Profile/help/Import-AzureRmContext.md

@@ -105,7 +105,7 @@ Accept wildcard characters: False
 ```
 
 ### -Scope
-Determines the scope of context changes, for example, wheher changes apply only to the cusrrent process, or to all sessions started by this user.
+Determines the scope of context changes, for example, whether changes apply only to the current process, or to all sessions started by this user.
 
 ```yaml
 Type: ContextModificationScope
@@ -156,11 +156,12 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 ## INPUTS
 
 ### Microsoft.Azure.Commands.Common.Authentication.Models.AzureRMProfile
-System.String
+Contains the set of credentials, accounts, and subscriptions that are used to communicate with Azure.
 
 ## OUTPUTS
 
 ### Microsoft.Azure.Commands.Profile.Models.PSAzureProfile
+Contains the set of credentials, accounts, and subscriptions that can be used to communicate with Azure.
 
 ## NOTES
 

src/ResourceManager/Profile/Commands.Profile/help/Remove-AzureRmAccount.md

@@ -42,7 +42,7 @@ Remove-AzureRmAccount [-AzureContext] <PSAzureContext> [-Scope <ContextModificat
 ```
 
 ## DESCRIPTION
-Remove all credentials, and contexts (subscription and tenant information) associated witht he given account.  After 
+Remove all credentials, and contexts (subscription and tenant information) associated with the given account.  After 
 executing this cmdlet, you will need to login again using Add-AzureRmAccount
 
 ## EXAMPLES
@@ -59,7 +59,7 @@ Logs out the account associated with the current context.
 PS C:\> Get-AzureRmContext "Work" | Remove-AzureRmAccount -Scope CurrentUser
 ```
 
-Logs out the account associated with the given context (named 'Work'). Because this uses the 'CurrewntUser' scope, all credentials and 
+Logs out the account associated with the given context (named 'Work'). Because this uses the 'CurrentUser' scope, all credentials and 
 contexts will be permanently deleted.
 
 ### Log out a particular user
@@ -147,7 +147,7 @@ Accept wildcard characters: False
 ```
 
 ### -Scope
-Determines the scope of context changes, for example, whether changes apply only to the cusrrent process, or to all sessions started by this user
+Determines the scope of context changes, for example, whether changes apply only to the current process, or to all sessions started by this user.
 
 ```yaml
 Type: ContextModificationScope

src/ResourceManager/Profile/Commands.Profile/help/Remove-AzureRmEnvironment.md

@@ -108,7 +108,7 @@ Accept wildcard characters: False
 ```
 
 ### -Scope
-Determines the scope of context changes, for example, wheher changes apply only to the cusrrent process, or to all sessions started by this user.
+Determines the scope of context changes, for example, whether changes apply only to the current process, or to all sessions started by this user.
 
 ```yaml
 Type: ContextModificationScope

src/ResourceManager/Profile/Commands.Profile/help/Set-AzureRmEnvironment.md

@@ -233,7 +233,7 @@ Accept wildcard characters: False
 ```
 
 ### -DefaultProfile
-The credeetnails, tenant and subscription used for communication with azure.
+The credentials, account, tenant and subscription used for communication with azure.
 
 ```yaml
 Type: IAzureContextContainer