From 6b1ccd31366de0e464aee3a4e30c44b71f6d628d Mon Sep 17 00:00:00 2001 From: Shawn Wilson Date: Fri, 10 May 2019 15:18:25 -0400 Subject: [PATCH 001/120] Added support for adding/updating mailbox display name. --- cmd/mailbox.go | 1 + cmd/mailboxAdd.go | 5 +++-- cmd/mailboxInfo.go | 1 + cmd/mailboxList.go | 4 ++-- cmd/mailboxUpdate.go | 16 +++++++++++++--- iredmail/mailbox.go | 23 +++++++++++++++++++++-- iredmail/mailboxAlias.go | 2 +- 7 files changed, 42 insertions(+), 10 deletions(-) diff --git a/cmd/mailbox.go b/cmd/mailbox.go index 0c7fb82..2a500a6 100644 --- a/cmd/mailbox.go +++ b/cmd/mailbox.go @@ -7,6 +7,7 @@ import ( var ( quota int storageBasePath string + displayName string ) var mailboxCmd = &cobra.Command{ diff --git a/cmd/mailboxAdd.go b/cmd/mailboxAdd.go index 7cf48a9..31dd707 100644 --- a/cmd/mailboxAdd.go +++ b/cmd/mailboxAdd.go @@ -24,7 +24,7 @@ var mailboxAddCmd = &cobra.Command{ } if len(args[1]) < passwordMinLength { - return errors.New("[PLAIN_PASSWORD] length to short (min length " + strconv.Itoa(passwordMinLength) + ")") + return errors.New("[PLAIN_PASSWORD] length too short (min length " + strconv.Itoa(passwordMinLength) + ")") } return nil @@ -37,7 +37,7 @@ var mailboxAddCmd = &cobra.Command{ defer server.Close() mailboxEmail, password := args[0], args[1] - err = server.MailboxAdd(mailboxEmail, password, quota, storageBasePath) + err = server.MailboxAdd(mailboxEmail, password, quota, storageBasePath, displayName) if err != nil { fatal("%v\n", err) } @@ -51,6 +51,7 @@ func init() { mailboxAddCmd.Flags().IntVarP("a, "quota", "q", 2048, "Quota (default 2048 MB)") mailboxAddCmd.Flags().StringVarP(&storageBasePath, "storage-path", "s", "/var/vmail/vmail1", "Storage base path") + mailboxAddCmd.Flags().StringVarP(&displayName, "name", "n", "", "Display Name") mailboxAddCmd.SetUsageTemplate(usageTemplate("mailbox add [MAILBOX_EMAIL] [PLAIN_PASSWORD]", printFlags)) } diff --git a/cmd/mailboxInfo.go b/cmd/mailboxInfo.go index 388d11e..1bafa58 100644 --- a/cmd/mailboxInfo.go +++ b/cmd/mailboxInfo.go @@ -72,6 +72,7 @@ func printMailboxInfo(mailbox iredmail.Mailbox, prettyPrint bool) { table.SetColumnColor(tablewriter.Colors{tablewriter.Bold}, tablewriter.Colors{}) } + table.Append([]string{"Display Name", mailbox.Name}) table.Append([]string{"Quota", fmt.Sprintf("%v MB", strconv.Itoa(mailbox.Quota))}) if len(mailbox.MailboxAliases) > 0 { diff --git a/cmd/mailboxList.go b/cmd/mailboxList.go index 929431b..eb33675 100644 --- a/cmd/mailboxList.go +++ b/cmd/mailboxList.go @@ -50,10 +50,10 @@ func printUserList(mailboxes iredmail.Mailboxes) { } table := tablewriter.NewWriter(os.Stdout) - table.SetHeader([]string{"Mailbox", "Quota (MB)"}) + table.SetHeader([]string{"Display Name", "Mailbox", "Quota (MB)"}) for _, m := range mailboxes { - table.Append([]string{m.Email, strconv.Itoa(m.Quota)}) + table.Append([]string{m.Name, m.Email, strconv.Itoa(m.Quota)}) } table.Render() } diff --git a/cmd/mailboxUpdate.go b/cmd/mailboxUpdate.go index 6fa8388..6710b0b 100644 --- a/cmd/mailboxUpdate.go +++ b/cmd/mailboxUpdate.go @@ -31,8 +31,8 @@ var ( // mailboxUpdateCmd represents the 'mailbox update' command var mailboxUpdateCmd = &cobra.Command{ Use: "update", - Short: "Update keep-copy and quota", - Long: `Update keep-copy and quota. + Short: "Update keep-copy, password, quota, and name", + Long: `Update keep-copy, password, quota, and name. -k, --keep-copy: If mailboxes with forwardings should not keep a copy of the forwarded email use "--keep-copy no". @@ -74,6 +74,15 @@ Set quota "--quota 4096" (in MB).`, updated = true } + if cmd.Flag("name").Changed { + err = server.MailboxSetName(mailboxEmail, displayName) + if err != nil { + fatal("%v\n", err) + } + info("Updating quota...\n") + updated = true + } + if cmd.Flag("keep-copy").Changed { err := server.MailboxSetKeepCopy(mailboxEmail, keepCopyInMailbox == "yes") if err != nil { @@ -86,7 +95,7 @@ Set quota "--quota 4096" (in MB).`, if cmd.Flag("password").Changed { pw := cmd.Flag("password").Value.String() if len(pw) < passwordMinLength { - fatal("password length to short (min length " + strconv.Itoa(passwordMinLength) + ")") + fatal("password length too short (min length " + strconv.Itoa(passwordMinLength) + ")") } err := server.MailboxSetPassword(mailboxEmail, pw) if err != nil { @@ -110,6 +119,7 @@ func init() { mailboxUpdateCmd.Flags().IntVarP("a, "quota", "q", 2048, "Sets quota (in MB)") mailboxUpdateCmd.Flags().StringVarP(&keepCopyInMailbox, "keep-copy", "k", "yes", "Sets keep-copy of forwardings") mailboxUpdateCmd.Flags().StringP("password", "p", "", "Set password") + mailboxUpdateCmd.Flags().StringVarP(&displayName, "name", "n", "", "Display Name") mailboxUpdateCmd.SetUsageTemplate(usageTemplate("mailbox update [MAILBOX_EMAIL]", printFlags)) } diff --git a/iredmail/mailbox.go b/iredmail/mailbox.go index 2d8a486..4cb613f 100644 --- a/iredmail/mailbox.go +++ b/iredmail/mailbox.go @@ -129,9 +129,13 @@ func (s *Server) Mailbox(mailboxEmail string) (Mailbox, error) { } // MailboxAdd adds a new mailbox -func (s *Server) MailboxAdd(mailboxEmail, password string, quota int, storageBasePath string) error { +func (s *Server) MailboxAdd(mailboxEmail, password string, quota int, storageBasePath string, displayName string) error { name, domain := parseEmail(mailboxEmail) + if displayName != "" { + name = displayName + } + m := Mailbox{ Email: mailboxEmail, Name: name, @@ -200,7 +204,7 @@ func (s *Server) MailboxAdd(mailboxEmail, password string, quota int, storageBas return err } -// MailboxDelete delets a mailbox +// MailboxDelete deletes a mailbox func (s *Server) MailboxDelete(mailboxEmail string) error { mailboxExists, err := s.mailboxExists(mailboxEmail) if err != nil { @@ -254,6 +258,21 @@ func (s *Server) MailboxSetQuota(mailboxEmail string, quota int) error { return err } + +// MailboxSetName sets the mailbox display name +func (s *Server) MailboxSetName(mailboxEmail string, displayName string) error { + sqlQuery := `UPDATE mailbox + SET name = ? + WHERE username = ?;` + _, err := s.DB.Exec(sqlQuery, displayName, mailboxEmail) + if err != nil { + return err + } + + return err +} + + // MailboxSetKeepCopy sets the keep-copy behavior if forwardings exist func (s *Server) MailboxSetKeepCopy(mailboxEmail string, keepCopyInMailbox bool) error { mailboxExists, err := s.mailboxExists(mailboxEmail) diff --git a/iredmail/mailboxAlias.go b/iredmail/mailboxAlias.go index b621ff8..d10f0a3 100644 --- a/iredmail/mailboxAlias.go +++ b/iredmail/mailboxAlias.go @@ -82,7 +82,7 @@ func (s *Server) MailboxAliasDelete(aliasEmail string) error { return err } -// MailboxAliasDeleteAll delets all mailbox aliases of a mailbox +// MailboxAliasDeleteAll deletes all mailbox aliases of a mailbox func (s *Server) MailboxAliasDeleteAll(mailboxEmail string) error { sqlQuery := "DELETE FROM forwardings WHERE forwarding = ? AND is_forwarding = 0 AND is_alias = 1 AND is_list = 0;" _, err := s.DB.Exec(sqlQuery, mailboxEmail) From a4cf7959524f7f5c26d27343cc7a524658e4828f Mon Sep 17 00:00:00 2001 From: Shawn Wilson Date: Fri, 10 May 2019 15:18:25 -0400 Subject: [PATCH 002/120] Added support for adding/updating mailbox display name. --- cmd/mailbox.go | 1 + cmd/mailboxAdd.go | 5 +++-- cmd/mailboxInfo.go | 1 + cmd/mailboxList.go | 4 ++-- cmd/mailboxUpdate.go | 16 +++++++++++++--- iredmail/mailbox.go | 23 +++++++++++++++++++++-- iredmail/mailboxAlias.go | 2 +- 7 files changed, 42 insertions(+), 10 deletions(-) diff --git a/cmd/mailbox.go b/cmd/mailbox.go index 0c7fb82..2a500a6 100644 --- a/cmd/mailbox.go +++ b/cmd/mailbox.go @@ -7,6 +7,7 @@ import ( var ( quota int storageBasePath string + displayName string ) var mailboxCmd = &cobra.Command{ diff --git a/cmd/mailboxAdd.go b/cmd/mailboxAdd.go index 7cf48a9..31dd707 100644 --- a/cmd/mailboxAdd.go +++ b/cmd/mailboxAdd.go @@ -24,7 +24,7 @@ var mailboxAddCmd = &cobra.Command{ } if len(args[1]) < passwordMinLength { - return errors.New("[PLAIN_PASSWORD] length to short (min length " + strconv.Itoa(passwordMinLength) + ")") + return errors.New("[PLAIN_PASSWORD] length too short (min length " + strconv.Itoa(passwordMinLength) + ")") } return nil @@ -37,7 +37,7 @@ var mailboxAddCmd = &cobra.Command{ defer server.Close() mailboxEmail, password := args[0], args[1] - err = server.MailboxAdd(mailboxEmail, password, quota, storageBasePath) + err = server.MailboxAdd(mailboxEmail, password, quota, storageBasePath, displayName) if err != nil { fatal("%v\n", err) } @@ -51,6 +51,7 @@ func init() { mailboxAddCmd.Flags().IntVarP("a, "quota", "q", 2048, "Quota (default 2048 MB)") mailboxAddCmd.Flags().StringVarP(&storageBasePath, "storage-path", "s", "/var/vmail/vmail1", "Storage base path") + mailboxAddCmd.Flags().StringVarP(&displayName, "name", "n", "", "Display Name") mailboxAddCmd.SetUsageTemplate(usageTemplate("mailbox add [MAILBOX_EMAIL] [PLAIN_PASSWORD]", printFlags)) } diff --git a/cmd/mailboxInfo.go b/cmd/mailboxInfo.go index 388d11e..1bafa58 100644 --- a/cmd/mailboxInfo.go +++ b/cmd/mailboxInfo.go @@ -72,6 +72,7 @@ func printMailboxInfo(mailbox iredmail.Mailbox, prettyPrint bool) { table.SetColumnColor(tablewriter.Colors{tablewriter.Bold}, tablewriter.Colors{}) } + table.Append([]string{"Display Name", mailbox.Name}) table.Append([]string{"Quota", fmt.Sprintf("%v MB", strconv.Itoa(mailbox.Quota))}) if len(mailbox.MailboxAliases) > 0 { diff --git a/cmd/mailboxList.go b/cmd/mailboxList.go index 929431b..eb33675 100644 --- a/cmd/mailboxList.go +++ b/cmd/mailboxList.go @@ -50,10 +50,10 @@ func printUserList(mailboxes iredmail.Mailboxes) { } table := tablewriter.NewWriter(os.Stdout) - table.SetHeader([]string{"Mailbox", "Quota (MB)"}) + table.SetHeader([]string{"Display Name", "Mailbox", "Quota (MB)"}) for _, m := range mailboxes { - table.Append([]string{m.Email, strconv.Itoa(m.Quota)}) + table.Append([]string{m.Name, m.Email, strconv.Itoa(m.Quota)}) } table.Render() } diff --git a/cmd/mailboxUpdate.go b/cmd/mailboxUpdate.go index 6fa8388..6710b0b 100644 --- a/cmd/mailboxUpdate.go +++ b/cmd/mailboxUpdate.go @@ -31,8 +31,8 @@ var ( // mailboxUpdateCmd represents the 'mailbox update' command var mailboxUpdateCmd = &cobra.Command{ Use: "update", - Short: "Update keep-copy and quota", - Long: `Update keep-copy and quota. + Short: "Update keep-copy, password, quota, and name", + Long: `Update keep-copy, password, quota, and name. -k, --keep-copy: If mailboxes with forwardings should not keep a copy of the forwarded email use "--keep-copy no". @@ -74,6 +74,15 @@ Set quota "--quota 4096" (in MB).`, updated = true } + if cmd.Flag("name").Changed { + err = server.MailboxSetName(mailboxEmail, displayName) + if err != nil { + fatal("%v\n", err) + } + info("Updating quota...\n") + updated = true + } + if cmd.Flag("keep-copy").Changed { err := server.MailboxSetKeepCopy(mailboxEmail, keepCopyInMailbox == "yes") if err != nil { @@ -86,7 +95,7 @@ Set quota "--quota 4096" (in MB).`, if cmd.Flag("password").Changed { pw := cmd.Flag("password").Value.String() if len(pw) < passwordMinLength { - fatal("password length to short (min length " + strconv.Itoa(passwordMinLength) + ")") + fatal("password length too short (min length " + strconv.Itoa(passwordMinLength) + ")") } err := server.MailboxSetPassword(mailboxEmail, pw) if err != nil { @@ -110,6 +119,7 @@ func init() { mailboxUpdateCmd.Flags().IntVarP("a, "quota", "q", 2048, "Sets quota (in MB)") mailboxUpdateCmd.Flags().StringVarP(&keepCopyInMailbox, "keep-copy", "k", "yes", "Sets keep-copy of forwardings") mailboxUpdateCmd.Flags().StringP("password", "p", "", "Set password") + mailboxUpdateCmd.Flags().StringVarP(&displayName, "name", "n", "", "Display Name") mailboxUpdateCmd.SetUsageTemplate(usageTemplate("mailbox update [MAILBOX_EMAIL]", printFlags)) } diff --git a/iredmail/mailbox.go b/iredmail/mailbox.go index 2d8a486..4cb613f 100644 --- a/iredmail/mailbox.go +++ b/iredmail/mailbox.go @@ -129,9 +129,13 @@ func (s *Server) Mailbox(mailboxEmail string) (Mailbox, error) { } // MailboxAdd adds a new mailbox -func (s *Server) MailboxAdd(mailboxEmail, password string, quota int, storageBasePath string) error { +func (s *Server) MailboxAdd(mailboxEmail, password string, quota int, storageBasePath string, displayName string) error { name, domain := parseEmail(mailboxEmail) + if displayName != "" { + name = displayName + } + m := Mailbox{ Email: mailboxEmail, Name: name, @@ -200,7 +204,7 @@ func (s *Server) MailboxAdd(mailboxEmail, password string, quota int, storageBas return err } -// MailboxDelete delets a mailbox +// MailboxDelete deletes a mailbox func (s *Server) MailboxDelete(mailboxEmail string) error { mailboxExists, err := s.mailboxExists(mailboxEmail) if err != nil { @@ -254,6 +258,21 @@ func (s *Server) MailboxSetQuota(mailboxEmail string, quota int) error { return err } + +// MailboxSetName sets the mailbox display name +func (s *Server) MailboxSetName(mailboxEmail string, displayName string) error { + sqlQuery := `UPDATE mailbox + SET name = ? + WHERE username = ?;` + _, err := s.DB.Exec(sqlQuery, displayName, mailboxEmail) + if err != nil { + return err + } + + return err +} + + // MailboxSetKeepCopy sets the keep-copy behavior if forwardings exist func (s *Server) MailboxSetKeepCopy(mailboxEmail string, keepCopyInMailbox bool) error { mailboxExists, err := s.mailboxExists(mailboxEmail) diff --git a/iredmail/mailboxAlias.go b/iredmail/mailboxAlias.go index b621ff8..d10f0a3 100644 --- a/iredmail/mailboxAlias.go +++ b/iredmail/mailboxAlias.go @@ -82,7 +82,7 @@ func (s *Server) MailboxAliasDelete(aliasEmail string) error { return err } -// MailboxAliasDeleteAll delets all mailbox aliases of a mailbox +// MailboxAliasDeleteAll deletes all mailbox aliases of a mailbox func (s *Server) MailboxAliasDeleteAll(mailboxEmail string) error { sqlQuery := "DELETE FROM forwardings WHERE forwarding = ? AND is_forwarding = 0 AND is_alias = 1 AND is_list = 0;" _, err := s.DB.Exec(sqlQuery, mailboxEmail) From 236130f2dde59b006704c01971998541601c7cd9 Mon Sep 17 00:00:00 2001 From: Shawn Wilson Date: Wed, 1 Jul 2020 14:45:11 -0400 Subject: [PATCH 003/120] Added support for v1.2.0 --- iredmail/version.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/iredmail/version.go b/iredmail/version.go index 8ae3c73..8d95ae8 100644 --- a/iredmail/version.go +++ b/iredmail/version.go @@ -13,11 +13,11 @@ import ( const ( // Version of iredmail-cli - Version = "0.2.8" + Version = "0.2.9" releaseFile = "/etc/iredmail-release" - supportedReleaseMin = "0.9.8" - supportedReleaseMax = "0.9.8" + supportedReleaseMin = "1.0.0" + supportedReleaseMax = "1.2.0" ) var ( @@ -40,7 +40,7 @@ func GetIredMailVersion() (iredMailVersion, error) { return version, err } - re := regexp.MustCompile(`^\d\.\d\.\d\s*MYSQL\s*edition`) + re := regexp.MustCompile(`^\d\.\d\.\d\s*(MYSQL|MARIADB)\s*edition`) versionLine := re.FindString(string(file)) if versionLine == "" { From c043c9ad8ab2534ed930502c1dcb93051d3a97f3 Mon Sep 17 00:00:00 2001 From: KostaGorod <35299380+KostaGorod@users.noreply.github.com> Date: Wed, 16 Jun 2021 15:15:20 +0300 Subject: [PATCH 004/120] Update to 1.3.2 --- iredmail/version.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/iredmail/version.go b/iredmail/version.go index 8d95ae8..3e614a8 100644 --- a/iredmail/version.go +++ b/iredmail/version.go @@ -13,11 +13,11 @@ import ( const ( // Version of iredmail-cli - Version = "0.2.9" + Version = "0.2.91" releaseFile = "/etc/iredmail-release" supportedReleaseMin = "1.0.0" - supportedReleaseMax = "1.2.0" + supportedReleaseMax = "1.3.2" ) var ( From 2dfd0f6c820e3e3bb65281c54c90454cac30db01 Mon Sep 17 00:00:00 2001 From: KostaGorod <35299380+KostaGorod@users.noreply.github.com> Date: Wed, 16 Jun 2021 15:16:00 +0300 Subject: [PATCH 005/120] Delete url to original repo --- Readme.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/Readme.md b/Readme.md index 776e125..44cf032 100644 --- a/Readme.md +++ b/Readme.md @@ -47,8 +47,6 @@ > The current version only supports the MySQL version of iRedMail -Download the appropriate binary from https://github.com/drlogout/iredmail-cli/releases/latest, untar the file and move the binary to e.g. `/usr/local/bin/iredmail-cli`. - By default `iredmail-cli` expects a config file under `~/.my.cnf-vmailadmin`. This file is generated through the iRedMail installation. It's also possible to specify a config file with the `—config` flag. The `.my.cnf-vmailadmin` file needs following variables: From 3cc4d66a1bc75a0d96ed4c62dc04ebf88788def5 Mon Sep 17 00:00:00 2001 From: KostaGorod <35299380+KostaGorod@users.noreply.github.com> Date: Wed, 16 Jun 2021 15:34:39 +0300 Subject: [PATCH 006/120] Update version.go --- iredmail/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iredmail/version.go b/iredmail/version.go index 3e614a8..35d1227 100644 --- a/iredmail/version.go +++ b/iredmail/version.go @@ -44,7 +44,7 @@ func GetIredMailVersion() (iredMailVersion, error) { versionLine := re.FindString(string(file)) if versionLine == "" { - return version, fmt.Errorf("No MYSQL version info found in release file %s", releaseFile) + return version, fmt.Errorf("No MYSQL nor MariaDB version info found in release file %s", releaseFile) } splitLine := strings.Split(versionLine, " ") From 0c1f1f3bc7d7926a26ed00af1473ea81f724dc63 Mon Sep 17 00:00:00 2001 From: KostaGorod <35299380+KostaGorod@users.noreply.github.com> Date: Wed, 16 Jun 2021 15:40:27 +0300 Subject: [PATCH 007/120] Update main.go --- main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.go b/main.go index 57a595e..0672223 100644 --- a/main.go +++ b/main.go @@ -14,7 +14,7 @@ package main -import "github.com/drlogout/iredmail-cli/cmd" +import "github.com/kostagorod/iredmail-cli/cmd" func main() { cmd.Execute() From bbaa3339b95025e9ef31374445adca5fb1117540 Mon Sep 17 00:00:00 2001 From: KostaGorod <35299380+KostaGorod@users.noreply.github.com> Date: Wed, 16 Jun 2021 15:49:14 +0300 Subject: [PATCH 008/120] Update mailboxAdd.go --- cmd/mailboxAdd.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/mailboxAdd.go b/cmd/mailboxAdd.go index 31dd707..e2ccf06 100644 --- a/cmd/mailboxAdd.go +++ b/cmd/mailboxAdd.go @@ -6,7 +6,7 @@ import ( "strconv" "github.com/asaskevich/govalidator" - "github.com/drlogout/iredmail-cli/iredmail" + "github.com/kostagorod/iredmail-cli/iredmail" "github.com/spf13/cobra" ) From a3bdcbe858467e2103031baedb50cb8012d3b0d2 Mon Sep 17 00:00:00 2001 From: KostaGorod <35299380+KostaGorod@users.noreply.github.com> Date: Wed, 16 Jun 2021 15:50:15 +0300 Subject: [PATCH 009/120] Update aliasAdd.go --- cmd/aliasAdd.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/aliasAdd.go b/cmd/aliasAdd.go index 082154a..8fa72d5 100644 --- a/cmd/aliasAdd.go +++ b/cmd/aliasAdd.go @@ -19,7 +19,7 @@ import ( "fmt" "github.com/asaskevich/govalidator" - "github.com/drlogout/iredmail-cli/iredmail" + "github.com/kostagorod/iredmail-cli/iredmail" "github.com/spf13/cobra" ) From 936a94b055104444f0e114d9a6652d9a1436c6a4 Mon Sep 17 00:00:00 2001 From: KostaGorod <35299380+KostaGorod@users.noreply.github.com> Date: Wed, 16 Jun 2021 15:50:32 +0300 Subject: [PATCH 010/120] Update aliasAddForwarding.go --- cmd/aliasAddForwarding.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/aliasAddForwarding.go b/cmd/aliasAddForwarding.go index 9acec72..2ce17d5 100644 --- a/cmd/aliasAddForwarding.go +++ b/cmd/aliasAddForwarding.go @@ -19,7 +19,7 @@ import ( "fmt" "github.com/asaskevich/govalidator" - "github.com/drlogout/iredmail-cli/iredmail" + "github.com/kostagorod/iredmail-cli/iredmail" "github.com/spf13/cobra" ) From 1d7d2387775a6a7d192902dd956fd146ee7f5f33 Mon Sep 17 00:00:00 2001 From: KostaGorod <35299380+KostaGorod@users.noreply.github.com> Date: Wed, 16 Jun 2021 15:50:44 +0300 Subject: [PATCH 011/120] Update aliasDelete.go --- cmd/aliasDelete.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/aliasDelete.go b/cmd/aliasDelete.go index c4d6bdb..7d6b6f3 100644 --- a/cmd/aliasDelete.go +++ b/cmd/aliasDelete.go @@ -19,7 +19,7 @@ import ( "fmt" "github.com/asaskevich/govalidator" - "github.com/drlogout/iredmail-cli/iredmail" + "github.com/kostagorod/iredmail-cli/iredmail" "github.com/spf13/cobra" ) From b8cdd3259a369f94d3759b7d7544f9ade3339e96 Mon Sep 17 00:00:00 2001 From: KostaGorod <35299380+KostaGorod@users.noreply.github.com> Date: Wed, 16 Jun 2021 15:50:58 +0300 Subject: [PATCH 012/120] Update aliasDeleteForwarding.go --- cmd/aliasDeleteForwarding.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/aliasDeleteForwarding.go b/cmd/aliasDeleteForwarding.go index e97c26a..582c7fb 100644 --- a/cmd/aliasDeleteForwarding.go +++ b/cmd/aliasDeleteForwarding.go @@ -19,7 +19,7 @@ import ( "fmt" "github.com/asaskevich/govalidator" - "github.com/drlogout/iredmail-cli/iredmail" + "github.com/kostagorod/iredmail-cli/iredmail" "github.com/spf13/cobra" ) From 0fcbdb676c102469f3f5c472098cfa8c434f0569 Mon Sep 17 00:00:00 2001 From: KostaGorod <35299380+KostaGorod@users.noreply.github.com> Date: Wed, 16 Jun 2021 15:51:11 +0300 Subject: [PATCH 013/120] Update aliasInfo.go --- cmd/aliasInfo.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/aliasInfo.go b/cmd/aliasInfo.go index 8889ff8..1ab96c5 100644 --- a/cmd/aliasInfo.go +++ b/cmd/aliasInfo.go @@ -20,7 +20,7 @@ import ( "os" "github.com/asaskevich/govalidator" - "github.com/drlogout/iredmail-cli/iredmail" + "github.com/kostagorod/iredmail-cli/iredmail" "github.com/olekukonko/tablewriter" "github.com/spf13/cobra" ) From 6407179c292800afcf34dd16a2fcd68481c562af Mon Sep 17 00:00:00 2001 From: KostaGorod <35299380+KostaGorod@users.noreply.github.com> Date: Wed, 16 Jun 2021 15:51:22 +0300 Subject: [PATCH 014/120] Update aliasList.go --- cmd/aliasList.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/aliasList.go b/cmd/aliasList.go index fa9607c..dcf2ff4 100644 --- a/cmd/aliasList.go +++ b/cmd/aliasList.go @@ -3,7 +3,7 @@ package cmd import ( "os" - "github.com/drlogout/iredmail-cli/iredmail" + "github.com/kostagorod/iredmail-cli/iredmail" "github.com/olekukonko/tablewriter" "github.com/spf13/cobra" ) From 12ae83b4f990ea4cc508f25840f084a750f6474c Mon Sep 17 00:00:00 2001 From: KostaGorod <35299380+KostaGorod@users.noreply.github.com> Date: Wed, 16 Jun 2021 15:51:34 +0300 Subject: [PATCH 015/120] Update domainAdd.go --- cmd/domainAdd.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/domainAdd.go b/cmd/domainAdd.go index 49af190..9124c58 100644 --- a/cmd/domainAdd.go +++ b/cmd/domainAdd.go @@ -20,7 +20,7 @@ import ( "strings" "github.com/asaskevich/govalidator" - "github.com/drlogout/iredmail-cli/iredmail" + "github.com/kostagorod/iredmail-cli/iredmail" "github.com/spf13/cobra" ) From 26ab6e684384d94e3a6e35226333776cafb6873a Mon Sep 17 00:00:00 2001 From: KostaGorod <35299380+KostaGorod@users.noreply.github.com> Date: Wed, 16 Jun 2021 15:51:46 +0300 Subject: [PATCH 016/120] Update domainAliasDelete.go --- cmd/domainAliasDelete.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/domainAliasDelete.go b/cmd/domainAliasDelete.go index 8de6a15..bb02924 100644 --- a/cmd/domainAliasDelete.go +++ b/cmd/domainAliasDelete.go @@ -20,7 +20,7 @@ import ( "strings" "github.com/asaskevich/govalidator" - "github.com/drlogout/iredmail-cli/iredmail" + "github.com/kostagorod/iredmail-cli/iredmail" "github.com/spf13/cobra" ) From 4f3fc8f00cf9ead738c810e7d989b0b97adccfbc Mon Sep 17 00:00:00 2001 From: KostaGorod <35299380+KostaGorod@users.noreply.github.com> Date: Wed, 16 Jun 2021 15:51:57 +0300 Subject: [PATCH 017/120] Update domainCatchallAdd.go --- cmd/domainCatchallAdd.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/domainCatchallAdd.go b/cmd/domainCatchallAdd.go index 294c49a..29ffebd 100644 --- a/cmd/domainCatchallAdd.go +++ b/cmd/domainCatchallAdd.go @@ -20,7 +20,7 @@ import ( "strings" "github.com/asaskevich/govalidator" - "github.com/drlogout/iredmail-cli/iredmail" + "github.com/kostagorod/iredmail-cli/iredmail" "github.com/spf13/cobra" ) From f6f2927dc42738d98e41703ed69b9a688e53bff8 Mon Sep 17 00:00:00 2001 From: KostaGorod <35299380+KostaGorod@users.noreply.github.com> Date: Wed, 16 Jun 2021 15:52:08 +0300 Subject: [PATCH 018/120] Update domainCatchallDelete.go --- cmd/domainCatchallDelete.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/domainCatchallDelete.go b/cmd/domainCatchallDelete.go index ba4e72d..509c43b 100644 --- a/cmd/domainCatchallDelete.go +++ b/cmd/domainCatchallDelete.go @@ -20,7 +20,7 @@ import ( "strings" "github.com/asaskevich/govalidator" - "github.com/drlogout/iredmail-cli/iredmail" + "github.com/kostagorod/iredmail-cli/iredmail" "github.com/spf13/cobra" ) From bc3906be072021250365a4f6c58dd5dfcd74dca1 Mon Sep 17 00:00:00 2001 From: KostaGorod <35299380+KostaGorod@users.noreply.github.com> Date: Wed, 16 Jun 2021 15:52:22 +0300 Subject: [PATCH 019/120] Update domainDelete.go --- cmd/domainDelete.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/domainDelete.go b/cmd/domainDelete.go index a077ad8..4c5a1ac 100644 --- a/cmd/domainDelete.go +++ b/cmd/domainDelete.go @@ -20,7 +20,7 @@ import ( "strings" "github.com/asaskevich/govalidator" - "github.com/drlogout/iredmail-cli/iredmail" + "github.com/kostagorod/iredmail-cli/iredmail" "github.com/spf13/cobra" ) From 90ebb1b42422c4fa3d7226aadd04516cf8ab5d87 Mon Sep 17 00:00:00 2001 From: KostaGorod <35299380+KostaGorod@users.noreply.github.com> Date: Wed, 16 Jun 2021 15:52:31 +0300 Subject: [PATCH 020/120] Update forwardingAdd.go --- cmd/forwardingAdd.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/forwardingAdd.go b/cmd/forwardingAdd.go index 5db56d1..a2621c9 100644 --- a/cmd/forwardingAdd.go +++ b/cmd/forwardingAdd.go @@ -19,7 +19,7 @@ import ( "fmt" "github.com/asaskevich/govalidator" - "github.com/drlogout/iredmail-cli/iredmail" + "github.com/kostagorod/iredmail-cli/iredmail" "github.com/spf13/cobra" ) From d45b72f750519c52878b208a1bf3f5b5d78ee3e4 Mon Sep 17 00:00:00 2001 From: KostaGorod <35299380+KostaGorod@users.noreply.github.com> Date: Wed, 16 Jun 2021 15:52:47 +0300 Subject: [PATCH 021/120] Update forwardingDelete.go --- cmd/forwardingDelete.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/forwardingDelete.go b/cmd/forwardingDelete.go index 159f735..5d77757 100644 --- a/cmd/forwardingDelete.go +++ b/cmd/forwardingDelete.go @@ -19,7 +19,7 @@ import ( "fmt" "github.com/asaskevich/govalidator" - "github.com/drlogout/iredmail-cli/iredmail" + "github.com/kostagorod/iredmail-cli/iredmail" "github.com/spf13/cobra" ) From 7956c9c7d238b4053022e0bec81c0c7d83c5a420 Mon Sep 17 00:00:00 2001 From: KostaGorod <35299380+KostaGorod@users.noreply.github.com> Date: Wed, 16 Jun 2021 15:52:59 +0300 Subject: [PATCH 022/120] Update mailboxAliasAdd.go --- cmd/mailboxAliasAdd.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/mailboxAliasAdd.go b/cmd/mailboxAliasAdd.go index 940039b..0a022ba 100644 --- a/cmd/mailboxAliasAdd.go +++ b/cmd/mailboxAliasAdd.go @@ -19,7 +19,7 @@ import ( "fmt" "github.com/asaskevich/govalidator" - "github.com/drlogout/iredmail-cli/iredmail" + "github.com/kostagorod/iredmail-cli/iredmail" "github.com/spf13/cobra" ) From fed5bfc50283d0a8035e1bf28857a23acdd88f31 Mon Sep 17 00:00:00 2001 From: KostaGorod <35299380+KostaGorod@users.noreply.github.com> Date: Wed, 16 Jun 2021 15:53:09 +0300 Subject: [PATCH 023/120] Update mailboxAliasDelete.go --- cmd/mailboxAliasDelete.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/mailboxAliasDelete.go b/cmd/mailboxAliasDelete.go index bcc4065..c7d9ec7 100644 --- a/cmd/mailboxAliasDelete.go +++ b/cmd/mailboxAliasDelete.go @@ -19,7 +19,7 @@ import ( "fmt" "github.com/asaskevich/govalidator" - "github.com/drlogout/iredmail-cli/iredmail" + "github.com/kostagorod/iredmail-cli/iredmail" "github.com/spf13/cobra" ) From c9483d8871f4b1f86340c4d2d6178b54d095a7eb Mon Sep 17 00:00:00 2001 From: KostaGorod <35299380+KostaGorod@users.noreply.github.com> Date: Wed, 16 Jun 2021 15:53:19 +0300 Subject: [PATCH 024/120] Update mailboxDelete.go --- cmd/mailboxDelete.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/mailboxDelete.go b/cmd/mailboxDelete.go index e576811..49df8de 100644 --- a/cmd/mailboxDelete.go +++ b/cmd/mailboxDelete.go @@ -19,7 +19,7 @@ import ( "fmt" "github.com/asaskevich/govalidator" - "github.com/drlogout/iredmail-cli/iredmail" + "github.com/kostagorod/iredmail-cli/iredmail" "github.com/spf13/cobra" ) From dc698a300d6d6cb62156b179fd9d9c4e1aa5259d Mon Sep 17 00:00:00 2001 From: KostaGorod <35299380+KostaGorod@users.noreply.github.com> Date: Wed, 16 Jun 2021 15:53:30 +0300 Subject: [PATCH 025/120] Update mailboxInfo.go --- cmd/mailboxInfo.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/mailboxInfo.go b/cmd/mailboxInfo.go index 1bafa58..1c57c17 100644 --- a/cmd/mailboxInfo.go +++ b/cmd/mailboxInfo.go @@ -22,7 +22,7 @@ import ( "strings" "github.com/asaskevich/govalidator" - "github.com/drlogout/iredmail-cli/iredmail" + "github.com/kostagorod/iredmail-cli/iredmail" "github.com/olekukonko/tablewriter" "github.com/spf13/cobra" ) From a4b5d026ae8263c6ec2c397e94005716b20e97fd Mon Sep 17 00:00:00 2001 From: KostaGorod <35299380+KostaGorod@users.noreply.github.com> Date: Wed, 16 Jun 2021 15:53:41 +0300 Subject: [PATCH 026/120] Update mailboxList.go --- cmd/mailboxList.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/mailboxList.go b/cmd/mailboxList.go index eb33675..8735bb9 100644 --- a/cmd/mailboxList.go +++ b/cmd/mailboxList.go @@ -4,7 +4,7 @@ import ( "os" "strconv" - "github.com/drlogout/iredmail-cli/iredmail" + "github.com/kostagorod/iredmail-cli/iredmail" "github.com/olekukonko/tablewriter" "github.com/spf13/cobra" ) From 86366d5cde3385d395e2865b8c3f801eabf928c4 Mon Sep 17 00:00:00 2001 From: KostaGorod <35299380+KostaGorod@users.noreply.github.com> Date: Wed, 16 Jun 2021 15:53:50 +0300 Subject: [PATCH 027/120] Update mailboxUpdate.go --- cmd/mailboxUpdate.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/mailboxUpdate.go b/cmd/mailboxUpdate.go index 6710b0b..83e64df 100644 --- a/cmd/mailboxUpdate.go +++ b/cmd/mailboxUpdate.go @@ -20,7 +20,7 @@ import ( "strconv" "github.com/asaskevich/govalidator" - "github.com/drlogout/iredmail-cli/iredmail" + "github.com/kostagorod/iredmail-cli/iredmail" "github.com/spf13/cobra" ) From ffffe941e9b53b2345247dd33dfa483a2a0ae255 Mon Sep 17 00:00:00 2001 From: KostaGorod <35299380+KostaGorod@users.noreply.github.com> Date: Wed, 16 Jun 2021 15:54:07 +0300 Subject: [PATCH 028/120] Update root.go --- cmd/root.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/root.go b/cmd/root.go index dba5555..b763ef8 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -6,7 +6,7 @@ import ( "os" "path/filepath" - "github.com/drlogout/iredmail-cli/iredmail" + "github.com/kostagorod/iredmail-cli/iredmail" "github.com/fatih/color" homedir "github.com/mitchellh/go-homedir" "github.com/spf13/cobra" From bdb521e2317b51d47b6019c14a8605850a8f6b76 Mon Sep 17 00:00:00 2001 From: KostaGorod <35299380+KostaGorod@users.noreply.github.com> Date: Wed, 16 Jun 2021 15:54:56 +0300 Subject: [PATCH 029/120] Update version.go --- cmd/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/version.go b/cmd/version.go index dbdd882..6758145 100644 --- a/cmd/version.go +++ b/cmd/version.go @@ -15,7 +15,7 @@ package cmd import ( - "github.com/drlogout/iredmail-cli/iredmail" + "github.com/kostagorod/iredmail-cli/iredmail" "github.com/spf13/cobra" ) From b3bb061b82bfdbccb5146cbfc70d53d620f6823a Mon Sep 17 00:00:00 2001 From: KostaGorod <35299380+KostaGorod@users.noreply.github.com> Date: Wed, 16 Jun 2021 16:00:38 +0300 Subject: [PATCH 030/120] Update forwardingList.go --- cmd/forwardingList.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/forwardingList.go b/cmd/forwardingList.go index 114443f..d24016f 100644 --- a/cmd/forwardingList.go +++ b/cmd/forwardingList.go @@ -17,7 +17,7 @@ package cmd import ( "os" - "github.com/drlogout/iredmail-cli/iredmail" + "github.com/kostagorod/iredmail-cli/iredmail" "github.com/olekukonko/tablewriter" "github.com/spf13/cobra" ) From 2cb481c23bbe5a4cdfff54f904942d52a50ce6e9 Mon Sep 17 00:00:00 2001 From: KostaGorod <35299380+KostaGorod@users.noreply.github.com> Date: Wed, 16 Jun 2021 16:00:55 +0300 Subject: [PATCH 031/120] Update domainList.go --- cmd/domainList.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/domainList.go b/cmd/domainList.go index 471efc2..b2dbf0f 100644 --- a/cmd/domainList.go +++ b/cmd/domainList.go @@ -17,7 +17,7 @@ package cmd import ( "os" - "github.com/drlogout/iredmail-cli/iredmail" + "github.com/kostagorod/iredmail-cli/iredmail" "github.com/olekukonko/tablewriter" "github.com/spf13/cobra" ) From 8e9c711ef35ae4601ec989d6120dcaaa3be7d837 Mon Sep 17 00:00:00 2001 From: KostaGorod <35299380+KostaGorod@users.noreply.github.com> Date: Wed, 16 Jun 2021 16:01:17 +0300 Subject: [PATCH 032/120] Update domainAliasAdd.go --- cmd/domainAliasAdd.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/domainAliasAdd.go b/cmd/domainAliasAdd.go index e2b6f3f..dd9461c 100644 --- a/cmd/domainAliasAdd.go +++ b/cmd/domainAliasAdd.go @@ -20,7 +20,7 @@ import ( "strings" "github.com/asaskevich/govalidator" - "github.com/drlogout/iredmail-cli/iredmail" + "github.com/kostagorod/iredmail-cli/iredmail" "github.com/spf13/cobra" ) From cffedbb972fa92eaaa79e751267ba527abbfe3ff Mon Sep 17 00:00:00 2001 From: KostaGorod <35299380+KostaGorod@users.noreply.github.com> Date: Wed, 16 Jun 2021 16:02:33 +0300 Subject: [PATCH 033/120] Update aliasAdd.go --- cmd/aliasAdd.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/aliasAdd.go b/cmd/aliasAdd.go index 8fa72d5..4d390ac 100644 --- a/cmd/aliasAdd.go +++ b/cmd/aliasAdd.go @@ -19,7 +19,7 @@ import ( "fmt" "github.com/asaskevich/govalidator" - "github.com/kostagorod/iredmail-cli/iredmail" + "github.com/KostaGorod/iredmail-cli/iredmail" "github.com/spf13/cobra" ) From 20636338e6b66dc788cb986f787ee22a0a7af4cb Mon Sep 17 00:00:00 2001 From: KostaGorod <35299380+KostaGorod@users.noreply.github.com> Date: Wed, 16 Jun 2021 16:02:42 +0300 Subject: [PATCH 034/120] Update aliasAddForwarding.go --- cmd/aliasAddForwarding.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/aliasAddForwarding.go b/cmd/aliasAddForwarding.go index 2ce17d5..d09ed72 100644 --- a/cmd/aliasAddForwarding.go +++ b/cmd/aliasAddForwarding.go @@ -19,7 +19,7 @@ import ( "fmt" "github.com/asaskevich/govalidator" - "github.com/kostagorod/iredmail-cli/iredmail" + "github.com/KostaGorod/iredmail-cli/iredmail" "github.com/spf13/cobra" ) From c5504ba35edbacb4e9c3749b5fa35115b39f52bc Mon Sep 17 00:00:00 2001 From: KostaGorod <35299380+KostaGorod@users.noreply.github.com> Date: Wed, 16 Jun 2021 16:02:52 +0300 Subject: [PATCH 035/120] Update aliasDelete.go --- cmd/aliasDelete.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/aliasDelete.go b/cmd/aliasDelete.go index 7d6b6f3..3894ff1 100644 --- a/cmd/aliasDelete.go +++ b/cmd/aliasDelete.go @@ -19,7 +19,7 @@ import ( "fmt" "github.com/asaskevich/govalidator" - "github.com/kostagorod/iredmail-cli/iredmail" + "github.com/KostaGorod/iredmail-cli/iredmail" "github.com/spf13/cobra" ) From cbe789ae602b847a7ca8cfe8030972527773498e Mon Sep 17 00:00:00 2001 From: KostaGorod <35299380+KostaGorod@users.noreply.github.com> Date: Wed, 16 Jun 2021 16:03:02 +0300 Subject: [PATCH 036/120] Update aliasDeleteForwarding.go --- cmd/aliasDeleteForwarding.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/aliasDeleteForwarding.go b/cmd/aliasDeleteForwarding.go index 582c7fb..ade2c5b 100644 --- a/cmd/aliasDeleteForwarding.go +++ b/cmd/aliasDeleteForwarding.go @@ -19,7 +19,7 @@ import ( "fmt" "github.com/asaskevich/govalidator" - "github.com/kostagorod/iredmail-cli/iredmail" + "github.com/KostaGorod/iredmail-cli/iredmail" "github.com/spf13/cobra" ) From 9ea50529b2069e50bc301ddd7f3b1d9ee6bb0de8 Mon Sep 17 00:00:00 2001 From: KostaGorod <35299380+KostaGorod@users.noreply.github.com> Date: Wed, 16 Jun 2021 16:03:13 +0300 Subject: [PATCH 037/120] Update aliasInfo.go --- cmd/aliasInfo.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/aliasInfo.go b/cmd/aliasInfo.go index 1ab96c5..1d3f3d7 100644 --- a/cmd/aliasInfo.go +++ b/cmd/aliasInfo.go @@ -20,7 +20,7 @@ import ( "os" "github.com/asaskevich/govalidator" - "github.com/kostagorod/iredmail-cli/iredmail" + "github.com/KostaGorod/iredmail-cli/iredmail" "github.com/olekukonko/tablewriter" "github.com/spf13/cobra" ) From 4277b03cbf8b0a4605e8203b500fc078d31ac471 Mon Sep 17 00:00:00 2001 From: KostaGorod <35299380+KostaGorod@users.noreply.github.com> Date: Wed, 16 Jun 2021 16:03:21 +0300 Subject: [PATCH 038/120] Update aliasList.go --- cmd/aliasList.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/aliasList.go b/cmd/aliasList.go index dcf2ff4..b639d6f 100644 --- a/cmd/aliasList.go +++ b/cmd/aliasList.go @@ -3,7 +3,7 @@ package cmd import ( "os" - "github.com/kostagorod/iredmail-cli/iredmail" + "github.com/KostaGorod/iredmail-cli/iredmail" "github.com/olekukonko/tablewriter" "github.com/spf13/cobra" ) From d90be8750bd89ff2778f838962feb0ead4e48b14 Mon Sep 17 00:00:00 2001 From: KostaGorod <35299380+KostaGorod@users.noreply.github.com> Date: Wed, 16 Jun 2021 16:03:35 +0300 Subject: [PATCH 039/120] Update domainAdd.go --- cmd/domainAdd.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/domainAdd.go b/cmd/domainAdd.go index 9124c58..4258efd 100644 --- a/cmd/domainAdd.go +++ b/cmd/domainAdd.go @@ -20,7 +20,7 @@ import ( "strings" "github.com/asaskevich/govalidator" - "github.com/kostagorod/iredmail-cli/iredmail" + "github.com/KostaGorod/iredmail-cli/iredmail" "github.com/spf13/cobra" ) From f4703b27c258ef484a6ba170d1902e6f2400b3b0 Mon Sep 17 00:00:00 2001 From: KostaGorod <35299380+KostaGorod@users.noreply.github.com> Date: Wed, 16 Jun 2021 16:03:45 +0300 Subject: [PATCH 040/120] Update domainAliasAdd.go --- cmd/domainAliasAdd.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/domainAliasAdd.go b/cmd/domainAliasAdd.go index dd9461c..34111c8 100644 --- a/cmd/domainAliasAdd.go +++ b/cmd/domainAliasAdd.go @@ -20,7 +20,7 @@ import ( "strings" "github.com/asaskevich/govalidator" - "github.com/kostagorod/iredmail-cli/iredmail" + "github.com/KostaGorod/iredmail-cli/iredmail" "github.com/spf13/cobra" ) From 6b5bf6d144dfe03491062e0454a552fa8e789cd1 Mon Sep 17 00:00:00 2001 From: KostaGorod <35299380+KostaGorod@users.noreply.github.com> Date: Wed, 16 Jun 2021 16:03:54 +0300 Subject: [PATCH 041/120] Update domainAliasDelete.go --- cmd/domainAliasDelete.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/domainAliasDelete.go b/cmd/domainAliasDelete.go index bb02924..8761d9f 100644 --- a/cmd/domainAliasDelete.go +++ b/cmd/domainAliasDelete.go @@ -20,7 +20,7 @@ import ( "strings" "github.com/asaskevich/govalidator" - "github.com/kostagorod/iredmail-cli/iredmail" + "github.com/KostaGorod/iredmail-cli/iredmail" "github.com/spf13/cobra" ) From d29673a004abe0fc3fa2a604519a0935ae71e353 Mon Sep 17 00:00:00 2001 From: KostaGorod <35299380+KostaGorod@users.noreply.github.com> Date: Wed, 16 Jun 2021 16:04:02 +0300 Subject: [PATCH 042/120] Update domainCatchallAdd.go --- cmd/domainCatchallAdd.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/domainCatchallAdd.go b/cmd/domainCatchallAdd.go index 29ffebd..1385dd2 100644 --- a/cmd/domainCatchallAdd.go +++ b/cmd/domainCatchallAdd.go @@ -20,7 +20,7 @@ import ( "strings" "github.com/asaskevich/govalidator" - "github.com/kostagorod/iredmail-cli/iredmail" + "github.com/KostaGorod/iredmail-cli/iredmail" "github.com/spf13/cobra" ) From 5fa200f184ad0c8e6d9988f4c885512eb0f6d011 Mon Sep 17 00:00:00 2001 From: KostaGorod <35299380+KostaGorod@users.noreply.github.com> Date: Wed, 16 Jun 2021 16:04:12 +0300 Subject: [PATCH 043/120] Update domainCatchallDelete.go --- cmd/domainCatchallDelete.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/domainCatchallDelete.go b/cmd/domainCatchallDelete.go index 509c43b..f4dd48e 100644 --- a/cmd/domainCatchallDelete.go +++ b/cmd/domainCatchallDelete.go @@ -20,7 +20,7 @@ import ( "strings" "github.com/asaskevich/govalidator" - "github.com/kostagorod/iredmail-cli/iredmail" + "github.com/KostaGorod/iredmail-cli/iredmail" "github.com/spf13/cobra" ) From 520203c4bd5950d71b4638d1abc96e6edc25a634 Mon Sep 17 00:00:00 2001 From: KostaGorod <35299380+KostaGorod@users.noreply.github.com> Date: Wed, 16 Jun 2021 16:04:22 +0300 Subject: [PATCH 044/120] Update domainDelete.go --- cmd/domainDelete.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/domainDelete.go b/cmd/domainDelete.go index 4c5a1ac..8c8fa69 100644 --- a/cmd/domainDelete.go +++ b/cmd/domainDelete.go @@ -20,7 +20,7 @@ import ( "strings" "github.com/asaskevich/govalidator" - "github.com/kostagorod/iredmail-cli/iredmail" + "github.com/KostaGorod/iredmail-cli/iredmail" "github.com/spf13/cobra" ) From efcb701117a0643d65f4dac2641187e5a927de0b Mon Sep 17 00:00:00 2001 From: KostaGorod <35299380+KostaGorod@users.noreply.github.com> Date: Wed, 16 Jun 2021 16:04:31 +0300 Subject: [PATCH 045/120] Update domainList.go --- cmd/domainList.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/domainList.go b/cmd/domainList.go index b2dbf0f..c404b45 100644 --- a/cmd/domainList.go +++ b/cmd/domainList.go @@ -17,7 +17,7 @@ package cmd import ( "os" - "github.com/kostagorod/iredmail-cli/iredmail" + "github.com/KostaGorod/iredmail-cli/iredmail" "github.com/olekukonko/tablewriter" "github.com/spf13/cobra" ) From 5a0067c2335374ca2459b8f2b51bb0ac86afc415 Mon Sep 17 00:00:00 2001 From: KostaGorod <35299380+KostaGorod@users.noreply.github.com> Date: Wed, 16 Jun 2021 16:04:42 +0300 Subject: [PATCH 046/120] Update forwardingAdd.go --- cmd/forwardingAdd.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/forwardingAdd.go b/cmd/forwardingAdd.go index a2621c9..bdf5201 100644 --- a/cmd/forwardingAdd.go +++ b/cmd/forwardingAdd.go @@ -19,7 +19,7 @@ import ( "fmt" "github.com/asaskevich/govalidator" - "github.com/kostagorod/iredmail-cli/iredmail" + "github.com/KostaGorod/iredmail-cli/iredmail" "github.com/spf13/cobra" ) From ceb42133f701fc5e8296ae3156b503a12b138225 Mon Sep 17 00:00:00 2001 From: KostaGorod <35299380+KostaGorod@users.noreply.github.com> Date: Wed, 16 Jun 2021 16:04:52 +0300 Subject: [PATCH 047/120] Update forwardingDelete.go --- cmd/forwardingDelete.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/forwardingDelete.go b/cmd/forwardingDelete.go index 5d77757..047eb4e 100644 --- a/cmd/forwardingDelete.go +++ b/cmd/forwardingDelete.go @@ -19,7 +19,7 @@ import ( "fmt" "github.com/asaskevich/govalidator" - "github.com/kostagorod/iredmail-cli/iredmail" + "github.com/KostaGorod/iredmail-cli/iredmail" "github.com/spf13/cobra" ) From 3796184135f8e26c8f55071ee9133e46ebf761c2 Mon Sep 17 00:00:00 2001 From: KostaGorod <35299380+KostaGorod@users.noreply.github.com> Date: Wed, 16 Jun 2021 16:05:01 +0300 Subject: [PATCH 048/120] Update forwardingList.go --- cmd/forwardingList.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/forwardingList.go b/cmd/forwardingList.go index d24016f..34fdae6 100644 --- a/cmd/forwardingList.go +++ b/cmd/forwardingList.go @@ -17,7 +17,7 @@ package cmd import ( "os" - "github.com/kostagorod/iredmail-cli/iredmail" + "github.com/KostaGorod/iredmail-cli/iredmail" "github.com/olekukonko/tablewriter" "github.com/spf13/cobra" ) From 486bff0bac4be1533232ea9c351d03ef99a31f42 Mon Sep 17 00:00:00 2001 From: KostaGorod <35299380+KostaGorod@users.noreply.github.com> Date: Wed, 16 Jun 2021 16:05:13 +0300 Subject: [PATCH 049/120] Update mailboxAdd.go --- cmd/mailboxAdd.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/mailboxAdd.go b/cmd/mailboxAdd.go index e2ccf06..ff3cd5e 100644 --- a/cmd/mailboxAdd.go +++ b/cmd/mailboxAdd.go @@ -6,7 +6,7 @@ import ( "strconv" "github.com/asaskevich/govalidator" - "github.com/kostagorod/iredmail-cli/iredmail" + "github.com/KostaGorod/iredmail-cli/iredmail" "github.com/spf13/cobra" ) From 451eb2d012a92f43dd8830e8f03a000033411e44 Mon Sep 17 00:00:00 2001 From: KostaGorod <35299380+KostaGorod@users.noreply.github.com> Date: Wed, 16 Jun 2021 16:05:22 +0300 Subject: [PATCH 050/120] Update mailboxAliasAdd.go --- cmd/mailboxAliasAdd.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/mailboxAliasAdd.go b/cmd/mailboxAliasAdd.go index 0a022ba..3cbef84 100644 --- a/cmd/mailboxAliasAdd.go +++ b/cmd/mailboxAliasAdd.go @@ -19,7 +19,7 @@ import ( "fmt" "github.com/asaskevich/govalidator" - "github.com/kostagorod/iredmail-cli/iredmail" + "github.com/KostaGorod/iredmail-cli/iredmail" "github.com/spf13/cobra" ) From af68fbb50ebbc96c4c2191657b200472be7e76a0 Mon Sep 17 00:00:00 2001 From: KostaGorod <35299380+KostaGorod@users.noreply.github.com> Date: Wed, 16 Jun 2021 16:05:31 +0300 Subject: [PATCH 051/120] Update mailboxAliasDelete.go --- cmd/mailboxAliasDelete.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/mailboxAliasDelete.go b/cmd/mailboxAliasDelete.go index c7d9ec7..efb033f 100644 --- a/cmd/mailboxAliasDelete.go +++ b/cmd/mailboxAliasDelete.go @@ -19,7 +19,7 @@ import ( "fmt" "github.com/asaskevich/govalidator" - "github.com/kostagorod/iredmail-cli/iredmail" + "github.com/KostaGorod/iredmail-cli/iredmail" "github.com/spf13/cobra" ) From d6fb3d45312d43956ec4aeb2ae3e620efe96357d Mon Sep 17 00:00:00 2001 From: KostaGorod <35299380+KostaGorod@users.noreply.github.com> Date: Wed, 16 Jun 2021 16:05:40 +0300 Subject: [PATCH 052/120] Update mailboxDelete.go --- cmd/mailboxDelete.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/mailboxDelete.go b/cmd/mailboxDelete.go index 49df8de..8549739 100644 --- a/cmd/mailboxDelete.go +++ b/cmd/mailboxDelete.go @@ -19,7 +19,7 @@ import ( "fmt" "github.com/asaskevich/govalidator" - "github.com/kostagorod/iredmail-cli/iredmail" + "github.com/KostaGorod/iredmail-cli/iredmail" "github.com/spf13/cobra" ) From 38adbf3c406394a7a7e16ec9873e6b69cdb73661 Mon Sep 17 00:00:00 2001 From: KostaGorod <35299380+KostaGorod@users.noreply.github.com> Date: Wed, 16 Jun 2021 16:05:47 +0300 Subject: [PATCH 053/120] Update mailboxInfo.go --- cmd/mailboxInfo.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/mailboxInfo.go b/cmd/mailboxInfo.go index 1c57c17..2f90a6c 100644 --- a/cmd/mailboxInfo.go +++ b/cmd/mailboxInfo.go @@ -22,7 +22,7 @@ import ( "strings" "github.com/asaskevich/govalidator" - "github.com/kostagorod/iredmail-cli/iredmail" + "github.com/KostaGorod/iredmail-cli/iredmail" "github.com/olekukonko/tablewriter" "github.com/spf13/cobra" ) From 9ec337453cfdaa98f71cd8422c6ab423e07add5c Mon Sep 17 00:00:00 2001 From: KostaGorod <35299380+KostaGorod@users.noreply.github.com> Date: Wed, 16 Jun 2021 16:05:55 +0300 Subject: [PATCH 054/120] Update mailboxList.go --- cmd/mailboxList.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/mailboxList.go b/cmd/mailboxList.go index 8735bb9..983034f 100644 --- a/cmd/mailboxList.go +++ b/cmd/mailboxList.go @@ -4,7 +4,7 @@ import ( "os" "strconv" - "github.com/kostagorod/iredmail-cli/iredmail" + "github.com/KostaGorod/iredmail-cli/iredmail" "github.com/olekukonko/tablewriter" "github.com/spf13/cobra" ) From 98bf417cbfa1b6ba96f58aeb70ab19ba803b0aa6 Mon Sep 17 00:00:00 2001 From: KostaGorod <35299380+KostaGorod@users.noreply.github.com> Date: Wed, 16 Jun 2021 16:06:03 +0300 Subject: [PATCH 055/120] Update mailboxUpdate.go --- cmd/mailboxUpdate.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/mailboxUpdate.go b/cmd/mailboxUpdate.go index 83e64df..d92f52b 100644 --- a/cmd/mailboxUpdate.go +++ b/cmd/mailboxUpdate.go @@ -20,7 +20,7 @@ import ( "strconv" "github.com/asaskevich/govalidator" - "github.com/kostagorod/iredmail-cli/iredmail" + "github.com/KostaGorod/iredmail-cli/iredmail" "github.com/spf13/cobra" ) From 94b0703d6f7504d99a907c858688c9bb4810409f Mon Sep 17 00:00:00 2001 From: KostaGorod <35299380+KostaGorod@users.noreply.github.com> Date: Wed, 16 Jun 2021 16:06:53 +0300 Subject: [PATCH 056/120] Update root.go --- cmd/root.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/root.go b/cmd/root.go index b763ef8..4e96e57 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -6,7 +6,7 @@ import ( "os" "path/filepath" - "github.com/kostagorod/iredmail-cli/iredmail" + "github.com/KostaGorod/iredmail-cli/iredmail" "github.com/fatih/color" homedir "github.com/mitchellh/go-homedir" "github.com/spf13/cobra" From 09beb1c4151410ff31a5bb81878360d142b2142f Mon Sep 17 00:00:00 2001 From: KostaGorod <35299380+KostaGorod@users.noreply.github.com> Date: Wed, 16 Jun 2021 16:07:40 +0300 Subject: [PATCH 057/120] Update version.go --- cmd/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/version.go b/cmd/version.go index 6758145..16f13c6 100644 --- a/cmd/version.go +++ b/cmd/version.go @@ -15,7 +15,7 @@ package cmd import ( - "github.com/kostagorod/iredmail-cli/iredmail" + "github.com/KostaGorod/iredmail-cli/iredmail" "github.com/spf13/cobra" ) From 98b4474f38cdcb9b934351d19be7e0ba18b35908 Mon Sep 17 00:00:00 2001 From: noxpost <41703267+noxpost@users.noreply.github.com> Date: Thu, 4 Nov 2021 10:45:20 -0500 Subject: [PATCH 058/120] Update version.go --- iredmail/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iredmail/version.go b/iredmail/version.go index 35d1227..3f80963 100644 --- a/iredmail/version.go +++ b/iredmail/version.go @@ -16,7 +16,7 @@ const ( Version = "0.2.91" releaseFile = "/etc/iredmail-release" - supportedReleaseMin = "1.0.0" + supportedReleaseMin = "0.9.8" supportedReleaseMax = "1.3.2" ) From 43f1dccd1d615d888c4f711ad5d2b97e07775ca8 Mon Sep 17 00:00:00 2001 From: noxpost <41703267+noxpost@users.noreply.github.com> Date: Thu, 4 Nov 2021 10:46:02 -0500 Subject: [PATCH 059/120] Update version.go --- cmd/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/version.go b/cmd/version.go index 16f13c6..e4a4ed9 100644 --- a/cmd/version.go +++ b/cmd/version.go @@ -15,7 +15,7 @@ package cmd import ( - "github.com/KostaGorod/iredmail-cli/iredmail" + "github.com/noxpost/iredmail-cli/iredmail" "github.com/spf13/cobra" ) From 991ec2514c38b42092a7adfceef7423710f2ae54 Mon Sep 17 00:00:00 2001 From: noxpost <41703267+noxpost@users.noreply.github.com> Date: Thu, 4 Nov 2021 11:00:45 -0500 Subject: [PATCH 060/120] Update version.go delete version check --- iredmail/version.go | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/iredmail/version.go b/iredmail/version.go index 3f80963..23bfed1 100644 --- a/iredmail/version.go +++ b/iredmail/version.go @@ -55,27 +55,6 @@ func GetIredMailVersion() (iredMailVersion, error) { // Check checks the iredMail version func (v *iredMailVersion) Check() error { - version, err := GetIredMailVersion() - if err != nil { - return err - } - - versionMin, err := semver.Parse(supportedReleaseMin) - if err != nil { - return err - } - versionMax, err := semver.Parse(supportedReleaseMax) - if err != nil { - return err - } - versionCur, err := semver.Parse(string(version)) - if err != nil { - return err - } - - if versionCur.LT(versionMin) || versionCur.GT(versionMax) { - return ErrIredMailVersionNotSupported - } - + return nil } From a51b4c593a80116a52a2c0bb0bb6b295b4587ccf Mon Sep 17 00:00:00 2001 From: noxpost <41703267+noxpost@users.noreply.github.com> Date: Thu, 4 Nov 2021 11:04:39 -0500 Subject: [PATCH 061/120] Update version.go --- iredmail/version.go | 1 - 1 file changed, 1 deletion(-) diff --git a/iredmail/version.go b/iredmail/version.go index 23bfed1..3e691dc 100644 --- a/iredmail/version.go +++ b/iredmail/version.go @@ -8,7 +8,6 @@ import ( "regexp" "strings" - "github.com/blang/semver" ) const ( From fd06ac5ea42af91c917107a81ea3e641e17a744d Mon Sep 17 00:00:00 2001 From: noxpost <41703267+noxpost@users.noreply.github.com> Date: Fri, 5 Nov 2021 07:40:16 -0500 Subject: [PATCH 062/120] Update aliasAdd.go --- cmd/aliasAdd.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/aliasAdd.go b/cmd/aliasAdd.go index 4d390ac..37c6899 100644 --- a/cmd/aliasAdd.go +++ b/cmd/aliasAdd.go @@ -19,7 +19,7 @@ import ( "fmt" "github.com/asaskevich/govalidator" - "github.com/KostaGorod/iredmail-cli/iredmail" + "github.com/noxpost/iredmail-cli/iredmail" "github.com/spf13/cobra" ) From 1b9082931c03af1c79b5750f020959cce8ae5f67 Mon Sep 17 00:00:00 2001 From: noxpost <41703267+noxpost@users.noreply.github.com> Date: Fri, 5 Nov 2021 07:40:33 -0500 Subject: [PATCH 063/120] Update aliasAddForwarding.go --- cmd/aliasAddForwarding.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/aliasAddForwarding.go b/cmd/aliasAddForwarding.go index d09ed72..13b0ca0 100644 --- a/cmd/aliasAddForwarding.go +++ b/cmd/aliasAddForwarding.go @@ -19,7 +19,7 @@ import ( "fmt" "github.com/asaskevich/govalidator" - "github.com/KostaGorod/iredmail-cli/iredmail" + "github.com/noxpost/iredmail-cli/iredmail" "github.com/spf13/cobra" ) From 48e7f4be985c9dacda1bdca6da7ef14d950ebea3 Mon Sep 17 00:00:00 2001 From: noxpost <41703267+noxpost@users.noreply.github.com> Date: Fri, 5 Nov 2021 07:40:53 -0500 Subject: [PATCH 064/120] Update aliasDelete.go --- cmd/aliasDelete.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/aliasDelete.go b/cmd/aliasDelete.go index 3894ff1..c484871 100644 --- a/cmd/aliasDelete.go +++ b/cmd/aliasDelete.go @@ -19,7 +19,7 @@ import ( "fmt" "github.com/asaskevich/govalidator" - "github.com/KostaGorod/iredmail-cli/iredmail" + "github.com/noxpost/iredmail-cli/iredmail" "github.com/spf13/cobra" ) From 9e614bf2e6e9c56932a333ffceb50866852f6ac1 Mon Sep 17 00:00:00 2001 From: noxpost <41703267+noxpost@users.noreply.github.com> Date: Fri, 5 Nov 2021 07:41:19 -0500 Subject: [PATCH 065/120] Update aliasDeleteForwarding.go --- cmd/aliasDeleteForwarding.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/aliasDeleteForwarding.go b/cmd/aliasDeleteForwarding.go index ade2c5b..9bd6257 100644 --- a/cmd/aliasDeleteForwarding.go +++ b/cmd/aliasDeleteForwarding.go @@ -19,7 +19,7 @@ import ( "fmt" "github.com/asaskevich/govalidator" - "github.com/KostaGorod/iredmail-cli/iredmail" + "github.com/noxpost/iredmail-cli/iredmail" "github.com/spf13/cobra" ) From 03d8c6a40dd3998b3e82cceb33bc91a8424ece4e Mon Sep 17 00:00:00 2001 From: noxpost <41703267+noxpost@users.noreply.github.com> Date: Fri, 5 Nov 2021 07:41:36 -0500 Subject: [PATCH 066/120] Update aliasInfo.go --- cmd/aliasInfo.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/aliasInfo.go b/cmd/aliasInfo.go index 1d3f3d7..ad8429f 100644 --- a/cmd/aliasInfo.go +++ b/cmd/aliasInfo.go @@ -20,7 +20,7 @@ import ( "os" "github.com/asaskevich/govalidator" - "github.com/KostaGorod/iredmail-cli/iredmail" + "github.com/noxpost/iredmail-cli/iredmail" "github.com/olekukonko/tablewriter" "github.com/spf13/cobra" ) From e8ec4dea0b865e9a7baba20c2f9af37be4a2f1c1 Mon Sep 17 00:00:00 2001 From: noxpost <41703267+noxpost@users.noreply.github.com> Date: Fri, 5 Nov 2021 07:41:56 -0500 Subject: [PATCH 067/120] Update aliasList.go --- cmd/aliasList.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/aliasList.go b/cmd/aliasList.go index b639d6f..5b8b912 100644 --- a/cmd/aliasList.go +++ b/cmd/aliasList.go @@ -3,7 +3,7 @@ package cmd import ( "os" - "github.com/KostaGorod/iredmail-cli/iredmail" + "github.com/noxpost/iredmail-cli/iredmail" "github.com/olekukonko/tablewriter" "github.com/spf13/cobra" ) From cc0ebf3bcc9c396ce26542e81cd47c1cbbed0e38 Mon Sep 17 00:00:00 2001 From: noxpost <41703267+noxpost@users.noreply.github.com> Date: Fri, 5 Nov 2021 07:42:28 -0500 Subject: [PATCH 068/120] Update domainAdd.go --- cmd/domainAdd.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/domainAdd.go b/cmd/domainAdd.go index 4258efd..2eb0314 100644 --- a/cmd/domainAdd.go +++ b/cmd/domainAdd.go @@ -20,7 +20,7 @@ import ( "strings" "github.com/asaskevich/govalidator" - "github.com/KostaGorod/iredmail-cli/iredmail" + "github.com/noxpost/iredmail-cli/iredmail" "github.com/spf13/cobra" ) From 79c85ffd5b6c4b47977e8d4c5de188cd007c0901 Mon Sep 17 00:00:00 2001 From: noxpost <41703267+noxpost@users.noreply.github.com> Date: Fri, 5 Nov 2021 07:42:42 -0500 Subject: [PATCH 069/120] Update domainAliasAdd.go --- cmd/domainAliasAdd.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/domainAliasAdd.go b/cmd/domainAliasAdd.go index 34111c8..20a832f 100644 --- a/cmd/domainAliasAdd.go +++ b/cmd/domainAliasAdd.go @@ -20,7 +20,7 @@ import ( "strings" "github.com/asaskevich/govalidator" - "github.com/KostaGorod/iredmail-cli/iredmail" + "github.com/noxpost/iredmail-cli/iredmail" "github.com/spf13/cobra" ) From 9fd6f17d58e8f3cdc92a6096deddf73191630a9d Mon Sep 17 00:00:00 2001 From: noxpost <41703267+noxpost@users.noreply.github.com> Date: Fri, 5 Nov 2021 07:43:11 -0500 Subject: [PATCH 070/120] Update domainAliasDelete.go --- cmd/domainAliasDelete.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/domainAliasDelete.go b/cmd/domainAliasDelete.go index 8761d9f..29c1c35 100644 --- a/cmd/domainAliasDelete.go +++ b/cmd/domainAliasDelete.go @@ -20,7 +20,7 @@ import ( "strings" "github.com/asaskevich/govalidator" - "github.com/KostaGorod/iredmail-cli/iredmail" + "github.com/noxpost/iredmail-cli/iredmail" "github.com/spf13/cobra" ) From 58f713cbb9c82e5134359943ab742329c71bdc78 Mon Sep 17 00:00:00 2001 From: noxpost <41703267+noxpost@users.noreply.github.com> Date: Fri, 5 Nov 2021 07:43:24 -0500 Subject: [PATCH 071/120] Update domainCatchallAdd.go --- cmd/domainCatchallAdd.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/domainCatchallAdd.go b/cmd/domainCatchallAdd.go index 1385dd2..5b49c99 100644 --- a/cmd/domainCatchallAdd.go +++ b/cmd/domainCatchallAdd.go @@ -20,7 +20,7 @@ import ( "strings" "github.com/asaskevich/govalidator" - "github.com/KostaGorod/iredmail-cli/iredmail" + "github.com/noxpost/iredmail-cli/iredmail" "github.com/spf13/cobra" ) From 79fe1c29b7e0e3d09e0bce01af0b71d1f5d585c2 Mon Sep 17 00:00:00 2001 From: noxpost <41703267+noxpost@users.noreply.github.com> Date: Fri, 5 Nov 2021 07:43:44 -0500 Subject: [PATCH 072/120] Update domainCatchallDelete.go --- cmd/domainCatchallDelete.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/domainCatchallDelete.go b/cmd/domainCatchallDelete.go index f4dd48e..cc1d44d 100644 --- a/cmd/domainCatchallDelete.go +++ b/cmd/domainCatchallDelete.go @@ -20,7 +20,7 @@ import ( "strings" "github.com/asaskevich/govalidator" - "github.com/KostaGorod/iredmail-cli/iredmail" + "github.com/noxpost/iredmail-cli/iredmail" "github.com/spf13/cobra" ) From 84c9f6e48dca1b48d6f72cc8372eb6cc253c5e61 Mon Sep 17 00:00:00 2001 From: noxpost <41703267+noxpost@users.noreply.github.com> Date: Fri, 5 Nov 2021 07:44:00 -0500 Subject: [PATCH 073/120] Update domainDelete.go --- cmd/domainDelete.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/domainDelete.go b/cmd/domainDelete.go index 8c8fa69..a527f18 100644 --- a/cmd/domainDelete.go +++ b/cmd/domainDelete.go @@ -20,7 +20,7 @@ import ( "strings" "github.com/asaskevich/govalidator" - "github.com/KostaGorod/iredmail-cli/iredmail" + "github.com/noxpost/iredmail-cli/iredmail" "github.com/spf13/cobra" ) From b6b75d4604454ff582aac35ea128bf2e2b1dc2de Mon Sep 17 00:00:00 2001 From: noxpost <41703267+noxpost@users.noreply.github.com> Date: Fri, 5 Nov 2021 07:44:17 -0500 Subject: [PATCH 074/120] Update domainList.go --- cmd/domainList.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/domainList.go b/cmd/domainList.go index c404b45..3ad1312 100644 --- a/cmd/domainList.go +++ b/cmd/domainList.go @@ -17,7 +17,7 @@ package cmd import ( "os" - "github.com/KostaGorod/iredmail-cli/iredmail" + "github.com/noxpost/iredmail-cli/iredmail" "github.com/olekukonko/tablewriter" "github.com/spf13/cobra" ) From 116714634e1459c042905b0b8f6d74bcc5728ca9 Mon Sep 17 00:00:00 2001 From: noxpost <41703267+noxpost@users.noreply.github.com> Date: Fri, 5 Nov 2021 07:44:44 -0500 Subject: [PATCH 075/120] Update forwardingAdd.go --- cmd/forwardingAdd.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/forwardingAdd.go b/cmd/forwardingAdd.go index bdf5201..945869b 100644 --- a/cmd/forwardingAdd.go +++ b/cmd/forwardingAdd.go @@ -19,7 +19,7 @@ import ( "fmt" "github.com/asaskevich/govalidator" - "github.com/KostaGorod/iredmail-cli/iredmail" + "github.com/noxpost/iredmail-cli/iredmail" "github.com/spf13/cobra" ) From 4202eda0f6af3e7f94c7f831e803a10cd822c039 Mon Sep 17 00:00:00 2001 From: noxpost <41703267+noxpost@users.noreply.github.com> Date: Fri, 5 Nov 2021 07:44:59 -0500 Subject: [PATCH 076/120] Update forwardingDelete.go --- cmd/forwardingDelete.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/forwardingDelete.go b/cmd/forwardingDelete.go index 047eb4e..f4a503c 100644 --- a/cmd/forwardingDelete.go +++ b/cmd/forwardingDelete.go @@ -19,7 +19,7 @@ import ( "fmt" "github.com/asaskevich/govalidator" - "github.com/KostaGorod/iredmail-cli/iredmail" + "github.com/noxpost/iredmail-cli/iredmail" "github.com/spf13/cobra" ) From 9d532f4588f36a0c08546c6a067dfa1f0100aec2 Mon Sep 17 00:00:00 2001 From: noxpost <41703267+noxpost@users.noreply.github.com> Date: Fri, 5 Nov 2021 07:45:14 -0500 Subject: [PATCH 077/120] Update forwardingList.go --- cmd/forwardingList.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/forwardingList.go b/cmd/forwardingList.go index 34fdae6..e9954c9 100644 --- a/cmd/forwardingList.go +++ b/cmd/forwardingList.go @@ -17,7 +17,7 @@ package cmd import ( "os" - "github.com/KostaGorod/iredmail-cli/iredmail" + "github.com/noxpost/iredmail-cli/iredmail" "github.com/olekukonko/tablewriter" "github.com/spf13/cobra" ) From 2bc83bbaa1395647c48d142e0050ef514bf65902 Mon Sep 17 00:00:00 2001 From: noxpost <41703267+noxpost@users.noreply.github.com> Date: Fri, 5 Nov 2021 07:45:31 -0500 Subject: [PATCH 078/120] Update mailboxAdd.go --- cmd/mailboxAdd.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/mailboxAdd.go b/cmd/mailboxAdd.go index ff3cd5e..75866fc 100644 --- a/cmd/mailboxAdd.go +++ b/cmd/mailboxAdd.go @@ -6,7 +6,7 @@ import ( "strconv" "github.com/asaskevich/govalidator" - "github.com/KostaGorod/iredmail-cli/iredmail" + "github.com/noxpost/iredmail-cli/iredmail" "github.com/spf13/cobra" ) From 45cfd5085141f9b0ab31ec580f343df4d371595c Mon Sep 17 00:00:00 2001 From: noxpost <41703267+noxpost@users.noreply.github.com> Date: Fri, 5 Nov 2021 07:45:45 -0500 Subject: [PATCH 079/120] Update mailboxAliasAdd.go --- cmd/mailboxAliasAdd.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/mailboxAliasAdd.go b/cmd/mailboxAliasAdd.go index 3cbef84..9fa0d23 100644 --- a/cmd/mailboxAliasAdd.go +++ b/cmd/mailboxAliasAdd.go @@ -19,7 +19,7 @@ import ( "fmt" "github.com/asaskevich/govalidator" - "github.com/KostaGorod/iredmail-cli/iredmail" + "github.com/noxpost/iredmail-cli/iredmail" "github.com/spf13/cobra" ) From 53895f5dce70f7c0df8c4cd17f501fd8efe8929a Mon Sep 17 00:00:00 2001 From: noxpost <41703267+noxpost@users.noreply.github.com> Date: Fri, 5 Nov 2021 07:46:06 -0500 Subject: [PATCH 080/120] Update mailboxAliasDelete.go --- cmd/mailboxAliasDelete.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/mailboxAliasDelete.go b/cmd/mailboxAliasDelete.go index efb033f..65d6eab 100644 --- a/cmd/mailboxAliasDelete.go +++ b/cmd/mailboxAliasDelete.go @@ -19,7 +19,7 @@ import ( "fmt" "github.com/asaskevich/govalidator" - "github.com/KostaGorod/iredmail-cli/iredmail" + "github.com/noxpost/iredmail-cli/iredmail" "github.com/spf13/cobra" ) From e2e43add5b289617ff860d38431f7974d6589edf Mon Sep 17 00:00:00 2001 From: noxpost <41703267+noxpost@users.noreply.github.com> Date: Fri, 5 Nov 2021 07:46:21 -0500 Subject: [PATCH 081/120] Update mailboxDelete.go --- cmd/mailboxDelete.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/mailboxDelete.go b/cmd/mailboxDelete.go index 8549739..1ebf489 100644 --- a/cmd/mailboxDelete.go +++ b/cmd/mailboxDelete.go @@ -19,7 +19,7 @@ import ( "fmt" "github.com/asaskevich/govalidator" - "github.com/KostaGorod/iredmail-cli/iredmail" + "github.com/noxpost/iredmail-cli/iredmail" "github.com/spf13/cobra" ) From eb2d2203daa8695240d38656c579a59e9ba9ba4c Mon Sep 17 00:00:00 2001 From: noxpost <41703267+noxpost@users.noreply.github.com> Date: Fri, 5 Nov 2021 07:46:37 -0500 Subject: [PATCH 082/120] Update mailboxInfo.go --- cmd/mailboxInfo.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/mailboxInfo.go b/cmd/mailboxInfo.go index 2f90a6c..db71579 100644 --- a/cmd/mailboxInfo.go +++ b/cmd/mailboxInfo.go @@ -22,7 +22,7 @@ import ( "strings" "github.com/asaskevich/govalidator" - "github.com/KostaGorod/iredmail-cli/iredmail" + "github.com/noxpost/iredmail-cli/iredmail" "github.com/olekukonko/tablewriter" "github.com/spf13/cobra" ) From 19773f9196ebc62020b40881424e8ea63223aef6 Mon Sep 17 00:00:00 2001 From: noxpost <41703267+noxpost@users.noreply.github.com> Date: Fri, 5 Nov 2021 07:46:51 -0500 Subject: [PATCH 083/120] Update mailboxList.go --- cmd/mailboxList.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/mailboxList.go b/cmd/mailboxList.go index 983034f..3cc305e 100644 --- a/cmd/mailboxList.go +++ b/cmd/mailboxList.go @@ -4,7 +4,7 @@ import ( "os" "strconv" - "github.com/KostaGorod/iredmail-cli/iredmail" + "github.com/noxpost/iredmail-cli/iredmail" "github.com/olekukonko/tablewriter" "github.com/spf13/cobra" ) From 76b3057f5a64fa7f29c721b32d115f2e8d2cf968 Mon Sep 17 00:00:00 2001 From: noxpost <41703267+noxpost@users.noreply.github.com> Date: Fri, 5 Nov 2021 07:47:04 -0500 Subject: [PATCH 084/120] Update mailboxUpdate.go --- cmd/mailboxUpdate.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/mailboxUpdate.go b/cmd/mailboxUpdate.go index d92f52b..18e2cb8 100644 --- a/cmd/mailboxUpdate.go +++ b/cmd/mailboxUpdate.go @@ -20,7 +20,7 @@ import ( "strconv" "github.com/asaskevich/govalidator" - "github.com/KostaGorod/iredmail-cli/iredmail" + "github.com/noxpost/iredmail-cli/iredmail" "github.com/spf13/cobra" ) From a45fe8b5e37f3a79ce1c84ca3966eec4af6b343f Mon Sep 17 00:00:00 2001 From: noxpost <41703267+noxpost@users.noreply.github.com> Date: Fri, 5 Nov 2021 07:47:19 -0500 Subject: [PATCH 085/120] Update root.go --- cmd/root.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/root.go b/cmd/root.go index 4e96e57..e047b22 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -6,7 +6,7 @@ import ( "os" "path/filepath" - "github.com/KostaGorod/iredmail-cli/iredmail" + "github.com/noxpost/iredmail-cli/iredmail" "github.com/fatih/color" homedir "github.com/mitchellh/go-homedir" "github.com/spf13/cobra" From eae31ec34eb033fcf0d03c1d60cb47359f01a6a5 Mon Sep 17 00:00:00 2001 From: noxpost <41703267+noxpost@users.noreply.github.com> Date: Fri, 5 Nov 2021 07:58:12 -0500 Subject: [PATCH 086/120] Update main.go --- main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.go b/main.go index 0672223..09a18da 100644 --- a/main.go +++ b/main.go @@ -14,7 +14,7 @@ package main -import "github.com/kostagorod/iredmail-cli/cmd" +import "github.com/noxpost/iredmail-cli/cmd" func main() { cmd.Execute() From 557996bcc2feeacb26cbb37e3e102ddc832999db Mon Sep 17 00:00:00 2001 From: Eddie Webbinaro Date: Mon, 13 Dec 2021 19:25:26 -0500 Subject: [PATCH 087/120] Update config.yml --- .circleci/config.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a5e5ada..1f124d1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -35,8 +35,6 @@ workflows: filters: tags: ignore: /.*/ - branches: - ignore: /.*/ - release: requires: - integration-test @@ -44,4 +42,4 @@ workflows: tags: only: /^v.*/ branches: - ignore: /.*/ \ No newline at end of file + ignore: /.*/ From d69f4da8ab9e5b33f5cc9b68d73a33cd81083a82 Mon Sep 17 00:00:00 2001 From: Eddie Webbinaro Date: Mon, 13 Dec 2021 19:27:48 -0500 Subject: [PATCH 088/120] Update config.yml --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1f124d1..ec85811 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -5,8 +5,8 @@ version: 2 jobs: integration-test: docker: - - image: circleci/golang:1.9 - working_directory: /go/src/github.com/drlogout/iredmail-cli + - image: cimg/go:1.17 + working_directory: /go/src/github.com/eddiewebb/iredmail-cli steps: - checkout - run: sudo cp .circleci/iredmail-release /etc/iredmail-release @@ -19,7 +19,7 @@ jobs: release: docker: - image: circleci/golang:1.9 - working_directory: /go/src/github.com/drlogout/iredmail-cli + working_directory: /go/src/github.com/eddiewebb/iredmail-cli steps: - checkout - run: go get -v -t -d ./... From 338110c8dc8ee55e86c8d4096b841b1bb59150d5 Mon Sep 17 00:00:00 2001 From: Eddie Webbinaro Date: Mon, 13 Dec 2021 19:29:27 -0500 Subject: [PATCH 089/120] Update config.yml --- .circleci/config.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ec85811..d89b3cd 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -6,7 +6,6 @@ jobs: integration-test: docker: - image: cimg/go:1.17 - working_directory: /go/src/github.com/eddiewebb/iredmail-cli steps: - checkout - run: sudo cp .circleci/iredmail-release /etc/iredmail-release From 69d9ad804853d297a3f0a5fe10b1157371a3fa29 Mon Sep 17 00:00:00 2001 From: Eddie Webbinaro Date: Sat, 18 Dec 2021 08:36:33 -0500 Subject: [PATCH 090/120] use go mod this catches up from golang 1.9 to 1.17 including use of go mod makefile has been updated to use go install where go get was used previously. --- .circleci/config.yml | 11 +- Makefile | 5 +- go.mod | 35 ++ go.sum | 821 +++++++++++++++++++++++++++++++++++++++++++ main.go | 1 + 5 files changed, 864 insertions(+), 9 deletions(-) create mode 100644 go.mod create mode 100644 go.sum diff --git a/.circleci/config.yml b/.circleci/config.yml index d89b3cd..adec24b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -12,17 +12,17 @@ jobs: - run: sudo cp .circleci/doveadm /usr/local/bin/doveadm - run: sudo chmod a+x /usr/local/bin/doveadm - run: cp .circleci/my.cnf-vmailadmin $HOME/.my.cnf-vmailadmin + - run: go install - run: go get -v -t -d ./... - run: go test -v ./integration_test release: docker: - - image: circleci/golang:1.9 - working_directory: /go/src/github.com/eddiewebb/iredmail-cli + - image: cimg/go:1.17 steps: - checkout - run: go get -v -t -d ./... - - run: git config --global user.name drlogout + - run: git config --global user.name eddiewebb - run: make dist - run: make release @@ -30,10 +30,7 @@ workflows: version: 2 run_release: jobs: - - integration-test: - filters: - tags: - ignore: /.*/ + - integration-test - release: requires: - integration-test diff --git a/Makefile b/Makefile index a3d676b..9bc06ec 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,8 @@ RELEASE_TAG=$$(git describe --abbrev=0 --tags) dist-tools: - @go get github.com/mitchellh/gox + @go install github.com/mitchellh/gox + export PATH="$PATH:$HOME/go/bin" dist: dist-tools rm -rf ./bin/* @@ -14,7 +15,7 @@ dist: dist-tools rm -rf ./bin/iredmail-cli_linux-arm64_$(RELEASE_TAG) release-tools: - @go get github.com/tcnksm/ghr + @go install github.com/tcnksm/ghr release: release-tools ghr $(RELEASE_TAG) ./bin/ diff --git a/go.mod b/go.mod new file mode 100644 index 0000000..db0f9b9 --- /dev/null +++ b/go.mod @@ -0,0 +1,35 @@ +module github.com/iredmail-cli + +go 1.17 + +require ( + github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d + github.com/fatih/color v1.13.0 + github.com/go-sql-driver/mysql v1.6.0 + github.com/mitchellh/go-homedir v1.1.0 + github.com/noxpost/iredmail-cli v0.2.7 + github.com/olekukonko/tablewriter v0.0.5 + github.com/onsi/ginkgo v1.16.5 + github.com/onsi/gomega v1.17.0 + github.com/spf13/cobra v1.3.0 +) + +require ( + github.com/blang/semver v3.5.1+incompatible // indirect + github.com/drlogout/iredmail-cli v0.2.7 // indirect + github.com/fsnotify/fsnotify v1.5.1 // indirect + github.com/hashicorp/go-version v1.0.0 // indirect + github.com/inconshreveable/mousetrap v1.0.0 // indirect + github.com/mattn/go-colorable v0.1.12 // indirect + github.com/mattn/go-isatty v0.0.14 // indirect + github.com/mattn/go-runewidth v0.0.9 // indirect + github.com/mitchellh/gox v1.0.1 // indirect + github.com/mitchellh/iochan v1.0.0 // indirect + github.com/nxadm/tail v1.4.8 // indirect + github.com/spf13/pflag v1.0.5 // indirect + golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d // indirect + golang.org/x/sys v0.0.0-20211205182925-97ca703d548d // indirect + golang.org/x/text v0.3.7 // indirect + gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect +) diff --git a/go.sum b/go.sum new file mode 100644 index 0000000..50fd530 --- /dev/null +++ b/go.sum @@ -0,0 +1,821 @@ +cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= +cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= +cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= +cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= +cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= +cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To= +cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4= +cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M= +cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc= +cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk= +cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs= +cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc= +cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= +cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI= +cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk= +cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg= +cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8= +cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0= +cloud.google.com/go v0.83.0/go.mod h1:Z7MJUsANfY0pYPdw0lbnivPx4/vhy/e2FEkSkF7vAVY= +cloud.google.com/go v0.84.0/go.mod h1:RazrYuxIK6Kb7YrzzhPoLmCVzl7Sup4NrbKPg8KHSUM= +cloud.google.com/go v0.87.0/go.mod h1:TpDYlFy7vuLzZMMZ+B6iRiELaY7z/gJPaqbMx6mlWcY= +cloud.google.com/go v0.90.0/go.mod h1:kRX0mNRHe0e2rC6oNakvwQqzyDmg57xJ+SZU1eT2aDQ= +cloud.google.com/go v0.93.3/go.mod h1:8utlLll2EF5XMAV15woO4lSbWQlk8rer9aLOfLh7+YI= +cloud.google.com/go v0.94.1/go.mod h1:qAlAugsXlC+JWO+Bke5vCtc9ONxjQT3drlTTnAplMW4= +cloud.google.com/go v0.97.0/go.mod h1:GF7l59pYBVlXQIBLx3a761cZ41F9bBH3JUlihCt2Udc= +cloud.google.com/go v0.98.0/go.mod h1:ua6Ush4NALrHk5QXDWnjvZHN93OuF0HfuEPq9I1X0cM= +cloud.google.com/go v0.99.0/go.mod h1:w0Xx2nLzqWJPuozYQX+hFfCSI8WioryfRDzkoI/Y2ZA= +cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= +cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= +cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= +cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg= +cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= +cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= +cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= +cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= +cloud.google.com/go/firestore v1.6.1/go.mod h1:asNXNOzBdyVQmEU+ggO8UPodTkEVFW5Qx+rwHnAz+EY= +cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= +cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= +cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= +cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU= +cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= +cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= +cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= +cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= +cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= +dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= +github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= +github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= +github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= +github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= +github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= +github.com/armon/go-metrics v0.3.10/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc= +github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= +github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= +github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d h1:Byv0BzEl3/e6D5CLfI0j/7hiIEtvGVFPCZ7Ei2oq8iQ= +github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw= +github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= +github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= +github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= +github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= +github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ= +github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= +github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= +github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= +github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= +github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= +github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag= +github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I= +github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= +github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= +github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= +github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI= +github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20211130200136-a8f946100490/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= +github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= +github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/drlogout/iredmail-cli v0.2.7 h1:4XhygyuBfJUxRKIfzfK7DYJhuAWlQKDtzNRtauhYfg4= +github.com/drlogout/iredmail-cli v0.2.7/go.mod h1:dYut6+WwGZ2PHe5yLdXbjppZxs/C1HIu2aoc3HhXLP0= +github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= +github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po= +github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= +github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= +github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ= +github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= +github.com/envoyproxy/go-control-plane v0.10.1/go.mod h1:AY7fTTXNdv/aJ2O5jwpxAPOWUZ7hQAEvzN5Pf27BkQQ= +github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/envoyproxy/protoc-gen-validate v0.6.2/go.mod h1:2t7qjJNvHPx8IjnBOzl9E9/baC+qXE/TeeyBRzgJDws= +github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= +github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= +github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w= +github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= +github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= +github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= +github.com/fsnotify/fsnotify v1.5.1 h1:mZcQUHVQUQWoPXXtuf9yuEXKudkV2sx1E06UadKWpgI= +github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU= +github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= +github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= +github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= +github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE= +github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= +github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= +github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= +github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= +github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= +github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= +github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= +github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= +github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= +github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8= +github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= +github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= +github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= +github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk= +github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= +github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= +github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= +github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= +github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= +github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= +github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM= +github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= +github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= +github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= +github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= +github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= +github.com/google/martian/v3 v3.2.1/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk= +github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= +github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= +github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= +github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= +github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= +github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0= +github.com/googleapis/gax-go/v2 v2.1.1/go.mod h1:hddJymUZASv3XPyGkUpKj8pPO47Rmb0eJc8R6ouapiM= +github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= +github.com/hashicorp/consul/api v1.11.0/go.mod h1:XjsvQN+RJGWI2TWy1/kqaE16HrR2J/FWgkYjdZQsX9M= +github.com/hashicorp/consul/sdk v0.8.0/go.mod h1:GBvyrGALthsZObzUGsfgHZQDXjg4lOjagTIwIR1vPms= +github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= +github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= +github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= +github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= +github.com/hashicorp/go-hclog v0.12.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= +github.com/hashicorp/go-hclog v1.0.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= +github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= +github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= +github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= +github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= +github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA= +github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs= +github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8= +github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= +github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= +github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/hashicorp/go-version v1.0.0 h1:21MVWPKDphxa7ineQQTrCU5brh7OuVVAzGOCnnCPtE8= +github.com/hashicorp/go-version v1.0.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= +github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= +github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= +github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= +github.com/hashicorp/mdns v1.0.1/go.mod h1:4gW7WsVCke5TE7EPeYliwHlRUyBtfCwuFwuMg2DmyNY= +github.com/hashicorp/mdns v1.0.4/go.mod h1:mtBihi+LeNXGtG8L9dX59gAEa12BDtBQSp4v/YAJqrc= +github.com/hashicorp/memberlist v0.2.2/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE= +github.com/hashicorp/memberlist v0.3.0/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE= +github.com/hashicorp/serf v0.9.5/go.mod h1:UWDWwZeL5cuWDJdl0C6wrvrUwEqtQ4ZKBKKENpqIUyk= +github.com/hashicorp/serf v0.9.6/go.mod h1:TXZNMjZQijwlDvp+r0b63xZ45H7JmCmgg4gpTwn9UV4= +github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= +github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho= +github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= +github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= +github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= +github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= +github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= +github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= +github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= +github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= +github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= +github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= +github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= +github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pretty v0.2.0 h1:s5hAObm+yFO5uHYt5dYjxi2rXrsnmRpJx4OYvIWUaQs= +github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/lyft/protoc-gen-star v0.5.3/go.mod h1:V0xaHgaf5oCCqmcxYcWiDfTiKsZsRc87/1qhoTACD8w= +github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= +github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= +github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= +github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= +github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= +github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40= +github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= +github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= +github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= +github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84= +github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE= +github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= +github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y= +github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= +github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0= +github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= +github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= +github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= +github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso= +github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI= +github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI= +github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= +github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= +github.com/mitchellh/gox v1.0.1 h1:x0jD3dcHk9a9xPSDN6YEL4xL6Qz0dvNYm8yZqui5chI= +github.com/mitchellh/gox v1.0.1/go.mod h1:ED6BioOGXMswlXa2zxfh/xdd5QhwYliBFn9V18Ap4z4= +github.com/mitchellh/iochan v1.0.0 h1:C+X3KsSTLFVBr/tK1eYN/vs4rJcvsiLU338UhYPJWeY= +github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= +github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= +github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/noxpost/iredmail-cli v0.2.7 h1:d0EjDJ1ZzmCnv51eGANNEE0FNoYnQIr3M+wYn5WZVjc= +github.com/noxpost/iredmail-cli v0.2.7/go.mod h1:sxVau9av4pzgPSVhqjsymw8HgttDsre9t+KnZGQi7WU= +github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= +github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= +github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= +github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec= +github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY= +github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= +github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= +github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= +github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= +github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= +github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= +github.com/onsi/gomega v1.17.0 h1:9Luw4uT5HTjHTN8+aNcSThgH1vdXnmdJ8xIfZ4wyTRE= +github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= +github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= +github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= +github.com/pelletier/go-toml v1.9.4/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= +github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= +github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s= +github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= +github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= +github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= +github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= +github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= +github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= +github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= +github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= +github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= +github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= +github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= +github.com/sagikazarmark/crypt v0.3.0/go.mod h1:uD/D+6UF4SrIR1uGEv7bBNkNqLGqUr43MRiaGWX1Nig= +github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= +github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= +github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= +github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= +github.com/spf13/afero v1.3.3/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY520V4= +github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= +github.com/spf13/cast v1.4.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= +github.com/spf13/cobra v1.3.0 h1:R7cSvGu+Vv+qX0gW5R/85dx2kmmJT5z5NM8ifdYjdn0= +github.com/spf13/cobra v1.3.0/go.mod h1:BrRVncBjOJa/eUcVVm9CE+oC6as8k+VYr4NY7WCi9V4= +github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= +github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= +github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/spf13/viper v1.10.0/go.mod h1:SoyBPwAtKDzypXNDFKN5kzH7ppppbGZtls1UpIy5AsM= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= +github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= +github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= +github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= +go.etcd.io/etcd/api/v3 v3.5.1/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= +go.etcd.io/etcd/client/pkg/v3 v3.5.1/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= +go.etcd.io/etcd/client/v2 v2.305.1/go.mod h1:pMEacxZW7o8pg4CrFE7pquyCJJzZvkvdD2RibOCCCGs= +go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= +go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= +go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= +go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= +go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= +go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= +go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= +go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= +golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= +golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= +golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= +golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= +golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= +golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= +golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= +golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= +golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= +golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= +golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= +golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= +golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= +golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= +golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= +golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= +golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= +golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.5.0/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= +golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= +golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= +golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= +golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8= +golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= +golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d h1:LO7XpTYMwTqxjLcGWPijK3vRXg1aWdlNOVOHRq45d7c= +golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20211005180243-6b3c2da341f1/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210603125802-9665404d3644/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211205182925-97ca703d548d h1:FjkYO/PPp4Wi0EAUOVLxePm7qVW4r4ctbWpURyuOD0E= +golang.org/x/sys v0.0.0-20211205182925-97ca703d548d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= +golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= +golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= +golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= +golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE= +golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= +golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= +google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= +google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= +google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= +google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= +google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= +google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= +google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= +google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= +google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= +google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= +google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg= +google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE= +google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8= +google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU= +google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94= +google.golang.org/api v0.47.0/go.mod h1:Wbvgpq1HddcWVtzsVLyfLp8lDg6AA241LmgIL59tHXo= +google.golang.org/api v0.48.0/go.mod h1:71Pr1vy+TAZRPkPs/xlCf5SsU8WjuAWv1Pfjbtukyy4= +google.golang.org/api v0.50.0/go.mod h1:4bNT5pAuq5ji4SRZm+5QIkjny9JAyVD/3gaSihNefaw= +google.golang.org/api v0.51.0/go.mod h1:t4HdrdoNgyN5cbEfm7Lum0lcLDLiise1F8qDKX00sOU= +google.golang.org/api v0.54.0/go.mod h1:7C4bFFOvVDGXjfDTAsgGwDgAxRDeQ4X8NvUedIt6z3k= +google.golang.org/api v0.55.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE= +google.golang.org/api v0.56.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE= +google.golang.org/api v0.57.0/go.mod h1:dVPlbZyBo2/OjBpmvNdpn2GRm6rPy75jyU7bmhdrMgI= +google.golang.org/api v0.59.0/go.mod h1:sT2boj7M9YJxZzgeZqXogmhfmRWDtPzT31xkieUbuZU= +google.golang.org/api v0.61.0/go.mod h1:xQRti5UdCmoCEqFxcz93fTl338AVqDgyaDRuOZ3hg9I= +google.golang.org/api v0.62.0/go.mod h1:dKmwPCydfsad4qCH08MSdgWjfHOyfpd4VtDGgRFdavw= +google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= +google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= +google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA= +google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U= +google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= +google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= +google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A= +google.golang.org/genproto v0.0.0-20210513213006-bf773b8c8384/go.mod h1:P3QM42oQyzQSnHPnZ/vqoCdDmzH28fzWByN9asMeM8A= +google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= +google.golang.org/genproto v0.0.0-20210604141403-392c879c8b08/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= +google.golang.org/genproto v0.0.0-20210608205507-b6d2f5bf0d7d/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= +google.golang.org/genproto v0.0.0-20210624195500-8bfb893ecb84/go.mod h1:SzzZ/N+nwJDaO1kznhnlzqS8ocJICar6hYhVyhi++24= +google.golang.org/genproto v0.0.0-20210713002101-d411969a0d9a/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k= +google.golang.org/genproto v0.0.0-20210716133855-ce7ef5c701ea/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k= +google.golang.org/genproto v0.0.0-20210728212813-7823e685a01f/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48= +google.golang.org/genproto v0.0.0-20210805201207-89edb61ffb67/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48= +google.golang.org/genproto v0.0.0-20210813162853-db860fec028c/go.mod h1:cFeNkxwySK631ADgubI+/XFU/xp8FD5KIVV4rj8UC5w= +google.golang.org/genproto v0.0.0-20210821163610-241b8fcbd6c8/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= +google.golang.org/genproto v0.0.0-20210828152312-66f60bf46e71/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= +google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= +google.golang.org/genproto v0.0.0-20210903162649-d08c68adba83/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= +google.golang.org/genproto v0.0.0-20210909211513-a8c4777a87af/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= +google.golang.org/genproto v0.0.0-20210924002016-3dee208752a0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211008145708-270636b82663/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211028162531-8db9c33dc351/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211129164237-f09f9a12af12/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211203200212-54befc351ae9/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211206160659-862468c7d6e0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= +google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= +google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= +google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60= +google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= +google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= +google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= +google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8= +google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= +google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= +google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= +google.golang.org/grpc v1.37.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= +google.golang.org/grpc v1.37.1/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= +google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= +google.golang.org/grpc v1.39.0/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= +google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= +google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= +google.golang.org/grpc v1.40.1/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= +google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= +google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= +google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= +google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= +google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= +google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= +google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= +google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= +google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= +google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= +google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ= +google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= +gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= +gopkg.in/ini.v1 v1.66.2/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= +gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= +gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= +gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= +honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= +honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= +rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= +rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= +rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= diff --git a/main.go b/main.go index 09a18da..74990b6 100644 --- a/main.go +++ b/main.go @@ -1,3 +1,4 @@ +// Copyright © 2021 Eddie Webbinaro // Copyright © 2018 Christian Nolte // // Licensed under the Apache License, Version 2.0 (the "License"); From b054aac934074a3a611a7f70fb932146bd4b3b00 Mon Sep 17 00:00:00 2001 From: Eddie Webbinaro Date: Sat, 18 Dec 2021 09:04:52 -0500 Subject: [PATCH 091/120] add mariadb container --- .circleci/config.yml | 17 +++++++++++++++-- .circleci/my.cnf-vmailadmin | 6 +++--- integration_test/suite_test.go | 2 +- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index adec24b..7f441a9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -6,6 +6,11 @@ jobs: integration-test: docker: - image: cimg/go:1.17 + - image: mariadb:10.7.1 + environment: + MARIADB_USER: vmail + MARIADB_PASSWORD: itslocalletmein + #parallelism: 4 steps: - checkout - run: sudo cp .circleci/iredmail-release /etc/iredmail-release @@ -13,7 +18,15 @@ jobs: - run: sudo chmod a+x /usr/local/bin/doveadm - run: cp .circleci/my.cnf-vmailadmin $HOME/.my.cnf-vmailadmin - run: go install - - run: go get -v -t -d ./... + - run: + name: install dockerize + command: wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz && sudo tar -C /usr/local/bin -xzvf dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz && rm dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz + environment: + DOCKERIZE_VERSION: v0.3.0 + - run: + name: Wait for db + command: dockerize -wait tcp://localhost:3306 -timeout 1m + #- run: go test -v $(go list ./... | circleci tests split) - run: go test -v ./integration_test release: @@ -21,7 +34,7 @@ jobs: - image: cimg/go:1.17 steps: - checkout - - run: go get -v -t -d ./... + - run: go install - run: git config --global user.name eddiewebb - run: make dist - run: make release diff --git a/.circleci/my.cnf-vmailadmin b/.circleci/my.cnf-vmailadmin index 181b391..891a386 100644 --- a/.circleci/my.cnf-vmailadmin +++ b/.circleci/my.cnf-vmailadmin @@ -1,5 +1,5 @@ [client] -host="iredmail-test-db.noltech.net" -port="3357" +host="localhost" +port="3306" user="vmail" -password="MDmPEwViyNNrMVpxrRGQivvFdtxZAp98" +password="itslocalletmein" diff --git a/integration_test/suite_test.go b/integration_test/suite_test.go index 34a59d3..90ffaa8 100644 --- a/integration_test/suite_test.go +++ b/integration_test/suite_test.go @@ -16,7 +16,7 @@ import ( const ( dbConnectionStringLocal = "vmail:sx4fDttWdWNbiBPsGxhbbxic2MmmGsmJ@tcp(127.0.0.1:8806)/vmail" - dbConnectionStringCI = "vmail:MDmPEwViyNNrMVpxrRGQivvFdtxZAp98@tcp(iredmail-test-db.noltech.net:3357)/vmail" + dbConnectionStringCI = "vmail:itslocalletmein@tcp(localhost:3306)/vmail" ) var ( From 35399187d5f639f63878d0511cff6efce0a97c6f Mon Sep 17 00:00:00 2001 From: Eddie Webbinaro Date: Sat, 18 Dec 2021 09:06:05 -0500 Subject: [PATCH 092/120] add mariadb container --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7f441a9..07754fa 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -10,6 +10,7 @@ jobs: environment: MARIADB_USER: vmail MARIADB_PASSWORD: itslocalletmein + MARIADB_ALLOW_EMPTY_ROOT_PASSWORD: "true" #parallelism: 4 steps: - checkout From f1dcf20880c306ed50c245902bed07dea98aaece Mon Sep 17 00:00:00 2001 From: Eddie Webbinaro Date: Sat, 18 Dec 2021 09:07:15 -0500 Subject: [PATCH 093/120] add mariadb container --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 07754fa..d0f9d9d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -11,6 +11,7 @@ jobs: MARIADB_USER: vmail MARIADB_PASSWORD: itslocalletmein MARIADB_ALLOW_EMPTY_ROOT_PASSWORD: "true" + MARIADB_DATABASE: vmail #parallelism: 4 steps: - checkout From 74cb0498d091fe7d361564f579c60ac40bfd66e8 Mon Sep 17 00:00:00 2001 From: Eddie Webbinaro Date: Sat, 18 Dec 2021 09:13:46 -0500 Subject: [PATCH 094/120] add mariadb container --- .circleci/config.yml | 1 + .circleci/define_tables.sql | 68 +++++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+) create mode 100644 .circleci/define_tables.sql diff --git a/.circleci/config.yml b/.circleci/config.yml index d0f9d9d..27ca90f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -29,6 +29,7 @@ jobs: name: Wait for db command: dockerize -wait tcp://localhost:3306 -timeout 1m #- run: go test -v $(go list ./... | circleci tests split) + - run: mysql -h localhost vmail < .circleci/define_tables.sql - run: go test -v ./integration_test release: diff --git a/.circleci/define_tables.sql b/.circleci/define_tables.sql new file mode 100644 index 0000000..4b12164 --- /dev/null +++ b/.circleci/define_tables.sql @@ -0,0 +1,68 @@ +-- all values are handled by testing, we just need strucutre +CREATE TABLE `alias` ( + `address` varchar(255) NOT NULL DEFAULT '', + `name` varchar(255) NOT NULL DEFAULT '', + `accesspolicy` varchar(30) NOT NULL DEFAULT '', + `domain` varchar(255) NOT NULL DEFAULT '', + `created` datetime NOT NULL DEFAULT '1970-01-01 01:01:01', + `modified` datetime NOT NULL DEFAULT '1970-01-01 01:01:01', + `expired` datetime NOT NULL DEFAULT '9999-12-31 00:00:00', + `active` tinyint(1) NOT NULL DEFAULT 1, + PRIMARY KEY (`address`), + KEY `domain` (`domain`), + KEY `expired` (`expired`), + KEY `active` (`active`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +CREATE TABLE `alias_domain` ( + `alias_domain` varchar(255) NOT NULL, + `target_domain` varchar(255) NOT NULL, + `created` datetime NOT NULL DEFAULT '1970-01-01 01:01:01', + `modified` datetime NOT NULL DEFAULT '1970-01-01 01:01:01', + `active` tinyint(1) NOT NULL DEFAULT 1, + PRIMARY KEY (`alias_domain`), + KEY `target_domain` (`target_domain`), + KEY `active` (`active`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +CREATE TABLE `domain` ( + `domain` varchar(255) NOT NULL DEFAULT '', + `description` text DEFAULT NULL, + `disclaimer` text DEFAULT NULL, + `aliases` int(10) NOT NULL DEFAULT 0, + `mailboxes` int(10) NOT NULL DEFAULT 0, + `maillists` int(10) NOT NULL DEFAULT 0, + `maxquota` bigint(20) NOT NULL DEFAULT 0, + `quota` bigint(20) NOT NULL DEFAULT 0, + `transport` varchar(255) NOT NULL DEFAULT 'dovecot', + `backupmx` tinyint(1) NOT NULL DEFAULT 0, + `settings` text DEFAULT NULL, + `created` datetime NOT NULL DEFAULT '1970-01-01 01:01:01', + `modified` datetime NOT NULL DEFAULT '1970-01-01 01:01:01', + `expired` datetime NOT NULL DEFAULT '9999-12-31 00:00:00', + `active` tinyint(1) NOT NULL DEFAULT 1, + PRIMARY KEY (`domain`), + KEY `backupmx` (`backupmx`), + KEY `expired` (`expired`), + KEY `active` (`active`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +CREATE TABLE `forwardings` ( + `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, + `address` varchar(255) NOT NULL DEFAULT '', + `forwarding` varchar(255) NOT NULL DEFAULT '', + `domain` varchar(255) NOT NULL DEFAULT '', + `dest_domain` varchar(255) NOT NULL DEFAULT '', + `is_maillist` tinyint(1) NOT NULL DEFAULT 0, + `is_list` tinyint(1) NOT NULL DEFAULT 0, + `is_forwarding` tinyint(1) NOT NULL DEFAULT 0, + `is_alias` tinyint(1) NOT NULL DEFAULT 0, + `active` tinyint(1) NOT NULL DEFAULT 1, + PRIMARY KEY (`id`), + UNIQUE KEY `address` (`address`,`forwarding`), + KEY `domain` (`domain`), + KEY `dest_domain` (`dest_domain`), + KEY `is_maillist` (`is_maillist`), + KEY `is_list` (`is_list`), + KEY `is_alias` (`is_alias`) +) ENGINE=InnoDB AUTO_INCREMENT=13 DEFAULT CHARSET=utf8; \ No newline at end of file From 844a64022a5177096fafd1054006df180893c2c7 Mon Sep 17 00:00:00 2001 From: Eddie Webbinaro Date: Sat, 18 Dec 2021 09:16:33 -0500 Subject: [PATCH 095/120] add mariadb container --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 27ca90f..9f9670d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -20,6 +20,7 @@ jobs: - run: sudo chmod a+x /usr/local/bin/doveadm - run: cp .circleci/my.cnf-vmailadmin $HOME/.my.cnf-vmailadmin - run: go install + - run: sudo apt-get update && sudo apt-get install mysql-shell - run: name: install dockerize command: wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz && sudo tar -C /usr/local/bin -xzvf dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz && rm dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz From 2c0e5d4db2349fc8a26ec18e698f36e1a4f5c02d Mon Sep 17 00:00:00 2001 From: Eddie Webbinaro Date: Sat, 18 Dec 2021 09:17:34 -0500 Subject: [PATCH 096/120] add mariadb container --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9f9670d..5af87b3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -20,7 +20,7 @@ jobs: - run: sudo chmod a+x /usr/local/bin/doveadm - run: cp .circleci/my.cnf-vmailadmin $HOME/.my.cnf-vmailadmin - run: go install - - run: sudo apt-get update && sudo apt-get install mysql-shell + - run: sudo apt-get update && sudo apt-get install mysql-client - run: name: install dockerize command: wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz && sudo tar -C /usr/local/bin -xzvf dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz && rm dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz From 6e5a839dedb91ce77bca6daac452561c33d26fa0 Mon Sep 17 00:00:00 2001 From: Eddie Webbinaro Date: Sat, 18 Dec 2021 09:18:49 -0500 Subject: [PATCH 097/120] add mariadb container --- .circleci/config.yml | 2 +- .circleci/my.cnf-vmailadmin | 2 +- integration_test/suite_test.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5af87b3..f21c3be 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -30,7 +30,7 @@ jobs: name: Wait for db command: dockerize -wait tcp://localhost:3306 -timeout 1m #- run: go test -v $(go list ./... | circleci tests split) - - run: mysql -h localhost vmail < .circleci/define_tables.sql + - run: mysql -h 127.0.0.1 vmail < .circleci/define_tables.sql - run: go test -v ./integration_test release: diff --git a/.circleci/my.cnf-vmailadmin b/.circleci/my.cnf-vmailadmin index 891a386..2a3b3c5 100644 --- a/.circleci/my.cnf-vmailadmin +++ b/.circleci/my.cnf-vmailadmin @@ -1,5 +1,5 @@ [client] -host="localhost" +host="127.0.0.1" port="3306" user="vmail" password="itslocalletmein" diff --git a/integration_test/suite_test.go b/integration_test/suite_test.go index 90ffaa8..b688f0c 100644 --- a/integration_test/suite_test.go +++ b/integration_test/suite_test.go @@ -16,7 +16,7 @@ import ( const ( dbConnectionStringLocal = "vmail:sx4fDttWdWNbiBPsGxhbbxic2MmmGsmJ@tcp(127.0.0.1:8806)/vmail" - dbConnectionStringCI = "vmail:itslocalletmein@tcp(localhost:3306)/vmail" + dbConnectionStringCI = "vmail:itslocalletmein@tcp(127.0.0.1:3306)/vmail" ) var ( From 5748d1d5ad3fd4e9ac4ba583d524ecb4b21c027f Mon Sep 17 00:00:00 2001 From: Eddie Webbinaro Date: Sat, 18 Dec 2021 09:21:26 -0500 Subject: [PATCH 098/120] add mariadb container --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f21c3be..ffa9e9e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -30,7 +30,7 @@ jobs: name: Wait for db command: dockerize -wait tcp://localhost:3306 -timeout 1m #- run: go test -v $(go list ./... | circleci tests split) - - run: mysql -h 127.0.0.1 vmail < .circleci/define_tables.sql + - run: mysql -h 127.0.0.1 -uroot vmail < .circleci/define_tables.sql - run: go test -v ./integration_test release: From 444f00180eba16da3d758725a71cb055f56d844e Mon Sep 17 00:00:00 2001 From: Eddie Webbinaro Date: Sat, 18 Dec 2021 09:26:09 -0500 Subject: [PATCH 099/120] add mariadb container --- .circleci/define_tables.sql | 326 +++++++++++++++++++++++++++++++++++- 1 file changed, 325 insertions(+), 1 deletion(-) diff --git a/.circleci/define_tables.sql b/.circleci/define_tables.sql index 4b12164..ac20ad8 100644 --- a/.circleci/define_tables.sql +++ b/.circleci/define_tables.sql @@ -65,4 +65,328 @@ CREATE TABLE `forwardings` ( KEY `is_maillist` (`is_maillist`), KEY `is_list` (`is_list`), KEY `is_alias` (`is_alias`) -) ENGINE=InnoDB AUTO_INCREMENT=13 DEFAULT CHARSET=utf8; \ No newline at end of file +) ENGINE=InnoDB AUTO_INCREMENT=13 DEFAULT CHARSET=utf8; + +-- +-- Table structure for table `last_login` +-- + +DROP TABLE IF EXISTS `last_login`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `last_login` ( + `username` varchar(255) NOT NULL DEFAULT '', + `domain` varchar(255) NOT NULL DEFAULT '', + `imap` int(11) DEFAULT NULL, + `pop3` int(11) DEFAULT NULL, + `lda` int(11) DEFAULT NULL, + PRIMARY KEY (`username`), + KEY `domain` (`domain`), + KEY `imap` (`imap`), + KEY `pop3` (`pop3`), + KEY `lda` (`lda`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `mailbox` +-- + +DROP TABLE IF EXISTS `mailbox`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `mailbox` ( + `username` varchar(255) NOT NULL DEFAULT '', + `password` varchar(255) NOT NULL DEFAULT '', + `name` varchar(255) NOT NULL DEFAULT '', + `language` varchar(5) NOT NULL DEFAULT '', + `mailboxformat` varchar(50) NOT NULL DEFAULT 'maildir', + `mailboxfolder` varchar(50) NOT NULL DEFAULT 'Maildir', + `storagebasedirectory` varchar(255) NOT NULL DEFAULT '', + `storagenode` varchar(255) NOT NULL DEFAULT '', + `maildir` varchar(255) NOT NULL DEFAULT '', + `quota` bigint(20) NOT NULL DEFAULT 0, + `domain` varchar(255) NOT NULL DEFAULT '', + `transport` varchar(255) NOT NULL DEFAULT '', + `department` varchar(255) NOT NULL DEFAULT '', + `rank` varchar(255) NOT NULL DEFAULT 'normal', + `employeeid` varchar(255) DEFAULT '', + `isadmin` tinyint(1) NOT NULL DEFAULT 0, + `isglobaladmin` tinyint(1) NOT NULL DEFAULT 0, + `enablesmtp` tinyint(1) NOT NULL DEFAULT 1, + `enablesmtpsecured` tinyint(1) NOT NULL DEFAULT 1, + `enablepop3` tinyint(1) NOT NULL DEFAULT 1, + `enablepop3secured` tinyint(1) NOT NULL DEFAULT 1, + `enablepop3tls` tinyint(1) NOT NULL DEFAULT 1, + `enableimap` tinyint(1) NOT NULL DEFAULT 1, + `enableimapsecured` tinyint(1) NOT NULL DEFAULT 1, + `enableimaptls` tinyint(1) NOT NULL DEFAULT 1, + `enabledeliver` tinyint(1) NOT NULL DEFAULT 1, + `enablelda` tinyint(1) NOT NULL DEFAULT 1, + `enablemanagesieve` tinyint(1) NOT NULL DEFAULT 1, + `enablemanagesievesecured` tinyint(1) NOT NULL DEFAULT 1, + `enablesieve` tinyint(1) NOT NULL DEFAULT 1, + `enablesievesecured` tinyint(1) NOT NULL DEFAULT 1, + `enablesievetls` tinyint(1) NOT NULL DEFAULT 1, + `enableinternal` tinyint(1) NOT NULL DEFAULT 1, + `enabledoveadm` tinyint(1) NOT NULL DEFAULT 1, + `enablelib-storage` tinyint(1) NOT NULL DEFAULT 1, + `enablequota-status` tinyint(1) NOT NULL DEFAULT 1, + `enableindexer-worker` tinyint(1) NOT NULL DEFAULT 1, + `enablelmtp` tinyint(1) NOT NULL DEFAULT 1, + `enabledsync` tinyint(1) NOT NULL DEFAULT 1, + `enablesogo` tinyint(1) NOT NULL DEFAULT 1, + `enablesogowebmail` varchar(1) NOT NULL DEFAULT 'y', + `enablesogocalendar` varchar(1) NOT NULL DEFAULT 'y', + `enablesogoactivesync` varchar(1) NOT NULL DEFAULT 'y', + `allow_nets` text DEFAULT NULL, + `disclaimer` text DEFAULT NULL, + `settings` text DEFAULT NULL, + `passwordlastchange` datetime NOT NULL DEFAULT '1970-01-01 01:01:01', + `created` datetime NOT NULL DEFAULT '1970-01-01 01:01:01', + `modified` datetime NOT NULL DEFAULT '1970-01-01 01:01:01', + `expired` datetime NOT NULL DEFAULT '9999-12-31 00:00:00', + `active` tinyint(1) NOT NULL DEFAULT 1, + PRIMARY KEY (`username`), + KEY `domain` (`domain`), + KEY `department` (`department`), + KEY `employeeid` (`employeeid`), + KEY `isadmin` (`isadmin`), + KEY `isglobaladmin` (`isglobaladmin`), + KEY `enablesmtp` (`enablesmtp`), + KEY `enablesmtpsecured` (`enablesmtpsecured`), + KEY `enablepop3` (`enablepop3`), + KEY `enablepop3secured` (`enablepop3secured`), + KEY `enablepop3tls` (`enablepop3tls`), + KEY `enableimap` (`enableimap`), + KEY `enableimapsecured` (`enableimapsecured`), + KEY `enableimaptls` (`enableimaptls`), + KEY `enabledeliver` (`enabledeliver`), + KEY `enablelda` (`enablelda`), + KEY `enablemanagesieve` (`enablemanagesieve`), + KEY `enablemanagesievesecured` (`enablemanagesievesecured`), + KEY `enablesieve` (`enablesieve`), + KEY `enablesievesecured` (`enablesievesecured`), + KEY `enablesievetls` (`enablesievetls`), + KEY `enablelmtp` (`enablelmtp`), + KEY `enableinternal` (`enableinternal`), + KEY `enabledoveadm` (`enabledoveadm`), + KEY `enablelib-storage` (`enablelib-storage`), + KEY `enablequota-status` (`enablequota-status`), + KEY `enableindexer-worker` (`enableindexer-worker`), + KEY `enabledsync` (`enabledsync`), + KEY `enablesogo` (`enablesogo`), + KEY `passwordlastchange` (`passwordlastchange`), + KEY `expired` (`expired`), + KEY `active` (`active`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `maillist_owners` +-- + +DROP TABLE IF EXISTS `maillist_owners`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `maillist_owners` ( + `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, + `address` varchar(255) NOT NULL DEFAULT '', + `owner` varchar(255) NOT NULL DEFAULT '', + `domain` varchar(255) NOT NULL DEFAULT '', + `dest_domain` varchar(255) NOT NULL DEFAULT '', + PRIMARY KEY (`id`), + UNIQUE KEY `address` (`address`,`owner`), + KEY `owner` (`owner`), + KEY `domain` (`domain`), + KEY `dest_domain` (`dest_domain`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `maillists` +-- + +DROP TABLE IF EXISTS `maillists`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `maillists` ( + `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, + `address` varchar(255) NOT NULL DEFAULT '', + `domain` varchar(255) NOT NULL DEFAULT '', + `transport` varchar(255) NOT NULL DEFAULT '', + `accesspolicy` varchar(30) NOT NULL DEFAULT '', + `maxmsgsize` bigint(20) NOT NULL DEFAULT 0, + `name` varchar(255) NOT NULL DEFAULT '', + `description` text DEFAULT NULL, + `mlid` varchar(36) NOT NULL DEFAULT '', + `is_newsletter` tinyint(1) NOT NULL DEFAULT 0, + `settings` text DEFAULT NULL, + `created` datetime NOT NULL DEFAULT '1970-01-01 01:01:01', + `modified` datetime NOT NULL DEFAULT '1970-01-01 01:01:01', + `expired` datetime NOT NULL DEFAULT '9999-12-31 00:00:00', + `active` tinyint(1) NOT NULL DEFAULT 1, + PRIMARY KEY (`id`), + UNIQUE KEY `address` (`address`), + UNIQUE KEY `mlid` (`mlid`), + KEY `is_newsletter` (`is_newsletter`), + KEY `domain` (`domain`), + KEY `active` (`active`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `moderators` +-- + +DROP TABLE IF EXISTS `moderators`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `moderators` ( + `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, + `address` varchar(255) NOT NULL DEFAULT '', + `moderator` varchar(255) NOT NULL DEFAULT '', + `domain` varchar(255) NOT NULL DEFAULT '', + `dest_domain` varchar(255) NOT NULL DEFAULT '', + PRIMARY KEY (`id`), + UNIQUE KEY `address` (`address`,`moderator`), + KEY `domain` (`domain`), + KEY `dest_domain` (`dest_domain`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `recipient_bcc_domain` +-- + +DROP TABLE IF EXISTS `recipient_bcc_domain`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `recipient_bcc_domain` ( + `domain` varchar(255) NOT NULL DEFAULT '', + `bcc_address` varchar(255) NOT NULL DEFAULT '', + `created` datetime NOT NULL DEFAULT '1970-01-01 01:01:01', + `modified` datetime NOT NULL DEFAULT '1970-01-01 01:01:01', + `expired` datetime NOT NULL DEFAULT '9999-12-31 00:00:00', + `active` tinyint(1) NOT NULL DEFAULT 1, + PRIMARY KEY (`domain`), + KEY `bcc_address` (`bcc_address`), + KEY `expired` (`expired`), + KEY `active` (`active`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `recipient_bcc_user` +-- + +DROP TABLE IF EXISTS `recipient_bcc_user`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `recipient_bcc_user` ( + `username` varchar(255) NOT NULL DEFAULT '', + `bcc_address` varchar(255) NOT NULL DEFAULT '', + `domain` varchar(255) NOT NULL DEFAULT '', + `created` datetime NOT NULL DEFAULT '1970-01-01 01:01:01', + `modified` datetime NOT NULL DEFAULT '1970-01-01 01:01:01', + `expired` datetime NOT NULL DEFAULT '9999-12-31 00:00:00', + `active` tinyint(1) NOT NULL DEFAULT 1, + PRIMARY KEY (`username`), + KEY `bcc_address` (`bcc_address`), + KEY `expired` (`expired`), + KEY `active` (`active`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `sender_bcc_domain` +-- + +DROP TABLE IF EXISTS `sender_bcc_domain`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `sender_bcc_domain` ( + `domain` varchar(255) NOT NULL DEFAULT '', + `bcc_address` varchar(255) NOT NULL DEFAULT '', + `created` datetime NOT NULL DEFAULT '1970-01-01 01:01:01', + `modified` datetime NOT NULL DEFAULT '1970-01-01 01:01:01', + `expired` datetime NOT NULL DEFAULT '9999-12-31 00:00:00', + `active` tinyint(1) NOT NULL DEFAULT 1, + PRIMARY KEY (`domain`), + KEY `bcc_address` (`bcc_address`), + KEY `expired` (`expired`), + KEY `active` (`active`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `sender_bcc_user` +-- + +DROP TABLE IF EXISTS `sender_bcc_user`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `sender_bcc_user` ( + `username` varchar(255) NOT NULL DEFAULT '', + `bcc_address` varchar(255) NOT NULL DEFAULT '', + `domain` varchar(255) NOT NULL DEFAULT '', + `created` datetime NOT NULL DEFAULT '1970-01-01 01:01:01', + `modified` datetime NOT NULL DEFAULT '1970-01-01 01:01:01', + `expired` datetime NOT NULL DEFAULT '9999-12-31 00:00:00', + `active` tinyint(1) NOT NULL DEFAULT 1, + PRIMARY KEY (`username`), + KEY `bcc_address` (`bcc_address`), + KEY `domain` (`domain`), + KEY `expired` (`expired`), + KEY `active` (`active`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `sender_relayhost` +-- + +DROP TABLE IF EXISTS `sender_relayhost`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `sender_relayhost` ( + `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, + `account` varchar(255) NOT NULL DEFAULT '', + `relayhost` varchar(255) NOT NULL DEFAULT '', + PRIMARY KEY (`id`), + UNIQUE KEY `account` (`account`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `share_folder` +-- + +DROP TABLE IF EXISTS `share_folder`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `share_folder` ( + `from_user` varchar(255) CHARACTER SET ascii NOT NULL, + `to_user` varchar(255) CHARACTER SET ascii NOT NULL, + `dummy` char(1) DEFAULT NULL, + PRIMARY KEY (`from_user`,`to_user`), + KEY `from_user` (`from_user`), + KEY `to_user` (`to_user`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `used_quota` +-- + +DROP TABLE IF EXISTS `used_quota`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `used_quota` ( + `username` varchar(255) NOT NULL, + `bytes` bigint(20) NOT NULL DEFAULT 0, + `messages` bigint(20) NOT NULL DEFAULT 0, + `domain` varchar(255) NOT NULL DEFAULT '', + PRIMARY KEY (`username`), + KEY `domain` (`domain`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; \ No newline at end of file From c3f3327ae3feb9a5906f8dd5a38fc67ba57f21f4 Mon Sep 17 00:00:00 2001 From: Eddie Webbinaro Date: Sat, 18 Dec 2021 09:32:36 -0500 Subject: [PATCH 100/120] add mariadb container --- .circleci/config.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ffa9e9e..ad84450 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -47,7 +47,10 @@ workflows: version: 2 run_release: jobs: - - integration-test + - integration-test: + filters: + tags: + only: /^v.*/ - release: requires: - integration-test From 6002829253338bf8ceec44eea6bfa98e21767615 Mon Sep 17 00:00:00 2001 From: Eddie Webbinaro Date: Sat, 18 Dec 2021 09:35:49 -0500 Subject: [PATCH 101/120] fix readme badge --- Readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Readme.md b/Readme.md index 44cf032..a5b0649 100644 --- a/Readme.md +++ b/Readme.md @@ -1,6 +1,6 @@ # iredmail-cli -[![CircleCI](https://circleci.com/gh/drlogout/iredmail-cli/tree/master.svg?style=svg)](https://circleci.com/gh/drlogout/iredmail-cli/tree/master) +[![CircleCI](https://img.shields.io/circleci/build/github/eddiewebb/iredmail-cli)](https://circleci.com/gh/eddiewebb/iredmail-cli/tree/master) ## Table of contents From 1dd12595b7d883c6c7652aba4305967480ae5180 Mon Sep 17 00:00:00 2001 From: Eddie Webbinaro Date: Sat, 18 Dec 2021 09:41:10 -0500 Subject: [PATCH 102/120] fix release --- Makefile | 4 ++-- go.mod | 3 --- go.sum | 6 ------ 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 9bc06ec..e1cbec2 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ RELEASE_TAG=$$(git describe --abbrev=0 --tags) dist-tools: - @go install github.com/mitchellh/gox + @go install github.com/mitchellh/gox@latest export PATH="$PATH:$HOME/go/bin" dist: dist-tools @@ -15,7 +15,7 @@ dist: dist-tools rm -rf ./bin/iredmail-cli_linux-arm64_$(RELEASE_TAG) release-tools: - @go install github.com/tcnksm/ghr + @go install github.com/tcnksm/ghr@latest release: release-tools ghr $(RELEASE_TAG) ./bin/ diff --git a/go.mod b/go.mod index db0f9b9..4c3ebcc 100644 --- a/go.mod +++ b/go.mod @@ -18,13 +18,10 @@ require ( github.com/blang/semver v3.5.1+incompatible // indirect github.com/drlogout/iredmail-cli v0.2.7 // indirect github.com/fsnotify/fsnotify v1.5.1 // indirect - github.com/hashicorp/go-version v1.0.0 // indirect github.com/inconshreveable/mousetrap v1.0.0 // indirect github.com/mattn/go-colorable v0.1.12 // indirect github.com/mattn/go-isatty v0.0.14 // indirect github.com/mattn/go-runewidth v0.0.9 // indirect - github.com/mitchellh/gox v1.0.1 // indirect - github.com/mitchellh/iochan v1.0.0 // indirect github.com/nxadm/tail v1.4.8 // indirect github.com/spf13/pflag v1.0.5 // indirect golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d // indirect diff --git a/go.sum b/go.sum index 50fd530..f62264b 100644 --- a/go.sum +++ b/go.sum @@ -222,8 +222,6 @@ github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerX github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= -github.com/hashicorp/go-version v1.0.0 h1:21MVWPKDphxa7ineQQTrCU5brh7OuVVAzGOCnnCPtE8= -github.com/hashicorp/go-version v1.0.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= @@ -284,10 +282,6 @@ github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXx github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= -github.com/mitchellh/gox v1.0.1 h1:x0jD3dcHk9a9xPSDN6YEL4xL6Qz0dvNYm8yZqui5chI= -github.com/mitchellh/gox v1.0.1/go.mod h1:ED6BioOGXMswlXa2zxfh/xdd5QhwYliBFn9V18Ap4z4= -github.com/mitchellh/iochan v1.0.0 h1:C+X3KsSTLFVBr/tK1eYN/vs4rJcvsiLU338UhYPJWeY= -github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= From f4374632f29b7d169c3288d68df150cc6d030b00 Mon Sep 17 00:00:00 2001 From: Eddie Webbinaro Date: Sat, 18 Dec 2021 12:20:50 -0500 Subject: [PATCH 103/120] wtf --- .circleci/iredmail-release | 2 +- iredmail/version.go | 17 +++++++---------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/.circleci/iredmail-release b/.circleci/iredmail-release index a38bec0..660ef49 100644 --- a/.circleci/iredmail-release +++ b/.circleci/iredmail-release @@ -1,2 +1,2 @@ -0.9.8 MYSQL edition. +2021091301 (Backend: mariadb, Date: 2021-12-12 23:16:00) iRedMail Easy: https://www.iredmail.org/easy.html # Get professional support from iRedMail Team: http://www.iredmail.org/support.html diff --git a/iredmail/version.go b/iredmail/version.go index 3e691dc..87f4288 100644 --- a/iredmail/version.go +++ b/iredmail/version.go @@ -6,13 +6,11 @@ import ( "io/ioutil" "os" "regexp" - "strings" - ) const ( // Version of iredmail-cli - Version = "0.2.91" + Version = "0.3.0" releaseFile = "/etc/iredmail-release" supportedReleaseMin = "0.9.8" @@ -39,21 +37,20 @@ func GetIredMailVersion() (iredMailVersion, error) { return version, err } - re := regexp.MustCompile(`^\d\.\d\.\d\s*(MYSQL|MARIADB)\s*edition`) - versionLine := re.FindString(string(file)) + re := regexp.MustCompile(`(?:^\d\.\d\.\d\s*(MYSQL|MARIADB)\s*edition)|(?:^\d{10} \(Backend: (mariadb|mysql).*)`) + versionLine := re.FindAllString(string(file), 2) - if versionLine == "" { - return version, fmt.Errorf("No MYSQL nor MariaDB version info found in release file %s", releaseFile) + if len(versionLine) < 1 { + return version, fmt.Errorf("No no MYSQL nor MariaDB version info found in release file %s", releaseFile) } - splitLine := strings.Split(versionLine, " ") - version = iredMailVersion(splitLine[0]) + version = iredMailVersion(versionLine[0] + versionLine[1]) return version, nil } // Check checks the iredMail version func (v *iredMailVersion) Check() error { - + return nil } From 60d8122d6f36db0c6345fbabad954ca7f417c1d7 Mon Sep 17 00:00:00 2001 From: Eddie Webbinaro Date: Sat, 18 Dec 2021 13:01:56 -0500 Subject: [PATCH 104/120] support easy version --- cmd/aliasAdd.go | 2 +- cmd/aliasAddForwarding.go | 2 +- cmd/aliasDelete.go | 2 +- cmd/aliasDeleteForwarding.go | 2 +- cmd/aliasInfo.go | 2 +- cmd/aliasList.go | 2 +- cmd/domainAdd.go | 2 +- cmd/domainAliasAdd.go | 2 +- cmd/domainAliasDelete.go | 2 +- cmd/domainCatchallAdd.go | 2 +- cmd/domainCatchallDelete.go | 2 +- cmd/domainDelete.go | 2 +- cmd/domainList.go | 2 +- cmd/forwardingAdd.go | 2 +- cmd/forwardingDelete.go | 2 +- cmd/forwardingList.go | 2 +- cmd/mailboxAdd.go | 3 ++- cmd/mailboxAliasAdd.go | 2 +- cmd/mailboxAliasDelete.go | 2 +- cmd/mailboxDelete.go | 2 +- cmd/mailboxInfo.go | 4 ++-- cmd/mailboxList.go | 2 +- cmd/mailboxUpdate.go | 2 +- cmd/root.go | 2 +- cmd/version.go | 4 ++-- go.mod | 1 - iredmail/version.go | 20 +++++++++++++++----- main.go | 2 +- 28 files changed, 44 insertions(+), 34 deletions(-) diff --git a/cmd/aliasAdd.go b/cmd/aliasAdd.go index 37c6899..da05948 100644 --- a/cmd/aliasAdd.go +++ b/cmd/aliasAdd.go @@ -19,7 +19,7 @@ import ( "fmt" "github.com/asaskevich/govalidator" - "github.com/noxpost/iredmail-cli/iredmail" + "github.com/iredmail-cli/iredmail" "github.com/spf13/cobra" ) diff --git a/cmd/aliasAddForwarding.go b/cmd/aliasAddForwarding.go index 13b0ca0..9ec8446 100644 --- a/cmd/aliasAddForwarding.go +++ b/cmd/aliasAddForwarding.go @@ -19,7 +19,7 @@ import ( "fmt" "github.com/asaskevich/govalidator" - "github.com/noxpost/iredmail-cli/iredmail" + "github.com/iredmail-cli/iredmail" "github.com/spf13/cobra" ) diff --git a/cmd/aliasDelete.go b/cmd/aliasDelete.go index c484871..17c0b74 100644 --- a/cmd/aliasDelete.go +++ b/cmd/aliasDelete.go @@ -19,7 +19,7 @@ import ( "fmt" "github.com/asaskevich/govalidator" - "github.com/noxpost/iredmail-cli/iredmail" + "github.com/iredmail-cli/iredmail" "github.com/spf13/cobra" ) diff --git a/cmd/aliasDeleteForwarding.go b/cmd/aliasDeleteForwarding.go index 9bd6257..11373de 100644 --- a/cmd/aliasDeleteForwarding.go +++ b/cmd/aliasDeleteForwarding.go @@ -19,7 +19,7 @@ import ( "fmt" "github.com/asaskevich/govalidator" - "github.com/noxpost/iredmail-cli/iredmail" + "github.com/iredmail-cli/iredmail" "github.com/spf13/cobra" ) diff --git a/cmd/aliasInfo.go b/cmd/aliasInfo.go index ad8429f..2e3aecc 100644 --- a/cmd/aliasInfo.go +++ b/cmd/aliasInfo.go @@ -20,7 +20,7 @@ import ( "os" "github.com/asaskevich/govalidator" - "github.com/noxpost/iredmail-cli/iredmail" + "github.com/iredmail-cli/iredmail" "github.com/olekukonko/tablewriter" "github.com/spf13/cobra" ) diff --git a/cmd/aliasList.go b/cmd/aliasList.go index 5b8b912..2c14e00 100644 --- a/cmd/aliasList.go +++ b/cmd/aliasList.go @@ -3,7 +3,7 @@ package cmd import ( "os" - "github.com/noxpost/iredmail-cli/iredmail" + "github.com/iredmail-cli/iredmail" "github.com/olekukonko/tablewriter" "github.com/spf13/cobra" ) diff --git a/cmd/domainAdd.go b/cmd/domainAdd.go index 2eb0314..72cbca8 100644 --- a/cmd/domainAdd.go +++ b/cmd/domainAdd.go @@ -20,7 +20,7 @@ import ( "strings" "github.com/asaskevich/govalidator" - "github.com/noxpost/iredmail-cli/iredmail" + "github.com/iredmail-cli/iredmail" "github.com/spf13/cobra" ) diff --git a/cmd/domainAliasAdd.go b/cmd/domainAliasAdd.go index 20a832f..df493ec 100644 --- a/cmd/domainAliasAdd.go +++ b/cmd/domainAliasAdd.go @@ -20,7 +20,7 @@ import ( "strings" "github.com/asaskevich/govalidator" - "github.com/noxpost/iredmail-cli/iredmail" + "github.com/iredmail-cli/iredmail" "github.com/spf13/cobra" ) diff --git a/cmd/domainAliasDelete.go b/cmd/domainAliasDelete.go index 29c1c35..2b5304c 100644 --- a/cmd/domainAliasDelete.go +++ b/cmd/domainAliasDelete.go @@ -20,7 +20,7 @@ import ( "strings" "github.com/asaskevich/govalidator" - "github.com/noxpost/iredmail-cli/iredmail" + "github.com/iredmail-cli/iredmail" "github.com/spf13/cobra" ) diff --git a/cmd/domainCatchallAdd.go b/cmd/domainCatchallAdd.go index 5b49c99..111028b 100644 --- a/cmd/domainCatchallAdd.go +++ b/cmd/domainCatchallAdd.go @@ -20,7 +20,7 @@ import ( "strings" "github.com/asaskevich/govalidator" - "github.com/noxpost/iredmail-cli/iredmail" + "github.com/iredmail-cli/iredmail" "github.com/spf13/cobra" ) diff --git a/cmd/domainCatchallDelete.go b/cmd/domainCatchallDelete.go index cc1d44d..51c2258 100644 --- a/cmd/domainCatchallDelete.go +++ b/cmd/domainCatchallDelete.go @@ -20,7 +20,7 @@ import ( "strings" "github.com/asaskevich/govalidator" - "github.com/noxpost/iredmail-cli/iredmail" + "github.com/iredmail-cli/iredmail" "github.com/spf13/cobra" ) diff --git a/cmd/domainDelete.go b/cmd/domainDelete.go index a527f18..0fb7b92 100644 --- a/cmd/domainDelete.go +++ b/cmd/domainDelete.go @@ -20,7 +20,7 @@ import ( "strings" "github.com/asaskevich/govalidator" - "github.com/noxpost/iredmail-cli/iredmail" + "github.com/iredmail-cli/iredmail" "github.com/spf13/cobra" ) diff --git a/cmd/domainList.go b/cmd/domainList.go index 3ad1312..6648f50 100644 --- a/cmd/domainList.go +++ b/cmd/domainList.go @@ -17,7 +17,7 @@ package cmd import ( "os" - "github.com/noxpost/iredmail-cli/iredmail" + "github.com/iredmail-cli/iredmail" "github.com/olekukonko/tablewriter" "github.com/spf13/cobra" ) diff --git a/cmd/forwardingAdd.go b/cmd/forwardingAdd.go index 945869b..633d2f4 100644 --- a/cmd/forwardingAdd.go +++ b/cmd/forwardingAdd.go @@ -19,7 +19,7 @@ import ( "fmt" "github.com/asaskevich/govalidator" - "github.com/noxpost/iredmail-cli/iredmail" + "github.com/iredmail-cli/iredmail" "github.com/spf13/cobra" ) diff --git a/cmd/forwardingDelete.go b/cmd/forwardingDelete.go index f4a503c..1854d87 100644 --- a/cmd/forwardingDelete.go +++ b/cmd/forwardingDelete.go @@ -19,7 +19,7 @@ import ( "fmt" "github.com/asaskevich/govalidator" - "github.com/noxpost/iredmail-cli/iredmail" + "github.com/iredmail-cli/iredmail" "github.com/spf13/cobra" ) diff --git a/cmd/forwardingList.go b/cmd/forwardingList.go index e9954c9..66748ff 100644 --- a/cmd/forwardingList.go +++ b/cmd/forwardingList.go @@ -17,7 +17,7 @@ package cmd import ( "os" - "github.com/noxpost/iredmail-cli/iredmail" + "github.com/iredmail-cli/iredmail" "github.com/olekukonko/tablewriter" "github.com/spf13/cobra" ) diff --git a/cmd/mailboxAdd.go b/cmd/mailboxAdd.go index 75866fc..dda35b3 100644 --- a/cmd/mailboxAdd.go +++ b/cmd/mailboxAdd.go @@ -5,8 +5,9 @@ import ( "fmt" "strconv" + "github.com/iredmail-cli/iredmail" + "github.com/asaskevich/govalidator" - "github.com/noxpost/iredmail-cli/iredmail" "github.com/spf13/cobra" ) diff --git a/cmd/mailboxAliasAdd.go b/cmd/mailboxAliasAdd.go index 9fa0d23..6fd2032 100644 --- a/cmd/mailboxAliasAdd.go +++ b/cmd/mailboxAliasAdd.go @@ -19,7 +19,7 @@ import ( "fmt" "github.com/asaskevich/govalidator" - "github.com/noxpost/iredmail-cli/iredmail" + "github.com/iredmail-cli/iredmail" "github.com/spf13/cobra" ) diff --git a/cmd/mailboxAliasDelete.go b/cmd/mailboxAliasDelete.go index 65d6eab..61a835e 100644 --- a/cmd/mailboxAliasDelete.go +++ b/cmd/mailboxAliasDelete.go @@ -19,7 +19,7 @@ import ( "fmt" "github.com/asaskevich/govalidator" - "github.com/noxpost/iredmail-cli/iredmail" + "github.com/iredmail-cli/iredmail" "github.com/spf13/cobra" ) diff --git a/cmd/mailboxDelete.go b/cmd/mailboxDelete.go index 1ebf489..c99fb69 100644 --- a/cmd/mailboxDelete.go +++ b/cmd/mailboxDelete.go @@ -19,7 +19,7 @@ import ( "fmt" "github.com/asaskevich/govalidator" - "github.com/noxpost/iredmail-cli/iredmail" + "github.com/iredmail-cli/iredmail" "github.com/spf13/cobra" ) diff --git a/cmd/mailboxInfo.go b/cmd/mailboxInfo.go index db71579..c3d75ad 100644 --- a/cmd/mailboxInfo.go +++ b/cmd/mailboxInfo.go @@ -22,7 +22,7 @@ import ( "strings" "github.com/asaskevich/govalidator" - "github.com/noxpost/iredmail-cli/iredmail" + "github.com/iredmail-cli/iredmail" "github.com/olekukonko/tablewriter" "github.com/spf13/cobra" ) @@ -72,7 +72,7 @@ func printMailboxInfo(mailbox iredmail.Mailbox, prettyPrint bool) { table.SetColumnColor(tablewriter.Colors{tablewriter.Bold}, tablewriter.Colors{}) } - table.Append([]string{"Display Name", mailbox.Name}) + table.Append([]string{"Display Name", mailbox.Name}) table.Append([]string{"Quota", fmt.Sprintf("%v MB", strconv.Itoa(mailbox.Quota))}) if len(mailbox.MailboxAliases) > 0 { diff --git a/cmd/mailboxList.go b/cmd/mailboxList.go index 3cc305e..d3f2bd0 100644 --- a/cmd/mailboxList.go +++ b/cmd/mailboxList.go @@ -4,7 +4,7 @@ import ( "os" "strconv" - "github.com/noxpost/iredmail-cli/iredmail" + "github.com/iredmail-cli/iredmail" "github.com/olekukonko/tablewriter" "github.com/spf13/cobra" ) diff --git a/cmd/mailboxUpdate.go b/cmd/mailboxUpdate.go index 18e2cb8..251f817 100644 --- a/cmd/mailboxUpdate.go +++ b/cmd/mailboxUpdate.go @@ -20,7 +20,7 @@ import ( "strconv" "github.com/asaskevich/govalidator" - "github.com/noxpost/iredmail-cli/iredmail" + "github.com/iredmail-cli/iredmail" "github.com/spf13/cobra" ) diff --git a/cmd/root.go b/cmd/root.go index e047b22..5021dcb 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -6,8 +6,8 @@ import ( "os" "path/filepath" - "github.com/noxpost/iredmail-cli/iredmail" "github.com/fatih/color" + "github.com/iredmail-cli/iredmail" homedir "github.com/mitchellh/go-homedir" "github.com/spf13/cobra" ) diff --git a/cmd/version.go b/cmd/version.go index e4a4ed9..37eb400 100644 --- a/cmd/version.go +++ b/cmd/version.go @@ -15,7 +15,7 @@ package cmd import ( - "github.com/noxpost/iredmail-cli/iredmail" + "github.com/iredmail-cli/iredmail" "github.com/spf13/cobra" ) @@ -30,7 +30,7 @@ var versionCmd = &cobra.Command{ } info("cli version: %s\n", iredmail.Version) - info("iredMail version (MySQL): %s\n", iredMailVersion) + info("%s version (%s): %s\n", iredMailVersion.Product, iredMailVersion.Dbtype, iredMailVersion.Version) if iredMailVersion.Check() == iredmail.ErrIredMailVersionNotSupported { warning("%v\n", iredmail.ErrIredMailVersionNotSupported) diff --git a/go.mod b/go.mod index 4c3ebcc..0fc9a78 100644 --- a/go.mod +++ b/go.mod @@ -16,7 +16,6 @@ require ( require ( github.com/blang/semver v3.5.1+incompatible // indirect - github.com/drlogout/iredmail-cli v0.2.7 // indirect github.com/fsnotify/fsnotify v1.5.1 // indirect github.com/inconshreveable/mousetrap v1.0.0 // indirect github.com/mattn/go-colorable v0.1.12 // indirect diff --git a/iredmail/version.go b/iredmail/version.go index 87f4288..2f11f95 100644 --- a/iredmail/version.go +++ b/iredmail/version.go @@ -22,7 +22,12 @@ var ( ErrIredMailVersionNotSupported = errors.New("iredMail version is not supported") ) -type iredMailVersion string +type iredMailVersion struct { + Dbtype string + Version string + Easy bool + Product string +} // GetIredMailVersion retrievs the iredMail version func GetIredMailVersion() (iredMailVersion, error) { @@ -37,20 +42,25 @@ func GetIredMailVersion() (iredMailVersion, error) { return version, err } - re := regexp.MustCompile(`(?:^\d\.\d\.\d\s*(MYSQL|MARIADB)\s*edition)|(?:^\d{10} \(Backend: (mariadb|mysql).*)`) - versionLine := re.FindAllString(string(file), 2) + re := regexp.MustCompile(`(?:^(\d\.\d\.\d)\s*(MYSQL|MARIADB)\s*edition)|(?:^(\d{10}) \(Backend: (mariadb|mysql).*)`) + versionLine := re.FindStringSubmatch(string(file)) if len(versionLine) < 1 { return version, fmt.Errorf("No no MYSQL nor MariaDB version info found in release file %s", releaseFile) } - version = iredMailVersion(versionLine[0] + versionLine[1]) + //TODO: add support understand easy version + if versionLine[3] != "" { + version = iredMailVersion{versionLine[4], versionLine[3], true, "iredMail Easy"} + } else { + version = iredMailVersion{versionLine[2], versionLine[1], false, "iredMail (manual)"} + } return version, nil } // Check checks the iredMail version func (v *iredMailVersion) Check() error { - + //TODO use version.EASY boolean to check semver style or new easy date tag style return nil } diff --git a/main.go b/main.go index 74990b6..2597351 100644 --- a/main.go +++ b/main.go @@ -15,7 +15,7 @@ package main -import "github.com/noxpost/iredmail-cli/cmd" +import "github.com/iredmail-cli/cmd" func main() { cmd.Execute() From 382b6d65bc1c31c61d0a4de34d754afd1935f514 Mon Sep 17 00:00:00 2001 From: Eddie Webbinaro Date: Sat, 18 Dec 2021 13:06:27 -0500 Subject: [PATCH 105/120] fix test failures with updated output --- integration_test/golden/can_list_mailboxes | 18 +++++++++--------- .../can_list_mailboxes_and_filter_result | 12 ++++++------ integration_test/golden/can_show_mailbox_info | 1 + 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/integration_test/golden/can_list_mailboxes b/integration_test/golden/can_list_mailboxes index 7f9e527..cb72f3f 100644 --- a/integration_test/golden/can_list_mailboxes +++ b/integration_test/golden/can_list_mailboxes @@ -1,9 +1,9 @@ -+-----------------------+------------+ -| MAILBOX | QUOTA (MB) | -+-----------------------+------------+ -| abuse@domain.com | 2048 | -| info@domain.com | 2048 | -| webmaster@example.com | 2048 | -| mail@example.net | 2048 | -| support@example.org | 2048 | -+-----------------------+------------+ ++--------------+-----------------------+------------+ +| DISPLAY NAME | MAILBOX | QUOTA (MB) | ++--------------+-----------------------+------------+ +| abuse | abuse@domain.com | 2048 | +| info | info@domain.com | 2048 | +| webmaster | webmaster@example.com | 2048 | +| mail | mail@example.net | 2048 | +| support | support@example.org | 2048 | ++--------------+-----------------------+------------+ diff --git a/integration_test/golden/can_list_mailboxes_and_filter_result b/integration_test/golden/can_list_mailboxes_and_filter_result index addd8ef..b1bb6c0 100644 --- a/integration_test/golden/can_list_mailboxes_and_filter_result +++ b/integration_test/golden/can_list_mailboxes_and_filter_result @@ -1,6 +1,6 @@ -+------------------+------------+ -| MAILBOX | QUOTA (MB) | -+------------------+------------+ -| abuse@domain.com | 2048 | -| info@domain.com | 2048 | -+------------------+------------+ ++--------------+------------------+------------+ +| DISPLAY NAME | MAILBOX | QUOTA (MB) | ++--------------+------------------+------------+ +| abuse | abuse@domain.com | 2048 | +| info | info@domain.com | 2048 | ++--------------+------------------+------------+ diff --git a/integration_test/golden/can_show_mailbox_info b/integration_test/golden/can_show_mailbox_info index c22dea0..ef83814 100644 --- a/integration_test/golden/can_show_mailbox_info +++ b/integration_test/golden/can_show_mailbox_info @@ -1,6 +1,7 @@ +----------------------+---------------------------------------------+ | MAILBOX | mail@example.net | +----------------------+---------------------------------------------+ +| Display Name | mail | | Quota | 2048 MB | | Mailbox aliases | abuse | | | postmaster | From ff9fdbad60134020679c62189cfdba467afb4ca6 Mon Sep 17 00:00:00 2001 From: Eddie Webbinaro Date: Sat, 25 Dec 2021 05:26:53 -0500 Subject: [PATCH 106/120] update validator to require emails for #1 --- cmd/mailboxAliasAdd.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cmd/mailboxAliasAdd.go b/cmd/mailboxAliasAdd.go index 6fd2032..aac824e 100644 --- a/cmd/mailboxAliasAdd.go +++ b/cmd/mailboxAliasAdd.go @@ -29,14 +29,14 @@ var mailboxAliasAddCmd = &cobra.Command{ Short: "Add a mailbox alias", Long: `Add a mailbox alias -A mailbox [MAILBOX_EMAIL] can have additional email addresses [ALIAS]@[DOMAIN], all emails sent to these addresses will be delivered to the same mailbox.`, +A mailbox [MAILBOX_EMAIL] can have additional email addresses [ALIAS]@[DOMAIN|ALIAS_DOMAIN], all emails sent to these addresses will be delivered to the same mailbox.`, Args: func(cmd *cobra.Command, args []string) error { if len(args) != 2 { - return errors.New("Requires [ALIAS] and [MAILBOX_EMAIL]") + return errors.New("Requires [ALIAS_EMAIL] and [MAILBOX_EMAIL]") } - if govalidator.IsEmail(args[0]) { - return fmt.Errorf("Invalid [ALIAS] format: %s, only name is required (the part before @)", args[0]) + if !govalidator.IsEmail(args[0]) { + return fmt.Errorf("Invalid [ALIAS_EMAIL] format: %s, to support alias domains iredmail-cli now needs full alias email.", args[0]) } if !govalidator.IsEmail(args[1]) { From 8999b56b01df7d6982e2d84e533a70b3649a186c Mon Sep 17 00:00:00 2001 From: Eddie Webbinaro Date: Sat, 25 Dec 2021 05:39:04 -0500 Subject: [PATCH 107/120] update tests to use full domain --- integration_test/golden/can_show_mailbox_info | 4 ++-- .../mailboxAliasAddDelete_test.go | 21 ++++++------------- iredmail/mailboxAlias.go | 5 +++-- 3 files changed, 11 insertions(+), 19 deletions(-) diff --git a/integration_test/golden/can_show_mailbox_info b/integration_test/golden/can_show_mailbox_info index ef83814..106adfa 100644 --- a/integration_test/golden/can_show_mailbox_info +++ b/integration_test/golden/can_show_mailbox_info @@ -3,8 +3,8 @@ +----------------------+---------------------------------------------+ | Display Name | mail | | Quota | 2048 MB | -| Mailbox aliases | abuse | -| | postmaster | +| Mailbox aliases | abuse@domain.com | +| | postmaster@example.com | | Forwardings | info@otherdomain.com | | | webmaster@otherexample.net | | Keep copy in mailbox | yes | diff --git a/integration_test/mailboxAliasAddDelete_test.go b/integration_test/mailboxAliasAddDelete_test.go index fbd278d..c04022f 100644 --- a/integration_test/mailboxAliasAddDelete_test.go +++ b/integration_test/mailboxAliasAddDelete_test.go @@ -46,8 +46,7 @@ var _ = Describe("mailbox alias add/delete", func() { defer db.Close() var exists bool - domain := strings.Split(mailboxName1, "@")[1] - aliasEmail := fmt.Sprintf("%s@%s", mailboxAlias1, domain) + aliasEmail := mailboxAlias1 sqlQuery := `SELECT exists (SELECT address FROM forwardings @@ -70,9 +69,7 @@ var _ = Describe("mailbox alias add/delete", func() { Fail(string(output)) } - name := strings.Split(mailboxName1, "@")[0] - - cli = exec.Command(cliPath, "mailbox", "add-alias", name, mailboxName1) + cli = exec.Command(cliPath, "mailbox", "add-alias", mailboxName1, mailboxName1) output, err = cli.CombinedOutput() if err == nil { Fail("Expect an error") @@ -124,10 +121,7 @@ var _ = Describe("mailbox alias add/delete", func() { Skip("can't add a mailbox alias if alias already exists") } - domain := strings.Split(mailboxName1, "@")[1] - aliasEmail := fmt.Sprintf("%s@%s", mailboxAlias1, domain) - - cli := exec.Command(cliPath, "alias", "add", aliasEmail) + cli := exec.Command(cliPath, "alias", "add", mailboxAlias1) output, err := cli.CombinedOutput() if err != nil { Fail(string(output)) @@ -146,7 +140,7 @@ var _ = Describe("mailbox alias add/delete", func() { } actual := string(output) - expected := fmt.Sprintf("An alias with %s already exists\n", aliasEmail) + expected := fmt.Sprintf("An alias with %s already exists\n", mailboxAlias1) if !reflect.DeepEqual(actual, expected) { Fail(fmt.Sprintf("actual = %s, expected = %s", actual, expected)) @@ -187,17 +181,14 @@ var _ = Describe("mailbox alias add/delete", func() { Fail(string(output)) } - domain := strings.Split(mailboxName1, "@")[1] - aliasEmail := fmt.Sprintf("%s@%s", mailboxAlias1, domain) - - cli = exec.Command(cliPath, "mailbox", "delete-alias", aliasEmail) + cli = exec.Command(cliPath, "mailbox", "delete-alias", mailboxAlias1) output, err = cli.CombinedOutput() if err != nil { Fail(string(output)) } actual := string(output) - expected := fmt.Sprintf("Successfully deleted mailbox alias %s\n", fmt.Sprintf("%s@%s", mailboxAlias1, domain)) + expected := fmt.Sprintf("Successfully deleted mailbox alias %s\n", mailboxAlias1) if !reflect.DeepEqual(actual, expected) { Fail(fmt.Sprintf("actual = %s, expected = %s", actual, expected)) diff --git a/iredmail/mailboxAlias.go b/iredmail/mailboxAlias.go index d10f0a3..61f4578 100644 --- a/iredmail/mailboxAlias.go +++ b/iredmail/mailboxAlias.go @@ -31,7 +31,8 @@ func (s *Server) MailboxAliasAdd(alias, mailboxEmail string) error { } _, domain := parseEmail(mailboxEmail) - aliasEmail := fmt.Sprintf("%s@%s", alias, domain) + aliasEmail := alias + _, aliasDomain := parseEmail(aliasEmail) mailboxAliasExists, err := s.mailboxAliasExists(aliasEmail) if err != nil { @@ -60,7 +61,7 @@ func (s *Server) MailboxAliasAdd(alias, mailboxEmail string) error { sqlQuery := ` INSERT INTO forwardings (address, forwarding, domain, dest_domain, is_forwarding, is_alias, is_list, active) VALUES (?, ?, ?, ?, 0, 1, 0, 1)` - _, err = s.DB.Exec(sqlQuery, aliasEmail, mailboxEmail, domain, domain) + _, err = s.DB.Exec(sqlQuery, aliasEmail, mailboxEmail, aliasDomain, domain) return err } From f9f6cb4f4cbfdce47c99796591150ea715a92f69 Mon Sep 17 00:00:00 2001 From: Eddie Webbinaro Date: Sat, 25 Dec 2021 05:44:04 -0500 Subject: [PATCH 108/120] #1: fix test data --- integration_test/suite_test.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/integration_test/suite_test.go b/integration_test/suite_test.go index b688f0c..72210ab 100644 --- a/integration_test/suite_test.go +++ b/integration_test/suite_test.go @@ -44,10 +44,12 @@ var ( forwardingAddress1 = "info@otherdomain.com" forwardingAddress2 = "webmaster@otherexample.net" - mailboxAlias1 = "postmaster" - mailboxAlias2 = "abuse" - mailboxAlias3 = "webmaster" + // update to allow full domain per ireddmail 0.9.7+ + mailboxAlias1 = "postmaster@example.com" + mailboxAlias2 = "abuse@domain.com" + mailboxAlias3 = "webmaster@example.net" + // I'mnot sure why these are called alias, they're mail lists in the SQL... alias1 = "developer@example.com" alias2 = "support@domain.com" alias3 = "help@example.net" From eac181156c32997b1627dc4a683799e600f7672e Mon Sep 17 00:00:00 2001 From: Eddie Webbinaro Date: Sat, 25 Dec 2021 05:48:25 -0500 Subject: [PATCH 109/120] #1: fix alias tests --- integration_test/mailboxAliasAddDelete_test.go | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/integration_test/mailboxAliasAddDelete_test.go b/integration_test/mailboxAliasAddDelete_test.go index c04022f..1a140dc 100644 --- a/integration_test/mailboxAliasAddDelete_test.go +++ b/integration_test/mailboxAliasAddDelete_test.go @@ -5,7 +5,6 @@ import ( "fmt" "os/exec" "reflect" - "strings" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" @@ -105,11 +104,8 @@ var _ = Describe("mailbox alias add/delete", func() { Fail("Expect an error") } - domain := strings.Split(mailboxName1, "@")[1] - aliasEmail := fmt.Sprintf("%s@%s", mailboxAlias1, domain) - actual := string(output) - expected := fmt.Sprintf("A mailbox alias with %s already exists\n", aliasEmail) + expected := fmt.Sprintf("A mailbox alias with %s already exists\n", mailboxAlias1) if !reflect.DeepEqual(actual, expected) { Fail(fmt.Sprintf("actual = %s, expected = %s", actual, expected)) From 007538e2ffe32f2df5a1948b5b5d91e31de7d4ac Mon Sep 17 00:00:00 2001 From: Eddie Webbinaro Date: Sat, 25 Dec 2021 06:01:03 -0500 Subject: [PATCH 110/120] #1: fixes golden checks and prints domain --- cmd/mailboxInfo.go | 3 +-- integration_test/mailboxAddDelete_test.go | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/cmd/mailboxInfo.go b/cmd/mailboxInfo.go index c3d75ad..ddd3452 100644 --- a/cmd/mailboxInfo.go +++ b/cmd/mailboxInfo.go @@ -80,8 +80,7 @@ func printMailboxInfo(mailbox iredmail.Mailbox, prettyPrint bool) { table.Append([]string{"Mailbox aliases", name}) for i := range mailbox.MailboxAliases { if (i + 1) < len(mailbox.MailboxAliases) { - name = strings.Split(mailbox.MailboxAliases[i+1].Address, "@")[0] - table.Append([]string{"", name}) + table.Append([]string{"", mailbox.MailboxAliases[i+1].Address}) } } } diff --git a/integration_test/mailboxAddDelete_test.go b/integration_test/mailboxAddDelete_test.go index f4a88fc..12e38fb 100644 --- a/integration_test/mailboxAddDelete_test.go +++ b/integration_test/mailboxAddDelete_test.go @@ -290,7 +290,7 @@ var _ = Describe("mailbox add/delete", func() { Fail(string(output)) } - cli = exec.Command(cliPath, "mailbox", "add-alias", name, mailboxName) + cli = exec.Command(cliPath, "mailbox", "add-alias", mailboxName1, mailboxName) output, err = cli.CombinedOutput() if err != nil { Fail(string(output)) From 64a58a3cffd836b4384d0cd9e2ba4ace8c41187b Mon Sep 17 00:00:00 2001 From: Eddie Webbinaro Date: Sat, 25 Dec 2021 06:04:29 -0500 Subject: [PATCH 111/120] #1: fixes golden checks and prints domain --- integration_test/mailboxAddDelete_test.go | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/integration_test/mailboxAddDelete_test.go b/integration_test/mailboxAddDelete_test.go index 12e38fb..64207e6 100644 --- a/integration_test/mailboxAddDelete_test.go +++ b/integration_test/mailboxAddDelete_test.go @@ -7,7 +7,6 @@ import ( "path/filepath" "reflect" "strconv" - "strings" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" @@ -280,17 +279,13 @@ var _ = Describe("mailbox add/delete", func() { Skip("can't add an mailbox if an mailbox alias with same email exists") } - splitMail := strings.Split(mailboxName1, "@") - name, domain := splitMail[0], splitMail[1] - mailboxName := "othername@" + domain - - cli := exec.Command(cliPath, "mailbox", "add", mailboxName, mailboxPW) + cli := exec.Command(cliPath, "mailbox", "add", aliasForwarding4, mailboxPW) output, err := cli.CombinedOutput() if err != nil { Fail(string(output)) } - cli = exec.Command(cliPath, "mailbox", "add-alias", mailboxName1, mailboxName) + cli = exec.Command(cliPath, "mailbox", "add-alias", mailboxName1, aliasForwarding4) output, err = cli.CombinedOutput() if err != nil { Fail(string(output)) From 73a6c1183dfeb3c22e7e7c1efccaddd5342044a7 Mon Sep 17 00:00:00 2001 From: Eddie Webbinaro Date: Sat, 25 Dec 2021 06:09:02 -0500 Subject: [PATCH 112/120] #1: fixes golden checks and prints domain --- cmd/mailboxInfo.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/cmd/mailboxInfo.go b/cmd/mailboxInfo.go index ddd3452..73ec1ea 100644 --- a/cmd/mailboxInfo.go +++ b/cmd/mailboxInfo.go @@ -19,7 +19,6 @@ import ( "fmt" "os" "strconv" - "strings" "github.com/asaskevich/govalidator" "github.com/iredmail-cli/iredmail" @@ -76,8 +75,7 @@ func printMailboxInfo(mailbox iredmail.Mailbox, prettyPrint bool) { table.Append([]string{"Quota", fmt.Sprintf("%v MB", strconv.Itoa(mailbox.Quota))}) if len(mailbox.MailboxAliases) > 0 { - name := strings.Split(mailbox.MailboxAliases[0].Address, "@")[0] - table.Append([]string{"Mailbox aliases", name}) + table.Append([]string{"Mailbox aliases", mailbox.MailboxAliases[0].Address}) for i := range mailbox.MailboxAliases { if (i + 1) < len(mailbox.MailboxAliases) { table.Append([]string{"", mailbox.MailboxAliases[i+1].Address}) From c82a30d4e0189bd9b9cd55d73df8256a15488f86 Mon Sep 17 00:00:00 2001 From: Eddie Webbinaro Date: Sat, 25 Dec 2021 06:12:34 -0500 Subject: [PATCH 113/120] bump version --- iredmail/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iredmail/version.go b/iredmail/version.go index 2f11f95..ca64bc8 100644 --- a/iredmail/version.go +++ b/iredmail/version.go @@ -10,7 +10,7 @@ import ( const ( // Version of iredmail-cli - Version = "0.3.0" + Version = "0.3.2" releaseFile = "/etc/iredmail-release" supportedReleaseMin = "0.9.8" From 7750fbe5f641a7155b2755103bfd0e59395b40bb Mon Sep 17 00:00:00 2001 From: Eddie Webbinaro Date: Sat, 25 Dec 2021 19:53:10 -0500 Subject: [PATCH 114/120] try auto release --- .circleci/config.yml | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ad84450..e8e3808 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -32,7 +32,22 @@ jobs: #- run: go test -v $(go list ./... | circleci tests split) - run: mysql -h 127.0.0.1 -uroot vmail < .circleci/define_tables.sql - run: go test -v ./integration_test - + + tag_version: + docker: + - image: cimg/go:1.17 + steps: + - checkout + - run: go install + - run: git config --global user.name eddiewebb + - run: + name: Tag it + command: | + TAG_VERSION=$(go run ./ version | head -n1 | cut -d":" -f2 | tr -d " ") + echo "tagging as: ${TAG_VERSION}" + git tag ${TAG_VERSION} + git push --tags + release: docker: - image: cimg/go:1.17 @@ -51,6 +66,12 @@ workflows: filters: tags: only: /^v.*/ + - tag_version: + filters: + branches: + only: master + requires: + - integration-test - release: requires: - integration-test From 1745e271287a1a812b01fdd2b9ba9df54d7a7a46 Mon Sep 17 00:00:00 2001 From: Eddie Webbinaro Date: Sat, 25 Dec 2021 20:01:51 -0500 Subject: [PATCH 115/120] tag passing builds on main --- .circleci/config.yml | 37 ++++++++++++------------------------- 1 file changed, 12 insertions(+), 25 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e8e3808..51d457c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,7 +1,4 @@ -# Golang CircleCI 2.0 configuration file -# -# Check https://circleci.com/docs/2.0/language-go/ for more details -version: 2 +version: 2.1 jobs: integration-test: docker: @@ -32,21 +29,17 @@ jobs: #- run: go test -v $(go list ./... | circleci tests split) - run: mysql -h 127.0.0.1 -uroot vmail < .circleci/define_tables.sql - run: go test -v ./integration_test - - tag_version: - docker: - - image: cimg/go:1.17 - steps: - - checkout - - run: go install - - run: git config --global user.name eddiewebb - - run: - name: Tag it - command: | - TAG_VERSION=$(go run ./ version | head -n1 | cut -d":" -f2 | tr -d " ") - echo "tagging as: ${TAG_VERSION}" - git tag ${TAG_VERSION} - git push --tags + - when: + condition: + equal: [ "master", << pipeline.git.branch >> ] + steps: + - run: + name: Tag it + command: | + TAG_VERSION=$(go run ./ version | head -n1 | cut -d":" -f2 | tr -d " ") + echo "tagging as: ${TAG_VERSION}" + git tag ${TAG_VERSION} + git push --tags release: docker: @@ -66,12 +59,6 @@ workflows: filters: tags: only: /^v.*/ - - tag_version: - filters: - branches: - only: master - requires: - - integration-test - release: requires: - integration-test From 94aca9df99eb6d20367edaea6d96191bc1404c75 Mon Sep 17 00:00:00 2001 From: Eddie Webbinaro Date: Sat, 25 Dec 2021 20:06:42 -0500 Subject: [PATCH 116/120] it works, use real name --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 51d457c..75b8e11 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -38,7 +38,7 @@ jobs: command: | TAG_VERSION=$(go run ./ version | head -n1 | cut -d":" -f2 | tr -d " ") echo "tagging as: ${TAG_VERSION}" - git tag ${TAG_VERSION} + git tag "v${TAG_VERSION}"" git push --tags release: From 16244ffaa4f78406cbc368c088b7c282aa7f944b Mon Sep 17 00:00:00 2001 From: Eddie Webbinaro Date: Sat, 25 Dec 2021 20:08:35 -0500 Subject: [PATCH 117/120] it works, use real name[skip ci] --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 75b8e11..34f76a2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -38,7 +38,7 @@ jobs: command: | TAG_VERSION=$(go run ./ version | head -n1 | cut -d":" -f2 | tr -d " ") echo "tagging as: ${TAG_VERSION}" - git tag "v${TAG_VERSION}"" + git tag "v${TAG_VERSION}" git push --tags release: From fafa19096832b05cde874a9e5fdcfd92bd80d438 Mon Sep 17 00:00:00 2001 From: Eddie Webbinaro Date: Sat, 25 Dec 2021 20:18:38 -0500 Subject: [PATCH 118/120] Clarify commands in docs [skip ci] --- Readme.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Readme.md b/Readme.md index a5b0649..de4e09b 100644 --- a/Readme.md +++ b/Readme.md @@ -1,7 +1,9 @@ -# iredmail-cli +# iredmail-cli Rebooted [![CircleCI](https://img.shields.io/circleci/build/github/eddiewebb/iredmail-cli)](https://circleci.com/gh/eddiewebb/iredmail-cli/tree/master) + It Lives!! + ## Table of contents * [Table of contents](#table-of-contents) @@ -18,9 +20,9 @@ * [info [MAILBOX_EMAIL]](#info-mailbox_email) * [list](#list) * [update [MAILBOX_EMAIL]](#update-mailbox_email) - * [add-alias [ALIAS] [MAILBOX_EMAIL]](#add-alias-alias-mailbox_email) + * [add-alias [ALIAS_EMAIL] [MAILBOX_EMAIL]](#add-alias-alias-mailbox_email) * [delete-alias [ALIAS_EMAIL]](#delete-alias-alias_email) - * [forwarding](#forwarding) + * [forwarding (not, exclusive,no sending rights)](#forwarding) * [add [MAILBOX_EMAIL] [DESTINATION_EMAIL]](#add-mailbox_email-destination_email) * [delete [MAILBOX_EMAIL] [DESTINATION_EMAIL]](#delete-mailbox_email-destination_email) * [list](#list-1) @@ -32,7 +34,7 @@ * [delete-alias [ALIAS_DOMAIN]](#delete-alias--alias_domain) * [add-catchall [DOMAIN] [DESTINATION_EMAIL]](#add-catchall-domain-destination_email) * [delete-catchall [DOMAIN] [DESTINATION_EMAIL]](#delete-catchall-domain-destination_email) - * [alias](#alias) + * [alias(NOT user specific, but for list or mass forwarding)](#alias) * [add [ALIAS_EMAIL]](#add-alias_email) * [delete [ALIAS_EMAIL]](#delete-alias_email) * [info [ALIAS_EMAIL]](#info-alias_email) From d115d942d07360eb5d3980d7fdc4af66d6acd742 Mon Sep 17 00:00:00 2001 From: Eddie Webbinaro Date: Sat, 25 Dec 2021 20:24:35 -0500 Subject: [PATCH 119/120] xclean up command help --- cmd/alias.go | 2 +- cmd/aliasAdd.go | 4 ++-- cmd/mailboxAliasAdd.go | 5 ++++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/cmd/alias.go b/cmd/alias.go index 01147c7..08247e4 100644 --- a/cmd/alias.go +++ b/cmd/alias.go @@ -7,7 +7,7 @@ import ( // aliasCmd represents the 'alias' command var aliasCmd = &cobra.Command{ Use: "alias", - Short: "Add/delete/list aliases and their forwardings", + Short: "Add/delete/list non-user specific (list/fwds) aliases and their forwardings", Run: func(cmd *cobra.Command, args []string) { cmd.Help() }, diff --git a/cmd/aliasAdd.go b/cmd/aliasAdd.go index da05948..66ab7ef 100644 --- a/cmd/aliasAdd.go +++ b/cmd/aliasAdd.go @@ -26,8 +26,8 @@ import ( // aliasAddCmd represents the 'alias add' command var aliasAddCmd = &cobra.Command{ Use: "add", - Short: "Add an alias", - Long: `Add an alias. + Short: "Add a list/fwd alias", + Long: `Add a NON-user specific alias for lists or forwarding. Emails sent to [ALIAS_EMAIL] will be delivered to alias forwardings. Use the "alias add-forwarding" command to add forwardings to the alias. An alias can have multiple forwardings.`, diff --git a/cmd/mailboxAliasAdd.go b/cmd/mailboxAliasAdd.go index aac824e..66f0fd7 100644 --- a/cmd/mailboxAliasAdd.go +++ b/cmd/mailboxAliasAdd.go @@ -29,7 +29,10 @@ var mailboxAliasAddCmd = &cobra.Command{ Short: "Add a mailbox alias", Long: `Add a mailbox alias -A mailbox [MAILBOX_EMAIL] can have additional email addresses [ALIAS]@[DOMAIN|ALIAS_DOMAIN], all emails sent to these addresses will be delivered to the same mailbox.`, +A mailbox [MAILBOX_EMAIL] can have additional email addresses; + [ALIAS]@[DOMAIN|ALIAS_DOMAIN], all emails sent to these addresses + will be delivered to the same mailbox. + Only this type of alias gets SENDING permission. Even with domain alias, names must be declared.`, Args: func(cmd *cobra.Command, args []string) error { if len(args) != 2 { return errors.New("Requires [ALIAS_EMAIL] and [MAILBOX_EMAIL]") From ed6d9f0c67b0d04a5bb23240525febeda0fcda82 Mon Sep 17 00:00:00 2001 From: Eddie Webbinaro Date: Sat, 25 Dec 2021 20:25:08 -0500 Subject: [PATCH 120/120] rev version --- iredmail/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iredmail/version.go b/iredmail/version.go index ca64bc8..e1f7fca 100644 --- a/iredmail/version.go +++ b/iredmail/version.go @@ -10,7 +10,7 @@ import ( const ( // Version of iredmail-cli - Version = "0.3.2" + Version = "0.3.3" releaseFile = "/etc/iredmail-release" supportedReleaseMin = "0.9.8"