Change PSScript resource to not exit on non-terminating errors

Author: SteveL-MSFT

resources/PSScript/psscript.ps1

@@ -138,17 +138,16 @@ try {
     $asyncResult = $ps.BeginInvoke()
     while (-not $asyncResult.IsCompleted) {
         Write-TraceQueue
-    
+
         Start-Sleep -Milliseconds 100
     }
     $outputCollection = $ps.EndInvoke($asyncResult)
     Write-TraceQueue
 
 
     if ($ps.HadErrors) {
-        # If there are any errors, we will exit with an error code
-        Write-DscTrace -Now -Level Error -Message 'Errors occurred during script execution.'
-        exit 1
+        # Errors can be non-terminating, so we just write a warning and continue
+        Write-DscTrace -Now -Level Warn -Message 'Non-terminating errors occurred during script execution.'
     }
 
     foreach ($output in $outputCollection) {

resources/PSScript/psscript.tests.ps1

@@ -324,4 +324,18 @@ Describe 'Tests for PSScript resource' {
         (Get-Content $TestDrive/error.txt -Raw) | Should -BeLike '*INFO*:*This is a host message*'
         (Get-Content $TestDrive/error.txt -Raw) | Should -BeLike '*INFO*:*This is a verbose message*'
     }
+
+    It 'Non-terminating errors do not cause script to fail' {
+        $yaml = @'
+        getScript: |
+          $ErrorActionPreference = 'Continue'
+          Write-Error "This is an error"
+          "This should still be output"
+'@
+        $result = dsc resource get -r 'Microsoft.DSC.Transitional/PowerShellScript' -i $yaml 2> $TestDrive/error.txt | ConvertFrom-Json
+        $LASTEXITCODE | Should -Be 0 -Because (Get-Content $TestDrive/error.txt -Raw | Out-String)
+        $result.actualState.output.Count | Should -Be 1 -Because ($result | ConvertTo-Json | Out-String)
+        $result.actualState.output[0] | Should -BeExactly "This should still be output"
+        (Get-Content $TestDrive/error.txt -Raw) | Should -BeLike '*WARN*:*Non-terminating errors occurred during script execution.*'
+    }
 }