Fix k8s name validation

Azure · May 4, 2019 · 476884e · 476884e
1 parent 94a4840
commit 476884e
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 5 deletions.
diff --git a/src/Azure.Functions.Cli/Kubernetes/KubernetesHelpers.cs b/src/Azure.Functions.Cli/Kubernetes/KubernetesHelpers.cs
@@ -50,7 +50,7 @@ public static class KubernetesHelper
             "mutatingwebhookconfiguration.admissionregistration.k8s.io/osiris-osiris-edge-proxy-injector"
         };
 
-        internal static void ValidateKubernetesName(string name)
+        public static void ValidateKubernetesName(string name)
         {
             var regExValue = "^[a-z0-9\\-\\.]*$";
             var regEx = new Regex(regExValue);
@@ -59,10 +59,6 @@ internal static void ValidateKubernetesName(string name)
             {
                 throw new CliException("Kubernetes name must be < 253 characters.\n" + kNameDoc);
             }
-            else if (!name.All(Char.IsLower))
-            {
-                throw new CliException("Kubernetes name must all lowercase.\n" + kNameDoc);
-            }
             else if (!regEx.IsMatch(name))
             {
                 throw new CliException($"Kubernetes namemust match {regExValue}.\n" + kNameDoc);

diff --git a/test/Azure.Functions.Cli.Tests/KubernetesHelperUnitTests.cs b/test/Azure.Functions.Cli.Tests/KubernetesHelperUnitTests.cs
@@ -0,0 +1,32 @@
+using Azure.Functions.Cli.Common;
+using Azure.Functions.Cli.Kubernetes;
+using FluentAssertions;
+using Xunit;
+
+namespace Azure.Functions.Cli.Tests
+{
+    public class KubernetesHelperUnitTests
+    {
+        [Theory]
+        [InlineData("normalname", true)]
+        [InlineData("name-with-dashes", true)]
+        [InlineData("name-with-numbers-938-234", true)]
+        [InlineData("name with spaces", false)]
+        [InlineData("NameWithCapital", false)]
+        [InlineData("name@something", false)]
+        public void ValidateKubernetesNames(string name, bool isValid)
+        {
+            try
+            {
+                KubernetesHelper.ValidateKubernetesName(name);
+            }
+            catch
+            {
+                if (isValid)
+                {
+                    throw;
+                }
+            }
+        }
+    }
+}