Rename DenyGlobs back to original Globs to avoid breaking change when…

… using options-json argument.
microsoft · Dec 6, 2024 · fcd0292 · fcd0292
1 parent 673d70b
commit fcd0292
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/DevSkim-DotNet/Microsoft.DevSkim.CLI/Commands/AnalyzeCommand.cs b/DevSkim-DotNet/Microsoft.DevSkim.CLI/Commands/AnalyzeCommand.cs
@@ -65,7 +65,7 @@ public int Run()
 
             IEnumerable<FileEntry> fileListing;
             Extractor extractor = new Extractor();
-            ExtractorOptions extractorOpts = new ExtractorOptions() { ExtractSelfOnFail = false, AllowFilters = _opts.AllowGlobs, DenyFilters = _opts.DenyGlobs };
+            ExtractorOptions extractorOpts = new ExtractorOptions() { ExtractSelfOnFail = false, AllowFilters = _opts.AllowGlobs, DenyFilters = _opts.Globs };
             // Analysing a single file
             if (!Directory.Exists(fullPath))
             {

diff --git a/DevSkim-DotNet/Microsoft.DevSkim.CLI/Options/BaseAnalyzeCommandOptions.cs b/DevSkim-DotNet/Microsoft.DevSkim.CLI/Options/BaseAnalyzeCommandOptions.cs
@@ -43,7 +43,7 @@ public record BaseAnalyzeCommandOptions : LogOptions
     public IEnumerable<Confidence> Confidences { get; set; } = new[] { Confidence.High, Confidence.Medium };
 
     [Option('g', "ignore-globs", HelpText = "Comma-separated Globs for files to skip analyzing", Separator = ',', Default = new[] { "**/.git/**", "**/bin/**" })]
-    public IEnumerable<string> DenyGlobs { get; set; } = new[] { "**/.git/**", "**/bin/**" };
+    public IEnumerable<string> Globs { get; set; } = new[] { "**/.git/**", "**/bin/**" };
 
     [Option("include-globs", HelpText = "If set, files must match one of these globs to be analyzed", Separator = ',', Default = new string[]{})]
     public IEnumerable<string> AllowGlobs { get; set; } = new string[]{};

diff --git a/DevSkim-DotNet/Microsoft.DevSkim.Tests/OptionsTests.cs b/DevSkim-DotNet/Microsoft.DevSkim.Tests/OptionsTests.cs
@@ -15,7 +15,7 @@ public void TestExcludeGlobs()
         {
             Severities = new[] { Severity.Critical | Severity.Important },
             ExitCodeIsNumIssues = true,
-            DenyGlobs = new List<string>() {"*.js"}
+            Globs = new List<string>() {"*.js"}
         };
         var testContent = "Hello World";
         var testRule =
@@ -154,7 +154,7 @@ public void TestIncludeAndExcludeGlobs()
             Severities = new[] { Severity.Critical | Severity.Important },
             ExitCodeIsNumIssues = true,
             AllowGlobs = new List<string>() {"*.js"},
-            DenyGlobs = new List<string>() {"*hello.js"}
+            Globs = new List<string>() {"*hello.js"}
         };
         var testContent = "Hello World";
         var testRule =
@@ -234,7 +234,7 @@ public void TestParsingJsonOptions()
         {
             Severities = new[] { Severity.Critical | Severity.Important },
             ExitCodeIsNumIssues = true,
-            DenyGlobs = new List<string>() {"*.js"}
+            Globs = new List<string>() {"*.js"}
         };
         // Serialize it to a file
         // Include world twice so we can disinguish between the two rules