extract named values and write to template, fixes myriad issues with other resources that use them

Author: lucashuet93

src/APIM_ARMTemplate/apimtemplate/Commands/Extract.cs

@@ -69,6 +69,7 @@ private void GenerateARMTemplate(string apimname, string resourceGroup, string f
 
             if (singleApiName == null)
             {
+                GenerateNamedValuesTemplate(resourceGroup, apimname, fileFolder);
                 GenerateLoggerTemplate(resourceGroup, apimname, fileFolder);
             }
 
@@ -390,16 +391,10 @@ private async void GenerateLoggerTemplate(string resourceGroup, string apimname,
             Console.WriteLine("------------------------------------------");
             Console.WriteLine("Getting loggers from service");
             LoggerExtractor loggerExtractor = new LoggerExtractor();
-            PropertyExtractor propertyExtractor = new PropertyExtractor();
             Template armTemplate = GenerateEmptyTemplateWithParameters();
 
             List<TemplateResource> templateResources = new List<TemplateResource>();
 
-            // pull named values for later credential reference
-            string properties = propertyExtractor.GetProperties(apimname, resourceGroup).Result;
-            JObject oProperties = JObject.Parse(properties);
-            List<PropertyTemplateResource> propertyResources = oProperties["value"].ToObject<List<PropertyTemplateResource>>();
-
             string loggers = loggerExtractor.GetLoggers(apimname, resourceGroup).Result;
             JObject oLoggers = JObject.Parse(loggers);
             foreach (var extractedLogger in oLoggers["value"])
@@ -414,13 +409,6 @@ private async void GenerateLoggerTemplate(string resourceGroup, string apimname,
                 loggerResource.apiVersion = "2018-06-01-preview";
                 loggerResource.scale = null;
 
-                // swap instrumentation key credentials for their hidden values if the logger is app insights, taken from named values
-                if (loggerResource.properties.credentials != null && loggerResource.properties.credentials.instrumentationKey != null)
-                {
-                    string hiddenKey = loggerResource.properties.credentials.instrumentationKey.Substring(2, loggerResource.properties.credentials.instrumentationKey.Length - 4);
-                    loggerResource.properties.credentials.instrumentationKey = propertyResources.Find(p => p.properties.displayName == hiddenKey).properties.value;
-                }
-
                 templateResources.Add(loggerResource);
             }
 
@@ -429,6 +417,38 @@ private async void GenerateLoggerTemplate(string resourceGroup, string apimname,
             fileWriter.WriteJSONToFile(armTemplate, @fileFolder + Path.DirectorySeparatorChar + apimname + "-loggers.json");
         }
 
+        private async void GenerateNamedValuesTemplate(string resourceGroup, string apimname, string fileFolder)
+        {
+            Console.WriteLine("------------------------------------------");
+            Console.WriteLine("Getting named values from service");
+            PropertyExtractor propertyExtractor = new PropertyExtractor();
+            Template armTemplate = GenerateEmptyTemplateWithParameters();
+
+            List<TemplateResource> templateResources = new List<TemplateResource>();
+
+            // pull named values for later credential reference
+            string properties = propertyExtractor.GetProperties(apimname, resourceGroup).Result;
+            JObject oProperties = JObject.Parse(properties);
+            foreach (var extractedProperty in oProperties["value"])
+            {
+                string propertyName = ((JValue)extractedProperty["name"]).Value.ToString();
+                Console.WriteLine("'{0}' Named value found", propertyName);
+
+                string fullLoggerResource = await propertyExtractor.GetProperty(apimname, resourceGroup, propertyName);
+                PropertyTemplateResource propertyTemplateResource = JsonConvert.DeserializeObject<PropertyTemplateResource>(fullLoggerResource);
+                propertyTemplateResource.name = $"[concat(parameters('ApimServiceName'), '/{propertyName}')]";
+                propertyTemplateResource.type = "Microsoft.ApiManagement/service/properties";
+                propertyTemplateResource.apiVersion = "2018-06-01-preview";
+                propertyTemplateResource.scale = null;
+
+                templateResources.Add(propertyTemplateResource);
+            }
+
+            armTemplate.resources = templateResources.ToArray();
+            FileWriter fileWriter = new FileWriter();
+            fileWriter.WriteJSONToFile(armTemplate, @fileFolder + Path.DirectorySeparatorChar + apimname + "-namedvalues.json");
+        }
+
         public Template GenerateEmptyTemplateWithParameters()
         {
             TemplateCreator templateCreator = new TemplateCreator();

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

@@ -20,6 +20,16 @@ public async Task<string> GetProperties(string ApiManagementName, string Resourc
             return await CallApiManagement(azToken, requestUrl);
         }
 
+        public async Task<string> GetProperty(string ApiManagementName, string ResourceGroupName, string propertyName)
+        {
+            (string azToken, string azSubId) = await auth.GetAccessToken();
+
+            string requestUrl = string.Format("{0}/subscriptions/{1}/resourceGroups/{2}/providers/Microsoft.ApiManagement/service/{3}/properties/{4}?api-version={5}",
+               baseUrl, azSubId, ResourceGroupName, ApiManagementName, propertyName, Constants.APIVersion);
+
+            return await CallApiManagement(azToken, requestUrl);
+        }
+
         private static async Task<string> CallApiManagement(string azToken, string requestUrl)
         {
             using (HttpClient httpClient = new HttpClient())