[8.18] (backport #9349) Enhancement/5235 correctly wrap errors from copyActionDir and copyRunDirectory #9933
+291
−50
Conversation
This file contains hidden or 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
![mergify[bot]](https://avatars.githubusercontent.com/in/10562?s=60&v=4){kind=small}
…Directory (#9349) * enhancement(5235): added copyActionStore package var * enhancement(5235): added copyRunDirectory package var * enhancement(5235): wrapping errors in copyRunDirectory enhancement(5235): wrapping mkdriall error in copyrundir function * enhancement(5235): added package var to abstract third party package function copy.Copy * enhancement(5235): using copyActionStoreFunc and copyRunDirectoryFunc * enhancement(5235): wrapping errors in upgrade function * enhancement(5235): added mkdirall wrapper in copyRunDir enhancement(5235): added common package import * enhancement(5235): using writefile wrapper in copyActionStore * enhancement(5235): using readFile wrapper in copyActionStore * enhancement(5235): added copyActionStore and copyRunDirectory tests in upgrade_test enhancement(5235): updated the copyRunDirectory test to mock stdlib functions * enhancement(5235): added TestUpgradeDirectoryCopyErrors test in upgrade_test enhancement(5235): added test imports in upgrade_test * enhancement(5235): added comment in step_unpack * enhancement(5235): added types in upgrade.go to abstract away functions for testability. abstracted copyActionStore and copyRunDirectory. Updated tests * enhancement(5235): updated upgrade tests, added tests cases for copyActionStore and copyRunDir error handling, removed unnecessary test, refactored copyActionStore and copyRunDirectory tests * enhancement(5235): moved where mkdriAllFunc type is declared * enhancement(5235): remove unnecessary change * enhancement(5235): added action store path to error message * enhancement(5235): remove unused commented code * enhancement(5235): fix typo in test log name (cherry picked from commit 96e0476) # Conflicts: # internal/pkg/agent/application/upgrade/upgrade.go
mergify
bot
added
backport
conflicts
mergify
bot
added
the
conflicts
|
Cherry-pick of 96e0476 has failed: To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally |
4 tasks
github-actions
bot
added
Team:Elastic-Agent-Control-Plane
|
Pinging @elastic/elastic-agent-control-plane (Team:Elastic-Agent-Control-Plane) |
|
This pull request has not been merged yet. Could you please review and merge it @kaanyalti? 🙏 |
kaanyalti
reviewed
Sep 15, 2025
kaanyalti
removed
the
conflicts
4 tasks
|
💚 Build Succeeded
History
cc @kaanyalti |
kaanyalti
approved these changes
Sep 15, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
PR 3/6
What does this PR do?
Why is it important?
This pr makes sure that the errors that originate from copyActionStore and copyRunDirectory get propagated correctly up the call stack.
Checklist
[ ] I have made corresponding changes to the documentation[ ] I have made corresponding change to the default configuration files[ ] I have added an entry in./changelog/fragmentsusing the changelog tool[ ] I have added an integration test or an E2E testDisruptive User Impact
none
How to test this PR locally
Build for windows, mac, linux
Install agent (managed and standalone)
Fill up disk until almost full
Trigger upgrade
Validate the upgrade detail error message shows insufficient disk error message both in the status output and on fleet ui.
Run the upgrade tests in upgrade_test.go
Related issues
This is an automatic backport of pull request #9349 done by [Mergify](https://mergify.com).