fix for extractor to associate groups to products (#251)

Author: UmairSyed

src/APIM_ARMTemplate/apimtemplate/Common/Constants/ResourceTypeConstants.cs

@@ -19,6 +19,7 @@ internal static class ResourceTypeConstants
         public const string Logger = "Microsoft.ApiManagement/service/loggers";
         public const string ProductAPI = "Microsoft.ApiManagement/service/products/apis";
         public const string Product = "Microsoft.ApiManagement/service/products";
+        public const string ProductGroup = "Microsoft.ApiManagement/service/products/groups";
         public const string ProductTag = "Microsoft.ApiManagement/service/products/tags";
         public const string ProductPolicy = "Microsoft.ApiManagement/service/products/policies";
         public const string Property = "Microsoft.ApiManagement/service/properties";

src/APIM_ARMTemplate/apimtemplate/Common/TemplateModels/ProductGroupsTemplateResource.cs

@@ -0,0 +1,22 @@
+using System.Collections.Generic;
+namespace Microsoft.Azure.Management.ApiManagement.ArmTemplates.Common
+{
+    public class ProductGroupsTemplateResource
+    {
+        public List<ProductGroupsValue> value { get; set; }
+    }
+
+    public class ProductGroupsValue : TemplateResource
+    {
+        public ProductGroupTemplateProperties properties { get; set; }
+    }
+
+    public class ProductGroupTemplateProperties
+    {
+        public string description { get; set; }
+        public string displayName { get; set; }
+        public string type { get; set; }
+        public string? externalId { get; set; }
+        public bool builtIn { get; set; }
+    }
+}

src/APIM_ARMTemplate/apimtemplate/Extractor/EntityExtractors/ProductExtractor.cs

@@ -47,7 +47,16 @@ public async Task<string> GetProductPolicyAsync(string ApiManagementName, string
             return await CallApiManagementAsync(azToken, requestUrl);
         }
 
+        public async Task<string> GetProductGroupsAsync(string ApiManagementName, string ResourceGroupName, string ProductName)
+        {
+            (string azToken, string azSubId) = await auth.GetAccessToken();
+
+            string requestUrl = string.Format("{0}/subscriptions/{1}/resourceGroups/{2}/providers/Microsoft.ApiManagement/service/{3}/products/{4}/groups?api-version={5}",
+            baseUrl, azSubId, ResourceGroupName, ApiManagementName, ProductName, GlobalConstants.APIVersion);
 
+            return await CallApiManagementAsync(azToken, requestUrl);
+        }
+        
         public async Task<string> GetProductTagsAsync(string ApiManagementName, string ResourceGroupName, string ProductName)
         {
             (string azToken, string azSubId) = await auth.GetAccessToken();
@@ -57,7 +66,7 @@ public async Task<string> GetProductTagsAsync(string ApiManagementName, string R
 
             return await CallApiManagementAsync(azToken, requestUrl);
         }
-
+        
         public async Task<Template> GenerateProductsARMTemplateAsync(string apimname, string resourceGroup, string singleApiName, List<TemplateResource> apiTemplateResources, string policyXMLBaseUrl, string fileFolder)
         {
             Console.WriteLine("------------------------------------------");
@@ -88,6 +97,9 @@ public async Task<Template> GenerateProductsARMTemplateAsync(string apimname, st
                 productsTemplateResource.name = $"[concat(parameters('ApimServiceName'), '/{productName}')]";
                 productsTemplateResource.apiVersion = GlobalConstants.APIVersion;
 
+                string productGroupDetails = await GetProductGroupsAsync(apimname, resourceGroup, productName);
+                ProductGroupsTemplateResource productGroupsDetails = JsonConvert.DeserializeObject<ProductGroupsTemplateResource>(productGroupDetails, settings);
+
                 // only extract the product if this is a full extraction, or in the case of a single api, if it is found in products associated with the api
                 if (singleApiName == null || productAPIResources.SingleOrDefault(p => p.name.Contains($"/{productName}/")) != null)
                 {
@@ -97,13 +109,21 @@ public async Task<Template> GenerateProductsARMTemplateAsync(string apimname, st
                     // add product policy resource to template
                     try
                     {
+                        var productResourceId = new string[] { $"[resourceId('Microsoft.ApiManagement/service/products', parameters('ApimServiceName'), '{productName}')]" };
+                        foreach (ProductGroupsValue ProductGroup in productGroupsDetails.value)
+                        {
+                            ProductGroup.name = $"[concat(parameters('ApimServiceName'), '/{productName}/{ProductGroup.name}')]";
+                            ProductGroup.apiVersion = GlobalConstants.APIVersion;
+                            ProductGroup.dependsOn = productResourceId;
+                            templateResources.Add(ProductGroup);
+                        }
                         string productPolicy = await GetProductPolicyAsync(apimname, resourceGroup, productName);
                         Console.WriteLine($" - Product policy found for {productName} product");
                         PolicyTemplateResource productPolicyResource = JsonConvert.DeserializeObject<PolicyTemplateResource>(productPolicy);
                         productPolicyResource.name = $"[concat(parameters('ApimServiceName'), '/{productName}/policy')]";
                         productPolicyResource.apiVersion = GlobalConstants.APIVersion;
                         productPolicyResource.scale = null;
-                        productPolicyResource.dependsOn = new string[] { $"[resourceId('Microsoft.ApiManagement/service/products', parameters('ApimServiceName'), '{productName}')]" };
+                        productPolicyResource.dependsOn = productResourceId;
 
                         // write policy xml content to file and point to it if policyXMLBaseUrl is provided
                         if (policyXMLBaseUrl != null)

src/APIM_ARMTemplate/apimtemplate/apimtemplate.csproj

@@ -4,6 +4,7 @@
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.1</TargetFramework>
     <ProjectGuid>{B5183465-2BC1-4206-9C9F-5AC9615AC941}</ProjectGuid>
+    <LangVersion>preview</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>