gofr-dev · mfreeman451 · Oct 16, 2024 · Oct 16, 2024 · Oct 17, 2024 · Oct 17, 2024
diff --git a/pkg/gofr/container/datasources.go b/pkg/gofr/container/datasources.go
@@ -255,7 +255,7 @@ type Mongo interface {
 	CreateCollection(ctx context.Context, name string) error
 
 	// StartSession starts a session and provide methods to run commands in a transaction.
-	StartSession() (any, error)
+	StartSession(ctx context.Context) (any, error)
 
 	HealthChecker
 }
@@ -285,8 +285,8 @@ type provider interface {
 	// UseTracer sets the tracer for the Cassandra client.
 	UseTracer(tracer any)
 
-	// Connect establishes a connection to Cassandra and registers metrics using the provided configuration when the client was Created.
-	Connect()
+	// Connect establishes a connection to a DB and registers metrics using the provided configuration when the client was Created.
+	Connect(ctx context.Context) error
 }
 
 type HealthChecker interface {

diff --git a/pkg/gofr/container/mock_datasources.go b/pkg/gofr/container/mock_datasources.go
diff --git a/pkg/gofr/datasource/cassandra/cassandra.go b/pkg/gofr/datasource/cassandra/cassandra.go
@@ -61,14 +61,14 @@ func New(conf Config) *Client {
 }
 
 // Connect establishes a connection to Cassandra and registers metrics using the provided configuration when the client was Created.
-func (c *Client) Connect() {
+func (c *Client) Connect(_ context.Context) error {
 	c.logger.Logf("connecting to cassandra at %v on port %v to keyspace %v", c.config.Hosts, c.config.Port, c.config.Keyspace)
 
 	sess, err := c.cassandra.clusterConfig.createSession()
 	if err != nil {
 		c.logger.Error("error connecting to cassandra: ", err)
 
-		return
+		return err
 	}
 
 	cassandraBucktes := []float64{.05, .075, .1, .125, .15, .2, .3, .5, .75, 1, 2, 3, 4, 5, 7.5, 10}
@@ -77,6 +77,8 @@ func (c *Client) Connect() {
 	c.logger.Logf("connected to '%s' keyspace at host '%s' and port '%d'", c.config.Keyspace, c.config.Hosts, c.config.Port)
 
 	c.cassandra.session = sess
+
+	return nil
 }
 
 // UseLogger sets the logger for the Cassandra client which asserts the Logger interface.

diff --git a/pkg/gofr/datasource/cassandra/cassandra_test.go b/pkg/gofr/datasource/cassandra/cassandra_test.go
@@ -112,7 +112,7 @@ func Test_Connect(t *testing.T) {
 
 		client.cassandra.clusterConfig = mockClusterConfig
 
-		client.Connect()
+		client.Connect(context.Background())
 
 		assert.Equal(t, tc.expSession, client.cassandra.session, "TEST[%d], Failed.\n%s", i, tc.desc)
 	}

diff --git a/pkg/gofr/datasource/mongo/errors.go b/pkg/gofr/datasource/mongo/errors.go
@@ -0,0 +1,17 @@
+package mongo
+
+import "errors"
+
+var (
+	// ErrInvalidURI is returned when the MongoDB URI is invalid or cannot be parsed.
+	ErrInvalidURI = errors.New("invalid MongoDB URI")
+
+	// ErrAuthentication is returned when authentication fails.
+	ErrAuthentication = errors.New("authentication failed")
+
+	// ErrDatabaseConnection is returned when the client fails to connect to the specified database.
+	ErrDatabaseConnection = errors.New("failed to connect to database")
+
+	// ErrGenericConnection is returned for general connection issues.
+	ErrGenericConnection = errors.New("MongoDB connection error")
-	// ErrInvalidURI is returned when the MongoDB URI is invalid or cannot be parsed.
-	ErrInvalidURI = errors.New("invalid MongoDB URI")
-
-	// ErrAuthentication is returned when authentication fails.
-	ErrAuthentication = errors.New("authentication failed")
-
-	// ErrDatabaseConnection is returned when the client fails to connect to the specified database.
-	ErrDatabaseConnection = errors.New("failed to connect to database")
-
-	// ErrGenericConnection is returned for general connection issues.
-	ErrGenericConnection = errors.New("MongoDB connection error")
+	// ErrInvalidURI is returned when the MongoDB URI is invalid or cannot be parsed.
+	ErrInvalidURI = fmt.Errorf("%w: invalid MongoDB URI", ErrConnection)
+
+	// ErrAuthentication is returned when authentication fails.
+	ErrAuthentication = fmt.Errorf("%w: authentication failed", ErrConnection)
+
+	// ErrDatabaseConnection is returned when the client fails to connect to the specified database.
+	ErrDatabaseConnection = fmt.Errorf("%w: failed to connect to database", ErrConnection)
+
+	// ErrGenericConnection is returned for general connection issues.
+	ErrConnection = errors.New("MongoDB connection error")
-	// ErrInvalidURI is returned when the MongoDB URI is invalid or cannot be parsed.
-	ErrInvalidURI = errors.New("invalid MongoDB URI")
-
-	// ErrAuthentication is returned when authentication fails.
-	ErrAuthentication = errors.New("authentication failed")
-
-	// ErrDatabaseConnection is returned when the client fails to connect to the specified database.
-	ErrDatabaseConnection = errors.New("failed to connect to database")
-
-	// ErrGenericConnection is returned for general connection issues.
-	ErrGenericConnection = errors.New("MongoDB connection error")
+	// ErrInvalidURI is returned when the MongoDB URI is invalid or cannot be parsed.
+	ErrInvalidURI = fmt.Errorf("%w: invalid MongoDB URI", ErrConnection)
+
+	// ErrAuthentication is returned when authentication fails.
+	ErrAuthentication = fmt.Errorf("%w: authentication failed", ErrConnection)
+
+	// ErrDatabaseConnection is returned when the client fails to connect to the specified database.
+	ErrDatabaseConnection = fmt.Errorf("%w: failed to connect to database", ErrConnection)
+
+	// ErrGenericConnection is returned for general connection issues.
+	ErrConnection = errors.New("MongoDB connection error")
+)
diff --git a/pkg/gofr/datasource/mongo/go.mod b/pkg/gofr/datasource/mongo/go.mod
@@ -4,27 +4,27 @@ go 1.22
 
 require (
 	github.com/stretchr/testify v1.9.0
-	go.mongodb.org/mongo-driver v1.15.1
-	go.opentelemetry.io/otel v1.30.0
-	go.opentelemetry.io/otel/trace v1.30.0
-	go.uber.org/mock v0.4.0
+	go.mongodb.org/mongo-driver v1.17.1
+	go.opentelemetry.io/otel v1.31.0
+	go.opentelemetry.io/otel/trace v1.31.0
+	go.uber.org/mock v0.5.0
 )
 
 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
-	github.com/klauspost/compress v1.17.8 // indirect
+	github.com/klauspost/compress v1.17.11 // indirect
 	github.com/montanaflynn/stats v0.7.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/xdg-go/pbkdf2 v1.0.0 // indirect
 	github.com/xdg-go/scram v1.1.2 // indirect
 	github.com/xdg-go/stringprep v1.0.4 // indirect
-	github.com/youmark/pkcs8 v0.0.0-20240424034433-3c2c7870ae76 // indirect
-	go.opentelemetry.io/otel/metric v1.30.0 // indirect
-	golang.org/x/crypto v0.23.0 // indirect
-	golang.org/x/sync v0.7.0 // indirect
-	golang.org/x/text v0.15.0 // indirect
+	github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 // indirect
+	go.opentelemetry.io/otel/metric v1.31.0 // indirect
+	golang.org/x/crypto v0.28.0 // indirect
+	golang.org/x/sync v0.8.0 // indirect
+	golang.org/x/text v0.19.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )