diff --git a/services/telemetryrouter/oas_commit b/services/telemetryrouter/oas_commit index 9df10dbb7..8ae9a8db5 100644 --- a/services/telemetryrouter/oas_commit +++ b/services/telemetryrouter/oas_commit @@ -1 +1 @@ -704bc151ecb2fa86e14ed14e7066163b24c08138 +e9fe931e91e0b8f067d5c12518398a52062ca794 diff --git a/services/telemetryrouter/src/stackit/telemetryrouter/models/access_token_base_request.py b/services/telemetryrouter/src/stackit/telemetryrouter/models/access_token_base_request.py index 90dd8e29b..387cf27ea 100644 --- a/services/telemetryrouter/src/stackit/telemetryrouter/models/access_token_base_request.py +++ b/services/telemetryrouter/src/stackit/telemetryrouter/models/access_token_base_request.py @@ -40,6 +40,19 @@ class AccessTokenBaseRequest(BaseModel): ) __properties: ClassVar[List[str]] = ["description", "displayName", "ttl"] + @field_validator("description") + def description_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"^([a-zA-Z0-9][a-zA-Z0-9 \-]*)?$", value): + raise ValueError(r"must validate the regular expression /^([a-zA-Z0-9][a-zA-Z0-9 \-]*)?$/") + return value + @field_validator("display_name") def display_name_validate_regular_expression(cls, value): """Validates the regular expression""" diff --git a/services/telemetryrouter/src/stackit/telemetryrouter/models/access_token_base_response.py b/services/telemetryrouter/src/stackit/telemetryrouter/models/access_token_base_response.py index 319aca477..5521a2c2b 100644 --- a/services/telemetryrouter/src/stackit/telemetryrouter/models/access_token_base_response.py +++ b/services/telemetryrouter/src/stackit/telemetryrouter/models/access_token_base_response.py @@ -46,6 +46,19 @@ class AccessTokenBaseResponse(BaseModel): status: StrictStr __properties: ClassVar[List[str]] = ["creatorId", "description", "displayName", "expirationTime", "id", "status"] + @field_validator("description") + def description_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"^([a-zA-Z0-9][a-zA-Z0-9 \-]*)?$", value): + raise ValueError(r"must validate the regular expression /^([a-zA-Z0-9][a-zA-Z0-9 \-]*)?$/") + return value + @field_validator("display_name") def display_name_validate_regular_expression(cls, value): """Validates the regular expression""" diff --git a/services/telemetryrouter/src/stackit/telemetryrouter/models/create_access_token_payload.py b/services/telemetryrouter/src/stackit/telemetryrouter/models/create_access_token_payload.py index d2a415b06..5aaed1d4c 100644 --- a/services/telemetryrouter/src/stackit/telemetryrouter/models/create_access_token_payload.py +++ b/services/telemetryrouter/src/stackit/telemetryrouter/models/create_access_token_payload.py @@ -40,6 +40,19 @@ class CreateAccessTokenPayload(BaseModel): ) __properties: ClassVar[List[str]] = ["description", "displayName", "ttl"] + @field_validator("description") + def description_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"^([a-zA-Z0-9][a-zA-Z0-9 \-]*)?$", value): + raise ValueError(r"must validate the regular expression /^([a-zA-Z0-9][a-zA-Z0-9 \-]*)?$/") + return value + @field_validator("display_name") def display_name_validate_regular_expression(cls, value): """Validates the regular expression""" diff --git a/services/telemetryrouter/src/stackit/telemetryrouter/models/create_access_token_response.py b/services/telemetryrouter/src/stackit/telemetryrouter/models/create_access_token_response.py index 289c25f83..67df071f4 100644 --- a/services/telemetryrouter/src/stackit/telemetryrouter/models/create_access_token_response.py +++ b/services/telemetryrouter/src/stackit/telemetryrouter/models/create_access_token_response.py @@ -55,6 +55,19 @@ class CreateAccessTokenResponse(BaseModel): "accessToken", ] + @field_validator("description") + def description_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"^([a-zA-Z0-9][a-zA-Z0-9 \-]*)?$", value): + raise ValueError(r"must validate the regular expression /^([a-zA-Z0-9][a-zA-Z0-9 \-]*)?$/") + return value + @field_validator("display_name") def display_name_validate_regular_expression(cls, value): """Validates the regular expression""" diff --git a/services/telemetryrouter/src/stackit/telemetryrouter/models/destination_response.py b/services/telemetryrouter/src/stackit/telemetryrouter/models/destination_response.py index c6b9a703b..09baf467c 100644 --- a/services/telemetryrouter/src/stackit/telemetryrouter/models/destination_response.py +++ b/services/telemetryrouter/src/stackit/telemetryrouter/models/destination_response.py @@ -74,6 +74,19 @@ def credential_type_validate_enum(cls, value): raise ValueError("must be one of enum values ('bearerToken', 'basicAuth', 'accessKey')") return value + @field_validator("description") + def description_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"^([a-zA-Z0-9][a-zA-Z0-9 \-]*)?$", value): + raise ValueError(r"must validate the regular expression /^([a-zA-Z0-9][a-zA-Z0-9 \-]*)?$/") + return value + @field_validator("display_name") def display_name_validate_regular_expression(cls, value): """Validates the regular expression""" diff --git a/services/telemetryrouter/src/stackit/telemetryrouter/models/get_access_token_response.py b/services/telemetryrouter/src/stackit/telemetryrouter/models/get_access_token_response.py index 9053aa434..8662da0be 100644 --- a/services/telemetryrouter/src/stackit/telemetryrouter/models/get_access_token_response.py +++ b/services/telemetryrouter/src/stackit/telemetryrouter/models/get_access_token_response.py @@ -46,6 +46,19 @@ class GetAccessTokenResponse(BaseModel): status: StrictStr __properties: ClassVar[List[str]] = ["creatorId", "description", "displayName", "expirationTime", "id", "status"] + @field_validator("description") + def description_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"^([a-zA-Z0-9][a-zA-Z0-9 \-]*)?$", value): + raise ValueError(r"must validate the regular expression /^([a-zA-Z0-9][a-zA-Z0-9 \-]*)?$/") + return value + @field_validator("display_name") def display_name_validate_regular_expression(cls, value): """Validates the regular expression""" diff --git a/services/telemetryrouter/src/stackit/telemetryrouter/models/telemetry_router_response.py b/services/telemetryrouter/src/stackit/telemetryrouter/models/telemetry_router_response.py index 934467361..7c4e59b1c 100644 --- a/services/telemetryrouter/src/stackit/telemetryrouter/models/telemetry_router_response.py +++ b/services/telemetryrouter/src/stackit/telemetryrouter/models/telemetry_router_response.py @@ -59,6 +59,19 @@ def creation_time_change_year_zero_to_one(cls, value): return "0001" + value[4:] # Take "0001" and append the rest of the string return value + @field_validator("description") + def description_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"^([a-zA-Z0-9][a-zA-Z0-9 \-]*)?$", value): + raise ValueError(r"must validate the regular expression /^([a-zA-Z0-9][a-zA-Z0-9 \-]*)?$/") + return value + @field_validator("display_name") def display_name_validate_regular_expression(cls, value): """Validates the regular expression""" diff --git a/services/telemetryrouter/src/stackit/telemetryrouter/models/update_access_token_payload.py b/services/telemetryrouter/src/stackit/telemetryrouter/models/update_access_token_payload.py index 7e7a10040..28ff31807 100644 --- a/services/telemetryrouter/src/stackit/telemetryrouter/models/update_access_token_payload.py +++ b/services/telemetryrouter/src/stackit/telemetryrouter/models/update_access_token_payload.py @@ -34,6 +34,19 @@ class UpdateAccessTokenPayload(BaseModel): ) __properties: ClassVar[List[str]] = ["description", "displayName"] + @field_validator("description") + def description_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"^([a-zA-Z0-9][a-zA-Z0-9 \-]*)?$", value): + raise ValueError(r"must validate the regular expression /^([a-zA-Z0-9][a-zA-Z0-9 \-]*)?$/") + return value + @field_validator("display_name") def display_name_validate_regular_expression(cls, value): """Validates the regular expression""" diff --git a/services/telemetryrouter/src/stackit/telemetryrouter/models/update_access_token_response.py b/services/telemetryrouter/src/stackit/telemetryrouter/models/update_access_token_response.py index e82063312..3aa7ec4d7 100644 --- a/services/telemetryrouter/src/stackit/telemetryrouter/models/update_access_token_response.py +++ b/services/telemetryrouter/src/stackit/telemetryrouter/models/update_access_token_response.py @@ -46,6 +46,19 @@ class UpdateAccessTokenResponse(BaseModel): status: StrictStr __properties: ClassVar[List[str]] = ["creatorId", "description", "displayName", "expirationTime", "id", "status"] + @field_validator("description") + def description_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"^([a-zA-Z0-9][a-zA-Z0-9 \-]*)?$", value): + raise ValueError(r"must validate the regular expression /^([a-zA-Z0-9][a-zA-Z0-9 \-]*)?$/") + return value + @field_validator("display_name") def display_name_validate_regular_expression(cls, value): """Validates the regular expression""" diff --git a/services/telemetryrouter/uv.lock b/services/telemetryrouter/uv.lock index 5cbc88cef..21a1c38e6 100644 --- a/services/telemetryrouter/uv.lock +++ b/services/telemetryrouter/uv.lock @@ -1057,7 +1057,7 @@ dev = [ [[package]] name = "stackit-telemetryrouter" -version = "0.4.0" +version = "0.5.0" source = { editable = "." } dependencies = [ { name = "pydantic" },