build: migrate mongo-driver v1 to v2

Replace go.mongodb.org/mongo-driver v1.17.9 with v2.5.0.
primitive.ObjectID replaced with bson.ObjectID, mongo.Connect
no longer takes context, options.Update renamed to UpdateOne.

Author: umputun

datastore/mongo.go

@@ -7,9 +7,9 @@ import (
 	"time"
 
 	log "github.com/go-pkgz/lgr"
-	"go.mongodb.org/mongo-driver/bson"
-	"go.mongodb.org/mongo-driver/mongo"
-	"go.mongodb.org/mongo-driver/mongo/options"
+	"go.mongodb.org/mongo-driver/v2/bson"
+	"go.mongodb.org/mongo-driver/v2/mongo"
+	"go.mongodb.org/mongo-driver/v2/mongo/options"
 )
 
 // MongoServer top level mongo ops
@@ -29,7 +29,7 @@ func New(connectionURI, dbName string, delay time.Duration) (*MongoServer, error
 		return nil, errors.New("env MONGO_URI not defined and --mongo not passed")
 	}
 
-	client, err := mongo.Connect(context.Background(), options.Client().ApplyURI(connectionURI))
+	client, err := mongo.Connect(options.Client().ApplyURI(connectionURI))
 	if err != nil {
 		return nil, err
 	}

datastore/rules.go

@@ -6,10 +6,9 @@ import (
 	"net/url"
 
 	log "github.com/go-pkgz/lgr"
-	"go.mongodb.org/mongo-driver/bson"
-	"go.mongodb.org/mongo-driver/bson/primitive"
-	"go.mongodb.org/mongo-driver/mongo"
-	"go.mongodb.org/mongo-driver/mongo/options"
+	"go.mongodb.org/mongo-driver/v2/bson"
+	"go.mongodb.org/mongo-driver/v2/mongo"
+	"go.mongodb.org/mongo-driver/v2/mongo/options"
 )
 
 // RulesDAO data-access obj for custom parsing rules, implements Rules
