Skip to content
This repository was archived by the owner on Feb 6, 2026. It is now read-only.

Commit ff6e185

Browse files
halliprhallipr
authored
Fix live test deployment and code issues (#723)
* Fix live test deployment and code issues * Fix loadtest and marketplace live tests * Skip timing based monitor test
1 parent a9e143d commit ff6e185

5 files changed

Lines changed: 70 additions & 49 deletions

File tree

‎infra/services/monitor.bicep‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,3 +190,22 @@ resource tableServiceDiagnostics 'Microsoft.Insights/diagnosticSettings@2021-05-
190190
]
191191
}
192192
}
193+
194+
// Role assignment for the test application to access the storage account
195+
resource blobContributorRoleDefinition 'Microsoft.Authorization/roleDefinitions@2018-01-01-preview' existing = {
196+
scope: subscription()
197+
// This is the Storage Blob Data Contributor role.
198+
// Read, write, and delete Azure Storage containers and blobs
199+
// See https://learn.microsoft.com/en-us/azure/role-based-access-control/built-in-roles#storage
200+
name: 'ba92f5b4-2d11-453d-a403-e96b0029c9fe'
201+
}
202+
203+
resource appBlobRoleAssignment 'Microsoft.Authorization/roleAssignments@2022-04-01' = {
204+
name: guid(blobContributorRoleDefinition.id, testApplicationOid, storageAccount.id)
205+
scope: storageAccount
206+
properties:{
207+
principalId: testApplicationOid
208+
roleDefinitionId: blobContributorRoleDefinition.id
209+
description: 'Blob Contributor for testApplicationOid'
210+
}
211+
}

‎infra/services/workbooks.bicep‎

Lines changed: 33 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -351,36 +351,37 @@ resource simpleTestWorkbook 'Microsoft.Insights/workbooks@2023-06-01' = {
351351
}
352352

353353
// User workbook for testing different kind
354-
resource userWorkbook 'Microsoft.Insights/workbooks@2023-06-01' = {
355-
name: guid('${baseName}-user-workbook')
356-
location: location
357-
kind: 'user'
358-
properties: {
359-
displayName: '${baseName} User Workbook'
360-
description: 'User workbook for testing different kind filter'
361-
category: 'workbook'
362-
sourceId: workspace.id
363-
serializedData: string({
364-
version: 'Notebook/1.0'
365-
items: [
366-
{
367-
type: 1
368-
content: {
369-
json: '# User Workbook\n\nThis is a user workbook for testing kind filters.'
370-
}
371-
}
372-
]
373-
styleSettings: {}
374-
'$schema': 'https://github.com/Microsoft/Application-Insights-Workbooks/blob/master/schema/workbook.json'
375-
})
376-
}
377-
tags: {
378-
purpose: 'testing'
379-
environment: 'development'
380-
project: 'azure-mcp'
381-
category: 'filter-test'
382-
}
383-
}
354+
// TODO: kind'user' is unsupported. The only valid value is 'shared'.
355+
// resource userWorkbook 'Microsoft.Insights/workbooks@2023-06-01' = {
356+
// name: guid('${baseName}-user-workbook')
357+
// location: location
358+
// kind: 'user'
359+
// properties: {
360+
// displayName: '${baseName} User Workbook'
361+
// description: 'User workbook for testing different kind filter'
362+
// category: 'workbook'
363+
// sourceId: workspace.id
364+
// serializedData: string({
365+
// version: 'Notebook/1.0'
366+
// items: [
367+
// {
368+
// type: 1
369+
// content: {
370+
// json: '# User Workbook\n\nThis is a user workbook for testing kind filters.'
371+
// }
372+
// }
373+
// ]
374+
// styleSettings: {}
375+
// '$schema': 'https://github.com/Microsoft/Application-Insights-Workbooks/blob/master/schema/workbook.json'
376+
// })
377+
// }
378+
// tags: {
379+
// purpose: 'testing'
380+
// environment: 'development'
381+
// project: 'azure-mcp'
382+
// category: 'filter-test'
383+
// }
384+
// }
384385

