Added custom mapping for new format in TfsNodeStructureTool

src/MigrationTools.Clients.TfsObjectModel/Tools/TfsNodeStructureToolOptions.cs

@@ -18,13 +18,21 @@ public sealed class TfsNodeStructureToolOptions : ToolOptions, ITfsNodeStructure
         /// Rules to apply to the Area Path. Is an object of NodeOptions e.g. { "Filters": ["*/**"], "Mappings": { "^oldProjectName([\\\\]?.*)$": "targetProjectA$1", } }
         /// </summary>
         /// <default>{"Filters": [], "Mappings": { "^migrationSource1([\\\\]?.*)$": "MigrationTest5$1" })</default>
-        public NodeOptions Areas { get; set; }
+        public NodeOptions Areas { get; set; } = new NodeOptions
+        {
+            Filters = new List<string>(),
+            Mappings = new Dictionary<string, string>()
+        };
 
         /// <summary>
         /// Rules to apply to the Area Path. Is an object of NodeOptions e.g. { "Filters": ["*/**"], "Mappings": { "^oldProjectName([\\\\]?.*)$": "targetProjectA$1", } }
         /// </summary>
         /// <default>{"Filters": [], "Mappings": { "^migrationSource1([\\\\]?.*)$": "MigrationTest5$1" })</default>
-        public NodeOptions Iterations { get; set; }
+        public NodeOptions Iterations { get; set; } = new NodeOptions
+        {
+            Filters = new List<string>(),
+            Mappings = new Dictionary<string, string>()
+        };
 
         /// <summary>
         /// When set to True the susyem will try to create any missing missing area or iteration paths from the revisions.

src/MigrationTools.ConsoleFull/Properties/launchSettings.json

@@ -25,7 +25,7 @@
     },
     "Upgrade": {
       "commandName": "Project",
-      "commandLineArgs": "upgrade -c \"C:\\Users\\MartinHinshelwoodNKD\\source\\repos\\azure-devops-migration-tools\\docs\\_includes\\sampleConfig\\configuration-full.json\" --debugTrace"
+      "commandLineArgs": "upgrade -c \"C:\\Users\\MartinHinshelwoodNKD\\source\\Danlewis3.json\" --debugTrace"
     },
     "Execute Classic": {
       "commandName": "Project",

src/MigrationTools/Endpoints/Infrastructure/EndpointRegistrationExtensions.cs

@@ -20,6 +20,11 @@ public static void AddConfiguredEndpoints(this IServiceCollection services, ICon
             {
                 var endpointName = endpointConfig.Key;
                 var endpointType = endpointConfig.GetValue<string>("EndpointType");
+                if (string.IsNullOrEmpty(endpointType))
+                {
+                    Log.Warning("Endpoint '{EndpointName}' does not have a type configured. Skipping.", endpointName);
+                    continue;
+                }
                 AddEndPointSingleton(services, configuration, endpointConfig, endpointName, endpointType);
             }
         }

src/MigrationTools/Options/OptionsConfigurationUpgrader.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Configuration;
 using System.Diagnostics;
+using System.Dynamic;
 using System.IO;
 using System.Linq;
 using System.Reflection;
@@ -24,6 +25,7 @@
 using MigrationTools.Processors.Infrastructure;
 using MigrationTools.Services;
 using Newtonsoft.Json.Linq;
+using static System.Collections.Specialized.BitVector32;
 
 namespace MigrationTools.Options
 {
@@ -153,12 +155,47 @@ private List<IOptions> ParseSectionCollectionWithTypePropertyNameToList(IConfigu
                 _logger.LogDebug("Upgrading {group} item {old} to {new}", path, optionTypeString, newOptionTypeString);
                 var option = GetOptionWithDefaults(configuration, newOptionTypeString);
                 childSection.Bind(option);
+                switch (optionTypeString)
+                {
+                    case "TfsNodeStructureOptions":
+                        MapTfsNodeStructureOptions(childSection, option);
+                        _logger.LogWarning("Empty type string found in {path}", path);
+                        break;
+                    default:
+                        break;
+                }
+
+
                 options.Add(option);
             }
 
             return options;
         }
 
+        private void MapTfsNodeStructureOptions(IConfigurationSection section, dynamic option)
+        {
+            // Map AreaMaps from the old structure to the new Areas.Mappings
+            var areaMaps = section.GetSection("AreaMaps").GetChildren();
+            foreach (var areaMap in areaMaps)
+            {
+                var key = areaMap.Key;
+                var value = areaMap.Value;
+                option.Areas.Mappings.Add(key, value);
+            }
+
+            // Map IterationMaps from the old structure to the new Iterations.Mappings
+            var iterationMaps = section.GetSection("IterationMaps").GetChildren();
+            foreach (var iterationMap in iterationMaps)
+            {
+                var key = iterationMap.Key;
+                var value = iterationMap.Value;
+                option.Iterations.Mappings.Add(key, value);
+            }
+            // Now map the intermediate structure back into the original `option` object
+            _logger.LogDebug("Mapped TfsNodeStructureOptions to TfsNodeStructureTool structure and updated the options object.");
+        }
+
+
         private List<IOptions> ParseV1FieldMaps(IConfiguration configuration)
         {
             List<IOptions> options = new List<IOptions>();