Fix sonar warnings in Obervability for AB#16872.

bcgov · Jan 7, 2025 · 719f1ba · 719f1ba
1 parent 1855630
commit 719f1ba
Showing 1 changed file with 17 additions and 4 deletions.
diff --git a/Apps/Common/src/AspNetConfiguration/Modules/Observability.cs b/Apps/Common/src/AspNetConfiguration/Modules/Observability.cs
@@ -277,10 +277,23 @@ private static LogEventLevel ExcludePaths(HttpContext ctx, Exception? ex, string
 
         private static bool IsWildcardMatch(PathString requestPath, string path)
         {
-            return requestPath.HasValue &&
-                   (path.StartsWith('*')
-                       ? requestPath.Value!.EndsWith(path.Replace("*", string.Empty, StringComparison.InvariantCultureIgnoreCase), StringComparison.InvariantCultureIgnoreCase)
-                       : requestPath.Equals(path, StringComparison.InvariantCultureIgnoreCase));
+            if (!requestPath.HasValue)
+            {
+                return false;
+            }
+
+            string requestPathValue = requestPath.Value!;
+
+            return path switch
+            {
+                _ when path.EndsWith('*') => requestPathValue.StartsWith(
+                    path.TrimEnd('*'),
+                    StringComparison.InvariantCultureIgnoreCase),
+                _ when path.StartsWith('*') => requestPathValue.EndsWith(
+                    path.TrimStart('*'),
+                    StringComparison.InvariantCultureIgnoreCase),
+                _ => requestPath.Equals(path, StringComparison.InvariantCultureIgnoreCase),
+            };
         }
     }
 }