From 4e491024335e2c4f72374e2600cfd359c6e116a5 Mon Sep 17 00:00:00 2001 From: Jonas Kaninda Date: Mon, 4 Nov 2024 08:48:38 +0100 Subject: [PATCH] refactor: Restructure project files for better organization, readability, and maintainability --- cmd/config/config.go | 2 +- cmd/config/init.go | 4 ++-- cmd/root.go | 2 +- cmd/server.go | 4 ++-- {pkg => internal}/config.go | 2 +- {pkg => internal}/handler.go | 2 +- {pkg => internal}/healthCheck.go | 2 +- {pkg => internal}/helpers.go | 0 {pkg => internal}/middleware.go | 0 {pkg => internal}/middleware/access-middleware.go | 2 +- {pkg => internal}/middleware/error-interceptor.go | 2 +- {pkg => internal}/middleware/middleware.go | 2 +- {pkg => internal}/middleware/rate-limit.go | 2 +- {pkg => internal}/middleware/types.go | 0 {pkg => internal}/middleware_test.go | 0 {pkg => internal}/proxy.go | 2 +- {pkg => internal}/route.go | 4 ++-- {pkg => internal}/server.go | 2 +- {pkg => internal}/server_test.go | 0 {pkg => internal}/types.go | 0 {pkg => internal}/var.go | 0 {internal => pkg}/logger/logger.go | 0 22 files changed, 17 insertions(+), 17 deletions(-) rename {pkg => internal}/config.go (99%) rename {pkg => internal}/handler.go (98%) rename {pkg => internal}/healthCheck.go (96%) rename {pkg => internal}/helpers.go (100%) rename {pkg => internal}/middleware.go (100%) rename {pkg => internal}/middleware/access-middleware.go (98%) rename {pkg => internal}/middleware/error-interceptor.go (97%) rename {pkg => internal}/middleware/middleware.go (99%) rename {pkg => internal}/middleware/rate-limit.go (98%) rename {pkg => internal}/middleware/types.go (100%) rename {pkg => internal}/middleware_test.go (100%) rename {pkg => internal}/proxy.go (98%) rename {pkg => internal}/route.go (98%) rename {pkg => internal}/server.go (97%) rename {pkg => internal}/server_test.go (100%) rename {pkg => internal}/types.go (100%) rename {pkg => internal}/var.go (100%) rename {internal => pkg}/logger/logger.go (100%) diff --git a/cmd/config/config.go b/cmd/config/config.go index 7bca009..f0ebb35 100644 --- a/cmd/config/config.go +++ b/cmd/config/config.go @@ -17,7 +17,7 @@ limitations under the License. package config import ( - "github.com/jkaninda/goma-gateway/internal/logger" + "github.com/jkaninda/goma-gateway/pkg/logger" "github.com/spf13/cobra" ) diff --git a/cmd/config/init.go b/cmd/config/init.go index b892c8b..b48f66b 100644 --- a/cmd/config/init.go +++ b/cmd/config/init.go @@ -16,8 +16,8 @@ See the License for the specific language governing permissions and limitations under the License. */ import ( - "github.com/jkaninda/goma-gateway/internal/logger" - "github.com/jkaninda/goma-gateway/pkg" + "github.com/jkaninda/goma-gateway/internal" + "github.com/jkaninda/goma-gateway/pkg/logger" "github.com/spf13/cobra" ) diff --git a/cmd/root.go b/cmd/root.go index 166873c..b69d868 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -18,7 +18,7 @@ package cmd import ( "github.com/jkaninda/goma-gateway/cmd/config" - "github.com/jkaninda/goma-gateway/internal/logger" + "github.com/jkaninda/goma-gateway/pkg/logger" "github.com/jkaninda/goma-gateway/util" "github.com/spf13/cobra" ) diff --git a/cmd/server.go b/cmd/server.go index fd9ba64..70480b4 100644 --- a/cmd/server.go +++ b/cmd/server.go @@ -20,8 +20,8 @@ import ( "context" "fmt" "github.com/common-nighthawk/go-figure" - "github.com/jkaninda/goma-gateway/internal/logger" - "github.com/jkaninda/goma-gateway/pkg" + "github.com/jkaninda/goma-gateway/internal" + "github.com/jkaninda/goma-gateway/pkg/logger" "github.com/jkaninda/goma-gateway/util" "github.com/spf13/cobra" ) diff --git a/pkg/config.go b/internal/config.go similarity index 99% rename from pkg/config.go rename to internal/config.go index 84c9827..9543230 100644 --- a/pkg/config.go +++ b/internal/config.go @@ -17,7 +17,7 @@ limitations under the License. */ import ( "fmt" - "github.com/jkaninda/goma-gateway/internal/logger" + "github.com/jkaninda/goma-gateway/pkg/logger" "github.com/jkaninda/goma-gateway/util" "github.com/spf13/cobra" "gopkg.in/yaml.v3" diff --git a/pkg/handler.go b/internal/handler.go similarity index 98% rename from pkg/handler.go rename to internal/handler.go index 897c156..59d0a68 100644 --- a/pkg/handler.go +++ b/internal/handler.go @@ -18,7 +18,7 @@ limitations under the License. import ( "encoding/json" "github.com/gorilla/mux" - "github.com/jkaninda/goma-gateway/internal/logger" + "github.com/jkaninda/goma-gateway/pkg/logger" "net/http" "sync" ) diff --git a/pkg/healthCheck.go b/internal/healthCheck.go similarity index 96% rename from pkg/healthCheck.go rename to internal/healthCheck.go index 8b5c283..9d0ecd8 100644 --- a/pkg/healthCheck.go +++ b/internal/healthCheck.go @@ -17,7 +17,7 @@ limitations under the License. */ import ( "fmt" - "github.com/jkaninda/goma-gateway/internal/logger" + "github.com/jkaninda/goma-gateway/pkg/logger" "io" "net/http" "net/url" diff --git a/pkg/helpers.go b/internal/helpers.go similarity index 100% rename from pkg/helpers.go rename to internal/helpers.go diff --git a/pkg/middleware.go b/internal/middleware.go similarity index 100% rename from pkg/middleware.go rename to internal/middleware.go diff --git a/pkg/middleware/access-middleware.go b/internal/middleware/access-middleware.go similarity index 98% rename from pkg/middleware/access-middleware.go rename to internal/middleware/access-middleware.go index af57fa7..b581c73 100644 --- a/pkg/middleware/access-middleware.go +++ b/internal/middleware/access-middleware.go @@ -18,7 +18,7 @@ limitations under the License. import ( "encoding/json" "fmt" - "github.com/jkaninda/goma-gateway/internal/logger" + "github.com/jkaninda/goma-gateway/pkg/logger" "github.com/jkaninda/goma-gateway/util" "net/http" "strings" diff --git a/pkg/middleware/error-interceptor.go b/internal/middleware/error-interceptor.go similarity index 97% rename from pkg/middleware/error-interceptor.go rename to internal/middleware/error-interceptor.go index b12f503..70a1dbe 100644 --- a/pkg/middleware/error-interceptor.go +++ b/internal/middleware/error-interceptor.go @@ -19,7 +19,7 @@ package middleware import ( "bytes" "encoding/json" - "github.com/jkaninda/goma-gateway/internal/logger" + "github.com/jkaninda/goma-gateway/pkg/logger" "io" "net/http" ) diff --git a/pkg/middleware/middleware.go b/internal/middleware/middleware.go similarity index 99% rename from pkg/middleware/middleware.go rename to internal/middleware/middleware.go index 00822b9..ff68ebe 100644 --- a/pkg/middleware/middleware.go +++ b/internal/middleware/middleware.go @@ -18,7 +18,7 @@ limitations under the License. import ( "encoding/base64" "encoding/json" - "github.com/jkaninda/goma-gateway/internal/logger" + "github.com/jkaninda/goma-gateway/pkg/logger" "io" "net/http" "net/url" diff --git a/pkg/middleware/rate-limit.go b/internal/middleware/rate-limit.go similarity index 98% rename from pkg/middleware/rate-limit.go rename to internal/middleware/rate-limit.go index 0d6ac7d..c4d7fad 100644 --- a/pkg/middleware/rate-limit.go +++ b/internal/middleware/rate-limit.go @@ -18,7 +18,7 @@ limitations under the License. import ( "encoding/json" "github.com/gorilla/mux" - "github.com/jkaninda/goma-gateway/internal/logger" + "github.com/jkaninda/goma-gateway/pkg/logger" "net/http" "time" ) diff --git a/pkg/middleware/types.go b/internal/middleware/types.go similarity index 100% rename from pkg/middleware/types.go rename to internal/middleware/types.go diff --git a/pkg/middleware_test.go b/internal/middleware_test.go similarity index 100% rename from pkg/middleware_test.go rename to internal/middleware_test.go diff --git a/pkg/proxy.go b/internal/proxy.go similarity index 98% rename from pkg/proxy.go rename to internal/proxy.go index 0e7abe4..793d81a 100644 --- a/pkg/proxy.go +++ b/internal/proxy.go @@ -18,7 +18,7 @@ limitations under the License. import ( "encoding/json" "fmt" - "github.com/jkaninda/goma-gateway/internal/logger" + "github.com/jkaninda/goma-gateway/pkg/logger" "net/http" "net/http/httputil" "net/url" diff --git a/pkg/route.go b/internal/route.go similarity index 98% rename from pkg/route.go rename to internal/route.go index 0f7cff8..e47c7fb 100644 --- a/pkg/route.go +++ b/internal/route.go @@ -17,8 +17,8 @@ limitations under the License. */ import ( "github.com/gorilla/mux" - "github.com/jkaninda/goma-gateway/internal/logger" - "github.com/jkaninda/goma-gateway/pkg/middleware" + "github.com/jkaninda/goma-gateway/internal/middleware" + "github.com/jkaninda/goma-gateway/pkg/logger" "github.com/jkaninda/goma-gateway/util" "time" ) diff --git a/pkg/server.go b/internal/server.go similarity index 97% rename from pkg/server.go rename to internal/server.go index ea8ac05..fbe0dc4 100644 --- a/pkg/server.go +++ b/internal/server.go @@ -18,7 +18,7 @@ limitations under the License. import ( "context" "fmt" - "github.com/jkaninda/goma-gateway/internal/logger" + "github.com/jkaninda/goma-gateway/pkg/logger" "net/http" "os" "sync" diff --git a/pkg/server_test.go b/internal/server_test.go similarity index 100% rename from pkg/server_test.go rename to internal/server_test.go diff --git a/pkg/types.go b/internal/types.go similarity index 100% rename from pkg/types.go rename to internal/types.go diff --git a/pkg/var.go b/internal/var.go similarity index 100% rename from pkg/var.go rename to internal/var.go diff --git a/internal/logger/logger.go b/pkg/logger/logger.go similarity index 100% rename from internal/logger/logger.go rename to pkg/logger/logger.go