Skip to content

Conversation

JamesNK
Copy link
Member

@JamesNK JamesNK commented Nov 6, 2024

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 #6557

Checklist

  • Is this feature complete?
    • Yes. Ready to ship.
    • No. Follow-up changes expected.
  • Are you including unit tests for the changes and scenario tests if relevant?
    • Yes
    • No
  • Did you add public API?
    • Yes
      • If yes, did you have an API Review for it?
        • Yes
        • No
      • Did you add <remarks /> and <code /> elements on your triple slash comments?
        • Yes
        • No
    • No
  • Does the change make any security assumptions or guarantees?
    • Yes
      • If yes, have you done a threat model and had a security review?
        • Yes
        • No
    • No
  • Does the change require an update in our Aspire docs?

@JamesNK JamesNK merged commit a7e3d44 into main Nov 11, 2024
9 checks passed
@JamesNK JamesNK deleted the jamesnk/resource-masking-fixes branch November 11, 2024 23:32
@JamesNK
Copy link
Member Author

JamesNK commented Nov 22, 2024

/backport to release/9.0

Copy link
Contributor

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

Copy link
Contributor

@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!

Copy link
Contributor

@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.

JamesNK added a commit that referenced this pull request Nov 22, 2024
@github-actions github-actions bot locked and limited conversation to collaborators Dec 22, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
2 participants