diff --git a/go.mod b/go.mod index e24f520..dd70cb1 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module gitea.pena/PenaSide/codeword go 1.22.2 require ( - gitea.pena/PenaSide/common v0.0.0-20241120141501-1695a0981562 + gitea.pena/PenaSide/common v0.0.0-20241128160655-fe730a08b5f1 gitea.pena/PenaSide/linters-golang v0.0.0-20241119212350-2759fa93724a gitea.pena/PenaSide/trashlog v0.0.0-20241119225515-2fd267647ca4 github.com/caarlos0/env/v8 v8.0.0 diff --git a/go.sum b/go.sum index f6eb960..5576389 100644 --- a/go.sum +++ b/go.sum @@ -1,6 +1,6 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -gitea.pena/PenaSide/common v0.0.0-20241120141501-1695a0981562 h1:LobhWlICMcbCCI+SouOzeRk2K5MsXSVHtv3QOcHRZnY= -gitea.pena/PenaSide/common v0.0.0-20241120141501-1695a0981562/go.mod h1:l71j3W1yROhOSfjWZ6wcMuzjBR37gu2ZTcXsorEJoiw= +gitea.pena/PenaSide/common v0.0.0-20241128160655-fe730a08b5f1 h1:w1AAxrlZGmxUI9NAa/0TYsc6sqWWF9yAzQaLL/KxwrM= +gitea.pena/PenaSide/common v0.0.0-20241128160655-fe730a08b5f1/go.mod h1:l71j3W1yROhOSfjWZ6wcMuzjBR37gu2ZTcXsorEJoiw= gitea.pena/PenaSide/linters-golang v0.0.0-20241119212350-2759fa93724a h1:UySqMgaOKNsR42Y6GQXoM2wn/waYNc9cakMUSvbEEAg= gitea.pena/PenaSide/linters-golang v0.0.0-20241119212350-2759fa93724a/go.mod h1:gdd+vOT6up9STkEbxa2qESLIMZFjCmRbkcheFQCVgZU= gitea.pena/PenaSide/trashlog v0.0.0-20241119225515-2fd267647ca4 h1:y9B4CSPIgiUoaXKyXLZxs1A9hxzDj26F9MH2R6uTkHQ= diff --git a/internal/initialize/config.go b/internal/initialize/config.go index 284d518..a441517 100644 --- a/internal/initialize/config.go +++ b/internal/initialize/config.go @@ -1,23 +1,24 @@ package initialize import ( + "gitea.pena/PenaSide/common/mongo" "github.com/caarlos0/env/v8" "github.com/joho/godotenv" "log" ) type Config struct { - AppName string `env:"APP_NAME" envDefault:"codeword"` - HTTPClientHost string `env:"HTTP_CLIENT_HOST" envDefault:"localhost"` - HTTPClientPort string `env:"HTTP_CLIENT_PORT" envDefault:"3000"` - HTTPAdminHost string `env:"HTTP_ADMIN_HOST" envDefault:"localhost"` - HTTPAdminPort string `env:"HTTP_ADMIN_PORT" envDefault:"3001"` - MongoHost string `env:"MONGO_HOST" envDefault:"127.0.0.1"` - MongoPort string `env:"MONGO_PORT" envDefault:"27020"` - MongoUser string `env:"MONGO_USER" envDefault:"test"` - MongoPassword string `env:"MONGO_PASSWORD" envDefault:"test"` - MongoDatabase string `env:"MONGO_DB" envDefault:"admin"` - MongoAuth string `env:"MONGO_AUTH" envDefault:"admin"` + AppName string `env:"APP_NAME" envDefault:"codeword"` + HTTPClientHost string `env:"HTTP_CLIENT_HOST" envDefault:"localhost"` + HTTPClientPort string `env:"HTTP_CLIENT_PORT" envDefault:"3000"` + HTTPAdminHost string `env:"HTTP_ADMIN_HOST" envDefault:"localhost"` + HTTPAdminPort string `env:"HTTP_ADMIN_PORT" envDefault:"3001"` + //MongoHost string `env:"MONGO_HOST" envDefault:"127.0.0.1"` + //MongoPort string `env:"MONGO_PORT" envDefault:"27020"` + //MongoUser string `env:"MONGO_USER" envDefault:"test"` + //MongoPassword string `env:"MONGO_PASSWORD" envDefault:"test"` + //MongoDatabase string `env:"MONGO_DB" envDefault:"admin"` + //MongoAuth string `env:"MONGO_AUTH" envDefault:"admin"` PublicCurveKey string `env:"PUBLIC_CURVE_KEY"` PrivateCurveKey string `env:"PRIVATE_CURVE_KEY"` SignSecret string `env:"SIGN_SECRET"` @@ -45,6 +46,7 @@ type Config struct { GrpcPort string `env:"GRPC_PORT" envDefault:"9000"` TrashLogHost string `env:"TRASH_LOG_HOST" envDefault:"localhost:7113"` ModuleLogger string `env:"MODULE_LOGGER" envDefault:"codeword-local"` + DataBase mongo.Configuration } func LoadConfig() (*Config, error) { diff --git a/internal/initialize/mongo.go b/internal/initialize/mongo.go index 94ba274..ab62d91 100644 --- a/internal/initialize/mongo.go +++ b/internal/initialize/mongo.go @@ -3,27 +3,18 @@ package initialize import ( "context" "gitea.pena/PenaSide/codeword/internal/repository" + mdb "gitea.pena/PenaSide/common/mongo" "go.mongodb.org/mongo-driver/mongo" "go.uber.org/zap" - mdb "gitea.pena/PenaSide/common/mongo" "time" ) func MongoDB(ctx context.Context, cfg Config) (*mongo.Database, error) { - dbConfig := &mdb.Configuration{ - Host: cfg.MongoHost, - Port: cfg.MongoPort, - User: cfg.MongoUser, - Password: cfg.MongoPassword, - DatabaseName: cfg.MongoDatabase, - Auth: cfg.MongoAuth, - } - newCtx, cancel := context.WithTimeout(ctx, 10*time.Second) defer cancel() mongoDeps := &mdb.ConnectDeps{ - Configuration: dbConfig, + Configuration: &cfg.DataBase, Timeout: 10 * time.Second, }