Skip to content

Return explicit empty subscription list result #508

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+4 −6
Open

Return explicit empty subscription list result #508

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d0499c1
Return explicit empty subscription list result
JasonYeMSFT Sep 18, 2025
ea8d1bf
Fix test
JasonYeMSFT Sep 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions core/Azure.Mcp.Core/src/Areas/Subscription/Commands/SubscriptionListCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,9 @@ public override async Task<CommandResponse> ExecuteAsync(CommandContext context,
var subscriptionService = context.GetService<ISubscriptionService>();
var subscriptions = await subscriptionService.GetSubscriptions(options.Tenant, options.RetryPolicy);

context.Response.Results = subscriptions?.Count > 0
? ResponseResult.Create(
context.Response.Results = ResponseResult.Create(
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for catching this! Just a nit change to follow all the other commands doing this:

context.Response.Results = ResponseResult.Create(new(subscriptions ?? []), SubscriptionJsonContext.Default.SubscriptionListCommandResult);

new SubscriptionListCommandResult(subscriptions),
SubscriptionJsonContext.Default.SubscriptionListCommandResult)
: null;
SubscriptionJsonContext.Default.SubscriptionListCommandResult);
}
catch (Exception ex)
{
Expand Down
4 changes: 2 additions & 2 deletions ...cp.Core/tests/Azure.Mcp.Core.UnitTests/Areas/Subscription/SubscriptionListCommandTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ await _subscriptionService.Received(1).GetSubscriptions(
}

[Fact]
public async Task ExecuteAsync_EmptySubscriptionList_ReturnsNullResults()
public async Task ExecuteAsync_EmptySubscriptionList_ReturnsNotNullResults()
{
// Arrange
_subscriptionService
Expand All @@ -120,7 +120,7 @@ public async Task ExecuteAsync_EmptySubscriptionList_ReturnsNullResults()
// Assert
Assert.NotNull(result);
Assert.Equal(200, result.Status);
Assert.Null(result.Results);
Assert.NotNull(result.Results);
}

[Fact]
Expand Down