From 23fee8e4e1c0e5e30beae5c2972b8c86ccc9a719 Mon Sep 17 00:00:00 2001 From: Ralph Slooten Date: Sat, 14 Dec 2024 17:51:02 +1300 Subject: [PATCH] Chore: Move smtpd & pop3 modules to internal --- .github/workflows/tests.yml | 2 +- cmd/root.go | 2 +- {server => internal}/pop3/functions.go | 0 {server => internal}/pop3/pop3_test.go | 0 {server => internal}/pop3/server.go | 0 {server => internal}/smtpd/main.go | 0 {server => internal}/smtpd/relay.go | 0 {server => internal}/smtpd/smtpd.go | 0 {server => internal}/smtpd/smtpd_test.go | 0 server/apiv1/release.go | 2 +- server/apiv1/send.go | 2 +- server/server.go | 2 +- 12 files changed, 5 insertions(+), 5 deletions(-) rename {server => internal}/pop3/functions.go (100%) rename {server => internal}/pop3/pop3_test.go (100%) rename {server => internal}/pop3/server.go (100%) rename {server => internal}/smtpd/main.go (100%) rename {server => internal}/smtpd/relay.go (100%) rename {server => internal}/smtpd/smtpd.go (100%) rename {server => internal}/smtpd/smtpd_test.go (100%) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 6ddc501..d6b1816 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -26,7 +26,7 @@ jobs: key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} restore-keys: | ${{ runner.os }}-go- - - run: go test -p 1 ./internal/storage ./server ./server/smtpd ./server/pop3 ./internal/tools ./internal/html2text ./internal/linkcheck -v + - run: go test -p 1 ./internal/storage ./server ./internal/smtpd ./internal/pop3 ./internal/tools ./internal/html2text ./internal/linkcheck -v - run: go test -p 1 ./internal/storage ./internal/html2text -bench=. # build the assets diff --git a/cmd/root.go b/cmd/root.go index e7a277c..4bc81de 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -9,10 +9,10 @@ import ( "github.com/axllent/mailpit/config" "github.com/axllent/mailpit/internal/auth" "github.com/axllent/mailpit/internal/logger" + "github.com/axllent/mailpit/internal/smtpd" "github.com/axllent/mailpit/internal/storage" "github.com/axllent/mailpit/internal/tools" "github.com/axllent/mailpit/server" - "github.com/axllent/mailpit/server/smtpd" "github.com/axllent/mailpit/server/webhook" "github.com/spf13/cobra" ) diff --git a/server/pop3/functions.go b/internal/pop3/functions.go similarity index 100% rename from server/pop3/functions.go rename to internal/pop3/functions.go diff --git a/server/pop3/pop3_test.go b/internal/pop3/pop3_test.go similarity index 100% rename from server/pop3/pop3_test.go rename to internal/pop3/pop3_test.go diff --git a/server/pop3/server.go b/internal/pop3/server.go similarity index 100% rename from server/pop3/server.go rename to internal/pop3/server.go diff --git a/server/smtpd/main.go b/internal/smtpd/main.go similarity index 100% rename from server/smtpd/main.go rename to internal/smtpd/main.go diff --git a/server/smtpd/relay.go b/internal/smtpd/relay.go similarity index 100% rename from server/smtpd/relay.go rename to internal/smtpd/relay.go diff --git a/server/smtpd/smtpd.go b/internal/smtpd/smtpd.go similarity index 100% rename from server/smtpd/smtpd.go rename to internal/smtpd/smtpd.go diff --git a/server/smtpd/smtpd_test.go b/internal/smtpd/smtpd_test.go similarity index 100% rename from server/smtpd/smtpd_test.go rename to internal/smtpd/smtpd_test.go diff --git a/server/apiv1/release.go b/server/apiv1/release.go index c125ede..3c1c9ce 100644 --- a/server/apiv1/release.go +++ b/server/apiv1/release.go @@ -10,9 +10,9 @@ import ( "github.com/axllent/mailpit/config" "github.com/axllent/mailpit/internal/logger" + "github.com/axllent/mailpit/internal/smtpd" "github.com/axllent/mailpit/internal/storage" "github.com/axllent/mailpit/internal/tools" - "github.com/axllent/mailpit/server/smtpd" "github.com/gorilla/mux" "github.com/lithammer/shortuuid/v4" ) diff --git a/server/apiv1/send.go b/server/apiv1/send.go index 7f006cc..270856f 100644 --- a/server/apiv1/send.go +++ b/server/apiv1/send.go @@ -12,8 +12,8 @@ import ( "strings" "github.com/axllent/mailpit/config" + "github.com/axllent/mailpit/internal/smtpd" "github.com/axllent/mailpit/internal/tools" - "github.com/axllent/mailpit/server/smtpd" "github.com/jhillyerd/enmime" ) diff --git a/server/server.go b/server/server.go index c942b29..c98e91c 100644 --- a/server/server.go +++ b/server/server.go @@ -19,12 +19,12 @@ import ( "github.com/axllent/mailpit/config" "github.com/axllent/mailpit/internal/auth" "github.com/axllent/mailpit/internal/logger" + "github.com/axllent/mailpit/internal/pop3" "github.com/axllent/mailpit/internal/stats" "github.com/axllent/mailpit/internal/storage" "github.com/axllent/mailpit/internal/tools" "github.com/axllent/mailpit/server/apiv1" "github.com/axllent/mailpit/server/handlers" - "github.com/axllent/mailpit/server/pop3" "github.com/axllent/mailpit/server/websockets" "github.com/gorilla/mux" "github.com/lithammer/shortuuid/v4"