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

Fix types for generated config models #15334

Merged
merged 1 commit into from
Jul 27, 2023
Merged

Fix types for generated config models #15334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 0 additions & 1 deletion LICENSE-3rdparty.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ flup-py3,Vendor,BSD-3-Clause,"Copyright (c) 2005, 2006 Allan Saddi <allan@saddi.
foundationdb,PyPI,Apache-2.0,Copyright 2017 FoundationDB
futures,PyPI,PSF,Copyright (c) 2015 Brian Quinlan
gearman,PyPI,Apache-2.0,Copyright 2010 Yelp
immutables,PyPI,Apache-2.0,Copyright 2018-present Contributors to the immutables project.
importlib-metadata,PyPI,Apache-2.0,"Copyright 2017-2019 Jason R. Coombs, Barry Warsaw"
in-toto,PyPI,Apache-2.0,Copyright 2018 New York University
ipaddress,PyPI,PSF,Copyright (c) 2013 Philipp Hagemeister
Expand Down
54 changes: 25 additions & 29 deletions active_directory/datadog_checks/active_directory/config_models/instance.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@

from __future__ import annotations

from typing import Mapping, Optional, Sequence, Union
from types import MappingProxyType
from typing import Optional, Union

from pydantic import BaseModel, ConfigDict, Field, field_validator, model_validator
from typing_extensions import Literal
Expand All @@ -22,6 +23,7 @@

class Counter(BaseModel):
model_config = ConfigDict(
arbitrary_types_allowed=True,
extra='allow',
frozen=True,
)
Expand All @@ -34,6 +36,7 @@ class Counter(BaseModel):

class InstanceCounts(BaseModel):
model_config = ConfigDict(
arbitrary_types_allowed=True,
frozen=True,
)
monitored: Optional[str] = None
Expand All @@ -43,11 +46,12 @@ class InstanceCounts(BaseModel):

class ExtraMetrics(BaseModel):
model_config = ConfigDict(
arbitrary_types_allowed=True,
frozen=True,
)
counters: Sequence[Mapping[str, Union[str, Counter]]]
exclude: Optional[Sequence[str]] = None
include: Optional[Sequence[str]] = None
counters: tuple[MappingProxyType[str, Union[str, Counter]], ...]
exclude: Optional[tuple[str, ...]] = None
include: Optional[tuple[str, ...]] = None
instance_counts: Optional[InstanceCounts] = None
name: str
tag_name: Optional[str] = None
Expand All @@ -56,19 +60,21 @@ class ExtraMetrics(BaseModel):

class MetricPatterns(BaseModel):
model_config = ConfigDict(
arbitrary_types_allowed=True,
frozen=True,
)
exclude: Optional[Sequence[str]] = None
include: Optional[Sequence[str]] = None
exclude: Optional[tuple[str, ...]] = None
include: Optional[tuple[str, ...]] = None


class Metrics(BaseModel):
model_config = ConfigDict(
arbitrary_types_allowed=True,
frozen=True,
)
counters: Sequence[Mapping[str, Union[str, Counter]]]
exclude: Optional[Sequence[str]] = None
include: Optional[Sequence[str]] = None
counters: tuple[MappingProxyType[str, Union[str, Counter]], ...]
exclude: Optional[tuple[str, ...]] = None
include: Optional[tuple[str, ...]] = None
instance_counts: Optional[InstanceCounts] = None
name: str
tag_name: Optional[str] = None
Expand All @@ -78,24 +84,25 @@ class Metrics(BaseModel):
class InstanceConfig(BaseModel):
model_config = ConfigDict(
validate_default=True,
arbitrary_types_allowed=True,
frozen=True,
)
additional_metrics: Optional[Sequence[Sequence[str]]] = None
counter_data_types: Optional[Sequence[str]] = None
additional_metrics: Optional[tuple[tuple[str, ...], ...]] = None
counter_data_types: Optional[tuple[str, ...]] = None
disable_generic_tags: Optional[bool] = None
empty_default_hostname: Optional[bool] = None
enable_health_service_check: Optional[bool] = None
extra_metrics: Optional[Mapping[str, ExtraMetrics]] = None
extra_metrics: Optional[MappingProxyType[str, ExtraMetrics]] = None
host: Optional[str] = None
metric_patterns: Optional[MetricPatterns] = None
metrics: Optional[Mapping[str, Metrics]] = None
metrics: Optional[MappingProxyType[str, Metrics]] = None
min_collection_interval: Optional[float] = None
namespace: Optional[str] = Field(None, pattern='\\w*')
password: Optional[str] = None
server: Optional[str] = None
server_tag: Optional[str] = None
service: Optional[str] = None
tags: Optional[Sequence[str]] = None
tags: Optional[tuple[str, ...]] = None
use_legacy_check_version: Optional[bool] = None
username: Optional[str] = None

Expand All @@ -104,25 +111,14 @@ def _initial_validation(cls, values):
return validation.core.initialize_config(getattr(validators, 'initialize_instance', identity)(values))

@field_validator('*', mode='before')
def _ensure_defaults(cls, value, info):
def _validate(cls, value, info):
field = cls.model_fields[info.field_name]
field_name = field.alias or info.field_name
if field_name in info.context['configured_fields']:
return value
value = getattr(validators, f'instance_{info.field_name}', identity)(value, field=field)
else:
value = getattr(defaults, f'instance_{info.field_name}', lambda: value)()

return getattr(defaults, f'instance_{info.field_name}', lambda: value)()

@field_validator('*')
def _run_validations(cls, value, info):
field = cls.model_fields[info.field_name]
field_name = field.alias or info.field_name
if field_name not in info.context['configured_fields']:
return value

