Add ssh_args and friends back, add var for proxy_command

[sivel]

SUMMARY

Add ssh_args and friends back, add var for proxy_command. Fixes #78750

ISSUE TYPE

• Bugfix Pull Request

COMPONENT NAME

lib/ansible/plugins/connection/paramiko_ssh.py

ADDITIONAL INFORMATION

[sivel]

There are no tests here, maybe I'll add them? Or maybe not since I'm deprecating them on adding. I should at least test that they work, which I have not done yet.

EDIT: Yes, verified it works

[sivel]

version_added test failing is expected. Copied the configs from the ssh plugin, since they originally matched.

[ansibot]

The test ansible-test sanity --test validate-modules [explain] failed with 3 errors:

lib/ansible/plugins/connection/paramiko_ssh.py:0:0: option-incorrect-version-added: version_added for new option (ssh_args) should be '2.15'. Currently StrictVersion ('0.0')
lib/ansible/plugins/connection/paramiko_ssh.py:0:0: option-incorrect-version-added: version_added for new option (ssh_common_args) should be '2.15'. Currently StrictVersion ('0.0')
lib/ansible/plugins/connection/paramiko_ssh.py:0:0: option-incorrect-version-added: version_added for new option (ssh_extra_args) should be '2.15'. Currently StrictVersion ('0.0')

click here for bot help

[bcoca]

we might want also _paramiko_ versions for each var/env var/ini entry that has higher precedence, JIC people use both connections but need different configuration

[s-hertel]

Since there's already a paramiko-specific option, could the priority just be reversed?

diff --git a/lib/ansible/plugins/connection/paramiko_ssh.py b/lib/ansible/plugins/connection/paramiko_ssh.py
index 82eae5c77e..5410b12b1b 100644
--- a/lib/ansible/plugins/connection/paramiko_ssh.py
+++ b/lib/ansible/plugins/connection/paramiko_ssh.py
@@ -287,7 +287,7 @@ class Connection(ConnectionBase):
             if proxy_command:
                 break
 
-        proxy_command = proxy_command or self.get_option('proxy_command')
+        proxy_command = self.get_option('proxy_command') or proxy_command

[sivel]

Probably, although that logic existed before this PR, but probably makes sense.

[s-hertel]

It looks like the vyos incidental tests pass if the ansible.builtin NetworkConnectionBase also adds the get_options fix from ansible.netcommon ansible-collections/ansible.netcommon@130c49e.

[sivel]

It looks like the vyos incidental tests pass if the ansible.builtin NetworkConnectionBase also adds the get_options fix from ansible.netcommon ansible-collections/ansible.netcommon@130c49e.

Hrm, weird, I tested locally and at least the one target was passing. Will look into this.

[s-hertel]

@sivel Oh, maybe it was just a flaky CI error in that case.

[sivel]

Super weird. First, I was confused, since #78789 is what I thought this PR was for a moment. Second, I'm now confused by why this change causes issues for the vyos tests, I'll have to let them run again now that I pushed another commit.

Maybe this PR just will need to be dependent on #78789, or I need to make the change you recommended.

[sivel]

Alright, must have just been flaky. vyos tests passed this time.