Skip to content

[8.18] (backport #9349) Enhancement/5235 correctly wrap errors from copyActionDir and copyRunDirectory#9933

Merged
kaanyalti merged 2 commits into8.18from
mergify/bp/8.18/pr-9349
Sep 15, 2025
Merged

[8.18] (backport #9349) Enhancement/5235 correctly wrap errors from copyActionDir and copyRunDirectory#9933
kaanyalti merged 2 commits into8.18from
mergify/bp/8.18/pr-9349

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Sep 12, 2025

PR 3/6

  • Enhancement

What does this PR do?

  • Adds error wrapping in copayActionStore and copyRunDirectory functions so that the errors are properly propagated.
  • Adds tests for copyActionStore, copyRunDirectory and error handling test for the Upgrade function

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 read and understood the pull request guidelines of this project.
  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • [ ] I have made corresponding changes to the documentation
  • [ ] I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • [ ] I have added an entry in ./changelog/fragments using the changelog tool
  • [ ] I have added an integration test or an E2E test

Disruptive 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

    • From fleet
    • Cli with remote url and file

  • 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).

@mergify
Enhancement/5235 correctly wrap errors from copyActionDir and copyRun…
f192416 
…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 mergify bot added backport conflicts There is a conflict in the backported pull request labels Sep 12, 2025
@mergify mergify bot requested a review from a team as a code owner September 12, 2025 22:47
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Sep 12, 2025
@mergify mergify bot removed the request for review from a team September 12, 2025 22:47
@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented Sep 12, 2025

Cherry-pick of 96e0476 has failed:

On branch mergify/bp/8.18/pr-9349
Your branch is up to date with 'origin/8.18'.

You are currently cherry-picking commit 96e047675.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   internal/pkg/agent/application/upgrade/step_unpack.go
	modified:   internal/pkg/agent/application/upgrade/upgrade_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   internal/pkg/agent/application/upgrade/upgrade.go

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

@mergify mergify bot requested review from michalpristas and pchila September 12, 2025 22:47
@mergify mergify bot added the backport label Sep 12, 2025
@mergify mergify bot mentioned this pull request Sep 12, 2025
Merged
4 tasks
@github-actions github-actions bot added Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team skip-changelog labels Sep 12, 2025
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Sep 12, 2025

Pinging @elastic/elastic-agent-control-plane (Team:Elastic-Agent-Control-Plane)

@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented Sep 15, 2025

This pull request has not been merged yet. Could you please review and merge it @kaanyalti? 🙏

kaanyalti
kaanyalti reviewed Sep 15, 2025
View reviewed changes
Comment thread internal/pkg/agent/application/upgrade/upgrade.go
@kaanyalti kaanyalti removed the conflicts There is a conflict in the backported pull request label Sep 15, 2025
@kaanyalti kaanyalti mentioned this pull request Sep 15, 2025
Merged
4 tasks
@elastic-sonarqube
Copy link
Copy Markdown

elastic-sonarqube bot commented Sep 15, 2025

Quality Gate passed Quality Gate passed

Issues
1 New issue
0 Fixed issues
0 Accepted issues

Measures
0 Security Hotspots
100.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube

@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Sep 15, 2025

💚 Build Succeeded

History

cc @kaanyalti

@kaanyalti kaanyalti merged commit bc0f82f into 8.18 Sep 15, 2025
19 checks passed
@kaanyalti kaanyalti deleted the mergify/bp/8.18/pr-9349 branch September 15, 2025 20:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@michalpristas michalpristas Awaiting requested review from michalpristas michalpristas is a code owner automatically assigned from elastic/elastic-agent-control-plane

@pchila pchila Awaiting requested review from pchila pchila is a code owner automatically assigned from elastic/elastic-agent-control-plane

1 more reviewer

@kaanyalti kaanyalti kaanyalti approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@kaanyalti kaanyalti

Labels

backport skip-changelog Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@elasticmachine @kaanyalti