dotnet / aspire

Tools, templates, and packages to accelerate building observable, production-ready apps
https://learn.microsoft.com/dotnet/aspire
MIT License
3.91k stars 476 forks source link

Resource masking fixes #6618

Closed JamesNK closed 1 week ago

JamesNK commented 2 weeks ago

Description

Bug repo:

  1. View project details
  2. Click show value for an env var
  3. Restart project
  4. Refreshed project details show values for all env vars

PR improves how state is tracked and updated. Adds integration tests.

Fixes https://github.com/dotnet/aspire/issues/6557

Checklist

JamesNK commented 19 hours ago

/backport to release/9.0

github-actions[bot] commented 19 hours ago

Started backporting to release/9.0: https://github.com/dotnet/aspire/actions/runs/11965753843

github-actions[bot] commented 19 hours ago

@JamesNK backporting to release/9.0 failed, the patch most likely resulted in conflicts:

$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch

Applying: Resource masking fixes
Using index info to reconstruct a base tree...
M   src/Aspire.Dashboard/Components/Controls/GridValue.razor
M   src/Aspire.Dashboard/Components/Controls/PropertyGrid.razor
M   src/Aspire.Dashboard/Components/Controls/PropertyGrid.razor.cs
M   src/Aspire.Dashboard/Components/Controls/ResourceDetails.razor
Falling back to patching base and 3-way merge...
Auto-merging src/Aspire.Dashboard/Components/Controls/ResourceDetails.razor
CONFLICT (content): Merge conflict in src/Aspire.Dashboard/Components/Controls/ResourceDetails.razor
Auto-merging src/Aspire.Dashboard/Components/Controls/PropertyGrid.razor.cs
CONFLICT (content): Merge conflict in src/Aspire.Dashboard/Components/Controls/PropertyGrid.razor.cs
Auto-merging src/Aspire.Dashboard/Components/Controls/PropertyGrid.razor
Auto-merging src/Aspire.Dashboard/Components/Controls/GridValue.razor
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Resource masking fixes
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

github-actions[bot] commented 19 hours ago

@JamesNK an error occurred while backporting to release/9.0, please check the run log for details!

Error: git am failed, most likely due to a merge conflict.