diff --git a/mongo/config.go b/mongo/config.go index 56880f0..7861a88 100644 --- a/mongo/config.go +++ b/mongo/config.go @@ -7,8 +7,7 @@ import ( ) type Configuration struct { - Host string `env:"MONGO_HOST,default=localhost"` - Port string `env:"MONGO_PORT,default=27017"` + URL string `env:"MONGO_URL,required"` User string `env:"MONGO_USER,required"` Password string `env:"MONGO_PASSWORD,required"` Auth string `env:"MONGO_AUTH,required"` diff --git a/mongo/connection.go b/mongo/connection.go index 49aad4e..3708a1d 100644 --- a/mongo/connection.go +++ b/mongo/connection.go @@ -5,8 +5,6 @@ import ( "fmt" "go.mongodb.org/mongo-driver/event" "log" - "net" - "net/url" "time" "go.mongodb.org/mongo-driver/mongo" @@ -23,11 +21,6 @@ func Connect(ctx context.Context, deps *ConnectDeps) (*mongo.Database, error) { return nil, ErrEmptyArgs } - mongoURI := &url.URL{ - Scheme: "mongodb", - Host: net.JoinHostPort(deps.Configuration.Host, deps.Configuration.Port), - } - cmdMonitor := &event.CommandMonitor{ Started: func(_ context.Context, evt *event.CommandStartedEvent) { if evt.CommandName == "find" { @@ -47,7 +40,7 @@ func Connect(ctx context.Context, deps *ConnectDeps) (*mongo.Database, error) { } connectionOptions := options.Client(). - ApplyURI(mongoURI.String()). + ApplyURI(deps.Configuration.URL). SetAuth(options.Credential{ AuthMechanism: "SCRAM-SHA-1", AuthSource: deps.Configuration.Auth, @@ -70,12 +63,12 @@ func Connect(ctx context.Context, deps *ConnectDeps) (*mongo.Database, error) { if err == nil { return connection.Database(deps.Configuration.DatabaseName), nil } - log.Printf("failed to ping the database <%s>: %s", mongoURI.String(), err.Error()) + log.Printf("failed to ping the database <%s>: %s", deps.Configuration.URL, err.Error()) } - log.Printf("failed to connect to db <%s>: %s", mongoURI.String(), err.Error()) + log.Printf("failed to connect to db <%s>: %s", deps.Configuration.URL, err.Error()) case <-timeoutExceeded: - return nil, fmt.Errorf("db connection <%s> failed after %d timeout", mongoURI.String(), deps.Timeout) + return nil, fmt.Errorf("db connection <%s> failed after %d timeout", deps.Configuration.URL, deps.Timeout) default: time.Sleep(1 * time.Second) }