Merge pull request #8889 from hashicorp/jbardin/copystructure

Update copystructure

vendor/github.com/mitchellh/copystructure/copystructure.go

@@ -1,6 +1,7 @@
 package copystructure
 
 import (
+	"errors"
 	"reflect"
 	"sync"
 
@@ -27,6 +28,8 @@ type CopierFunc func(interface{}) (interface{}, error)
 // this map as well as to Copy in a mutex.
 var Copiers map[reflect.Type]CopierFunc = make(map[reflect.Type]CopierFunc)
 
+var errPointerRequired = errors.New("Copy argument must be a pointer when Lock is true")
+
 type Config struct {
 	// Lock any types that are a sync.Locker and are not a mutex while copying.
 	// If there is an RLocker method, use that to get the sync.Locker.
@@ -38,6 +41,10 @@ type Config struct {
 }
 
 func (c Config) Copy(v interface{}) (interface{}, error) {
+	if c.Lock && reflect.ValueOf(v).Kind() != reflect.Ptr {
+		return nil, errPointerRequired
+	}
+
 	w := new(walker)
 	if c.Lock {
 		w.useLocks = true
@@ -350,19 +357,20 @@ func (w *walker) lock(v reflect.Value) {
 
 	var locker sync.Locker
 
-	// first check if we can get a locker from the value
+	// We can't call Interface() on a value directly, since that requires
-	switch l := v.Interface().(type) {
+	// a copy. This is OK, since the pointer to a value which is a sync.Locker
-	case rlocker:
+	// is also a sync.Locker.
-		// don't lock a mutex directly
+	if v.Kind() == reflect.Ptr {
-		if _, ok := l.(*sync.RWMutex); !ok {
+		switch l := v.Interface().(type) {
-			locker = l.RLocker()
+		case rlocker:
+			// don't lock a mutex directly
+			if _, ok := l.(*sync.RWMutex); !ok {
+				locker = l.RLocker()
+			}
+		case sync.Locker:
+			locker = l
 		}
-	case sync.Locker:
+	} else if v.CanAddr() {
-		locker = l
-	}
-
-	// the value itself isn't a locker, so check the method on a pointer too
-	if locker == nil && v.CanAddr() {
 		switch l := v.Addr().Interface().(type) {
 		case rlocker:
 			// don't lock a mutex directly

vendor/vendor.json

@@ -1484,10 +1484,10 @@
 			"revision": "8631ce90f28644f54aeedcb3e389a85174e067d1"
 		},
 		{
-			"checksumSHA1": "y2HsVMt3eYGqywv5ljijnywJMb4=",
+			"checksumSHA1": "Vfkp+PcZ1wZ4+D6AsHTpKkdsQG0=",
 			"path": "github.com/mitchellh/copystructure",
-			"revision": "6871c41ca9148d368715dedcda473f396f205df5",
+			"revision": "501dcbdc7c358c4d0bfa066018834bedca79fde3",
-			"revisionTime": "2016-08-25T20:45:07Z"
+			"revisionTime": "2016-09-16T19:51:24Z"
 		},
 		{
 			"path": "github.com/mitchellh/go-homedir",