Merge pull request #1173 from Gijsreyn/gh-1093/main/invoke-mcp-delete

Add missing delete for MCP server invoke

Author: SteveL-MSFT

dsc/src/mcp/invoke_dsc_resource.rs

@@ -28,6 +28,7 @@ pub enum DscOperation {
     Set,
     Test,
     Export,
+    Delete,
 }
 
 #[derive(Serialize, JsonSchema)]
@@ -37,6 +38,7 @@ pub enum ResourceOperationResult {
     SetResult(SetResult),
     TestResult(TestResult),
     ExportResult(ExportResult),
+    DeleteResult { success: bool },
 }
 
 #[derive(Serialize, JsonSchema)]
@@ -57,9 +59,9 @@ pub struct InvokeDscResourceRequest {
 #[tool_router(router = invoke_dsc_resource_router, vis = "pub")]
 impl McpServer {
     #[tool(
-        description = "Invoke a DSC resource operation (Get, Set, Test, Export) with specified properties in JSON format",
+        description = "Invoke a DSC resource operation (Get, Set, Test, Export, Delete) with specified properties in JSON format",
         annotations(
-            title = "Invoke a DSC resource operation (Get, Set, Test, Export) with specified properties in JSON format",
+            title = "Invoke a DSC resource operation (Get, Set, Test, Export, Delete) with specified properties in JSON format",
             read_only_hint = false,
             destructive_hint = true,
             idempotent_hint = true,
@@ -94,6 +96,12 @@ impl McpServer {
                     };
                     Ok(ResourceOperationResult::TestResult(result))
                 },
+                DscOperation::Delete => {
+                    match resource.delete(&properties_json) {
+                        Ok(()) => Ok(ResourceOperationResult::DeleteResult { success: true }),
+                        Err(e) => Err(McpError::internal_error(e.to_string(), None)),
+                    }
+                },
                 DscOperation::Export => {
                     let result = match resource.export(&properties_json) {
                         Ok(res) => res,

dsc/tests/dsc_mcp.tests.ps1

@@ -306,7 +306,7 @@ Describe 'Tests for MCP server' {
         @{ operation = 'test'; property = 'desiredState' }
         @{ operation = 'export'; property = 'actualState' }
     ) {
-        param($operation)
+        param($operation, $property)
 
         $mcpRequest = @{
             jsonrpc = "2.0"
@@ -333,4 +333,30 @@ Describe 'Tests for MCP server' {
         $response.result.structuredContent.result.$property.action | Should -BeExactly $operation -Because $because
         $response.result.structuredContent.result.$property.hello | Should -BeExactly "World" -Because $because
     }
+
+    It 'Calling invoke_dsc_resource for delete operation' {
+        $mcpRequest = @{
+            jsonrpc = "2.0"
+            id = 12
+            method = "tools/call"
+            params = @{
+                name = "invoke_dsc_resource"
+                arguments = @{
+                    type = 'Test/Operation'
+                    operation = 'delete'
+                    resource_type = 'Test/Operation'
+                    properties_json = (@{
+                        hello = "World"
+                        action = 'delete'
+                    } | 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.success | Should -Be $true -Because $because
+    }
 }

tools/dsctest/dscoperation.dsc.resource.json

@@ -35,6 +35,17 @@
             }
         ]
     },
+    "delete": {
+        "executable": "dsctest",
+        "args": [
+            "operation",
+            "--operation",
+            "delete",
+            {
+                "jsonInputArg": "--input"
+            }
+        ]
+    },
     "export": {
         "executable": "dsctest",
         "args": [