Handle error from json.Unmarshal, fix test and docs

hashicorp · Dec 4, 2017 · 24f37a2 · 24f37a2
1 parent 8807a27
commit 24f37a2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/plugins/database/mongodb/connection_producer.go b/plugins/database/mongodb/connection_producer.go
@@ -93,7 +93,10 @@ func (c *mongoDBConnectionProducer) Connection() (interface{}, error) {
 		}
 
 		var concern writeConcern
-		json.Unmarshal([]byte(input), &concern)
+		err = json.Unmarshal([]byte(input), &concern)
+		if err != nil {
+			return nil, err
+		}
 
 		c.session.SetSafe(&mgo.Safe{
 			W:        concern.W,

diff --git a/plugins/database/mongodb/mongodb_test.go b/plugins/database/mongodb/mongodb_test.go
@@ -16,7 +16,7 @@ import (
 
 const testMongoDBRole = `{ "db": "admin", "roles": [ { "role": "readWrite" } ] }`
 
-const testMongoDBWriteConcern = `{ "w": "majority", "wtimeout": 5000 }`
+const testMongoDBWriteConcern = `{ "wmode": "majority", "wtimeout": 5000 }`
 
 func prepareMongoDBTestContainer(t *testing.T) (cleanup func(), retURL string) {
 	if os.Getenv("MONGODB_URL") != "" {

diff --git a/website/source/api/secret/databases/mongodb.html.md b/website/source/api/secret/databases/mongodb.html.md
@@ -39,7 +39,7 @@ has a number of parameters to further configure a connection.
   "plugin_name": "mongodb-database-plugin",
   "allowed_roles": "readonly",
   "connection_url": "mongodb://admin:[email protected]:27017/admin?ssl=true",
-  "write_concern": "{ \"w\": \"majority\", \"wtimeout\": 5000 }"
+  "write_concern": "{ \"wmode\": \"majority\", \"wtimeout\": 5000 }"
 }
 ```