Skip to content

Commit 16f3e7f

Browse files
committed
Fix findings
1 parent 0185b4b commit 16f3e7f

File tree

2 files changed

+26
-7
lines changed

2 files changed

+26
-7
lines changed

ankaios_sdk/_components/complete_state.py

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,10 @@
6969
from .workload import Workload
7070
from .workload_state import WorkloadStateCollection
7171
from .manifest import Manifest
72-
from ..utils import SUPPORTED_API_VERSION, _to_config_item
72+
from ..utils import SUPPORTED_API_VERSION, _to_config_item, get_logger
73+
74+
75+
logger = get_logger()
7376

7477

7578
class CompleteState:
@@ -95,19 +98,35 @@ def __init__(self,
9598
"""
9699
self._complete_state = _ank_base.CompleteState()
97100
self._set_api_version(SUPPORTED_API_VERSION)
101+
if _proto:
102+
self._complete_state = _proto
103+
logger.debug(
104+
"CompleteState initialized from proto message"
105+
)
106+
return
98107
if manifest:
99108
self._complete_state.desiredState.CopyFrom(
100109
manifest._to_desired_state()
101110
)
111+
logger.debug(
112+
"CompleteState initialized from manifest"
113+
)
114+
return
102115
if configs:
103116
self.set_configs(configs)
117+
logger.debug(
118+
"CompleteState initialized from configs"
119+
)
120+
return
104121
if workloads:
105122
self._complete_state.desiredState.workloads.workloads.clear()
106123
for workload in workloads:
107124
self._complete_state.desiredState.workloads.workloads[
108125
workload.name].CopyFrom(workload._to_proto())
109-
if _proto:
110-
self._complete_state = _proto
126+
logger.debug(
127+
"CompleteState initialized from workloads"
128+
)
129+
return
111130

112131
def __str__(self) -> str:
113132
"""

ankaios_sdk/utils.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"""
3232

3333
import logging
34-
from typing import Union, List, Dict
34+
from typing import Union
3535
from enum import Enum
3636
import threading
3737
from ._protos import _ank_base
@@ -91,7 +91,7 @@ def get_logger(name="Ankaios logger"):
9191
return logger
9292

9393

94-
def _to_config_item(item: Union[str, List, Dict]
94+
def _to_config_item(item: Union[str, list, dict]
9595
) -> _ank_base.ConfigItem:
9696
"""
9797
Returns an ank_base.ConfigItem from a base type.
@@ -102,10 +102,10 @@ def _to_config_item(item: Union[str, List, Dict]
102102
config_item = _ank_base.ConfigItem()
103103
if isinstance(item, str):
104104
config_item.String = item
105-
elif isinstance(item, List):
105+
elif isinstance(item, list):
106106
for value in [_to_config_item(value) for value in item]:
107107
config_item.array.values.append(value)
108-
elif isinstance(item, Dict):
108+
elif isinstance(item, dict):
109109
for key, value in item.items():
110110
config_item.object.fields[key]. \
111111
CopyFrom(_to_config_item(value))

0 commit comments

Comments
 (0)