Differentiate policy id vs implementation (#414)

cisagov · Jul 7, 2023 · 2ade0e4 · 2ade0e4
1 parent a04eb7b
commit 2ade0e4
Show file tree

Hide file tree

Showing 4 changed files with 2,841 additions and 2,323 deletions.
diff --git a/PowerShell/ScubaGear/Modules/CreateReport/CreateReport.psm1 b/PowerShell/ScubaGear/Modules/CreateReport/CreateReport.psm1
@@ -236,7 +236,7 @@ function Import-SecureBaseline{
             $Group.GroupName = $GroupName.Split(".")[1].Trim() # 1 to remove the leading space
             $Group.Controls = @()
 
-            $IdRegex =  "#### MS\.[$($Product.ToUpper())]+\.$($Group.GroupNumber)\."
+            $IdRegex =  "#### MS\.[$($Product.ToUpper())]+\.$($Group.GroupNumber)\.\d+v\d+\s*$"
             # Select-String line numbers aren't 0-indexed, hence the "-1" on the next line
             $LineNumbers = Select-String $IdRegex "$($BaselinePath)$($Product).md" | ForEach-Object {$_."LineNumber"-1}