dstandish opened a new pull request #6163: [AIRFLOW-4574] SSHHook private_key may only be supplied in extras URL: https://github.com/apache/airflow/pull/6163 * discussion on original PR suggested removing private_key option as init param * with this PR, can still provide through extras, but not as init param * also add support for private_key in tunnel -- missing in original PR for this issue * remove test related to private_key init param * use context manager to auto-close socket listener so tests can be re-run @mik-laj @pgagnon @kaxil in spirit of collaboration I set out to address issue in original PR for this issue (#6104 ). Namely, I set out to remove private_key as an init param to SSHHook. Lo and behold I noticed that original PR did not extend support for `private_key` to the get_tunnel hook method, because it doesn't use `get_conn` but connects independently. This PR rectifies this oversight by adding this capability. I did not create new jira because this feels like continuation of same issue -- just more fully realizing it, and in a way that everyone can be happy with. There were some minor tweaks that I made to testing. * In test, The `HELLO_SERVER_CMD` was not executed in context manager, so it left the socket listener running, which meant you could not rerun the tests without manually killing the listener process. I use context manager. I think this makes sense in same PR because it actively interfered with my ability to test my change. * In test, I also moved connection creation / destruction to setUpClass / tearDownClass so they are created and destroyed only once for the ssh hook test suite. Made sense to do this because in adding tunnel test I had to use the connection in more than one place. Make sure you have checked _all_ steps below. ### Jira - [ ] My PR addresses the following [Airflow Jira](https://issues.apache.org/jira/browse/AIRFLOW/) issues and references them in the PR title. For example, "\[AIRFLOW-XXX\] My Airflow PR" - https://issues.apache.org/jira/browse/AIRFLOW-XXX - In case you are fixing a typo in the documentation you can prepend your commit with \[AIRFLOW-XXX\], code changes always need a Jira issue. - In case you are proposing a fundamental code change, you need to create an Airflow Improvement Proposal ([AIP](https://cwiki.apache.org/confluence/display/AIRFLOW/Airflow+Improvements+Proposals)). - In case you are adding a dependency, check if the license complies with the [ASF 3rd Party License Policy](https://www.apache.org/legal/resolved.html#category-x). ### Description - [ ] Here are some details about my PR, including screenshots of any UI changes: ### Tests - [ ] My PR adds the following unit tests __OR__ does not need testing for this extremely good reason: ### Commits - [ ] My commits all reference Jira issues in their subject lines, and I have squashed multiple commits if they address the same issue. In addition, my commits follow the guidelines from "[How to write a good git commit message](http://chris.beams.io/posts/git-commit/)": 1. Subject is separated from body by a blank line 1. Subject is limited to 50 characters (not including Jira issue reference) 1. Subject does not end with a period 1. Subject uses the imperative mood ("add", not "adding") 1. Body wraps at 72 characters 1. Body explains "what" and "why", not "how" ### Documentation - [ ] In case of new functionality, my PR adds documentation that describes how to use it. - All the public functions and the classes in the PR contain docstrings that explain what it does - If you implement backwards incompatible changes, please leave a note in the [Updating.md](https://github.com/apache/airflow/blob/master/UPDATING.md) so we can assign it to a appropriate release
---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
