Skip to content

Commit 51e9a0d

Browse files
los93soldanmoseleyDamianEdwards
authored
Makes VolumeNameGenerator public (#6531)
* -Makes VolumeNameGenerator public * Update src/Aspire.Hosting/Utils/VolumeNameGenerator.cs Co-authored-by: Dan Moseley <[email protected]> * Take @danmosely suggestion to change the exception message * Renames VolumeNameGenerator.CreateVolumeName to Generate * -Mark VolumeNameGenerator.Sanitize as internal * Pretty sure that should be all of it * Oops * Update src/Aspire.Hosting/Utils/VolumeNameGenerator.cs Co-authored-by: Damian Edwards <[email protected]> * Drops code doc of Sanitize since it's not public --------- Co-authored-by: Dan Moseley <[email protected]> Co-authored-by: Damian Edwards <[email protected]>
1 parent b76abf5 commit 51e9a0d

File tree

66 files changed

+56
-102
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+56
-102
lines changed

‎src/Aspire.Hosting.Azure.CosmosDB/Aspire.Hosting.Azure.CosmosDB.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
<ItemGroup>
1616
<Compile Include="..\Shared\Cosmos\CosmosConstants.cs" Link="Shared\CosmosConstants.cs" />
1717
<Compile Include="..\Shared\Cosmos\CosmosUtils.cs" Link="Shared\CosmosUtils.cs" />
18-
<Compile Include="..\Shared\VolumeNameGenerator.cs" Link="Utils\VolumeNameGenerator.cs" />
1918
</ItemGroup>
2019

2120
<ItemGroup>

‎src/Aspire.Hosting.Azure.CosmosDB/AzureCosmosDBExtensions.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ static CosmosClient CreateCosmosClient(string connectionString)
184184
/// <returns>A builder for the <see cref="AzureCosmosDBEmulatorResource"/>.</returns>
185185
public static IResourceBuilder<AzureCosmosDBEmulatorResource> WithDataVolume(this IResourceBuilder<AzureCosmosDBEmulatorResource> builder, string? name = null)
186186
=> builder.WithEnvironment("AZURE_COSMOS_EMULATOR_ENABLE_DATA_PERSISTENCE", "true")
187-
.WithVolume(name ?? VolumeNameGenerator.CreateVolumeName(builder, "data"), "/tmp/cosmos/appdata", isReadOnly: false);
187+
.WithVolume(name ?? VolumeNameGenerator.Generate(builder, "data"), "/tmp/cosmos/appdata", isReadOnly: false);
188188

189189
/// <summary>
190190
/// Configures the gateway port for the Azure Cosmos DB emulator.

‎src/Aspire.Hosting.Azure.EventHubs/Aspire.Hosting.Azure.EventHubs.csproj‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,6 @@
1212
<MinCodeCoverage>14</MinCodeCoverage>
1313
</PropertyGroup>
1414

15-
<ItemGroup>
16-
<Compile Include="$(SharedDir)VolumeNameGenerator.cs" Link="Utils\VolumeNameGenerator.cs" />
17-
</ItemGroup>
18-
1915
<ItemGroup>
2016
<ProjectReference Include="..\Aspire.Hosting.Azure.Storage\Aspire.Hosting.Azure.Storage.csproj" />
2117
<ProjectReference Include="..\Aspire.Hosting.Azure\Aspire.Hosting.Azure.csproj" />

‎src/Aspire.Hosting.Azure.EventHubs/AzureEventHubsExtensions.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ public static IResourceBuilder<AzureEventHubsEmulatorResource> WithDataBindMount
268268
/// <param name="name">The name of the volume. Defaults to an auto-generated name based on the application and resource names.</param>
269269
/// <returns>A builder for the <see cref="AzureEventHubsEmulatorResource"/>.</returns>
270270
public static IResourceBuilder<AzureEventHubsEmulatorResource> WithDataVolume(this IResourceBuilder<AzureEventHubsEmulatorResource> builder, string? name = null)
271-
=> builder.WithVolume(name ?? VolumeNameGenerator.CreateVolumeName(builder, "data"), "/data", isReadOnly: false);
271+
=> builder.WithVolume(name ?? VolumeNameGenerator.Generate(builder, "data"), "/data", isReadOnly: false);
272272

273273
/// <summary>
274274
/// Configures the gateway port for the Azure Event Hubs emulator.

‎src/Aspire.Hosting.Azure.Storage/Aspire.Hosting.Azure.Storage.csproj‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,7 @@
1111
<PropertyGroup>
1212
<MinCodeCoverage>96</MinCodeCoverage>
1313
</PropertyGroup>
14-
15-
<ItemGroup>
16-
<Compile Include="$(SharedDir)VolumeNameGenerator.cs" Link="Utils\VolumeNameGenerator.cs" />
17-
</ItemGroup>
18-
14+
1915
<ItemGroup>
2016
<PackageReference Include="AspNetCore.HealthChecks.Azure.Storage.Blobs" />
2117
</ItemGroup>

‎src/Aspire.Hosting.Azure.Storage/AzureStorageExtensions.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ public static IResourceBuilder<AzureStorageEmulatorResource> WithDataBindMount(t
167167
/// <param name="isReadOnly">A flag that indicates if this is a read-only volume.</param>
168168
/// <returns>A builder for the <see cref="AzureStorageEmulatorResource"/>.</returns>
169169
public static IResourceBuilder<AzureStorageEmulatorResource> WithDataVolume(this IResourceBuilder<AzureStorageEmulatorResource> builder, string? name = null, bool isReadOnly = false)
170-
=> builder.WithVolume(name ?? VolumeNameGenerator.CreateVolumeName(builder, "data"), "/data", isReadOnly);
170+
=> builder.WithVolume(name ?? VolumeNameGenerator.Generate(builder, "data"), "/data", isReadOnly);
171171

172172
/// <summary>
173173
/// Modifies the host port that the storage emulator listens on for blob requests.

‎src/Aspire.Hosting.Elasticsearch/Aspire.Hosting.Elasticsearch.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
</PropertyGroup>
1414

1515
<ItemGroup>
16-
<Compile Include="$(SharedDir)VolumeNameGenerator.cs" Link="Utils\VolumeNameGenerator.cs" />
1716
<Compile Include="$(ComponentsDir)Aspire.Elastic.Clients.Elasticsearch\ElasticsearchHealthCheck.cs" Link="ElasticsearchHealthCheck.cs"></Compile>
1817
</ItemGroup>
1918

‎src/Aspire.Hosting.Elasticsearch/ElasticsearchBuilderExtensions.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ public static IResourceBuilder<ElasticsearchResource> WithDataVolume(this IResou
117117
{
118118
ArgumentNullException.ThrowIfNull(builder);
119119

120-
return builder.WithVolume(name ?? VolumeNameGenerator.CreateVolumeName(builder, "data"), "/usr/share/elasticsearch/data");
120+
return builder.WithVolume(name ?? VolumeNameGenerator.Generate(builder, "data"), "/usr/share/elasticsearch/data");
121121
}
122122

123123
/// <summary>

‎src/Aspire.Hosting.Garnet/Aspire.Hosting.Garnet.csproj‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@
1414
<MinCodeCoverage>92</MinCodeCoverage>
1515
</PropertyGroup>
1616

17-
<ItemGroup>
18-
<Compile Include="$(SharedDir)VolumeNameGenerator.cs" Link="Utils\VolumeNameGenerator.cs" />
19-
</ItemGroup>
20-
2117
<ItemGroup>
2218
<PackageReference Include="AspNetCore.HealthChecks.Redis" />
2319
</ItemGroup>

‎src/Aspire.Hosting.Garnet/GarnetBuilderExtensions.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ public static IResourceBuilder<GarnetResource> WithDataVolume(this IResourceBuil
105105
{
106106
ArgumentNullException.ThrowIfNull(builder);
107107

108-
builder.WithVolume(name ?? VolumeNameGenerator.CreateVolumeName(builder, "data"), GarnetContainerDataDirectory,
108+
builder.WithVolume(name ?? VolumeNameGenerator.Generate(builder, "data"), GarnetContainerDataDirectory,
109109
isReadOnly);
110110
if (!isReadOnly)
111111
{

0 commit comments

Comments
 (0)