Merge pull request #5916 from wastoresh/webcontainer

[Storage] Support $web Container

Author: markcowl

src/Storage/ChangeLog.md

@@ -18,6 +18,11 @@
         - Additional information about change #1
 -->
 ## Current Release
+*Support $web as Storage blob container name
+	- New-AzureStorageBlobContainer
+	- Remove-AzureStorageBlobContainer
+	- Set-AzureStorageBlobContent
+	- Get-AzureStorageBlobContent
 
 ## Version 4.2.1
 * Fix the issue that upload Blob and upload File cmdlets fail on FIPS policy enabled machines

src/Storage/Commands.Storage.Test/Common/NameUtilTest.cs

@@ -27,7 +27,7 @@ public class NameUtilTest : StorageTestBase
         [TestMethod]
         public void IsValidContainerNameTest()
         {
-            string[] positives = { "$root", "$logs", "abc", "abc987", "abc2de", "4abc", "abc-def", new String('a', 63) };
+            string[] positives = { "$root", "$logs", "$web", "abc", "abc987", "abc2de", "4abc", "abc-def", new String('a', 63) };
             NameValidateHelper(positives, true, NameUtil.IsValidContainerName);
 
             string[] negatives =
@@ -51,7 +51,7 @@ public void IsValidContainerNameTest()
         [TestMethod]
         public void IsValidContainerPrefixTest()
         {
-            string[] positives = { "$", "$ro", "$l", "$root", "a", "ab", "abc", "$logs", "abc", "abc987", "abc2de", "4abc", "abc-def", "a-c", "ac-", new String('a', 63) };
+            string[] positives = { "$", "$ro", "$l", "$root", "a", "ab", "abc", "$logs", "$web", "abc", "abc987", "abc2de", "4abc", "abc-def", "a-c", "ac-", new String('a', 63) };
             NameValidateHelper(positives, true, NameUtil.IsValidContainerPrefix);
 
             string[] negatives =
@@ -74,7 +74,7 @@ public void IsValidContainerPrefixTest()
         [TestMethod]
         public void IsValidBlobNameTest()
         {
-            string[] positives = { "$", "$ro", "$l", "$root", "a", "*&(&^$^*", "ab", "abc", "$logs", "abc", "abc987", "abc2de", "4abc", "abc-def", "a-c", "ac-", new String('a', 1024)};
+            string[] positives = { "$", "$ro", "$l", "$root", "a", "*&(&^$^*", "ab", "abc", "$logs", "$web", "abc", "abc987", "abc2de", "4abc", "abc-def", "a-c", "ac-", new String('a', 1024)};
             NameValidateHelper(positives, true, NameUtil.IsValidBlobName);
 
             string[] negatives =
@@ -88,7 +88,7 @@ public void IsValidBlobNameTest()
         [TestMethod]
         public void IsValidBlobPrefixTest()
         {
-            string[] positives = { "$", "$ro", "$l", "$root", "a", "*&(&^$^*", "ab", "abc", "$logs", "abc", "abc987", "abc2de", "4abc", "abc-def", "a-c", "ac-", new String('a', 1024) };
+            string[] positives = { "$", "$ro", "$l", "$root", "a", "*&(&^$^*", "ab", "abc", "$logs", "$web", "abc", "abc987", "abc2de", "4abc", "abc-def", "a-c", "ac-", new String('a', 1024) };
             NameValidateHelper(positives, true, NameUtil.IsValidBlobPrefix);
 
             string[] negatives =

src/Storage/Commands.Storage/Common/NameUtil.cs

@@ -73,7 +73,7 @@ public static void ValidateContainerName(string name)
         /// <returns>True for valid container name, otherwise return false</returns>
         public static bool IsValidContainerName(string containerName)
         {
-            Regex regex = new Regex(@"^\$root$|^\$logs$|^[a-z0-9]([a-z0-9]|(?<=[a-z0-9])-(?=[a-z0-9])){2,62}$");
+            Regex regex = new Regex(@"^\$root$|^\$logs$|^\$web$|^[a-z0-9]([a-z0-9]|(?<=[a-z0-9])-(?=[a-z0-9])){2,62}$");
             return regex.IsMatch(containerName);
         }
 
@@ -88,8 +88,9 @@ public static bool IsValidContainerPrefix(string containerPrefix)
             {
                 string root = "$root";
                 string logs = "$logs";
+                string web = "$web";
 
-                if (root.IndexOf(containerPrefix) == 0 || logs.IndexOf(containerPrefix) == 0)
+                if (root.IndexOf(containerPrefix) == 0 || logs.IndexOf(containerPrefix) == 0 || web.IndexOf(containerPrefix) == 0)
                 {
                     return true;
                 }