[ResilienceManagement] Add create commands (namespace: resilience) by adishiritwick · Pull Request #3166 · microsoft/mcp

adishiritwick · 2026-07-28T10:12:54Z

Adds the authoring (create-or-update) commands to the Azure Resilience Management toolset (Azure.Mcp.Tools.ResilienceManagement, command namespace resilience).

This is PR 2 of the rollout plan in #2894 — building on the read-only surface delivered in #2948. It adds create commands across the usage-plan command groups, reusing the toolset plumbing established in PR 1 (IAreaSetup, BaseAzureResourceService, non-standard serviceGroup path-parameter handling, parameter shapes, telemetry, and recorded-test infrastructure). Lifecycle/action commands follow in PR 3.

All commands are create-or-update (ReadOnly = false, Destructive = true, Idempotent = true). Each returns the created/updated resource's details.

Commands added:

Usage Plan
resilience usageplan create (UsagePlans_CreateOrUpdate)
resilience usageplan enrollment create (Enrollments_CreateOrUpdate)
Also includes unit tests, recorded live tests (goal template/assignment, usage plan, enrollment), README/command docs/e2e prompts, and a changelog entry.

GitHub issue number?

[Link to the GitHub issue this PR addresses]

Pre-merge Checklist

azure-pipelines · 2026-07-28T10:13:11Z

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

github-actions · 2026-07-28T10:13:16Z

Thank you for your contribution adishiritwick! We will review the pull request and get back to you soon.

Copilot

Pull request overview

Adds Resilience Management “create” operations to the resilience namespace, extending the toolset beyond read-only scenarios by enabling usage plan and enrollment creation via ARM, along with unit/live test coverage and documentation/tooling updates.

Changes:

Added azmcp resilience usageplan create and azmcp resilience usageplan enrollment create commands, wired through IResilienceManagementService.
Expanded live test infrastructure and added unit/integration tests for the new create commands.
Updated Azure MCP Server docs/prompts, consolidated tool mappings, and changelog entry.

Reviewed changes

Copilot reviewed 19 out of 19 changed files in this pull request and generated 2 comments.

Show a summary per file

File	Description
tools/Azure.Mcp.Tools.ResilienceManagement/tests/test-resources.bicep	Adds outputs for isolated “create” test resource names.
tools/Azure.Mcp.Tools.ResilienceManagement/tests/test-resources-post.ps1	Creates isolated RG/service group for create live tests (note: outside harness-managed RG).
tools/Azure.Mcp.Tools.ResilienceManagement/tests/Azure.Mcp.Tools.ResilienceManagement.Tests/UsagePlans/UsagePlanCreateCommandTests.cs	New unit tests for usage plan create command validation/results/errors.
tools/Azure.Mcp.Tools.ResilienceManagement/tests/Azure.Mcp.Tools.ResilienceManagement.Tests/UsagePlans/Enrollments/UsagePlanEnrollmentCreateCommandTests.cs	New unit tests for enrollment create command validation/results/errors.
tools/Azure.Mcp.Tools.ResilienceManagement/tests/Azure.Mcp.Tools.ResilienceManagement.Tests/ResilienceManagementCommandTests.cs	Adds live/integration scenarios for creating usage plans and enrollments.
tools/Azure.Mcp.Tools.ResilienceManagement/tests/Azure.Mcp.Tools.ResilienceManagement.Tests/assets.json	Updates recorded-test assets tag.
tools/Azure.Mcp.Tools.ResilienceManagement/src/Services/ResilienceManagementService.cs	Implements ARM create/update flows for usage plans and enrollments.
tools/Azure.Mcp.Tools.ResilienceManagement/src/Services/IResilienceManagementService.cs	Extends service interface with create APIs.
tools/Azure.Mcp.Tools.ResilienceManagement/src/ResilienceManagementSetup.cs	Registers new commands and adds them to command groups.
tools/Azure.Mcp.Tools.ResilienceManagement/src/Options/UsagePlans/UsagePlanCreateOption.cs	Adds options for usage plan creation.
tools/Azure.Mcp.Tools.ResilienceManagement/src/Options/UsagePlans/Enrollments/UsagePlanEnrollmentCreateOption.cs	Adds options for enrollment creation.
tools/Azure.Mcp.Tools.ResilienceManagement/src/Commands/UsagePlans/UsagePlanCreateCommand.cs	New command implementation + error mapping for usage plan create.
tools/Azure.Mcp.Tools.ResilienceManagement/src/Commands/UsagePlans/Enrollments/UsagePlanEnrollmentCreateCommand.cs	New command implementation + error mapping for enrollment create.
tools/Azure.Mcp.Tools.ResilienceManagement/src/Commands/ResilienceManagementJsonContext.cs	Registers new response models for AOT-safe JSON serialization.
servers/Azure.Mcp.Server/src/Resources/consolidated-tools.json	Adds a consolidated “create” tool mapping for the new commands.
servers/Azure.Mcp.Server/README.md	Adds example prompts for the new create scenarios.
servers/Azure.Mcp.Server/docs/e2eTestPrompts.md	Adds E2E prompts for the new tool IDs.
servers/Azure.Mcp.Server/docs/azmcp-commands.md	Adds CLI docs for the new `create` commands.
servers/Azure.Mcp.Server/changelog-entries/1782549900000.yaml	Adds changelog entries for the new features.

