From 559c127876ebd4b130d97ddbf52f58d57cf040ea Mon Sep 17 00:00:00 2001 From: viktorbarzin Date: Fri, 9 Apr 2021 21:07:50 +0100 Subject: [PATCH] fix bug where alway overwrite... --- cli/email_alias.go | 10 ++++------ modules/kubernetes/mailserver/extra/aliases.txt | 1 - 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/cli/email_alias.go b/cli/email_alias.go index 48ee6ab8..173bb46d 100644 --- a/cli/email_alias.go +++ b/cli/email_alias.go @@ -28,7 +28,6 @@ func addEmailAlias(gitFs *GitFS, to, fromDomain string) (string, error) { } aliasEmail := generateRandomEmail(fromDomain) glog.Infof("adding %s -> %s alias to %s", aliasEmail, to, emailAliasesConfigFileRelative) - contents := fmt.Sprintf("%s %s", aliasEmail, to) // Read existing contents fRead, err := (*gitFs.fs).OpenFile(emailAliasesConfigFileRelative, os.O_RDONLY, 0644) @@ -40,20 +39,19 @@ func addEmailAlias(gitFs *GitFS, to, fromDomain string) (string, error) { return "", errors.Wrapf(err, "failed to read existing aliases file") } glog.Infof("current aliases file contents: \n%s", string(fileContentsBytes)) - fRead.Close() - newContents := getAddedAliasContents(string(fileContentsBytes), aliasEmail, to) + defer fRead.Close() + newContents := getAddedAliasContents(string(fileContentsBytes), aliasEmail, to) // Write new contents fWrite, err := (*gitFs.fs).OpenFile(emailAliasesConfigFileRelative, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0644) if err != nil { return "", errors.Wrapf(err, "failed to open file where new email alias will be added") } - defer fWrite.Close() - glog.Infof("writing new contents to file: \n%s", newContents) - if _, err = fWrite.Write([]byte(contents)); err != nil { + if _, err = fWrite.Write([]byte(newContents)); err != nil { return "", errors.Wrapf(err, "failed to write config to file") } + defer fWrite.Close() return aliasEmail, nil } diff --git a/modules/kubernetes/mailserver/extra/aliases.txt b/modules/kubernetes/mailserver/extra/aliases.txt index c7aa8ae5..e69de29b 100644 --- a/modules/kubernetes/mailserver/extra/aliases.txt +++ b/modules/kubernetes/mailserver/extra/aliases.txt @@ -1 +0,0 @@ -officially-emelie-generated@viktorbarzin.me vbarzin@gmail.come \ No newline at end of file