Skip to content
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

Rename DcpServiceName to TargetPortExpression #3371

Merged
merged 1 commit into from
Apr 4, 2024

Conversation

eerhardt
Copy link
Member

@eerhardt eerhardt commented Apr 3, 2024

This allows us to not leak "DCP" into the public API and keeps DCP-isms contained in the DCP code.

This is a follow up from #3305 (comment).

Microsoft Reviewers: Open in CodeFlow

This allows us to not leak "DCP" into the public API and keeps DCP-isms contained in the DCP code.
@dotnet-issue-labeler dotnet-issue-labeler bot added the area-codeflow for labeling automated codeflow. intentionally a different color! label Apr 3, 2024
@karolz-ms
Copy link
Member

@ReubenBond discovered that #3305 has broken plain Executables using specific port. @eerhardt you might want to coordinate with him on the fix.

@eerhardt
Copy link
Member Author

eerhardt commented Apr 4, 2024

@ReubenBond discovered that #3305 has broken plain Executables using specific port. @eerhardt you might want to coordinate with him on the fix.

#3372 is the fix for that I believe. Once both our changes are in, we can backport all 3 fixes to preview6.

@eerhardt eerhardt merged commit 997d15f into dotnet:main Apr 4, 2024
8 checks passed
@eerhardt eerhardt deleted the DcpServiceName branch April 4, 2024 00:25
eerhardt added a commit to eerhardt/aspire that referenced this pull request Apr 5, 2024
This allows us to not leak "DCP" into the public API and keeps DCP-isms contained in the DCP code.
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]>
@github-actions github-actions bot locked and limited conversation to collaborators May 4, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
area-codeflow for labeling automated codeflow. intentionally a different color!
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants