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

Adopt requests new get_connection API #164

Merged
merged 6 commits into from
May 28, 2024
Merged

Adopt requests new get_connection API #164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d49d5dd
Fix requests 2.32 compatibility
pquentin May 23, 2024
56d1e68
Fix lint
pquentin May 23, 2024
8a222e2
Fix prepared request
pquentin May 23, 2024
204fd95
Test minimum dependencies in CI
pquentin May 27, 2024
db6e12a
Fix typo in CI file
pquentin May 27, 2024
4668bde
Test minimum dependencies on Python 3.8
pquentin May 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,15 @@ jobs:
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
os: ["ubuntu-latest"]
experimental: [false]
nox-session: ['']
include:
- python-version: "3.8"
os: "ubuntu-latest"
experimental: false
nox-session: "test-min-deps"

runs-on: ${{ matrix.os }}
name: test-${{ matrix.python-version }}
name: test-${{ matrix.python-version }} ${{ matrix.nox-session }}
continue-on-error: ${{ matrix.experimental }}
steps:
- name: Checkout repository
Expand All @@ -65,9 +71,10 @@ jobs:
run: python -m pip install --upgrade nox

- name: Run tests
run: "nox -rs test-${PYTHON_VERSION%-dev}"
run: nox -s ${NOX_SESSION:-test-$PYTHON_VERSION}
env:
PYTHON_VERSION: ${{ matrix.python-version }}
NOX_SESSION: ${{ matrix.nox-session }}
# Required for development versions of Python
AIOHTTP_NO_EXTENSIONS: 1
FROZENLIST_NO_EXTENSIONS: 1
Expand Down
13 changes: 12 additions & 1 deletion elastic_transport/_node/_http_requests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,18 @@ def __init__(self, config: NodeConfig):
)
# Preload the HTTPConnectionPool so initialization issues
# are raised here instead of in perform_request()
adapter.get_connection(self.base_url) # type: ignore[no-untyped-call]
if hasattr(adapter, "get_connection_with_tls_context"):
request = requests.Request(method="GET", url=self.base_url)
prepared_request = self.session.prepare_request(request)
adapter.get_connection_with_tls_context(
prepared_request, verify=self.session.verify
)
else:
# elastic-transport is not vulnerable to CVE-2024-35195 because it uses
# requests.Session and an SSLContext without using the verify parameter.
# We should remove this branch when requiring requests 2.32 or later.
adapter.get_connection(self.base_url)
Copy link
Contributor

Choose a reason for hiding this comment

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

Do we need to preserve the type: ignore here? And are there any typing considerations for the new call?

Copy link
Member Author

Choose a reason for hiding this comment

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

We don't, the types were fixed in typeshed yesterday: python/typeshed#12000.


self.session.mount(prefix=f"{self.scheme}://", adapter=adapter)

def perform_request(
Expand Down
12 changes: 12 additions & 0 deletions noxfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,18 @@ def test(session):
session.run("coverage", "report", "-m")


@nox.session(name="test-min-deps", python="3.8")
def test_min_deps(session):
session.install("-r", "requirements-min.txt", ".[develop]", silent=False)
session.run(
"pytest",
"--cov=elastic_transport",
*(session.posargs or ("tests/",)),
env={"PYTHONWARNINGS": "always::DeprecationWarning"},
)
session.run("coverage", "report", "-m")


@nox.session(python="3")
def docs(session):
session.install(".[develop]")
Expand Down
4 changes: 4 additions & 0 deletions requirements-min.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
requests==2.26.0
urllib3==1.26.2
aiohttp==3.8.0
httpx==0.27.0
Loading