Skip to content

DI Refactor: Azure.Mcp.Tools.AppService #1900

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

Merged
conniey merged 6 commits into from
Mar 17, 2026
Merged

DI Refactor: Azure.Mcp.Tools.AppService #1900

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
192b1ea
Initial plan
Copilot Mar 2, 2026
1c76d75
DI refactor: inject IAppServiceService via constructor in all AppServ…
Copilot Mar 2, 2026
c6b9e13
Add AppServiceSetup to CommandFactoryHelpers and add changelog entry
Copilot Mar 2, 2026
90e6213
Add PR number.
conniey Mar 10, 2026
859e93d
Merge branch 'main' into copilot/refactor-appservice-dependency-injec…
conniey Mar 10, 2026
e6ae5d6
fix: fix imports ordering in CommandFactoryHelpers.cs
Copilot Mar 16, 2026
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
3 changes: 3 additions & 0 deletions core/Azure.Mcp.Core/tests/Azure.Mcp.Core.UnitTests/Areas/Server/CommandFactoryHelpers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
using Azure.Mcp.Tools.Aks;
using Azure.Mcp.Tools.AppConfig;
using Azure.Mcp.Tools.AppLens;
using Azure.Mcp.Tools.AppService;
using Azure.Mcp.Tools.Authorization;
using Azure.Mcp.Tools.AzureBestPractices;
using Azure.Mcp.Tools.AzureIsv;
Expand Down Expand Up @@ -67,6 +68,7 @@ public static ICommandFactory CreateCommandFactory(IServiceProvider? serviceProv
new AdvisorSetup(),
new AksSetup(),
new AppConfigSetup(),
new AppServiceSetup(),
new AppLensSetup(),
new AuthorizationSetup(),
new AzureBestPracticesSetup(),
Expand Down Expand Up @@ -132,6 +134,7 @@ public static IServiceCollection SetupCommonServices()
new AdvisorSetup(),
new AksSetup(),
new AppConfigSetup(),
new AppServiceSetup(),
new AppLensSetup(),
new AuthorizationSetup(),
new AzureBestPracticesSetup(),
Expand Down
4 changes: 4 additions & 0 deletions servers/Azure.Mcp.Server/changelog-entries/1772482309825.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
pr: 1900
changes:
Comment thread
conniey marked this conversation as resolved.
- section: "Other Changes"
description: "AppService: Improve testability by removing dependency on CommandContext.ServiceProvider in ExecuteAsync"
6 changes: 3 additions & 3 deletions tools/Azure.Mcp.Tools.AppService/src/Commands/Database/DatabaseAddCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,12 @@

Comment thread
conniey marked this conversation as resolved.
namespace Azure.Mcp.Tools.AppService.Commands.Database;

public sealed class DatabaseAddCommand(ILogger<DatabaseAddCommand> logger)
public sealed class DatabaseAddCommand(ILogger<DatabaseAddCommand> logger, IAppServiceService appServiceService)
: BaseAppServiceCommand<DatabaseAddOptions>(resourceGroupRequired: true, appRequired: true)
{
private const string CommandTitle = "Add Database to App Service";
private readonly ILogger<DatabaseAddCommand> _logger = logger;
private readonly IAppServiceService _appServiceService = appServiceService;

public override string Id => "14be1264-82c8-4a4c-8271-7cfe1fbebbc8";

Expand Down Expand Up @@ -73,8 +74,7 @@ public override async Task<CommandResponse> ExecuteAsync(CommandContext context,
{
context.Activity?.AddTag("subscription", options.Subscription);

var appServiceService = context.GetService<IAppServiceService>();
var connectionInfo = await appServiceService.AddDatabaseAsync(
var connectionInfo = await _appServiceService.AddDatabaseAsync(
options.AppName!,
options.ResourceGroup!,
options.DatabaseType!,
Expand Down
6 changes: 3 additions & 3 deletions tools/Azure.Mcp.Tools.AppService/src/Commands/Webapp/Settings/AppSettingsGetCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,12 @@

namespace Azure.Mcp.Tools.AppService.Commands.Webapp.Settings;

public sealed class AppSettingsGetCommand(ILogger<AppSettingsGetCommand> logger)
public sealed class AppSettingsGetCommand(ILogger<AppSettingsGetCommand> logger, IAppServiceService appServiceService)
: BaseAppServiceCommand<BaseAppServiceOptions>(resourceGroupRequired: true, appRequired: true)
{
private const string CommandTitle = "Gets Azure App Service Web App Application Settings";
private readonly ILogger<AppSettingsGetCommand> _logger = logger;
private readonly IAppServiceService _appServiceService = appServiceService;
public override string Id => "825ef21f-392f-4cd4-8272-7e7dce12e293";
public override string Name => "get-appsettings";

Expand Down Expand Up @@ -53,8 +54,7 @@ public override async Task<CommandResponse> ExecuteAsync(CommandContext context,
{
context.Activity?.AddTag("subscription", options.Subscription);

var appServiceService = context.GetService<IAppServiceService>();
var appSettings = await appServiceService.GetAppSettingsAsync(
var appSettings = await _appServiceService.GetAppSettingsAsync(
options.Subscription!,
options.ResourceGroup!,
options.AppName!,
Expand Down
6 changes: 3 additions & 3 deletions tools/Azure.Mcp.Tools.AppService/src/Commands/Webapp/Settings/AppSettingsUpdateCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,12 @@

namespace Azure.Mcp.Tools.AppService.Commands.Webapp.Settings;

public sealed class AppSettingsUpdateCommand(ILogger<AppSettingsUpdateCommand> logger)
public sealed class AppSettingsUpdateCommand(ILogger<AppSettingsUpdateCommand> logger, IAppServiceService appServiceService)
: BaseAppServiceCommand<AppSettingsUpdateOptions>(resourceGroupRequired: true, appRequired: true)
{
private const string CommandTitle = "Updates Azure App Service Web App Application Settings";
private readonly ILogger<AppSettingsUpdateCommand> _logger = logger;
private readonly IAppServiceService _appServiceService = appServiceService;
public override string Id => "08ca52a3-f766-4c62-9597-702f629efaf6";
public override string Name => "update-appsettings";

Expand Down Expand Up @@ -113,8 +114,7 @@ public override async Task<CommandResponse> ExecuteAsync(CommandContext context,
{
context.Activity?.AddTag("subscription", options.Subscription);

var appServiceService = context.GetService<IAppServiceService>();
var updateResult = await appServiceService.UpdateAppSettingsAsync(
var updateResult = await _appServiceService.UpdateAppSettingsAsync(
options.Subscription!,
options.ResourceGroup!,
options.AppName!,
Expand Down
6 changes: 3 additions & 3 deletions tools/Azure.Mcp.Tools.AppService/src/Commands/Webapp/WebappGetCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,12 @@

namespace Azure.Mcp.Tools.AppService.Commands.Webapp;

public sealed class WebappGetCommand(ILogger<WebappGetCommand> logger)
public sealed class WebappGetCommand(ILogger<WebappGetCommand> logger, IAppServiceService appServiceService)
: BaseAppServiceCommand<BaseAppServiceOptions>(resourceGroupRequired: false)
{
private const string CommandTitle = "Gets Azure App Service Web App Details";
private readonly ILogger<WebappGetCommand> _logger = logger;
private readonly IAppServiceService _appServiceService = appServiceService;
public override string Id => "4412f1af-16e7-46db-8305-33e3d7ae06de";
public override string Name => "get";

Expand Down Expand Up @@ -71,8 +72,7 @@ public override async Task<CommandResponse> ExecuteAsync(CommandContext context,
{
context.Activity?.AddTag("subscription", options.Subscription);

var appServiceService = context.GetService<IAppServiceService>();
var webapps = await appServiceService.GetWebAppsAsync(
var webapps = await _appServiceService.GetWebAppsAsync(
options.Subscription!,
options.ResourceGroup,
options.AppName,
Expand Down
27 changes: 10 additions & 17 deletions ...e/tests/Azure.Mcp.Tools.AppService.UnitTests/Commands/Database/DatabaseAddCommandTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,16 @@ namespace Azure.Mcp.Tools.AppService.UnitTests.Commands.Database;
public class DatabaseAddCommandTests
{
private readonly IAppServiceService _appServiceService;
private readonly IServiceProvider _serviceProvider;
private readonly ILogger<DatabaseAddCommand> _logger;
private readonly DatabaseAddCommand _command;
private readonly CommandContext _context;

public DatabaseAddCommandTests()
{
_appServiceService = Substitute.For<IAppServiceService>();
_logger = Substitute.For<ILogger<DatabaseAddCommand>>();
var collection = new ServiceCollection();
collection.AddSingleton(_appServiceService);
collection.AddSingleton(_logger);
_serviceProvider = collection.BuildServiceProvider();
_command = new(_logger, _appServiceService);
_context = new(new ServiceCollection().BuildServiceProvider());
}

[Theory]
Expand Down Expand Up @@ -117,12 +116,10 @@ await _appServiceService.Received(1).AddDatabaseAsync(
public async Task ExecuteAsync_MissingRequiredParameter_ReturnsErrorResponse(params string[] commandArgs)
{
// Arrange
var command = new DatabaseAddCommand(_logger);
var args = command.GetCommand().Parse(commandArgs);
var context = new CommandContext(_serviceProvider);
var args = _command.GetCommand().Parse(commandArgs);

// Act
var response = await command.ExecuteAsync(context, args, TestContext.Current.CancellationToken);
var response = await _command.ExecuteAsync(_context, args, TestContext.Current.CancellationToken);

// Assert
Assert.NotNull(response);
Expand Down Expand Up @@ -178,11 +175,9 @@ public async Task ExecuteAsync_WithVariousParameters_AcceptsParameters(
parameters.Add("retry-delay", retryDelay.Value);

// Execute the command directly in unit tests rather than via the tool runner helper
var command = new DatabaseAddCommand(_logger);
var argList = parameters.SelectMany(kvp => new[] { $"--{kvp.Key}", kvp.Value?.ToString() ?? string.Empty }).ToArray();
var parseResult = command.GetCommand().Parse(argList);
var context = new CommandContext(_serviceProvider);
var response = await command.ExecuteAsync(context, parseResult, TestContext.Current.CancellationToken);
var parseResult = _command.GetCommand().Parse(argList);
var response = await _command.ExecuteAsync(_context, parseResult, TestContext.Current.CancellationToken);

// Test actual command execution and proper error handling
Assert.NotNull(response);
Expand Down Expand Up @@ -240,19 +235,17 @@ public async Task ExecuteAsync_ServiceThrowsException_ReturnsErrorResponse()
Arg.Any<CancellationToken>())
.ThrowsAsync(new InvalidOperationException("Service error"));

var command = new DatabaseAddCommand(_logger);
var args = command.GetCommand().Parse([
var args = _command.GetCommand().Parse([
"--subscription", subscription,
"--resource-group", resourceGroup,
"--app", appName,
"--database-type", databaseType,
"--database-server", databaseServer,
"--database", databaseName
]);
var context = new CommandContext(_serviceProvider);

// Act
var response = await command.ExecuteAsync(context, args, TestContext.Current.CancellationToken);
var response = await _command.ExecuteAsync(_context, args, TestContext.Current.CancellationToken);
// Assert
Assert.NotNull(response);
Assert.Equal(HttpStatusCode.InternalServerError, response.Status);
Expand Down
8 changes: 2 additions & 6 deletions ...ure.Mcp.Tools.AppService.UnitTests/Commands/Webapp/Settings/AppSettingsGetCommandTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ namespace Azure.Mcp.Tools.AppService.UnitTests.Commands.Webapp.Settings;
public class AppSettingsGetCommandTests
{
private readonly IAppServiceService _appServiceService;
private readonly IServiceProvider _serviceProvider;
private readonly ILogger<AppSettingsGetCommand> _logger;
private readonly AppSettingsGetCommand _command;
private readonly CommandContext _context;
Expand All @@ -32,11 +31,8 @@ public AppSettingsGetCommandTests()
_appServiceService = Substitute.For<IAppServiceService>();
_logger = Substitute.For<ILogger<AppSettingsGetCommand>>();

var collection = new ServiceCollection().AddSingleton(_appServiceService);
_serviceProvider = collection.BuildServiceProvider();

_command = new(_logger);
_context = new(_serviceProvider);
_command = new(_logger, _appServiceService);
_context = new(new ServiceCollection().BuildServiceProvider());
_commandDefinition = _command.GetCommand();
}

Expand Down
8 changes: 2 additions & 6 deletions ....Mcp.Tools.AppService.UnitTests/Commands/Webapp/Settings/AppSettingsUpdateCommandTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ namespace Azure.Mcp.Tools.AppService.UnitTests.Commands.Webapp.Settings;
public class AppSettingsUpdateCommandTests
{
private readonly IAppServiceService _appServiceService;
private readonly IServiceProvider _serviceProvider;
private readonly ILogger<AppSettingsUpdateCommand> _logger;
private readonly AppSettingsUpdateCommand _command;
private readonly CommandContext _context;
Expand All @@ -32,11 +31,8 @@ public AppSettingsUpdateCommandTests()
_appServiceService = Substitute.For<IAppServiceService>();
_logger = Substitute.For<ILogger<AppSettingsUpdateCommand>>();

var collection = new ServiceCollection().AddSingleton(_appServiceService);
_serviceProvider = collection.BuildServiceProvider();

_command = new(_logger);
_context = new(_serviceProvider);
_command = new(_logger, _appServiceService);
_context = new(new ServiceCollection().BuildServiceProvider());
_commandDefinition = _command.GetCommand();
}

Expand Down
8 changes: 2 additions & 6 deletions ...rvice/tests/Azure.Mcp.Tools.AppService.UnitTests/Commands/Webapp/WebappGetCommandTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ namespace Azure.Mcp.Tools.AppService.UnitTests.Commands.Webapp;
public class WebappGetCommandTests
{
private readonly IAppServiceService _appServiceService;
private readonly IServiceProvider _serviceProvider;
private readonly ILogger<WebappGetCommand> _logger;
private readonly WebappGetCommand _command;
private readonly CommandContext _context;
Expand All @@ -33,11 +32,8 @@ public WebappGetCommandTests()
_appServiceService = Substitute.For<IAppServiceService>();
_logger = Substitute.For<ILogger<WebappGetCommand>>();

var collection = new ServiceCollection().AddSingleton(_appServiceService);
_serviceProvider = collection.BuildServiceProvider();

_command = new(_logger);
_context = new(_serviceProvider);
_command = new(_logger, _appServiceService);
_context = new(new ServiceCollection().BuildServiceProvider());
_commandDefinition = _command.GetCommand();
}

Expand Down
Loading