MCP Tools in Drills: Drill Run Get and Drill Run Resource Get by dynamicdhx · Pull Request #3318 · microsoft/mcp

dynamicdhx · 2026-08-19T01:37:09Z

What does this PR do?

[Provide a clear, concise description of the changes]

[Add additional context, screenshots, or information that helps reviewers]

GitHub issue number?

[Link to the GitHub issue this PR addresses]

Pre-merge Checklist

azure-pipelines · 2026-08-19T01:37:29Z

Azure Pipelines: Successfully started running 1 pipeline(s). There may be pipelines that require an authorized user to comment /azp run to run.

dynamicdhx · 2026-08-19T01:38:23Z

Tool Descriptor Evaluator Results

Test 1

Expected Tool: resilience_drill_run_get
Prompt: List all runs of drill <drill_name> in service group <service_group>

Results

Rank	Score	Tool	Status
1	0.795099	`resilience_drill_run_get`	✅ EXPECTED
2	0.600467	`resilience_drill_get`	❌
3	0.596544	`resilience_drill_run_resource_get`	❌
4	0.523022	`resilience_drill_resource_get`	❌
5	0.415640	`resilience_recovery_plan_get`	❌

Test 2

Expected Tool: resilience_drill_run_get
Prompt: Get drill run <drill_run_name> for drill <drill_name> in service group <service_group>

Results

Rank	Score	Tool	Status
1	0.757379	`resilience_drill_run_get`	✅ EXPECTED
2	0.637246	`resilience_drill_run_resource_get`	❌
3	0.563664	`resilience_drill_get`	❌
4	0.505661	`resilience_drill_resource_get`	❌
5	0.396332	`resilience_recovery_plan_get`	❌

Test 3

Expected Tool: resilience_drill_run_resource_get
Prompt: List all resources of drill run <drill_run_name> for drill <drill_name> in service group <service_group>

Results

Rank	Score	Tool	Status
1	0.755976	`resilience_drill_run_resource_get`	✅ EXPECTED
2	0.733873	`resilience_drill_run_get`	❌
3	0.652398	`resilience_drill_resource_get`	❌
4	0.592966	`resilience_drill_get`	❌
5	0.490844	`group_resource_list`	❌

Test 4

Expected Tool: resilience_drill_run_resource_get
Prompt: Get resource <resource_name> from drill run <drill_run_name> for drill <drill_name> in service group <service_group>

Results

Rank	Score	Tool	Status
1	0.733581	`resilience_drill_run_resource_get`	✅ EXPECTED
2	0.644799	`resilience_drill_run_get`	❌
3	0.576003	`resilience_drill_resource_get`	❌
4	0.507843	`resilience_drill_get`	❌
5	0.401303	`resilience_goal_resource_get`	❌

Copilot

Pull request overview

Adds Azure Resilience Management drill run and drill run resource/target retrieval capabilities to the ResilienceManagement toolset, wiring new commands through the tool registration and updating Azure MCP Server documentation/metadata.

Changes:

Added azmcp resilience drill run get and azmcp resilience drill run resource get commands (plus options, JSON serialization context, and unit tests).
Extended IResilienceManagementService / ResilienceManagementService with DrillRun and DrillRunTarget list/get operations.
Updated server docs/metadata (consolidated tool mapping, e2e prompts, azmcp command reference) and added changelog entries.

Reviewed changes

Copilot reviewed 15 out of 15 changed files in this pull request and generated 4 comments.

Show a summary per file

