Compare commits

..

3 Commits

Author SHA1 Message Date
Ompragash Viswanathan 6cdc129e0b Update base image version to fix sec vuln and renamed Dockerfiles for clarity 2024-11-13 16:52:46 +05:30
architmallik7 00423fe0b9 fix 2024-05-03 19:15:41 +05:30
architmallik7 e56738efed Added Map for storing email 2024-05-03 17:43:16 +05:30
4 changed files with 31 additions and 19 deletions
@@ -1,11 +1,11 @@
FROM golang:1.22.1-alpine as builder FROM golang:1.22.7-alpine as builder
WORKDIR /go/src/drone-email WORKDIR /go/src/drone-email
COPY . . COPY . .
RUN GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build RUN GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build
FROM alpine:3.14 FROM alpine:3.20
RUN apk add --no-cache ca-certificates tzdata RUN apk add --no-cache ca-certificates tzdata
@@ -1,11 +1,11 @@
FROM golang:1.22.1-alpine as builder FROM golang:1.22.7-alpine as builder
WORKDIR /go/src/drone-email WORKDIR /go/src/drone-email
COPY . . COPY . .
RUN GOOS=linux GOARCH=arm GOARM=7 CGO_ENABLED=0 go build RUN GOOS=linux GOARCH=arm GOARM=7 CGO_ENABLED=0 go build
FROM alpine:3.14 FROM alpine:3.20
RUN apk add --no-cache ca-certificates tzdata RUN apk add --no-cache ca-certificates tzdata
+1 -1
View File
@@ -1,3 +1,3 @@
module github.com/drone-plugins/drone-email module github.com/drone-plugins/drone-email
go 1.22.1 go 1.22.7
+26 -14
View File
@@ -118,31 +118,46 @@ type (
func (p Plugin) Exec() error { func (p Plugin) Exec() error {
var dialer *gomail.Dialer var dialer *gomail.Dialer
if !p.Config.RecipientsOnly { recipientsMap := make(map[string]struct{})
exists := false
for _, recipient := range p.Config.Recipients {
if recipient == p.Commit.Author.Email {
exists = true
}
}
if !exists { // Add recipients from the config
p.Config.Recipients = append(p.Config.Recipients, p.Commit.Author.Email) for _, recipient := range p.Config.Recipients {
if recipient == "" {
log.Warnf("Skipping empty recipient from config")
continue
}
recipientsMap[recipient] = struct{}{}
}
// Add commit author's email if not already present and RecipientsOnly is false
if !p.Config.RecipientsOnly {
if p.Commit.Author.Email != "" {
recipientsMap[p.Commit.Author.Email] = struct{}{}
} else {
log.Warn("Commit author email is empty")
} }
} }
// Add recipients from the recipients file
if p.Config.RecipientsFile != "" { if p.Config.RecipientsFile != "" {
f, err := os.Open(p.Config.RecipientsFile) f, err := os.Open(p.Config.RecipientsFile)
if err == nil { if err == nil {
scanner := bufio.NewScanner(f) scanner := bufio.NewScanner(f)
for scanner.Scan() { for scanner.Scan() {
p.Config.Recipients = append(p.Config.Recipients, scanner.Text()) recipient := scanner.Text()
if recipient == "" {
log.Warnf("Skipping empty recipient from file %s", p.Config.RecipientsFile)
continue
}
recipientsMap[recipient] = struct{}{}
} }
} else { } else {
log.Errorf("Could not open RecipientsFile %s: %v", p.Config.RecipientsFile, err) log.Errorf("Could not open RecipientsFile %s: %v", p.Config.RecipientsFile, err)
} }
} }
log.Infof("Recipients: %v", recipientsMap)
if p.Config.Username == "" && p.Config.Password == "" { if p.Config.Username == "" && p.Config.Password == "" {
dialer = &gomail.Dialer{Host: p.Config.Host, Port: p.Config.Port} dialer = &gomail.Dialer{Host: p.Config.Host, Port: p.Config.Port}
} else { } else {
@@ -216,10 +231,7 @@ func (p Plugin) Exec() error {
// Send emails // Send emails
message := gomail.NewMessage() message := gomail.NewMessage()
for _, recipient := range p.Config.Recipients { for recipient := range recipientsMap {
if len(recipient) == 0 {
continue
}
message.SetAddressHeader("From", p.Config.FromAddress, p.Config.FromName) message.SetAddressHeader("From", p.Config.FromAddress, p.Config.FromName)
message.SetAddressHeader("To", recipient, "") message.SetAddressHeader("To", recipient, "")
message.SetHeader("Subject", subject) message.SetHeader("Subject", subject)