You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by GitBox <gi...@apache.org> on 2021/08/08 02:14:16 UTC
[GitHub] [airflow] rahulraina7 opened a new pull request #16012: Fixing Glue hooks/operators
rahulraina7 opened a new pull request #16012:
URL: https://github.com/apache/airflow/pull/16012
Use of s3Hook load_file is wrong and leads to an error
```
botocore.exceptions.ParamValidationError: Parameter validation failed:
Invalid bucket name "artifacts/glue-scripts/myscript.py": Bucket name must match the regex "^[a-zA-Z0-9.\-_]{1,255}$" or be an ARN matching the regex "^arn:(aws).*:(s3|s3-object-lambda):[a-z\-0-9]+:[0-9]{12}:accesspoint[/:][a-zA-Z0-9\-]{1,63}$|^arn:(aws).*:s3-outposts:[a-z\-0-9]+:[0-9]{12}:outpost[/:][a-zA-Z0-9\-]{1,63}[/:]accesspoint[/:][a-zA-Z0-9\-]{1,63}$"
```
<!--
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 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/
-->
---
**^ Add meaningful description above**
Read the **[Pull Request Guidelines](https://github.com/apache/airflow/blob/master/CONTRIBUTING.rst#pull-request-guidelines)** for more information.
In case of fundamental code change, Airflow Improvement Proposal ([AIP](https://cwiki.apache.org/confluence/display/AIRFLOW/Airflow+Improvements+Proposals)) is needed.
In case of a new dependency, check compliance with the [ASF 3rd Party License Policy](https://www.apache.org/legal/resolved.html#category-x).
In case of backwards incompatible changes please leave a note in [UPDATING.md](https://github.com/apache/airflow/blob/master/UPDATING.md).
--
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
[GitHub] [airflow] boring-cyborg[bot] commented on pull request #16012: Fixing s3 hook load_file use in glue operator
Posted by GitBox <gi...@apache.org>.
boring-cyborg[bot] commented on pull request #16012:
URL: https://github.com/apache/airflow/pull/16012#issuecomment-846560713
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/master/CONTRIBUTING.rst)
Here are some useful points:
- Pay attention to the quality of your code (flake8, pylint and type annotations). Our [pre-commits]( https://github.com/apache/airflow/blob/master/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/master/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/master/BREEZE.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/master/CONTRIBUTING.rst#coding-style-and-best-practices).
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [airflow] uranusjr commented on a change in pull request #16012: Fixing s3 hook load_file use in glue operator
Posted by GitBox <gi...@apache.org>.
uranusjr commented on a change in pull request #16012:
URL: https://github.com/apache/airflow/pull/16012#discussion_r637570284
##########
File path: airflow/providers/amazon/aws/operators/glue.py
##########
@@ -101,7 +101,8 @@ def execute(self, context):
if self.script_location and not self.script_location.startswith(self.s3_protocol):
s3_hook = S3Hook(aws_conn_id=self.aws_conn_id)
script_name = os.path.basename(self.script_location)
- s3_hook.load_file(self.script_location, self.s3_bucket, self.s3_artifacts_prefix + script_name)
+ s3_hook.load_file(self.script_location, self.s3_artifacts_prefix + script_name, bucket_name=self.s3_bucket)
+ self.script_location = f"s3://{self.s3_bucket}/{self.s3_artifacts_prefix + script_name}"
Review comment:
Or this should be a local variable in this function. The important thing is `execute()` should not modify attributes.
--
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:
users@infra.apache.org
[GitHub] [airflow] uranusjr commented on a change in pull request #16012: Fixing Glue hooks/operators
Posted by GitBox <gi...@apache.org>.
uranusjr commented on a change in pull request #16012:
URL: https://github.com/apache/airflow/pull/16012#discussion_r655156985
##########
File path: airflow/providers/amazon/aws/operators/glue.py
##########
@@ -101,16 +101,15 @@ def execute(self, context):
if self.script_location and not self.script_location.startswith(self.s3_protocol):
s3_hook = S3Hook(aws_conn_id=self.aws_conn_id)
script_name = os.path.basename(self.script_location)
- s3_hook.load_file(
- filename=self.script_location,
- key=self.s3_artifacts_prefix + script_name,
- bucket_name=self.s3_bucket,
- )
+ s3_hook.load_file(self.script_location, self.s3_artifacts_prefix + script_name, bucket_name=self.s3_bucket)
+ s3_script_location = f"s3://{self.s3_bucket}/{self.s3_artifacts_prefix + script_name}"
Review comment:
```suggestion
s3_script_location = f"s3://{self.s3_bucket}/{self.s3_artifacts_prefix}{script_name}"
```
?
--
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:
users@infra.apache.org
[GitHub] [airflow] rahulraina7 commented on a change in pull request #16012: Fixing s3 hook load_file use in glue operator
Posted by GitBox <gi...@apache.org>.
rahulraina7 commented on a change in pull request #16012:
URL: https://github.com/apache/airflow/pull/16012#discussion_r637703308
##########
File path: airflow/providers/amazon/aws/operators/glue.py
##########
@@ -101,7 +101,8 @@ def execute(self, context):
if self.script_location and not self.script_location.startswith(self.s3_protocol):
s3_hook = S3Hook(aws_conn_id=self.aws_conn_id)
script_name = os.path.basename(self.script_location)
- s3_hook.load_file(self.script_location, self.s3_bucket, self.s3_artifacts_prefix + script_name)
+ s3_hook.load_file(self.script_location, self.s3_artifacts_prefix + script_name, bucket_name=self.s3_bucket)
+ self.script_location = f"s3://{self.s3_bucket}/{self.s3_artifacts_prefix + script_name}"
Review comment:
I have resolved this in the latest push
--
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:
users@infra.apache.org
[GitHub] [airflow] rahulraina7 commented on pull request #16012: Fixing Glue hooks/operators
Posted by GitBox <gi...@apache.org>.
rahulraina7 commented on pull request #16012:
URL: https://github.com/apache/airflow/pull/16012#issuecomment-894321200
> @rahulraina7 the glue tests are failing
Fixed with the latest commit.
--
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
[GitHub] [airflow] eladkal merged pull request #16012: Fixing ParamValidationError when executing load_file in Glue hooks/operators
Posted by GitBox <gi...@apache.org>.
eladkal merged pull request #16012:
URL: https://github.com/apache/airflow/pull/16012
--
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
[GitHub] [airflow] github-actions[bot] commented on pull request #16012: Fixing Glue hooks/operators
Posted by GitBox <gi...@apache.org>.
github-actions[bot] commented on pull request #16012:
URL: https://github.com/apache/airflow/pull/16012#issuecomment-895766066
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.
--
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
[GitHub] [airflow] potiuk commented on pull request #16012: Fixing Glue hooks/operators
Posted by GitBox <gi...@apache.org>.
potiuk commented on pull request #16012:
URL: https://github.com/apache/airflow/pull/16012#issuecomment-865289407
Is it possible to add some unit tests with mocking for that ?
--
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:
users@infra.apache.org
[GitHub] [airflow] github-actions[bot] commented on pull request #16012: Fixing Glue hooks/operators
Posted by GitBox <gi...@apache.org>.
github-actions[bot] commented on pull request #16012:
URL: https://github.com/apache/airflow/pull/16012#issuecomment-893904709
This pull request has been automatically marked as stale because it has not had recent activity. It will be closed in 5 days if no further activity occurs. Thank you for your 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
[GitHub] [airflow] eladkal commented on pull request #16012: Fixing Glue hooks/operators
Posted by GitBox <gi...@apache.org>.
eladkal commented on pull request #16012:
URL: https://github.com/apache/airflow/pull/16012#issuecomment-894308798
@rahulraina7 the glue tests are failing
--
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
[GitHub] [airflow] boring-cyborg[bot] commented on pull request #16012: Fixing ParamValidationError when executing load_file in Glue hooks/operators
Posted by GitBox <gi...@apache.org>.
boring-cyborg[bot] commented on pull request #16012:
URL: https://github.com/apache/airflow/pull/16012#issuecomment-896208282
Awesome work, congrats on your first merged pull request!
--
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
[GitHub] [airflow] rahulraina7 edited a comment on pull request #16012: Fixing Glue hooks/operators
Posted by GitBox <gi...@apache.org>.
rahulraina7 edited a comment on pull request #16012:
URL: https://github.com/apache/airflow/pull/16012#issuecomment-846977278
I have also updated the glue hook to use IAM arn for its execution role.
As there can be a path associated with a role name, This won't work if there is an actual path present.
Example:
```
{'Role': {'Path': '/dataplatform/glue/', 'RoleName': 'glue-role', 'RoleId': 'AROAU2X5YFLK4EU5OCRWW', 'Arn': 'arn:aws:iam::****:role/dataplatform/glue/glue-role', 'CreateDate': datetime.datetime(2021, 5, 23, 14, 50, 3, tzinfo=tzutc()), 'AssumeRolePolicyDocument': {'Version': '2012-10-17', 'Statement': [{'Sid': '', 'Effect': 'Allow', 'Principal': {'Service': 'glue.amazonaws.com'}, 'Action': 'sts:AssumeRole'}]}, 'MaxSessionDuration': 3600, 'RoleLastUsed': {'LastUsedDate': datetime.datetime(2021, 5, 24, 6, 1, 50, tzinfo=tzutc()), 'Region': 'ap-southeast-1'}}, 'ResponseMetadata': {'RequestId': '25bffed5-ef5d-41eb-8959-16e75961d896', 'HTTPStatusCode': 200, 'HTTPHeaders': {'x-amzn-requestid': '25bffed5-ef5d-41eb-8959-16e75961d896', 'content-type': 'text/xml', 'content-length': '1005', 'date': 'Mon, 24 May 2021 11:14:04 GMT'}, 'RetryAttempts': 0}}
```
Its better to use Arn since the underlying API in boto3 supports that
--
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:
users@infra.apache.org
[GitHub] [airflow] uranusjr commented on a change in pull request #16012: Fixing Glue hooks/operators
Posted by GitBox <gi...@apache.org>.
uranusjr commented on a change in pull request #16012:
URL: https://github.com/apache/airflow/pull/16012#discussion_r655156985
##########
File path: airflow/providers/amazon/aws/operators/glue.py
##########
@@ -101,16 +101,15 @@ def execute(self, context):
if self.script_location and not self.script_location.startswith(self.s3_protocol):
s3_hook = S3Hook(aws_conn_id=self.aws_conn_id)
script_name = os.path.basename(self.script_location)
- s3_hook.load_file(
- filename=self.script_location,
- key=self.s3_artifacts_prefix + script_name,
- bucket_name=self.s3_bucket,
- )
+ s3_hook.load_file(self.script_location, self.s3_artifacts_prefix + script_name, bucket_name=self.s3_bucket)
+ s3_script_location = f"s3://{self.s3_bucket}/{self.s3_artifacts_prefix + script_name}"
Review comment:
```suggestion
s3_script_location = f"s3://{self.s3_bucket}/{self.s3_artifacts_prefix}{script_name}"
```
?
--
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:
users@infra.apache.org
[GitHub] [airflow] rahulraina7 commented on a change in pull request #16012: Fixing Glue hooks/operators
Posted by GitBox <gi...@apache.org>.
rahulraina7 commented on a change in pull request #16012:
URL: https://github.com/apache/airflow/pull/16012#discussion_r655221109
##########
File path: airflow/providers/amazon/aws/operators/glue.py
##########
@@ -101,16 +101,15 @@ def execute(self, context):
if self.script_location and not self.script_location.startswith(self.s3_protocol):
s3_hook = S3Hook(aws_conn_id=self.aws_conn_id)
script_name = os.path.basename(self.script_location)
- s3_hook.load_file(
- filename=self.script_location,
- key=self.s3_artifacts_prefix + script_name,
- bucket_name=self.s3_bucket,
- )
+ s3_hook.load_file(self.script_location, self.s3_artifacts_prefix + script_name, bucket_name=self.s3_bucket)
+ s3_script_location = f"s3://{self.s3_bucket}/{self.s3_artifacts_prefix + script_name}"
Review comment:
resolved
--
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:
users@infra.apache.org
[GitHub] [airflow] rahulraina7 closed pull request #16012: Fixing Glue hooks/operators
Posted by GitBox <gi...@apache.org>.
rahulraina7 closed pull request #16012:
URL: https://github.com/apache/airflow/pull/16012
--
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
[GitHub] [airflow] rahulraina7 commented on a change in pull request #16012: Fixing Glue hooks/operators
Posted by GitBox <gi...@apache.org>.
rahulraina7 commented on a change in pull request #16012:
URL: https://github.com/apache/airflow/pull/16012#discussion_r655221109
##########
File path: airflow/providers/amazon/aws/operators/glue.py
##########
@@ -101,16 +101,15 @@ def execute(self, context):
if self.script_location and not self.script_location.startswith(self.s3_protocol):
s3_hook = S3Hook(aws_conn_id=self.aws_conn_id)
script_name = os.path.basename(self.script_location)
- s3_hook.load_file(
- filename=self.script_location,
- key=self.s3_artifacts_prefix + script_name,
- bucket_name=self.s3_bucket,
- )
+ s3_hook.load_file(self.script_location, self.s3_artifacts_prefix + script_name, bucket_name=self.s3_bucket)
+ s3_script_location = f"s3://{self.s3_bucket}/{self.s3_artifacts_prefix + script_name}"
Review comment:
resolved
--
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:
users@infra.apache.org
[GitHub] [airflow] rahulraina7 commented on pull request #16012: Fixing s3 hook load_file use in glue operator
Posted by GitBox <gi...@apache.org>.
rahulraina7 commented on pull request #16012:
URL: https://github.com/apache/airflow/pull/16012#issuecomment-846977278
I have also updated the glue hook to use IAM arn for its execution role.
As the same name can be there in multiple paths. This won't work if there is an actual path present.
Example:
```
{'Role': {'Path': '/dataplatform/glue/', 'RoleName': 'glue-role', 'RoleId': 'AROAU2X5YFLK4EU5OCRWW', 'Arn': 'arn:aws:iam::****:role/dataplatform/glue/glue-role', 'CreateDate': datetime.datetime(2021, 5, 23, 14, 50, 3, tzinfo=tzutc()), 'AssumeRolePolicyDocument': {'Version': '2012-10-17', 'Statement': [{'Sid': '', 'Effect': 'Allow', 'Principal': {'Service': 'glue.amazonaws.com'}, 'Action': 'sts:AssumeRole'}]}, 'MaxSessionDuration': 3600, 'RoleLastUsed': {'LastUsedDate': datetime.datetime(2021, 5, 24, 6, 1, 50, tzinfo=tzutc()), 'Region': 'ap-southeast-1'}}, 'ResponseMetadata': {'RequestId': '25bffed5-ef5d-41eb-8959-16e75961d896', 'HTTPStatusCode': 200, 'HTTPHeaders': {'x-amzn-requestid': '25bffed5-ef5d-41eb-8959-16e75961d896', 'content-type': 'text/xml', 'content-length': '1005', 'date': 'Mon, 24 May 2021 11:14:04 GMT'}, 'RetryAttempts': 0}}
```
Its better to use Arn since the underlying API in boto3 supports that
--
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:
users@infra.apache.org
[GitHub] [airflow] rahulraina7 commented on pull request #16012: Fixing Glue hooks/operators
Posted by GitBox <gi...@apache.org>.
rahulraina7 commented on pull request #16012:
URL: https://github.com/apache/airflow/pull/16012#issuecomment-894187994
Updated tests. Please review @uranusjr , @o-nikolas
--
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
[GitHub] [airflow] uranusjr commented on a change in pull request #16012: Fixing s3 hook load_file use in glue operator
Posted by GitBox <gi...@apache.org>.
uranusjr commented on a change in pull request #16012:
URL: https://github.com/apache/airflow/pull/16012#discussion_r637570162
##########
File path: airflow/providers/amazon/aws/operators/glue.py
##########
@@ -101,7 +101,8 @@ def execute(self, context):
if self.script_location and not self.script_location.startswith(self.s3_protocol):
s3_hook = S3Hook(aws_conn_id=self.aws_conn_id)
script_name = os.path.basename(self.script_location)
- s3_hook.load_file(self.script_location, self.s3_bucket, self.s3_artifacts_prefix + script_name)
+ s3_hook.load_file(self.script_location, self.s3_artifacts_prefix + script_name, bucket_name=self.s3_bucket)
+ self.script_location = f"s3://{self.s3_bucket}/{self.s3_artifacts_prefix + script_name}"
Review comment:
This value should be resolved in `__init__()` instead.
--
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:
users@infra.apache.org
[GitHub] [airflow] rahulraina7 commented on a change in pull request #16012: Fixing Glue hooks/operators
Posted by GitBox <gi...@apache.org>.
rahulraina7 commented on a change in pull request #16012:
URL: https://github.com/apache/airflow/pull/16012#discussion_r638441983
##########
File path: airflow/providers/amazon/aws/hooks/glue_crawler.py
##########
@@ -105,7 +105,8 @@ def create_crawler(self, **crawler_kwargs) -> str:
"""
crawler_name = crawler_kwargs['Name']
self.log.info("Creating crawler: %s", crawler_name)
- return self.glue_client.create_crawler(**crawler_kwargs)['Crawler']['Name']
Review comment:
This is wrong and would lead to ```KeyError```
```
File "/usr/local/lib/python3.8/site-packages/airflow/providers/amazon/aws/hooks/glue_crawler.py", line 108, in create_crawler
return self.glue_client.create_crawler(**crawler_kwargs)['Crawler']['Name']
KeyError: 'Crawler'
```
According to : https://boto3.amazonaws.com/v1/documentation/api/latest/reference/services/glue.html#Glue.Client.create_crawler
This returns an empty dict
--
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:
users@infra.apache.org
[GitHub] [airflow] potiuk commented on pull request #16012: Fixing Glue hooks/operators
Posted by GitBox <gi...@apache.org>.
potiuk commented on pull request #16012:
URL: https://github.com/apache/airflow/pull/16012#issuecomment-865289407
Is it possible to add some unit tests with mocking for that ?
--
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:
users@infra.apache.org