Skip to content

Commit 55a2d57

Browse files
committed
Merge branch 'az022' of github.com:markcowl/azure-powershell into az022
2 parents 6855758 + dbce6b0 commit 55a2d57

35 files changed

+60
-52
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Below is a table containing the various Azure PowerShell rollup modules found in
1616
| Description | Module Name | PowerShell Gallery Link |
1717
| --------------------------------------------------------------- | ----------------- | ----------------------- |
1818
| Rollup Module for ARM Cmdlets | `AzureRM` | [![AzureRM](https://img.shields.io/powershellgallery/v/AzureRM.svg?style=flat-square&label=AzureRM)](https://www.powershellgallery.com/packages/AzureRM/) |
19-
| Rollup Module for .NET Core Cmdlets | `AzureRM.Netcore` | [![AzureRM.Netcore](https://img.shields.io/powershellgallery/v/AzureRM.Netcore.svg?style=flat-square&label=AzureRM.Netcore)](https://www.powershellgallery.com/packages/AzureRM.Netcore/) |
19+
| Rollup Module for .NET Standard cmdlets | `Az` | [![Az](https://img.shields.io/powershellgallery/v/Az.svg?style=flat-square&label=Az)](https://www.powershellgallery.com/packages/Az/) |
2020
| Rollup Module for Administrative Modules in Azure Stack | `AzureStack` | [![AzureStack](https://img.shields.io/powershellgallery/v/AzureStack.svg?style=flat-square&label=AzureStack)](https://www.powershellgallery.com/packages/AzureStack/) |
2121
| Rollup Module for Service Management Cmdlets | `Azure` | [![Azure](https://img.shields.io/powershellgallery/v/Azure.svg?style=flat-square&label=Azure)](https://www.powershellgallery.com/packages/Azure/) |
2222

src/ResourceManager/Profile/Commands.Profile/AzureRmAlias/Mappings.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -556,6 +556,9 @@ public static Dictionary<string, object> GetCaseInsensitiveMapping()
556556
'Remove-AzDataFactoryV2Pipeline': 'Remove-AzureRmDataFactoryV2Pipeline',
557557
'Remove-AzDataFactoryV2IntegrationRuntimeNode': 'Remove-AzureRmDataFactoryV2IntegrationRuntimeNode'
558558
},
559+
'Az.ResourceGraph': {
560+
'Search-AzGraph': 'Search-AzureRmGraph'
561+
},
559562
'Az.PolicyInsights': {
560563
'Get-AzPolicyEvent': 'Get-AzureRmPolicyEvent',
561564
'Get-AzPolicyState': 'Get-AzureRmPolicyState',

src/ResourceManager/RedisCache/Commands.RedisCache/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+
* Allow any string as Size parameter going forward. Add P5 in PSArgumentCompleter popup
2122

2223
## Version 5.0.6
2324
* Updated Insights dependency.

src/ResourceManager/RedisCache/Commands.RedisCache/Commands/NewAzureRedisCache.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ public class NewAzureRedisCache : RedisCacheCmdletBase
4141
[ValidateNotNullOrEmpty]
4242
public string Location { get; set; }
4343

44-
[Parameter(ValueFromPipelineByPropertyName = true, Mandatory = false, HelpMessage = "Size of redis cache. Valid values: P1,P2, P3, P4, C0, C1, C2, C3, C4, C5, C6, 250MB, 1GB, 2.5GB, 6GB, 13GB, 26GB, 53GB")]
45-
[ValidateSet(SizeConverter.P1String, SizeConverter.P2String, SizeConverter.P3String, SizeConverter.P4String,
44+
[Parameter(ValueFromPipelineByPropertyName = true, Mandatory = false, HelpMessage = "Size of redis cache. Valid values: P1,P2, P3, P4, P5, C0, C1, C2, C3, C4, C5, C6, 250MB, 1GB, 2.5GB, 6GB, 13GB, 26GB, 53GB, 120GB")]
45+
[PSArgumentCompleter(SizeConverter.P1String, SizeConverter.P2String, SizeConverter.P3String, SizeConverter.P4String, SizeConverter.P5String,
4646
SizeConverter.C0String, SizeConverter.C1String, SizeConverter.C2String, SizeConverter.C3String, SizeConverter.C4String, SizeConverter.C5String, SizeConverter.C6String,
47-
SizeConverter.MB250, SizeConverter.GB1, SizeConverter.GB2_5, SizeConverter.GB6, SizeConverter.GB13, SizeConverter.GB26, SizeConverter.GB53, IgnoreCase = false)]
47+
SizeConverter.MB250, SizeConverter.GB1, SizeConverter.GB2_5, SizeConverter.GB6, SizeConverter.GB13, SizeConverter.GB26, SizeConverter.GB53, SizeConverter.GB120)]
4848
public string Size { get; set; }
4949

5050
[Parameter(ValueFromPipelineByPropertyName = true, Mandatory = false, HelpMessage = "Choose to create a Basic, Standard, or Premium cache.")]

src/ResourceManager/RedisCache/Commands.RedisCache/Commands/SetAzureRedisCache.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ public class SetAzureRedisCache : RedisCacheCmdletBase
3535
[ValidateNotNullOrEmpty]
3636
public string Name { get; set; }
3737

38-
[Parameter(ValueFromPipelineByPropertyName = true, Mandatory = false, HelpMessage = "Size of redis cache. Valid values: P1,P2, P3, P4, C0, C1, C2, C3, C4, C5, C6, 250MB, 1GB, 2.5GB, 6GB, 13GB, 26GB, 53GB")]
39-
[ValidateSet(SizeConverter.P1String, SizeConverter.P2String, SizeConverter.P3String, SizeConverter.P4String,
38+
[Parameter(ValueFromPipelineByPropertyName = true, Mandatory = false, HelpMessage = "Size of redis cache. Valid values: P1,P2, P3, P4, P5, C0, C1, C2, C3, C4, C5, C6, 250MB, 1GB, 2.5GB, 6GB, 13GB, 26GB, 53GB, 120GB")]
39+
[PSArgumentCompleter(SizeConverter.P1String, SizeConverter.P2String, SizeConverter.P3String, SizeConverter.P4String, SizeConverter.P5String,
4040
SizeConverter.C0String, SizeConverter.C1String, SizeConverter.C2String, SizeConverter.C3String, SizeConverter.C4String, SizeConverter.C5String, SizeConverter.C6String,
41-
SizeConverter.MB250, SizeConverter.GB1, SizeConverter.GB2_5, SizeConverter.GB6, SizeConverter.GB13, SizeConverter.GB26, SizeConverter.GB53, IgnoreCase = false)]
41+
SizeConverter.MB250, SizeConverter.GB1, SizeConverter.GB2_5, SizeConverter.GB6, SizeConverter.GB13, SizeConverter.GB26, SizeConverter.GB53, SizeConverter.GB120)]
4242
public string Size { get; set; }
4343

4444
[Parameter(ValueFromPipelineByPropertyName = true, Mandatory = false, HelpMessage = "Choose to create a Basic, Standard, or Premium cache.")]

src/ResourceManager/RedisCache/Commands.RedisCache/Models/SizeConverter.cs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ internal static class SizeConverter
2525
public const string GB13 = "13GB";
2626
public const string GB26 = "26GB";
2727
public const string GB53 = "53GB";
28+
public const string GB120 = "120GB";
2829

2930
public const string C0String = "C0";
3031
public const string C1String = "C1";
@@ -38,6 +39,7 @@ internal static class SizeConverter
3839
public const string P2String = "P2";
3940
public const string P3String = "P3";
4041
public const string P4String = "P4";
42+
public const string P5String = "P5";
4143

4244
private static Dictionary<string, string> skuStringToActualSize = new Dictionary<string, string>{
4345
{ C0String, MB250 },
@@ -50,7 +52,8 @@ internal static class SizeConverter
5052
{ P1String, GB6 },
5153
{ P2String, GB13 },
5254
{ P3String, GB26 },
53-
{ P4String, GB53 }
55+
{ P4String, GB53 },
56+
{ P5String, GB120 }
5457
};
5558

5659
public static string GetSizeInRedisSpecificFormat(string actualSizeFromUser, bool isPremiumCache)
@@ -100,6 +103,8 @@ public static string GetSizeInRedisSpecificFormat(string actualSizeFromUser, boo
100103
{
101104
return C6String;
102105
}
106+
case GB120:
107+
return P5String;
103108
// accepting C0, C1 etc.
104109
default:
105110
return actualSizeFromUser;

src/ResourceManager/ResourceGraph/Commands.ResourceGraph/Az.ResourceGraph.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
FunctionsToExport = @()
7373

7474
# Cmdlets 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 cmdlets to export.
75-
CmdletsToExport = 'Search-AzureRmGraph'
75+
CmdletsToExport = 'Search-AzGraph'
7676

7777
# Variables to export from this module
7878
# VariablesToExport = @()

src/ResourceManager/Security/Commands.Security/AzureRM.Security.psd1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ CompanyName = 'Microsoft Corporation'
3030
Copyright = 'Microsoft Corporation. All rights reserved.'
3131

3232
# Description of the functionality provided by this module
33-
Description = 'Microsoft Azure PowerShell - Azure Security Center cmdlets in PowerShell and PowerShell Core. Allows managing and monitoring the security posture of your resources.'
33+
Description = 'Microsoft Azure PowerShell - Azure Security Center cmdlets in PowerShell and PowerShell Core. Allows managing and monitoring the security posture of your resources. for more information visit https://github.com/Azure/azure-powershell/blob/preview/src/ResourceManager/Security/Commands.Security/help/AzureRM.Security.md'
3434

3535
# Minimum version of the Windows PowerShell engine required by this module
3636
PowerShellVersion = '5.0'
@@ -51,7 +51,7 @@ CLRVersion = '4.0'
5151
# ProcessorArchitecture = ''
5252

5353
# Modules that must be imported into the global environment prior to importing this module
54-
RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '5.6.0'; })
54+
RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '5.5.1'; })
5555

5656
# Assemblies that must be loaded prior to importing this module
5757
RequiredAssemblies = '.\Microsoft.Azure.Management.SecurityCenter.dll'

src/ResourceManager/Security/Commands.Security/ChangeLog.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@
1919
-->
2020
## Current Release
2121

22+
## Version 0.2.0
23+
24+
* Aligning AzureRm.Profile dependency with the rest of AzureRm and updating documentation notes
25+
2226
## Version 0.1.0
2327

2428
* Public preview release of Security Center cmdlets

src/ResourceManager/Security/Commands.Security/Commands.Security.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@
125125
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
126126
</None>
127127
<None Include="AzureRM.Security.psd1" />
128+
<None Include="ChangeLog.md" />
128129
<None Include="help\*.md" />
129130
<None Include="MSSharedLibKey.snk" />
130131
<None Include="packages.config" />

0 commit comments

Comments
 (0)