Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix templated ansible_ssh_common_args issues #956

Closed
wants to merge 1 commit into from
+8 −6
Closed

Fix templated ansible_ssh_common_args issues #956

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions ansible_mitogen/transport_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,12 +475,13 @@ def ansible_ssh_timeout(self):
)

def ssh_args(self):
local_vars = self._task_vars.get("hostvars", {}).get(self._inventory_name, {})
return [
mitogen.core.to_text(term)
for s in (
C.config.get_config_value("ssh_args", plugin_type="connection", plugin_name="ssh", variables=self._task_vars.get("vars", {})),
C.config.get_config_value("ssh_common_args", plugin_type="connection", plugin_name="ssh", variables=self._task_vars.get("vars", {})),
C.config.get_config_value("ssh_extra_args", plugin_type="connection", plugin_name="ssh", variables=self._task_vars.get("vars", {}))
C.config.get_config_value("ssh_args", plugin_type="connection", plugin_name="ssh", variables=local_vars),
C.config.get_config_value("ssh_common_args", plugin_type="connection", plugin_name="ssh", variables=local_vars),
C.config.get_config_value("ssh_extra_args", plugin_type="connection", plugin_name="ssh", variables=local_vars)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note to self:

before: variables=self._task_vars.get("vars", {})
after:  variables=self._task_vars.get("hostvars", {}).get(self._inventory_name, {})

)
for term in ansible.utils.shlex.shlex_split(s or '')
Copy link
Member

@moreati moreati Sep 5, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note to self:

... for term in ansible.utils.shlex.shlex_split(s or '')]

probably behaves identically to

... for term in ansible.utils.shlex.shlex_split(s) if s]

An experiment/test would confirm this. If true, then I think MitogenViaSpec.ssh_args() and PlayContextSpec.ssh_args() are functionally identical. I think this PR would preserve this property.

]
Expand Down Expand Up @@ -707,12 +708,13 @@ def ansible_ssh_timeout(self):
)

def ssh_args(self):
local_vars = self._task_vars.get("hostvars", {}).get(self._inventory_name, {})
return [
mitogen.core.to_text(term)
for s in (
C.config.get_config_value("ssh_args", plugin_type="connection", plugin_name="ssh", variables=self._task_vars.get("vars", {})),
C.config.get_config_value("ssh_common_args", plugin_type="connection", plugin_name="ssh", variables=self._task_vars.get("vars", {})),
C.config.get_config_value("ssh_extra_args", plugin_type="connection", plugin_name="ssh", variables=self._task_vars.get("vars", {}))
C.config.get_config_value("ssh_args", plugin_type="connection", plugin_name="ssh", variables=local_vars),
C.config.get_config_value("ssh_common_args", plugin_type="connection", plugin_name="ssh", variables=local_vars),
C.config.get_config_value("ssh_extra_args", plugin_type="connection", plugin_name="ssh", variables=local_vars)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note to self:

before: variables=self._task_vars.get("vars", {})
after:  variables=self._task_vars.get("hostvars", {}).get(self._inventory_name, {})

)
for term in ansible.utils.shlex.shlex_split(s)
if s
Expand Down