Merge pull request #16 from hellofresh/patch/mongo-driver-1.0

Bumped mongo driver to 1.0-rc1 to use new package structure

Author: vgarvardt

Gopkg.lock

@@ -41,10 +41,10 @@
   name = "github.com/gofrs/uuid"
   version = "3.2.0"
 
-[[constraint]]
-  name = "github.com/mongodb/mongo-go-driver"
-  version = "0.3.0"
-
 [prune]
   go-tests = true
   unused-packages = true
+
+[[constraint]]
+  name = "go.mongodb.org/mongo-driver"
+  version = "v1.0.0-rc1"

Gopkg.toml

@@ -9,8 +9,8 @@ import (
 	"github.com/hellofresh/goengine"
 	"github.com/hellofresh/goengine/mongodb"
 	"github.com/hellofresh/goengine/rabbit"
-	"github.com/mongodb/mongo-go-driver/mongo"
-	"github.com/mongodb/mongo-go-driver/mongo/options"
+	"go.mongodb.org/mongo-driver/mongo"
+	"go.mongodb.org/mongo-driver/mongo/options"
 )
 
 func main() {
@@ -26,9 +26,10 @@ func main() {
 	}
 
 	goengine.Log("Connecting to the database", map[string]interface{}{"dsn": mongoDSN}, nil)
-	mongoClient, err := mongo.NewClientWithOptions(
-		mongoDSN,
-		options.Client().SetAppName("goengine"),
+	mongoClient, err := mongo.NewClient(
+		options.Client().
+			ApplyURI(mongoDSN).
+			SetAppName("goengine"),
 	)
 	if err != nil {
 		goengine.Log("Failed to create new Mongo mongoClient", nil, err)

cmd/goengine/main.go

@@ -6,10 +6,10 @@ import (
 
 	"github.com/hellofresh/goengine"
 	"github.com/hellofresh/goengine/reflection"
-	"github.com/mongodb/mongo-go-driver/bson"
-	"github.com/mongodb/mongo-go-driver/mongo"
-	"github.com/mongodb/mongo-go-driver/mongo/options"
-	"github.com/mongodb/mongo-go-driver/x/bsonx"
+	"go.mongodb.org/mongo-driver/bson"
+	"go.mongodb.org/mongo-driver/mongo"
+	"go.mongodb.org/mongo-driver/mongo/options"
+	"go.mongodb.org/mongo-driver/x/bsonx"
 )
 
 // MongoEvent represents an event on mongodb
@@ -163,7 +163,7 @@ func (s *EventStore) CountEventsFor(streamName goengine.StreamName, id string) (
 	ctx, cancel := s.cs.CountEventsFor()
 	defer cancel()
 
-	return s.mongoDB.Collection(string(streamName)).Count(ctx, bson.M{"aggregate_id": string(streamName)})
+	return s.mongoDB.Collection(string(streamName)).CountDocuments(ctx, bson.M{"aggregate_id": string(streamName)})
 }
 
 func (s *EventStore) createIndices(c *mongo.Collection) error {