Merge branch 'master' of https://github.com/mongodb/mongo-go-driver

Author: Hixon10

.errcheck-excludes

@@ -2,3 +2,6 @@
 (github.com/mongodb/mongo-go-driver/core/connection.Connection).Close
 (*github.com/mongodb/mongo-go-driver/core/topology.Subscription).Unsubscribe
 (*github.com/mongodb/mongo-go-driver/core/topology.Server).Close
+(*github.com/mongodb/mongo-go-driver/core/connection.pool).closeConnection
+(net.Conn).Close
+encoding/pem.Encode

.evergreen/config.yml

@@ -10,7 +10,7 @@ stepback: true
 # Mark a failure as a system/bootstrap failure (purple box) rather then a task
 # failure by default.
 # Actual testing tasks are marked with `type: test`
-command_type: system
+command_type: setup
 
 # Protect ourself against rogue test case, or curl gone wild, that runs forever
 # 12 minutes is the longest we'll ever run
@@ -27,10 +27,9 @@ functions:
   fetch-source:
     # Executes git clone and applies the submitted patch, if any
     - command: git.get_project
+      type: system
       params:
         directory: src/github.com/mongodb/mongo-go-driver
-    # Deprecated. Should be removed. But still needed for certain agents (ZAP)
-    - command: git.apply_patch
     # Make an evergreen expansion file with dynamic values
     - command: shell.exec
       params:
@@ -61,18 +60,14 @@ functions:
            export MONGO_ORCHESTRATION_HOME="$DRIVERS_TOOLS/.evergreen/orchestration"
            export MONGODB_BINARIES="$DRIVERS_TOOLS/mongodb/bin"
            export UPLOAD_BUCKET="${project}"
-           export PATH="${GCC_PATH}:$GOPATH/bin:$MONGODB_BINARIES:$PATH"
+           export PATH="${GO_DIST}/bin:${GCC_PATH}:$GOPATH/bin:$MONGODB_BINARIES:$PATH"
            export PROJECT="${project}"
 
            if [ "Windows_NT" = "$OS" ]; then
               export USERPROFILE=$(cygpath -w $(dirname $(dirname $(dirname $(dirname `pwd`)))))
               export HOME=$(cygpath -w $(dirname $(dirname $(dirname $(dirname `pwd`)))))
            fi
 
-           go get -u github.com/andrewkroh/gvm
-           eval "$(gvm -f bash 1.9.5)"
-           gvm -f bash 1.9.5
-
            go version
            go env
 
@@ -87,7 +82,7 @@ functions:
               set -o errexit
               set -o xtrace
               export GOPATH="$GOPATH"
-              export GOROOT="$GOROOT"
+              export GOROOT="${GO_DIST}"
               export DRIVERS_TOOLS="$DRIVERS_TOOLS"
               export MONGO_ORCHESTRATION_HOME="$MONGO_ORCHESTRATION_HOME"
               export MONGODB_BINARIES="$MONGODB_BINARIES"
@@ -543,26 +538,29 @@ axes:
       - id: "windows-64"
         display_name: "Windows 64-bit"
         run_on:
-          - windows-64-vs2015-compile
           - windows-64-vs2015-test
-          - windows-64-vs2015-large
         variables:
           GCC_PATH: "/cygdrive/c/mingw-w64/x86_64-4.9.1-posix-seh-rt_v3-rev1/mingw64/bin"
-      - id: "ubuntu1404-64"
-        display_name: "Ubuntu 14.04"
-        run_on: ubuntu1404-build
+          GO_DIST: "C:\\golang\\go1.9.5"
+      - id: "ubuntu1604-64"
+        display_name: "Ubuntu 16.04"
+        run_on: ubuntu1604-build
+        variables:
+          GO_DIST: "/opt/golang/go1.9"
       - id: osx
         display_name: "MacOS 10.12"
         run_on: macos-1012
+        variables:
+          GO_DIST: "/opt/golang/go1.9"
 
 
 buildvariants:
 - name: static-analysis
   display_name: "Static Analysis"
   run_on:
-    # we don't care where this one runs
-    - macos-1012
-    - ubuntu1404-build
+    - ubuntu1604-build
+  expansions: 
+    GO_DIST: "/opt/golang/go1.9"
   tasks:
     - name: ".static-analysis"
 

Makefile

@@ -39,7 +39,7 @@ lint-add-whitelist:
 
 .PHONY: errcheck
 errcheck:
-	errcheck -exclude .errcheck-excludes ./bson/... ./mongo/...
+	errcheck -exclude .errcheck-excludes ./bson/... ./mongo/... ./core/...
 
 .PHONY: test
 test:

bson/decode.go

@@ -702,6 +702,9 @@ func (d *Decoder) decodeBSONArrayToSlice(sliceType reflect.Type) (reflect.Value,
 			break
 		}
 
+		if sliceType.Elem().Kind() == reflect.Ptr {
+			elem = elem.Addr()
+		}
 		out.Index(i).Set(elem)
 	}
 
