fix: resolve CIDR expansion not working properly

- Remove unreachable early return in ConfigurationParser.ParseAndValidateAsync()
- Fix property mapping issues (http_path -> path, http_match -> expect_text)
- Change ConfigurationParser service registration from Singleton to Scoped
- Ensure CIDR ranges like 10.18.8.0/24 are properly expanded to individual IPs

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <[email protected]>

Author: hemanandr

ThingConnect.Pulse.Server/Program.cs

@@ -135,10 +135,11 @@ public static async Task Main(string[] args)
 
 
             // Add configuration services
-            builder.Services.AddSingleton<ConfigurationParser>(serviceProvider =>
+            builder.Services.AddScoped<ConfigurationParser>(serviceProvider =>
             {
                 ILogger<ConfigurationParser> logger = serviceProvider.GetRequiredService<ILogger<ConfigurationParser>>();
-                return ConfigurationParser.CreateAsync(logger).GetAwaiter().GetResult();
+                IDiscoveryService discoveryService = serviceProvider.GetRequiredService<IDiscoveryService>();
+                return ConfigurationParser.CreateAsync(logger, discoveryService).GetAwaiter().GetResult();
             });
             builder.Services.AddScoped<IConfigurationService, ConfigurationService>();
             builder.Services.AddScoped<ISettingsService, SettingsService>();

ThingConnect.Pulse.Server/Services/ConfigurationParser.cs

@@ -1,6 +1,7 @@
 using NJsonSchema;
 using ThingConnect.Pulse.Server.Data;
 using ThingConnect.Pulse.Server.Models;
+using ThingConnect.Pulse.Server.Services.Monitoring;
 using YamlDotNet.Serialization;
 using YamlDotNet.Serialization.NamingConventions;
 
@@ -11,17 +12,19 @@ public sealed class ConfigurationParser
     private readonly IDeserializer _yamlDeserializer;
     private readonly JsonSchema _schema;
     private readonly ILogger<ConfigurationParser> _logger;
+    private readonly IDiscoveryService _discoveryService;
 
-    private ConfigurationParser(JsonSchema schema, ILogger<ConfigurationParser> logger)
+    private ConfigurationParser(JsonSchema schema, ILogger<ConfigurationParser> logger, IDiscoveryService discoveryService)
     {
         _yamlDeserializer = new DeserializerBuilder()
             .WithNamingConvention(UnderscoredNamingConvention.Instance)
             .Build();
         _schema = schema;
         _logger = logger;
+        _discoveryService = discoveryService;
     }
 
-    public static async Task<ConfigurationParser> CreateAsync(ILogger<ConfigurationParser> logger)
+    public static async Task<ConfigurationParser> CreateAsync(ILogger<ConfigurationParser> logger, IDiscoveryService discoveryService)
     {
         string assemblyLocation = System.Reflection.Assembly.GetExecutingAssembly().Location;
         string? assemblyDirectory = Path.GetDirectoryName(assemblyLocation);
@@ -43,7 +46,7 @@ public static async Task<ConfigurationParser> CreateAsync(ILogger<ConfigurationP
         string schemaJson = await File.ReadAllTextAsync(schemaPath);
         JsonSchema schema = await JsonSchema.FromJsonAsync(schemaJson);
         logger.LogInformation("Configuration schema loaded successfully");
-        return new ConfigurationParser(schema, logger);
+        return new ConfigurationParser(schema, logger, discoveryService);
     }
 
     public Task<(ConfigurationYaml? Configuration, ValidationErrorsDto? Errors)> ParseAndValidateAsync(string yamlContent)
@@ -62,7 +65,6 @@ public static async Task<ConfigurationParser> CreateAsync(ILogger<ConfigurationP
                 .Build();
             string configJson = serializer.Serialize(config);
 
-            return Task.FromResult<(ConfigurationYaml? Configuration, ValidationErrorsDto? Errors)>((config, null));
             // Perform schema validation
             ICollection<NJsonSchema.Validation.ValidationError> validationResults = _schema.Validate(configJson);
 
@@ -135,7 +137,7 @@ public static async Task<ConfigurationParser> CreateAsync(ILogger<ConfigurationP
         }
     }
 
-    public (List<Group> Groups, List<Data.Endpoint> Endpoints) ConvertToEntities(ConfigurationYaml config)
+    public async Task<(List<Group> Groups, List<Data.Endpoint> Endpoints)> ConvertToEntitiesAsync(ConfigurationYaml config)
     {
         var groups = config.Groups.Select(g => new Group
         {
@@ -146,21 +148,32 @@ public static async Task<ConfigurationParser> CreateAsync(ILogger<ConfigurationP
             SortOrder = g.SortOrder ?? 0
         }).ToList();
 
-        var endpoints = config.Targets.Select(t => new Data.Endpoint
+        // Convert config targets to dynamic objects for DiscoveryService
+        var dynamicTargets = config.Targets.Select(t => new
         {
-            Id = Guid.NewGuid(),
-            Name = t.Name ?? "Unnamed",
-            GroupId = t.Group,
-            Type = t.Type,
-            Host = t.Host ?? t.Cidr ?? t.Wildcard ?? "localhost",
-            Port = t.Port,
-            IntervalSeconds = t.IntervalSeconds ?? config.Defaults.IntervalSeconds,
-            TimeoutMs = t.TimeoutMs ?? config.Defaults.TimeoutMs,
-            Retries = t.Retries ?? config.Defaults.Retries,
-            HttpPath = t.HttpPath,
-            HttpMatch = t.HttpMatch ?? config.Defaults.Http?.ExpectText,
-            Enabled = t.Enabled ?? true
-        }).ToList();
+            type = t.Type.ToString().ToLower(),
+            host = t.Host,
+            cidr = t.Cidr,
+            wildcard = t.Wildcard,
+            port = t.Port,
+            name = t.Name,
+            group = t.Group,
+            interval_seconds = t.IntervalSeconds ?? config.Defaults.IntervalSeconds,
+            timeout_ms = t.TimeoutMs ?? config.Defaults.TimeoutMs,
+            retries = t.Retries ?? config.Defaults.Retries,
+            path = t.HttpPath,
+            expect_text = t.HttpMatch ?? config.Defaults.Http?.ExpectText,
+            enabled = t.Enabled ?? true,
+            notes = t.Notes,
+            expected_rtt_ms = t.ExpectedRttMs
+        }).Cast<dynamic>().ToList();
+
+        // Use DiscoveryService to expand CIDR ranges, wildcards, and hostnames
+        IEnumerable<Data.Endpoint> expandedEndpoints = await _discoveryService.ExpandTargetsAsync(dynamicTargets);
+        var endpoints = expandedEndpoints.ToList();
+
+        _logger.LogInformation("Converted configuration with {GroupCount} groups and {TargetCount} targets into {EndpointCount} endpoints",
+            groups.Count, config.Targets.Count, endpoints.Count);
 
         return (groups, endpoints);
     }

ThingConnect.Pulse.Server/Services/ConfigurationService.cs

@@ -58,7 +58,7 @@ public async Task<ApplyResultDto> ApplyConfigurationAsync(string yamlContent, st
             };
         }
 
-        (List<Group> groups, List<Data.Endpoint> endpoints) = _parser.ConvertToEntities(configuration!);
+        (List<Group> groups, List<Data.Endpoint> endpoints) = await _parser.ConvertToEntitiesAsync(configuration!);
 
         using Microsoft.EntityFrameworkCore.Storage.IDbContextTransaction transaction = await _context.Database.BeginTransactionAsync();
         try
@@ -170,7 +170,7 @@ public async Task<ApplyResultDto> PreviewChangesAsync(string yamlContent)
             throw new InvalidOperationException("Configuration parsing returned null");
         }
 
-        (List<Group> groups, List<Data.Endpoint> endpoints) = _parser.ConvertToEntities(configuration!);
+        (List<Group> groups, List<Data.Endpoint> endpoints) = await _parser.ConvertToEntitiesAsync(configuration!);
 
         List<Group> existingGroups = await _context.Groups.ToListAsync();
         List<Data.Endpoint> existingEndpoints = await _context.Endpoints.ToListAsync();