Features/productgroup (#352)

* [Creator] added product group

* [Creator] added Tests for ProductGroup

Author: Ben-Duf

src/APIM_ARMTemplate/apimtemplate.test/Creator/TemplateCreatorFactories/ProductTemplateCreatorFactory.cs

@@ -8,7 +8,8 @@ public class ProductTemplateCreatorFactory
         public static ProductTemplateCreator GenerateProductTemplateCreator()
         {
             PolicyTemplateCreator policyTemplateCreator = PolicyTemplateCreatorFactory.GeneratePolicyTemplateCreator();
-            ProductTemplateCreator productTemplateCreator = new ProductTemplateCreator(policyTemplateCreator);
+            ProductGroupTemplateCreator productGroupTemplateCreator = new ProductGroupTemplateCreator();
+            ProductTemplateCreator productTemplateCreator = new ProductTemplateCreator(policyTemplateCreator, productGroupTemplateCreator);
             return productTemplateCreator;
         }
     }

src/APIM_ARMTemplate/apimtemplate.test/Creator/TemplateCreatorTests/ProductGroupTemplateCreatorTests.cs

@@ -0,0 +1,47 @@
+using System.Collections.Generic;
+using Xunit;
+using Microsoft.Azure.Management.ApiManagement.ArmTemplates.Common;
+using Microsoft.Azure.Management.ApiManagement.ArmTemplates.Create;
+
+namespace Microsoft.Azure.Management.ApiManagement.ArmTemplates.Test
+{
+    public class ProductGroupTemplateCreatorTests
+    {
+        [Fact]
+        public void ShouldCreateProductGroupTemplateResourceFromValues()
+        {
+            // arrange
+            ProductGroupTemplateCreator productgroupTemplateCreator = new ProductGroupTemplateCreator();
+            string groupName  = "groupName";
+            string productName = "productName";
+            string[] dependsOn = new string[] { "dependsOn" };
+
+            // act
+            ProductGroupsValue productGroupTemplateResource = productgroupTemplateCreator.CreateProductGroupTemplateResource(groupName, productName, dependsOn);
+
+            // assert
+            Assert.Equal($"[concat(parameters('ApimServiceName'), '/{productName}/{groupName}')]", productGroupTemplateResource.name);
+            Assert.Equal(dependsOn, productGroupTemplateResource.dependsOn);
+        }
+
+        [Fact]
+        public void ShouldCreateCorrectNumberOfProductGroupTemplateResourcesFromCreatorConfig()
+        {
+            // arrange
+            ProductGroupTemplateCreator productgroupTemplateCreator = new ProductGroupTemplateCreator();
+            ProductConfig config = new ProductConfig()
+            {
+                groups = "1, 2, 3"
+            };
+            int count = 3;
+            string[] dependsOn = new string[] { "dependsOn" };
+
+            // act
+            List<ProductGroupsValue> productAPITemplateResources = productgroupTemplateCreator.CreateProductGroupTemplateResources(config, dependsOn);
+
+            // assert
+            Assert.Equal(count, productAPITemplateResources.Count);
+            
+        }
+    }
+}

src/APIM_ARMTemplate/apimtemplate/Commands/Create.cs

@@ -44,9 +44,10 @@ public CreateCommand()
                     ProductAPITemplateCreator productAPITemplateCreator = new ProductAPITemplateCreator();
                     TagAPITemplateCreator tagAPITemplateCreator = new TagAPITemplateCreator();
                     PolicyTemplateCreator policyTemplateCreator = new PolicyTemplateCreator(fileReader);
+                    ProductGroupTemplateCreator productGroupTemplateCreator = new ProductGroupTemplateCreator();
                     DiagnosticTemplateCreator diagnosticTemplateCreator = new DiagnosticTemplateCreator();
                     ReleaseTemplateCreator releaseTemplateCreator = new ReleaseTemplateCreator();
