simplify test struct and set proper default for oplog replay

Author: radoslawszulgo

cmd/pbm-agent/oplog.go

@@ -77,7 +77,7 @@ func (a *Agent) OplogReplay(ctx context.Context, r *ctrl.ReplayCmd, opID ctrl.OP
 	}
 
 	l.Info("oplog replay started")
-	rr := restore.New(a.leadConn, a.nodeConn, a.brief, cfg, r.RSMap, 0, 0)
+	rr := restore.New(a.leadConn, a.nodeConn, a.brief, cfg, r.RSMap, 0, 1)
 	err = rr.ReplayOplog(ctx, r, opID, l)
 	if err != nil {
 		if errors.Is(err, restore.ErrNoDataForShard) {

cmd/pbm/restore_test.go

@@ -103,48 +103,38 @@ func TestCloningValidation(t *testing.T) {
 	}
 }
 
-func Test_parseCLINumInsertionWorkersOption(t *testing.T) {
-
-	type args struct {
-		value int32
-	}
+func TestParseCLINumInsertionWorkersOption(t *testing.T) {
 
 	var num int32 = 1
 
 	tests := []struct {
 		name    string
-		args    args
+		value   int32
 		want    *int32
 		wantErr bool
 	}{
 		{
-			name: "valid number - no error",
-			args: args{
-				value: 1,
-			},
+			name:    "valid number - no error",
+			value:   1,
 			want:    &num,
 			wantErr: false,
 		},
 		{
-			name: "zero  - no error, but return nil",
-			args: args{
-				value: 0,
-			},
+			name:    "zero  - no error, but return nil",
+			value:   0,
 			want:    nil,
 			wantErr: false,
 		},
 		{
-			name: "negative value  - error",
-			args: args{
-				value: -1,
-			},
+			name:    "negative value  - error",
+			value:   -1,
 			want:    nil,
 			wantErr: true,
 		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			got, err := parseCLINumInsertionWorkersOption(tt.args.value)
+			got, err := parseCLINumInsertionWorkersOption(tt.value)
 			if (err != nil) != tt.wantErr {
 				t.Errorf("parseCLINumInsertionWorkersOption() error = %v, wantErr %v", err, tt.wantErr)
 				return

pbm/topo/cluster.go

@@ -2,8 +2,6 @@ package topo
 
 import (
 	"context"
-	"encoding/json"
-	"fmt"
 	"strings"
 
 	"go.mongodb.org/mongo-driver/bson"
@@ -60,13 +58,7 @@ func GetClusterTime(ctx context.Context, m connect.Client) (primitive.Timestamp,
 
 func ClusterTimeFromNodeInfo(info *NodeInfo) (primitive.Timestamp, error) {
 	if info.ClusterTime == nil {
-		jsonResponse, err := json.Marshal(info)
-		errDetails := string(jsonResponse)
-		if err != nil {
-			fmt.Println(err)
-			errDetails = "Unable to parse response."
-		}
-		return primitive.Timestamp{}, errors.Errorf("No clusterTime in response. Received: %s", errDetails)
+		return primitive.Timestamp{}, errors.Errorf("No clusterTime in response. Received: %+v", info)
 	}
 
 	return info.ClusterTime.ClusterTime, nil