deps Nov 2023 (#894)

Author: defbin

cli/delete.go

@@ -304,11 +304,11 @@ func printCleanupInfoTo(w io.Writer, backups []pbm.BackupMeta, chunks []pbm.Oplo
 		}
 
 		lastWrite := &rs[len(rs)-1].End
-		if primitive.CompareTimestamp(*lastWrite, c.StartTS) == -1 {
+		if lastWrite.Compare(c.StartTS) == -1 {
 			oplogRanges[c.RS] = append(rs, oplogRange{c.StartTS, c.EndTS})
 			continue
 		}
-		if primitive.CompareTimestamp(*lastWrite, c.EndTS) == -1 {
+		if lastWrite.Compare(c.EndTS) == -1 {
 			*lastWrite = c.EndTS
 		}
 	}

cli/status.go

@@ -312,11 +312,7 @@ func connect(ctx context.Context, uri, hosts string) (*mongo.Client, error) {
 	curi.RawQuery = query.Encode()
 	curi.Host = host
 
-	conn, err := mongo.NewClient(options.Client().ApplyURI(curi.String()).SetAppName("pbm-status"))
-	if err != nil {
-		return nil, errors.Wrap(err, "create mongo client")
-	}
-	err = conn.Connect(ctx)
+	conn, err := mongo.Connect(ctx, options.Client().ApplyURI(curi.String()).SetAppName("pbm-status"))
 	if err != nil {
 		return nil, errors.Wrap(err, "connect")
 	}
@@ -724,7 +720,7 @@ func getPITRranges(cn *pbm.PBM, bcps []pbm.BackupMeta, rsMap map[string]string)
 	}
 
 	sort.Slice(bcps, func(i, j int) bool {
-		return primitive.CompareTimestamp(bcps[i].LastWriteTS, bcps[j].LastWriteTS) == -1
+		return bcps[i].LastWriteTS.Compare(bcps[j].LastWriteTS) == -1
 	})
 
 	var pr []pitrRange

e2e-tests/cmd/ensure-oplog/main.go

@@ -358,23 +358,23 @@ func findChunkRanges(rs []pbm.OplogChunk, from, till primitive.Timestamp) []time
 	rv := []timerange{}
 
 	c := rs[0]
-	if primitive.CompareTimestamp(from, c.StartTS) == -1 {
+	if from.Compare(c.StartTS) == -1 {
 		rv = append(rv, timerange{from, c.StartTS})
 	}
 
 	endTS := c.EndTS
 	for _, c = range rs[1:] {
-		if primitive.CompareTimestamp(endTS, c.StartTS) == -1 {
+		if endTS.Compare(c.StartTS) == -1 {
 			rv = append(rv, timerange{endTS, c.StartTS})
 		}
-		if primitive.CompareTimestamp(till, c.EndTS) != 1 {
+		if till.Compare(c.EndTS) != 1 {
 			return rv
 		}
 
 		endTS = c.EndTS
 	}
 
-	if primitive.CompareTimestamp(endTS, till) == -1 {
+	if endTS.Compare(till) == -1 {
 		rv = append(rv, timerange{endTS, till})
 	}
 

e2e-tests/pkg/pbm/clock_skew.go

@@ -15,7 +15,7 @@ import (
 func ClockSkew(rsName, ts, dockerHost string) error {
 	log.Printf("== Skew the clock for %s on the replicaset %s ", ts, rsName)
 
-	cn, err := docker.NewClient(dockerHost, "1.39", nil, nil)
+	cn, err := docker.NewClientWithOpts(docker.WithHost(dockerHost))
 	if err != nil {
 		return errors.Wrap(err, "docker client")
 	}

e2e-tests/pkg/pbm/docker.go

@@ -21,7 +21,7 @@ type Docker struct {
 }
 
 func NewDocker(ctx context.Context, host string) (*Docker, error) {
-	cn, err := docker.NewClient(host, "1.39", nil, nil)
+	cn, err := docker.NewClientWithOpts(docker.WithHost(host))
 	if err != nil {
 		return nil, errors.Wrap(err, "docker client")
 	}

e2e-tests/pkg/pbm/mongod.go

@@ -36,17 +36,13 @@ func NewMongo(ctx context.Context, connectionURI string) (*Mongo, error) {
 }
 
 func connect(ctx context.Context, uri, appName string) (*mongo.Client, error) {
-	client, err := mongo.NewClient(
+	client, err := mongo.Connect(ctx,
 		options.Client().ApplyURI(uri).
 			SetAppName(appName).
 			SetReadPreference(readpref.Primary()).
 			SetReadConcern(readconcern.Majority()).
-			SetWriteConcern(writeconcern.New(writeconcern.WMajority())),
+			SetWriteConcern(writeconcern.Majority()),
 	)
-	if err != nil {
-		return nil, errors.Wrap(err, "create mongo client")
-	}
-	err = client.Connect(ctx)
 	if err != nil {
 		return nil, errors.Wrap(err, "mongo connect")
 	}

e2e-tests/pkg/pbm/pbm_ctl.go

@@ -27,7 +27,7 @@ type Ctl struct {
 var backupNameRE = regexp.MustCompile(`Starting backup '([0-9\-\:TZ]+)'`)
 
 func NewCtl(ctx context.Context, host, pbmContainer string) (*Ctl, error) {
-	cn, err := docker.NewClient(host, "1.39", nil, nil)
+	cn, err := docker.NewClientWithOpts(docker.WithHost(host))
 	if err != nil {
 		return nil, errors.Wrap(err, "docker client")
 	}

e2e-tests/pkg/tests/sharded/test_bounds_check.go

@@ -19,11 +19,11 @@ type scounter struct {
 }
 
 func lte(t1, t2 primitive.Timestamp) bool {
-	return primitive.CompareTimestamp(t1, t2) <= 0
+	return t1.Compare(t2) <= 0
 }
 
 func lt(t1, t2 primitive.Timestamp) bool {
-	return primitive.CompareTimestamp(t1, t2) < 0
+	return t1.Compare(t2) < 0
 }
 
 func (c *Cluster) BackupBoundsCheck(typ pbm.BackupType, mongoVersion string) {

e2e-tests/pkg/tests/sharded/test_oplog_replay.go

@@ -89,7 +89,7 @@ func getLastWrittenCounter(counters map[string]shardCounter) tpbm.Counter {
 		log.Printf("\tshard %s: %d [%v] | %v",
 			name, cc.WriteTime.T, time.Unix(int64(cc.WriteTime.T), 0), cc)
 
-		if primitive.CompareTimestamp(rv.WriteTime, cc.WriteTime) == -1 {
+		if rv.WriteTime.Compare(cc.WriteTime) == -1 {
 			rv = cc
 		}
 	}

e2e-tests/pkg/tests/sharded/trx.go

@@ -79,7 +79,7 @@ func (c *Cluster) DistributedTransactions(bcp Backuper, col string) {
 			SetDefaultReadPreference(readpref.Primary()).
 			SetCausalConsistency(true).
 			SetDefaultReadConcern(readconcern.Majority()).
-			SetDefaultWriteConcern(writeconcern.New(writeconcern.WMajority())),
+			SetDefaultWriteConcern(writeconcern.Majority()),
 	)
 	if err != nil {
 		log.Fatalln("ERROR: start session:", err)
@@ -205,7 +205,7 @@ func (c *Cluster) printBalancerStatus(ctx context.Context) {
 		bson.D{{"balancerStatus", 1}},
 	)
 
-	state, err := br.DecodeBytes()
+	state, err := br.Raw()
 	if err != nil {
 		log.Fatalln("ERROR: balancerStatus:", err)
 	}