Ensure that SMTP message body is not empty

src/commcare_cloud/commands/deploy/utils.py

@@ -60,27 +60,30 @@ def send_deploy_start_email(environment, context):
         and context.revision is not None
     )
     env_name = environment.meta_config.deploy_env
-    subject = f"{context.user} has initiated a {context.service_name} deploy to {env_name}"
+    message = f"{context.user} has initiated a {context.service_name} deploy to {env_name}"
     prefix = ""
     if is_nonstandard_deploy_time:
-        subject += " outside maintenance window"
+        message += " outside maintenance window"
         prefix = "ATTENTION: "
     if is_non_default_branch:
-        subject += f" with non-default branch '{context.revision}'"
+        message += f" with non-default branch '{context.revision}'"
         prefix = "ATTENTION: "
-    subject = f"{prefix}{subject}"
+    message = f"{prefix}{message}"
 
     send_email(
         environment,
-        subject=subject,
+        subject=message,
+        message=message,
     )
 
 
 def record_deploy_failed(environment, context):
     notify_slack_deploy_end(environment, context, is_success=False)
+    message = f"{context.service_name} deploy to {environment.name} failed"
     send_email(
         environment,
-        subject=f"{context.service_name} deploy to {environment.name} failed",
+        subject=message,
+        message=message,
     )
 
 
@@ -96,16 +99,19 @@ def announce_deploy_success(environment, context):
     )
 
 
-def send_email(environment, subject, message='', to_admins=True, recipients=None):
+def send_email(environment, subject, message, to_admins=True, recipients=None):
     """
     Call a Django management command to send an email.
 
-    :param environment: The Environement object
+    :param environment: The Environment object
     :param subject: Email subject
-    :param message: Email message
+    :param message: Email message body
     :param to_admins: True if mail should be sent to Django admins
     :param recipients: List of additional addresses to send mail to
     """
+    if not message:
+        raise ValueError('Some cloud hosting providers require a message body')
+
     if environment.fab_settings_config.email_enabled:
         print(color_summary(f">> Sending email: {subject}"))
         args = [