MCP Tools in Drills : Drill Get and Drill Resource Get - #3232
Open
dynamicdhx wants to merge 30 commits into
Open
MCP Tools in Drills : Drill Get and Drill Resource Get #3232dynamicdhx wants to merge 30 commits into
dynamicdhx wants to merge 30 commits into
Conversation
dynamicdhx
requested review from
a team and
Vinay Gera (g2vinay)
as code owners
August 10, 2026 04:47
|
Azure Pipelines: Successfully started running 1 pipeline(s). There may be pipelines that require an authorized user to comment /azp run to run. |
Contributor
There was a problem hiding this comment.
Pull request overview
Adds new Resilience Management drill tooling to the Azure MCP “resilience” area, enabling agents/users to list/get drills and drill targets (resources) for a service group, and wires these tools into server-level documentation and consolidation.
Changes:
- Introduces
azmcp resilience drill getandazmcp resilience drill resource getcommands (options, models, JSON context, service APIs, and setup registration). - Adds unit tests for the new commands and extends recorded/live integration tests to cover drill listing.
- Updates consolidated tool mapping plus
azmcp-commands.mdande2eTestPrompts.mdto include the new tools.
Reviewed changes
Copilot reviewed 16 out of 16 changed files in this pull request and generated 5 comments.
Show a summary per file
| File | Description |
|---|---|
| tools/Azure.Mcp.Tools.ResilienceManagement/tests/Azure.Mcp.Tools.ResilienceManagement.Tests/ResilienceManagementCommandTests.cs | Adds recorded/live integration coverage for listing drills. |
| tools/Azure.Mcp.Tools.ResilienceManagement/tests/Azure.Mcp.Tools.ResilienceManagement.Tests/Drills/DrillGetCommandTests.cs | Adds unit tests for drill list/get behavior. |
| tools/Azure.Mcp.Tools.ResilienceManagement/tests/Azure.Mcp.Tools.ResilienceManagement.Tests/Drills/Resources/DrillResourceGetCommandTests.cs | Adds unit tests for drill target list/get behavior. |
| tools/Azure.Mcp.Tools.ResilienceManagement/src/Services/IResilienceManagementService.cs | Extends service contract with drill + drill-target APIs. |
| tools/Azure.Mcp.Tools.ResilienceManagement/src/Services/ResilienceManagementService.cs | Implements ARM calls for listing/getting drills and drill targets. |
| tools/Azure.Mcp.Tools.ResilienceManagement/src/ResilienceManagementSetup.cs | Registers the new drill command group + command DI registrations. |
| tools/Azure.Mcp.Tools.ResilienceManagement/src/Options/ResilienceManagementOptionDescriptions.cs | Adds option description text for --drill. |
| tools/Azure.Mcp.Tools.ResilienceManagement/src/Options/Drills/DrillGetOption.cs | Defines CLI/tool options for drill list/get. |
| tools/Azure.Mcp.Tools.ResilienceManagement/src/Options/Drills/Resources/DrillResourceGetOption.cs | Defines CLI/tool options for drill target list/get. |
| tools/Azure.Mcp.Tools.ResilienceManagement/src/Models/DrillInfo.cs | Adds response model for drill details. |
| tools/Azure.Mcp.Tools.ResilienceManagement/src/Commands/ResilienceManagementJsonContext.cs | Registers new drill types for source-gen JSON serialization. |
| tools/Azure.Mcp.Tools.ResilienceManagement/src/Commands/Drills/DrillGetCommand.cs | Implements drill list/get command and error mapping. |
| tools/Azure.Mcp.Tools.ResilienceManagement/src/Commands/Drills/Resources/DrillResourceGetCommand.cs | Implements drill target list/get command and error mapping. |
| servers/Azure.Mcp.Server/src/Resources/consolidated-tools.json | Adds drill tools into the consolidated resilience management tool. |
| servers/Azure.Mcp.Server/docs/e2eTestPrompts.md | Adds e2e prompts for the two new drill tools. |
| servers/Azure.Mcp.Server/docs/azmcp-commands.md | Documents new CLI commands for drills and drill targets. |
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
Author
|
@microsoft-github-policy-service agree company="Microsoft"
…________________________________
From: microsoft-github-policy-service[bot] ***@***.***>
Sent: 11 August 2026 12:27
To: microsoft/mcp ***@***.***>
Cc: Dhruv Bharuka ***@***.***>; Mention ***@***.***>
Subject: Re: [microsoft/mcp] MCP Tools in Drills : Drill Get and Drill Resource Get (PR #3232)
[https://avatars.githubusercontent.com/in/95686?s=20&v=4]microsoft-github-policy-service[bot] left a comment (microsoft/mcp#3232)<#3232 (comment)>
dynamicdhx<https://github.com/dynamicdhx> please read the following Contributor License Agreement(CLA). If you agree with the CLA, please reply with the following information.
@microsoft-github-policy-service agree [company="{your company}"]
Options:
* (default - no company specified) I have sole ownership of intellectual property rights to my Submissions and I am not making Submissions in the course of work for my employer.
@microsoft-github-policy-service agree
* (when company given) I am making Submissions in the course of work for my employer (or my employer has intellectual property rights in my Submissions by contract or applicable law). I have permission from my employer to make Submissions and enter into this Agreement on behalf of my employer. By signing below, the defined term “You” includes me and my employer.
@microsoft-github-policy-service agree company="Microsoft"
Contributor License Agreement
Contribution License Agreement
This Contribution License Agreement (“Agreement”) is agreed to by the party signing below (“You”),
and conveys certain license rights to Microsoft Corporation and its affiliates (“Microsoft”) for Your
contributions to Microsoft open source projects. This Agreement is effective as of the latest signature
date below.
1. Definitions.
“Code” means the computer software code, whether in human-readable or machine-executable form,
that is delivered by You to Microsoft under this Agreement.
“Project” means any of the projects owned or managed by Microsoft and offered under a license
approved by the Open Source Initiative (www.opensource.org<http://www.opensource.org/>).
“Submit” is the act of uploading, submitting, transmitting, or distributing code or other content to any
Project, including but not limited to communication on electronic mailing lists, source code control
systems, and issue tracking systems that are managed by, or on behalf of, the Project for the purpose of
discussing and improving that Project, but excluding communication that is conspicuously marked or
otherwise designated in writing by You as “Not a Submission.”
“Submission” means the Code and any other copyrightable material Submitted by You, including any
associated comments and documentation.
2. Your Submission. You must agree to the terms of this Agreement before making a Submission to any
Project. This Agreement covers any and all Submissions that You, now or in the future (except as
described in Section 4 below), Submit to any Project.
3. Originality of Work. You represent that each of Your Submissions is entirely Your original work.
Should You wish to Submit materials that are not Your original work, You may Submit them separately
to the Project if You (a) retain all copyright and license information that was in the materials as You
received them, (b) in the description accompanying Your Submission, include the phrase “Submission
containing materials of a third party:” followed by the names of the third party and any licenses or other
restrictions of which You are aware, and (c) follow any other instructions in the Project’s written
guidelines concerning Submissions.
4. Your Employer. References to “employer” in this Agreement include Your employer or anyone else
for whom You are acting in making Your Submission, e.g. as a contractor, vendor, or agent. If Your
Submission is made in the course of Your work for an employer or Your employer has intellectual
property rights in Your Submission by contract or applicable law, You must secure permission from Your
employer to make the Submission before signing this Agreement. In that case, the term “You” in this
Agreement will refer to You and the employer collectively. If You change employers in the future and
desire to Submit additional Submissions for the new employer, then You agree to sign a new Agreement
and secure permission from the new employer before Submitting those Submissions.
5. Licenses.
* Copyright License. You grant Microsoft, and those who receive the Submission directly or
indirectly from Microsoft, a perpetual, worldwide, non-exclusive, royalty-free, irrevocable license in the
Submission to reproduce, prepare derivative works of, publicly display, publicly perform, and distribute
the Submission and such derivative works, and to sublicense any or all of the foregoing rights to third
parties.
* Patent License. You grant Microsoft, and those who receive the Submission directly or
indirectly from Microsoft, a perpetual, worldwide, non-exclusive, royalty-free, irrevocable license under
Your patent claims that are necessarily infringed by the Submission or the combination of the
Submission with the Project to which it was Submitted to make, have made, use, offer to sell, sell and
import or otherwise dispose of the Submission alone or with the Project.
* Other Rights Reserved. Each party reserves all rights not expressly granted in this Agreement.
No additional licenses or rights whatsoever (including, without limitation, any implied licenses) are
granted by implication, exhaustion, estoppel or otherwise.
1. Representations and Warranties. You represent that You are legally entitled to grant the above
licenses. You represent that each of Your Submissions is entirely Your original work (except as You may
have disclosed under Section 3). You represent that You have secured permission from Your employer to
make the Submission in cases where Your Submission is made in the course of Your work for Your
employer or Your employer has intellectual property rights in Your Submission by contract or applicable
law. If You are signing this Agreement on behalf of Your employer, You represent and warrant that You
have the necessary authority to bind the listed employer to the obligations contained in this Agreement.
You are not expected to provide support for Your Submission, unless You choose to do so. UNLESS
REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING, AND EXCEPT FOR THE WARRANTIES
EXPRESSLY STATED IN SECTIONS 3, 4, AND 6, THE SUBMISSION PROVIDED UNDER THIS AGREEMENT IS
PROVIDED WITHOUT WARRANTY OF ANY KIND, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY OF
NONINFRINGEMENT, MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE.
2. Notice to Microsoft. You agree to notify Microsoft in writing of any facts or circumstances of which
You later become aware that would make Your representations in this Agreement inaccurate in any
respect.
3. Information about Submissions. You agree that contributions to Projects and information about
contributions may be maintained indefinitely and disclosed publicly, including Your name and other
information that You submit with Your Submission.
4. Governing Law/Jurisdiction. This Agreement is governed by the laws of the State of Washington, and
the parties consent to exclusive jurisdiction and venue in the federal courts sitting in King County,
Washington, unless no federal subject matter jurisdiction exists, in which case the parties consent to
exclusive jurisdiction and venue in the Superior Court of King County, Washington. The parties waive all
defenses of lack of personal jurisdiction and forum non-conveniens.
5. Entire Agreement/Assignment. This Agreement is the entire agreement between the parties, and
supersedes any and all prior agreements, understandings or communications, written or oral, between
the parties relating to the subject matter hereof. This Agreement may be assigned by Microsoft.
—
Reply to this email directly, view it on GitHub<#3232?email_source=notifications&email_token=CKBBTSS34NCXTLXCGRTMFKT5JK7VBA5CNFSNUABFM5UWIORPF5TWS5BNNB2WEL2JONZXKZKDN5WW2ZLOOQXTKMRVGAYDCMBVGM2KM4TFMFZW63VHNVSW45DJN5XKKZLWMVXHJLDGN5XXIZLSL5RWY2LDNM#issuecomment-5250010534>, or unsubscribe<https://github.com/notifications/unsubscribe-auth/CKBBTSSJE64FI6WHAYJBN2L5JK7VBAVCNFSNUABFKJSXA33TNF2G64TZHM4TMMZQGM4DMNRQHNEXG43VMU5TKMJQGY3TCOBYG4Y2C5QC>.
Triage notifications, keep track of coding agent tasks and review pull requests on the go with GitHub Mobile for iOS<https://github.com/notifications/mobile/ios/CKBBTSVKVX3Q3EJAYGDDPE35JK7VBA5CNFSNUABFM5UWIORPF5TWS5BNNB2WEL2JONZXKZKDN5WW2ZLOOQXTKMRVGAYDCMBVGM2KM4TFMFZW63VHNVSW45DJN5XKKZLWMVXHJKTGN5XXIZLSL5UW64Y> and Android<https://github.com/notifications/mobile/android/CKBBTSR2RX54GRJLJMWMC735JK7VBA5CNFSNUABFM5UWIORPF5TWS5BNNB2WEL2JONZXKZKDN5WW2ZLOOQXTKMRVGAYDCMBVGM2KM4TFMFZW63VHNVSW45DJN5XKKZLWMVXHJLTGN5XXIZLSL5QW4ZDSN5UWI>. Download it today!
You are receiving this because you were mentioned.Message ID: ***@***.***>
|
Removed the AdditionalResourceGroupTags parameter and updated the tags assignment accordingly.
- Add missing final newlines in DrillGetCommand.cs, DrillInfo.cs, DrillGetOption.cs, and DrillGetCommandTests.cs - Fix import ordering in ResilienceManagementSetup.cs (alphabetical: Drills, Goals, Recovery, UsagePlans, then Services, then Microsoft)
…s://github.com/microsoft/mcp into users/dhruvbharuka/drillgetanddrillresourceget
Vinay Gera (g2vinay)
requested changes
Aug 12, 2026
Contributor
There was a problem hiding this comment.
Thanks for adding the drill tooling, Dhruv — the command/service/options code is clean and follows the existing resilience patterns closely, so this is mostly there. The blocker is that CI is red, and I was able to reproduce three separate failures locally (3 failed / 90 passed running the toolset tests at the head commit). None of them are design problems — they're all test/CI hygiene and quick to clear.
1. The new integration tests have no recordings (this is what's failing the test legs)
Should_list_drills, Should_list_drill_resources, and Should_return_400_when_drill_missing_for_drill_resource_get all fail in playback with ClientResultException: Service request failed / "exception during start playback" — the classic "there's no recording for this test" signature. The tell is that assets.json still points at the old tag (..._5ec122e793) and isn't part of this PR, so the new tests were never recorded and pushed. Good news is the provisioning is already there (step 8 in test-resources-post.ps1 creates a drill and polls for a drill resource), so you should just need to run the drill tests in Record mode, test-proxy push, and commit the updated assets.json. (Ref: docs/recorded-tests.md.)
While you're in there: Should_return_400_when_drill_missing_for_drill_resource_get never actually calls Azure — it just omits the required --drill and expects a 400 — but because it lives in the recorded suite it still needs a recording. That exact case is already covered by the DrillResourceGetCommandTests unit test, so I'd drop it from the recorded suite rather than record an empty interaction.
2. dotnet format hasn't been run (this is failing the Analyze leg)
dotnet format --verify-no-changes flags four things:
- Missing final newline in
DrillInfo.cs,DrillGetCommand.cs, andDrillGetOption.cs. - Import ordering in
ResilienceManagementSetup.cs— the newCommands.Drillsusings landed after theGoals.*ones, but should be alphabetical (Drills before Goals).
A quick dotnet format + commit clears all of it.
3. Spelling check is red
The all-caps deployment-output key DRILLNAME (used in the post script and the integration tests) gets spell-checked as drillname, which isn't in the dictionary. The sibling keys are already allow-listed (recoveryplanname, servicegroupname, …), so just add drillname to tools/Azure.Mcp.Tools.ResilienceManagement/cspell.yaml in alphabetical order.
Checklist items still outstanding
- Changelog — these are new user-facing tools, so they need an entry under
servers/Azure.Mcp.Server/changelog-entries/. - ToolDescriptionEvaluator — please paste the results into the PR description (≥ 0.4 and top-3 for the drill prompts). The descriptions read well; we just need the numbers on record.
Minor (non-blocking)
DrillInfo.Tags is a Dictionary<string,string>? — prefer IReadOnlyDictionary<string,string>? to match UsagePlanInfo and avoid exposing a mutable collection on the response model (same thing Copilot flagged).
Once the recordings are in, format is clean, and the spelling word is added, CI should go green and I'm happy to re-review. Thanks again!
Author
|
Copilot resolve the merge conflicts in this pull request |
Co-authored-by: dynamicdhx <310516170+dynamicdhx@users.noreply.github.com>
Contributor
Resolved by merging the current |
Co-authored-by: dynamicdhx <310516170+dynamicdhx@users.noreply.github.com>
- Add 'drillname' to ResilienceManagement cspell.yaml in alphabetical order - Aligns with other deployment-output keys (recoveryplanname, servicegroupname, etc.)
…s://github.com/microsoft/mcp into users/dhruvbharuka/drillgetanddrillresourceget
…s://github.com/microsoft/mcp into users/dhruvbharuka/drillgetanddrillresourceget
Co-authored-by: dynamicdhx <310516170+dynamicdhx@users.noreply.github.com>
…s://github.com/microsoft/mcp into users/dhruvbharuka/drillgetanddrillresourceget
Author
Tool Description Evaluator ResultsTest 1Expected Tool: Results
Test 2Expected Tool: Results
Test 3Expected Tool: Results
Test 4Expected Tool: Results
Test 5Expected Tool: Results
Test 6Expected Tool: Results
Test 7Expected Tool: Results
Test 8Expected Tool: Results
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What does this PR do?
`Adds new Resilience Management drill tooling to the Azure MCP “resilience” area, enabling agents/users to list/get drills and drill targets (resources) for a service group, and wires these tools into server-level documentation and consolidation.
Changes:
Introduces azmcp resilience drill get and azmcp resilience drill resource get commands (options, models, JSON context, service APIs, and setup registration).
Adds unit tests for the new commands and extends recorded/live integration tests to cover drill listing.
Updates consolidated tool mapping plus azmcp-commands.md and e2eTestPrompts.md to include the new tools.`
[Add additional context, screenshots, or information that helps reviewers]GitHub issue number?
[Link to the GitHub issue this PR addresses]Pre-merge Checklist
servers/Azure.Mcp.Server/README.mdand/orservers/Fabric.Mcp.Server/README.mddocumentationREADME.mdchanges running the script./eng/scripts/Process-PackageReadMe.ps1. See Package READMEToolDescriptionEvaluatorand obtained a score of0.4or more and a top 3 ranking for all related test promptsconsolidated-tools.jsonbreaking-changelabelservers/Azure.Mcp.Server/docs/azmcp-commands.md./eng/scripts/Update-AzCommandsMetadata.ps1to update tool metadata inazmcp-commands.md(required for CI)servers/Azure.Mcp.Server/docs/e2eTestPrompts.mdcrypto mining, spam, data exfiltration, etc.)/azp run mcp - pullrequest - liveto run Live Test Pipeline