Remove property extraction limit of 100 (#482)

* #456 Remove property extraction limit

* Remove debugging helper

Co-authored-by: Wendelin Niesl <Wendelin.Niesl@plan-b-gmbh.com>
Co-authored-by: RupengLiu <rliu1211@terpmail.umd.edu>

Author: 3 people

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

@@ -471,12 +471,12 @@ public async Task<Template> CreateMasterTemplateParameterValues(List<string> api
             {
                 Dictionary<string, string> namedValues = new Dictionary<string, string>();
                 PropertyExtractor pExc = new PropertyExtractor();
-                string properties = await pExc.GetPropertiesAsync(exc.sourceApimName, exc.resourceGroup);
-                JObject oProperties = JObject.Parse(properties);
+                string[] properties = await pExc.GetPropertiesAsync(exc.sourceApimName, exc.resourceGroup);
 
-                foreach (var extractedProperty in oProperties["value"])
+                foreach (var extractedProperty in properties)
                 {
-                    string propertyName = ((JValue)extractedProperty["name"]).Value.ToString();
+                    JToken oProperty = JObject.Parse(extractedProperty);
+                    string propertyName = ((JValue)oProperty["name"]).Value.ToString();
                     string fullPropertyResource = await pExc.GetPropertyDetailsAsync(exc.sourceApimName, exc.resourceGroup, propertyName);
                     PropertyTemplateResource propertyTemplateResource = JsonConvert.DeserializeObject<PropertyTemplateResource>(fullPropertyResource);
                     string propertyValue = propertyTemplateResource.properties.value;

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

@@ -4,19 +4,38 @@
 using System.Collections.Generic;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
+using System.Linq;
 
 namespace Microsoft.Azure.Management.ApiManagement.ArmTemplates.Extract
 {
     public class PropertyExtractor : EntityExtractor
     {
-        public async Task<string> GetPropertiesAsync(string ApiManagementName, string ResourceGroupName)
+        public async Task<string[]> GetPropertiesAsync(string ApiManagementName, string ResourceGroupName)
         {
-            (string azToken, string azSubId) = await auth.GetAccessToken();
+            JObject oProperty = new JObject();
+            int numOfProperties = 0;
+            List<string> propertyObjs = new List<string>();
+            do
+            {
+                (string azToken, string azSubId) = await auth.GetAccessToken();
 
-            string requestUrl = string.Format("{0}/subscriptions/{1}/resourceGroups/{2}/providers/Microsoft.ApiManagement/service/{3}/properties?api-version={4}",
-               baseUrl, azSubId, ResourceGroupName, ApiManagementName, GlobalConstants.APIVersion);
+                string requestUrl = string.Format("{0}/subscriptions/{1}/resourceGroups/{2}/providers/Microsoft.ApiManagement/service/{3}/properties?$skip={4}&api-version={5}",
+                   baseUrl, azSubId, ResourceGroupName, ApiManagementName, numOfProperties, GlobalConstants.APIVersion);
 
-            return await CallApiManagementAsync(azToken, requestUrl);
+                numOfProperties += GlobalConstants.NumOfRecords;
+
+                string properties = await CallApiManagementAsync(azToken, requestUrl);
+
+                oProperty = JObject.Parse(properties);
+
+                foreach (var item in oProperty["value"])
+                {
+                    propertyObjs.Add(item.ToString());
+                }
+            }
+            while (oProperty["nextLink"] != null);
+
+            return propertyObjs.ToArray();
         }
 
         public async Task<string> GetPropertyDetailsAsync(string ApiManagementName, string ResourceGroupName, string propertyName)
@@ -45,12 +64,12 @@ public async Task<Template> GenerateNamedValuesTemplateAsync(string singleApiNam
             List<TemplateResource> templateResources = new List<TemplateResource>();
 
             // pull all named values (properties) for service
-            string properties = await GetPropertiesAsync(exc.sourceApimName, exc.resourceGroup);
-            JObject oProperties = JObject.Parse(properties);
+            string[] properties = await GetPropertiesAsync(exc.sourceApimName, exc.resourceGroup);
 
-            foreach (var extractedProperty in oProperties["value"])
+            foreach (var extractedProperty in properties)
             {
-                string propertyName = ((JValue)extractedProperty["name"]).Value.ToString();
+                JToken oProperty = JObject.Parse(extractedProperty);
+                string propertyName = ((JValue)oProperty["name"]).Value.ToString();
                 string fullPropertyResource = await GetPropertyDetailsAsync(exc.sourceApimName, exc.resourceGroup, propertyName);
 
                 // convert returned named value to template resource class