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 cef498e Standardize Amazon SES naming (#20367)
cef498e is described below
commit cef498efe9f4818e5f8e85c179ca730e84b31f4a
Author: D. Ferruzzi <[email protected]>
AuthorDate: Sat Dec 18 12:06:02 2021 -0800
Standardize Amazon SES naming (#20367)
---
airflow/providers/amazon/aws/hooks/ses.py | 18 +++++++++++++++++-
airflow/providers/amazon/aws/utils/emailer.py | 4 ++--
tests/providers/amazon/aws/hooks/test_ses.py | 6 +++---
tests/providers/amazon/aws/utils/test_emailer.py | 2 +-
4 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/airflow/providers/amazon/aws/hooks/ses.py
b/airflow/providers/amazon/aws/hooks/ses.py
index ec4b283..21efa14 100644
--- a/airflow/providers/amazon/aws/hooks/ses.py
+++ b/airflow/providers/amazon/aws/hooks/ses.py
@@ -15,13 +15,14 @@
# specific language governing permissions and limitations
# under the License.
"""This module contains AWS SES Hook"""
+import warnings
from typing import Any, Dict, Iterable, List, Optional, Union
from airflow.providers.amazon.aws.hooks.base_aws import AwsBaseHook
from airflow.utils.email import build_mime_message
-class SESHook(AwsBaseHook):
+class SesHook(AwsBaseHook):
"""
Interact with Amazon Simple Email Service.
@@ -95,3 +96,18 @@ class SESHook(AwsBaseHook):
return ses_client.send_raw_email(
Source=mail_from, Destinations=recipients, RawMessage={'Data':
message.as_string()}
)
+
+
+class SESHook(SesHook):
+ """
+ This hook is deprecated.
+ Please use :class:`airflow.providers.amazon.aws.hooks.ses.SesHook`.
+ """
+
+ def __init__(self, *args, **kwargs):
+ warnings.warn(
+ "This hook is deprecated. " "Please use
:class:`airflow.providers.amazon.aws.hooks.ses.SesHook`.",
+ DeprecationWarning,
+ stacklevel=2,
+ )
+ super().__init__(*args, **kwargs)
diff --git a/airflow/providers/amazon/aws/utils/emailer.py
b/airflow/providers/amazon/aws/utils/emailer.py
index fc34835..33cca1a 100644
--- a/airflow/providers/amazon/aws/utils/emailer.py
+++ b/airflow/providers/amazon/aws/utils/emailer.py
@@ -19,7 +19,7 @@
from typing import List, Optional, Union
-from airflow.providers.amazon.aws.hooks.ses import SESHook
+from airflow.providers.amazon.aws.hooks.ses import SesHook
def send_email(
@@ -36,7 +36,7 @@ def send_email(
**kwargs,
) -> None:
"""Email backend for SES."""
- hook = SESHook(aws_conn_id=conn_id)
+ hook = SesHook(aws_conn_id=conn_id)
hook.send_email(
mail_from=from_email,
to=to,
diff --git a/tests/providers/amazon/aws/hooks/test_ses.py
b/tests/providers/amazon/aws/hooks/test_ses.py
index 06d56f9..227beca 100644
--- a/tests/providers/amazon/aws/hooks/test_ses.py
+++ b/tests/providers/amazon/aws/hooks/test_ses.py
@@ -19,14 +19,14 @@ import boto3
import pytest
from moto import mock_ses
-from airflow.providers.amazon.aws.hooks.ses import SESHook
+from airflow.providers.amazon.aws.hooks.ses import SesHook
boto3.setup_default_session()
@mock_ses
def test_get_conn():
- hook = SESHook(aws_conn_id='aws_default')
+ hook = SesHook(aws_conn_id='aws_default')
assert hook.get_conn() is not None
@@ -42,7 +42,7 @@ def test_get_conn():
)
def test_send_email(to, cc, bcc):
# Given
- hook = SESHook()
+ hook = SesHook()
ses_client = hook.get_conn()
mail_from = '[email protected]'
diff --git a/tests/providers/amazon/aws/utils/test_emailer.py
b/tests/providers/amazon/aws/utils/test_emailer.py
index bcbbd4e..e61eecc 100644
--- a/tests/providers/amazon/aws/utils/test_emailer.py
+++ b/tests/providers/amazon/aws/utils/test_emailer.py
@@ -22,7 +22,7 @@ from airflow.providers.amazon.aws.utils.emailer import
send_email
class TestSendEmailSes(TestCase):
- @mock.patch("airflow.providers.amazon.aws.utils.emailer.SESHook")
+ @mock.patch("airflow.providers.amazon.aws.utils.emailer.SesHook")
def test_send_ses_email(self, mock_hook):
send_email(
from_email="From Test <[email protected]>",
