This is an automated email from the ASF dual-hosted git repository.
potiuk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/master by this push:
new 86695b6 Deprecate email credentials from environment variables.
(#13601)
86695b6 is described below
commit 86695b62a0281364088642fa3dc17d92cf9e7cbe
Author: Joshua Carp <jm.c...@gmail.com>
AuthorDate: Sat Jan 30 10:03:50 2021 -0500
Deprecate email credentials from environment variables. (#13601)
Email backends fetch credentials from environment variables, but other
credentials are typically stored in connections. This patch deprecates
email credentials from environment variables and checks connections
first. We can drop the environment variable fallback in a future
release.
---
airflow/config_templates/config.yml | 6 +++
airflow/config_templates/default_airflow.cfg | 3 ++
airflow/config_templates/default_test.cfg | 1 +
airflow/operators/email.py | 3 ++
airflow/providers/sendgrid/utils/emailer.py | 30 ++++++++++++---
airflow/utils/email.py | 52 +++++++++++++++++++-------
tests/providers/sendgrid/utils/test_emailer.py | 6 +--
tests/utils/test_email.py | 16 ++++++++
8 files changed, 94 insertions(+), 23 deletions(-)
diff --git a/airflow/config_templates/config.yml
b/airflow/config_templates/config.yml
index da79a4f..64b852c 100644
--- a/airflow/config_templates/config.yml
+++ b/airflow/config_templates/config.yml
@@ -1248,6 +1248,12 @@
type: string
example: ~
default: "airflow.utils.email.send_email_smtp"
+ - name: email_conn_id
+ description: Email connection to use
+ version_added: ~
+ type: string
+ example: ~
+ default: "smtp_default"
- name: default_email_on_retry
description: |
Whether email alerts should be sent when a task is retried
diff --git a/airflow/config_templates/default_airflow.cfg
b/airflow/config_templates/default_airflow.cfg
index 3c9adeb..48d4111 100644
--- a/airflow/config_templates/default_airflow.cfg
+++ b/airflow/config_templates/default_airflow.cfg
@@ -620,6 +620,9 @@ session_lifetime_minutes = 43200
# Email backend to use
email_backend = airflow.utils.email.send_email_smtp
+# Email connection to use
+email_conn_id = smtp_default
+
# Whether email alerts should be sent when a task is retried
default_email_on_retry = True
diff --git a/airflow/config_templates/default_test.cfg
b/airflow/config_templates/default_test.cfg
index 767176d..8cc9305 100644
--- a/airflow/config_templates/default_test.cfg
+++ b/airflow/config_templates/default_test.cfg
@@ -80,6 +80,7 @@ page_size = 100
[email]
email_backend = airflow.utils.email.send_email_smtp
+email_conn_id = smtp_default
[smtp]
smtp_host = localhost
diff --git a/airflow/operators/email.py b/airflow/operators/email.py
index 4bccbc3..5ae5f80 100644
--- a/airflow/operators/email.py
+++ b/airflow/operators/email.py
@@ -63,6 +63,7 @@ class EmailOperator(BaseOperator):
bcc: Optional[Union[List[str], str]] = None,
mime_subtype: str = 'mixed',
mime_charset: str = 'utf-8',
+ conn_id: Optional[str] = None,
**kwargs,
) -> None:
super().__init__(**kwargs)
@@ -74,6 +75,7 @@ class EmailOperator(BaseOperator):
self.bcc = bcc
self.mime_subtype = mime_subtype
self.mime_charset = mime_charset
+ self.conn_id = conn_id
def execute(self, context):
send_email(
@@ -85,4 +87,5 @@ class EmailOperator(BaseOperator):
bcc=self.bcc,
mime_subtype=self.mime_subtype,
mime_charset=self.mime_charset,
+ conn_id=self.conn_id,
)
diff --git a/airflow/providers/sendgrid/utils/emailer.py
b/airflow/providers/sendgrid/utils/emailer.py
index f95fd3c..df832a4 100644
--- a/airflow/providers/sendgrid/utils/emailer.py
+++ b/airflow/providers/sendgrid/utils/emailer.py
@@ -21,6 +21,7 @@ import base64
import logging
import mimetypes
import os
+import warnings
from typing import Dict, Iterable, Optional, Union
import sendgrid
@@ -36,6 +37,8 @@ from sendgrid.helpers.mail import (
SandBoxMode,
)
+from airflow.exceptions import AirflowException
+from airflow.hooks.base import BaseHook
from airflow.utils.email import get_email_address_list
log = logging.getLogger(__name__)
@@ -43,7 +46,7 @@ log = logging.getLogger(__name__)
AddressesType = Union[str, Iterable[str]]
-def send_email(
+def send_email( # pylint: disable=too-many-locals
to: AddressesType,
subject: str,
html_content: str,
@@ -51,6 +54,7 @@ def send_email(
cc: Optional[AddressesType] = None,
bcc: Optional[AddressesType] = None,
sandbox_mode: bool = False,
+ conn_id: str = "sendgrid_default",
**kwargs,
) -> None:
"""
@@ -115,11 +119,25 @@ def send_email(
)
mail.add_attachment(attachment)
- _post_sendgrid_mail(mail.get())
-
-
-def _post_sendgrid_mail(mail_data: Dict) -> None:
- sendgrid_client =
sendgrid.SendGridAPIClient(api_key=os.environ.get('SENDGRID_API_KEY'))
+ _post_sendgrid_mail(mail.get(), conn_id)
+
+
+def _post_sendgrid_mail(mail_data: Dict, conn_id: str = "sendgrid_default") ->
None:
+ api_key = None
+ try:
+ conn = BaseHook.get_connection(conn_id)
+ api_key = conn.password
+ except AirflowException:
+ pass
+ if api_key is None:
+ warnings.warn(
+ "Fetching Sendgrid credentials from environment variables will be
deprecated in a future "
+ "release. Please set credentials using a connection instead.",
+ PendingDeprecationWarning,
+ stacklevel=2,
+ )
+ api_key = os.environ.get('SENDGRID_API_KEY')
+ sendgrid_client = sendgrid.SendGridAPIClient(api_key=api_key)
response = sendgrid_client.client.mail.send.post(request_body=mail_data)
# 2xx status code.
if 200 <= response.status_code < 300:
diff --git a/airflow/utils/email.py b/airflow/utils/email.py
index 8e4359b..7d17027 100644
--- a/airflow/utils/email.py
+++ b/airflow/utils/email.py
@@ -20,6 +20,7 @@ import collections.abc
import logging
import os
import smtplib
+import warnings
from email.mime.application import MIMEApplication
from email.mime.multipart import MIMEMultipart
from email.mime.text import MIMEText
@@ -27,7 +28,7 @@ from email.utils import formatdate
from typing import Any, Dict, Iterable, List, Optional, Tuple, Union
from airflow.configuration import conf
-from airflow.exceptions import AirflowConfigException
+from airflow.exceptions import AirflowConfigException, AirflowException
log = logging.getLogger(__name__)
@@ -36,16 +37,18 @@ def send_email(
to: Union[List[str], Iterable[str]],
subject: str,
html_content: str,
- files=None,
- dryrun=False,
- cc=None,
- bcc=None,
- mime_subtype='mixed',
- mime_charset='utf-8',
+ files: Optional[List[str]] = None,
+ dryrun: bool = False,
+ cc: Optional[Union[str, Iterable[str]]] = None,
+ bcc: Optional[Union[str, Iterable[str]]] = None,
+ mime_subtype: str = 'mixed',
+ mime_charset: str = 'utf-8',
+ conn_id: Optional[str] = None,
**kwargs,
):
"""Send email using backend specified in EMAIL_BACKEND."""
backend = conf.getimport('email', 'EMAIL_BACKEND')
+ backend_conn_id = conn_id or conf.get("email", "EMAIL_CONN_ID")
to_list = get_email_address_list(to)
to_comma_separated = ", ".join(to_list)
@@ -59,6 +62,7 @@ def send_email(
bcc=bcc,
mime_subtype=mime_subtype,
mime_charset=mime_charset,
+ conn_id=backend_conn_id,
**kwargs,
)
@@ -73,6 +77,7 @@ def send_email_smtp(
bcc: Optional[Union[str, Iterable[str]]] = None,
mime_subtype: str = 'mixed',
mime_charset: str = 'utf-8',
+ conn_id: str = "smtp_default",
**kwargs,
):
"""
@@ -94,7 +99,7 @@ def send_email_smtp(
mime_charset=mime_charset,
)
- send_mime_email(e_from=smtp_mail_from, e_to=recipients, mime_msg=msg,
dryrun=dryrun)
+ send_mime_email(e_from=smtp_mail_from, e_to=recipients, mime_msg=msg,
conn_id=conn_id, dryrun=dryrun)
def build_mime_message(
@@ -162,7 +167,9 @@ def build_mime_message(
return msg, recipients
-def send_mime_email(e_from: str, e_to: List[str], mime_msg: MIMEMultipart,
dryrun: bool = False) -> None:
+def send_mime_email(
+ e_from: str, e_to: List[str], mime_msg: MIMEMultipart, conn_id: str =
"smtp_default", dryrun: bool = False
+) -> None:
"""Send MIME email."""
smtp_host = conf.get('smtp', 'SMTP_HOST')
smtp_port = conf.getint('smtp', 'SMTP_PORT')
@@ -173,11 +180,28 @@ def send_mime_email(e_from: str, e_to: List[str],
mime_msg: MIMEMultipart, dryru
smtp_user = None
smtp_password = None
- try:
- smtp_user = conf.get('smtp', 'SMTP_USER')
- smtp_password = conf.get('smtp', 'SMTP_PASSWORD')
- except AirflowConfigException:
- log.debug("No user/password found for SMTP, so logging in with no
authentication.")
+ smtp_user, smtp_password = None, None
+ if conn_id is not None:
+ try:
+ from airflow.hooks.base import BaseHook
+
+ conn = BaseHook.get_connection(conn_id)
+ smtp_user = conn.login
+ smtp_password = conn.password
+ except AirflowException:
+ pass
+ if smtp_user is None or smtp_password is None:
+ warnings.warn(
+ "Fetching SMTP credentials from configuration variables will be
deprecated in a future "
+ "release. Please set credentials using a connection instead.",
+ PendingDeprecationWarning,
+ stacklevel=2,
+ )
+ try:
+ smtp_user = conf.get('smtp', 'SMTP_USER')
+ smtp_password = conf.get('smtp', 'SMTP_PASSWORD')
+ except AirflowConfigException:
+ log.debug("No user/password found for SMTP, so logging in with no
authentication.")
if not dryrun:
for attempt in range(1, smtp_retry_limit + 1):
diff --git a/tests/providers/sendgrid/utils/test_emailer.py
b/tests/providers/sendgrid/utils/test_emailer.py
index bb1a5f2..cb6232c 100644
--- a/tests/providers/sendgrid/utils/test_emailer.py
+++ b/tests/providers/sendgrid/utils/test_emailer.py
@@ -95,7 +95,7 @@ class TestSendEmailSendGrid(unittest.TestCase):
bcc=self.bcc,
files=[f.name],
)
- mock_post.assert_called_once_with(expected_mail_data)
+ mock_post.assert_called_once_with(expected_mail_data,
"sendgrid_default")
# Test the right email is constructed.
@mock.patch.dict('os.environ', SENDGRID_MAIL_FROM='f...@bar.com',
SENDGRID_MAIL_SENDER='Foo')
@@ -110,7 +110,7 @@ class TestSendEmailSendGrid(unittest.TestCase):
personalization_custom_args=self.personalization_custom_args,
categories=self.categories,
)
- mock_post.assert_called_once_with(self.expected_mail_data_extras)
+ mock_post.assert_called_once_with(self.expected_mail_data_extras,
"sendgrid_default")
@mock.patch.dict('os.environ', clear=True)
@mock.patch('airflow.providers.sendgrid.utils.emailer._post_sendgrid_mail')
@@ -124,4 +124,4 @@ class TestSendEmailSendGrid(unittest.TestCase):
from_email='f...@foo.bar',
from_name='Foo Bar',
)
- mock_post.assert_called_once_with(self.expected_mail_data_sender)
+ mock_post.assert_called_once_with(self.expected_mail_data_sender,
"sendgrid_default")
diff --git a/tests/utils/test_email.py b/tests/utils/test_email.py
index a34dc7d..b680fdc 100644
--- a/tests/utils/test_email.py
+++ b/tests/utils/test_email.py
@@ -76,6 +76,7 @@ class TestEmail(unittest.TestCase):
def setUp(self):
conf.remove_option('email', 'EMAIL_BACKEND')
+ conf.remove_option('email', 'EMAIL_CONN_ID')
@mock.patch('airflow.utils.email.send_email')
def test_default_backend(self, mock_send_email):
@@ -97,6 +98,7 @@ class TestEmail(unittest.TestCase):
bcc=None,
mime_charset='utf-8',
mime_subtype='mixed',
+ conn_id='smtp_default',
)
assert not mock_send_email.called
@@ -192,6 +194,20 @@ class TestEmailSmtp(unittest.TestCase):
mock_smtp.return_value.sendmail.assert_called_once_with('from', 'to',
msg.as_string())
assert mock_smtp.return_value.quit.called
+ @mock.patch('smtplib.SMTP')
+ @mock.patch('airflow.hooks.base.BaseHook')
+ def test_send_mime_conn_id(self, mock_hook, mock_smtp):
+ msg = MIMEMultipart()
+ mock_conn = mock.Mock()
+ mock_conn.login = 'user'
+ mock_conn.password = 'password'
+ mock_hook.get_connection.return_value = mock_conn
+ utils.email.send_mime_email('from', 'to', msg, dryrun=False,
conn_id='smtp_default')
+ mock_hook.get_connection.assert_called_with('smtp_default')
+ mock_smtp.return_value.login.assert_called_once_with('user',
'password')
+ mock_smtp.return_value.sendmail.assert_called_once_with('from', 'to',
msg.as_string())
+ assert mock_smtp.return_value.quit.called
+
@mock.patch('smtplib.SMTP_SSL')
@mock.patch('smtplib.SMTP')
def test_send_mime_ssl(self, mock_smtp, mock_smtp_ssl):
