[airflow] branch main updated: Opsgenie: Fix `close_alert` to properly send `kwargs` (#23442)

[potiuk]

This is an automated email from the ASF dual-hosted git repository.

potiuk 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 ca3fbbbe14 Opsgenie: Fix `close_alert` to properly send `kwargs` 
(#23442)
ca3fbbbe14 is described below

commit ca3fbbbe14203774a16ddd23e82cfe652b22eb4a
Author: Benoit Person <benoit.per...@gmail.com>
AuthorDate: Sun May 8 23:38:50 2022 +0200

    Opsgenie: Fix `close_alert` to properly send `kwargs` (#23442)
---
 airflow/providers/opsgenie/hooks/opsgenie.py     | 4 ++--
 airflow/providers/opsgenie/operators/opsgenie.py | 2 +-
 tests/providers/opsgenie/hooks/test_opsgenie.py  | 6 ++----
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/airflow/providers/opsgenie/hooks/opsgenie.py 
b/airflow/providers/opsgenie/hooks/opsgenie.py
index 567e90c17e..602ca4e7a5 100644
--- a/airflow/providers/opsgenie/hooks/opsgenie.py
+++ b/airflow/providers/opsgenie/hooks/opsgenie.py
@@ -103,7 +103,7 @@ class OpsgenieAlertHook(BaseHook):
         identifier: str,
         identifier_type: Optional[str] = 'id',
         payload: Optional[dict] = None,
-        kwargs: Optional[dict] = None,
+        **kwargs: Optional[dict],
     ) -> SuccessResponse:
         """
         Close an alert in Opsgenie
@@ -126,7 +126,7 @@ class OpsgenieAlertHook(BaseHook):
                 identifier=identifier,
                 identifier_type=identifier_type,
                 close_alert_payload=close_alert_payload,
-                kwargs=kwargs,
+                **kwargs,
             )
             return api_response
         except OpenApiException as e:
diff --git a/airflow/providers/opsgenie/operators/opsgenie.py 
b/airflow/providers/opsgenie/operators/opsgenie.py
index 7521316313..1e2ff05b60 100644
--- a/airflow/providers/opsgenie/operators/opsgenie.py
+++ b/airflow/providers/opsgenie/operators/opsgenie.py
@@ -206,7 +206,7 @@ class OpsgenieCloseAlertOperator(BaseOperator):
             identifier=self.identifier,
             identifier_type=self.identifier_type,
             payload=self._build_opsgenie_close_alert_payload(),
-            kwargs=self.close_alert_kwargs,
+            **(self.close_alert_kwargs or {}),
         )
 
 
diff --git a/tests/providers/opsgenie/hooks/test_opsgenie.py 
b/tests/providers/opsgenie/hooks/test_opsgenie.py
index 8963c1b561..813dae98c9 100644
--- a/tests/providers/opsgenie/hooks/test_opsgenie.py
+++ b/tests/providers/opsgenie/hooks/test_opsgenie.py
@@ -129,14 +129,12 @@ class TestOpsgenieAlertHook(unittest.TestCase):
         kwargs = {'async_req': True}
 
         # Then
-        hook.close_alert(
-            identifier=identifier, identifier_type=identifier_type, 
payload=pay_load, kwargs=kwargs
-        )
+        hook.close_alert(identifier=identifier, 
identifier_type=identifier_type, payload=pay_load, **kwargs)
         close_alert_mock.assert_called_once_with(
             identifier=identifier,
             identifier_type=identifier_type,
             close_alert_payload=CloseAlertPayload(**pay_load),
-            kwargs=kwargs,
+            **kwargs,
         )
 
     @mock.patch.object(AlertApi, 'delete_alert')