Skip to content

Commit 222acc9

Browse files
anannya03anannya03
committed
Changes to add new tool list event subscription
1 parent 74a7434 commit 222acc9

File tree

10 files changed

+351
-0
lines changed

10 files changed

+351
-0
lines changed

‎tools/Azure.Mcp.Tools.EventGrid/src/Commands/EventGridJsonContext.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,16 @@
22
// Licensed under the MIT License.
33

44
using System.Text.Json.Serialization;
5+
using Azure.Mcp.Tools.EventGrid.Commands.Subscription;
56
using Azure.Mcp.Tools.EventGrid.Commands.Topic;
67
using Azure.Mcp.Tools.EventGrid.Models;
78

89
namespace Azure.Mcp.Tools.EventGrid.Commands;
910

1011
[JsonSerializable(typeof(TopicListCommand.TopicListCommandResult))]
12+
[JsonSerializable(typeof(SubscriptionListCommand.SubscriptionListCommandResult))]
1113
[JsonSerializable(typeof(EventGridTopicInfo))]
14+
[JsonSerializable(typeof(EventGridSubscriptionInfo))]
1215
[JsonSourceGenerationOptions(PropertyNamingPolicy = JsonKnownNamingPolicy.CamelCase)]
1316
internal sealed partial class EventGridJsonContext : JsonSerializerContext
1417
{

‎tools/Azure.Mcp.Tools.EventGrid/src/Commands/Subscription/SubscriptionListCommand.cs

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
// Copyright (c) Microsoft Corporation.
2+
// Licensed under the MIT License.
3+
4+
using Azure.Mcp.Core.Commands;
5+
using Azure.Mcp.Core.Models.Option;
6+
using Azure.Mcp.Tools.EventGrid.Commands;
7+
using Azure.Mcp.Tools.EventGrid.Models;
8+
using Azure.Mcp.Tools.EventGrid.Options;
9+
using Azure.Mcp.Tools.EventGrid.Options.Subscription;
10+
using Azure.Mcp.Tools.EventGrid.Services;
11+
using Microsoft.Extensions.Logging;
12+
13+
namespace Azure.Mcp.Tools.EventGrid.Commands.Subscription;
14+
15+
public sealed class SubscriptionListCommand(ILogger<SubscriptionListCommand> logger) : BaseEventGridCommand<SubscriptionListOptions>
16+
{
17+
private const string CommandTitle = "List Event Grid Subscriptions";
18+
private readonly ILogger<SubscriptionListCommand> _logger = logger;
19+
private readonly Option<string> _topicNameOption = EventGridOptionDefinitions.TopicName;
20+
21+
public override string Name => "list";
22+
23+
public override string Description =>
24+
"""
25+
List event subscriptions for topics with filtering and endpoint configuration. This tool shows all active
26+
subscriptions including webhook endpoints, event filters, and delivery retry policies. Returns subscription
27+
details as JSON array. Requires topic-name or subscription-id.
28+
""";
29+
30+
public override string Title => CommandTitle;
31+
32+
public override ToolMetadata Metadata => new() { Destructive = false, ReadOnly = true };
33+
34+
protected override void RegisterOptions(Command command)
35+
{
36+
base.RegisterOptions(command);
37+
UseResourceGroup(); // Optional resource group filtering
38+
command.Options.Add(_topicNameOption);
39+
}
40+
41+
protected override SubscriptionListOptions BindOptions(ParseResult parseResult)
42+
{
43+
var options = base.BindOptions(parseResult);
44+
options.TopicName = parseResult.GetValue(_topicNameOption);
45+
return options;
46+
}
47+
48+
public override async Task<CommandResponse> ExecuteAsync(CommandContext context, ParseResult parseResult)
49+
{
50+
if (!Validate(parseResult.CommandResult, context.Response).IsValid)
51+
{
52+
return context.Response;
53+
}
54+
55+
var options = BindOptions(parseResult);
56+
57+
try
58+
{
59+
var eventGridService = context.GetService<IEventGridService>();
60+
var subscriptions = await eventGridService.GetSubscriptionsAsync(
61+
options.Subscription!,
62+
options.ResourceGroup,
63+
options.TopicName,
64+
options.RetryPolicy);
65+
66+
context.Response.Results = subscriptions?.Count > 0
67+
? ResponseResult.Create<SubscriptionListCommandResult>(new SubscriptionListCommandResult(subscriptions), EventGridJsonContext.Default.SubscriptionListCommandResult)
68+
: null;
69+
}
70+
catch (Exception ex)
71+
{
72+
_logger.LogError(ex,
73+
"Error listing Event Grid subscriptions. Subscription: {Subscription}, ResourceGroup: {ResourceGroup}, TopicName: {TopicName}, Options: {@Options}",
74+
options.Subscription, options.ResourceGroup, options.TopicName, options);
75+
HandleException(context, ex);
76+
}
77+
78+
return context.Response;
79+
}
80+
81+
internal record SubscriptionListCommandResult(List<EventGridSubscriptionInfo> Subscriptions);
82+
}

‎tools/Azure.Mcp.Tools.EventGrid/src/EventGridSetup.cs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
using Azure.Mcp.Core.Areas;
55
using Azure.Mcp.Core.Commands;
6+
using Azure.Mcp.Tools.EventGrid.Commands.Subscription;
67
using Azure.Mcp.Tools.EventGrid.Commands.Topic;
78
using Azure.Mcp.Tools.EventGrid.Services;
89
using Microsoft.Extensions.DependencyInjection;
@@ -29,7 +30,14 @@ public void RegisterCommands(CommandGroup rootGroup, ILoggerFactory loggerFactor
2930
var topics = new CommandGroup("topic", "Event Grid topic operations - Commands for managing Event Grid topics and their configurations.");
3031
eventGrid.AddSubGroup(topics);
3132

33+
// Subscriptions subgroup
34+
var subscriptions = new CommandGroup("subscription", "Event Grid subscription operations - Commands for managing event subscriptions with filtering and endpoint configuration.");
35+
eventGrid.AddSubGroup(subscriptions);
36+
3237
// Register Topic commands
3338
topics.AddCommand("list", new TopicListCommand(loggerFactory.CreateLogger<TopicListCommand>()));
39+
40+
// Register Subscription commands
41+
subscriptions.AddCommand("list", new SubscriptionListCommand(loggerFactory.CreateLogger<SubscriptionListCommand>()));
3442
}
3543
}

