Skip to content

Commit f4405e1

Browse files
RussKieRussKie
committed
Push test snapshots to Helix
1 parent da4e00b commit f4405e1

17 files changed

+93
-74
lines changed

‎tests/Aspire.Hosting.Azure.Tests/AzureBicepResourceTests.cs

+26-26
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ public async Task AddAzureCosmosDBViaRunMode_WithAccessKeyAuthentication(string?
325325
Assert.Equal(expectedManifest, manifest.ManifestNode.ToString());
326326

327327
await Verifier.Verify(manifest.BicepText, extension: "bicep")
328-
.UseDirectory("Snapshots");
328+
.UseHelixAwareDirectory("Snapshots");
329329

330330
Assert.NotNull(callbackDatabases);
331331
Assert.Collection(
@@ -369,7 +369,7 @@ public async Task AddAzureCosmosDBViaRunMode_NoAccessKeyAuthentication()
369369
Assert.Equal(expectedManifest, manifest.ManifestNode.ToString());
370370

371371
await Verifier.Verify(manifest.BicepText, extension: "bicep")
372-
.UseDirectory("Snapshots");
372+
.UseHelixAwareDirectory("Snapshots");
373373

374374
Assert.NotNull(callbackDatabases);
375375
Assert.Collection(
@@ -446,7 +446,7 @@ public async Task AddAzureCosmosDBViaPublishMode_WithAccessKeyAuthentication(str
446446
Assert.Equal(expectedManifest, m);
447447

448448
await Verifier.Verify(manifest.BicepText, extension: "bicep")
449-
.UseDirectory("Snapshots");
449+
.UseHelixAwareDirectory("Snapshots");
450450

451451
Assert.NotNull(callbackDatabases);
452452
Assert.Collection(
@@ -488,7 +488,7 @@ public async Task AddAzureCosmosDBViaPublishMode_NoAccessKeyAuthentication()
488488
Assert.Equal(expectedManifest, manifest.ManifestNode.ToString());
489489

490490
await Verifier.Verify(manifest.BicepText, extension: "bicep")
491-
.UseDirectory("Snapshots");
491+
.UseHelixAwareDirectory("Snapshots");
492492

493493
Assert.NotNull(callbackDatabases);
494494
Assert.Collection(
@@ -612,7 +612,7 @@ public async Task AddApplicationInsightsWithoutExplicitLawGetsDefaultLawParamete
612612
Assert.Equal(expectedManifest, appInsightsManifest.ManifestNode.ToString());
613613

614614
await Verifier.Verify(appInsightsManifest.BicepText, extension: "bicep")
615-
.UseDirectory("Snapshots");
615+
.UseHelixAwareDirectory("Snapshots");
616616
}
617617

618618
[Fact]
@@ -641,7 +641,7 @@ public async Task AddApplicationInsightsWithoutExplicitLawGetsDefaultLawParamete
641641
Assert.Equal(expectedManifest, appInsightsManifest.ManifestNode.ToString());
642642

643643
await Verifier.Verify(appInsightsManifest.BicepText, extension: "bicep")
644-
.UseDirectory("Snapshots");
644+
.UseHelixAwareDirectory("Snapshots");
645645
}
646646

647647
[Fact]
@@ -674,7 +674,7 @@ public async Task AddApplicationInsightsWithExplicitLawArgumentDoesntGetDefaultP
674674
Assert.Equal(expectedManifest, appInsightsManifest.ManifestNode.ToString());
675675

676676
await Verifier.Verify(appInsightsManifest.BicepText, extension: "bicep")
677-
.UseDirectory("Snapshots");
677+
.UseHelixAwareDirectory("Snapshots");
678678
}
679679

680680
[Fact]
@@ -697,7 +697,7 @@ public async Task AddLogAnalyticsWorkspace()
697697
Assert.Equal(expectedManifest, appInsightsManifest.ManifestNode.ToString());
698698

699699
await Verifier.Verify(appInsightsManifest.BicepText, extension: "bicep")
700-
.UseDirectory("Snapshots");
700+
.UseHelixAwareDirectory("Snapshots");
701701
}
702702

703703
[Fact]
@@ -847,7 +847,7 @@ public async Task PublishAsRedisPublishesRedisAsAzureRedisInfrastructure()
847847
Assert.Equal(expectedManifest, manifest.ManifestNode.ToString());
848848

849849
await Verifier.Verify(manifest.BicepText, extension: "bicep")
850-
.UseDirectory("Snapshots");
850+
.UseHelixAwareDirectory("Snapshots");
851851
}
852852

853853
[Fact]
@@ -884,7 +884,7 @@ public async Task AsAzureSqlDatabaseViaRunMode()
884884
Assert.Equal(expectedManifest, manifest.ManifestNode.ToString());
885885

886886
await Verifier.Verify(manifest.BicepText, extension: "bicep")
887-
.UseDirectory("Snapshots");
887+
.UseHelixAwareDirectory("Snapshots");
888888
}
889889

