Skip to content

Commit 6725888

Browse files
author
Andrei Neagu
committed
removed deprecated code
1 parent 0b55b32 commit 6725888

File tree

2 files changed

+16
-10
lines changed

2 files changed

+16
-10
lines changed
Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,21 @@
11
from typing import Final
22

33
from aws_library.ec2._models import AWSTagKey, AWSTagValue
4-
from pydantic import parse_obj_as
4+
from pydantic import TypeAdapter
55

66
DOCKER_STACK_DEPLOY_COMMAND_NAME: Final[str] = "private cluster docker deploy"
7-
DOCKER_STACK_DEPLOY_COMMAND_EC2_TAG_KEY: Final[AWSTagKey] = parse_obj_as(
8-
AWSTagKey, "io.simcore.clusters-keeper.private_cluster_docker_deploy"
9-
)
7+
DOCKER_STACK_DEPLOY_COMMAND_EC2_TAG_KEY: Final[AWSTagKey] = TypeAdapter(
8+
AWSTagKey
9+
).validate_python("io.simcore.clusters-keeper.private_cluster_docker_deploy")
1010

11-
USER_ID_TAG_KEY: Final[AWSTagKey] = parse_obj_as(AWSTagKey, "user_id")
12-
WALLET_ID_TAG_KEY: Final[AWSTagKey] = parse_obj_as(AWSTagKey, "wallet_id")
13-
ROLE_TAG_KEY: Final[AWSTagKey] = parse_obj_as(AWSTagKey, "role")
14-
WORKER_ROLE_TAG_VALUE: Final[AWSTagValue] = parse_obj_as(AWSTagValue, "worker")
15-
MANAGER_ROLE_TAG_VALUE: Final[AWSTagValue] = parse_obj_as(AWSTagValue, "manager")
11+
USER_ID_TAG_KEY: Final[AWSTagKey] = TypeAdapter(AWSTagKey).validate_python("user_id")
12+
WALLET_ID_TAG_KEY: Final[AWSTagKey] = TypeAdapter(AWSTagKey).validate_python(
13+
"wallet_id"
14+
)
15+
ROLE_TAG_KEY: Final[AWSTagKey] = TypeAdapter(AWSTagKey).validate_python("role")
16+
WORKER_ROLE_TAG_VALUE: Final[AWSTagValue] = TypeAdapter(AWSTagValue).validate_python(
17+
"worker"
18+
)
19+
MANAGER_ROLE_TAG_VALUE: Final[AWSTagValue] = TypeAdapter(AWSTagValue).validate_python(
20+
"manager"
21+
)

services/clusters-keeper/tests/unit/conftest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ def mocked_ssm_server_envs(
9898
f"{CLUSTERS_KEEPER_ENV_PREFIX}{k}": (
9999
v.get_secret_value() if isinstance(v, SecretStr) else v
100100
)
101-
for k, v in mocked_ssm_server_settings.dict().items()
101+
for k, v in mocked_ssm_server_settings.model_dump().items()
102102
}
103103
return setenvs_from_dict(monkeypatch, changed_envs)
104104

0 commit comments

Comments
 (0)