Centralize config file search and schema version validation to avoid duplication

Co-authored-by: waldekmastykarz <11164679+waldekmastykarz@users.noreply.github.com>

Author: Copilot

DevProxy.Abstractions/Utils/ProxyUtils.cs

@@ -273,6 +273,25 @@ public static void ValidateSchemaVersion(string schemaUrl, ILogger logger)
             return;
         }
 
+        var warning = GetSchemaVersionMismatchWarning(schemaUrl);
+        if (warning is not null)
+        {
+            logger.LogWarning("{Warning}", warning);
+        }
+    }
+
+    /// <summary>
+    /// Checks if the schema URL version matches the current Dev Proxy version.
+    /// Returns a warning message if versions don't match, or null if they match
+    /// or the schema URL cannot be parsed.
+    /// </summary>
+    public static string? GetSchemaVersionMismatchWarning(string schemaUrl)
+    {
+        if (string.IsNullOrWhiteSpace(schemaUrl))
+        {
+            return null;
+        }
+
         try
         {
             var uri = new Uri(schemaUrl);
@@ -285,18 +304,47 @@ public static void ValidateSchemaVersion(string schemaUrl, ILogger logger)
                 if (CompareSemVer(currentVersion, schemaVersion) != 0)
                 {
                     var currentSchemaUrl = uri.ToString().Replace($"/v{schemaVersion}/", $"/v{currentVersion}/", StringComparison.OrdinalIgnoreCase);
-                    logger.LogWarning("The version of schema does not match the installed Dev Proxy version, the expected schema is {Schema}", currentSchemaUrl);
+                    return $"The version of schema does not match the installed Dev Proxy version, the expected schema is {currentSchemaUrl}";
                 }
             }
-            else
-            {
-                logger.LogDebug("Invalid schema {SchemaUrl}, skipping schema version validation.", schemaUrl);
-            }
         }
-        catch (Exception ex)
+        catch
         {
-            logger.LogWarning("Invalid schema {SchemaUrl}, skipping schema version validation. Error: {Error}", schemaUrl, ex.Message);
+            // Ignore schema URL parsing errors
         }
+
+        return null;
+    }
+
+    /// <summary>
+    /// Returns the ordered list of config file paths to search.
+    /// The first existing file in the list should be used.
+    /// </summary>
+    public static IEnumerable<string?> GetConfigFileCandidates(string? userConfigFile)
+    {
+        return [
+            // config file specified by the user takes precedence
+            // null if not specified
+            userConfigFile,
+            // current directory - JSON/JSONC files
+            "devproxyrc.jsonc",
+            "devproxyrc.json",
+            // current directory - YAML files
+            "devproxyrc.yaml",
+            "devproxyrc.yml",
+            // .devproxy subdirectory - JSON/JSONC files
+            Path.Combine(".devproxy", "devproxyrc.jsonc"),
+            Path.Combine(".devproxy", "devproxyrc.json"),
+            // .devproxy subdirectory - YAML files
+            Path.Combine(".devproxy", "devproxyrc.yaml"),
+            Path.Combine(".devproxy", "devproxyrc.yml"),
+            // app folder - JSON/JSONC files
+            Path.Combine(AppFolder ?? "", "devproxyrc.jsonc"),
+            Path.Combine(AppFolder ?? "", "devproxyrc.json"),
+            // app folder - YAML files
+            Path.Combine(AppFolder ?? "", "devproxyrc.yaml"),
+            Path.Combine(AppFolder ?? "", "devproxyrc.yml")
+        ];
     }
 
     /// <summary>

DevProxy/Commands/ConfigCommand.cs

@@ -504,16 +504,7 @@ private static string GetTargetFolderPath(string appFolder, string configId)
             return File.Exists(resolved) ? resolved : null;
         }
 
-        string?[] configFiles = [
-            "devproxyrc.jsonc",
-            "devproxyrc.json",
-            Path.Combine(".devproxy", "devproxyrc.jsonc"),
-            Path.Combine(".devproxy", "devproxyrc.json"),
-            Path.Combine(ProxyUtils.AppFolder ?? "", "devproxyrc.jsonc"),
-            Path.Combine(ProxyUtils.AppFolder ?? "", "devproxyrc.json")
-        ];
-
-        foreach (var configFile in configFiles)
+        foreach (var configFile in ProxyUtils.GetConfigFileCandidates(null))
         {
             if (!string.IsNullOrEmpty(configFile) && File.Exists(configFile))
             {
@@ -626,29 +617,10 @@ private static async Task<int> ValidateConfigCoreAsync(
 
     private static void ValidateSchemaVersion(string schemaUrl, List<ValidationMessage> warnings)
     {
-        try
-        {
-            var uri = new Uri(schemaUrl);
-            if (uri.Segments.Length > 2)
-            {
-                var schemaVersion = uri.Segments[^2]
-                    .TrimStart('v')
-                    .TrimEnd('/');
-                var currentVersion = ProxyUtils.NormalizeVersion(ProxyUtils.ProductVersion);
-                if (ProxyUtils.CompareSemVer(currentVersion, schemaVersion) != 0)
-                {
-                    var currentSchemaUrl = uri.ToString().Replace(
-                        $"/v{schemaVersion}/",
-                        $"/v{currentVersion}/",
-                        StringComparison.OrdinalIgnoreCase);
-                    warnings.Add(new("$schema",
-                        $"Schema version does not match Dev Proxy version, expected schema: {currentSchemaUrl}"));
-                }
-            }
-        }
-        catch
+        var warning = ProxyUtils.GetSchemaVersionMismatchWarning(schemaUrl);
+        if (warning is not null)
         {
-            // Ignore schema version parsing errors
+            warnings.Add(new("$schema", warning));
         }
     }
 

DevProxy/Extensions/ConfigurationManagerExtensions.cs

@@ -16,31 +16,7 @@ public static ConfigurationManager ConfigureDevProxyConfig(this ConfigurationMan
         configuration.Sources.Clear();
         _ = configuration.SetBasePath(Directory.GetCurrentDirectory());
 
-        string?[] configFiles = [
-            // config file specified by the user takes precedence
-            // null if not specified
-            options.ConfigFile,
-            // current directory - JSON/JSONC files
-            "devproxyrc.jsonc",
-            "devproxyrc.json",
-            // current directory - YAML files
-            "devproxyrc.yaml",
-            "devproxyrc.yml",
-            // .devproxy subdirectory - JSON/JSONC files
-            Path.Combine(".devproxy", "devproxyrc.jsonc"),
-            Path.Combine(".devproxy", "devproxyrc.json"),
-            // .devproxy subdirectory - YAML files
-            Path.Combine(".devproxy", "devproxyrc.yaml"),
-            Path.Combine(".devproxy", "devproxyrc.yml"),
-            // app folder - JSON/JSONC files
-            Path.Combine(ProxyUtils.AppFolder ?? "", "devproxyrc.jsonc"),
-            Path.Combine(ProxyUtils.AppFolder ?? "", "devproxyrc.json"),
-            // app folder - YAML files
-            Path.Combine(ProxyUtils.AppFolder ?? "", "devproxyrc.yaml"),
-            Path.Combine(ProxyUtils.AppFolder ?? "", "devproxyrc.yml")
-        ];
-
-        foreach (var configFile in configFiles)
+        foreach (var configFile in ProxyUtils.GetConfigFileCandidates(options.ConfigFile))
         {
             if (!string.IsNullOrEmpty(configFile) && File.Exists(configFile))
             {