Skip to content

Fix assignment of template field in __init__ in AwsToAwsBaseOperator #36604

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eladkal merged 3 commits into from
Jan 5, 2024
Merged

Fix assignment of template field in __init__ in AwsToAwsBaseOperator #36604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6b0e410
add assignment of templated field
romsharon98 Jan 4, 2024
1fe3f97
fix static checks
romsharon98 Jan 5, 2024
52773c7
fix static checks
romsharon98 Jan 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion airflow/providers/amazon/aws/hooks/s3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@
from uuid import uuid4

if TYPE_CHECKING:
from airflow.utils.types import ArgNotSet

with suppress(ImportError):
from aiobotocore.client import AioBaseClient

Expand Down Expand Up @@ -167,7 +169,7 @@ class S3Hook(AwsBaseHook):

def __init__(
self,
aws_conn_id: str | None = AwsBaseHook.default_conn_name,
aws_conn_id: str | None | ArgNotSet = AwsBaseHook.default_conn_name,
transfer_config_args: dict | None = None,
extra_args: dict | None = None,
*args,
Expand Down
9 changes: 6 additions & 3 deletions airflow/providers/amazon/aws/transfers/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,14 @@ def __init__(
**kwargs,
) -> None:
super().__init__(**kwargs)
self.source_aws_conn_id = source_aws_conn_id
self.dest_aws_conn_id = dest_aws_conn_id
if not isinstance(aws_conn_id, ArgNotSet):
warnings.warn(_DEPRECATION_MSG, AirflowProviderDeprecationWarning, stacklevel=3)
self.source_aws_conn_id = aws_conn_id
else:
self.source_aws_conn_id = source_aws_conn_id
self.dest_aws_conn_id = (
self.source_aws_conn_id if isinstance(dest_aws_conn_id, ArgNotSet) else dest_aws_conn_id
)
if isinstance(dest_aws_conn_id, ArgNotSet):
self.dest_aws_conn_id = self.source_aws_conn_id
else:
self.dest_aws_conn_id = dest_aws_conn_id
3 changes: 2 additions & 1 deletion airflow/providers/amazon/aws/transfers/dynamodb_to_s3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@

if TYPE_CHECKING:
from airflow.utils.context import Context
from airflow.utils.types import ArgNotSet


class JSONEncoder(json.JSONEncoder):
Expand All @@ -55,7 +56,7 @@ def _upload_file_to_s3(
file_obj: IO,
bucket_name: str,
s3_key_prefix: str,
aws_conn_id: str | None = AwsBaseHook.default_conn_name,
aws_conn_id: str | None | ArgNotSet = AwsBaseHook.default_conn_name,
) -> None:
s3_client = S3Hook(aws_conn_id=aws_conn_id).get_conn()
file_obj.seek(0)
Expand Down