Thanks to visit codestin.com
Credit goes to github.com

Skip to content

WaitFor/WaitForCompletion implementation. #5394

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Aug 30, 2024
Merged

WaitFor/WaitForCompletion implementation. #5394

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
9ae6a64
WaitFor/WaitForCompletion implementation.
mitchdenny Aug 23, 2024
a42780b
Better XML doc comments.
mitchdenny Aug 23, 2024
cb52d52
Update src/Aspire.Hosting/ResourceBuilderExtensions.cs
mitchdenny Aug 23, 2024
a88cd1f
Add test cases.
mitchdenny Aug 23, 2024
bf58bb8
WaitForCompletion
mitchdenny Aug 27, 2024
a80d501
Add more tests.
mitchdenny Aug 28, 2024
c969099
Test tweaks and PR feedback.
mitchdenny Aug 28, 2024
ab6668f
PR feedback. Make WaitFor cause a failure if the process exists or fa…
mitchdenny Aug 28, 2024
d1d57ad
Tweaks to logging and using nginx container image instead.
mitchdenny Aug 29, 2024
735eba9
Remove WaitFor from TestShop to validate that it isn't the problem.
mitchdenny Aug 29, 2024
ab5a3fa
Merge branch 'main' into mitchdenny/wait-for
mitchdenny Aug 30, 2024
79150b0
Skip Kafka test.
mitchdenny Aug 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Test tweaks and PR feedback.
  • Loading branch information
@mitchdenny
mitchdenny committed Aug 28, 2024
commit c96909914be230c7400d9ef7c779ea257814bfe3
4 changes: 1 addition & 3 deletions src/Aspire.Hosting/ResourceBuilderExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -619,9 +619,7 @@ public static IResourceBuilder<T> WaitForCompletion<T>(this IResourceBuilder<T>
{
builder.ApplicationBuilder.Eventing.Subscribe<BeforeResourceStartedEvent>(builder.Resource, async (e, ct) =>
{
// TODO: Decide how we want to interpret inconsistent results from replicas of projects. For now
// if we detect that the project is configured for replicas we will throw an exception.
if (dependency.Resource.Annotations.Any(a => a is ReplicaAnnotation ra && ra.Replicas > 1))
if (dependency.Resource.TryGetLastAnnotation<ReplicaAnnotation>(out var replicaAnnotation) && replicaAnnotation.Replicas > 1)
{
throw new DistributedApplicationException("WaitForCompletion cannot be used with resources that have replicas.");
}
Expand Down
12 changes: 8 additions & 4 deletions tests/Aspire.Hosting.Tests/WaitForTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ public async Task EnsureDependentResourceMovesIntoWaitingState()
// into a Running state, so rather than awaiting it we'll hold onto the
// task so we can inspect the state of the Redis resource which should
// be in a waiting state if everything is working correctly.
var startTask = app.StartAsync();
var startupCts = new CancellationTokenSource(TimeSpan.FromSeconds(60));
var startTask = app.StartAsync(startupCts.Token);

// We don't want to wait forever for Redis to move into a waiting state,
// it should be super quick, but we'll allow 60 seconds just in case the
Expand Down Expand Up @@ -66,7 +67,8 @@ public async Task EnsureDependentResourceMovesIntoWaitingStateUntilDependencyMov
// into a Finished state, so rather than awaiting it we'll hold onto the
// task so we can inspect the state of the Redis resource which should
// be in a waiting state if everything is working correctly.
var startTask = app.StartAsync();
var startupCts = new CancellationTokenSource(TimeSpan.FromSeconds(60));
var startTask = app.StartAsync(startupCts.Token);

// We don't want to wait forever for Redis to move into a waiting state,
// it should be super quick, but we'll allow 60 seconds just in case the
Expand Down Expand Up @@ -113,7 +115,8 @@ public async Task EnsureDependencyResourceThatReturnsNonMatchingExitCodeResultsI
// into a Finished state, so rather than awaiting it we'll hold onto the
// task so we can inspect the state of the Redis resource which should
// be in a waiting state if everything is working correctly.
var startTask = app.StartAsync();
var startupCts = new CancellationTokenSource(TimeSpan.FromSeconds(60));
var startTask = app.StartAsync(startupCts.Token);

// We don't want to wait forever for Redis to move into a waiting state,
// it should be super quick, but we'll allow 60 seconds just in case the
Expand Down Expand Up @@ -161,7 +164,8 @@ public async Task DependencyWithGreaterThan1ReplicaAnnotationCausesDependentReso
// into a Finished state, so rather than awaiting it we'll hold onto the
// task so we can inspect the state of the Redis resource which should
// be in a waiting state if everything is working correctly.
var startTask = app.StartAsync();
var startupCts = new CancellationTokenSource(TimeSpan.FromSeconds(60));
var startTask = app.StartAsync(startupCts.Token);

// We don't want to wait forever for Redis to move into a waiting state,
// it should be super quick, but we'll allow 60 seconds just in case the
Expand Down
Loading