Skip to content

Commit 1c22f61

Browse files
committed
Address review comments
1 parent 2beb32d commit 1c22f61

File tree

4 files changed

+14
-2
lines changed

4 files changed

+14
-2
lines changed

src/cloudai/_core/json_gen_strategy.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,12 @@ def sanitize_k8s_job_name(self, job_name: str) -> str:
5656
sanitized_name = re.sub(r"[^a-z0-9-]", "-", sanitized_name)
5757
sanitized_name = re.sub(r"^[^a-z0-9]+", "", sanitized_name)
5858
sanitized_name = re.sub(r"[^a-z0-9]+$", "", sanitized_name)
59-
return sanitized_name[:253]
59+
final_name = sanitized_name[:253]
60+
61+
if not final_name:
62+
raise ValueError(f"'{job_name}' cannot be sanitized to a valid Kubernetes job name.")
63+
64+
return final_name
6065

6166
def store_test_run(self) -> None:
6267
from cloudai.models.scenario import TestRunDetails

src/cloudai/systems/kubernetes/kubernetes_system.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,7 @@ def _delete_batch_job(self, job_name: str) -> None:
449449
)
450450
raise
451451

452-
api_response = cast("k8s.client.V1Job", api_response)
452+
api_response = cast("k8s.client.V1Status", api_response)
453453
logging.debug(f"Batch job '{job_name}' deleted with status: {api_response.status}")
454454

455455
def _delete_dynamo_graph_deployment(self, job_name: str) -> None:

tests/json_gen_strategy/test_common_kubernetes.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,3 +41,10 @@ def test_job_name_sanitization(k8s_system: KubernetesSystem, base_tr: TestRun, t
4141
base_tr.name = tname
4242
json_gen = MyJsonGenStrategy(k8s_system, base_tr)
4343
assert json_gen.sanitize_k8s_job_name(base_tr.name) == expected
44+
45+
46+
def test_job_name_sanitization_raises(k8s_system: KubernetesSystem, base_tr: TestRun) -> None:
47+
base_tr.name = "!@#$%^&*()"
48+
json_gen = MyJsonGenStrategy(k8s_system, base_tr)
49+
with pytest.raises(ValueError):
50+
json_gen.sanitize_k8s_job_name(base_tr.name)

tests/json_gen_strategy/test_sleep_kubernetes_json_gen_strategy copy.py renamed to tests/json_gen_strategy/test_sleep_kubernetes_json_gen_strategy.py

File renamed without changes.

0 commit comments

Comments
 (0)