TOOLS-2287: URI parser incorrectly prints unsupported parameter warn…

…ings (#261)

Compatibility with breaking change in mongo-tools-common/#40 - revendor MTC and remove calls to URI.AddKnownURIParameters

Gopkg.toml

@@ -29,7 +29,7 @@ required = ["github.com/3rf/mongo-lint"]
 
 [[constraint]]
   name = "github.com/mongodb/mongo-tools-common"
-  version = "v3.0.9"
+  version = "v3.0.13"
 
 [[constraint]]
   name = "github.com/nsf/termbox-go"

mongodump/mongodump_test.go

@@ -59,7 +59,6 @@ func simpleMongoDumpInstance() *MongoDump {
 	if uri := os.Getenv("MONGOD"); uri != "" {
 		fakeArgs := []string{"--uri=" + uri}
 		toolOptions = options.New("mongodump", "", "", "", true, options.EnabledOptions{URI: true})
-		toolOptions.URI.AddKnownURIParameters(options.KnownURIOptionsReadPreference)
 		_, err := toolOptions.ParseArgs(fakeArgs)
 		if err != nil {
 			panic("Could not parse MONGOD environment variable")

mongodump/options.go

@@ -84,7 +84,6 @@ func ParseOptions(rawArgs []string, versionStr, gitCommit string) (Options, erro
 	opts.AddOptions(inputOpts)
 	outputOpts := &OutputOptions{}
 	opts.AddOptions(outputOpts)
-	opts.URI.AddKnownURIParameters(options.KnownURIOptionsReadPreference)
 
 	extraArgs, err := opts.ParseArgs(rawArgs)
 	if err != nil {

mongoexport/mongoexport_test.go

@@ -38,7 +38,6 @@ func simpleMongoExportOpts() Options {
 	if uri := os.Getenv("MONGOD"); uri != "" {
 		fakeArgs := []string{"--uri=" + uri}
 		toolOptions = options.New("mongoexport", "", "", "", true, options.EnabledOptions{URI: true})
-		toolOptions.URI.AddKnownURIParameters(options.KnownURIOptionsReadPreference)
 		_, err := toolOptions.ParseArgs(fakeArgs)
 		if err != nil {
 			panic("Could not parse MONGOD environment variable")

mongoexport/options.go

@@ -110,7 +110,6 @@ func ParseOptions(rawArgs []string, versionStr, gitCommit string) (Options, erro
 	opts.AddOptions(outputOpts)
 	inputOpts := &InputOptions{}
 	opts.AddOptions(inputOpts)
-	opts.AddKnownURIParameters(options.KnownURIOptionsReadPreference)
 
 	extraArgs, err := opts.ParseArgs(rawArgs)
 	if err != nil {

mongofiles/options.go

@@ -43,8 +43,6 @@ func ParseOptions(rawArgs []string, versionStr, gitCommit string) (Options, erro
 
 	opts.AddOptions(storageOpts)
 	opts.AddOptions(inputOpts)
-	opts.URI.AddKnownURIParameters(options.KnownURIOptionsReadPreference)
-	opts.URI.AddKnownURIParameters(options.KnownURIOptionsWriteConcern)
 
 	extraArgs, err := opts.ParseArgs(rawArgs)
 	if err != nil {

mongoimport/options.go

@@ -125,7 +125,6 @@ func ParseOptions(rawArgs []string, versionStr, gitCommit string) (Options, erro
 	ingestOpts := &IngestOptions{}
 	opts.AddOptions(inputOpts)
 	opts.AddOptions(ingestOpts)
-	opts.URI.AddKnownURIParameters(options.KnownURIOptionsWriteConcern)
 
 	extraArgs, err := opts.ParseArgs(rawArgs)
 	if err != nil {

mongorestore/mongorestore_test.go

@@ -81,7 +81,7 @@ func TestDeprecatedDBAndCollectionOptions(t *testing.T) {
 		log.SetWriter(&buffer)
 		defer log.SetWriter(os.Stderr)
 
-		Convey("and no warning is issued in the well-defined case", t, func() {
+		Convey("and no warning is issued in the well-defined case", func() {
 			// No error and nothing written in the log
 			args := []string{
 				"testdata/hashedIndexes.bson",
@@ -100,7 +100,7 @@ func TestDeprecatedDBAndCollectionOptions(t *testing.T) {
 			So(buffer.String(), ShouldBeEmpty)
 		})
 
-		Convey("and a warning is issued in the deprecated case", t, func() {
+		Convey("and a warning is issued in the deprecated case", func() {
 			// No error and some kind of warning message in the log
 			args := []string{
 				DBOption, "db1",

mongorestore/options.go

@@ -156,8 +156,6 @@ func ParseOptions(rawArgs []string, versionStr, gitCommit string) (Options, erro
 	outputOpts := &OutputOptions{}
 	opts.AddOptions(outputOpts)
 
-	opts.URI.AddKnownURIParameters(options.KnownURIOptionsWriteConcern)
-
 	extraArgs, err := opts.ParseArgs(rawArgs)
 	if err != nil {
 		return Options{}, err