diff --git a/services/alb/oas_commit b/services/alb/oas_commit index 7d368bd2a..42d3f2f4f 100644 --- a/services/alb/oas_commit +++ b/services/alb/oas_commit @@ -1 +1 @@ -1deab1542e767cd08525dfd6c2cd0b65b9c923c3 +79a99bf8bc8175f2f384c7636da1fae5f6a9bd60 diff --git a/services/alb/src/stackit/alb/models/loadbalancer_option_access_control.py b/services/alb/src/stackit/alb/models/loadbalancer_option_access_control.py index b5f5ff138..9da554579 100644 --- a/services/alb/src/stackit/alb/models/loadbalancer_option_access_control.py +++ b/services/alb/src/stackit/alb/models/loadbalancer_option_access_control.py @@ -15,24 +15,43 @@ import json import pprint +import re # noqa: F401 from typing import Any, ClassVar, Dict, List, Optional, Set -from pydantic import BaseModel, ConfigDict, Field, StrictStr +from pydantic import BaseModel, ConfigDict, Field, StrictStr, field_validator from pydantic_core import to_jsonable_python -from typing_extensions import Self +from typing_extensions import Annotated, Self class LoadbalancerOptionAccessControl(BaseModel): """ - Use this option to limit the IP ranges that can use the Application Load Balancer. + Use this option to limit the IP ranges that can use the Application Load Balancer. `allowed_source_ranges` and `ip_block_list_name` may be set together. When both are set, `allowed_source_ranges` is evaluated first, then `ip_block_list_name` is evaluated. """ # noqa: E501 allowed_source_ranges: Optional[List[StrictStr]] = Field( default=None, - description="Application Load Balancer is accessible only from an IP address in this range", + description="Application Load Balancer is accessible only from an IP address in this range. May be combined with `ipBlockListName`; `allowedSourceRanges` is evaluated first, then `ipBlockListName`.", alias="allowedSourceRanges", ) - __properties: ClassVar[List[str]] = ["allowedSourceRanges"] + ip_block_list_name: Optional[Annotated[str, Field(strict=True)]] = Field( + default=None, + description='Reference to an IP block list by name. Traffic originating from any IP in the referenced list is denied access to the Application Load Balancer. See "IP Lists API" for how to manage IP block lists. May be combined with `allowedSourceRanges`; `allowedSourceRanges` is evaluated first, then `ipBlockListName`.', + alias="ipBlockListName", + ) + __properties: ClassVar[List[str]] = ["allowedSourceRanges", "ipBlockListName"] + + @field_validator("ip_block_list_name") + def ip_block_list_name_validate_regular_expression(cls, value): + """Validates the regular expression""" + if value is None: + return value + + if not isinstance(value, str): + value = str(value) + + if not re.match(r"^[0-9a-z](?:(?:[0-9a-z]|-){0,49}[0-9a-z])?$", value): + raise ValueError(r"must validate the regular expression /^[0-9a-z](?:(?:[0-9a-z]|-){0,49}[0-9a-z])?$/") + return value model_config = ConfigDict( validate_by_name=True, @@ -82,5 +101,7 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: if not isinstance(obj, dict): return cls.model_validate(obj) - _obj = cls.model_validate({"allowedSourceRanges": obj.get("allowedSourceRanges")}) + _obj = cls.model_validate( + {"allowedSourceRanges": obj.get("allowedSourceRanges"), "ipBlockListName": obj.get("ipBlockListName")} + ) return _obj