From 179cbb98915c2f084d31dbf55d837026fee02f02 Mon Sep 17 00:00:00 2001
From: Jordan Borean <jborean93@gmail.com>
Date: Tue, 12 Feb 2019 13:50:00 +1000
Subject: [PATCH] win_dsc - return warning from DSC invocation (#51927)

---
 changelogs/fragments/win_dsc-warning.yaml             |  2 ++
 lib/ansible/modules/windows/win_dsc.ps1               | 11 +++++++++--
 test/integration/targets/win_dsc/tasks/tests.yml      |  3 +++
 .../win_dsc/templates/ANSIBLE_xTestResource.psm1      |  2 ++
 4 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 changelogs/fragments/win_dsc-warning.yaml

diff --git a/changelogs/fragments/win_dsc-warning.yaml b/changelogs/fragments/win_dsc-warning.yaml
new file mode 100644
index 00000000000..23be4739a09
--- /dev/null
+++ b/changelogs/fragments/win_dsc-warning.yaml
@@ -0,0 +1,2 @@
+minor_changes:
+- win_dsc - Display the warnings produced by the DSC engine for better troubleshooting - https://github.com/ansible/ansible/issues/51543
diff --git a/lib/ansible/modules/windows/win_dsc.ps1 b/lib/ansible/modules/windows/win_dsc.ps1
index 4903ebcf218..007db9bef93 100644
--- a/lib/ansible/modules/windows/win_dsc.ps1
+++ b/lib/ansible/modules/windows/win_dsc.ps1
@@ -236,7 +236,11 @@ try
 {
     #Defined variables in strictmode
     $TestError, $TestError = $null
-    $TestResult = Invoke-DscResource @Config -Method Test -ModuleName $Module -ErrorVariable TestError -ErrorAction SilentlyContinue
+    $TestResult = Invoke-DscResource @Config -Method Test -ModuleName $Module -ErrorVariable TestError -ErrorAction SilentlyContinue -WarningVariable TestWarn
+    foreach ($warning in $TestWarn) {
+        Add-Warning -obj $result -message $warning.Message
+    }
+
     if ($TestError)
     {
        throw ($TestError[0].Exception.Message)
@@ -245,7 +249,10 @@ try
     {
         if ($check_mode -eq $False)
         {
-            $SetResult = Invoke-DscResource -Method Set @Config -ModuleName $Module -ErrorVariable SetError -ErrorAction SilentlyContinue -WarningAction SilentlyContinue
+            $SetResult = Invoke-DscResource -Method Set @Config -ModuleName $Module -ErrorVariable SetError -ErrorAction SilentlyContinue -WarningVariable SetWarn
+            foreach ($warning in $SetWarn) {
+                Add-Warning -obj $result -message $warning.Message
+            }
             if ($SetError -and ($SetResult -eq $null))
             {
                 #If SetError was filled, throw to exit out of the try/catch loop
diff --git a/test/integration/targets/win_dsc/tasks/tests.yml b/test/integration/targets/win_dsc/tasks/tests.yml
index b724fb37e72..b855e2fff2f 100644
--- a/test/integration/targets/win_dsc/tasks/tests.yml
+++ b/test/integration/targets/win_dsc/tasks/tests.yml
@@ -307,6 +307,9 @@
     that:
     - test_dsc_custom is changed
     - test_dsc_custom_output.content|b64decode|strip_newline == test_dsc_custom_expected|strip_newline
+    - test_dsc_custom.warnings | length == 2
+    - "'[[xTestResource]DirectResourceAccess] test warning' in test_dsc_custom.warnings[0]"
+    - "'[[xTestResource]DirectResourceAccess] set warning' in test_dsc_custom.warnings[1]"
 
 - name: run custom DSC resource with version
   win_dsc:
diff --git a/test/integration/targets/win_dsc/templates/ANSIBLE_xTestResource.psm1 b/test/integration/targets/win_dsc/templates/ANSIBLE_xTestResource.psm1
index 59569f8ff79..a7cd3bad1c6 100644
--- a/test/integration/targets/win_dsc/templates/ANSIBLE_xTestResource.psm1
+++ b/test/integration/targets/win_dsc/templates/ANSIBLE_xTestResource.psm1
@@ -119,6 +119,7 @@ CimInstanceArrayParam:
     }
     New-Item -Path $Path -ItemType File > $null
     Set-Content -Path $Path -Value $file_contents > $null
+    Write-Warning -Message "set warning"
 }
 
 Function Test-TargetResource
@@ -167,6 +168,7 @@ Function Test-TargetResource
         [Microsoft.Management.Infrastructure.CimInstance[]]
         $CimInstanceArrayParam
     )
+    Write-Warning -Message "test warning"
     return $false
 }