return getattr(validators, f'instance_{info.field_name}', identity)(value, field=field)

@field_validator('*', mode='after')
def _make_immutable(cls, value):
return validation.utils.make_immutable(value)

@model_validator(mode='after')
Expand Down
20 changes: 5 additions & 15 deletions active_directory/datadog_checks/active_directory/config_models/shared.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
class SharedConfig(BaseModel):
model_config = ConfigDict(
validate_default=True,
arbitrary_types_allowed=True,
frozen=True,
)
service: Optional[str] = None
Expand All @@ -32,25 +33,14 @@ def _initial_validation(cls, values):
return validation.core.initialize_config(getattr(validators, 'initialize_shared', identity)(values))

@field_validator('*', mode='before')
def _ensure_defaults(cls, value, info):
def _validate(cls, value, info):
field = cls.model_fields[info.field_name]
field_name = field.alias or info.field_name
if field_name in info.context['configured_fields']:
return value
value = getattr(validators, f'shared_{info.field_name}', identity)(value, field=field)
else:
value = getattr(defaults, f'shared_{info.field_name}', lambda: value)()

return getattr(defaults, f'shared_{info.field_name}', lambda: value)()

@field_validator('*')
def _run_validations(cls, value, info):
field = cls.model_fields[info.field_name]
field_name = field.alias or info.field_name
if field_name not in info.context['configured_fields']:
return value

return getattr(validators, f'shared_{info.field_name}', identity)(value, field=field)

@field_validator('*', mode='after')
def _make_immutable(cls, value):
return validation.utils.make_immutable(value)

@model_validator(mode='after')
Expand Down
24 changes: 7 additions & 17 deletions activemq/datadog_checks/activemq/config_models/instance.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

from __future__ import annotations

from typing import Optional, Sequence
from typing import Optional

from pydantic import BaseModel, ConfigDict, field_validator, model_validator

Expand All @@ -22,6 +22,7 @@
class InstanceConfig(BaseModel):
model_config = ConfigDict(
validate_default=True,
arbitrary_types_allowed=True,
frozen=True,
)
collect_default_jvm_metrics: Optional[bool] = None
Expand All @@ -42,7 +43,7 @@ class InstanceConfig(BaseModel):
rmi_connection_timeout: Optional[float] = None
rmi_registry_ssl: Optional[bool] = None
service: Optional[str] = None
tags: Optional[Sequence[str]] = None
tags: Optional[tuple[str, ...]] = None
tools_jar_path: Optional[str] = None
trust_store_password: Optional[str] = None
trust_store_path: Optional[str] = None
Expand All @@ -53,25 +54,14 @@ def _initial_validation(cls, values):
return validation.core.initialize_config(getattr(validators, 'initialize_instance', identity)(values))

@field_validator('*', mode='before')
def _ensure_defaults(cls, value, info):
def _validate(cls, value, info):
field = cls.model_fields[info.field_name]
field_name = field.alias or info.field_name
if field_name in info.context['configured_fields']:
return value
value = getattr(validators, f'instance_{info.field_name}', identity)(value, field=field)
else:
value = getattr(defaults, f'instance_{info.field_name}', lambda: value)()

return getattr(defaults, f'instance_{info.field_name}', lambda: value)()

@field_validator('*')
def _run_validations(cls, value, info):
field = cls.model_fields[info.field_name]
field_name = field.alias or info.field_name
if field_name not in info.context['configured_fields']:
return value

return getattr(validators, f'instance_{info.field_name}', identity)(value, field=field)

@field_validator('*', mode='after')
def _make_immutable(cls, value):
return validation.utils.make_immutable(value)

@model_validator(mode='after')
Expand Down
25 changes: 8 additions & 17 deletions activemq/datadog_checks/activemq/config_models/shared.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@

from __future__ import annotations

from typing import Any, Mapping, Optional, Sequence
from types import MappingProxyType
from typing import Any, Optional

from pydantic import BaseModel, ConfigDict, field_validator, model_validator

Expand All @@ -22,10 +23,11 @@
class SharedConfig(BaseModel):
model_config = ConfigDict(
validate_default=True,
arbitrary_types_allowed=True,
frozen=True,
)
collect_default_metrics: Optional[bool] = None
conf: Optional[Sequence[Mapping[str, Any]]] = None
conf: Optional[tuple[MappingProxyType[str, Any], ...]] = None
is_jmx: bool
new_gc_metrics: Optional[bool] = None
service: Optional[str] = None
Expand All @@ -36,25 +38,14 @@ def _initial_validation(cls, values):
return validation.core.initialize_config(getattr(validators, 'initialize_shared', identity)(values))

@field_validator('*', mode='before')
def _ensure_defaults(cls, value, info):
def _validate(cls, value, info):
field = cls.model_fields[info.field_name]
field_name = field.alias or info.field_name
if field_name in info.context['configured_fields']:
return value
value = getattr(validators, f'shared_{info.field_name}', identity)(value, field=field)
else:
value = getattr(defaults, f'shared_{info.field_name}', lambda: value)()

return getattr(defaults, f'shared_{info.field_name}', lambda: value)()

@field_validator('*')
def _run_validations(cls, value, info):
field = cls.model_fields[info.field_name]
field_name = field.alias or info.field_name
if field_name not in info.context['configured_fields']:
return value

return getattr(validators, f'shared_{info.field_name}', identity)(value, field=field)

@field_validator('*', mode='after')
def _make_immutable(cls, value):
return validation.utils.make_immutable(value)

@model_validator(mode='after')
Expand Down
Loading