Import tools: 4f093ae71cdb4c6a6e9de7cd1dc67ea4405f0013 from branch v3.4r3.4.7-rc0r3.4.7

ref: 29b8883c56..4f093ae71c
for: 3.4.7

TOOLS-1109    failes to build on arm64 (syscall.Dup2 not supported)
TOOLS-1542    dump and export shouldn't count views before running
TOOLS-1563    windows tests are failing after `use mongodb 3.4 "current" tests`
TOOLS-1577    update the readme with information about mongoreplay
TOOLS-1713    Move mongoreplay evergreen config .evergreen.yml into common.yml
TOOLS-1741    mongoimport --uri throws errors when passed Atlas Connection String URI
TOOLS-1743    legacy24 and legacy26 dumprestore tests failing on master

4 files changed, 101 insertions, 27 deletions

diff --git a/src/mongo/gotools/common/db/namespaces.go b/src/mongo/gotools/common/db/namespaces.go
index 908687b1c56..8530b16aa5e 100644
--- a/src/mongo/gotools/common/db/namespaces.go
+++ b/src/mongo/gotools/common/db/namespaces.go
@@ -2,13 +2,23 @@ package db
 
 import (
 	"fmt"
-	"github.com/mongodb/mongo-tools/common/bsonutil"
+	"strings"
+
 	"github.com/mongodb/mongo-tools/common/log"
 	"gopkg.in/mgo.v2"
 	"gopkg.in/mgo.v2/bson"
-	"strings"
 )
 
+type CollectionInfo struct {
+	Name    string  `bson:"name"`
+	Type    string  `bson:"type"`
+	Options *bson.D `bson:"options"`
+}
+
+func (ci *CollectionInfo) IsView() bool {
+	return ci.Type == "view"
+}
+
 // IsNoCmd reeturns true if err indicates a query command is not supported,
 // otherwise, returns false.
 func IsNoCmd(err error) bool {
@@ -124,7 +134,7 @@ func getCollectionsPre28(database *mgo.Database, name string) (*mgo.Iter, error)
 	return iter, nil
 }
 
