More dep bumps

Godeps/Godeps.json

@@ -74,33 +74,33 @@
 		},
 		{
 			"ImportPath": "github.com/coreos/etcd/Godeps/_workspace/src/github.com/ugorji/go/codec",
-			"Comment": "v2.3.0-alpha.1-12-ge6d6b64",
-			"Rev": "e6d6b648c4b17a5dbe0787786d8ac62063d1b630"
+			"Comment": "v2.3.0-alpha.1-20-gc9d233d",
+			"Rev": "c9d233d69ac0f21580910ba232494a6a5c02a373"
 		},
 		{
 			"ImportPath": "github.com/coreos/etcd/Godeps/_workspace/src/golang.org/x/net/context",
-			"Comment": "v2.3.0-alpha.1-12-ge6d6b64",
-			"Rev": "e6d6b648c4b17a5dbe0787786d8ac62063d1b630"
+			"Comment": "v2.3.0-alpha.1-20-gc9d233d",
+			"Rev": "c9d233d69ac0f21580910ba232494a6a5c02a373"
 		},
 		{
 			"ImportPath": "github.com/coreos/etcd/client",
-			"Comment": "v2.3.0-alpha.1-12-ge6d6b64",
-			"Rev": "e6d6b648c4b17a5dbe0787786d8ac62063d1b630"
+			"Comment": "v2.3.0-alpha.1-20-gc9d233d",
+			"Rev": "c9d233d69ac0f21580910ba232494a6a5c02a373"
 		},
 		{
 			"ImportPath": "github.com/coreos/etcd/pkg/pathutil",
-			"Comment": "v2.3.0-alpha.1-12-ge6d6b64",
-			"Rev": "e6d6b648c4b17a5dbe0787786d8ac62063d1b630"
+			"Comment": "v2.3.0-alpha.1-20-gc9d233d",
+			"Rev": "c9d233d69ac0f21580910ba232494a6a5c02a373"
 		},
 		{
 			"ImportPath": "github.com/coreos/etcd/pkg/transport",
-			"Comment": "v2.3.0-alpha.1-12-ge6d6b64",
-			"Rev": "e6d6b648c4b17a5dbe0787786d8ac62063d1b630"
+			"Comment": "v2.3.0-alpha.1-20-gc9d233d",
+			"Rev": "c9d233d69ac0f21580910ba232494a6a5c02a373"
 		},
 		{
 			"ImportPath": "github.com/coreos/etcd/pkg/types",
-			"Comment": "v2.3.0-alpha.1-12-ge6d6b64",
-			"Rev": "e6d6b648c4b17a5dbe0787786d8ac62063d1b630"
+			"Comment": "v2.3.0-alpha.1-20-gc9d233d",
+			"Rev": "c9d233d69ac0f21580910ba232494a6a5c02a373"
 		},
 		{
 			"ImportPath": "github.com/duosecurity/duo_api_golang",

vendor/github.com/hashicorp/hcl/hcl/y.go

@@ -62,7 +62,7 @@ var hclStatenames = [...]string{}
 
 const hclEofCode = 1
 const hclErrCode = 2
-const hclInitialStackSize = 16
+const hclMaxDepth = 200
 
 //line parse.y:259
 
@@ -179,17 +179,18 @@ type hclParser interface {
 }
 
 type hclParserImpl struct {
-	lval  hclSymType
-	stack [hclInitialStackSize]hclSymType
-	char  int
+	lookahead func() int
 }
 
 func (p *hclParserImpl) Lookahead() int {
-	return p.char
+	return p.lookahead()
 }
 
 func hclNewParser() hclParser {
-	return &hclParserImpl{}
+	p := &hclParserImpl{
+		lookahead: func() int { return -1 },
+	}
+	return p
 }
 
 const hclFlag = -1000
@@ -317,20 +318,22 @@ func hclParse(hcllex hclLexer) int {
 
 func (hclrcvr *hclParserImpl) Parse(hcllex hclLexer) int {
 	var hcln int
+	var hcllval hclSymType
 	var hclVAL hclSymType
 	var hclDollar []hclSymType
 	_ = hclDollar // silence set and not used
-	hclS := hclrcvr.stack[:]
+	hclS := make([]hclSymType, hclMaxDepth)
 
 	Nerrs := 0   /* number of errors */
 	Errflag := 0 /* error recovery flag */
 	hclstate := 0
-	hclrcvr.char = -1
-	hcltoken := -1 // hclrcvr.char translated into internal numbering
+	hclchar := -1
+	hcltoken := -1 // hclchar translated into internal numbering
+	hclrcvr.lookahead = func() int { return hclchar }
 	defer func() {
 		// Make sure we report no lookahead when not parsing.
 		hclstate = -1
-		hclrcvr.char = -1
+		hclchar = -1
 		hcltoken = -1
 	}()
 	hclp := -1
@@ -362,8 +365,8 @@ hclnewstate:
 	if hcln <= hclFlag {
 		goto hcldefault /* simple state */
 	}
-	if hclrcvr.char < 0 {
-		hclrcvr.char, hcltoken = hcllex1(hcllex, &hclrcvr.lval)
+	if hclchar < 0 {
+		hclchar, hcltoken = hcllex1(hcllex, &hcllval)
 	}
 	hcln += hcltoken
 	if hcln < 0 || hcln >= hclLast {
@@ -371,9 +374,9 @@ hclnewstate:
 	}
 	hcln = hclAct[hcln]
 	if hclChk[hcln] == hcltoken { /* valid shift */
-		hclrcvr.char = -1
+		hclchar = -1
 		hcltoken = -1
-		hclVAL = hclrcvr.lval
+		hclVAL = hcllval
 		hclstate = hcln
 		if Errflag > 0 {
 			Errflag--
@@ -385,8 +388,8 @@ hcldefault:
 	/* default state action */
 	hcln = hclDef[hclstate]
 	if hcln == -2 {
-		if hclrcvr.char < 0 {
-			hclrcvr.char, hcltoken = hcllex1(hcllex, &hclrcvr.lval)
+		if hclchar < 0 {
+			hclchar, hcltoken = hcllex1(hcllex, &hcllval)
 		}
 
 		/* look through exception table */
@@ -449,7 +452,7 @@ hcldefault:
 			if hcltoken == hclEofCode {
 				goto ret1
 			}
-			hclrcvr.char = -1
+			hclchar = -1
 			hcltoken = -1
 			goto hclnewstate /* try again in the same state */
 		}

vendor/github.com/hashicorp/hcl/json/y.go

@@ -69,7 +69,7 @@ var jsonStatenames = [...]string{}
 
 const jsonEofCode = 1
 const jsonErrCode = 2
-const jsonInitialStackSize = 16
+const jsonMaxDepth = 200
 
 //line parse.y:210
 
@@ -175,17 +175,18 @@ type jsonParser interface {
 }
 
 type jsonParserImpl struct {
-	lval  jsonSymType
-	stack [jsonInitialStackSize]jsonSymType
-	char  int
+	lookahead func() int
 }
 
 func (p *jsonParserImpl) Lookahead() int {
-	return p.char
+	return p.lookahead()
 }
 
 func jsonNewParser() jsonParser {
-	return &jsonParserImpl{}
+	p := &jsonParserImpl{
+		lookahead: func() int { return -1 },
+	}
+	return p
 }
 
 const jsonFlag = -1000
@@ -313,20 +314,22 @@ func jsonParse(jsonlex jsonLexer) int {
 
 func (jsonrcvr *jsonParserImpl) Parse(jsonlex jsonLexer) int {
 	var jsonn int
+	var jsonlval jsonSymType
 	var jsonVAL jsonSymType
 	var jsonDollar []jsonSymType
 	_ = jsonDollar // silence set and not used
-	jsonS := jsonrcvr.stack[:]
+	jsonS := make([]jsonSymType, jsonMaxDepth)
 
 	Nerrs := 0   /* number of errors */
 	Errflag := 0 /* error recovery flag */
 	jsonstate := 0
-	jsonrcvr.char = -1
-	jsontoken := -1 // jsonrcvr.char translated into internal numbering
+	jsonchar := -1
+	jsontoken := -1 // jsonchar translated into internal numbering
+	jsonrcvr.lookahead = func() int { return jsonchar }
 	defer func() {
 		// Make sure we report no lookahead when not parsing.
 		jsonstate = -1
-		jsonrcvr.char = -1
+		jsonchar = -1
 		jsontoken = -1
 	}()
 	jsonp := -1
@@ -358,8 +361,8 @@ jsonnewstate:
 	if jsonn <= jsonFlag {
 		goto jsondefault /* simple state */
 	}
-	if jsonrcvr.char < 0 {
-		jsonrcvr.char, jsontoken = jsonlex1(jsonlex, &jsonrcvr.lval)
+	if jsonchar < 0 {
+		jsonchar, jsontoken = jsonlex1(jsonlex, &jsonlval)
 	}
 	jsonn += jsontoken
 	if jsonn < 0 || jsonn >= jsonLast {
@@ -367,9 +370,9 @@ jsonnewstate:
 	}
 	jsonn = jsonAct[jsonn]
 	if jsonChk[jsonn] == jsontoken { /* valid shift */
-		jsonrcvr.char = -1
+		jsonchar = -1
 		jsontoken = -1
-		jsonVAL = jsonrcvr.lval
+		jsonVAL = jsonlval
 		jsonstate = jsonn
 		if Errflag > 0 {
 			Errflag--
@@ -381,8 +384,8 @@ jsondefault:
 	/* default state action */
 	jsonn = jsonDef[jsonstate]
 	if jsonn == -2 {
-		if jsonrcvr.char < 0 {
-			jsonrcvr.char, jsontoken = jsonlex1(jsonlex, &jsonrcvr.lval)
+		if jsonchar < 0 {
+			jsonchar, jsontoken = jsonlex1(jsonlex, &jsonlval)
 		}
 
 		/* look through exception table */
@@ -445,7 +448,7 @@ jsondefault:
 			if jsontoken == jsonEofCode {
 				goto ret1
 			}
-			jsonrcvr.char = -1
+			jsonchar = -1
 			jsontoken = -1
 			goto jsonnewstate /* try again in the same state */
 		}

vendor/github.com/mitchellh/reflectwalk/location_string.go

@@ -9,7 +9,7 @@ const _Location_name = "NoneMapMapKeyMapValueSliceSliceElemStructStructFieldWalk
 var _Location_index = [...]uint8{0, 4, 7, 13, 21, 26, 35, 41, 52, 59}
 
 func (i Location) String() string {
-	if i >= Location(len(_Location_index)-1) {
+	if i+1 >= Location(len(_Location_index)) {
 		return fmt.Sprintf("Location(%d)", i)
 	}
 	return _Location_name[_Location_index[i]:_Location_index[i+1]]