up dependencies

Author: Roman Tarasov

commands/migrate.go

@@ -7,7 +7,6 @@ import (
 	"github.com/coldze/mongol/primitives/mongo"
 	"github.com/coldze/primitives/custom_error"
 	"github.com/coldze/primitives/logs"
-	mgo "github.com/mongodb/mongo-go-driver/mongo"
 )
 
 func Migrate(path string, limit int64, log logs.Logger) custom_error.CustomError {
@@ -16,9 +15,10 @@ func Migrate(path string, limit int64, log logs.Logger) custom_error.CustomError
 		return custom_error.NewErrorf(errValue, "Failed to load changelog.")
 	}
 	ctx := context.Background()
-	mongoClient, err := mgo.Connect(ctx, changeLog.GetConnectionString(), nil)
+
+	mongoClient, err := newMgoClient(ctx, changeLog.GetConnectionString())
 	if err != nil {
-		return custom_error.MakeErrorf("Failed to connect to mongo. Error: %v", err)
+		return custom_error.NewErrorf(err, "Failed to connect to mongo.")
 	}
 	defer mongoClient.Disconnect(ctx)
 	db := mongoClient.Database(changeLog.GetDBName())

commands/rollback.go

@@ -7,7 +7,6 @@ import (
 	"github.com/coldze/mongol/primitives/mongo"
 	"github.com/coldze/primitives/custom_error"
 	"github.com/coldze/primitives/logs"
-	mgo "github.com/mongodb/mongo-go-driver/mongo"
 )
 
 func Rollback(path string, limit int64, log logs.Logger) custom_error.CustomError {
@@ -16,9 +15,9 @@ func Rollback(path string, limit int64, log logs.Logger) custom_error.CustomErro
 		return custom_error.NewErrorf(errValue, "Failed to load changelog.")
 	}
 	ctx := context.Background()
-	mongoClient, err := mgo.Connect(ctx, changeLog.GetConnectionString(), nil)
+	mongoClient, err := newMgoClient(ctx, changeLog.GetConnectionString())
 	if err != nil {
-		return custom_error.MakeErrorf("Failed to connect to mongo. Error: %v", err)
+		return custom_error.NewErrorf(err, "Failed to connect to mongo.")
 	}
 	defer mongoClient.Disconnect(ctx)
 	db := mongoClient.Database(changeLog.GetDBName())

commands/util.go

@@ -0,0 +1,29 @@
+package commands
+
+import (
+	"context"
+
+	"github.com/coldze/primitives/custom_error"
+	mgo "github.com/mongodb/mongo-go-driver/mongo"
+	"github.com/mongodb/mongo-go-driver/mongo/options"
+)
+
+func newMgoClient(ctx context.Context, uri string) (*mgo.Client, custom_error.CustomError) {
+	clientOpts := options.Client()
+	if clientOpts == nil {
+		return nil, custom_error.MakeErrorf("Something went completely wrong. ClientOpts are nil")
+	}
+	clientOpts = clientOpts.ApplyURI(uri)
+	if clientOpts == nil {
+		return nil, custom_error.MakeErrorf("Something went completely wrong. ClientOpts are nil")
+	}
+	err := clientOpts.Validate()
+	if err != nil {
+		return nil, custom_error.MakeErrorf("Failed to validate ClientOpts. Error: %v", err)
+	}
+	mongoClient, err := mgo.Connect(ctx, clientOpts)
+	if err != nil {
+		return nil, custom_error.MakeErrorf("Failed to connect to mongo. Error: %v", err)
+	}
+	return mongoClient, nil
+}