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.

Sign up for GitHub

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

Jump to bottom

Update agent_upgrade command force flag message #18432

Merged
merged 1 commit into from
Sep 14, 2023
Merged

Update agent_upgrade command force flag message #18432

merged 1 commit into from
Sep 14, 2023

Conversation

GGP1
Copy link
Member

@GGP1 GGP1 commented Aug 15, 2023 •
edited
Loading

Related issue
Closes #18227

Description

Updates the agent_upgrade command --force flag message to not mention version downgrades. It now uses the same wording as the agent upgrade module documentation.

Documentation pull request: wazuh/wazuh-documentation#6345

Tests

Framework unit tests 
(venv) gasti@pop-os:~/work/wazuh$ python3 -m pytest framework --disable-warnings
====================================== test session starts =======================================
platform linux -- Python 3.9.16, pytest-7.3.1, pluggy-1.0.0
rootdir: /home/gasti/work/wazuh/framework
plugins: asyncio-0.18.1, tavern-1.23.5, trio-0.7.0, html-2.1.1, aiohttp-1.0.4, metadata-3.0.0
asyncio: mode=auto
collected 2052 items                                                                             

framework/scripts/tests/test_agent_groups.py ..............                                [  0%]
framework/scripts/tests/test_agent_upgrade.py ...............                              [  1%]
framework/scripts/tests/test_cluster_control.py ......                                     [  1%]
framework/scripts/tests/test_wazuh_clusterd.py .......                                     [  2%]
framework/scripts/tests/test_wazuh_logtest.py ......................                       [  3%]
framework/wazuh/core/cluster/dapi/tests/test_dapi.py ................................      [  4%]
framework/wazuh/core/cluster/tests/test_client.py ................                         [  5%]
framework/wazuh/core/cluster/tests/test_cluster.py ...................................     [  7%]
framework/wazuh/core/cluster/tests/test_common.py ........................................ [  9%]
...................................                                                        [ 10%]
framework/wazuh/core/cluster/tests/test_control.py ......                                  [ 11%]
framework/wazuh/core/cluster/tests/test_local_client.py .............                      [ 11%]
framework/wazuh/core/cluster/tests/test_local_server.py ........................           [ 12%]
framework/wazuh/core/cluster/tests/test_master.py ........................................ [ 14%]
.....                                                                                      [ 15%]
framework/wazuh/core/cluster/tests/test_server.py ...................                      [ 16%]
framework/wazuh/core/cluster/tests/test_utils.py ...........                               [ 16%]
framework/wazuh/core/cluster/tests/test_worker.py ....................................     [ 18%]
framework/wazuh/core/tests/test_active_response.py ..............                          [ 19%]
framework/wazuh/core/tests/test_agent.py ................................................. [ 21%]
.......................................................................................... [ 25%]
.......                                                                                    [ 26%]
framework/wazuh/core/tests/test_cdb_list.py ......................................         [ 27%]
framework/wazuh/core/tests/test_common.py .......                                          [ 28%]
framework/wazuh/core/tests/test_configuration.py ......................................... [ 30%]
.............................                                                              [ 31%]
framework/wazuh/core/tests/test_database.py .............                                  [ 32%]
framework/wazuh/core/tests/test_decoder.py ................                                [ 33%]
framework/wazuh/core/tests/test_exception.py ...                                           [ 33%]
framework/wazuh/core/tests/test_input_validator.py ...                                     [ 33%]
framework/wazuh/core/tests/test_logtest.py ..                                              [ 33%]
framework/wazuh/core/tests/test_manager.py ...............                                 [ 34%]
framework/wazuh/core/tests/test_mitre.py .............                                     [ 34%]
framework/wazuh/core/tests/test_pyDaemonModule.py .....                                    [ 35%]
framework/wazuh/core/tests/test_results.py ........................................        [ 37%]
framework/wazuh/core/tests/test_rootcheck.py .............                                 [ 37%]
framework/wazuh/core/tests/test_rule.py ......................                             [ 38%]
framework/wazuh/core/tests/test_sca.py ........................                            [ 39%]
framework/wazuh/core/tests/test_security.py ............                                   [ 40%]
framework/wazuh/core/tests/test_stats.py .................                                 [ 41%]
framework/wazuh/core/tests/test_syscheck.py .......                                        [ 41%]
framework/wazuh/core/tests/test_syscollector.py ...                                        [ 41%]
framework/wazuh/core/tests/test_task.py ........                                           [ 42%]
framework/wazuh/core/tests/test_utils.py ................................................. [ 44%]
.......................................................................................... [ 49%]
.......................................................................................... [ 53%]
................                                                                           [ 54%]
framework/wazuh/core/tests/test_vulnerability.py ..                                        [ 54%]
framework/wazuh/core/tests/test_wazuh_queue.py ....................                        [ 55%]
framework/wazuh/core/tests/test_wazuh_socket.py ....................                       [ 56%]
framework/wazuh/core/tests/test_wdb.py ...............................                     [ 57%]
framework/wazuh/core/tests/test_wlogging.py .........                                      [ 58%]
framework/wazuh/rbac/tests/test_auth_context.py ..                                         [ 58%]
framework/wazuh/rbac/tests/test_decorators.py ............................................ [ 60%]
.................................................................                          [ 63%]
framework/wazuh/rbac/tests/test_default_configuration.py ................................. [ 65%]
.......................                                                                    [ 66%]
framework/wazuh/rbac/tests/test_orm.py ................................................... [ 68%]
...                                                                                        [ 68%]
framework/wazuh/rbac/tests/test_preprocessor.py ...........                                [ 69%]
framework/wazuh/tests/test_active_response.py ............                                 [ 70%]
framework/wazuh/tests/test_agent.py ...................................................... [ 72%]
...............................................................                            [ 75%]
framework/wazuh/tests/test_cdb_list.py ................................................... [ 78%]
..                                                                                         [ 78%]
framework/wazuh/tests/test_ciscat.py .................................                     [ 79%]
framework/wazuh/tests/test_cluster.py ..........                                           [ 80%]
framework/wazuh/tests/test_decoder.py ...................................                  [ 82%]
framework/wazuh/tests/test_group.py .......                                                [ 82%]
framework/wazuh/tests/test_logtest.py ......                                               [ 82%]
framework/wazuh/tests/test_manager.py ....................................                 [ 84%]
framework/wazuh/tests/test_mitre.py .......                                                [ 84%]
framework/wazuh/tests/test_rootcheck.py .................................................. [ 87%]
                                                                                           [ 87%]