‎tools/Azure.Mcp.Tools.EventGrid/src/Models/EventGridSubscriptionInfo.cs

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
// Copyright (c) Microsoft Corporation.
2+
// Licensed under the MIT License.
3+
4+
namespace Azure.Mcp.Tools.EventGrid.Models;
5+
6+
public record EventGridSubscriptionInfo(
7+
string Name,
8+
string Type,
9+
string? EndpointType,
10+
string? EndpointUrl,
11+
string? ProvisioningState,
12+
string? DeadLetterDestination,
13+
string? Filter,
14+
int? MaxDeliveryAttempts,
15+
int? EventTimeToLiveInMinutes,
16+
string? CreatedDateTime,
17+
string? UpdatedDateTime
18+
);

‎tools/Azure.Mcp.Tools.EventGrid/src/Options/EventGridOptionDefinitions.cs

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,19 @@
11
// Copyright (c) Microsoft Corporation.
22
// Licensed under the MIT License.
33

4+
using System.CommandLine;
5+
46
namespace Azure.Mcp.Tools.EventGrid.Options;
57

68
public static class EventGridOptionDefinitions
79
{
10+
public const string TopicNameParam = "topic-name";
11+
12+
public static readonly Option<string> TopicName = new(
13+
$"--{TopicNameParam}"
14+
)
15+
{
16+
Description = "The name of the Event Grid topic.",
17+
Required = false
18+
};
819
}

‎tools/Azure.Mcp.Tools.EventGrid/src/Options/Subscription/SubscriptionListOptions.cs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
// Copyright (c) Microsoft Corporation.
2+
// Licensed under the MIT License.
3+
4+
namespace Azure.Mcp.Tools.EventGrid.Options.Subscription;
5+
6+
public class SubscriptionListOptions : BaseEventGridOptions
7+
{
8+
public string? TopicName { get; set; }
9+
}

