Skip to content

Commit 2a55125

Browse files
afscromeafscrome
committed
Fix some references to LifecycleHooks that were actually Event Subscribers
1 parent 5b9f816 commit 2a55125

File tree

6 files changed

+23
-23
lines changed

6 files changed

+23
-23
lines changed

src/Aspire.Hosting/Devcontainers/DevcontainerPortForwardingLifecycleHook.cs renamed to src/Aspire.Hosting/Devcontainers/DevcontainerPortForwardingEventingSubscriber.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99

1010
namespace Aspire.Hosting.Devcontainers;
1111

12-
internal sealed class DevcontainerPortForwardingLifecycleHook : IDistributedApplicationEventingSubscriber
12+
internal sealed class DevcontainerPortForwardingEventingSubscriber : IDistributedApplicationEventingSubscriber
1313
{
1414
private readonly IOptions<CodespacesOptions> _codespacesOptions;
1515
private readonly IOptions<DevcontainersOptions> _devcontainersOptions;
1616
private readonly IOptions<SshRemoteOptions> _sshRemoteOptions;
1717
private readonly DevcontainerSettingsWriter _settingsWriter;
1818

19-
public DevcontainerPortForwardingLifecycleHook(
19+
public DevcontainerPortForwardingEventingSubscriber(
2020
IOptions<CodespacesOptions> codespacesOptions,
2121
IOptions<DevcontainersOptions> devcontainersOptions,
2222
IOptions<SshRemoteOptions> sshRemoteOptions,

‎src/Aspire.Hosting/DistributedApplicationBuilder.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -489,13 +489,13 @@ public DistributedApplicationBuilder(DistributedApplicationOptions options)
489489
_innerBuilder.Services.TryAddEnumerable(ServiceDescriptor.Singleton<IConfigureOptions<DevcontainersOptions>, ConfigureDevcontainersOptions>());
490490
_innerBuilder.Services.TryAddEnumerable(ServiceDescriptor.Singleton<IConfigureOptions<SshRemoteOptions>, ConfigureSshRemoteOptions>());
491491
_innerBuilder.Services.AddSingleton<DevcontainerSettingsWriter>();
492-
_innerBuilder.Services.TryAddEventingSubscriber<DevcontainerPortForwardingLifecycleHook>();
492+
_innerBuilder.Services.TryAddEventingSubscriber<DevcontainerPortForwardingEventingSubscriber>();
493493

494494
// Required command validation for resources
495495
#pragma warning disable ASPIRECOMMAND001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
496496
_innerBuilder.Services.TryAddSingleton<IRequiredCommandValidator, RequiredCommandValidator>();
497497
#pragma warning restore ASPIRECOMMAND001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
498-
_innerBuilder.Services.TryAddEventingSubscriber<RequiredCommandValidationLifecycleHook>();
498+
_innerBuilder.Services.TryAddEventingSubscriber<RequiredCommandValidationEventingSubscriber>();
499499
}
500500

501501
if (ExecutionContext.IsRunMode)

src/Aspire.Hosting/Lifecycle/RequiredCommandValidationLifecycleHook.cs renamed to src/Aspire.Hosting/Lifecycle/RequiredCommandValidationEventingSubscriber.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ namespace Aspire.Hosting.Lifecycle;
1515
/// This subscriber processes <see cref="RequiredCommandAnnotation"/> on resources and delegates
1616
/// validation to <see cref="IRequiredCommandValidator"/>.
1717
/// </remarks>
18-
internal sealed class RequiredCommandValidationLifecycleHook(
18+
internal sealed class RequiredCommandValidationEventingSubscriber(
1919
IRequiredCommandValidator validator) : IDistributedApplicationEventingSubscriber
2020
{
2121
private readonly IRequiredCommandValidator _validator = validator ?? throw new ArgumentNullException(nameof(validator));

tests/Aspire.Hosting.Tests/Dashboard/DashboardLifecycleHookTests.cs renamed to tests/Aspire.Hosting.Tests/Dashboard/DashboardEventHandlersTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
namespace Aspire.Hosting.Tests.Dashboard;
2222

2323
[Trait("Partition", "3")]
24-
public class DashboardLifecycleHookTests(ITestOutputHelper testOutputHelper)
24+
public class DashboardEventHandlersTests(ITestOutputHelper testOutputHelper)
2525
{
2626
[Theory]
2727
[MemberData(nameof(Data))]

‎tests/Aspire.Hosting.Tests/DistributedApplicationBuilderTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ public void BuilderAddsDefaultServices()
4646
Assert.Collection(
4747
eventingSubscribers,
4848
s => Assert.IsType<DashboardEventHandlers>(s),
49-
s => Assert.IsType<DevcontainerPortForwardingLifecycleHook>(s),
50-
s => Assert.IsType<RequiredCommandValidationLifecycleHook>(s)
49+
s => Assert.IsType<DevcontainerPortForwardingEventingSubscriber>(s),
50+
s => Assert.IsType<RequiredCommandValidationEventingSubscriber>(s)
5151
);
5252

5353
var options = app.Services.GetRequiredService<IOptions<PipelineOptions>>();

‎tests/Aspire.Hosting.Tests/RequiredCommandAnnotationTests.cs‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -130,18 +130,18 @@ public void WithRequiredCommand_ThrowsOnNullCommand()
130130
}
131131

132132
[Fact]
133-
public async Task RequiredCommandValidationLifecycleHook_IsRegistered()
133+
public async Task RequiredCommandValidationEventingSubscriber_IsRegistered()
134134
{
135135
var builder = DistributedApplication.CreateBuilder();
136136

137137
await using var app = builder.Build();
138138

139139
var subscribers = app.Services.GetServices<IDistributedApplicationEventingSubscriber>();
140-
Assert.Contains(subscribers, s => s is RequiredCommandValidationLifecycleHook);
140+
Assert.Contains(subscribers, s => s is RequiredCommandValidationEventingSubscriber);
141141
}
142142

143143
[Fact]
144-
public async Task RequiredCommandValidationLifecycleHook_ValidatesExistingCommand()
144+
public async Task RequiredCommandValidationEventingSubscriber_ValidatesExistingCommand()
145145
{
146146
var builder = DistributedApplication.CreateBuilder();
147147
var command = OperatingSystem.IsWindows() ? "cmd" : "sh";
@@ -158,7 +158,7 @@ public async Task RequiredCommandValidationLifecycleHook_ValidatesExistingComman
158158
}
159159

160160
[Fact]
161-
public async Task RequiredCommandValidationLifecycleHook_LogsWarningForMissingCommand()
161+
public async Task RequiredCommandValidationEventingSubscriber_LogsWarningForMissingCommand()
162162
{
163163
var builder = DistributedApplication.CreateBuilder();
164164
builder.AddContainer("test", "image").WithRequiredCommand("this-command-definitely-does-not-exist-12345");
@@ -175,7 +175,7 @@ public async Task RequiredCommandValidationLifecycleHook_LogsWarningForMissingCo
175175
}
176176

177177
[Fact]
178-
public async Task RequiredCommandValidationLifecycleHook_IncludesHelpLinkInWarning()
178+
public async Task RequiredCommandValidationEventingSubscriber_IncludesHelpLinkInWarning()
179179
{
180180
var builder = DistributedApplication.CreateBuilder();
181181
builder.AddContainer("test", "image")
@@ -193,7 +193,7 @@ public async Task RequiredCommandValidationLifecycleHook_IncludesHelpLinkInWarni
193193
}
194194

195195
[Fact]
196-
public async Task RequiredCommandValidationLifecycleHook_CallsValidationCallback()
196+
public async Task RequiredCommandValidationEventingSubscriber_CallsValidationCallback()
197197
{
198198
var builder = DistributedApplication.CreateBuilder();
199199
var callbackInvoked = false;
@@ -218,7 +218,7 @@ public async Task RequiredCommandValidationLifecycleHook_CallsValidationCallback
218218
}
219219

220220
[Fact]
221-
public async Task RequiredCommandValidationLifecycleHook_CallsValidationCallbackWithContext()
221+
public async Task RequiredCommandValidationEventingSubscriber_CallsValidationCallbackWithContext()
222222
{
223223
var builder = DistributedApplication.CreateBuilder();
224224
var command = OperatingSystem.IsWindows() ? "cmd" : "sh";
@@ -246,7 +246,7 @@ public async Task RequiredCommandValidationLifecycleHook_CallsValidationCallback
246246
}
247247

248248
[Fact]
249-
public async Task RequiredCommandValidationLifecycleHook_LogsWarningOnFailedValidationCallback()
249+
public async Task RequiredCommandValidationEventingSubscriber_LogsWarningOnFailedValidationCallback()
250250
{
251251
var builder = DistributedApplication.CreateBuilder();
252252
var command = OperatingSystem.IsWindows() ? "cmd" : "sh";
@@ -269,7 +269,7 @@ public async Task RequiredCommandValidationLifecycleHook_LogsWarningOnFailedVali
269269
}
270270

271271
[Fact]
272-
public async Task RequiredCommandValidationLifecycleHook_ValidatesMultipleAnnotations()
272+
public async Task RequiredCommandValidationEventingSubscriber_ValidatesMultipleAnnotations()
273273
{
274274
var builder = DistributedApplication.CreateBuilder();
275275
var command = OperatingSystem.IsWindows() ? "cmd" : "sh";
@@ -290,7 +290,7 @@ public async Task RequiredCommandValidationLifecycleHook_ValidatesMultipleAnnota
290290
}
291291

292292
[Fact]
293-
public async Task RequiredCommandValidationLifecycleHook_CoalescesNotificationsForSameCommand()
293+
public async Task RequiredCommandValidationEventingSubscriber_CoalescesNotificationsForSameCommand()
294294
{
295295
var builder = DistributedApplication.CreateBuilder();
296296
const string missingCommand = "this-command-definitely-does-not-exist-coalesce-test";
@@ -312,7 +312,7 @@ public async Task RequiredCommandValidationLifecycleHook_CoalescesNotificationsF
312312
}
313313

314314
[Fact]
315-
public async Task RequiredCommandValidationLifecycleHook_CachesSuccessfulValidation()
315+
public async Task RequiredCommandValidationEventingSubscriber_CachesSuccessfulValidation()
316316
{
317317
var builder = DistributedApplication.CreateBuilder();
318318
var command = OperatingSystem.IsWindows() ? "cmd" : "sh";
@@ -347,7 +347,7 @@ public async Task RequiredCommandValidationLifecycleHook_CachesSuccessfulValidat
347347
}
348348

349349
[Fact]
350-
public async Task RequiredCommandValidationLifecycleHook_CallsInteractionServiceForMissingCommand()
350+
public async Task RequiredCommandValidationEventingSubscriber_CallsInteractionServiceForMissingCommand()
351351
{
352352
var builder = DistributedApplication.CreateBuilder();
353353
const string missingCommand = "this-command-does-not-exist-interaction-test";
@@ -379,7 +379,7 @@ public async Task RequiredCommandValidationLifecycleHook_CallsInteractionService
379379
}
380380

381381
[Fact]
382-
public async Task RequiredCommandValidationLifecycleHook_DoesNotCallInteractionServiceWhenUnavailable()
382+
public async Task RequiredCommandValidationEventingSubscriber_DoesNotCallInteractionServiceWhenUnavailable()
383383
{
384384
var builder = DistributedApplication.CreateBuilder();
385385
const string missingCommand = "this-command-does-not-exist-unavailable-test";
@@ -403,7 +403,7 @@ public async Task RequiredCommandValidationLifecycleHook_DoesNotCallInteractionS
403403
}
404404

405405
[Fact]
406-
public async Task RequiredCommandValidationLifecycleHook_CoalescesInteractionServiceCalls()
406+
public async Task RequiredCommandValidationEventingSubscriber_CoalescesInteractionServiceCalls()
407407
{
408408
var builder = DistributedApplication.CreateBuilder();
409409
const string missingCommand = "this-command-does-not-exist-coalesce-interaction-test";
@@ -436,7 +436,7 @@ public async Task RequiredCommandValidationLifecycleHook_CoalescesInteractionSer
436436
}
437437

438438
/// <summary>
439-
/// Helper method to subscribe all eventing subscribers (including RequiredCommandValidationLifecycleHook)
439+
/// Helper method to subscribe all eventing subscribers (including RequiredCommandValidationEventingSubscriber)
440440
/// to the eventing system. This simulates what happens during app.StartAsync().
441441
/// </summary>
442442
private static async Task SubscribeHooksAsync(DistributedApplication app)

0 commit comments

Comments
 (0)