Rick Winter (RickWinter)

Noticed a couple things

Rick Winter (RickWinter) · 2026-07-29T16:48:48Z

+#     and carries the same Owners/DeleteAfter tags as the managed resource group so subscription-wide
+#     expiry-based clean-up (see New-TestResources.ps1's DeleteAfterHours) reclaims it automatically.
+$managedResourceGroup = Get-AzResourceGroup -Name $ResourceGroupName
+New-AzResourceGroup -Name $createResourceGroupName -Location $managedResourceGroup.Location -Tag $managedResourceGroup.Tags -Force | Out-Null


This resource group is created after New-TestResources.ps1 grants the test identity Owner only on the harness-managed resource group. The live tests call the new command as that test identity, so creating a usage plan in $createResourceGroupName will fail with 403 in CI unless the identity already has subscription-wide access. Pass TestApplicationOid into this script and grant it the required role on the new resource group, or keep the create test resources inside the managed group.

Addressed. Please check

Vinay Gera (g2vinay)

Thanks for adding this authoring surface. The inline comments cover the specific comments.

Vinay Gera (g2vinay) · 2026-08-07T06:19:27Z

+    private readonly ILogger<UsagePlanCreateCommand> _logger = logger;
+    private readonly IResilienceManagementService _resilienceManagementService = resilienceManagementService;
+
+    public override async Task<CommandResponse> ExecuteAsync(CommandContext context, UsagePlanCreateOptions options, CancellationToken cancellationToken)


Please add ValidateOptions for --usage-plan. The API requires usage plan names to match ^[a-zA-Z0-9-]{3,24}$, but the command currently accepts any non-empty string. Please also add negative tests for malformed, oversized, and path-like values.

Vinay Gera (g2vinay) · 2026-08-07T06:19:38Z

+    private readonly ILogger<UsagePlanEnrollmentCreateCommand> _logger = logger;
+    private readonly IResilienceManagementService _resilienceManagementService = resilienceManagementService;
+
+    public override async Task<CommandResponse> ExecuteAsync(CommandContext context, UsagePlanEnrollmentCreateOptions options, CancellationToken cancellationToken)


Please validate --usage-plan, --enrollment, and --service-group using their documented Azure naming rules before they are used in ARM resource identifiers. Usage plan and enrollment names must match ^[a-zA-Z0-9-]{3,24}$. Please include negative tests for malformed, oversized, and path-like values.

Vinay Gera (g2vinay) · 2026-08-07T06:20:09Z

