Make the dashboard an appmodel resource #3453
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
dotnet-issue-labeler
bot
added
the
area-app-model
- Moved dashboard resource into a lifecycle hook instead of making it a dcp resource. This removes the specialized code from ApplicationExecutor from knowing about the dashboard. As a result of this change I also cleaned up how we configure and validate dcp options to use IConfigureOptions and IValidateOptions. - Added tests for the dashboard resource - Made a change to ApplicationExecutor to allow resources that start as hidden to remain hidden.
davidfowl
force-pushed
the
davidfowl/isolate-dashboard-resource
branch
from
6e7cf1e to
ef23c70
Compare
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
This is a huge change but good one. Makes things a lot cleaner. |
- Added hidden to a new known resource states class - Added more test cases
JamesNK
approved these changes
Apr 7, 2024
ReubenBond
reviewed
Apr 8, 2024
| _innerBuilder.Services.AddSingleton<IKubernetesService, KubernetesService>(); | ||
| // DCP stuff | ||
| _innerBuilder.Services.AddSingleton<ApplicationExecutor>(); | ||
| _innerBuilder.Services.AddSingleton<IDashboardEndpointProvider, HostDashboardEndpointProvider>(); |
There was a problem hiding this comment.
HostDashboradEndpointProvider is being added regardless of whether the dashboard is enabled.
davidfowl
added a commit
that referenced
this pull request
Apr 10, 2024
* Make the dashboard an appmodel resource - Moved dashboard resource into a lifecycle hook instead of making it a dcp resource. This removes the specialized code from ApplicationExecutor from knowing about the dashboard. As a result of this change I also cleaned up how we configure and validate dcp options to use IConfigureOptions and IValidateOptions. - Added tests for the dashboard resource - Made a change to ApplicationExecutor to allow resources that start as hidden to remain hidden. - Added hidden to a new known resource states class - Added more test cases
joperezr
pushed a commit
that referenced
this pull request
Apr 10, 2024
* Improve service address allocation (#3294) * Improve service address allocation Should fix #3265 * Make the dashboard an appmodel resource (#3453) * Make the dashboard an appmodel resource - Moved dashboard resource into a lifecycle hook instead of making it a dcp resource. This removes the specialized code from ApplicationExecutor from knowing about the dashboard. As a result of this change I also cleaned up how we configure and validate dcp options to use IConfigureOptions and IValidateOptions. - Added tests for the dashboard resource - Made a change to ApplicationExecutor to allow resources that start as hidden to remain hidden. - Added hidden to a new known resource states class - Added more test cases * Only add dashboard services if the dashboard is enabled (#3489) * Only add dashboard services if the dashboard is enabled * Don't wait until after we've started the entire app to print the token (#3472) - Print it right after we print the dashboard url - Refactored the dashboard resource to use DashboardOptions instead of DcpOptions --------- Co-authored-by: Karol Zadora-Przylecki <karolz@microsoft.com> Co-authored-by: Reuben Bond <203839+ReubenBond@users.noreply.github.com>
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.
IConfigureOptionsandIValidateOptions.AI generated:
This pull request includes changes to the
Aspire.Hostingproject, specifically to theDashboardLifecycleHook.csandApplicationExecutor.csfiles. The changes mainly revolve around the removal of the dashboard configuration and lifecycle hooks, the addition of a new lifecycle hook, and modifications to the state of the dashboard resource.Here are the most important changes:
src/Aspire.Hosting/Dashboard/DashboardLifecycleHook.cs: A new lifecycle hook was added. This hook configures the dashboard resource before the start of the application. It checks if the dashboard resource exists and configures it, or adds a new dashboard resource if it doesn't exist. The configuration includes setting up the dashboard path, working directory, executable resource, and environment variables.Removal of dashboard configuration from ApplicationExecutor:
src/Aspire.Hosting/Dcp/ApplicationExecutor.cs: Several methods related to the dashboard configuration were removed, includingConfigureAspireDashboardResource,StartDashboardAsDcpExecutableAsync,GetDashboardEnvironmentVariablesAsync, andPrintDashboardUrls. Also, the dashboard configuration was removed from theRunApplicationAsyncmethod.Modifications to dashboard resource state:
src/Aspire.Hosting/Dcp/ApplicationExecutor.cs: The state of the dashboard resource was modified in theToSnapshotmethods forContainer,Executable, andProjectresources. The state is now set to "Hidden" if the initial state in the application model is "Hidden". [1] [2] [3] [4]Other changes:
src/Aspire.Hosting/Dcp/ApplicationExecutor.cs: ThePreparePlainExecutablesandPrepareProjectExecutablesmethods now call a new methodSetInitialResourceStateto set the initial state of the resource. [1] [2]src/Aspire.Hosting/Dcp/ApplicationExecutor.cs: Several references to the dashboard and related parameters were removed from theApplicationExecutorclass. [1] [2] [3] [4]Fixes #3450
Microsoft Reviewers: Open in CodeFlow