890890
[Fact]
@@ -920,7 +920,7 @@ public async Task AsAzureSqlDatabaseViaPublishMode()
920920
Assert.Equal(expectedManifest, manifest.ManifestNode.ToString());
921921

922922
await Verifier.Verify(manifest.BicepText, extension: "bicep")
923-
.UseDirectory("Snapshots");
923+
.UseHelixAwareDirectory("Snapshots");
924924
}
925925

926926
[Fact]
@@ -964,7 +964,7 @@ public async Task AsAzurePostgresFlexibleServerViaRunMode()
964964
Assert.Equal(expectedManifest, manifest.ManifestNode.ToString());
965965

966966
await Verifier.Verify(manifest.BicepText, extension: "bicep")
967-
.UseDirectory("Snapshots");
967+
.UseHelixAwareDirectory("Snapshots");
968968
}
969969

970970
[Fact]
@@ -1008,7 +1008,7 @@ public async Task AsAzurePostgresFlexibleServerViaPublishMode()
10081008
Assert.Equal(expectedManifest, manifest.ManifestNode.ToString());
10091009

10101010
await Verifier.Verify(manifest.BicepText, extension: "bicep")
1011-
.UseDirectory("Snapshots");
1011+
.UseHelixAwareDirectory("Snapshots");
10121012
}
10131013

10141014
[Fact]
@@ -1164,7 +1164,7 @@ public async Task AddAzureServiceBus(bool useObsoleteMethods)
11641164
Assert.Equal(expected, manifest.ManifestNode.ToString());
11651165

11661166
await Verifier.Verify(manifest.BicepText, extension: "bicep")
1167-
.UseDirectory("Snapshots");
1167+
.UseHelixAwareDirectory("Snapshots");
11681168

11691169
var sbRoles = Assert.Single(model.Resources.OfType<AzureProvisioningResource>(), r => r.Name == "sb-roles");
11701170
var sbRolesManifest = await GetManifestWithBicep(sbRoles, skipPreparer: true);
@@ -1225,7 +1225,7 @@ public async Task AddDefaultAzureWebPubSub()
12251225
Assert.Equal("wps1", wps.Resource.Name);
12261226
output.WriteLine(manifest.BicepText);
12271227
await Verifier.Verify(manifest.BicepText, extension: "bicep")
1228-
.UseDirectory("Snapshots");
1228+
.UseHelixAwareDirectory("Snapshots");
12291229

12301230
var wpsRoles = Assert.Single(model.Resources.OfType<AzureProvisioningResource>(), r => r.Name == "wps1-roles");
12311231
var wpsRolesManifest = await GetManifestWithBicep(wpsRoles, skipPreparer: true);
@@ -1284,7 +1284,7 @@ public async Task AddAzureWebPubSubWithParameters()
12841284
Assert.Equal("wps1", wps.Resource.Name);
12851285

12861286
await Verifier.Verify(manifest.BicepText, extension: "bicep")
1287-
.UseDirectory("Snapshots");
1287+
.UseHelixAwareDirectory("Snapshots");
12881288
}
12891289

12901290
[Fact]
@@ -1362,7 +1362,7 @@ public async Task AddAzureStorageViaRunMode()
13621362
Assert.Equal(expectedStorageManifest, storageManifest.ManifestNode.ToString());
13631363

13641364
await Verifier.Verify(storageManifest.BicepText, extension: "bicep")
1365-
.UseDirectory("Snapshots");
1365+
.UseHelixAwareDirectory("Snapshots");
13661366

13671367
// Check blob resource.
13681368
var blob = storage.AddBlobs("blob");
@@ -1448,7 +1448,7 @@ public async Task AddAzureStorageViaRunModeAllowSharedKeyAccessOverridesDefaultF
14481448
Assert.Equal(expectedStorageManifest, storageManifest.ManifestNode.ToString());
14491449

14501450
await Verifier.Verify(storageManifest.BicepText, extension: "bicep")
1451-
.UseDirectory("Snapshots");
1451+
.UseHelixAwareDirectory("Snapshots");
14521452