File	Description
tools/Azure.Mcp.Tools.ResilienceManagement/tests/Azure.Mcp.Tools.ResilienceManagement.Tests/Drills/Runs/Resources/DrillRunResourceGetCommandTests.cs	New unit tests for drill run resource list/get behavior and error handling.
tools/Azure.Mcp.Tools.ResilienceManagement/tests/Azure.Mcp.Tools.ResilienceManagement.Tests/Drills/Runs/DrillRunGetCommandTests.cs	New unit tests for drill run list/get behavior and error handling.
tools/Azure.Mcp.Tools.ResilienceManagement/src/Services/ResilienceManagementService.cs	Implements ARM-backed list/get for drill runs and drill run targets.
tools/Azure.Mcp.Tools.ResilienceManagement/src/Services/IResilienceManagementService.cs	Adds service interface methods for drill runs and drill run targets.
tools/Azure.Mcp.Tools.ResilienceManagement/src/ResilienceManagementSetup.cs	Registers new commands and adds `drill run` and `drill run resource` command groups.
tools/Azure.Mcp.Tools.ResilienceManagement/src/Options/Drills/Runs/Resources/DrillRunResourceGetOptions.cs	New options POCO for `drill run resource get`.
tools/Azure.Mcp.Tools.ResilienceManagement/src/Options/Drills/Runs/DrillRunGetOption.cs	New options POCO for `drill run get`.
tools/Azure.Mcp.Tools.ResilienceManagement/src/Commands/ResilienceManagementJsonContext.cs	Registers new command result types for source-generated JSON serialization (AOT).
tools/Azure.Mcp.Tools.ResilienceManagement/src/Commands/Drills/Runs/Resources/DrillRunResourceGetCommand.cs	New command to list/get drill run targets (resources).
tools/Azure.Mcp.Tools.ResilienceManagement/src/Commands/Drills/Runs/DrillRunGetCommand.cs	New command to list/get drill runs.
servers/Azure.Mcp.Server/src/Resources/consolidated-tools.json	Updates consolidated tool description + mapped tool list to include new drill run tools.
servers/Azure.Mcp.Server/docs/e2eTestPrompts.md	Adds e2e prompt coverage rows for the two new tools.
servers/Azure.Mcp.Server/docs/azmcp-commands.md	Documents the two new CLI command shapes.
servers/Azure.Mcp.Server/changelog-entries/copilot-add-drill-run-resource-get.yaml	Changelog entry for drill run resource get tool.
servers/Azure.Mcp.Server/changelog-entries/copilot-add-drill-run-get.yaml	Changelog entry for drill run get tool.

💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.

+        RequestFailedException reqEx when reqEx.Status == (int)HttpStatusCode.Forbidden =>
+            "Authorization failed getting the drill run. Verify that you have access.",
+        RequestFailedException reqEx when reqEx.Status == (int)HttpStatusCode.NotFound =>
+            "Drill run not found. Verify the drill run, drill, and service group exist and you have access.",
+        RequestFailedException => "Failed to get the drill run. Verify the drill run, drill, and service group, then retry.",


+        RequestFailedException reqEx when reqEx.Status == (int)HttpStatusCode.Forbidden =>
+            "Authorization failed getting the drill run resource. Verify that you have access.",
+        RequestFailedException reqEx when reqEx.Status == (int)HttpStatusCode.NotFound =>
+            "Drill run resource not found. Verify the resource, drill run, drill, and service group exist and you have access.",
+        RequestFailedException => "Failed to get the drill run resource. Verify the resource, drill run, drill, and service group, then retry.",


        services.AddSingleton<DrillGetCommand>();
        services.AddSingleton<DrillResourceGetCommand>();
+        services.AddSingleton<DrillRunGetCommand>();
+        services.AddSingleton<DrillRunResourceGetCommand>();


Vinay Gera (g2vinay) · 2026-08-21T07:18:57Z

+
+namespace Azure.Mcp.Tools.ResilienceManagement.Options.Drills.Runs.Resources;
+
+public sealed class DrillRunResourceGetOptions


Nit: rename this file to DrillRunResourceGetOption.cs (singular) to match the sibling DrillRunGetOption.cs and the toolset convention (DrillGetOption.cs, DrillResourceGetOption.cs). The class name stays DrillRunResourceGetOptions.

Vinay Gera (g2vinay) · 2026-08-21T07:19:05Z

