Skip to content

Commit d0a9b95

Browse files
authored
Fixes InstanceConfig model generation when validators functions are defined in spec.yaml (DataDog#21409)
* Fix additional field validators package in model generation * Add changelog
1 parent f094e1a commit d0a9b95

3 files changed

Lines changed: 6 additions & 5 deletions

File tree

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fixes InstanceConfig model generation when validators functions are defined in spec.yaml

datadog_checks_dev/datadog_checks/dev/tooling/configuration/consumers/model/model_file.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ def _define_validator_functions(model_id, validator_data, need_defaults):
162162
model_file_lines.append('')
163163
model_file_lines.append(f' if info.field_name == {option_name!r}:')
164164
for import_path in import_paths:
165-
model_file_lines.append(f' value = validation.{import_path}(value, field=field)')
165+
model_file_lines.append(f' value = validators.{import_path}(value, field=field)')
166166

167167
if need_defaults:
168168
model_file_lines.append(' else:')

datadog_checks_dev/tests/tooling/configuration/consumers/model/test_common_validators.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,12 +99,12 @@ def _validate(cls, value, info):
9999
value = getattr(validators, f'instance_{info.field_name}', identity)(value, field=field)
100100
101101
if info.field_name == 'foo':
102-
value = validation.pkg.subpkg2.validate2(value, field=field)
103-
value = validation.pkg.subpkg2.validate1(value, field=field)
102+
value = validators.pkg.subpkg2.validate2(value, field=field)
103+
value = validators.pkg.subpkg2.validate1(value, field=field)
104104
105105
if info.field_name == 'tags':
106-
value = validation.pkg.subpkg1.validate2(value, field=field)
107-
value = validation.pkg.subpkg1.validate1(value, field=field)
106+
value = validators.pkg.subpkg1.validate2(value, field=field)
107+
value = validators.pkg.subpkg1.validate1(value, field=field)
108108
109109
return validation.utils.make_immutable(value)
110110

0 commit comments

Comments
 (0)