Merge pull request #5400 from hashicorp/phinze/update-hcl

deps: update hcl to latest

Godeps/Godeps.json

@@ -630,39 +630,39 @@
 		},
 		{
 			"ImportPath": "github.com/hashicorp/hcl",
-			"Rev": "578dd9746824a54637686b51a41bad457a56bcef"
+			"Rev": "71c7409f1abba841e528a80556ed2c67671744c3"
 		},
 		{
 			"ImportPath": "github.com/hashicorp/hcl/hcl/ast",
-			"Rev": "578dd9746824a54637686b51a41bad457a56bcef"
+			"Rev": "71c7409f1abba841e528a80556ed2c67671744c3"
 		},
 		{
 			"ImportPath": "github.com/hashicorp/hcl/hcl/parser",
-			"Rev": "578dd9746824a54637686b51a41bad457a56bcef"
+			"Rev": "71c7409f1abba841e528a80556ed2c67671744c3"
 		},
 		{
 			"ImportPath": "github.com/hashicorp/hcl/hcl/scanner",
-			"Rev": "578dd9746824a54637686b51a41bad457a56bcef"
+			"Rev": "71c7409f1abba841e528a80556ed2c67671744c3"
 		},
 		{
 			"ImportPath": "github.com/hashicorp/hcl/hcl/strconv",
-			"Rev": "578dd9746824a54637686b51a41bad457a56bcef"
+			"Rev": "71c7409f1abba841e528a80556ed2c67671744c3"
 		},
 		{
 			"ImportPath": "github.com/hashicorp/hcl/hcl/token",
-			"Rev": "578dd9746824a54637686b51a41bad457a56bcef"
+			"Rev": "71c7409f1abba841e528a80556ed2c67671744c3"
 		},
 		{
 			"ImportPath": "github.com/hashicorp/hcl/json/parser",
-			"Rev": "578dd9746824a54637686b51a41bad457a56bcef"
+			"Rev": "71c7409f1abba841e528a80556ed2c67671744c3"
 		},
 		{
 			"ImportPath": "github.com/hashicorp/hcl/json/scanner",
-			"Rev": "578dd9746824a54637686b51a41bad457a56bcef"
+			"Rev": "71c7409f1abba841e528a80556ed2c67671744c3"
 		},
 		{
 			"ImportPath": "github.com/hashicorp/hcl/json/token",
-			"Rev": "578dd9746824a54637686b51a41bad457a56bcef"
+			"Rev": "71c7409f1abba841e528a80556ed2c67671744c3"
 		},
 		{
 			"ImportPath": "github.com/hashicorp/hil",

vendor/github.com/hashicorp/hcl/README.md

@@ -64,6 +64,16 @@ of the syntax and grammar is listed here.
   * Strings are double-quoted and can contain any UTF-8 characters.
     Example: `"Hello, World"`
 
+  * Multi-line strings start with `<<EOF` at the end of a line, and end
+    with `EOF` on its own line ([here documents](https://en.wikipedia.org/wiki/Here_document)).
+    Any text may be used in place of `EOF`. Example:
+```
+<<FOO
+hello
+world
+FOO
+```
+
   * Numbers are assumed to be base 10. If you prefix a number with 0x,
     it is treated as a hexadecimal. If it is prefixed with 0, it is
     treated as an octal. Numbers can be in scientific notation: "1e10".

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

@@ -246,6 +246,11 @@ func (p *Parser) objectType() (*ast.ObjectType, error) {
 		return nil, err
 	}
 
+	// If there is no error, we should be at a RBRACE to end the object
+	if p.tok.Type != token.RBRACE {
+		return nil, fmt.Errorf("object expected closing RBRACE got: %s", p.tok.Type)
+	}
+
 	o.List = l
 	o.Rbrace = p.tok.Pos // advanced via parseObjectList
 	return o, nil