-                    ProductTemplateCreator productTemplateCreator = new ProductTemplateCreator(policyTemplateCreator);
+                    ProductTemplateCreator productTemplateCreator = new ProductTemplateCreator(policyTemplateCreator, productGroupTemplateCreator);
                     TagTemplateCreator tagTemplateCreator = new TagTemplateCreator();
                     APITemplateCreator apiTemplateCreator = new APITemplateCreator(fileReader, policyTemplateCreator, productAPITemplateCreator, tagAPITemplateCreator, diagnosticTemplateCreator, releaseTemplateCreator);
                     MasterTemplateCreator masterTemplateCreator = new MasterTemplateCreator();

src/APIM_ARMTemplate/apimtemplate/Creator/Models/CreatorConfiguration.cs

@@ -84,6 +84,8 @@ public class ProductConfig : ProductsTemplateProperties
     {
         // policy file location (local or url)
         public string policy { get; set; }
+        // coma separated names
+        public string groups { get; set; }
     }
 
 }

src/APIM_ARMTemplate/apimtemplate/Creator/TemplateCreators/ProductGroupTemplateCreator.cs

@@ -0,0 +1,35 @@
+using System.Collections.Generic;
+using Microsoft.Azure.Management.ApiManagement.ArmTemplates.Common;
+
+namespace Microsoft.Azure.Management.ApiManagement.ArmTemplates.Create
+{
+    public class ProductGroupTemplateCreator
+    {
+        public ProductGroupsValue CreateProductGroupTemplateResource(string groupName, string productName, string[] dependsOn)
+        {
+            // create products/apis resource with properties
+            ProductGroupsValue productAPITemplateResource = new ProductGroupsValue()
+            {
+                name = $"[concat(parameters('{ParameterNames.ApimServiceName}'), '/{productName}/{groupName}')]",
+                type = ResourceTypeConstants.ProductGroup,
+                apiVersion = GlobalConstants.APIVersion,
+                dependsOn = dependsOn
+            };
+            return productAPITemplateResource;
+        }
+
+        public List<ProductGroupsValue> CreateProductGroupTemplateResources(ProductConfig product, string[] dependsOn)
+        {
+            // create a products/apis association resource for each product provided in the config file
+            List<ProductGroupsValue> productGroupTemplates = new List<ProductGroupsValue>();
+            // products is comma separated list of productIds
+            string[] groupNames = product.groups.Split(", ");
+            foreach (string groupName in groupNames)
+            {
+                ProductGroupsValue productAPITemplate = this.CreateProductGroupTemplateResource(groupName, product.displayName, dependsOn);
+                productGroupTemplates.Add(productAPITemplate);
+            }
+            return productGroupTemplates;
+        }
+    }
+}

src/APIM_ARMTemplate/apimtemplate/Creator/TemplateCreators/ProductTemplateCreator.cs

@@ -6,10 +6,12 @@ namespace Microsoft.Azure.Management.ApiManagement.ArmTemplates.Create
     public class ProductTemplateCreator : TemplateCreator
     {
         private PolicyTemplateCreator policyTemplateCreator;
+        private ProductGroupTemplateCreator productGroupTemplateCreator;
 
-        public ProductTemplateCreator(PolicyTemplateCreator policyTemplateCreator)
+        public ProductTemplateCreator(PolicyTemplateCreator policyTemplateCreator,ProductGroupTemplateCreator productGroupTemplateCreator)
         {
             this.policyTemplateCreator = policyTemplateCreator;
+            this.productGroupTemplateCreator = productGroupTemplateCreator;
         }
 
         public Template CreateProductTemplate(CreatorConfig creatorConfig)
@@ -53,6 +55,14 @@ public Template CreateProductTemplate(CreatorConfig creatorConfig)
                     PolicyTemplateResource productPolicy = this.policyTemplateCreator.CreateProductPolicyTemplateResource(product, dependsOn);
                     resources.Add(productPolicy);
                 }
+
+                // create product group resources if provided
+                if(product.groups != null)
+                {
+                    string[] dependsOn = new string[] { $"[resourceId('Microsoft.ApiManagement/service/products', parameters('{ParameterNames.ApimServiceName}'), '{product.displayName}')]" };
+                    List<ProductGroupsValue> productGroups = this.productGroupTemplateCreator.CreateProductGroupTemplateResources(product, dependsOn);
+                    resources.AddRange(productGroups);
+                }
             }
 
             productTemplate.resources = resources.ToArray();