Use new Podman flags for healthcheck

Relevant Podman documentation here:
https://docs.podman.io/en/v5.4.0/markdown/podman-healthcheck-run.1.html

Signed-off-by: Robin Syl <robin@robinsyl.dev>
Signed-off-by: Monika Kairaityte <monika@kibit.lt>

Author: recursiveribbons

newsfragments/add-start_interval-in-healthcheck.misc

@@ -0,0 +1,2 @@
+Add support for `start_interval` option.
+Rename healthcheck flags to be consistent with Podman options.

podman_compose.py

@@ -1286,7 +1286,7 @@ async def container_to_args(
         if isinstance(healthcheck_test, str):
             # podman does not add shell to handle command with whitespace
             podman_args.extend([
-                "--healthcheck-command",
+                "--health-cmd",
                 json.dumps(["CMD-SHELL", healthcheck_test]),
             ])
         elif is_list(healthcheck_test):
@@ -1296,11 +1296,11 @@ async def container_to_args(
             if healthcheck_type == "NONE":
                 podman_args.append("--no-healthcheck")
             elif healthcheck_type == "CMD":
-                podman_args.extend(["--healthcheck-command", json.dumps(healthcheck_test)])
+                podman_args.extend(["--health-cmd", json.dumps(healthcheck_test)])
             elif healthcheck_type == "CMD-SHELL":
                 if len(healthcheck_test) != 1:
                     raise ValueError("'CMD_SHELL' takes a single string after it")
-                podman_args.extend(["--healthcheck-command", json.dumps(healthcheck_test)])
+                podman_args.extend(["--health-cmd", json.dumps(healthcheck_test)])
             else:
                 raise ValueError(
                     f"unknown healthcheck test type [{healthcheck_type}],\
@@ -1311,15 +1311,15 @@ async def container_to_args(
 
     # interval, timeout and start_period are specified as durations.
     if "interval" in healthcheck:
-        podman_args.extend(["--healthcheck-interval", healthcheck["interval"]])
+        podman_args.extend(["--health-interval", healthcheck["interval"]])
     if "timeout" in healthcheck:
-        podman_args.extend(["--healthcheck-timeout", healthcheck["timeout"]])
+        podman_args.extend(["--health-timeout", healthcheck["timeout"]])
     if "start_period" in healthcheck:
-        podman_args.extend(["--healthcheck-start-period", healthcheck["start_period"]])
+        podman_args.extend(["--health-start-period", healthcheck["start_period"]])
 
     # convert other parameters to string
     if "retries" in healthcheck:
-        podman_args.extend(["--healthcheck-retries", str(healthcheck["retries"])])
+        podman_args.extend(["--health-retries", str(healthcheck["retries"])])
 
     # handle podman extension
     if 'x-podman' in cnt:

tests/unit/test_container_to_args.py

@@ -889,7 +889,7 @@ async def test_healthcheck_string(self) -> None:
                 "--name=project_name_service_name1",
                 "-d",
                 "--network=bridge:alias=service_name",
-                "--healthcheck-command",
+                "--health-cmd",
                 '["CMD-SHELL", "cmd arg1 arg2"]',
                 "busybox",
             ],
@@ -909,7 +909,7 @@ async def test_healthcheck_cmd_args(self) -> None:
                 "--name=project_name_service_name1",
                 "-d",
                 "--network=bridge:alias=service_name",
-                "--healthcheck-command",
+                "--health-cmd",
                 '["cmd", "arg1", "arg2"]',
                 "busybox",
             ],
@@ -929,7 +929,7 @@ async def test_healthcheck_cmd_shell(self) -> None:
                 "--name=project_name_service_name1",
                 "-d",
                 "--network=bridge:alias=service_name",
-                "--healthcheck-command",
+                "--health-cmd",
                 '["cmd arg1 arg2"]',
                 "busybox",
             ],