fixed region regex

Author: liaoyustudent

aliyun-net-sdk-core.Tests/Units/AcsRequest.cs

@@ -192,6 +192,10 @@ public void validateParam()
             });
 
             acsRequest.RegionId = "";
+            Assert.Empty(acsRequest.RegionId);
+
+            acsRequest.RegionId = null;
+            Assert.Null(acsRequest.RegionId);
             Assert.Throws<ArgumentException>(() =>
             {
                 acsRequest.ProductNetwork = "a.b";
@@ -200,10 +204,22 @@ public void validateParam()
             acsRequest.ProductNetwork = "private";
             Assert.Equal("private", acsRequest.ProductNetwork);
 
+            acsRequest.ProductNetwork = "";
+            Assert.Empty(acsRequest.ProductNetwork);
+
+            acsRequest.ProductNetwork = null;
+            Assert.Null(acsRequest.ProductNetwork);
+
             Assert.Throws<ArgumentException>(() =>
             {
                 acsRequest.ProductSuffix = "a.b";
             });
+
+            acsRequest.ProductSuffix = "";
+            Assert.Empty(acsRequest.ProductSuffix);
+
+            acsRequest.ProductSuffix = null;
+            Assert.Null(acsRequest.ProductSuffix);
         }
     }
 

aliyun-net-sdk-core/AcsRequest.cs

@@ -69,11 +69,15 @@ public virtual string RegionId
             }
             set
             {
-                var match = Regex.Match(value, "^[a-zA-Z0-9_-]*$");
-                if (!match.Success)
-                {
-                    throw new ArgumentException("regionId is invalid", "regionId");
+                if(!string.IsNullOrEmpty(value))
+                {
+                    var match = Regex.Match(value, "^[a-zA-Z0-9_-]+$");
+                    if (!match.Success)
+                    {
+                        throw new ArgumentException("regionId is invalid", "regionId");
+                    }
                 }
+                
                 regionId = value;
             }
         }
@@ -91,11 +95,15 @@ public string ProductNetwork
             }
             set
             {
-                var match = Regex.Match(value, "^[a-zA-Z0-9_-]+$");
-                if (!match.Success)
-                {
-                    throw new ArgumentException("productNetwork is invalid", "productNetwork");
+                if(!string.IsNullOrEmpty(value))
+                {
+                    var match = Regex.Match(value, "^[a-zA-Z0-9_-]+$");
+                    if (!match.Success)
+                    {
+                        throw new ArgumentException("productNetwork is invalid", "productNetwork");
+                    }
                 }
+                
                 productNetwork = value;
             }
         }
@@ -108,11 +116,15 @@ public string ProductSuffix
             }
             set
             {
-                var match = Regex.Match(value, "^[a-zA-Z0-9_-]+$");
-                if (!match.Success)
-                {
-                    throw new ArgumentException("productSuffix is invalid", "productSuffix");
+                if(!string.IsNullOrEmpty(value))
+                {
+                    var match = Regex.Match(value, "^[a-zA-Z0-9_-]+$");
+                    if (!match.Success)
+                    {
+                        throw new ArgumentException("productSuffix is invalid", "productSuffix");
+                    }
                 }
+                
                 productSuffix = value;
             }
         }