Skip to content

Using settings from connection #34556

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
cropland-bv wants to merge 1 commit into from
Closed

Using settings from connection #34556

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 27 additions & 13 deletions airflow/utils/email.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
from __future__ import annotations

import collections.abc
import json
import logging
import os
import smtplib
Expand All @@ -33,6 +34,7 @@

from airflow.configuration import conf
from airflow.exceptions import AirflowConfigException, AirflowException, RemovedInAirflow3Warning
from airflow.hooks.base import BaseHook

log = logging.getLogger(__name__)

Expand Down Expand Up @@ -128,6 +130,10 @@ def send_email_smtp(
>>> send_email('test@example.com', 'foo', '<b>Foo</b> bar', ['/dev/null'], dryrun=True)
"""
smtp_mail_from = conf.get("smtp", "SMTP_MAIL_FROM")
if conn_id is not None:
airflow_conn = BaseHook.get_connection(conn_id)
extra = json.loads(airflow_conn.extra)

@Taragolis Taragolis Sep 22, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
extra = json.loads(airflow_conn.extra)
extra = airflow_conn.extra_dejson

smtp_mail_from = extra.get("from_email", smtp_mail_from)

if smtp_mail_from is not None:
mail_from = smtp_mail_from
Expand Down Expand Up @@ -245,11 +251,18 @@ def send_mime_email(

if conn_id is not None:
try:
from airflow.hooks.base import BaseHook

airflow_conn = BaseHook.get_connection(conn_id)
smtp_user = airflow_conn.login
smtp_password = airflow_conn.password
smtp_host = airflow_conn.host
smtp_port = airflow_conn.port

extra = json.loads(airflow_conn.extra)

@Taragolis Taragolis Sep 22, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
extra = json.loads(airflow_conn.extra)
extra = airflow_conn.extra_dejson


smtp_starttls = not extra.get("disable_tls", not smtp_starttls)
smtp_timeout = int(extra.get("timeout", smtp_timeout))
smtp_retry_limit = int(extra.get("retry_limit", smtp_retry_limit))
smtp_ssl = not extra.get("disable_ssl", not smtp_ssl)
except AirflowException:
pass
if smtp_user is None or smtp_password is None:
Expand All @@ -271,17 +284,18 @@ def send_mime_email(
try:
smtp_conn = _get_smtp_connection(smtp_host, smtp_port, smtp_timeout, smtp_ssl)
except smtplib.SMTPServerDisconnected:
if attempt == smtp_retry_limit:
raise
else:
if smtp_starttls:
smtp_conn.starttls()
if smtp_user and smtp_password:
smtp_conn.login(smtp_user, smtp_password)
log.info("Sent an alert email to %s", e_to)
smtp_conn.sendmail(e_from, e_to, mime_msg.as_string())
smtp_conn.quit()
break
if attempt < smtp_retry_limit:
continue
raise

if smtp_starttls:
smtp_conn.starttls()
if smtp_user and smtp_password:
smtp_conn.login(smtp_user, smtp_password)
log.info("Sent an alert email to %s", e_to)
smtp_conn.sendmail(e_from, e_to, mime_msg.as_string())
smtp_conn.quit()
break


def get_email_address_list(addresses: str | Iterable[str]) -> list[str]:
Expand Down