Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge 4.10.1 into 4.11.0 #7228

Merged
merged 9 commits into from
Jan 10, 2025
Merged

Merge 4.10.1 into 4.11.0 #7228

merged 9 commits into from
Jan 10, 2025

Conversation

Desvelao
Copy link
Member

Merge 4.10.1 into 4.11.0

Caution

Merge PR strategy: Create a merge commit

Desvelao and others added 8 commits December 13, 2024 15:07
fix(changelog): pull request number
* fix(get-updates): improve error handling by renaming variable for clarity and adjusting error response structure

* fix(plugin-services): update WazuhCheckUpdatesServices type to include Logger for improved service management

* fix(get-updates): use IAPIHost type for host management to enhance type safety and code clarity in update services

* fix(get-updates): add logger for improved debugging of API status errors in update retrieval process

* fix(get-updates): refactor update retrieval to include version handling and optimize status checking logic for better clarity

* fix(get-updates): update test cases to handle version formatting and improve mocking for Wazuh core interactions

* fix(get-updates): enhance tests by mocking last_available_patch for clearer version handling and improved stability

* fix(get-updates): reorganize imports in test file for better readability and consistency with common constants and types

* fix(get-updates): refactor test setup to improve mocking of saved objects and requests for more accurate updates handling

* fix(get-updates): standardize api_id and version formatting in tests for consistent updates handling across all scenarios

* fix(get-updates): improve error handling and add tests for undefined api_version scenarios in update fetching logic

* fix(get-updates): enhance error response handling and add test for dual request failure in update fetching logic

* fix(get-updates): remove unnecessary mock data from tests for clearer error handling in dual request failure scenarios

* fix(get-updates): add test for handling API errors on secondary request in update retrieval logic

* fix(get-updates): add test for retrieving updates when initial API version is undefined and secondary request fails

* fix(get-updates): refactor test cases to use 'it' for better consistency in update retrieval tests

* fix(get-updates): simplify test descriptions to improve readability in update retrieval tests

* fix(get-updates): enhance test descriptions for clarity in update availability cases and error handling scenarios

* fix(changelog): update entries for issue #7177 and add fix for incorrect Wazuh API version display after upgrade

* fix(changelog): correct rendering entry for vulnerability reference and clarify Wazuh API version display issue after upgrade

---------

Co-authored-by: Federico Rodriguez <[email protected]>
* Bump revision to 07

* Prettier
* Bump version 4.10.1

* Fix prettier
* chore(bump): 4.10.0 rev 08

* fix(prettier): code format
Merge 4.10.0 into 4.10.1
@Desvelao Desvelao self-assigned this Jan 10, 2025
JuanGarriuz
JuanGarriuz previously approved these changes Jan 10, 2025
Copy link
Member

@JuanGarriuz JuanGarriuz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTTM!!!

@Desvelao Desvelao mentioned this pull request Jan 10, 2025
6 tasks
@Desvelao Desvelao linked an issue Jan 10, 2025 that may be closed by this pull request
6 tasks
Copy link
Contributor

Wazuh Core plugin code coverage (Jest) test % values
Statements 45.5% ( 400 / 879 )
Branches 41.09% ( 157 / 382 )
Functions 43.87% ( 136 / 310 )
Lines 45.69% ( 398 / 871 )

Copy link
Contributor

Wazuh Check Updates plugin code coverage (Jest) test % values
Statements 78.72% ( 185 / 235 )
Branches 62.72% ( 69 / 110 )
Functions 61.7% ( 29 / 47 )
Lines 78.72% ( 185 / 235 )

Copy link
Contributor

Main plugin code coverage (Jest) test % values
Statements 14.93% ( 4449 / 29789 )
Branches 9.77% ( 1878 / 19212 )
Functions 14.69% ( 1059 / 7207 )
Lines 15.15% ( 4343 / 28663 )

@Desvelao Desvelao merged commit 21207c4 into 4.11.0 Jan 10, 2025
5 checks passed
@Desvelao Desvelao deleted the merge-4.10.1-into-4.11.0 branch January 10, 2025 09:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Post release tasks for 4.10.0
5 participants