ROX-23249: multiple emailsender issues discovered by debugging

dp-terraform/helm/rhacs-terraform/values.yaml

@@ -76,6 +76,7 @@ emailsender:
   clusterId: ""
   clusterName: ""
   environment: ""
+  senderAddress: "[email protected]"
   authConfigFromKubernetes: true
   resources:
     requests:

emailsender/cmd/app/main.go

@@ -44,8 +44,8 @@ func main() {
 		glog.Errorf("Failed to initialise SES Client: %v", err)
 		os.Exit(1)
 	}
-	temporarySenderName := "[email protected]"
-	emailSender := email.NewEmailSender(temporarySenderName, sesClient)
+
+	emailSender := email.NewEmailSender(cfg.SenderAddress, sesClient)
 	emailHandler := api.NewEmailHandler(emailSender)
 
 	router, err := api.SetupRoutes(cfg.AuthConfig, emailHandler)

emailsender/config/config.go

@@ -36,6 +36,7 @@ type Config struct {
 	MetricsAddress           string `env:"METRICS_ADDRESS" envDefault:":9090"`
 	AuthConfigFile           string `env:"AUTH_CONFIG_FILE" envDefault:"config/emailsender-authz.yaml"`
 	AuthConfigFromKubernetes bool   `env:"AUTH_CONFIG_FROM_KUBERNETES" envDefault:"false"`
+	SenderAddress            string `env:"SENDER_ADDRESS" envDefault:"[email protected]"`
 	AuthConfig               AuthConfig
 }
 

emailsender/pkg/api/emailhandler.go

@@ -18,8 +18,8 @@ type EmailHandler struct {
 
 // SendEmailRequest represents API requests for sending email
 type SendEmailRequest struct {
-	To         []string
-	RawMessage []byte
+	To         []string `json:"to"`
+	RawMessage []byte   `json:"rawMessage"`
 }
 
 type Envelope map[string]interface{}

emailsender/pkg/email/sender.go

@@ -1,29 +1,41 @@
 package email
 
 import (
+	"bytes"
 	"context"
 	"fmt"
+
 	"github.com/golang/glog"
 )
 
+const fromTemplate = "From: RHACS Cloud Service <%s>\r\n"
+
+// Sender defines the interface to send emails
 type Sender interface {
 	Send(ctx context.Context, to []string, rawMessage []byte) error
 }
 
+// MailSender is the default implementation for the Sender interface
 type MailSender struct {
 	from string
 	ses  *SES
 }
 
+// NewEmailSender returns a new MailSender instance
 func NewEmailSender(from string, ses *SES) *MailSender {
 	return &MailSender{
 		from: from,
 		ses:  ses,
 	}
 }
 
+// Send sends an email to the given AWS SES
 func (s *MailSender) Send(ctx context.Context, to []string, rawMessage []byte) error {
-	_, err := s.ses.SendRawEmail(ctx, s.from, to, rawMessage)
+	// Even though AWS adds the from handler we need to set it the the message to show
+	// an alias in email inboxes that is more human friendly ([email protected] vs. RHACS Cloud Service)
+	fromBytes := []byte(fmt.Sprintf(fromTemplate, s.from))
+	raw := bytes.Join([][]byte{fromBytes, rawMessage}, nil)
+	_, err := s.ses.SendRawEmail(ctx, s.from, to, raw)
 	if err != nil {
 		glog.Errorf("Failed sending email: %v", err)
 		return fmt.Errorf("failed to send email: %v", err)