Skip to content

verbosity and default sender name and email address #75

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

Open
hyung-hwan wants to merge 3 commits into
base: master
Choose a base branch
from
Open

verbosity and default sender name and email address #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8ae1878
set the sender email address and the name from the committer if they …
hyung-hwan Oct 13, 2023
186fb78
added the verbose/PLUGIN_VERBOSE option to emit some informational text
hyung-hwan Oct 13, 2023
0b64cbd
removed Password from the debug output
hyung-hwan Oct 13, 2023
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
6 changes: 6 additions & 0 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,11 @@ func main() {
app.Version = "2.0.2"
app.Flags = []cli.Flag{
// Plugin environment
cli.BoolFlag{
Name: "verbose",
Usage: "set verbosity",
EnvVar: "PLUGIN_VERBOSE",
},
cli.StringFlag{
Name: "from",
Usage: "from address",
Expand Down Expand Up @@ -405,6 +410,7 @@ func run(c *cli.Context) error {
PullRequest: c.Int("pullRequest"),
DeployTo: c.String("deployTo"),
Config: Config{
Verbose: c.Bool("verbose"),
FromAddress: fromAddress,
FromName: c.String("from.name"),
Host: c.String("host"),
Expand Down
25 changes: 24 additions & 1 deletion plugin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ type (
}

Config struct {
Verbose bool
FromAddress string
FromName string
Host string
Expand Down Expand Up @@ -143,6 +144,10 @@ func (p Plugin) Exec() error {
}
}

if p.Config.Verbose {
log.Infof ("Host [%s], Port [%d], Username [%s]", p.Config.Host, p.Config.Port, p.Config.Username);
}

if p.Config.Username == "" && p.Config.Password == "" {
dialer = &gomail.Dialer{Host: p.Config.Host, Port: p.Config.Port}
} else {
Expand Down Expand Up @@ -220,7 +225,25 @@ func (p Plugin) Exec() error {
if len(recipient) == 0 {
continue
}
message.SetAddressHeader("From", p.Config.FromAddress, p.Config.FromName)

from_address := p.Config.FromAddress
from_name := p.Config.FromName
if from_address == "" {
from_address = p.Commit.Author.Email
if from_address == "" {
from_address = recipient
}

if from_name == "" { // only if from_address is blank as well
from_name = p.Commit.Author.Name
}
}

if p.Config.Verbose {
log.Infof ("Recipient [%s] From [%s <%s>]", recipient, from_name, from_address)
}

message.SetAddressHeader("From", from_address, from_name)
message.SetAddressHeader("To", recipient, "")
message.SetHeader("Subject", subject)
message.AddAlternative("text/plain", plainBody)
Expand Down