14531453
// Check blob resource.
14541454
var blob = storage.AddBlobs("blob");
@@ -1535,7 +1535,7 @@ public async Task AddAzureStorageViaPublishMode()
15351535
Assert.Equal(expectedStorageManifest, storageManifest.ManifestNode.ToString());
15361536

15371537
await Verifier.Verify(storageManifest.BicepText, extension: "bicep")
1538-
.UseDirectory("Snapshots");
1538+
.UseHelixAwareDirectory("Snapshots");
15391539

15401540
var storageRoles = Assert.Single(model.Resources.OfType<AzureProvisioningResource>(), r => r.Name == "storage-roles");
15411541
var storageRolesManifest = await GetManifestWithBicep(storageRoles, skipPreparer: true);
@@ -1562,7 +1562,7 @@ param principalId string
15621562
}
15631563
scope: storage
15641564
}
1565-
1565+
15661566
resource storage_StorageTableDataContributor 'Microsoft.Authorization/roleAssignments@2022-04-01' = {
15671567
name: guid(storage.id, principalId, subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '0a9a7e1f-b9d0-4cc4-a60d-0319b160aaa3'))
15681568
properties: {
@@ -1572,7 +1572,7 @@ param principalId string
15721572
}
15731573
scope: storage
15741574
}
1575-
1575+
15761576
resource storage_StorageQueueDataContributor 'Microsoft.Authorization/roleAssignments@2022-04-01' = {
15771577
name: guid(storage.id, principalId, subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '974c5e8b-45b9-4653-ba55-5f855dd0fb88'))
15781578
properties: {
@@ -1671,7 +1671,7 @@ public async Task AddAzureStorageViaPublishModeEnableAllowSharedKeyAccessOverrid
16711671
Assert.Equal(expectedStorageManifest, storageManifest.ManifestNode.ToString());
16721672

16731673
await Verifier.Verify(storageManifest.BicepText, extension: "bicep")
1674-
.UseDirectory("Snapshots");
1674+
.UseHelixAwareDirectory("Snapshots");
16751675

16761676
// Check blob resource.
16771677
var blob = storage.AddBlobs("blob");
@@ -1763,7 +1763,7 @@ public async Task AddAzureSearch()
17631763
Assert.Equal(expectedManifest, manifest.ManifestNode.ToString());
17641764

17651765
await Verifier.Verify(manifest.BicepText, extension: "bicep")
1766-
.UseDirectory("Snapshots");
1766+
.UseHelixAwareDirectory("Snapshots");
17671767

17681768
var searchRoles = Assert.Single(model.Resources.OfType<AzureProvisioningResource>(), r => r.Name == "search-roles");
17691769
var searchRolesManifest = await GetManifestWithBicep(searchRoles, skipPreparer: true);
@@ -1790,7 +1790,7 @@ param principalId string
17901790
}
17911791
scope: search
17921792
}
1793-
1793+
17941794
resource search_SearchServiceContributor 'Microsoft.Authorization/roleAssignments@2022-04-01' = {
17951795
name: guid(search.id, principalId, subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '7ca78c08-252a-4471-8644-bb5ff32d4ba0'))
17961796
properties: {
@@ -1895,7 +1895,7 @@ public async Task AddAzureOpenAI(bool overrideLocalAuthDefault, bool useObsolete
18951895
Assert.Equal(expectedManifest, manifest.ManifestNode.ToString());
18961896

18971897
await Verifier.Verify(manifest.BicepText, extension: "bicep")
1898-
.UseDirectory("Snapshots");
1898+
.UseHelixAwareDirectory("Snapshots");
18991899

19001900
var openaiRoles = Assert.Single(model.Resources.OfType<AzureProvisioningResource>(), r => r.Name == "openai-roles");
19011901
var openaiRolesManifest = await GetManifestWithBicep(openaiRoles, skipPreparer: true);
@@ -1996,7 +1996,7 @@ public async Task InfrastructureCanBeMutatedAfterCreation()
19961996
Assert.Equal(expectedManifest, manifest.ToString());
19971997

19981998
await Verifier.Verify(bicep, extension: "bicep")
1999-
.UseDirectory("Snapshots");
1999+
.UseHelixAwareDirectory("Snapshots");
20002000
}
20012001

20022002
[UnsafeAccessor(UnsafeAccessorKind.Method, Name = "ExecuteBeforeStartHooksAsync")]

‎tests/Aspire.Hosting.Azure.Tests/AzureContainerAppsTests.cs

-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
using Azure.Provisioning.Primitives;
1616
using Azure.Provisioning.Storage;
1717
using Microsoft.Extensions.DependencyInjection;
18-
using Xunit;
1918
using static Aspire.Hosting.Utils.AzureManifestUtils;
2019

2120
namespace Aspire.Hosting.Azure.Tests;

‎tests/Aspire.Hosting.Azure.Tests/AzureContainerRegistryTests.cs

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
using Aspire.Hosting.Utils;
1010
using Azure.Provisioning.ContainerRegistry;
1111
using Microsoft.Extensions.DependencyInjection;
12-
using Xunit;
1312
using static Aspire.Hosting.Utils.AzureManifestUtils;
1413

1514
namespace Aspire.Hosting.Azure.Tests;

‎tests/Aspire.Hosting.Azure.Tests/AzureCosmosDBExtensionsTests.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ public async Task AddAzureCosmosDB(bool useAcaInfrastructure)
201201
var manifest = await GetManifestWithBicep(model, cosmos.Resource);
202202

203203
await Verifier.Verify(manifest.BicepText, extension: "bicep")
204-
.UseDirectory("Snapshots");
204+
.UseHelixAwareDirectory("Snapshots");
205205

206206
var cosmosRoles = Assert.Single(model.Resources.OfType<AzureProvisioningResource>(), r => r.Name == "cosmos-roles");
207207
var cosmosRolesManifest = await GetManifestWithBicep(cosmosRoles, skipPreparer: true);
@@ -256,6 +256,6 @@ public async Task AddAzureCosmosDatabase_WorksWithAccessKeyAuth_ChildResources()
256256
var manifest = await GetManifestWithBicep(cosmos.Resource);
257257

258258
await Verifier.Verify(manifest.BicepText, extension: "bicep")
259-
.UseDirectory("Snapshots");
259+
.UseHelixAwareDirectory("Snapshots");
260260
}
261261
}