framework/wazuh/tests/test_rule.py ....................................................... [ 90%]
.                                                                                          [ 90%]
framework/wazuh/tests/test_sca.py ...........                                              [ 90%]
framework/wazuh/tests/test_security.py ................................................... [ 93%]
......................                                                                     [ 94%]
framework/wazuh/tests/test_stats.py ...............                                        [ 94%]
framework/wazuh/tests/test_syscheck.py .........................                           [ 96%]
framework/wazuh/tests/test_syscollector.py ............                                    [ 96%]
framework/wazuh/tests/test_task.py ............................                            [ 98%]
framework/wazuh/tests/test_vulnerability.py ........................................       [100%]

==================== 2052 passed, 61 warnings in 213.10s (0:03:33) =====================

@GGP1 GGP1 self-assigned this Aug 15, 2023
@GGP1 GGP1 mentioned this pull request Aug 15, 2023
Closed
mhamra
mhamra previously approved these changes Aug 25, 2023
View reviewed changes
Copy link
Contributor

@mhamra mhamra left a comment

Choose a reason for hiding this comment

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

The help messages, DocStrings and tests were updated. There's no change to the logic of the source code.

LGTM!

Thanks @GGP1

Selutario
Selutario reviewed Aug 28, 2023
View reviewed changes
Copy link
Contributor

@Selutario Selutario left a comment •
edited
Loading

Choose a reason for hiding this comment

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

LGTM, but the release type for this issue is patch so it must be merged in 4.5.3 (once it is created). Please, rebase the branch accordingly.

@Selutario Selutario mentioned this pull request Aug 28, 2023
Merged
@GGP1 GGP1 force-pushed the fix/18227-remove-downgrade-reference branch from ffad8ee to eed752f Compare September 4, 2023 18:59
@GGP1 GGP1 changed the base branch from master to 4.5.3 September 4, 2023 18:59
@GGP1 GGP1 force-pushed the fix/18227-remove-downgrade-reference branch from eed752f to 92d882a Compare September 12, 2023 18:27
@Selutario Selutario merged commit 83cc68a into 4.5.3 Sep 14, 2023
48 of 49 checks passed
@Selutario Selutario deleted the fix/18227-remove-downgrade-reference branch September 14, 2023 10:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Selutario Selutario Selutario approved these changes

@mhamra mhamra mhamra left review comments

Assignees

@GGP1 GGP1

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Remove downgrade reference in agent_upgrade binary
3 participants
@GGP1 @mhamra @Selutario