-func GetCollectionOptions(coll *mgo.Collection) (*bson.D, error) {
+func GetCollectionInfo(coll *mgo.Collection) (*CollectionInfo, error) {
 	iter, useFullName, err := GetCollections(coll.Database, coll.Name)
 	if err != nil {
 		return nil, err
@@ -134,33 +144,32 @@ func GetCollectionOptions(coll *mgo.Collection) (*bson.D, error) {
 	if useFullName {
 		comparisonName = coll.FullName
 	}
-	collInfo := &bson.D{}
+
+	collInfo := &CollectionInfo{}
 	for iter.Next(collInfo) {
-		name, err := bsonutil.FindValueByKey("name", collInfo)
-		if err != nil {
-			collInfo = nil
-			continue
-		}
-		if nameStr, ok := name.(string); ok {
-			if nameStr == comparisonName {
-				// we've found the collection we're looking for
-				break
+		if collInfo.Name == comparisonName {
+			if useFullName {
+				collName, err := StripDBFromNamespace(collInfo.Name, coll.Database.Name)
+				if err != nil {
+					return nil, err
+				}
+				collInfo.Name = collName
 			}
-		} else {
-			collInfo = nil
-			continue
+			break
 		}
 	}
+	if err := iter.Err(); err != nil {
+		return nil, err
+	}
+	return collInfo, nil
+}
 
-	if collInfo != nil {
-		optsInterface, _ := bsonutil.FindValueByKey("options", collInfo)
-		if optsInterface != nil {
-			optsD, ok := optsInterface.(bson.D)
-			if !ok {
-				return nil, fmt.Errorf("Cannot unmarshal collection options for collection %v.%v", coll.Database, coll.Name)
-			}
-			return &optsD, nil
-		}
+func StripDBFromNamespace(namespace string, dbName string) (string, error) {
+	namespacePrefix := dbName + "."
+	// if the collection info came from querying system.indexes (2.6 or earlier) then the
+	// "name" we get includes the db name as well, so we must remove it
+	if strings.HasPrefix(namespace, namespacePrefix) {
+		return namespace[len(namespacePrefix):], nil
 	}
-	return nil, iter.Err()
+	return "", fmt.Errorf("namespace '%v' format is invalid - expected to start with '%v'", namespace, namespacePrefix)
 }
diff --git a/src/mongo/gotools/common/db/namespaces_test.go b/src/mongo/gotools/common/db/namespaces_test.go
new file mode 100644
index 00000000000..0e390a2f43c
--- /dev/null
+++ b/src/mongo/gotools/common/db/namespaces_test.go
@@ -0,0 +1,52 @@
+package db
+
+import (
+	"fmt"
+	"testing"
+
+	. "github.com/smartystreets/goconvey/convey"
+)
+
+type stripDBFromNamespaceTestCase struct {
+	inputNamespace string
+	inputDBName    string
+
+	outputNamespace string
+	outputError     error
+}
+
+func TestStripDBFromNamespace(t *testing.T) {
+	Convey("When testing StripDBFromNamespace with cases", t, func() {
+		testCases := []stripDBFromNamespaceTestCase{
+			{
+				inputNamespace: "database.col",
+				inputDBName:    "database",
+
+				outputNamespace: "col",
+				outputError:     nil,
+			},
+			{
+				inputNamespace: "database2.col",
+				inputDBName:    "database",
+
+				outputNamespace: "",
+				outputError:     fmt.Errorf("namespace 'database2.col' format is invalid - expected to start with 'database.'"),
+			},
+			{
+				inputNamespace: "database.col",
+				inputDBName:    "notAPrefix",
+
+				outputNamespace: "",
+				outputError:     fmt.Errorf("namespace 'database.col' format is invalid - expected to start with 'notAPrefix.'"),
+			},
+		}
+		Convey("cases should match expected", func() {
+			for _, tc := range testCases {
+				resultNamespace, resultError := StripDBFromNamespace(tc.inputNamespace, tc.inputDBName)
+				So(resultError, ShouldResemble, tc.outputError)
+				So(resultNamespace, ShouldEqual, tc.outputNamespace)
+			}
+		})
+	})
+
+}
diff --git a/src/mongo/gotools/common/db/write_concern.go b/src/mongo/gotools/common/db/write_concern.go
index cf7a8e98d56..8759fb59ad1 100644
--- a/src/mongo/gotools/common/db/write_concern.go
+++ b/src/mongo/gotools/common/db/write_concern.go
@@ -127,11 +127,17 @@ func BuildWriteConcern(writeConcern string, nodeType NodeType, cs *connstring.Co
 	}
 
 	if cs != nil {
+		if cs.W == "" {
+			cs.W = "majority"
+		}
 		sessionSafety, err = constructSafetyFromConnString(cs)
 		if err != nil {
 			return nil, err
 		}
-	} else if writeConcern != "" {
+	} else {
+		if writeConcern == "" {
+			writeConcern = "majority"
+		}
 		sessionSafety, err = constructWCObject(writeConcern)
 		if err != nil {
 			return nil, err
diff --git a/src/mongo/gotools/common/db/write_concern_test.go b/src/mongo/gotools/common/db/write_concern_test.go
index bdc6ef69018..31a5baf1bfb 100644
--- a/src/mongo/gotools/common/db/write_concern_test.go
+++ b/src/mongo/gotools/common/db/write_concern_test.go
@@ -54,6 +54,13 @@ func TestBuildWriteConcern(t *testing.T) {
 				So(err, ShouldBeNil)
 				So(writeConcern.J, ShouldBeTrue)
 			})
+			// Regression test for TOOLS-1741
+			Convey("When passing an empty writeConcern and empty URI"+
+				"then write concern should default to being majority", func() {
+				writeConcern, err := BuildWriteConcern("", ReplSet, nil)
+				So(err, ShouldBeNil)
+				So(writeConcern.WMode, ShouldEqual, "majority")
+			})
 		})
 		Convey("and given a connection string", func() {
 			Convey("with a w value of 0, without j set, a nil write concern should be returned", func() {