Skip to content

Conversation

@30blay
Copy link
Contributor

@30blay 30blay commented Oct 14, 2021

Related issue: #16323

The SFTP hook does not allow for a SSH private key string to be used, only a private key file path. As it is based on the SSH hook, which does allow for a private key string to be used, a small change could align these two hooks.

This change first checks if a paramiko object is present after the SSH hook has been initialised, and the prefers that rather than the ssh key file path.

This PR replaces stale PR #16338

@boring-cyborg
Copy link

boring-cyborg bot commented Oct 14, 2021

Congratulations on your first Pull Request and welcome to the Apache Airflow community! If you have any issues or are unsure about any anything please check our Contribution Guide (https://github.com/apache/airflow/blob/main/CONTRIBUTING.rst)
Here are some useful points:

  • Pay attention to the quality of your code (flake8, mypy and type annotations). Our pre-commits will help you with that.
  • In case of a new feature add useful documentation (in docstrings or in docs/ directory). Adding a new operator? Check this short guide Consider adding an example DAG that shows how users should use it.
  • Consider using Breeze environment for testing locally, it’s a heavy docker but it ships with a working Airflow and a lot of integrations.
  • Be patient and persistent. It might take some time to get a review or get the final approval from Committers.
  • Please follow ASF Code of Conduct for all communication including (but not limited to) comments on Pull Requests, Mailing list and Slack.
  • Be sure to read the Airflow Coding style.
    Apache Airflow is a community-driven project and together we are making it better 🚀.
    In case of doubts contact the developers at:
    Mailing List: dev@airflow.apache.org
    Slack: https://s.apache.org/airflow-slack

@uranusjr
Copy link
Member

Could you address the review comment in the original PR? Namely https://github.com/apache/airflow/pull/16338/files#r649058789

@30blay
Copy link
Contributor Author

30blay commented Oct 22, 2021

Could you address the review comment in the original PR? Namely https://github.com/apache/airflow/pull/16338/files#r649058789

Done!

Copy link
Member

@uranusjr uranusjr left a comment

Choose a reason for hiding this comment

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

Assuming CI passes.

@github-actions github-actions bot added the okay to merge It's ok to merge this PR as it does not require more tests label Oct 26, 2021
@github-actions
Copy link

The PR is likely OK to be merged with just subset of tests for default Python and Database versions without running the full matrix of tests, because it does not modify the core of Airflow. If the committers decide that the full tests matrix is needed, they will add the label 'full tests needed'. Then you should rebase to the latest main or amend the last commit of the PR, and push it with --force-with-lease.

hx-markterry and others added 9 commits October 26, 2021 10:30
Remove the link to pysftp. SFTP Connection's private_key is the key content, while pysftp's private_key is a file path. Readers should look at the documentation for SFTP Connection for argument definitions
Since private_key is now the actual private key content, and key_file is not the path to the private key file
@potiuk potiuk merged commit 83eb80d into apache:main Oct 28, 2021
@boring-cyborg
Copy link

boring-cyborg bot commented Oct 28, 2021

Awesome work, congrats on your first merged pull request!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area:providers kind:documentation okay to merge It's ok to merge this PR as it does not require more tests

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants