From 02512b5487873cd5e1e0e14d9e8585fbffe01dfc Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Mon, 22 Aug 2016 09:40:31 -0700 Subject: [PATCH] vendor: update HCL for GH-8295 --- vendor/github.com/hashicorp/hcl/decoder.go | 2 +- vendor/vendor.json | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/vendor/github.com/hashicorp/hcl/decoder.go b/vendor/github.com/hashicorp/hcl/decoder.go index cfddbf360..a6938feb3 100644 --- a/vendor/github.com/hashicorp/hcl/decoder.go +++ b/vendor/github.com/hashicorp/hcl/decoder.go @@ -489,7 +489,7 @@ func (d *decoder) decodeStruct(name string, node ast.Node, result reflect.Value) // the yacc parser would always ensure top-level elements were arrays. The new // parser does not make the same guarantees, thus we need to convert any // top-level literal elements into a list. - if _, ok := node.(*ast.LiteralType); ok { + if _, ok := node.(*ast.LiteralType); ok && item != nil { node = &ast.ObjectList{Items: []*ast.ObjectItem{item}} } diff --git a/vendor/vendor.json b/vendor/vendor.json index c1074eabe..f1401fc40 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -1148,10 +1148,10 @@ "revision": "7e3c02b30806fa5779d3bdfc152ce4c6f40e7b38" }, { - "checksumSHA1": "ydHBPi04mEh+Tir+2JkpSIMckcw=", + "checksumSHA1": "8E3sekKdBZ38W0UFwONoZb0txbE=", "path": "github.com/hashicorp/hcl", - "revision": "d8c773c4cba11b11539e3d45f93daeaa5dcf1fa1", - "revisionTime": "2016-07-11T23:17:52Z" + "revision": "bc40da04e8303cb7406e9ed1a2b742d636c5d960", + "revisionTime": "2016-08-22T16:37:30Z" }, { "checksumSHA1": "IxyvRpCFeoJBGl2obLKJV7RCGjg=",