@@ -19,16 +18,16 @@ type RulesDAO struct {
 
 // Rule record, entry in mongo
 type Rule struct {
-	ID        primitive.ObjectID `json:"id" bson:"_id,omitempty"`
-	Domain    string             `json:"domain"`
-	MatchURLs []string           `json:"match_url,omitempty" bson:"match_urls,omitempty"`
-	Content   string             `json:"content"`
-	Author    string             `json:"author,omitempty" bson:"author,omitempty"`
-	TS        string             `json:"ts,omitempty" bson:"ts,omitempty"` // ts of original article
-	Excludes  []string           `json:"excludes,omitempty" bson:"excludes,omitempty"`
-	TestURLs  []string           `json:"test_urls,omitempty" bson:"test_urls"`
-	User      string             `json:"user"`
-	Enabled   bool               `json:"enabled"`
+	ID        bson.ObjectID `json:"id" bson:"_id,omitempty"`
+	Domain    string        `json:"domain"`
+	MatchURLs []string      `json:"match_url,omitempty" bson:"match_urls,omitempty"`
+	Content   string        `json:"content"`
+	Author    string        `json:"author,omitempty" bson:"author,omitempty"`
+	TS        string        `json:"ts,omitempty" bson:"ts,omitempty"` // ts of original article
+	Excludes  []string      `json:"excludes,omitempty" bson:"excludes,omitempty"`
+	TestURLs  []string      `json:"test_urls,omitempty" bson:"test_urls"`
+	User      string        `json:"user"`
+	Enabled   bool          `json:"enabled"`
 }
 
 // Get rule by url. Checks if found in mongo, matching by domain
@@ -57,26 +56,26 @@ func (r RulesDAO) Get(ctx context.Context, rURL string) (Rule, bool) {
 }
 
 // GetByID returns record by id
-func (r RulesDAO) GetByID(ctx context.Context, id primitive.ObjectID) (Rule, bool) {
+func (r RulesDAO) GetByID(ctx context.Context, id bson.ObjectID) (Rule, bool) {
 	var rule Rule
 	err := r.Collection.FindOne(ctx, bson.M{"_id": id}).Decode(&rule)
 	return rule, err == nil
 }
 
 // Save upsert rule
 func (r RulesDAO) Save(ctx context.Context, rule Rule) (Rule, error) {
-	ch, err := r.UpdateOne(ctx, bson.M{"domain": rule.Domain}, bson.M{"$set": rule}, options.Update().SetUpsert(true))
+	ch, err := r.UpdateOne(ctx, bson.M{"domain": rule.Domain}, bson.M{"$set": rule}, options.UpdateOne().SetUpsert(true))
 	if err != nil {
 		log.Printf("[WARN] failed to save, error=%v, article=%v", err, rule)
 		return rule, err
 	}
 	if ch.UpsertedID != nil {
-		if oid, ok := ch.UpsertedID.(primitive.ObjectID); ok {
+		if oid, ok := ch.UpsertedID.(bson.ObjectID); ok {
 			rule.ID = oid
 		}
 	}
 	// if rule was updated, we have no id, so try to find it by domain
-	if rule.ID == primitive.NilObjectID {
+	if rule.ID == bson.NilObjectID {
 		var found Rule
 		err = r.Collection.FindOne(ctx, bson.M{"domain": rule.Domain}).Decode(&found)
 		if err == nil {
@@ -87,7 +86,7 @@ func (r RulesDAO) Save(ctx context.Context, rule Rule) (Rule, error) {
 }
 
 // Disable marks enabled=false, by id
-func (r RulesDAO) Disable(ctx context.Context, id primitive.ObjectID) error {
+func (r RulesDAO) Disable(ctx context.Context, id bson.ObjectID) error {
 	_, err := r.UpdateOne(ctx, bson.M{"_id": id}, bson.M{"$set": bson.M{"enabled": false}})
 	return err
 }

datastore/rules_test.go

@@ -8,7 +8,7 @@ import (
 	"github.com/go-pkgz/testutils/containers"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"go.mongodb.org/mongo-driver/bson/primitive"
+	"go.mongodb.org/mongo-driver/v2/bson"
 )
 
 const letterBytes = "abcdefghijklmnopqrstuvwxyz"
@@ -23,7 +23,7 @@ func TestRulesSave(t *testing.T) {
 		assert.Equal(t, rule.Domain, saved.Domain)
 		assert.Equal(t, rule.Content, saved.Content)
 		assert.True(t, saved.Enabled)
-		assert.NotEqual(t, primitive.NilObjectID, saved.ID)
+		assert.NotEqual(t, bson.NilObjectID, saved.ID)
 	})
 
 	t.Run("upsert same domain preserves id", func(t *testing.T) {
@@ -130,12 +130,12 @@ func TestRulesGetByID(t *testing.T) {
 	})
 
 	t.Run("non-existing id", func(t *testing.T) {
-		_, ok := rules.GetByID(context.Background(), primitive.NewObjectID())
+		_, ok := rules.GetByID(context.Background(), bson.NewObjectID())
 		assert.False(t, ok)
 	})
 
 	t.Run("nil object id", func(t *testing.T) {
-		_, ok := rules.GetByID(context.Background(), primitive.NilObjectID)
+		_, ok := rules.GetByID(context.Background(), bson.NilObjectID)
 		assert.False(t, ok)
 	})
 }
@@ -158,7 +158,7 @@ func TestRulesDisable(t *testing.T) {
 	})
 
 	t.Run("disable non-existing id does not error", func(t *testing.T) {
-		err := rules.Disable(context.Background(), primitive.NewObjectID())
+		err := rules.Disable(context.Background(), bson.NewObjectID())
 		require.NoError(t, err) // mongo UpdateOne with no match is not an error
 	})
 }
@@ -204,7 +204,7 @@ func TestRulesAll(t *testing.T) {
 
 func TestRuleString(t *testing.T) {
 	rule := Rule{
-		ID:      primitive.NewObjectID(),
+		ID:      bson.NewObjectID(),
 		Domain:  "example.com",
 		Content: ".article",
 		Enabled: true,

extractor/mocks/rules.go

@@ -14,7 +14,7 @@ import (
 	"github.com/PuerkitoBio/goquery"
 	log "github.com/go-pkgz/lgr"
 	"github.com/mauidude/go-readability"
-	"go.mongodb.org/mongo-driver/bson/primitive"
+	"go.mongodb.org/mongo-driver/v2/bson"
 
 	"github.com/ukeeper/ukeeper-readability/datastore"
 )
@@ -24,9 +24,9 @@ import (
 // Rules interface with all methods to access datastore
 type Rules interface {
 	Get(ctx context.Context, rURL string) (datastore.Rule, bool)
-	GetByID(ctx context.Context, id primitive.ObjectID) (datastore.Rule, bool)
+	GetByID(ctx context.Context, id bson.ObjectID) (datastore.Rule, bool)
 	Save(ctx context.Context, rule datastore.Rule) (datastore.Rule, error)
-	Disable(ctx context.Context, id primitive.ObjectID) error
+	Disable(ctx context.Context, id bson.ObjectID) error
 	All(ctx context.Context) []datastore.Rule
 }
 

extractor/readability.go

@@ -13,6 +13,7 @@ require (
 	github.com/mauidude/go-readability v0.0.0-20220221173116-a9b3620098b7
 	github.com/stretchr/testify v1.11.1
 	go.mongodb.org/mongo-driver v1.17.9
+	go.mongodb.org/mongo-driver/v2 v2.5.0
 	golang.org/x/net v0.52.0
 )
 

go.mod

@@ -359,6 +359,8 @@ github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQ
 go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
 go.mongodb.org/mongo-driver v1.17.9 h1:IexDdCuuNJ3BHrELgBlyaH9p60JXAvdzWR128q+U5tU=
 go.mongodb.org/mongo-driver v1.17.9/go.mod h1:LlOhpH5NUEfhxcAwG0UEkMqwYcc4JU18gtCdGudk/tQ=
+go.mongodb.org/mongo-driver/v2 v2.5.0 h1:yXUhImUjjAInNcpTcAlPHiT7bIXhshCTL3jVBkF3xaE=
+go.mongodb.org/mongo-driver/v2 v2.5.0/go.mod h1:yOI9kBsufol30iFsl1slpdq1I0eHPzybRWdyYUs8K/0=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
 go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
 go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64=

go.sum

@@ -16,7 +16,7 @@ import (
 	"github.com/go-pkgz/rest"
 	"github.com/go-pkgz/rest/logger"
 	"github.com/go-pkgz/routegroup"
-	"go.mongodb.org/mongo-driver/bson/primitive"
+	"go.mongodb.org/mongo-driver/v2/bson"
 
 	"github.com/ukeeper/ukeeper-readability/datastore"
 	"github.com/ukeeper/ukeeper-readability/extractor"
@@ -345,10 +345,10 @@ func (s *Server) authFake(w http.ResponseWriter, _ *http.Request) {
 	rest.RenderJSON(w, JSON{"pong": t.Format("20060102150405")})
 }
 
-func getBid(id string) primitive.ObjectID {
-	bid, err := primitive.ObjectIDFromHex(id)
+func getBid(id string) bson.ObjectID {
+	bid, err := bson.ObjectIDFromHex(id)
 	if err != nil {
-		return primitive.NilObjectID
+		return bson.NilObjectID
 	}
 	return bid
 }

rest/server.go

@@ -20,7 +20,7 @@ import (
 	"github.com/go-pkgz/rest"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"go.mongodb.org/mongo-driver/bson/primitive"
+	"go.mongodb.org/mongo-driver/v2/bson"
 
 	"github.com/ukeeper/ukeeper-readability/datastore"
 	"github.com/ukeeper/ukeeper-readability/extractor"
@@ -650,7 +650,7 @@ func newRulesStoreMock() *mocks.RulesMock {
 			}
 			return datastore.Rule{}, false
 		},
-		GetByIDFunc: func(_ context.Context, id primitive.ObjectID) (datastore.Rule, bool) {
+		GetByIDFunc: func(_ context.Context, id bson.ObjectID) (datastore.Rule, bool) {
 			mu.Lock()
 			defer mu.Unlock()
 			for _, r := range rules {
@@ -666,7 +666,7 @@ func newRulesStoreMock() *mocks.RulesMock {
 			// upsert by domain
 			for i, r := range rules {
 				if r.Domain == rule.Domain {
-					if rule.ID != primitive.NilObjectID && rule.ID != r.ID {
+					if rule.ID != bson.NilObjectID && rule.ID != r.ID {
 						return rule, fmt.Errorf("the (immutable) field '_id' was found to have been altered")
 					}
 					rule.ID = r.ID
@@ -675,19 +675,19 @@ func newRulesStoreMock() *mocks.RulesMock {
 				}
 			}
 			// insert new, check for duplicate _id
-			if rule.ID != primitive.NilObjectID {
+			if rule.ID != bson.NilObjectID {
 				for _, r := range rules {
 					if r.ID == rule.ID {
 						return rule, fmt.Errorf("E11000 duplicate key error")
 					}
 				}
 			} else {
-				rule.ID = primitive.NewObjectID()
+				rule.ID = bson.NewObjectID()
 			}
 			rules = append(rules, rule)
 			return rule, nil
 		},
-		DisableFunc: func(_ context.Context, id primitive.ObjectID) error {
+		DisableFunc: func(_ context.Context, id bson.ObjectID) error {
 			mu.Lock()
 			defer mu.Unlock()
 			for i, r := range rules {