This is an automated email from the ASF dual-hosted git repository.
ferruzzi pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/main by this push:
new 8c6751ff0f quick fix on RDS operator to prevent parameter collision
(#32436)
8c6751ff0f is described below
commit 8c6751ff0f2056af1cb08cec03db8a4d6c913ca7
Author: Raphaël Vandon <vand...@amazon.com>
AuthorDate: Fri Jul 7 15:39:29 2023 -0700
quick fix on RDS operator to prevent parameter collision (#32436)
* quick fix on RDS operator to prevent parameter collision
without this code, if the user specified a region in the hook params, it'd
create an error about the param being specified twice
* use initialized value
---
airflow/providers/amazon/aws/operators/rds.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/airflow/providers/amazon/aws/operators/rds.py
b/airflow/providers/amazon/aws/operators/rds.py
index 2630098bc4..c037251643 100644
--- a/airflow/providers/amazon/aws/operators/rds.py
+++ b/airflow/providers/amazon/aws/operators/rds.py
@@ -62,8 +62,9 @@ class RdsBaseOperator(BaseOperator):
AirflowProviderDeprecationWarning,
stacklevel=3, # 2 is in the operator's init, 3 is in the user
code creating the operator
)
- self.region_name = region_name
- self.hook = RdsHook(aws_conn_id=aws_conn_id, region_name=region_name,
**(hook_params or {}))
+ hook_params = hook_params or {}
+ self.region_name = region_name or hook_params.pop("region_name", None)
+ self.hook = RdsHook(aws_conn_id=aws_conn_id,
region_name=self.region_name, **(hook_params))
super().__init__(*args, **kwargs)
self._await_interval = 60 # seconds
