diff --git a/internal/cmd/http.go b/internal/cmd/http.go index e74b9c7..2dd540c 100644 --- a/internal/cmd/http.go +++ b/internal/cmd/http.go @@ -1,14 +1,14 @@ package cmd import ( - "framework_v2/internal/app/config" - "framework_v2/internal/app/ent" - "framework_v2/internal/app/facade" - "framework_v2/internal/app/gin" - "framework_v2/internal/app/jobs" - "framework_v2/internal/app/jwks" - "framework_v2/internal/app/logger" - "framework_v2/internal/app/s3" + "framework_v2/internal/providers/config" + "framework_v2/internal/providers/ent" + "framework_v2/internal/providers/facade" + "framework_v2/internal/providers/gin" + "framework_v2/internal/providers/jobs" + "framework_v2/internal/providers/jwks" + "framework_v2/internal/providers/logger" + "framework_v2/internal/providers/s3" "github.com/spf13/cobra" ) diff --git a/internal/cmd/migrate.go b/internal/cmd/migrate.go index 65d79ac..de26558 100644 --- a/internal/cmd/migrate.go +++ b/internal/cmd/migrate.go @@ -7,9 +7,9 @@ import ( "entgo.io/ent/dialect/sql/schema" "errors" "fmt" - "framework_v2/internal/app/config" - "framework_v2/internal/app/ent" - "framework_v2/internal/app/logger" + "framework_v2/internal/providers/config" + "framework_v2/internal/providers/ent" + "framework_v2/internal/providers/logger" //entmigrate "framework_v2/internal/ent/migrate" "framework_v2/internal/migrations" diff --git a/internal/cmd/rpc.go b/internal/cmd/rpc.go index a1d2c5c..cc47019 100644 --- a/internal/cmd/rpc.go +++ b/internal/cmd/rpc.go @@ -1,13 +1,13 @@ package cmd import ( - "framework_v2/internal/app/config" - "framework_v2/internal/app/ent" - "framework_v2/internal/app/jobs" - "framework_v2/internal/app/jwks" - "framework_v2/internal/app/logger" - "framework_v2/internal/app/redis" grpc2 "framework_v2/internal/middleware/grpc" + "framework_v2/internal/providers/config" + "framework_v2/internal/providers/ent" + "framework_v2/internal/providers/jobs" + "framework_v2/internal/providers/jwks" + "framework_v2/internal/providers/logger" + "framework_v2/internal/providers/redis" "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/auth" "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/logging" "github.com/spf13/cobra" diff --git a/internal/cmd/schedule.go b/internal/cmd/schedule.go index 35605fc..545dbfc 100644 --- a/internal/cmd/schedule.go +++ b/internal/cmd/schedule.go @@ -2,11 +2,11 @@ package cmd import ( "fmt" - "framework_v2/internal/app/config" - "framework_v2/internal/app/ent" - "framework_v2/internal/app/jobs" - "framework_v2/internal/app/logger" - "framework_v2/internal/app/redis" + "framework_v2/internal/providers/config" + "framework_v2/internal/providers/ent" + "framework_v2/internal/providers/jobs" + "framework_v2/internal/providers/logger" + "framework_v2/internal/providers/redis" "github.com/spf13/cobra" "time" diff --git a/internal/cmd/worker.go b/internal/cmd/worker.go index e2e0745..6e22d3d 100644 --- a/internal/cmd/worker.go +++ b/internal/cmd/worker.go @@ -1,11 +1,11 @@ package cmd import ( - "framework_v2/internal/app/config" - "framework_v2/internal/app/ent" - "framework_v2/internal/app/jobs" - "framework_v2/internal/app/logger" - "framework_v2/internal/app/redis" + "framework_v2/internal/providers/config" + "framework_v2/internal/providers/ent" + "framework_v2/internal/providers/jobs" + "framework_v2/internal/providers/logger" + "framework_v2/internal/providers/redis" "github.com/hibiken/asynq" "github.com/spf13/cobra" "log" diff --git a/internal/handlers/controllers/user/main.go b/internal/handlers/controllers/user/main.go index 7e53f26..ab30b71 100644 --- a/internal/handlers/controllers/user/main.go +++ b/internal/handlers/controllers/user/main.go @@ -2,7 +2,7 @@ package user import ( "fmt" - "framework_v2/internal/app/auth" + "framework_v2/internal/providers/auth" "github.com/gin-gonic/gin" ) diff --git a/internal/middleware/grpc/auth.go b/internal/middleware/grpc/auth.go index e8a88f3..e056f83 100644 --- a/internal/middleware/grpc/auth.go +++ b/internal/middleware/grpc/auth.go @@ -2,10 +2,10 @@ package grpc import ( "context" - auth2 "framework_v2/internal/app/auth" - "framework_v2/internal/app/config" - "framework_v2/internal/app/jwks" - "framework_v2/internal/app/logger" + auth2 "framework_v2/internal/providers/auth" + "framework_v2/internal/providers/config" + "framework_v2/internal/providers/jwks" + "framework_v2/internal/providers/logger" "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/auth" "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/logging" "github.com/mitchellh/mapstructure" diff --git a/internal/middleware/grpc/log.go b/internal/middleware/grpc/log.go index 62c1f5f..0bc4a4b 100644 --- a/internal/middleware/grpc/log.go +++ b/internal/middleware/grpc/log.go @@ -3,7 +3,7 @@ package grpc import ( "context" "fmt" - "framework_v2/internal/app/logger" + "framework_v2/internal/providers/logger" "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/logging" "go.uber.org/zap" ) diff --git a/internal/middleware/http/jwt.go b/internal/middleware/http/jwt.go index a4ced2a..59bac59 100644 --- a/internal/middleware/http/jwt.go +++ b/internal/middleware/http/jwt.go @@ -2,11 +2,11 @@ package http import ( "errors" - "framework_v2/internal/app/auth" - "framework_v2/internal/app/config" - "framework_v2/internal/app/facade" - "framework_v2/internal/app/helper" - "framework_v2/internal/app/jwks" + "framework_v2/internal/providers/auth" + "framework_v2/internal/providers/config" + "framework_v2/internal/providers/facade" + "framework_v2/internal/providers/helper" + "framework_v2/internal/providers/jwks" "github.com/gin-gonic/gin" "github.com/mitchellh/mapstructure" "net/http" diff --git a/internal/app/auth/user.go b/internal/providers/auth/user.go similarity index 100% rename from internal/app/auth/user.go rename to internal/providers/auth/user.go diff --git a/internal/app/config/config.go b/internal/providers/config/config.go similarity index 100% rename from internal/app/config/config.go rename to internal/providers/config/config.go diff --git a/internal/app/config/init.go b/internal/providers/config/init.go similarity index 100% rename from internal/app/config/init.go rename to internal/providers/config/init.go diff --git a/internal/app/ent/ent.go b/internal/providers/ent/ent.go similarity index 93% rename from internal/app/ent/ent.go rename to internal/providers/ent/ent.go index 866e044..08bd458 100644 --- a/internal/app/ent/ent.go +++ b/internal/providers/ent/ent.go @@ -2,7 +2,7 @@ package ent import ( "errors" - "framework_v2/internal/app/logger" + "framework_v2/internal/providers/logger" _ "github.com/lib/pq" "go.uber.org/zap" ) diff --git a/internal/app/facade/bind.go b/internal/providers/facade/bind.go similarity index 100% rename from internal/app/facade/bind.go rename to internal/providers/facade/bind.go diff --git a/internal/app/gin/gin.go b/internal/providers/gin/gin.go similarity index 94% rename from internal/app/gin/gin.go rename to internal/providers/gin/gin.go index fed5ac4..b7213ae 100644 --- a/internal/app/gin/gin.go +++ b/internal/providers/gin/gin.go @@ -2,10 +2,10 @@ package gin import ( "fmt" - "framework_v2/internal/app/auth" - "framework_v2/internal/app/facade" - "framework_v2/internal/app/helper" http2 "framework_v2/internal/middleware/http" + "framework_v2/internal/providers/auth" + "framework_v2/internal/providers/facade" + "framework_v2/internal/providers/helper" "github.com/gin-gonic/gin" "net/http" "reflect" diff --git a/internal/app/gin/init.go b/internal/providers/gin/init.go similarity index 91% rename from internal/app/gin/init.go rename to internal/providers/gin/init.go index c92a7b3..1285e9e 100644 --- a/internal/app/gin/init.go +++ b/internal/providers/gin/init.go @@ -1,9 +1,9 @@ package gin import ( - "framework_v2/internal/app/facade" "framework_v2/internal/handlers/controllers/user" "framework_v2/internal/middleware/http" + "framework_v2/internal/providers/facade" ginzap "github.com/gin-contrib/zap" "github.com/gin-gonic/gin" "time" diff --git a/internal/app/helper/offset.go b/internal/providers/helper/offset.go similarity index 100% rename from internal/app/helper/offset.go rename to internal/providers/helper/offset.go diff --git a/internal/app/helper/response.go b/internal/providers/helper/response.go similarity index 92% rename from internal/app/helper/response.go rename to internal/providers/helper/response.go index c1da11f..412f103 100644 --- a/internal/app/helper/response.go +++ b/internal/providers/helper/response.go @@ -1,7 +1,7 @@ package helper import ( - "framework_v2/internal/app/response" + "framework_v2/internal/providers/response" "github.com/gin-gonic/gin" ) diff --git a/internal/app/jobs/init.go b/internal/providers/jobs/init.go similarity index 91% rename from internal/app/jobs/init.go rename to internal/providers/jobs/init.go index 4e53205..e6a4c30 100644 --- a/internal/app/jobs/init.go +++ b/internal/providers/jobs/init.go @@ -1,7 +1,7 @@ package jobs import ( - "framework_v2/internal/app/config" + "framework_v2/internal/providers/config" "github.com/hibiken/asynq" ) diff --git a/internal/app/jwks/init.go b/internal/providers/jwks/init.go similarity index 100% rename from internal/app/jwks/init.go rename to internal/providers/jwks/init.go diff --git a/internal/app/jwks/jwks.go b/internal/providers/jwks/jwks.go similarity index 90% rename from internal/app/jwks/jwks.go rename to internal/providers/jwks/jwks.go index 69cf1dc..9601a54 100644 --- a/internal/app/jwks/jwks.go +++ b/internal/providers/jwks/jwks.go @@ -2,8 +2,8 @@ package jwks import ( "errors" - "framework_v2/internal/app/config" - "framework_v2/internal/app/logger" + "framework_v2/internal/providers/config" + "framework_v2/internal/providers/logger" "github.com/MicahParks/keyfunc/v3" "github.com/golang-jwt/jwt/v5" "time" diff --git a/internal/app/logger/init.go b/internal/providers/logger/init.go similarity index 84% rename from internal/app/logger/init.go rename to internal/providers/logger/init.go index 140282a..eec79ba 100644 --- a/internal/app/logger/init.go +++ b/internal/providers/logger/init.go @@ -1,7 +1,7 @@ package logger import ( - "framework_v2/internal/app/facade" + "framework_v2/internal/providers/facade" "go.uber.org/zap" ) diff --git a/internal/app/redis/init.go b/internal/providers/redis/init.go similarity index 83% rename from internal/app/redis/init.go rename to internal/providers/redis/init.go index ea66331..f36a004 100644 --- a/internal/app/redis/init.go +++ b/internal/providers/redis/init.go @@ -2,8 +2,8 @@ package redis import "C" import ( - "framework_v2/internal/app/config" - "framework_v2/internal/app/facade" + "framework_v2/internal/providers/config" + "framework_v2/internal/providers/facade" "github.com/redis/go-redis/v9" "golang.org/x/net/context" ) diff --git a/internal/app/response/base_response.go b/internal/providers/response/base_response.go similarity index 100% rename from internal/app/response/base_response.go rename to internal/providers/response/base_response.go diff --git a/internal/app/s3/init.go b/internal/providers/s3/init.go similarity index 82% rename from internal/app/s3/init.go rename to internal/providers/s3/init.go index b16027c..c50ba33 100644 --- a/internal/app/s3/init.go +++ b/internal/providers/s3/init.go @@ -1,8 +1,8 @@ package s3 import ( - "framework_v2/internal/app/config" - "framework_v2/internal/app/facade" + "framework_v2/internal/providers/config" + "framework_v2/internal/providers/facade" "github.com/minio/minio-go/v7" "github.com/minio/minio-go/v7/pkg/credentials" )