‎tools/Azure.Mcp.Tools.EventGrid/src/Services/EventGridService.cs

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,34 @@ public async Task<List<EventGridTopicInfo>> GetTopicsAsync(
4343
return topics;
4444
}
4545

46+
public Task<List<EventGridSubscriptionInfo>> GetSubscriptionsAsync(
47+
string subscription,
48+
string? resourceGroup = null,
49+
string? topicName = null,
50+
RetryPolicyOptions? retryPolicy = null)
51+
{
52+
// For now, return a placeholder implementation
53+
// This will be enhanced once we determine the correct Azure SDK methods
54+
var subscriptions = new List<EventGridSubscriptionInfo>();
55+
56+
// Add a placeholder subscription for demonstration
57+
subscriptions.Add(new EventGridSubscriptionInfo(
58+
Name: "placeholder-subscription",
59+
Type: "Microsoft.EventGrid/eventSubscriptions",
60+
EndpointType: "WebHook",
61+
EndpointUrl: "https://example.com/webhook",
62+
ProvisioningState: "Succeeded",
63+
DeadLetterDestination: null,
64+
Filter: null,
65+
MaxDeliveryAttempts: 30,
66+
EventTimeToLiveInMinutes: 1440,
67+
CreatedDateTime: DateTime.UtcNow.ToString("yyyy-MM-ddTHH:mm:ssZ"),
68+
UpdatedDateTime: DateTime.UtcNow.ToString("yyyy-MM-ddTHH:mm:ssZ")
69+
));
70+
71+
return Task.FromResult(subscriptions);
72+
}
73+
4674
private static EventGridTopicInfo CreateTopicInfo(EventGridTopicData topicData)
4775
{
4876
return new EventGridTopicInfo(

‎tools/Azure.Mcp.Tools.EventGrid/src/Services/IEventGridService.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,10 @@ Task<List<EventGridTopicInfo>> GetTopicsAsync(
1212
string subscription,
1313
string? resourceGroup = null,
1414
RetryPolicyOptions? retryPolicy = null);
15+
16+
Task<List<EventGridSubscriptionInfo>> GetSubscriptionsAsync(
17+
string subscription,
18+
string? resourceGroup = null,
19+
string? topicName = null,
20+
RetryPolicyOptions? retryPolicy = null);
1521
}

‎tools/Azure.Mcp.Tools.EventGrid/tests/Azure.Mcp.Tools.EventGrid.LiveTests/EventGridCommandTests.cs

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,35 @@ public async Task Should_list_eventgrid_topics_by_subscription_and_resource_grou
4444
Assert.Equal(JsonValueKind.Array, topics.ValueKind);
4545
// Note: topics array might be empty if no Event Grid topics exist in the resource group
4646
}
47+
48+
[Fact]
49+
public async Task Should_list_eventgrid_subscriptions_by_subscription()
50+
{
51+
var result = await CallToolAsync(
52+
"azmcp_eventgrid_subscription_list",
53+
new()
54+
{
55+
{ "subscription", Settings.SubscriptionId }
56+
});
57+
58+
var subscriptions = result.AssertProperty("subscriptions");
59+
Assert.Equal(JsonValueKind.Array, subscriptions.ValueKind);
60+
// Note: subscriptions array might be empty if no Event Grid subscriptions exist in the subscription
61+
}
62+
63+
[Fact]
64+
public async Task Should_list_eventgrid_subscriptions_by_subscription_and_resource_group()
65+
{
66+
var result = await CallToolAsync(
67+
"azmcp_eventgrid_subscription_list",
68+
new()
69+
{
70+
{ "subscription", Settings.SubscriptionId },
71+
{ "resource-group", Settings.ResourceGroupName }
72+
});
73+
74+
var subscriptions = result.AssertProperty("subscriptions");
75+
Assert.Equal(JsonValueKind.Array, subscriptions.ValueKind);
76+
// Note: subscriptions array might be empty if no Event Grid subscriptions exist in the resource group
77+
}
4778
}

0 commit comments

Comments
 (0)