Giuliov/make affixes optional (#140)

* first attempt

* fix test

Author: giuliov

src/aggregator-cli/Naming/FileNamingTemplates.cs

@@ -11,10 +11,6 @@ internal class FileNamingTemplates : INamingTemplates
         internal FileNamingTemplates(string jsonData)
         {
             affixes = JsonConvert.DeserializeObject<NamingAffixes>(jsonData);
-            // validate
-            if (string.IsNullOrWhiteSpace(affixes.ResourceGroupPrefix)
-                && string.IsNullOrWhiteSpace(affixes.ResourceGroupSuffix))
-                throw new ArgumentException("Must specify at least one affix for ResourceGroup");
         }
 
         private class InstanceName_ : InstanceCreateNames

src/unittests-core/BuiltInNamingTemplateTests.cs

@@ -1,4 +1,4 @@
-using Xunit;
+using Xunit;
 using aggregator.cli;
 
 namespace unittests_core
@@ -10,6 +10,7 @@ public void CustomResourceGroupName()
         {
             var templates = new BuiltInNamingTemplates();
             var names = templates.GetInstanceCreateNames("n", "rg");
+
             Assert.Equal("n", names.PlainName);
             Assert.Equal("naggregator", names.FunctionAppName);
             Assert.Equal("rg", names.ResourceGroupName);
@@ -21,10 +22,33 @@ public void DefaultResourceGroupName()
         {
             var templates = new BuiltInNamingTemplates();
             var names = templates.GetInstanceCreateNames("n", null);
+
             Assert.Equal("n", names.PlainName);
             Assert.Equal("naggregator", names.FunctionAppName);
             Assert.Equal("aggregator-n", names.ResourceGroupName);
             Assert.False(names.IsCustom);
         }
+
+        [Fact]
+        public void FromResourceGroupName_CustomResourceGroupName()
+        {
+            var templates = new BuiltInNamingTemplates();
+
+            var actual = templates.FromResourceGroupName("aggregator-n");
+
+            Assert.Equal("n", actual.PlainName);
+            Assert.Equal("aggregator-n", actual.ResourceGroupName);
+        }
+
+        [Fact]
+        public void FromResourceGroupName_DefaultResourceGroupName()
+        {
+            var templates = new BuiltInNamingTemplates();
+
+            var actual = templates.FromResourceGroupName("aggregator-n");
+
+            Assert.Equal("n", actual.PlainName);
+            Assert.Equal("aggregator-n", actual.ResourceGroupName);
+        }
     }
-}
+}

src/unittests-core/FileNamingTemplateTests.cs

@@ -10,7 +10,8 @@ public class FileNamingTemplateTests
         public void CtorValidate_Fails()
         {
             //"Must specify at least one affix for ResourceGroup"
-            Assert.Throws<ArgumentException>(() => new FileNamingTemplates("{}"));
+            Assert.True(true);
+            //Assert.Throws<ArgumentException>(() => new FileNamingTemplates("{}"));
         }
 
         [Fact]
@@ -22,6 +23,7 @@ public void InstanceValidate_Fails_OnNullName()
         }
 
         [Theory]
+        [InlineData(@"{}", "n", "rg")]
         [InlineData(@"{""ResourceGroupPrefix"":""a""}", "n", "arg")]
         [InlineData(@"{""ResourceGroupSuffix"":""z""}", "n", "rgz")]
         [InlineData(@"{""ResourceGroupPrefix"":""p"",""ResourceGroupSuffix"":""s""}", "n", "prgs")]
@@ -34,6 +36,7 @@ public void ResourceGroupName_Succeeds(string jsonData, string plainName, string
         }
 
         [Theory]
+        [InlineData(@"{""FunctionAppPrefix"":""a""}", "n", "an")]
         [InlineData(@"{""ResourceGroupPrefix"":""a"",""FunctionAppPrefix"":""a""}", "n", "an")]
         [InlineData(@"{""ResourceGroupPrefix"":""a"",""FunctionAppSuffix"":""z""}", "n", "nz")]
         [InlineData(@"{""ResourceGroupPrefix"":""a"",""FunctionAppPrefix"":""p"",""FunctionAppSuffix"":""s""}", "n", "pns")]
@@ -46,6 +49,7 @@ public void FunctionAppName_Succeeds(string jsonData, string plainName, string f
         }
 
         [Theory]
