Skip to content

Commit 02b4bbb

Browse files
committed
Update step titles to use resource naming convention
1 parent 772b0c2 commit 02b4bbb

File tree

7 files changed

+14
-14
lines changed

7 files changed

+14
-14
lines changed

src/Aspire.Cli/Commands/PublishCommandBase.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -791,7 +791,7 @@ public async Task WriteStepMessageAsync(string stepId, string stepTitle, string
791791
formattedMessage = $"[red]{formattedMessage}[/]";
792792
}
793793

794-
AnsiConsole.MarkupLine($"[dim]{timestamp}[/] [{stepColor}]{stepTitle,-12}[/] {formattedMessage}");
794+
AnsiConsole.MarkupLine($"[dim]{timestamp}[/] [{stepColor}]({stepTitle})[/] {formattedMessage}");
795795

796796
if (wasSpinning)
797797
{

src/Aspire.Hosting.Azure/AzureDeployingContext.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ private async Task<bool> TryValidateAzureCliLoginAsync(CancellationToken cancell
9595
return true;
9696
}
9797

98-
var validationStep = await activityReporter.CreateStepAsync("Validating Azure CLI authentication", cancellationToken).ConfigureAwait(false);
98+
var validationStep = await activityReporter.CreateStepAsync("validate-auth", cancellationToken).ConfigureAwait(false);
9999
await using (validationStep.ConfigureAwait(false))
100100
{
101101
try
@@ -126,7 +126,7 @@ private async Task<bool> TryProvisionAzureBicepResources(List<AzureBicepResource
126126
return true;
127127
}
128128

129-
var deployingStep = await activityReporter.CreateStepAsync($"Deploying {bicepResources.Count} Azure resource(s)", cancellationToken).ConfigureAwait(false);
129+
var deployingStep = await activityReporter.CreateStepAsync("deploy-resources", cancellationToken).ConfigureAwait(false);
130130
await using (deployingStep.ConfigureAwait(false))
131131
{
132132
try
@@ -254,7 +254,7 @@ private async Task<bool> TryDeployComputeResources(DistributedApplicationModel m
254254
return true;
255255
}
256256

257-
var computeStep = await activityReporter.CreateStepAsync("Deploying compute resources", cancellationToken).ConfigureAwait(false);
257+
var computeStep = await activityReporter.CreateStepAsync("deploy-compute", cancellationToken).ConfigureAwait(false);
258258
await using (computeStep.ConfigureAwait(false))
259259
{
260260
try
@@ -346,7 +346,7 @@ private async Task LoginToAllRegistries(IEnumerable<IContainerRegistry> registri
346346
return;
347347
}
348348

349-
var loginStep = await activityReporter.CreateStepAsync("Authenticating to container registries", cancellationToken).ConfigureAwait(false);
349+
var loginStep = await activityReporter.CreateStepAsync("auth-registries", cancellationToken).ConfigureAwait(false);
350350
await using (loginStep.ConfigureAwait(false))
351351
{
352352
try
@@ -414,7 +414,7 @@ private async Task AuthenticateToAcr(IPublishingStep parentStep, string registry
414414
private async Task PushImagesToAllRegistries(Dictionary<IContainerRegistry, List<IResource>> resourcesByRegistry, CancellationToken cancellationToken)
415415
{
416416
var totalImageCount = resourcesByRegistry.Values.SelectMany(resources => resources).Count();
417-
var pushStep = await activityReporter.CreateStepAsync($"Pushing {totalImageCount} images to container registries", cancellationToken).ConfigureAwait(false);
417+
var pushStep = await activityReporter.CreateStepAsync("push-images", cancellationToken).ConfigureAwait(false);
418418
await using (pushStep.ConfigureAwait(false))
419419
{
420420
try

src/Aspire.Hosting.Azure/AzurePublishingContext.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public async Task WriteModelAsync(DistributedApplicationModel model, AzureEnviro
8989
}
9090

9191
var step = await ActivityReporter.CreateStepAsync(
92-
"Publishing Azure Bicep templates",
92+
"publish-bicep",
9393
cancellationToken
9494
).ConfigureAwait(false);
9595

src/Aspire.Hosting.Azure/Provisioning/Internal/PublishModeProvisioningContextProvider.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ private async Task PromptForSubscriptionAsync(CancellationToken cancellationToke
105105
bool fetchSucceeded = false;
106106

107107
var step = await activityReporter.CreateStepAsync(
108-
"Retrieving Azure subscription information",
108+
"fetch-subscription",
109109
cancellationToken).ConfigureAwait(false);
110110

111111
await using (step.ConfigureAwait(false))
@@ -222,7 +222,7 @@ private async Task PromptForLocationAndResourceGroupAsync(CancellationToken canc
222222
bool fetchSucceeded = false;
223223

224224
var step = await activityReporter.CreateStepAsync(
225-
"Retrieving Azure region information",
225+
"[fetch-regions]",
226226
cancellationToken).ConfigureAwait(false);
227227

228228
await using (step.ConfigureAwait(false))

src/Aspire.Hosting.Docker/DockerComposePublishingContext.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ private async Task WriteDockerComposeOutputAsync(DistributedApplicationModel mod
148148
}
149149

150150
var step = await activityReporter.CreateStepAsync(
151-
"Writing Docker Compose file.",
151+
"write-compose",
152152
cancellationToken: cancellationToken).ConfigureAwait(false);
153153

154154
await using (step.ConfigureAwait(false))
@@ -177,14 +177,14 @@ private async Task WriteDockerComposeOutputAsync(DistributedApplicationModel mod
177177
foreach (var entry in environment.CapturedEnvironmentVariables ?? [])
178178
{
179179
var (key, (description, defaultValue, source)) = entry;
180-
180+
181181
// If the source is a parameter and there's no explicit default value,
182182
// resolve the parameter's default value asynchronously
183183
if (defaultValue is null && source is ParameterResource parameter && !parameter.Secret && parameter.Default is not null)
184184
{
185185
defaultValue = await parameter.GetValueAsync(cancellationToken).ConfigureAwait(false);
186186
}
187-
187+
188188
envFile.AddIfMissing(key, defaultValue, description);
189189
}
190190

src/Aspire.Hosting/Publishing/Publisher.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public async Task PublishAsync(DistributedApplicationModel model, CancellationTo
6767

6868
// Add a step to do model analysis before publishing/deploying
6969
var step = await progressReporter.CreateStepAsync(
70-
"Analyzing model.",
70+
"analyze-model",
7171
cancellationToken).ConfigureAwait(false);
7272

7373
await using (step.ConfigureAwait(false))

src/Aspire.Hosting/Publishing/ResourceContainerImageBuilder.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ internal sealed class ResourceContainerImageBuilder(
144144
public async Task BuildImagesAsync(IEnumerable<IResource> resources, ContainerBuildOptions? options = null, CancellationToken cancellationToken = default)
145145
{
146146
var step = await activityReporter.CreateStepAsync(
147-
"Building container images for resources",
147+
"build-images",
148148
cancellationToken).ConfigureAwait(false);
149149

150150
await using (step.ConfigureAwait(false))

0 commit comments

Comments
 (0)