Skip to content

Commit e944b15

Browse files
authored
Rds Operator pass custom conn_id to superclass (apache#51196)
* Adjuste RDSHook to pass aws_conn_id to Hooks * Added tests for changes and changed name of defaul conn_id in in RdsBaseOperator * Fixed pre-commit errors * Removed unnecessary args from RDSBaseOperator
1 parent 2b89c0d commit e944b15

File tree

2 files changed

+12
-4
lines changed
  • providers/amazon
    • src/airflow/providers/amazon/aws/operators
    • tests/unit/amazon/aws/operators

2 files changed

+12
-4
lines changed

providers/amazon/src/airflow/providers/amazon/aws/operators/rds.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,8 @@ class RdsBaseOperator(AwsBaseOperator[RdsHook]):
5454
def __init__(
5555
self,
5656
*args,
57-
aws_conn_id: str | None = "aws_conn_id",
58-
region_name: str | None = None,
5957
**kwargs,
6058
):
61-
self.aws_conn_id = aws_conn_id
62-
self.region_name = region_name
6359
super().__init__(*args, **kwargs)
6460

6561
self._await_interval = 60 # seconds

providers/amazon/tests/unit/amazon/aws/operators/test_rds.py

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,18 @@ def test_hook_attribute(self):
174174
assert hasattr(self.op, "hook")
175175
assert self.op.hook.__class__.__name__ == "RdsHook"
176176

177+
def test_overwritten_conn_passed_to_hook(self):
178+
OVERWRITTEN_CONN = "new-conn-id"
179+
op = RdsBaseOperator(
180+
task_id="test_overwritten_conn_passed_to_hook_task", aws_conn_id=OVERWRITTEN_CONN, dag=self.dag
181+
)
182+
assert op.hook.aws_conn_id == OVERWRITTEN_CONN
183+
184+
def test_no_conn_passed_to_hook(self):
185+
DEFAULT_CONN = "aws_default"
186+
op = RdsBaseOperator(task_id="test_no_conn_passed_to_hook_task", dag=self.dag)
187+
assert op.hook.aws_conn_id == DEFAULT_CONN
188+
177189

178190
class TestRdsCreateDbSnapshotOperator:
179191
@classmethod

0 commit comments

Comments
 (0)