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

Upgrade aiohttp version to 3.9.1 #20798

Merged
merged 1 commit into from Dec 21, 2023
Merged

Conversation

fdalmaup
Copy link
Member

Related issue
#20586

Description

Upgrades the aiohttp to version 3.9.1 which fixes a found security vulnerability.

Tests

Unit tests can be found here.
API Integration tests can be found here.

@fdalmaup fdalmaup self-assigned this Dec 13, 2023
@fdalmaup fdalmaup linked an issue Dec 13, 2023 that may be closed by this pull request
GGP1
GGP1 previously approved these changes Dec 14, 2023
Copy link
Member

@GGP1 GGP1 left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Member

@Selutario Selutario left a comment

Choose a reason for hiding this comment

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

LGTM (blocked until we can assign it a new deps_version)

@fdalmaup
Copy link
Member Author

Regarding the failure of test_overview_endpoints.tavern.yaml, it was also run locally to verify it was a random failure and these are the results:

test_overview_endpoints.tavern.yaml local executions
(integrationtest-env) fdalmau@wazuhFW:~/git/wazuh/api/test/integration(enhancement/20586-upgrade-aiohttp)$  pytest test_overview_endpoints.tavern.yaml
====================================================================== test session starts ======================================================================
platform linux -- Python 3.8.10, pytest-7.3.1, pluggy-0.13.1
rootdir: /home/fdalmau/git/wazuh/api/test/integration
configfile: pytest.ini
plugins: aiohttp-1.0.4, trio-0.7.0, metadata-2.0.2, tavern-1.23.5, asyncio-0.18.1, html-2.1.1
asyncio: mode=auto
collected 1 item                                                                                                                                                

test_overview_endpoints.tavern.yaml .                                                                                                                     [100%]

======================================================================= warnings summary ========================================================================
../../../../../venv/integrationtest-env/lib/python3.8/site-packages/_pytest/nodes.py:642
  /home/fdalmau/venv/integrationtest-env/lib/python3.8/site-packages/_pytest/nodes.py:642: PytestRemovedIn8Warning: The (fspath: py.path.local) argument to YamlFile is deprecated. Please use the (path: pathlib.Path) argument instead.
  See https://docs.pytest.org/en/latest/deprecations.html#fspath-argument-for-node-constructors-replaced-with-pathlib-path
    return super().from_parent(parent=parent, fspath=fspath, path=path, **kw)

-- Docs: https://docs.pytest.org/en/stable/how-to/capture-warnings.html
=========================================================== 1 passed, 1 warning in 1199.32s (0:19:59) ===========================================================
(integrationtest-env) fdalmau@wazuhFW:~/git/wazuh/api/test/integration(enhancement/20586-upgrade-aiohttp)$ pytest test_overview_endpoints.tavern.yaml
====================================================================== test session starts ======================================================================
platform linux -- Python 3.8.10, pytest-7.3.1, pluggy-0.13.1
rootdir: /home/fdalmau/git/wazuh/api/test/integration
configfile: pytest.ini
plugins: aiohttp-1.0.4, trio-0.7.0, metadata-2.0.2, tavern-1.23.5, asyncio-0.18.1, html-2.1.1
asyncio: mode=auto
collected 1 item                                                                                                                                                

test_overview_endpoints.tavern.yaml .                                                                                                                     [100%]

======================================================================= warnings summary ========================================================================
../../../../../venv/integrationtest-env/lib/python3.8/site-packages/_pytest/nodes.py:642
  /home/fdalmau/venv/integrationtest-env/lib/python3.8/site-packages/_pytest/nodes.py:642: PytestRemovedIn8Warning: The (fspath: py.path.local) argument to YamlFile is deprecated. Please use the (path: pathlib.Path) argument instead.
  See https://docs.pytest.org/en/latest/deprecations.html#fspath-argument-for-node-constructors-replaced-with-pathlib-path
    return super().from_parent(parent=parent, fspath=fspath, path=path, **kw)

-- Docs: https://docs.pytest.org/en/stable/how-to/capture-warnings.html
=========================================================== 1 passed, 1 warning in 985.03s (0:16:25) ============================================================
(integrationtest-env) fdalmau@wazuhFW:~/git/wazuh/api/test/integration(enhancement/20586-upgrade-aiohttp)$ pytest test_overview_endpoints.tavern.yaml
====================================================================== test session starts ======================================================================
platform linux -- Python 3.8.10, pytest-7.3.1, pluggy-0.13.1
rootdir: /home/fdalmau/git/wazuh/api/test/integration
configfile: pytest.ini
plugins: aiohttp-1.0.4, trio-0.7.0, metadata-2.0.2, tavern-1.23.5, asyncio-0.18.1, html-2.1.1
asyncio: mode=auto
collected 1 item                                                                                                                                                

test_overview_endpoints.tavern.yaml .                                                                                                                     [100%]

======================================================================= warnings summary ========================================================================
../../../../../venv/integrationtest-env/lib/python3.8/site-packages/_pytest/nodes.py:642
  /home/fdalmau/venv/integrationtest-env/lib/python3.8/site-packages/_pytest/nodes.py:642: PytestRemovedIn8Warning: The (fspath: py.path.local) argument to YamlFile is deprecated. Please use the (path: pathlib.Path) argument instead.
  See https://docs.pytest.org/en/latest/deprecations.html#fspath-argument-for-node-constructors-replaced-with-pathlib-path
    return super().from_parent(parent=parent, fspath=fspath, path=path, **kw)

-- Docs: https://docs.pytest.org/en/stable/how-to/capture-warnings.html
=========================================================== 1 passed, 1 warning in 1005.38s (0:16:45) ===========================================================

The found error does not seem to be related with the dependency upgrade.

@fdalmaup fdalmaup force-pushed the enhancement/20586-upgrade-aiohttp branch from c2af91f to 35e532c Compare December 21, 2023 14:17
@Selutario
Copy link
Member

Checks passed successfully before. The only one failing, test_overview_endpoints, was run locally three times and also passed, so I'm merging the PR.

@Selutario Selutario merged commit 123ac73 into 4.7.2 Dec 21, 2023
@Selutario Selutario deleted the enhancement/20586-upgrade-aiohttp branch December 21, 2023 14:20
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.

Upgrade aiohttp version to version >=3.9.0
3 participants