Merge branch '4.14.0' into 4.13.1

microsoft · Jun 27, 2022 · bd9d9d3 · bd9d9d3
2 parents 35895c3 + 967b6a4
commit bd9d9d3
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## [Unreleased]
 
+* PowerSTIG Convert should add newline to raw Xccdf to ensure Pester tests Pass : [#1118](https://github.com/microsoft/PowerStig/issues/1118)
+
 ## [4.13.1] - 2022-06-27
 
 * Fixed:Split-BenchmarkId returns the wrong value for Windows Defender V2R4 [#1121](https://github.com/microsoft/PowerStig/issues/1121)

diff --git a/source/Module/STIG/Convert/Functions.PowerStigXml.ps1 b/source/Module/STIG/Convert/Functions.PowerStigXml.ps1
@@ -249,6 +249,16 @@ function ConvertTo-PowerStigXml
     {
         $convertedStigObjects = ConvertFrom-StigXccdf -Path $Path -RuleIdFilter $RuleIdFilter
 
+        # Add a newline to end of raw xccdf if it doesn't exist
+        $rawXccdf = Get-Content -Path $Path
+        $fileLength = $rawXccdf.Length
+        $lastLine = $rawXccdf[$fileLength - 1]
+
+        if ($lastline -ne '')
+        {
+            Add-Content -Path $path -Value ''
+        }
+
         # Get the raw xccdf xml to pull additional details from the root node.
         [xml] $xccdfXml = Get-Content -Path $Path -Encoding UTF8
         [version] $stigVersionNumber = Get-StigVersionNumber -StigDetails $xccdfXml