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: scientific notation integer parsing in config #1662

Merged
merged 2 commits into from
Oct 23, 2023
Merged

fix: scientific notation integer parsing in config #1662

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c8f792e
fix: scientific notation integer parsing in config
olevski Oct 11, 2023
84705f3
Merge branch 'master' into fix-config-integer-parsing
olevski Oct 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 7 additions & 10 deletions git_services/git_services/sidecar/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,16 @@
from dataclasses import dataclass
from pathlib import Path
from typing import Any, Callable, Text, TypeVar, Union
from typing import Any, Text, TypeVar, Union

import dataconf

from git_services.cli.sentry import SentryConfig


def _parse_value_as_numeric(val: Any, parse_to: Callable) -> Union[float, int]:
output = parse_to(val)
if type(output) is not float and type(output) is not int:
raise ValueError(
f"parse_to should convert to float or int, it returned type {type(output)}"
)
return output
def _parse_value_as_int(val: Any) -> int:
# NOTE: That int() does not understand scientific notation
# even stuff that is "technically" an integer like 3e10, but float does understand it
return int(float(val))


PathType = TypeVar("PathType", bound=Path)
Expand All @@ -29,8 +26,8 @@ class Config:
git_proxy_health_port: Union[Text, int] = 8081

def __post_init__(self):
self.port = _parse_value_as_numeric(self.port, int)
self.git_proxy_health_port = _parse_value_as_numeric(self.git_proxy_health_port, int)
self.port = _parse_value_as_int(self.port)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

question (non-blocking): Do ports actually have this issue, since they only go to 65535?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably not but I am not sure at what value k8s decides to convert large ints to scientific notation

self.git_proxy_health_port = _parse_value_as_int(self.git_proxy_health_port)
if isinstance(self.mount_path, str):
self.mount_path = Path(self.mount_path)

Expand Down
39 changes: 20 additions & 19 deletions renku_notebooks/config/dynamic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from dataclasses import dataclass, field
from typing import Any, Callable, Dict, List, Optional, Text, Union
from typing import Any, Dict, List, Optional, Text, Union

import yaml

Expand All @@ -17,13 +17,14 @@ def _parse_str_as_bool(val: Union[str, bool]) -> bool:
raise ValueError(f"Unsupported data type received, expected str or bool, got {type(val)}")


def _parse_value_as_numeric(val: Any, parse_to: Callable) -> Union[float, int]:
output = parse_to(val)
if type(output) is not float and type(output) is not int:
raise ValueError(
f"parse_to should convert to float or int, it returned type {type(output)}"
)
return output
def _parse_value_as_int(val: Any) -> int:
# NOTE: That int() does not understand scientific notation
# even stuff that is "technically" an integer like 3e10, but float does understand it
return int(float(val))


def _parse_value_as_float(val: Any) -> float:
return float(val)


@dataclass
Expand All @@ -49,7 +50,7 @@ class _SentryConfig:

def __post_init__(self):
self.enabled = _parse_str_as_bool(self.enabled)
self.sample_rate = _parse_value_as_numeric(self.sample_rate, float)
self.sample_rate = _parse_value_as_float(self.sample_rate)


@dataclass
Expand All @@ -68,8 +69,8 @@ class _GitProxyConfig:
renku_client_id: Text = "renku"

def __post_init__(self):
self.port = _parse_value_as_numeric(self.port, int)
self.health_port = _parse_value_as_numeric(self.health_port, int)
self.port = _parse_value_as_int(self.port)
self.health_port = _parse_value_as_int(self.health_port)


@dataclass
Expand All @@ -80,7 +81,7 @@ class _GitRpcServerConfig:
sentry: _SentryConfig = field(default_factory=lambda: _SentryConfig(enabled=False))

def __post_init__(self):
self.port = _parse_value_as_numeric(self.port, int)
self.port = _parse_value_as_int(self.port)


@dataclass
Expand Down Expand Up @@ -151,11 +152,11 @@ class _GenericCullingConfig:
hibernated_seconds: Union[Text, int] = 86400

def __post_init__(self):
self.idle_seconds = _parse_value_as_numeric(self.idle_seconds, int)
self.max_age_seconds = _parse_value_as_numeric(self.max_age_seconds, int)
self.pending_seconds = _parse_value_as_numeric(self.pending_seconds, int)
self.failed_seconds = _parse_value_as_numeric(self.failed_seconds, int)
self.hibernated_seconds = _parse_value_as_numeric(self.hibernated_seconds, int)
self.idle_seconds = _parse_value_as_int(self.idle_seconds)
self.max_age_seconds = _parse_value_as_int(self.max_age_seconds)
self.pending_seconds = _parse_value_as_int(self.pending_seconds)
self.failed_seconds = _parse_value_as_int(self.failed_seconds)
self.hibernated_seconds = _parse_value_as_int(self.hibernated_seconds)


@dataclass
Expand All @@ -180,8 +181,8 @@ class _SessionSshConfig:

def __post_init__(self):
self.enabled = _parse_str_as_bool(self.enabled)
self.service_port = _parse_value_as_numeric(self.service_port, int)
self.container_port = _parse_value_as_numeric(self.container_port, int)
self.service_port = _parse_value_as_int(self.service_port)
self.container_port = _parse_value_as_int(self.container_port)


@dataclass
Expand Down
Loading