Merge pull request Azure#10471 from Azure/redis_fix_issue_9510

Fix for redis issue Azure#9510

Author: msJinLei

src/RedisCache/RedisCache.Test/ScenarioTests/Utilitytests.cs

@@ -1,4 +1,6 @@
-using Microsoft.WindowsAzure.Commands.ScenarioTest;
+using Microsoft.Azure.Commands.RedisCache.Models;
+using Microsoft.Azure.Management.Redis.Models;
+using Microsoft.WindowsAzure.Commands.ScenarioTest;
 using System;
 using Xunit;
 
@@ -48,5 +50,37 @@ public void ValidateResourceGroupAndResourceName_Success()
 
             Utility.ValidateResourceGroupAndResourceName(resourceGroup, name);
         }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void ValidateSize_InvalidSizePremium()
+        {
+            string sku = "Premium";
+            string size = "C1";
+
+            var ex = Assert.Throws<ArgumentException>(() => SizeConverter.ValidateSize(size.ToUpper(), SkuName.Premium.Equals(sku)));
+            Assert.Contains("Invalid Size. Example for valid values: For Standard or Basic Sku: (C0, C1, C2, C3, C4, C5, C6), for Premium Sku: (P1, P2, P3, P4, P5)", ex.Message);
+        }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void ValidateSize_InvalidSizeStandard()
+        {
+            string sku = "Standard";
+            string size = "P1";
+
+            var ex = Assert.Throws<ArgumentException>(() => SizeConverter.ValidateSize(size.ToUpper(), SkuName.Premium.Equals(sku)));
+            Assert.Contains("Invalid Size. Example for valid values: For Standard or Basic Sku: (C0, C1, C2, C3, C4, C5, C6), for Premium Sku: (P1, P2, P3, P4, P5)", ex.Message);
+        }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void ValidateSize_Success()
+        {
+            string sku = "Premium";
+            string size = "P1";
+
+            SizeConverter.ValidateSize(size.ToUpper(), SkuName.Premium.Equals(sku));            
+        }
     }
 }

src/RedisCache/RedisCache/ChangeLog.md

@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Added validation on `-Size` parameter for `Set-AzRedisCache` and `New-AzRedisCache` cmdlets
 
 ## Version 1.1.1
 * Updated `Set-AzRedisCache` reference documentation to include missing values for `-Size` parameter

src/RedisCache/RedisCache/Commands/NewAzureRedisCache.cs

@@ -86,11 +86,15 @@ public override void ExecuteCmdlet()
 
             if (string.IsNullOrEmpty(Size))
             {
-                Size = SizeConverter.C1String;
+                if (SkuStrings.Premium.Equals(Sku, StringComparison.OrdinalIgnoreCase))
+                    Size = SizeConverter.P1String;
+                else
+                    Size = SizeConverter.C1String;
             }
             else
             {
                 Size = SizeConverter.GetSizeInRedisSpecificFormat(Size, SkuStrings.Premium.Equals(Sku));
+                SizeConverter.ValidateSize(Size.ToUpper(), SkuStrings.Premium.Equals(Sku));
             }
 
             int skuCapacity = 1;

src/RedisCache/RedisCache/Commands/SetAzureRedisCache.cs

@@ -95,6 +95,7 @@ public override void ExecuteCmdlet()
             else
             {
                 Size = SizeConverter.GetSizeInRedisSpecificFormat(Size, SkuStrings.Premium.Equals(Sku));
+                SizeConverter.ValidateSize(Size.ToUpper(), SkuStrings.Premium.Equals(Sku));
                 skuFamily = Size.Substring(0, 1);
                 int.TryParse(Size.Substring(1), out skuCapacity);
             }

src/RedisCache/RedisCache/Models/SizeConverter.cs

@@ -14,6 +14,8 @@
 
 namespace Microsoft.Azure.Commands.RedisCache.Models
 {
+    using Microsoft.Azure.Commands.RedisCache.Properties;
+    using System;
     using System.Collections.Generic;
 
     internal static class SizeConverter
@@ -41,6 +43,26 @@ internal static class SizeConverter
         public const string P4String = "P4";
         public const string P5String = "P5";
 
+        private static IList<string> CList = new List<string>()
+        {
+            C0String,
+            C1String,
+            C2String,
+            C3String,
+            C4String,
+            C5String,
+            C6String
+        };
+
+        private static IList<string> PList = new List<string>()
+        {            
+            P1String,
+            P2String,
+            P3String,
+            P4String,
+            P5String         
+        };
+
         private static Dictionary<string, string> skuStringToActualSize = new Dictionary<string, string>{
             { C0String, MB250 },
             { C1String, GB1 },
@@ -120,5 +142,12 @@ public static string GetSizeInUserSpecificFormat(string skuFamily, int skuCapaci
             }
             return null;
         }
+
+        public static void ValidateSize(string size, bool isPremiumCache)
+        {            
+            if((isPremiumCache && !PList.Contains(size)) || (!isPremiumCache && !CList.Contains(size))) {
+                throw new ArgumentException(Resources.InvalidSize);
+            }
+        }
     }
 }

src/RedisCache/RedisCache/Properties/Resources.Designer.cs

@@ -162,6 +162,9 @@
   <data name="InvalidResourceGroupName" xml:space="preserve">
     <value>ResourceGroupName should not contain '/'. Name should be the plain, short name of the resource group, e.g. 'myResourceGroup'. (Not an Azure resource identifier.)</value>
   </data>
+  <data name="InvalidSize" xml:space="preserve">
+    <value>Invalid Size. Example for valid values: For Standard or Basic Sku: (C0, C1, C2, C3, C4, C5, C6), for Premium Sku: (P1, P2, P3, P4, P5)</value>
+  </data>
   <data name="PatchScheduleNotFound" xml:space="preserve">
     <value>There are no patch schedules found for redis cache '{0}'.</value>
   </data>

src/RedisCache/RedisCache/Properties/Resources.resx

@@ -258,6 +258,7 @@ Valid values are:
 - P2
 - P3
 - P4
+- P5
 - C0
 - C1
 - C2