+        [InlineData(@"{""HostingPlanPrefix"":""a""}", "n", "an")]
         [InlineData(@"{""ResourceGroupPrefix"":""a"",""HostingPlanPrefix"":""a""}", "n", "an")]
         [InlineData(@"{""ResourceGroupPrefix"":""a"",""HostingPlanSuffix"":""z""}", "n", "nz")]
         [InlineData(@"{""ResourceGroupPrefix"":""a"",""HostingPlanPrefix"":""p"",""HostingPlanSuffix"":""s""}", "n", "pns")]
@@ -58,6 +62,7 @@ public void HostingPlanName_Succeeds(string jsonData, string plainName, string h
         }
 
         [Theory]
+        [InlineData(@"{""AppInsightPrefix"":""a""}", "n", "an")]
         [InlineData(@"{""ResourceGroupPrefix"":""a"",""AppInsightPrefix"":""a""}", "n", "an")]
         [InlineData(@"{""ResourceGroupPrefix"":""a"",""AppInsightSuffix"":""z""}", "n", "nz")]
         [InlineData(@"{""ResourceGroupPrefix"":""a"",""AppInsightPrefix"":""p"",""AppInsightSuffix"":""s""}", "n", "pns")]
@@ -70,6 +75,7 @@ public void AppInsightName_Succeeds(string jsonData, string plainName, string ap
         }
 
         [Theory]
+        [InlineData(@"{""StorageAccountPrefix"":""a""}", "n", "an")]
         [InlineData(@"{""ResourceGroupPrefix"":""a"",""StorageAccountPrefix"":""a""}", "n", "an")]
         [InlineData(@"{""ResourceGroupPrefix"":""a"",""StorageAccountSuffix"":""z""}", "n", "nz")]
         [InlineData(@"{""ResourceGroupPrefix"":""a"",""StorageAccountPrefix"":""p"",""StorageAccountSuffix"":""s""}", "n", "pns")]
@@ -82,6 +88,7 @@ public void StorageAccountName_Succeeds(string jsonData, string plainName, strin
         }
 
         [Theory]
+        [InlineData(@"{}", "n", "n")]
         [InlineData(@"{""ResourceGroupPrefix"":""a""}", "an", "n")]
         [InlineData(@"{""ResourceGroupSuffix"":""z""}", "nz", "n")]
         [InlineData(@"{""ResourceGroupPrefix"":""p"",""ResourceGroupSuffix"":""s""}", "pns", "n")]
@@ -95,6 +102,7 @@ public void FromResourceGroupName_Succeeds(string jsonData, string rgName, strin
         }
 
         [Theory]
+        [InlineData(@"{}", "rg", "app", "app")]
         [InlineData(@"{""ResourceGroupPrefix"":""a""}", "arg", "app", "app")]
         [InlineData(@"{""ResourceGroupPrefix"":""a"",""FunctionAppPrefix"":""a""}", "arg", "an", "n")]
         [InlineData(@"{""ResourceGroupPrefix"":""a"",""FunctionAppSuffix"":""z""}", "arg", "nz", "n")]
@@ -109,6 +117,7 @@ public void FromFunctionAppName_Succeeds(string jsonData, string rgName, string
         }
 
         [Theory]
+        [InlineData(@"{}", "https://zorro.azure.net/pippo", "zorro")]
         [InlineData(@"{""ResourceGroupPrefix"":""a""}", "https://zorro.azure.net/pippo", "zorro")]
         [InlineData(@"{""ResourceGroupPrefix"":""a"",""FunctionAppPrefix"":""a""}", "https://an.azure.net/pippo", "n")]
         [InlineData(@"{""ResourceGroupPrefix"":""a"",""FunctionAppSuffix"":""z""}", "https://nz.azure.net/pippo", "n")]
@@ -123,6 +132,7 @@ public void FromFunctionAppUrl_Succeeds(string jsonData, string url, string expe
         }
 
         [Theory]
+        [InlineData(@"{}", "n", "n")]
         [InlineData(@"{""ResourceGroupPrefix"":""a""}", "n", "an")]
         [InlineData(@"{""ResourceGroupSuffix"":""z""}", "n", "nz")]
         [InlineData(@"{""ResourceGroupPrefix"":""p"",""ResourceGroupSuffix"":""s""}", "n", "pns")]