Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 4 additions & 12 deletions tools/Azure.Mcp.Tools.AppLens/src/Services/AppLensService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ internal async Task<FindResourceIdResult> FindResourceAsync(

// Filter to supported resource types
var supportedResults = filteredResults
.Where(r => IsResourceTypeSupported(r.ResourceType, r.ResourceKind))
.Where(r => IsResourceTypeSupported(r.ResourceType))
.ToImmutableArray();
Comment thread
tmeschter marked this conversation as resolved.

if (supportedResults.Length == 0)
Expand Down Expand Up @@ -255,19 +255,11 @@ private async Task<ImmutableArray<AppLensArgQueryResult>> ExecuteArgQueryAsync(
}

/// <summary>
/// Checks whether a resource type (and optionally kind) is supported by AppLens diagnostics.
/// Checks whether a resource type is supported by AppLens diagnostics.
/// </summary>
internal static bool IsResourceTypeSupported(string resourceType, string resourceKind)
internal static bool IsResourceTypeSupported(string resourceType)
{
if (resourceType.Equals("microsoft.web/sites", StringComparison.OrdinalIgnoreCase))
{
return resourceKind.Equals("app", StringComparison.OrdinalIgnoreCase)
|| resourceKind.Equals("linux", StringComparison.OrdinalIgnoreCase)
|| resourceKind.Equals("functionapp", StringComparison.OrdinalIgnoreCase);
}

return resourceType.Equals("microsoft.containerservice/managedclusters", StringComparison.OrdinalIgnoreCase)
|| resourceType.Equals("microsoft.apimanagement/service", StringComparison.OrdinalIgnoreCase);
return SupportedResourceTypes().Contains(resourceType, StringComparer.OrdinalIgnoreCase);
}

/// <summary>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -414,24 +414,20 @@ await ExecuteCommandAsync(
}

[Theory]
[InlineData("microsoft.web/sites", "app", true)]
[InlineData("microsoft.web/sites", "linux", true)]
[InlineData("microsoft.web/sites", "functionapp", true)]
[InlineData("Microsoft.Web/Sites", "App", true)]
[InlineData("MICROSOFT.WEB/SITES", "APP", true)]
[InlineData("microsoft.containerservice/managedclusters", "", true)]
[InlineData("Microsoft.ContainerService/managedClusters", "", true)]
[InlineData("microsoft.apimanagement/service", "", true)]
[InlineData("Microsoft.ApiManagement/service", "", true)]
[InlineData("microsoft.web/sites", "container", false)]
[InlineData("microsoft.web/sites", "", false)]
[InlineData("microsoft.compute/virtualmachines", "", false)]
[InlineData("microsoft.storage/storageaccounts", "", false)]
[InlineData("microsoft.sql/servers", "", false)]
public void IsResourceTypeSupported_ReturnsCorrectResult(string resourceType, string resourceKind, bool expected)
[InlineData("microsoft.web/sites", true)]
[InlineData("Microsoft.Web/Sites", true)]
[InlineData("MICROSOFT.WEB/SITES", true)]
[InlineData("microsoft.containerservice/managedclusters", true)]
[InlineData("Microsoft.ContainerService/managedClusters", true)]
[InlineData("microsoft.apimanagement/service", true)]
[InlineData("Microsoft.ApiManagement/service", true)]
[InlineData("microsoft.compute/virtualmachines", false)]
[InlineData("microsoft.storage/storageaccounts", false)]
[InlineData("microsoft.sql/servers", false)]
public void IsResourceTypeSupported_ReturnsCorrectResult(string resourceType, bool expected)
{
// Act
var result = AppLensService.IsResourceTypeSupported(resourceType, resourceKind);
var result = AppLensService.IsResourceTypeSupported(resourceType);

// Assert
Assert.Equal(expected, result);
Expand Down