+    Title = "Create Resilience Usage Plan",
+    Description = """
+        Creates a resilience usage plan in the specified resource group with the given plan type, and returns
+        the created usage plan information including id, name, resource type, location, tags, plan type, and
+        provisioning state.


The service uses CreateOrUpdateAsync, but this metadata presents the command as create-only. Please describe the create-or-update behavior consistently so users understand that an existing usage plan may be modified.

Vinay Gera (g2vinay) · 2026-08-07T06:20:10Z

+        RequestFailedException reqEx when reqEx.Status == (int)HttpStatusCode.Conflict =>
+            "Usage plan name already exists. Choose a different name.",


Since this is a create-or-update operation, an existing name should normally be valid. Is every HTTP 409 from this API guaranteed to mean a name collision? Please check a documented Azure error code before returning this message, or use a sanitized generic conflict message.

Vinay Gera (g2vinay) · 2026-08-07T06:20:10Z

+            $"Authorization failed creating the usage plan enrollment. Details: {reqEx.Message}",
+        RequestFailedException reqEx when reqEx.Status == (int)HttpStatusCode.NotFound =>
+            "Usage plan or service group not found. Verify they exist and you have access.",
+        RequestFailedException reqEx => reqEx.Message,


Please replace the raw Azure exception message with a sanitized fallback message. Backend payloads should not be returned directly to callers.

Vinay Gera (g2vinay) · 2026-08-07T06:21:50Z

+            "resilience_usageplan_create",
+            new()
+            {
+                { "subscription", Settings.SubscriptionId },


Please pass { "tenant", Settings.TenantId } to each new recorded-test tool call, including both calls in the enrollment test. Otherwise, these tests can fail when the subscription is not in the default tenant.

Vinay Gera (g2vinay) · 2026-08-07T06:22:09Z

+| resilience_usageplan_create | Create a resilience usage plan <usage_plan_name> with plan type Basic in resource group <resource_group_name> |
+| resilience_usageplan_enrollment_create | Create a usage plan enrollment <enrollment_name> for usage plan <usage_plan_name> associated with service group <service_group> in resource group <resource_group_name> |


Please add 2–3 realistic prompt variants for each new tool, as required by the tool-development guide. One exact phrasing per tool provides limited coverage for ToolDescriptionEvaluator and routing behavior.

Vinay Gera (g2vinay) · 2026-08-07T06:22:09Z

+        Assert.NotEmpty(command.Description);
+    }
+
+    [Theory]


Please add negative tests for invalid usage-plan, enrollment, and service-group names. The current tests verify only whether required options are present.

Vinay Gera (g2vinay) · 2026-08-07T06:22:09Z

 * "List all resilience recovery plans in service group 'my-service-group'"
 * "Get the recovery plan 'my-recovery-plan' in service group 'my-service-group'"
 * "List the recovery jobs of recovery plan 'my-recovery-plan' in service group 'my-service-group'"
+* "Create a resilience usage plan 'my-plan' in resource group 'my-rg'"


--plan-type is required, but this example does not provide one. Please make it complete, for example: "Create a Basic resilience usage plan 'my-plan' in resource group 'my-rg'."

Vinay Gera (g2vinay) · 2026-08-07T06:22:09Z

@@ -0,0 +1,5 @@
+changes:
+  - section: "Features Added"
+    description: "Added the 'azmcp resilience usageplan create' command to create a resilience usage plan in a resource group, including its plan type."


The implementation performs create-or-update. Please use that wording here so the changelog accurately describes the behavior.

Copilot AI review requested due to automatic review settings July 28, 2026 10:12

adishiritwick requested review from a team and Vinay Gera (g2vinay) as code owners July 28, 2026 10:12

adishiritwick requested review from Rick Winter (RickWinter), Connie Yau (conniey), Jair Myree (jairmyree), msalaman, Sai Koumudi Kaluvakolanu (saikoumudi) and Tom Meschter (tmeschter) July 28, 2026 10:12

github-actions Bot added community contribution customer-reported tools-ResilienceManagement labels Jul 28, 2026

Copilot started reviewing on behalf of adishiritwick July 28, 2026 10:13 View session

Copilot AI reviewed Jul 28, 2026

View reviewed changes

Comment thread servers/Azure.Mcp.Server/src/Resources/consolidated-tools.json

Comment thread tools/Azure.Mcp.Tools.ResilienceManagement/tests/test-resources-post.ps1 Outdated

Rick Winter (RickWinter) reviewed Jul 29, 2026

View reviewed changes

adishiritwick added 4 commits August 6, 2026 11:03

update

e646a51

up

876ba59

up

1f1a9c1

up

2c90f10

adishiritwick force-pushed the adishi/createusagepattern branch from 35a6f91 to 2c90f10 Compare August 6, 2026 05:34

Vinay Gera (g2vinay) requested changes Aug 7, 2026

View reviewed changes

		RequestFailedException reqEx when reqEx.Status == (int)HttpStatusCode.Conflict =>
		"Usage plan name already exists. Choose a different name.",

		\| resilience_usageplan_create \| Create a resilience usage plan <usage_plan_name> with plan type Basic in resource group <resource_group_name> \|
		\| resilience_usageplan_enrollment_create \| Create a usage plan enrollment <enrollment_name> for usage plan <usage_plan_name> associated with service group <service_group> in resource group <resource_group_name> \|

Uh oh!

Conversation

adishiritwick commented Jul 28, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

GitHub issue number?

Pre-merge Checklist

Uh oh!

azure-pipelines Bot commented Jul 28, 2026

Uh oh!

github-actions Bot commented Jul 28, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Rick Winter (RickWinter) left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Vinay Gera (g2vinay) left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

adishiritwick commented Jul 28, 2026 •

edited

Loading

Vinay Gera (g2vinay) left a comment •

edited

Loading