Skip to content

Fixes InstanceConfig model generation when validators functions are defined in spec.yaml #21409

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixes InstanceConfig model generation when validators functions are defined in spec.yaml #21409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4a49299
Fix additional field validators package in model generation
eric-weaver Sep 19, 2025
13374b6
Add changelog
eric-weaver Sep 19, 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
1 change: 1 addition & 0 deletions datadog_checks_dev/changelog.d/21409.fixed
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fixes InstanceConfig model generation when validators functions are defined in spec.yaml
2 changes: 1 addition & 1 deletion datadog_checks_dev/datadog_checks/dev/tooling/configuration/consumers/model/model_file.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ def _define_validator_functions(model_id, validator_data, need_defaults):
model_file_lines.append('')
model_file_lines.append(f' if info.field_name == {option_name!r}:')
for import_path in import_paths:
model_file_lines.append(f' value = validation.{import_path}(value, field=field)')
model_file_lines.append(f' value = validators.{import_path}(value, field=field)')

if need_defaults:
model_file_lines.append(' else:')
Expand Down
8 changes: 4 additions & 4 deletions datadog_checks_dev/tests/tooling/configuration/consumers/model/test_common_validators.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,12 +99,12 @@ def _validate(cls, value, info):
value = getattr(validators, f'instance_{info.field_name}', identity)(value, field=field)

if info.field_name == 'foo':
value = validation.pkg.subpkg2.validate2(value, field=field)
value = validation.pkg.subpkg2.validate1(value, field=field)
value = validators.pkg.subpkg2.validate2(value, field=field)
value = validators.pkg.subpkg2.validate1(value, field=field)

if info.field_name == 'tags':
value = validation.pkg.subpkg1.validate2(value, field=field)
value = validation.pkg.subpkg1.validate1(value, field=field)
value = validators.pkg.subpkg1.validate2(value, field=field)
value = validators.pkg.subpkg1.validate1(value, field=field)

return validation.utils.make_immutable(value)

Expand Down
Loading