You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by "VelmiraPetkova (via GitHub)" <gi...@apache.org> on 2024/05/07 15:30:40 UTC
[PR] Allow FTPHook to change port number [airflow]
VelmiraPetkova opened a new pull request, #39465:
URL: https://github.com/apache/airflow/pull/39465
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
regarding copyright ownership. The ASF licenses this file
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
<!--
Thank you for contributing! Please make sure that your code changes
are covered with tests. And in case of new features or big changes
remember to adjust the documentation.
Feel free to ping committers for the review!
In case of an existing issue, reference it using one of the following:
closes: #ISSUE
related: #ISSUE
How to write a good git commit message:
http://chris.beams.io/posts/git-commit/
-->
Allow FTPHook to use a custom FTP port number
closes: #39308
<!-- Please keep an empty line above the dashes. -->
--
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.
To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Allow FTPHook to change port number [airflow]
Posted by "boring-cyborg[bot] (via GitHub)" <gi...@apache.org>.
boring-cyborg[bot] commented on PR #39465:
URL: https://github.com/apache/airflow/pull/39465#issuecomment-2098726975
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 Contributors' Guide (https://github.com/apache/airflow/blob/main/contributing-docs/README.rst)
Here are some useful points:
- Pay attention to the quality of your code (ruff, mypy and type annotations). Our [pre-commits]( https://github.com/apache/airflow/blob/main/contributing-docs/08_static_code_checks.rst#prerequisites-for-pre-commit-hooks) 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](https://github.com/apache/airflow/blob/main/docs/apache-airflow/howto/custom-operator.rst) Consider adding an example DAG that shows how users should use it.
- Consider using [Breeze environment](https://github.com/apache/airflow/blob/main/dev/breeze/doc/README.rst) 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](https://www.apache.org/foundation/policies/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]( https://github.com/apache/airflow/blob/main/contributing-docs/05_pull_requests.rst#coding-style-and-best-practices).
- Always keep your Pull Requests rebased, otherwise your build might fail due to changes not related to your commits.
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
--
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.
To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Allow FTPHook to change port number [airflow]
Posted by "boring-cyborg[bot] (via GitHub)" <gi...@apache.org>.
boring-cyborg[bot] commented on PR #39465:
URL: https://github.com/apache/airflow/pull/39465#issuecomment-2133237480
Awesome work, congrats on your first merged pull request! You are invited to check our [Issue Tracker](https://github.com/apache/airflow/issues) for additional contributions.
--
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.
To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Allow FTPHook to change port number [airflow]
Posted by "vincbeck (via GitHub)" <gi...@apache.org>.
vincbeck commented on code in PR #39465:
URL: https://github.com/apache/airflow/pull/39465#discussion_r1599058827
##########
airflow/providers/ftp/hooks/ftp.py:
##########
@@ -58,7 +58,11 @@ def get_conn(self) -> ftplib.FTP:
if self.conn is None:
params = self.get_connection(self.ftp_conn_id)
pasv = params.extra_dejson.get("passive", True)
- self.conn = ftplib.FTP(params.host, params.login, params.password) # nosec: B321
+ self.conn = ftplib.FTP() # nosec: B321
+ if params.host:
+ self.conn.connect(params.host, params.port)
+ if params.login:
+ self.conn.login(params.login, params.password)
Review Comment:
Can `params.login` be provided but not `params.host`? If yes, then there is an indentention issue
--
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.
To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Allow FTPHook to change port number [airflow]
Posted by "amoghrajesh (via GitHub)" <gi...@apache.org>.
amoghrajesh commented on code in PR #39465:
URL: https://github.com/apache/airflow/pull/39465#discussion_r1602586766
##########
airflow/providers/ftp/hooks/ftp.py:
##########
@@ -58,7 +58,14 @@ def get_conn(self) -> ftplib.FTP:
if self.conn is None:
params = self.get_connection(self.ftp_conn_id)
pasv = params.extra_dejson.get("passive", True)
- self.conn = ftplib.FTP(params.host, params.login, params.password) # nosec: B321
+ self.conn = ftplib.FTP() # nosec: B321
+ if params.host:
+ port = ftplib.FTP_PORT
+ if params.port is not None:
+ port = params.port
Review Comment:
Can we add a log statement here so that we know which port was used
--
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.
To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Allow FTPHook to change port number [airflow]
Posted by "eladkal (via GitHub)" <gi...@apache.org>.
eladkal commented on code in PR #39465:
URL: https://github.com/apache/airflow/pull/39465#discussion_r1615691939
##########
airflow/providers/ftp/hooks/ftp.py:
##########
@@ -19,10 +19,12 @@
import datetime
import ftplib # nosec: B402
+import logging
from typing import Any, Callable
from airflow.hooks.base import BaseHook
+logger = logging.getLogger(__name__)
Review Comment:
```suggestion
logger = logging.getLogger(__name__)
```
Fix static checks
--
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.
To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Allow FTPHook to change port number [airflow]
Posted by "VelmiraPetkova (via GitHub)" <gi...@apache.org>.
VelmiraPetkova commented on PR #39465:
URL: https://github.com/apache/airflow/pull/39465#issuecomment-2132210801
Sorry for the delay. I updated the PR. Could you please take a look? Thank you!
--
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.
To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Allow FTPHook to change port number [airflow]
Posted by "potiuk (via GitHub)" <gi...@apache.org>.
potiuk merged PR #39465:
URL: https://github.com/apache/airflow/pull/39465
--
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.
To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Allow FTPHook to change port number [airflow]
Posted by "VelmiraPetkova (via GitHub)" <gi...@apache.org>.
VelmiraPetkova commented on code in PR #39465:
URL: https://github.com/apache/airflow/pull/39465#discussion_r1600545687
##########
airflow/providers/ftp/hooks/ftp.py:
##########
@@ -58,7 +58,11 @@ def get_conn(self) -> ftplib.FTP:
if self.conn is None:
params = self.get_connection(self.ftp_conn_id)
pasv = params.extra_dejson.get("passive", True)
- self.conn = ftplib.FTP(params.host, params.login, params.password) # nosec: B321
+ self.conn = ftplib.FTP() # nosec: B321
+ if params.host:
+ self.conn.connect(params.host, params.port)
+ if params.login:
+ self.conn.login(params.login, params.password)
Review Comment:
This is implemented in the same way as in the standard library. Plus, `params.login` and `params.password` only have a meaning when trying to connect to a FTP server for which you need to have a host name supplied (even if it's localhost).
--
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.
To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Allow FTPHook to change port number [airflow]
Posted by "VelmiraPetkova (via GitHub)" <gi...@apache.org>.
VelmiraPetkova commented on PR #39465:
URL: https://github.com/apache/airflow/pull/39465#issuecomment-2103337828
Yes, I'll do the test case over the weekend.
--
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.
To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Allow FTPHook to change port number [airflow]
Posted by "VelmiraPetkova (via GitHub)" <gi...@apache.org>.
VelmiraPetkova commented on code in PR #39465:
URL: https://github.com/apache/airflow/pull/39465#discussion_r1603978146
##########
airflow/providers/ftp/hooks/ftp.py:
##########
@@ -58,7 +58,14 @@ def get_conn(self) -> ftplib.FTP:
if self.conn is None:
params = self.get_connection(self.ftp_conn_id)
pasv = params.extra_dejson.get("passive", True)
- self.conn = ftplib.FTP(params.host, params.login, params.password) # nosec: B321
+ self.conn = ftplib.FTP() # nosec: B321
+ if params.host:
+ port = ftplib.FTP_PORT
+ if params.port is not None:
+ port = params.port
Review Comment:
Hello, I added a log message. Can you take a look?
--
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.
To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Allow FTPHook to change port number [airflow]
Posted by "eladkal (via GitHub)" <gi...@apache.org>.
eladkal commented on code in PR #39465:
URL: https://github.com/apache/airflow/pull/39465#discussion_r1615691939
##########
airflow/providers/ftp/hooks/ftp.py:
##########
@@ -19,10 +19,12 @@
import datetime
import ftplib # nosec: B402
+import logging
from typing import Any, Callable
from airflow.hooks.base import BaseHook
+logger = logging.getLogger(__name__)
Review Comment:
```suggestion
logger = logging.getLogger(__name__)
```
Fix static checks
--
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.
To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Allow FTPHook to change port number [airflow]
Posted by "vincbeck (via GitHub)" <gi...@apache.org>.
vincbeck commented on code in PR #39465:
URL: https://github.com/apache/airflow/pull/39465#discussion_r1600560171
##########
airflow/providers/ftp/hooks/ftp.py:
##########
@@ -58,7 +58,11 @@ def get_conn(self) -> ftplib.FTP:
if self.conn is None:
params = self.get_connection(self.ftp_conn_id)
pasv = params.extra_dejson.get("passive", True)
- self.conn = ftplib.FTP(params.host, params.login, params.password) # nosec: B321
+ self.conn = ftplib.FTP() # nosec: B321
+ if params.host:
+ self.conn.connect(params.host, params.port)
+ if params.login:
+ self.conn.login(params.login, params.password)
Review Comment:
No problem then
--
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.
To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Allow FTPHook to change port number [airflow]
Posted by "VelmiraPetkova (via GitHub)" <gi...@apache.org>.
VelmiraPetkova commented on PR #39465:
URL: https://github.com/apache/airflow/pull/39465#issuecomment-2110998707
I did some tests and fixed a tiny bug, when no port is supplied.
--
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.
To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Allow FTPHook to change port number [airflow]
Posted by "eladkal (via GitHub)" <gi...@apache.org>.
eladkal commented on PR #39465:
URL: https://github.com/apache/airflow/pull/39465#issuecomment-2132077581
@VelmiraPetkova can you please fix static checks?
--
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.
To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Allow FTPHook to change port number [airflow]
Posted by "potiuk (via GitHub)" <gi...@apache.org>.
potiuk commented on PR #39465:
URL: https://github.com/apache/airflow/pull/39465#issuecomment-2133236880
The failing integration test case is a flake - mssql does not have enough time to start. This has been fixed in #39866
--
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.
To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org