Added ability to resolve target port #3305
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- Change how we process and expose target ports. This change makes it possible to avoid using any internals of DCP to access and resolve target ports from any resource. - More launch profile processing to the project resource defaults. - Remove logic in the manifest writing that wrote a special env variable. This should just work now like everything else. - Exposed TargetPort and Exists on EndpointReference. - Use this new target property with dapr. - Added a ReferenceExpressionBuilder which makes it possible to dynamically build a ReferenceExpression. - Endpoints and env are evaulated earlier now so change remove tests that add default launch profile on real projects without allocating those endpoints.
dotnet-issue-labeler
bot
added
the
area-app-model
davidfowl
commented
Mar 31, 2024
| { | ||
| var launchProfile = project.GetEffectiveLaunchProfile(); | ||
| if (launchProfile is not null && !string.IsNullOrWhiteSpace(launchProfile.CommandLineArgs)) | ||
| var cmdArgs = launchProfile.CommandLineArgs.Split((string?)null, StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries); |
There was a problem hiding this comment.
This should move to the project defaults as well #3306. I have a local change on top of this PR with that working.
davidfowl
added
the
breaking-change
karolz-ms
approved these changes
Apr 2, 2024
|
you going to backport to p6 @davidfowl? |
eerhardt
reviewed
Apr 3, 2024
Comment on lines
+71
to
+73
| /// The associated service name created in DCP for this endpoint. | ||
| /// </summary> | ||
| public string? DcpServiceName { get; } |
There was a problem hiding this comment.
I'm not sure this is a great public name in our application model.
Users don't really know (and shouldn't know IMO) about DCP at all. Is there a better name we can use here?
There was a problem hiding this comment.
Unfortunately this isn’t generic even if we change the property name (which is fine).
Also we have lots of dcp in the config, logging etc do we want to do a single pass?
There was a problem hiding this comment.
Can we make it internal for now? We can always make it public later.
There was a problem hiding this comment.
That makes it impossible to write a test. This is difficult because we need something that can appear in string interpolated expression. It doesn’t need to be the dcp expression but it has to be something that we can detect and replace with the dcp expression, at runtime .
There’s another alternative that comes to mind:
Make it internal: Delete the property:
Don’t evaluate this object inside of the IValueProvider implementation, but have that object flow all the way out to evaluation phase (GetValue) in ApplicationExecutor.
I think that means we’d need to manually process ReferenceExpressions in GetValue, handling target port specially.
radical
pushed a commit
to radical/aspire
that referenced
this pull request
Apr 3, 2024
* Added ability to resolve target port - Change how we process and expose target ports. This change makes it possible to avoid using any internals of DCP to access and resolve target ports from any resource. - More launch profile processing to the project resource defaults. - Remove logic in the manifest writing that wrote a special env variable. This should just work now like everything else. - Exposed TargetPort and Exists on EndpointReference. - Use this new target property with dapr. - Added a ReferenceExpressionBuilder which makes it possible to dynamically build a ReferenceExpression. - Endpoints and env are evaulated earlier now so change remove tests that add default launch profile on real projects without allocating those endpoints. * Remove more uses of TestProgram * Fix tests
eerhardt
pushed a commit
to eerhardt/aspire
that referenced
this pull request
Apr 5, 2024
* Added ability to resolve target port - Change how we process and expose target ports. This change makes it possible to avoid using any internals of DCP to access and resolve target ports from any resource. - More launch profile processing to the project resource defaults. - Remove logic in the manifest writing that wrote a special env variable. This should just work now like everything else. - Exposed TargetPort and Exists on EndpointReference. - Use this new target property with dapr. - Added a ReferenceExpressionBuilder which makes it possible to dynamically build a ReferenceExpression. - Endpoints and env are evaulated earlier now so change remove tests that add default launch profile on real projects without allocating those endpoints. * Remove more uses of TestProgram * Fix tests
davidfowl
added a commit
that referenced
this pull request
Apr 6, 2024
* Added ability to resolve target port (#3305) * Added ability to resolve target port - Change how we process and expose target ports. This change makes it possible to avoid using any internals of DCP to access and resolve target ports from any resource. - More launch profile processing to the project resource defaults. - Remove logic in the manifest writing that wrote a special env variable. This should just work now like everything else. - Exposed TargetPort and Exists on EndpointReference. - Use this new target property with dapr. - Added a ReferenceExpressionBuilder which makes it possible to dynamically build a ReferenceExpression. - Endpoints and env are evaulated earlier now so change remove tests that add default launch profile on real projects without allocating those endpoints. * Remove more uses of TestProgram * Fix tests * Rename DcpServiceName to TargetPortExpression (#3371) This allows us to not leak "DCP" into the public API and keeps DCP-isms contained in the DCP code. * Do not set TargetPort to Port when IsProxying is also set (#3372) * Do not set TargetPort to Port when IsProxied is true * Move TargetPort check to ApplicationExecutor * Apply port selection logic to manifest publishing (cherry picked from commit 09f5ae9) * Update src/Aspire.Hosting/Dcp/ApplicationExecutor.cs Co-authored-by: Eric Erhardt <[email protected]> --------- Co-authored-by: Eric Erhardt <[email protected]> --------- Co-authored-by: David Fowler <[email protected]> Co-authored-by: Reuben Bond <[email protected]>
1 task
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
cc @DamianEdwards this should fix dapr and the tests.
Goal is to have this go into p6 (API fit and finish).