extern/podman-compose
1
0
Fork 1
mirror of https://github.com/containers/podman-compose.git synced 2025-04-30 20:34:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix handling of --in-pod argument

Browse Source 
Currently --in-pod handling is broken because the only way to set False
is by providing empty argument like "--in-pod=". As of Python 3.7 the
solution is to accept string and parse manually.

Co-authored-by: Randolph Sapp <res.sapp@gmail.com>
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
This commit is contained in:
Povilas Kanapickas 2024-04-28 21:12:20 +03:00
parent 58641f0545
commit 70a0e2d003
4 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
podman_compose.py
View File

@ -346,7 +346,7 @@ def norm_ulimit(inner_value):
def transform(args, project_name, given_containers): def transform(args, project_name, given_containers):
if not args.in_pod: if not args.in_pod_bool:
pod_name = None pod_name = None
pods = [] pods = []
else: else:
@ -1911,6 +1911,13 @@ class PodmanCompose:
for cmd_parser in cmd._parse_args: # pylint: disable=protected-access for cmd_parser in cmd._parse_args: # pylint: disable=protected-access
cmd_parser(subparser) cmd_parser(subparser)
self.global_args = parser.parse_args() self.global_args = parser.parse_args()
if self.global_args.in_pod.lower() not in ('', 'true', '1', 'false', '0'):
raise ValueError(
f'Invalid --in-pod value: \'{self.global_args.in_pod}\'. '
'It must be set to either of: empty value, true, 1, false, 0'
)
self.global_args.in_pod_bool = self.global_args.in_pod.lower() in ('', 'true', '1')
if self.global_args.version: if self.global_args.version:
self.global_args.command = "version" self.global_args.command = "version"
if not self.global_args.command or self.global_args.command == "help": if not self.global_args.command or self.global_args.command == "help":
@ -1927,8 +1934,8 @@ class PodmanCompose:
"--in-pod", "--in-pod",
help="pod creation", help="pod creation",
metavar="in_pod", metavar="in_pod",
type=bool, type=str,
default=True, default="true",
) )
parser.add_argument( parser.add_argument(
"--pod-args", "--pod-args",

2
pytests/test_can_merge_build.py
View File

@ -127,7 +127,7 @@ def set_args(podman_compose: PodmanCompose, file_names: list[str]) -> None:
podman_compose.global_args.project_name = None podman_compose.global_args.project_name = None
podman_compose.global_args.env_file = None podman_compose.global_args.env_file = None
podman_compose.global_args.profile = [] podman_compose.global_args.profile = []
podman_compose.global_args.in_pod = True podman_compose.global_args.in_pod_bool = True
podman_compose.global_args.no_normalize = True podman_compose.global_args.no_normalize = True

2
pytests/test_can_merge_cmd_ent.py
View File

@ -99,7 +99,7 @@ def set_args(podman_compose: PodmanCompose, file_names: list[str]) -> None:
podman_compose.global_args.project_name = None podman_compose.global_args.project_name = None
podman_compose.global_args.env_file = None podman_compose.global_args.env_file = None
podman_compose.global_args.profile = [] podman_compose.global_args.profile = []
podman_compose.global_args.in_pod = True podman_compose.global_args.in_pod_bool = True
podman_compose.global_args.no_normalize = None podman_compose.global_args.no_normalize = None

2
pytests/test_normalize_final_build.py
View File

@ -254,7 +254,7 @@ def set_args(podman_compose: PodmanCompose, file_names: list[str], no_normalize:
podman_compose.global_args.project_name = None podman_compose.global_args.project_name = None
podman_compose.global_args.env_file = None podman_compose.global_args.env_file = None
podman_compose.global_args.profile = [] podman_compose.global_args.profile = []
podman_compose.global_args.in_pod = True podman_compose.global_args.in_pod_bool = True
podman_compose.global_args.no_normalize = no_normalize podman_compose.global_args.no_normalize = no_normalize