From 4a49299dd9685b8b158e168acc898500d07dc664 Mon Sep 17 00:00:00 2001 From: Eric Weaver Date: Fri, 19 Sep 2025 14:36:30 -0400 Subject: [PATCH 1/2] Fix additional field validators package in model generation --- .../tooling/configuration/consumers/model/model_file.py | 2 +- .../consumers/model/test_common_validators.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/datadog_checks_dev/datadog_checks/dev/tooling/configuration/consumers/model/model_file.py b/datadog_checks_dev/datadog_checks/dev/tooling/configuration/consumers/model/model_file.py index e4df4a2ceba89..8dabdaaa0c9f9 100644 --- a/datadog_checks_dev/datadog_checks/dev/tooling/configuration/consumers/model/model_file.py +++ b/datadog_checks_dev/datadog_checks/dev/tooling/configuration/consumers/model/model_file.py @@ -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:') diff --git a/datadog_checks_dev/tests/tooling/configuration/consumers/model/test_common_validators.py b/datadog_checks_dev/tests/tooling/configuration/consumers/model/test_common_validators.py index ec10b56b6a381..cbdce1b8bbfcf 100644 --- a/datadog_checks_dev/tests/tooling/configuration/consumers/model/test_common_validators.py +++ b/datadog_checks_dev/tests/tooling/configuration/consumers/model/test_common_validators.py @@ -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) From 13374b67627f27e0c2ae2cade1fe7fa159bba52c Mon Sep 17 00:00:00 2001 From: Eric Weaver Date: Fri, 19 Sep 2025 15:06:43 -0400 Subject: [PATCH 2/2] Add changelog --- datadog_checks_dev/changelog.d/21409.fixed | 1 + 1 file changed, 1 insertion(+) create mode 100644 datadog_checks_dev/changelog.d/21409.fixed diff --git a/datadog_checks_dev/changelog.d/21409.fixed b/datadog_checks_dev/changelog.d/21409.fixed new file mode 100644 index 0000000000000..2b013959726cf --- /dev/null +++ b/datadog_checks_dev/changelog.d/21409.fixed @@ -0,0 +1 @@ +Fixes InstanceConfig model generation when validators functions are defined in spec.yaml