385386
// Sentinel workbook for testing different category
386387
resource sentinelWorkbook 'Microsoft.Insights/workbooks@2023-06-01' = {
@@ -452,7 +453,7 @@ output performanceWorkbookId string = performanceWorkbook.id
452453
output securityWorkbookId string = securityWorkbook.id
453454
output applicationInsightsWorkbookId string = applicationInsightsWorkbook.id
454455
output simpleTestWorkbookId string = simpleTestWorkbook.id
455-
output userWorkbookId string = userWorkbook.id
456+
//output userWorkbookId string = userWorkbook.id
456457
output sentinelWorkbookId string = sentinelWorkbook.id
457458
output tsgWorkbookId string = tsgWorkbook.id
458459

@@ -462,7 +463,7 @@ output workbookNames array = [
462463
securityWorkbook.properties.displayName
463464
applicationInsightsWorkbook.properties.displayName
464465
simpleTestWorkbook.properties.displayName
465-
userWorkbook.properties.displayName
466+
//userWorkbook.properties.displayName
466467
sentinelWorkbook.properties.displayName
467468
tsgWorkbook.properties.displayName
468469
]

‎tests/Areas/LoadTesting/LiveTests/LoadTestingCommandTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public async Task Should_list_loadtests()
2424
{
2525
// Arrange
2626
var result = await CallToolAsync(
27-
"azmcp-loadtesting-testresource-list",
27+
"azmcp_loadtesting_testresource_list",
2828
new()
2929
{
3030
{ "subscription", _subscriptionId },
@@ -33,7 +33,7 @@ public async Task Should_list_loadtests()
3333
});
3434

3535
// Assert
36-
var items = result.AssertProperty("LoadTests");
36+
var items = result.AssertProperty("LoadTest");
3737
Assert.Equal(JsonValueKind.Array, items.ValueKind);
3838
Assert.NotEmpty(items.EnumerateArray());
3939
foreach (var item in items.EnumerateArray())

‎tests/Areas/Marketplace/LiveTests/MarketplaceCommandTests.cs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public async Task Should_get_marketplace_product()
3939

4040
// Act
4141
var result = await CallToolAsync(
42-
"azmcp-marketplace-product-get",
42+
"azmcp_marketplace_product_get",
4343
new()
4444
{
4545
{ "subscription", _subscriptionId },
@@ -78,7 +78,7 @@ public async Task Should_get_marketplace_product_with_language_option()
7878

7979
// Act
8080
var result = await CallToolAsync(
81-
"azmcp-marketplace-product-get",
81+
"azmcp_marketplace_product_get",
8282
new()
8383
{
8484
{ "subscription", _subscriptionId },
@@ -104,7 +104,7 @@ public async Task Should_get_marketplace_product_with_market_option()
104104

105105
// Act
106106
var result = await CallToolAsync(
107-
"azmcp-marketplace-product-get",
107+
"azmcp_marketplace_product_get",
108108
new()
109109
{
110110
{ "subscription", _subscriptionId },
@@ -129,7 +129,7 @@ public async Task Should_get_marketplace_product_with_include_hidden_plans()
129129

130130
// Act
131131
var result = await CallToolAsync(
132-
"azmcp-marketplace-product-get",
132+
"azmcp_marketplace_product_get",
133133
new()
134134
{
135135
{ "subscription", _subscriptionId },
@@ -161,7 +161,7 @@ public async Task Should_get_marketplace_product_with_service_instruction_templa
161161

162162
// Act
163163
var result = await CallToolAsync(
164-
"azmcp-marketplace-product-get",
164+
"azmcp_marketplace_product_get",
165165
new()
166166
{
167167
{ "subscription", _subscriptionId },
@@ -188,7 +188,7 @@ public async Task Should_handle_nonexistent_product_gracefully()
188188
var exception = await Assert.ThrowsAnyAsync<Exception>(async () =>
189189
{
190190
await CallToolAsync(
191-
"azmcp-marketplace-product-get",
191+
"azmcp_marketplace_product_get",
192192
new()
193193
{
194194
{ "subscription", _subscriptionId },
@@ -211,7 +211,7 @@ public async Task Should_validate_required_subscription_parameter()
211211
var exception = await Assert.ThrowsAnyAsync<Exception>(async () =>
212212
{
213213
await CallToolAsync(
214-
"azmcp-marketplace-product-get",
214+
"azmcp_marketplace_product_get",
215215
new()
216216
{
217217
{ "product-id", productId }
@@ -230,7 +230,7 @@ public async Task Should_validate_required_product_id_parameter()
230230
var exception = await Assert.ThrowsAnyAsync<Exception>(async () =>
231231
{
232232
await CallToolAsync(
233-
"azmcp-marketplace-product-get",
233+
"azmcp_marketplace_product_get",
234234
new()
235235
{
236236
{ "subscription", _subscriptionId }
@@ -252,7 +252,7 @@ public async Task Should_get_marketplace_product_with_multiple_options()
252252

253253
// Act
254254
var result = await CallToolAsync(
255-
"azmcp-marketplace-product-get",
255+
"azmcp_marketplace_product_get",
256256
new()
257257
{
258258
{ "subscription", _subscriptionId },

‎tests/Areas/Monitor/LiveTests/MonitorCommandTests.cs‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ public class MonitorCommandTests(LiveTestFixture fixture, ITestOutputHelper outp
2121
private LogAnalyticsHelper? _logHelper;
2222
private const string TestLogType = "TestLogs_CL";
2323
private IMonitorService? _monitorService;
24+
private string _storageAccountName = $"{fixture.Settings.ResourceBaseName}mon";
2425

2526
ValueTask IAsyncLifetime.InitializeAsync()
2627
{
@@ -82,7 +83,7 @@ public async Task Should_list_monitor_workspaces()
8283
Assert.NotEmpty(array);
8384
}
8485

85-
[Fact]
86+
[Fact(Skip = "Intermittent failures due to slow ingestion")]
8687
[Trait("Category", "Live")]
8788
public async Task Should_get_table_contents()
8889
{
@@ -169,7 +170,7 @@ public async Task Should_list_monitor_table_types()
169170
[Trait("Category", "Live")]
170171
public async Task Should_query_monitor_logs_by_resource_id()
171172
{
172-
var storageResourceId = $"/subscriptions/{Settings.SubscriptionId}/resourceGroups/{Settings.ResourceGroupName}/providers/Microsoft.Storage/storageAccounts/{Settings.ResourceBaseName}";
173+
var storageResourceId = $"/subscriptions/{Settings.SubscriptionId}/resourceGroups/{Settings.ResourceGroupName}/providers/Microsoft.Storage/storageAccounts/{_storageAccountName}";
173174
await QueryForLogsAsync(
174175
async args => await CallToolAsync("azmcp_monitor_resource_log_query", args),
175176
new()
@@ -275,7 +276,7 @@ private static async Task QueryForLogsAsync(
275276
public async Task Should_list_metric_definitions()
276277
{
277278
// Example resource ID - uses a storage account that should exist from the test fixture
278-
string resourceId = $"/subscriptions/{Settings.SubscriptionId}/resourceGroups/{Settings.ResourceGroupName}/providers/Microsoft.Storage/storageAccounts/{Settings.ResourceBaseName}";
279+
string resourceId = $"/subscriptions/{Settings.SubscriptionId}/resourceGroups/{Settings.ResourceGroupName}/providers/Microsoft.Storage/storageAccounts/{_storageAccountName}";
279280

280281
var result = await CallToolAsync(
281282
"azmcp_monitor_metrics_definitions",
@@ -347,7 +348,7 @@ public async Task Should_list_metric_definitions()
347348
public async Task Should_query_metrics()
348349
{
349350
// Example resource ID - uses a storage account that should exist from the test fixture
350-
string resourceId = $"/subscriptions/{Settings.SubscriptionId}/resourceGroups/{Settings.ResourceGroupName}/providers/Microsoft.Storage/storageAccounts/{Settings.ResourceBaseName}";
351+
string resourceId = $"/subscriptions/{Settings.SubscriptionId}/resourceGroups/{Settings.ResourceGroupName}/providers/Microsoft.Storage/storageAccounts/{_storageAccountName}";
351352

352353
var result = await CallToolAsync(
353354
"azmcp_monitor_metrics_query",
@@ -413,7 +414,7 @@ private async Task GenerateStorageActivityAsync()
413414
var listResult = await CallToolAsync("azmcp_storage_blob_container_list", new()
414415
{
415416
{ "subscription", Settings.SubscriptionId },
416-
{ "account-name", Settings.ResourceBaseName }
417+
{ "account-name", _storageAccountName }
417418
});
418419

419420
Output.WriteLine("Listed storage containers to generate metrics");
@@ -428,7 +429,7 @@ private async Task GenerateStorageActivityAsync()
428429
var blobListResult = await CallToolAsync("azmcp_storage_blob_list", new()
429430
{
430431
{ "subscription", Settings.SubscriptionId },
431-
{ "account-name", Settings.ResourceBaseName },
432+
{ "account-name", _storageAccountName },
432433
{ "container-name", containerName.GetString() }
433434
});
434435

0 commit comments

Comments
 (0)