+
+    protected override string GetErrorMessage(Exception ex) => ex switch
+    {
+        KeyNotFoundException => "Drill run not found. Verify the drill run name, drill, service group, and that you have access.",


This KeyNotFoundException arm looks unreachable. GetDrillRunAsync calls the ARM GetAsync, which throws RequestFailedException with Status 404 on a missing run (already handled below), not KeyNotFoundException. Consider removing this arm (and the analogous one in DrillRunResourceGetCommand), or point to the path that actually throws it.

Vinay Gera (g2vinay) · 2026-08-21T07:19:15Z

+
+    protected override string GetErrorMessage(Exception ex) => ex switch
+    {
+        KeyNotFoundException => "Drill run resource not found. Verify the resource name, drill run, drill, service group, and that you have access.",


Same as DrillRunGetCommand: this KeyNotFoundException arm is unreachable — the ARM GetAsync throws RequestFailedException (Status 404) on a missing resource, not KeyNotFoundException. Drop it or reference the code path that throws it.

Vinay Gera (g2vinay) · 2026-08-21T07:19:24Z

+
+# Get a run of a drill, or list all runs of the drill (omit --name)
+# ❌ Destructive | ✅ Idempotent | ❌ OpenWorld | ✅ ReadOnly | ❌ Secret | ❌ LocalRequired
+azmcp resilience drill run get --subscription <subscription> \


These commands are service-group-scoped and don't expose a --subscription option, so documenting --subscription <subscription> here is inaccurate (and would be rejected under strict unknown-parameter handling). Note the existing drill get / drill resource get blocks above have the same line, so this is a pre-existing pattern — ideally fix all four together.

Vinay Gera (g2vinay) · 2026-08-21T07:19:34Z

    }

+    [Fact]
+    public async Task Should_list_drill_runs()


These four new TestType=Live recorded tests were added, but assets.json isn't updated in this PR (Tag is still ..._cb0c443485), so there are no recordings for them. The default PR build runs recorded tests in playback (Test-Code.ps1 -TestType All applies no trait filter), so with no recordings they fail — which is what's reddening the test legs of mcp - pullrequest. The live pipeline needs to run to record these interactions and bump the assets Tag.

Copilot AI lite review requested due to automatic review settings August 19, 2026 01:37

dynamicdhx requested review from a team and Vinay Gera (g2vinay) as code owners August 19, 2026 01:37

dynamicdhx requested review from JasonYeMSFT (JasonYeMSFT), Rick Winter (RickWinter), Sai Koumudi Kaluvakolanu (saikoumudi), Sandeep Sen (sandeep-sen), Tom Meschter (tmeschter) and Jeff Fisher (xirzec) August 19, 2026 01:37

github-actions Bot added server-Azure.Mcp Azure.Mcp.Server tools-ResilienceManagement labels Aug 19, 2026

Copilot started reviewing on behalf of dynamicdhx August 19, 2026 01:37 View session

Copilot AI reviewed Aug 19, 2026

View reviewed changes

Add drill run get commands

d1a6902

dynamicdhx force-pushed the users/dhruvbharuka/drillrungetanddrillrunresourceget branch from ba4a907 to d1a6902 Compare August 19, 2026 02:00

Vinay Gera (g2vinay) reviewed Aug 21, 2026

View reviewed changes

Navigation Menu

Uh oh!

MCP Tools in Drills: Drill Run Get and Drill Run Resource Get - #3318

MCP Tools in Drills: Drill Run Get and Drill Run Resource Get#3318
dynamicdhx wants to merge 1 commit into
microsoft:mainfrom
dynamicdhx:users/dhruvbharuka/drillrungetanddrillrunresourceget

dynamicdhx commented Aug 19, 2026

Uh oh!

azure-pipelines Bot commented Aug 19, 2026

Uh oh!

dynamicdhx commented Aug 19, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Vinay Gera (g2vinay) Aug 21, 2026

Uh oh!

Vinay Gera (g2vinay) Aug 21, 2026

Uh oh!

Vinay Gera (g2vinay) Aug 21, 2026

Uh oh!

Vinay Gera (g2vinay) Aug 21, 2026

Uh oh!

Vinay Gera (g2vinay) Aug 21, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants


		namespace Azure.Mcp.Tools.ResilienceManagement.Options.Drills.Runs.Resources;

		public sealed class DrillRunResourceGetOptions

Uh oh!

Conversation

dynamicdhx commented Aug 19, 2026

What does this PR do?

GitHub issue number?

Pre-merge Checklist

Uh oh!

azure-pipelines Bot commented Aug 19, 2026

Uh oh!

dynamicdhx commented Aug 19, 2026

Tool Descriptor Evaluator Results

Test 1

Results

Test 2

Results

Test 3

Results

Test 4

Results

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Vinay Gera (g2vinay) Aug 21, 2026

Choose a reason for hiding this comment

Uh oh!

Vinay Gera (g2vinay) Aug 21, 2026

Choose a reason for hiding this comment

Uh oh!

Vinay Gera (g2vinay) Aug 21, 2026

Choose a reason for hiding this comment

Uh oh!

Vinay Gera (g2vinay) Aug 21, 2026

Choose a reason for hiding this comment

Uh oh!

Vinay Gera (g2vinay) Aug 21, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants