Merge pull request #385 from SteveL-MSFT/arg-object

Refactor arguments to command resources an mixed strings and objects for extensibility

Author: SteveL-MSFT

dsc/assertion.dsc.resource.json

@@ -60,6 +60,7 @@
     "args": [
       "config",
       "validate"
-    ]
+    ],
+    "input": "stdin"
   }
 }

dsc/group.dsc.resource.json

@@ -48,6 +48,7 @@
     "args": [
       "config",
       "validate"
-    ]
+    ],
+    "input": "stdin"
   }
 }

dsc/parallel.dsc.resource.json

@@ -51,6 +51,7 @@
     "args": [
       "config",
       "validate"
-    ]
+    ],
+    "input": "stdin"
   }
 }

dsc/tests/dsc_args.tests.ps1

@@ -54,24 +54,20 @@ Describe 'config argument tests' {
         $env:DSC_RESOURCE_PATH = $oldPath
     }
 
-    It 'input is <type>' -Skip:(!$IsWindows) -TestCases @(
+    It 'input is <type>' -TestCases @(
         @{ type = 'yaml'; text = @'
-            keyPath: HKLM\Software\Microsoft\Windows NT\CurrentVersion
-            valueName: ProductName
+            output: Hello There
 '@ }
         @{ type = 'json'; text = @'
             {
-                "keyPath": "HKLM\\Software\\Microsoft\\Windows NT\\CurrentVersion",
-                "valueName": "ProductName"
+                "output": "Hello There"
             }
 '@ }
     ) {
         param($text)
-        $output = $text | dsc resource get -r Microsoft.Windows/Registry
+        $output = $text | dsc resource get -r Test/Echo
         $output = $output | ConvertFrom-Json
-        $output.actualState.keyPath | Should -BeExactly 'HKLM\Software\Microsoft\Windows NT\CurrentVersion'
-        $output.actualState.valueName | Should -BeExactly 'ProductName'
-        $output.actualState.valueData.String | Should -Match 'Windows .*'
+        $output.actualState.output | Should -BeExactly 'Hello There'
     }
 
     It '--format <format> is used even when redirected' -TestCases @(

dsc/tests/dsc_discovery.tests.ps1

@@ -72,27 +72,14 @@ Describe 'tests for resource discovery' {
         $manifest = @'
         {
             "$schema": "https://raw.githubusercontent.com/PowerShell/DSC/main/schemas/2023/08/bundled/resource/manifest.json",
-            "type": "Test/Echo",
+            "type": "Test/InvalidSemver",
             "version": "1.1.0..1",
             "get": {
-                "executable": "dsctest",
-                "args": [
-                    "echo",
-                    "--input",
-                    "{json}"
-                ],
-                "input": {
-                    "arg": "{json}"
-                }
+                "executable": "dsctest"
             },
             "schema": {
                 "command": {
-                    "executable": "dsctest",
-                    "args": [
-                        "schema",
-                        "-s",
-                        "echo"
-                    ]
+                    "executable": "dsctest"
                 }
             }
         }
@@ -102,6 +89,7 @@ Describe 'tests for resource discovery' {
             $env:DSC_RESOURCE_PATH = $testdrive
             Set-Content -Path "$testdrive/test.dsc.resource.json" -Value $manifest
             $out = dsc resource list 2>&1
+            write-verbose -verbose ($out | Out-String)
             $out | Should -Match 'WARN.*?Validation.*?Invalid manifest.*?version'
         }
         finally {