Merge pull request #642 from PowerShell/kapilmb/FixDscSeverityFilter

Fix severity filtering for DSC rules

Author: Kapil Borle

Engine/ScriptAnalyzer.cs

@@ -1895,28 +1895,7 @@ public IEnumerable<DiagnosticRecord> AnalyzeSyntaxTree(
                     // Run DSC Class rule
                     foreach (IDSCResourceRule dscResourceRule in this.DSCResourceRules)
                     {
-                        bool includeRegexMatch = false;
-                        bool excludeRegexMatch = false;
-
-                        foreach (Regex include in includeRegexList)
-                        {
-                            if (include.IsMatch(dscResourceRule.GetName()))
-                            {
-                                includeRegexMatch = true;
-                                break;
-                            }
-                        }
-
-                        foreach (Regex exclude in excludeRegexList)
-                        {
-                            if (exclude.IsMatch(dscResourceRule.GetName()))
-                            {
-                                excludeRegexMatch = true;
-                                break;
-                            }
-                        }
-
-                        if ((includeRule == null || includeRegexMatch) && (excludeRule == null || excludeRegexMatch))
+                        if (IsRuleAllowed(dscResourceRule))
                         {
                             this.outputWriter.WriteVerbose(string.Format(CultureInfo.CurrentCulture, Strings.VerboseRunningMessage, dscResourceRule.GetName()));
 

Tests/Engine/InvokeScriptAnalyzer.tests.ps1

@@ -317,6 +317,26 @@ Describe "Test Severity" {
              $errors = Invoke-ScriptAnalyzer $directory\TestScript.ps1 -Severity information, warning
             $errors.Count | Should Be 1
         }
+
+        It "works for dsc rules" {
+            $testDataPath = [System.IO.Path]::Combine($(Split-Path $directory -Parent), `
+                                                                'Rules', `
+                                                                'DSCResources', `
+                                                                'MSFT_WaitForAll', `
+                                                                'MSFT_WaitForAll.psm1')
+
+            Function Get-Count {begin{$count=0} process{$count++} end{$count}}
+
+            Invoke-ScriptAnalyzer -Path $testDataPath -Severity Error | `
+                Where-Object {$_.RuleName -eq "PSDSCUseVerboseMessageInDSCResource"} | `
+                Get-Count | `
+                Should Be 0
+
+            Invoke-ScriptAnalyzer -Path $testDataPath -Severity Information | `
+                Where-Object {$_.RuleName -eq "PSDSCUseVerboseMessageInDSCResource"} | `
+                Get-Count | `
+                Should Be 2
+        }
     }
 
     Context "When used incorrectly" {