-
Notifications
You must be signed in to change notification settings - Fork 543
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.
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
#2367 dapr change the app port depending on the app protocol #3184
#2367 dapr change the app port depending on the app protocol #3184
Conversation
okay, I know now why the playground project is not working. There seems to be a bug unrelated to this PR that it is required to have dapr |
Okay after I integrated locally the nuget.org feed I was able to test my change. For me it looks like it is working. |
src/Aspire.Hosting.Dapr/DaprDistributedApplicationLifecycleHook.cs
Outdated
Show resolved
Hide resolved
@davidfowl and @karolz-ms, because you both were involved in #3305 can I ask you to review this PR too? |
src/Aspire.Hosting.Dapr/DaprDistributedApplicationLifecycleHook.cs
Outdated
Show resolved
Hide resolved
src/Aspire.Hosting.Dapr/DaprDistributedApplicationLifecycleHook.cs
Outdated
Show resolved
Hide resolved
src/Aspire.Hosting.Dapr/DaprDistributedApplicationLifecycleHook.cs
Outdated
Show resolved
Hide resolved
Co-authored-by: David Fowler <[email protected]>
…_for_the_protocoll merge main, because I need the new dapr tests
@davidfowl please review again :) I changed the logic and also added tests |
src/Aspire.Hosting.Dapr/DaprDistributedApplicationLifecycleHook.cs
Outdated
Show resolved
Hide resolved
src/Aspire.Hosting.Dapr/DaprDistributedApplicationLifecycleHook.cs
Outdated
Show resolved
Hide resolved
src/Aspire.Hosting.Dapr/DaprDistributedApplicationLifecycleHook.cs
Outdated
Show resolved
Hide resolved
…otocoll' into dapr/use_the_endpoint_for_the_protocoll
src/Aspire.Hosting.Dapr/DaprDistributedApplicationLifecycleHook.cs
Outdated
Show resolved
Hide resolved
src/Aspire.Hosting.Dapr/DaprDistributedApplicationLifecycleHook.cs
Outdated
Show resolved
Hide resolved
src/Aspire.Hosting.Dapr/DaprDistributedApplicationLifecycleHook.cs
Outdated
Show resolved
Hide resolved
This looks great |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks great overall, thanks so much @paule96 for taking care of this. I have just one question regarding the use of targetPortExpression
in the test
/backport to release/8.0 |
Started backporting to release/8.0: https://github.com/dotnet/aspire/actions/runs/8654197627 |
@davidfowl backporting to release/8.0 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: dapr change the app port depending on the app protocol
Applying: fix endpoint annotations for dapr.
error: sha1 information is lacking or useless (src/Aspire.Hosting.Dapr/DaprDistributedApplicationLifecycleHook.cs).
error: could not build fake ancestor
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 fix endpoint annotations for dapr.
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128 Please backport manually! |
@davidfowl an error occurred while backporting to release/8.0, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
* dapr change the app port depending on the app protocol * fix endpoint annotations for dapr. * fix the rest of the endpoints uri schemas * Apply suggestions from code review Co-authored-by: David Fowler <[email protected]> * fix white spaces * now we can define both, dapr protocol or endpoint from the configured endpoint * add tests * revert changes in the playground * fix spelling issue * add a large comment for all of this logic * fix formatting * Update src/Aspire.Hosting.Dapr/DaprDistributedApplicationLifecycleHook.cs * change to switch expression fix test * revert changes in playground * format stuff * fix is null and formating * improve switch --------- Co-authored-by: David Fowler <[email protected]>
…3626) * dapr change the app port depending on the app protocol * fix endpoint annotations for dapr. * fix the rest of the endpoints uri schemas * Apply suggestions from code review * fix white spaces * now we can define both, dapr protocol or endpoint from the configured endpoint * add tests * revert changes in the playground * fix spelling issue * add a large comment for all of this logic * fix formatting * Update src/Aspire.Hosting.Dapr/DaprDistributedApplicationLifecycleHook.cs * change to switch expression fix test * revert changes in playground * format stuff * fix is null and formating * improve switch --------- Co-authored-by: paule96 <[email protected]> Co-authored-by: David Fowler <[email protected]>
if you dapr connected apps uses anything else then
http
they will currently not correctly connecting to the sidecare. (more details to that issue in #2367 )To fix this now, a use can set the app protocol in the sidecare options and this will then take the correct endpoint information.
Open questions:
Microsoft Reviewers: Open in CodeFlow