Fix tool and add tests

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

dsc/src/mcp/invoke_dsc_resource.rs

@@ -22,7 +22,7 @@ use serde::{Deserialize, Serialize};
 use tokio::task;
 
 #[derive(Deserialize, JsonSchema)]
-#[serde(rename_all = "lowercase", untagged)]
+#[serde(rename_all = "lowercase")]
 pub enum DscOperation {
     Get,
     Set,

dsc/tests/dsc_mcp.tests.ps1

@@ -20,9 +20,6 @@ Describe 'Tests for MCP server' {
                 while ($mcp.StandardOutput.Peek() -eq -1) {
                     Start-Sleep -Milliseconds 100
                 }
-                while ($mcp.StandardError.Peek() -ne -1) {
-                    $stderr = $mcp.StandardError.ReadLine()
-                }
                 $stdout = $mcp.StandardOutput.ReadLine()
                 return ($stdout | ConvertFrom-Json -Depth 30)
             }
@@ -302,4 +299,38 @@ Describe 'Tests for MCP server' {
         $response.result.structuredContent.functions.Count | Should -Be 0
         $response.result.structuredContent.functions | Should -BeNullOrEmpty
     }
+
+    It 'Calling invoke_dsc_resource for operation: <operation>' -TestCases @(
+        @{ operation = 'get'; property = 'actualState' }
+        @{ operation = 'set'; property = 'beforeState' }
+        @{ operation = 'test'; property = 'desiredState' }
+        @{ operation = 'export'; property = 'actualState' }
+    ) {
+        param($operation)
+
+        $mcpRequest = @{
+            jsonrpc = "2.0"
+            id = 12
+            method = "tools/call"
+            params = @{
+                name = "invoke_dsc_resource"
+                arguments = @{
+                    type = 'Test/Operation'
+                    operation = $operation
+                    resource_type = 'Test/Operation'
+                    properties_json = (@{
+                        hello = "World"
+                        action = $operation
+                    } | ConvertTo-Json -Depth 20)
+                }
+            }
+        }
+
+        $response = Send-McpRequest -request $mcpRequest
+        $response.id | Should -Be 12
+        $because = ($response | ConvertTo-Json -Depth 20 | Out-String)
+        ($response.result.structuredContent.psobject.properties | Measure-Object).Count | Should -Be 1 -Because $because
+        $response.result.structuredContent.result.$property.action | Should -BeExactly $operation -Because $because
+        $response.result.structuredContent.result.$property.hello | Should -BeExactly "World" -Because $because
+    }
 }

tools/dsctest/dscoperation.dsc.resource.json

@@ -0,0 +1,59 @@
+{
+    "$schema": "https://aka.ms/dsc/schemas/v3/bundled/resource/manifest.json",
+    "type": "Test/Operation",
+    "version": "0.1.0",
+    "get": {
+        "executable": "dsctest",
+        "args": [
+            "operation",
+            "--operation",
+            "get",
+            {
+                "jsonInputArg": "--input"
+            }
+        ]
+    },
+    "set": {
+        "executable": "dsctest",
+        "args": [
+            "operation",
+            "--operation",
+            "set",
+            {
+                "jsonInputArg": "--input"
+            }
+        ]
+    },
+    "test": {
+        "executable": "dsctest",
+        "args": [
+            "operation",
+            "--operation",
+            "trace",
+            {
+                "jsonInputArg": "--input"
+            }
+        ]
+    },
+    "export": {
+        "executable": "dsctest",
+        "args": [
+            "operation",
+            "--operation",
+            "export",
+            {
+                "jsonInputArg": "--input"
+            }
+        ]
+    },
+    "schema": {
+        "command": {
+            "executable": "dsctest",
+            "args": [
+                "schema",
+                "-s",
+                "operation"
+            ]
+        }
+    }
+}

tools/dsctest/src/args.rs

@@ -14,6 +14,7 @@ pub enum Schemas {
     Get,
     InDesiredState,
     Metadata,
+    Operation,
     Sleep,
     Trace,
     Version,
@@ -100,6 +101,14 @@ pub enum SubCommand {
         export: bool,
     },
 
+    #[clap(name = "operation", about = "Perform an operation")]
+    Operation {
+        #[clap(name = "operation", short, long, help = "The name of the operation to perform")]
+        operation: String,
+        #[clap(name = "input", short, long, help = "The input to the operation command as JSON")]
+        input: String,
+    },
+
     #[clap(name = "schema", about = "Get the JSON schema for a subcommand")]
     Schema {
         #[clap(name = "subcommand", short, long, help = "The subcommand to get the schema for")]

tools/dsctest/src/main.rs

@@ -10,6 +10,7 @@ mod exporter;
 mod get;
 mod in_desired_state;
 mod metadata;
+mod operation;
 mod adapter;
 mod sleep;
 mod trace;
@@ -28,6 +29,7 @@ use crate::exporter::{Exporter, Resource};
 use crate::get::Get;
 use crate::in_desired_state::InDesiredState;
 use crate::metadata::Metadata;
+use crate::operation::Operation;
 use crate::sleep::Sleep;
 use crate::trace::Trace;
 use crate::version::Version;
@@ -209,6 +211,17 @@ fn main() {
             }
             String::new()
         },
+        SubCommand::Operation { operation, input } => {
+            let mut operation_result = match serde_json::from_str::<Operation>(&input) {
+                Ok(op) => op,
+                Err(err) => {
+                    eprintln!("Error JSON does not match schema: {err}");
+                    std::process::exit(1);
+                }
+            };
+            operation_result.operation = Some(operation.to_lowercase());
+            serde_json::to_string(&operation_result).unwrap()
+        },
         SubCommand::Schema { subcommand } => {
             let schema = match subcommand {
                 Schemas::Adapter => {
@@ -238,6 +251,9 @@ fn main() {
                 Schemas::Metadata => {
                     schema_for!(Metadata)
                 },
+                Schemas::Operation => {
+                    schema_for!(Operation)
+                },
                 Schemas::Sleep => {
                     schema_for!(Sleep)
                 },

tools/dsctest/src/operation.rs

@@ -0,0 +1,13 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+use schemars::JsonSchema;
+use serde::{Deserialize, Serialize};
+use serde_json::{Map, Value};
+
+#[derive(Debug, Clone, PartialEq, Deserialize, Serialize, JsonSchema)]
+pub struct Operation {
+    pub operation: Option<String>,
+    #[serde(flatten)]
+    pub params: Map<String, Value>,
+}