@@ -787,11 +790,12 @@ func matchesField(key string, field string, sType reflect.Type) bool {
 
 	tag, ok := sField.Tag.Lookup("bson")
 	if !ok {
+		// Get the full tag string
+		tag = string(sField.Tag)
+
 		if len(sField.Tag) == 0 || strings.ContainsRune(tag, ':') {
 			return strings.ToLower(key) == strings.ToLower(field)
 		}
-
-		tag = string(sField.Tag)
 	}
 
 	var fieldKey string

core/command/aggregate.go

@@ -49,9 +49,15 @@ func (a *Aggregate) Encode(desc description.SelectedServer) (wiremessage.WireMes
 			if t == 0 && a.HasDollarOut() {
 				continue
 			}
-			option.Option(cursor)
+			err := option.Option(cursor)
+			if err != nil {
+				return nil, err
+			}
 		default:
-			option.Option(command)
+			err := option.Option(command)
+			if err != nil {
+				return nil, err
+			}
 		}
 	}
 

core/command/count.go

@@ -41,7 +41,10 @@ func (c *Count) Encode(desc description.SelectedServer) (wiremessage.WireMessage
 		if option == nil {
 			continue
 		}
-		option.Option(command)
+		err := option.Option(command)
+		if err != nil {
+			return nil, err
+		}
 	}
 
 	return (&Command{DB: c.NS.DB, ReadPref: c.ReadPref, Command: command}).Encode(desc)

core/command/delete.go

@@ -48,10 +48,16 @@ func (d *Delete) Encode(desc description.SelectedServer) (wiremessage.WireMessag
 		case nil:
 		case options.OptCollation:
 			for _, doc := range d.Deletes {
-				option.Option(doc)
+				err := option.Option(doc)
+				if err != nil {
+					return nil, err
+				}
 			}
 		default:
-			option.Option(command)
+			err := option.Option(command)
+			if err != nil {
+				return nil, err
+			}
 		}
 	}
 

core/command/distinct.go

@@ -48,7 +48,10 @@ func (d *Distinct) Encode(desc description.SelectedServer) (wiremessage.WireMess
 		if option == nil {
 			continue
 		}
-		option.Option(command)
+		err := option.Option(command)
+		if err != nil {
+			return nil, err
+		}
 	}
 
 	return (&Command{DB: d.NS.DB, ReadPref: d.ReadPref, Command: command}).Encode(desc)

core/command/drop_collection.go

@@ -0,0 +1,70 @@
+// Copyright (C) MongoDB, Inc. 2017-present.
+//
+// Licensed under the Apache License, Version 2.0 (the "License"); you may
+// not use this file except in compliance with the License. You may obtain
+// a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+
+package command
+
+import (
+	"context"
+
+	"github.com/mongodb/mongo-go-driver/bson"
+	"github.com/mongodb/mongo-go-driver/core/description"
+	"github.com/mongodb/mongo-go-driver/core/wiremessage"
+)
+
+// DropCollection represents the drop command.
+//
+// The dropCollections command drops collection for a database.
+type DropCollection struct {
+	DB         string
+	Collection string
+	result     bson.Reader
+	err        error
+}
+
+// Encode will encode this command into a wire message for the given server description.
+func (di *DropCollection) Encode(desc description.SelectedServer) (wiremessage.WireMessage, error) {
+	cmd := bson.NewDocument(
+		bson.EC.String("drop", di.Collection),
+	)
+
+	return (&Command{DB: di.DB, Command: cmd, isWrite: true}).Encode(desc)
+}
+
+// Decode will decode the wire message using the provided server description. Errors during decoding
+// are deferred until either the Result or Err methods are called.
+func (di *DropCollection) Decode(desc description.SelectedServer, wm wiremessage.WireMessage) *DropCollection {
+	di.result, di.err = (&Command{}).Decode(desc, wm).Result()
+	return di
+}
+
+// Result returns the result of a decoded wire message and server description.
+func (di *DropCollection) Result() (bson.Reader, error) {
+	if di.err != nil {
+		return nil, di.err
+	}
+	return di.result, nil
+}
+
+// Err returns the error set on this command.
+func (di *DropCollection) Err() error { return di.err }
+
+// RoundTrip handles the execution of this command using the provided wiremessage.ReadWriter.
+func (di *DropCollection) RoundTrip(ctx context.Context, desc description.SelectedServer, rw wiremessage.ReadWriter) (bson.Reader, error) {
+	wm, err := di.Encode(desc)
+	if err != nil {
+		return nil, err
+	}
+
+	err = rw.WriteWireMessage(ctx, wm)
+	if err != nil {
+		return nil, err
+	}
+	wm, err = rw.ReadWireMessage(ctx)
+	if err != nil {
+		return nil, err
+	}
+	return di.Decode(desc, wm).Result()
+}

core/command/find.go

@@ -43,21 +43,25 @@ func (f *Find) Encode(desc description.SelectedServer) (wiremessage.WireMessage,
 
 	var limit int64
 	var batchSize int32
+	var err error
 
 	for _, option := range f.Opts {
 		switch t := option.(type) {
 		case nil:
 			continue
 		case options.OptLimit:
 			limit = int64(t)
-			option.Option(command)
+			err = option.Option(command)
 		case options.OptBatchSize:
 			batchSize = int32(t)
-			option.Option(command)
+			err = option.Option(command)
 		case options.OptProjection:
-			t.IsFind().Option(command)
+			err = t.IsFind().Option(command)
 		default:
-			option.Option(command)
+			err = option.Option(command)
+		}
+		if err != nil {
+			return nil, err
 		}
 	}