From 33c8a491915f8ee04af0de36314e7b149dafb012 Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Sat, 11 Oct 2025 15:29:14 +0200 Subject: [PATCH] Fix crashes due to wrong names. (#1161) --- changelogs/fragments/1161-fix.yml | 4 ++++ plugins/connection/docker.py | 2 +- plugins/modules/docker_compose_v2_exec.py | 2 +- plugins/modules/docker_compose_v2_run.py | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 changelogs/fragments/1161-fix.yml diff --git a/changelogs/fragments/1161-fix.yml b/changelogs/fragments/1161-fix.yml new file mode 100644 index 00000000..a7446de4 --- /dev/null +++ b/changelogs/fragments/1161-fix.yml @@ -0,0 +1,4 @@ +bugfixes: + - "docker connection plugin - fix crash instead of warning if Docker version does not support ``remote_user`` (https://github.com/ansible-collections/community.docker/pull/1161)." + - "docker_compose_v2_exec - fix crash instead of reporting error if ``detach=true`` and ``stdin`` is provided (https://github.com/ansible-collections/community.docker/pull/1161)." + - "docker_compose_v2_run - fix crash instead of reporting error if ``detach=true`` and ``stdin`` is provided (https://github.com/ansible-collections/community.docker/pull/1161)." diff --git a/plugins/connection/docker.py b/plugins/connection/docker.py index 807098c3..bb84bbcd 100644 --- a/plugins/connection/docker.py +++ b/plugins/connection/docker.py @@ -353,7 +353,7 @@ class Connection(ConnectionBase): actual_user = self._get_docker_remote_user() if actual_user != self.get_option("remote_user"): display.warning( - f'docker {self.docker_version} does not support remote_user, using container default: {self.actual_user or "?"}' + f'docker {self.docker_version} does not support remote_user, using container default: {actual_user or "?"}' ) return actual_user elif self._display.verbosity > 2: diff --git a/plugins/modules/docker_compose_v2_exec.py b/plugins/modules/docker_compose_v2_exec.py index 79156740..985637f5 100644 --- a/plugins/modules/docker_compose_v2_exec.py +++ b/plugins/modules/docker_compose_v2_exec.py @@ -200,7 +200,7 @@ class ExecManager(BaseComposeManager): self.argv = shlex.split(parameters["command"]) if self.detach and self.stdin is not None: - self.mail("If detach=true, stdin cannot be provided.") + self.fail("If detach=true, stdin cannot be provided.") if self.stdin is not None and parameters["stdin_add_newline"]: self.stdin += "\n" diff --git a/plugins/modules/docker_compose_v2_run.py b/plugins/modules/docker_compose_v2_run.py index 82fff5fe..73571a31 100644 --- a/plugins/modules/docker_compose_v2_run.py +++ b/plugins/modules/docker_compose_v2_run.py @@ -286,7 +286,7 @@ class ExecManager(BaseComposeManager): self.argv = shlex.split(parameters["command"]) if self.detach and self.stdin is not None: - self.mail("If detach=true, stdin cannot be provided.") + self.fail("If detach=true, stdin cannot be provided.") if self.stdin is not None and parameters["stdin_add_newline"]: self.stdin += "\n"