add tracing, fix winps resource manifest

Author: Steve Lee (POWERSHELL HE/HIM) (from Dev Box)

dsc_lib/src/dscresources/command_resource.rs

@@ -562,13 +562,14 @@ pub fn invoke_command(executable: &str, args: Option<Vec<String>>, input: Option
     }
 
     let mut child = command.spawn()?;
-    if input.is_some() {
+    if let Some(input) = input {
+        trace!("Writing stdin to command: {input}");
         // pipe to child stdin in a scope so that it is dropped before we wait
         // otherwise the pipe isn't closed and the child process waits forever
         let Some(mut child_stdin) = child.stdin.take() else {
             return Err(DscError::CommandOperation("Failed to open stdin".to_string(), executable.to_string()));
         };
-        child_stdin.write_all(input.unwrap_or_default().as_bytes())?;
+        child_stdin.write_all(input.as_bytes())?;
         child_stdin.flush()?;
     }
 
@@ -633,12 +634,15 @@ fn get_command_input(input_kind: &Option<InputKind>, input: &str) -> Result<Comm
     let mut stdin: Option<String> = None;
     match input_kind {
         Some(InputKind::Env) => {
+            debug!("Parsing input as environment variables");
             env = Some(json_to_hashmap(input)?);
         },
         Some(InputKind::Stdin) => {
+            debug!("Parsing input as stdin");
             stdin = Some(input.to_string());
         },
         None => {
+            debug!("No input kind specified");
             // leave input as none
         },
     }

powershell-adapter/Tests/powershellgroup.config.tests.ps1

@@ -5,7 +5,7 @@ Describe 'PowerShell adapter resource tests' {
 
     BeforeAll {
         if ($isWindows) {
-          winrm quickconfig -quiet
+          winrm quickconfig -quiet -force
         }  
         $OldPSModulePath  = $env:PSModulePath
         $env:PSModulePath += [System.IO.Path]::PathSeparator + $PSScriptRoot
@@ -28,7 +28,7 @@ Describe 'PowerShell adapter resource tests' {
 
     It 'Get works on config with File resource for WinPS' -Skip:(!$IsWindows){
 
-      $testFile = 'c:\test.txt'
+      $testFile = "$testdrive\test.txt"
       'test' | Set-Content -Path $testFile -Force
       $r = (Get-Content -Raw $winpsConfigPath).Replace('c:\test.txt',"$testFile") | dsc config get
       $LASTEXITCODE | Should -Be 0

powershell-adapter/Tests/powershellgroup.resource.tests.ps1

@@ -5,7 +5,7 @@ Describe 'PowerShell adapter resource tests' {
 
     BeforeAll {
         if ($isWindows) {
-            winrm quickconfig -quiet
+            winrm quickconfig -quiet -force
         }    
         $OldPSModulePath  = $env:PSModulePath
         $env:PSModulePath += [System.IO.Path]::PathSeparator + $PSScriptRoot
@@ -33,7 +33,7 @@ Describe 'PowerShell adapter resource tests' {
 
     It 'Get works on Binary "File" resource' -Skip:(!$IsWindows){
 
-        $testFile = 'c:\test.txt'
+        $testFile = "$testdrive\test.txt"
         'test' | Set-Content -Path $testFile -Force
         $r = '{"DestinationPath":"' + $testFile.replace('\','\\') + '"}' | dsc resource get -r 'PSDesiredStateConfiguration/File'
         $LASTEXITCODE | Should -Be 0
@@ -43,7 +43,7 @@ Describe 'PowerShell adapter resource tests' {
 
     It 'Get works on traditional "Script" resource' -Skip:(!$IsWindows){
 
-        $testFile = 'c:\test.txt'
+        $testFile = "$testdrive\test.txt"
         'test' | Set-Content -Path $testFile -Force
         $r = '{"GetScript": "@{result = $(Get-Content ' + $testFile.replace('\','\\') + ')}", "SetScript": "throw", "TestScript": "throw"}' | dsc resource get -r 'PSDesiredStateConfiguration/Script'
         $LASTEXITCODE | Should -Be 0

powershell-adapter/windowspowershell.dsc.resource.json

@@ -28,7 +28,8 @@
         "-NoProfile",
         "-Command",
         "$Input | ./powershell.resource.ps1 Get"
-      ]
+      ],
+      "input": "stdin"
       },
     "set": {
       "executable": "powershell",