Merge branch 'main' of https://github.com/microsoft/sqltoolsservice

microsoft · Oct 22, 2024 · 6c449bd · 6c449bd
2 parents 6286c28 + 71f373c
commit 6c449bd
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,6 @@
+{
+    "sarif-viewer.connectToGithubCodeScanning": "off",
+    "csharp.debug.sourceFileMap": {
+      "/_/src/Microsoft.SqlTools.ServiceLayer": "${workspaceFolder}/src/Microsoft.SqlTools.ServiceLayer"
+     }
+}
diff --git a/src/Microsoft.SqlTools.Migration/MigrationService.cs b/src/Microsoft.SqlTools.Migration/MigrationService.cs
@@ -611,11 +611,15 @@ internal async Task HandleGetArmTemplateRequest(
         {
             try
             {
+                Logger.Verbose("request received in toolsservice");
                 ProvisioningScriptServiceProvider provider = new ProvisioningScriptServiceProvider();
                 string searchPattern = $"*{targetType}-Baseline*.json";
                 string skuRecommendationReportFilePath = Directory.GetFiles(SqlAssessmentConfiguration.ReportsAndLogsRootFolderPath, searchPattern).FirstOrDefault();
+                Logger.Verbose($"Logging report file path -- {skuRecommendationReportFilePath}");
                 List<SkuRecommendationResult> recommendations = ExtractSkuRecommendationReportAction.ExtractSkuRecommendationsFromReport(skuRecommendationReportFilePath);
+                Logger.Verbose($"recommendations generated-- {recommendations.Count}");
                 List<SqlArmTemplate> templateList = provider.GenerateProvisioningScript(recommendations);
+                Logger.Verbose($"ARM templates generated-- {templateList.Count}");
                 List<string> armTemplates = new List<string>();
                 foreach (SqlArmTemplate template in templateList)
                 {
@@ -624,13 +628,17 @@ internal async Task HandleGetArmTemplateRequest(
                         Formatting.Indented,
                         new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore, Culture = CultureInfo.InvariantCulture }
                         );
+                    Logger.Verbose($"Logging ARM templates -- {jsonOutput}");
                     armTemplates.Add(jsonOutput);
                 }
+                Logger.Verbose($"sending response -- {armTemplates.Count}");
                 await requestContext.SendResult(armTemplates);
             }
             catch (Exception e)
             {
                 await requestContext.SendError(e.ToString());
+                Logger.Verbose($"inside catch block --  ");
+                await requestContext.SendError(e.ToString());
             }
         }