Skip to content

Commit fde94d8

Browse files
committed
address PR comments
1 parent 7f4b383 commit fde94d8

File tree

18 files changed

+45
-14
lines changed

18 files changed

+45
-14
lines changed

src/ResourceManager/AnalysisServices/ChangeLog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
- Additional information about change #1
1919
-->
2020
## Current Release
21+
* Corrected usage of `Login-AzureRmAccount` to use `Connect-AzureRmAccount`
2122
* Added ResourceGroup Completer to -ResourceGroup parameters allowing tab completion through resource groups in current subscription
2223

2324
## Version 0.6.1

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ protected override IAzureContext DefaultContext
102102
{
103103
if (DefaultProfile == null || DefaultProfile.DefaultContext == null || DefaultProfile.DefaultContext.Account == null)
104104
{
105-
throw new PSInvalidOperationException("Run Connect-AzureRmAccount to login.");
105+
throw new PSInvalidOperationException(Resources.RunConnectAccount);
106106
}
107107

108108
return DefaultProfile.DefaultContext;

src/ResourceManager/Common/Commands.ResourceManager.Common/Properties/Resources.Designer.cs

Lines changed: 11 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/ResourceManager/Common/Commands.ResourceManager.Common/Properties/Resources.resx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,4 +219,7 @@ Use the Enable-AzureDataCollection cmdlet to turn the feature On. The cmdlet can
219219
<data name="DefaultResourceGroupKey" xml:space="preserve">
220220
<value>Default Resource Group</value>
221221
</data>
222+
<data name="RunConnectAccount" xml:space="preserve">
223+
<value>Run Connect-AzureRmAccount to login.</value>
224+
</data>
222225
</root>

src/ResourceManager/Compute/ChangeLog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
- Additional information about change #1
1919
-->
2020
## Current Release
21+
* Corrected usage of `Login-AzureRmAccount` to use `Connect-AzureRmAccount`
2122
* Added simplified parameter set to New-AzureRmVmss, which creates a Virtual Machine Scale Set and all required resources using smart defaults
2223
* Added Location Completer to -Location parameters allowing tab completion through valid Locations
2324
* Added ResourceGroup Completer to -ResourceGroup parameters allowing tab completion through resource groups in current subscription

src/ResourceManager/DataLakeAnalytics/ChangeLog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
- Additional information about change #1
1919
-->
2020
## Current Release
21+
* Corrected usage of `Login-AzureRmAccount` to use `Connect-AzureRmAccount`
2122
* Added Location Completer to -Location parameters allowing tab completion through valid Locations
2223
* Added ResourceGroup Completer to -ResourceGroup parameters allowing tab completion through resource groups in current subscription
2324
* Obsoleted -Tags in favor of -Tag for New-AzureRmDataLakeAnalyticsAccount and Set-AzureRmDataLakeAnalyticsAccount

src/ResourceManager/DataLakeStore/ChangeLog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
- Additional information about change #1
1919
-->
2020
## Current Release
21+
* Corrected usage of `Login-AzureRmAccount` to use `Connect-AzureRmAccount`
2122
* Added Location Completer to -Location parameters allowing tab completion through valid Locations
2223
* Added ResourceGroup Completer to -ResourceGroup parameters allowing tab completion through resource groups in current subscription
2324
* Obsoleted -Tags in favor of -Tag for New-AzureRmDataLakeStoreAccount and Set-AzureRmDataLakeStoreAccount

src/ResourceManager/Insights/ChangeLog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
- Additional information about change #1
1919
-->
2020
## Current Release
21+
* Corrected usage of `Login-AzureRmAccount` to use `Connect-AzureRmAccount`
2122
* Added Location Completer to -Location parameters allowing tab completion through valid Locations
2223
* Added ResourceGroup Completer to -ResourceGroup parameters allowing tab completion through resource groups in current subscription
2324

src/ResourceManager/KeyVault/ChangeLog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
- Additional information about change #1
1919
-->
2020
## Current Release
21+
* Corrected usage of `Login-AzureRmAccount` to use `Connect-AzureRmAccount`
2122
* Added Location Completer to -Location parameters allowing tab completion through valid Locations
2223
* Added ResourceGroup Completer to -ResourceGroup parameters allowing tab completion through resource groups in current subscription
2324
* Added -AsJob support for long-running KeyVault cmdlets. Allows selected cmdlets to run in the background and return a job to track and control progress.

src/ResourceManager/Profile/AzureRM.Profile.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ CmdletsToExport = 'Disable-AzureRmDataCollection', 'Disable-AzureRmContextAutosa
114114
# 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.
115115
AliasesToExport = 'Add-AzureRmAccount', 'Login-AzAccount', 'Login-AzureRmAccount',
116116
'Remove-AzureRmAccount', 'Logout-AzAccount', 'Logout-AzureRmAccount',
117-
'Select-AzureRmSubscription', 'Resolve-Error', 'Save-AzureRmProfile', 'Select-AzureRmProfile'
117+
'Select-AzureRmSubscription', 'Resolve-Error', 'Save-AzureRmProfile'
118118

119119
# DSC resources to export from this module
120120
# DscResourcesToExport = @()

src/ResourceManager/Profile/ChangeLog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
## Current Release
2121
* `Add-AzureRmAccount` has been renamed as `Connect-AzureRmAccount`; an alias has been added for the old cmdlet name, and other aliases (`Login-AzAccount` and `Login-AzureRmAccount`) have been redirected to the new cmdlet name.
2222
* `Remove-AzureRmAccount` has been renamed as `Disconnect-AzureRmAccount`; an alias has been added for the old cmdlet name, and other aliases (`Logout-AzAccount` and `Logout-AzureRmAccount`) have been redirected to the new cmdlet name.
23+
* Corrected Resource Strings to use Connect-AzureRmAccount instead of Login-AzureRmAccount
2324
* Added ResourceGroup Completer to -ResourceGroup parameters allowing tab completion through resource groups in current subscription
2425
* Add-AzureRmAccount
2526
* Added -MSI login for authenticationg using the credentials of the Managed Service Identity of the current VM / Service

src/ResourceManager/Profile/Commands.Profile/Context/GetAzureRMContext.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
using System;
2121
using System.Linq;
2222
using System.Collections.ObjectModel;
23+
using Microsoft.Azure.Commands.Profile.Properties;
2324

2425
namespace Microsoft.Azure.Commands.Profile
2526
{
@@ -55,7 +56,7 @@ public override void ExecuteCmdlet()
5556
if (DefaultContext == null)
5657
{
5758
WriteError(new ErrorRecord(
58-
new PSInvalidOperationException("Run Connect-AzureRmAccount to login."),
59+
new PSInvalidOperationException(Resources.RunLoginCmdlet),
5960
string.Empty,
6061
ErrorCategory.AuthenticationError,
6162
null));

src/ResourceManager/Profile/Commands.Profile/Context/ImportAzureRMContext.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ namespace Microsoft.Azure.Commands.Profile
2727
/// Selects Microsoft Azure profile.
2828
/// </summary>
2929
[Cmdlet(VerbsData.Import, "AzureRmContext", SupportsShouldProcess = true, DefaultParameterSetName = ProfileFromDiskParameterSet), OutputType(typeof(PSAzureProfile))]
30-
[Alias("Select-AzureRmProfile")]
3130
public class ImportAzureRMContextCommand : AzureContextModificationCmdlet
3231
{
3332
internal const string InMemoryProfileParameterSet = "InMemoryProfile";

src/ResourceManager/Profile/Commands.Profile/Properties/Resources.Designer.cs

Lines changed: 14 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/ResourceManager/Profile/Commands.Profile/Properties/Resources.resx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -403,4 +403,7 @@
403403
<data name="SubscriptionOrTenantMissing" xml:space="preserve">
404404
<value>Must supply Subscription Id and Tenant Id when using -SkipValidation</value>
405405
</data>
406+
<data name="RunLoginCmdlet" xml:space="preserve">
407+
<value>Run Connect-AzureRmAccount to login.</value>
408+
</data>
406409
</root>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
"Login-AzureRmAccount" = "Connect-AzureRmAccount";
1919
"Select-AzureRmSubscription" = "Set-AzureRmContext";
2020
"Save-AzureRmProfile" = "Save-AzureRmContext";
21-
"Select-AzureRmProfile" = "Import-AzureRmContext";
2221
"Resolve-Error" = "Resolve-AzureRmError";
2322
"Remove-AzureRmAccount" = "Disconnect-AzureRmAccount";
2423
"Logout-AzAccount" = "Disconnect-AzureRmAccount";

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ schema: 2.0.0
88
# Disconnect-AzureRmAccount
99

1010
## SYNOPSIS
11-
Disconnect from a connected Azure account and removes all credentials and contexts associated with that account.
11+
Disconnects a connected Azure account and removes all credentials and contexts associated with that account.
1212

1313
## SYNTAX
1414

@@ -43,7 +43,7 @@ Disconnect-AzureRmAccount [-AzureContext] <PSAzureContext> [-Scope <ContextModif
4343
```
4444

4545
## DESCRIPTION
46-
The Disconnect-AzureRmAccount cmdlet disconnects from a connected Azure account and removes all credentials and contexts (subscription and tenant information) associated with that account.
46+
The Disconnect-AzureRmAccount cmdlet disconnects a connected Azure account and removes all credentials and contexts (subscription and tenant information) associated with that account.
4747

4848
After executing this cmdlet, you will need to login again using Connect-AzureRmAccount.
4949

src/ResourceManager/UsageAggregates/ChangeLog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
- Additional information about change #1
1919
-->
2020
## Current Release
21+
* Corrected usage of `Login-AzureRmAccount` to use `Connect-AzureRmAccount`
2122

2223
## Version 4.0.0
2324
* Add support for online help

0 commit comments

Comments
 (0)