Skip to content

Fix OpenLDAP custom queries to use search_scope parameter #21385

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

Merged
AAraKKe merged 13 commits into from
Oct 29, 2025
Merged

Fix OpenLDAP custom queries to use search_scope parameter #21385

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
a154e3c
Fix OpenLDAP custom queries to use search_scope parameter
puretension Sep 17, 2025
f54168b
Add changelog entry for search_scope parameter fix
puretension Sep 17, 2025
a39e31a
Simplify search_scope test to avoid CI issues
puretension Sep 17, 2025
5f048a2
Fix code formatting for linting compliance
puretension Sep 17, 2025
4b5c6bd
Fix search_scope to use ldap3 constants instead of strings
puretension Sep 17, 2025
366139b
Fix trailing whitespace for linting compliance
puretension Sep 17, 2025
6dfa80f
Address reviewer feedback: use mapping dict and improve error handling
puretension Oct 22, 2025
2aac389
Use DEFAULT_SEARCH_SCOPE constant instead of hardcoded values
puretension Oct 22, 2025
18f8403
Fix code formatting for linting compliance
puretension Oct 24, 2025
f1139b2
Fix import sorting in OpenLDAP test files
puretension Oct 24, 2025
8191df1
Merge branch 'master' into fix/openldap-search-scope-parameter-20685
AAraKKe Oct 27, 2025
f1db660
Fix import formatting for linting compliance
puretension Oct 27, 2025
039403f
Run ddev test --fmt openldap to fix linting issues
puretension Oct 27, 2025
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
Prev Previous commit
Next Next commit
Fix import sorting in OpenLDAP test files 
Organize imports in test files to comply with ruff linting rules:
- tests/conftest.py: Sort imports alphabetically
- tests/test_check.py: Sort imports alphabetically
- tests/test_unit.py: Sort imports alphabetically

Signed-off-by: puretension <[email protected]>
  • Loading branch information
@puretension
puretension committed Oct 24, 2025
commit f1139b2fad29addabe1bace5e33f4af71450f64e
1 change: 0 additions & 1 deletion openldap/tests/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
from copy import deepcopy

import pytest

from datadog_checks.dev import TempDir, docker_run
from datadog_checks.dev.fs import create_file, path_exists
from datadog_checks.openldap import OpenLDAP
Expand Down
1 change: 0 additions & 1 deletion openldap/tests/test_check.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

import ldap3
import pytest

from datadog_checks.base.utils.platform import Platform

from .common import _check
Expand Down
3 changes: 1 addition & 2 deletions openldap/tests/test_unit.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

import ldap3
import pytest

from datadog_checks.base.errors import CheckException

from .common import HERE
Expand Down Expand Up @@ -315,7 +314,7 @@ def test_custom_query_search_scope_default(check, mocker):
check._perform_custom_queries(conn_mock, queries, tags, instance)

conn_mock.search.assert_called_once_with(
"ou=users,dc=example,dc=com", "(objectClass=person)", search_scope=DEFAULT_SEARCH_SCOPE, attributes=None
"ou=users,dc=example,dc=com", "(objectClass=person)", search_scope=ldap3.SUBTREE, attributes=None
)


Expand Down
Loading