‎tests/Aspire.Hosting.Azure.Tests/AzureEventHubsExtensionsTests.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ public async Task CanSetHubAndConsumerGroupName()
290290
var manifest = await AzureManifestUtils.GetManifestWithBicep(model, eventHubs.Resource);
291291

292292
await Verifier.Verify(manifest.BicepText, extension: "bicep")
293-
.UseDirectory("Snapshots");
293+
.UseHelixAwareDirectory("Snapshots");
294294

295295
var ehRoles = Assert.Single(model.Resources.OfType<AzureProvisioningResource>(), r => r.Name == "eh-roles");
296296
var ehRolesManifest = await AzureManifestUtils.GetManifestWithBicep(ehRoles, skipPreparer: true);

‎tests/Aspire.Hosting.Azure.Tests/AzureKeyVaultTests.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public async Task AddKeyVaultViaRunMode()
2828
Assert.Equal(expectedManifest, manifest.ManifestNode.ToString());
2929

3030
await Verifier.Verify(manifest.BicepText, extension: "bicep")
31-
.UseDirectory("Snapshots");
31+
.UseHelixAwareDirectory("Snapshots");
3232
}
3333

3434
[Fact]
@@ -52,7 +52,7 @@ public async Task AddKeyVaultViaPublishMode()
5252
Assert.Equal(expectedManifest, manifest.ManifestNode.ToString());
5353

5454
await Verifier.Verify(manifest.BicepText, extension: "bicep")
55-
.UseDirectory("Snapshots");
55+
.UseHelixAwareDirectory("Snapshots");
5656

5757
var kvRoles = Assert.Single(model.Resources.OfType<AzureProvisioningResource>(), r => r.Name == "mykv-roles");
5858
var kvRolesManifest = await AzureManifestUtils.GetManifestWithBicep(kvRoles, skipPreparer: true);

‎tests/Aspire.Hosting.Azure.Tests/AzurePostgresExtensionsTests.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public async Task AddAzurePostgresFlexibleServer(bool publishMode, bool useAcaIn
4848
Assert.Equal(expectedManifest, manifest.ManifestNode.ToString());
4949

5050
await Verifier.Verify(manifest.BicepText, extension: "bicep")
51-
.UseDirectory("Snapshots");
51+
.UseHelixAwareDirectory("Snapshots");
5252

5353
var postgresRoles = Assert.Single(model.Resources.OfType<AzureProvisioningResource>(), r => r.Name == "postgres-data-roles");
5454
var postgresRolesManifest = await AzureManifestUtils.GetManifestWithBicep(postgresRoles, skipPreparer: true);
@@ -146,7 +146,7 @@ public async Task AddAzurePostgresWithPasswordAuth(bool specifyUserName, bool sp
146146
Assert.Equal(expectedManifest, m);
147147

148148
await Verifier.Verify(manifest.BicepText, extension: "bicep")
149-
.UseDirectory("Snapshots");
149+
.UseHelixAwareDirectory("Snapshots");
150150
}
151151

152152
[Theory]

‎tests/Aspire.Hosting.Azure.Tests/AzureProvisioningResourceExtensionsTests.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public async Task AsProvisioningParameterTests()
6060
Assert.Equal(expectedManifest, manifest.ManifestNode.ToString());
6161

6262
await Verifier.Verify(manifest.BicepText, extension: "bicep")
63-
.UseDirectory("Snapshots");
63+
.UseHelixAwareDirectory("Snapshots");
6464
}
6565

