Skip to content

Allow any string as Size parameter going forward. Add P5 in PSArgumen… #7306

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 20, 2018
Merged

Allow any string as Size parameter going forward. Add P5 in PSArgumen… #7306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b6ce95c
Allow any string as Size parameter going forward. Add P5 in PSArgumen…
Sep 19, 2018
6d3e0fe
Created change log file
Sep 19, 2018
2ef0a3b
Update ChangeLog file and delete the duplicate file
Sep 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/ResourceManager/RedisCache/Commands.RedisCache/ChangeLog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
- Additional information about change #1
-->
## Current Release
* Allow any string as Size parameter going forward. Add P5 in PSArgumentCompleter popup

## Version 5.0.6
* Updated Insights dependency.
Expand Down
6 changes: 3 additions & 3 deletions src/ResourceManager/RedisCache/Commands.RedisCache/Commands/NewAzureRedisCache.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ public class NewAzureRedisCache : RedisCacheCmdletBase
[ValidateNotNullOrEmpty]
public string Location { get; set; }

[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")]
[ValidateSet(SizeConverter.P1String, SizeConverter.P2String, SizeConverter.P3String, SizeConverter.P4String,
[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")]
[PSArgumentCompleter(SizeConverter.P1String, SizeConverter.P2String, SizeConverter.P3String, SizeConverter.P4String, SizeConverter.P5String,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@SiddharthChatrolaMs any test functionality for the new values to ensure that they work on the server?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We wanted to make this parameter string so whenever we have new Sku, customers can create new caches without PowerShell update. Existing tests would be enough for that. As we don't test all of the values provided here

SizeConverter.C0String, SizeConverter.C1String, SizeConverter.C2String, SizeConverter.C3String, SizeConverter.C4String, SizeConverter.C5String, SizeConverter.C6String,
SizeConverter.MB250, SizeConverter.GB1, SizeConverter.GB2_5, SizeConverter.GB6, SizeConverter.GB13, SizeConverter.GB26, SizeConverter.GB53, IgnoreCase = false)]
SizeConverter.MB250, SizeConverter.GB1, SizeConverter.GB2_5, SizeConverter.GB6, SizeConverter.GB13, SizeConverter.GB26, SizeConverter.GB53, SizeConverter.GB120)]
public string Size { get; set; }

[Parameter(ValueFromPipelineByPropertyName = true, Mandatory = false, HelpMessage = "Choose to create a Basic, Standard, or Premium cache.")]
Expand Down
6 changes: 3 additions & 3 deletions src/ResourceManager/RedisCache/Commands.RedisCache/Commands/SetAzureRedisCache.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ public class SetAzureRedisCache : RedisCacheCmdletBase
[ValidateNotNullOrEmpty]
public string Name { get; set; }

[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")]
[ValidateSet(SizeConverter.P1String, SizeConverter.P2String, SizeConverter.P3String, SizeConverter.P4String,
[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")]
[PSArgumentCompleter(SizeConverter.P1String, SizeConverter.P2String, SizeConverter.P3String, SizeConverter.P4String, SizeConverter.P5String,
SizeConverter.C0String, SizeConverter.C1String, SizeConverter.C2String, SizeConverter.C3String, SizeConverter.C4String, SizeConverter.C5String, SizeConverter.C6String,
SizeConverter.MB250, SizeConverter.GB1, SizeConverter.GB2_5, SizeConverter.GB6, SizeConverter.GB13, SizeConverter.GB26, SizeConverter.GB53, IgnoreCase = false)]
SizeConverter.MB250, SizeConverter.GB1, SizeConverter.GB2_5, SizeConverter.GB6, SizeConverter.GB13, SizeConverter.GB26, SizeConverter.GB53, SizeConverter.GB120)]
public string Size { get; set; }

[Parameter(ValueFromPipelineByPropertyName = true, Mandatory = false, HelpMessage = "Choose to create a Basic, Standard, or Premium cache.")]
Expand Down
7 changes: 6 additions & 1 deletion src/ResourceManager/RedisCache/Commands.RedisCache/Models/SizeConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ internal static class SizeConverter
public const string GB13 = "13GB";
public const string GB26 = "26GB";
public const string GB53 = "53GB";
public const string GB120 = "120GB";

public const string C0String = "C0";
public const string C1String = "C1";
Expand All @@ -38,6 +39,7 @@ internal static class SizeConverter
public const string P2String = "P2";
public const string P3String = "P3";
public const string P4String = "P4";
public const string P5String = "P5";

private static Dictionary<string, string> skuStringToActualSize = new Dictionary<string, string>{
{ C0String, MB250 },
Expand All @@ -50,7 +52,8 @@ internal static class SizeConverter
{ P1String, GB6 },
{ P2String, GB13 },
{ P3String, GB26 },
{ P4String, GB53 }
{ P4String, GB53 },
{ P5String, GB120 }
};

public static string GetSizeInRedisSpecificFormat(string actualSizeFromUser, bool isPremiumCache)
Expand Down Expand Up @@ -100,6 +103,8 @@ public static string GetSizeInRedisSpecificFormat(string actualSizeFromUser, boo
{
return C6String;
}
case GB120:
return P5String;
// accepting C0, C1 etc.
default:
return actualSizeFromUser;
Expand Down