6666
private sealed class Project : IProjectMetadata

‎tests/Aspire.Hosting.Azure.Tests/AzurePublisherTests.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ public async Task PublishAsync_GeneratesMainBicep(bool useContext)
105105
var content = File.ReadAllText(Path.Combine(tempDir.Path, "main.bicep"));
106106

107107
await Verifier.Verify(content, extension: "bicep")
108-
.UseDirectory("Snapshots");
108+
.UseHelixAwareDirectory("Snapshots");
109109
}
110110

111111
[Fact]

‎tests/Aspire.Hosting.Azure.Tests/AzureRedisExtensionsTests.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public async Task AddAzureRedis(bool useAcaInfrastructure)
3838
var manifest = await GetManifestWithBicep(model, redis.Resource);
3939

4040
await Verifier.Verify(manifest.BicepText, extension: "bicep")
41-
.UseDirectory("Snapshots");
41+
.UseHelixAwareDirectory("Snapshots");
4242

4343
var redisRoles = Assert.Single(model.Resources.OfType<AzureProvisioningResource>(), r => r.Name == "redis-cache-roles");
4444
var redisRolesManifest = await AzureManifestUtils.GetManifestWithBicep(redisRoles, skipPreparer: true);
@@ -121,7 +121,7 @@ public async Task AddAzureRedisWithAccessKeyAuthentication(string? kvName)
121121
Assert.Equal(expectedManifest, m);
122122

123123
await Verifier.Verify(manifest.BicepText, extension: "bicep")
124-
.UseDirectory("Snapshots");
124+
.UseHelixAwareDirectory("Snapshots");
125125
}
126126

127127
[Fact]

‎tests/Aspire.Hosting.Azure.Tests/AzureResourcePreparerTests.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public async Task AppliesDefaultRoleAssignmentsInRunModeIfReferenced(bool addCon
7171

7272
var storageRolesManifest = await GetManifestWithBicep(storageRoles, skipPreparer: true);
7373
await Verifier.Verify(storageRolesManifest.BicepText, extension: "bicep")
74-
.UseDirectory("Snapshots");
74+
.UseHelixAwareDirectory("Snapshots");
7575
}
7676
else
7777
{
@@ -115,7 +115,7 @@ public async Task AppliesRoleAssignmentsInRunMode(DistributedApplicationOperatio
115115

116116
var storageRolesManifest = await GetManifestWithBicep(storageRoles, skipPreparer: true);
117117
await Verifier.Verify(storageRolesManifest.BicepText, extension: "bicep")
118-
.UseDirectory("Snapshots");
118+
.UseHelixAwareDirectory("Snapshots");
119119
}
120120
else
121121
{

‎tests/Aspire.Hosting.Azure.Tests/AzureServiceBusExtensionsTests.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public async Task ResourceNamesCanBeDifferentThanAzureNames()
3737
var manifest = await AzureManifestUtils.GetManifestWithBicep(serviceBus.Resource);
3838

3939
await Verifier.Verify(manifest.BicepText, extension: "bicep")
40-
.UseDirectory("Snapshots");
40+
.UseHelixAwareDirectory("Snapshots");
4141
}
4242

4343
[Theory]
@@ -62,7 +62,7 @@ public async Task TopicNamesCanBeLongerThan24(bool useObsoleteMethods)
6262
var manifest = await AzureManifestUtils.GetManifestWithBicep(serviceBus.Resource);
6363

6464
await Verifier.Verify(manifest.BicepText, extension: "bicep")
65-
.UseDirectory("Snapshots");
65+
.UseHelixAwareDirectory("Snapshots");
6666
}
6767

6868
[Fact(Skip = "Azure ServiceBus emulator is not reliable in CI - https://github.com/dotnet/aspire/issues/7066")]

0 commit comments

Comments
 (0)