ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #7595 from hashicorp/multiline-strings 

Update HIL and HCL
This commit is contained in:
James Nugent 2016-07-11 18:29:17 -06:00 committed by GitHub
parent d69256dcb4 1a999926fe
commit fc4d548761
4 changed files with 31 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vendor/github.com/hashicorp/hcl/hcl/scanner/scanner.go generated vendored
View File

@ -469,7 +469,7 @@ func (s *Scanner) scanString() {
// read character after quote // read character after quote
ch := s.next() ch := s.next()
if ch == '\n' || ch < 0 || ch == eof { if ch < 0 || ch == eof {
s.err("literal not terminated") s.err("literal not terminated")
return return
} }

3
vendor/github.com/hashicorp/hcl/hcl/strconv/quote.go generated vendored
View File

@ -27,9 +27,6 @@ func Unquote(s string) (t string, err error) {
if quote != '"' { if quote != '"' {
return "", ErrSyntax return "", ErrSyntax
} }
if contains(s, '\n') {
return "", ErrSyntax
}
// Is it trivial? Avoid allocation. // Is it trivial? Avoid allocation.
if !contains(s, '\\') && !contains(s, quote) && !contains(s, '$') { if !contains(s, '\\') && !contains(s, quote) && !contains(s, '$') {

2
vendor/github.com/hashicorp/hil/convert.go generated vendored
View File

@ -144,5 +144,5 @@ func VariableToInterface(input ast.Variable) (interface{}, error) {
return result, nil return result, nil
} }
return nil, fmt.Errorf("Find") return nil, fmt.Errorf("unknown input type: %s", input.Type)
} }

58
vendor/vendor.json vendored
View File

@ -828,80 +828,80 @@
{ {
"checksumSHA1": "ydHBPi04mEh+Tir+2JkpSIMckcw=", "checksumSHA1": "ydHBPi04mEh+Tir+2JkpSIMckcw=",
"path": "github.com/hashicorp/hcl", "path": "github.com/hashicorp/hcl",
"revision": "364df430845abef160a0bfb3a59979f746bf4956", "revision": "d8c773c4cba11b11539e3d45f93daeaa5dcf1fa1",
"revisionTime": "2016-07-08T14:13:38Z" "revisionTime": "2016-07-11T23:17:52Z"
}, },
{ {
"checksumSHA1": "IxyvRpCFeoJBGl2obLKJV7RCGjg=", "checksumSHA1": "IxyvRpCFeoJBGl2obLKJV7RCGjg=",
"path": "github.com/hashicorp/hcl/hcl/ast", "path": "github.com/hashicorp/hcl/hcl/ast",
"revision": "364df430845abef160a0bfb3a59979f746bf4956", "revision": "d8c773c4cba11b11539e3d45f93daeaa5dcf1fa1",
"revisionTime": "2016-07-08T14:13:38Z" "revisionTime": "2016-07-11T23:17:52Z"
}, },
{ {
"checksumSHA1": "5HVecyfmcTm6OTffEi6LGayQf5M=", "checksumSHA1": "5HVecyfmcTm6OTffEi6LGayQf5M=",
"path": "github.com/hashicorp/hcl/hcl/fmtcmd", "path": "github.com/hashicorp/hcl/hcl/fmtcmd",
"revision": "364df430845abef160a0bfb3a59979f746bf4956", "revision": "d8c773c4cba11b11539e3d45f93daeaa5dcf1fa1",
"revisionTime": "2016-07-08T14:13:38Z" "revisionTime": "2016-07-11T23:17:52Z"
}, },
{ {
"checksumSHA1": "l2oQxBsZRwn6eZjf+whXr8c9+8c=", "checksumSHA1": "l2oQxBsZRwn6eZjf+whXr8c9+8c=",
"path": "github.com/hashicorp/hcl/hcl/parser", "path": "github.com/hashicorp/hcl/hcl/parser",
"revision": "364df430845abef160a0bfb3a59979f746bf4956", "revision": "d8c773c4cba11b11539e3d45f93daeaa5dcf1fa1",
"revisionTime": "2016-07-08T14:13:38Z" "revisionTime": "2016-07-11T23:17:52Z"
}, },
{ {
"checksumSHA1": "CSmwxPOTz7GSpnWPF9aGkbVeR64=", "checksumSHA1": "CSmwxPOTz7GSpnWPF9aGkbVeR64=",
"path": "github.com/hashicorp/hcl/hcl/printer", "path": "github.com/hashicorp/hcl/hcl/printer",
"revision": "364df430845abef160a0bfb3a59979f746bf4956", "revision": "d8c773c4cba11b11539e3d45f93daeaa5dcf1fa1",
"revisionTime": "2016-07-08T14:13:38Z" "revisionTime": "2016-07-11T23:17:52Z"
}, },
{ {
"checksumSHA1": "FHZ1IXjWHUyuMjy/wQChE4pSoPg=", "checksumSHA1": "vjhDQVlgHhdxml1V8/cj0vOe+j8=",
"path": "github.com/hashicorp/hcl/hcl/scanner", "path": "github.com/hashicorp/hcl/hcl/scanner",
"revision": "364df430845abef160a0bfb3a59979f746bf4956", "revision": "d8c773c4cba11b11539e3d45f93daeaa5dcf1fa1",
"revisionTime": "2016-07-08T14:13:38Z" "revisionTime": "2016-07-11T23:17:52Z"
}, },
{ {
"checksumSHA1": "riN5acfVDm4j6LhWXauqiWH5n84=", "checksumSHA1": "JlZmnzqdmFFyb1+2afLyR3BOE/8=",
"path": "github.com/hashicorp/hcl/hcl/strconv", "path": "github.com/hashicorp/hcl/hcl/strconv",
"revision": "364df430845abef160a0bfb3a59979f746bf4956", "revision": "d8c773c4cba11b11539e3d45f93daeaa5dcf1fa1",
"revisionTime": "2016-07-08T14:13:38Z" "revisionTime": "2016-07-11T23:17:52Z"
}, },
{ {
"checksumSHA1": "c6yprzj06ASwCo18TtbbNNBHljA=", "checksumSHA1": "c6yprzj06ASwCo18TtbbNNBHljA=",
"path": "github.com/hashicorp/hcl/hcl/token", "path": "github.com/hashicorp/hcl/hcl/token",
"revision": "364df430845abef160a0bfb3a59979f746bf4956", "revision": "d8c773c4cba11b11539e3d45f93daeaa5dcf1fa1",
"revisionTime": "2016-07-08T14:13:38Z" "revisionTime": "2016-07-11T23:17:52Z"
}, },
{ {
"checksumSHA1": "jQ45CCc1ed/nlV7bbSnx6z72q1M=", "checksumSHA1": "jQ45CCc1ed/nlV7bbSnx6z72q1M=",
"path": "github.com/hashicorp/hcl/json/parser", "path": "github.com/hashicorp/hcl/json/parser",
"revision": "364df430845abef160a0bfb3a59979f746bf4956", "revision": "d8c773c4cba11b11539e3d45f93daeaa5dcf1fa1",
"revisionTime": "2016-07-08T14:13:38Z" "revisionTime": "2016-07-11T23:17:52Z"
}, },
{ {
"checksumSHA1": "S1e0F9ZKSnqgOLfjDTYazRL28tA=", "checksumSHA1": "S1e0F9ZKSnqgOLfjDTYazRL28tA=",
"path": "github.com/hashicorp/hcl/json/scanner", "path": "github.com/hashicorp/hcl/json/scanner",
"revision": "364df430845abef160a0bfb3a59979f746bf4956", "revision": "d8c773c4cba11b11539e3d45f93daeaa5dcf1fa1",
"revisionTime": "2016-07-08T14:13:38Z" "revisionTime": "2016-07-11T23:17:52Z"
}, },
{ {
"checksumSHA1": "fNlXQCQEnb+B3k5UDL/r15xtSJY=", "checksumSHA1": "fNlXQCQEnb+B3k5UDL/r15xtSJY=",
"path": "github.com/hashicorp/hcl/json/token", "path": "github.com/hashicorp/hcl/json/token",
"revision": "364df430845abef160a0bfb3a59979f746bf4956", "revision": "d8c773c4cba11b11539e3d45f93daeaa5dcf1fa1",
"revisionTime": "2016-07-08T14:13:38Z" "revisionTime": "2016-07-11T23:17:52Z"
}, },
{ {
"checksumSHA1": "o5JhQCQpoSRFcMwD8LxqP8iJ04o=", "checksumSHA1": "kqCMCHy2b+RBMKC+ER+OPqp8C3E=",
"path": "github.com/hashicorp/hil", "path": "github.com/hashicorp/hil",
"revision": "79fc9230647576201673b35c724c58ec034bd21d", "revision": "1e86c6b523c55d1fa6c6e930ce80b548664c95c2",
"revisionTime": "2016-07-11T16:29:56Z" "revisionTime": "2016-07-11T23:18:37Z"
}, },
{ {
"checksumSHA1": "UICubs001+Q4MsUf9zl2vcMzWQQ=", "checksumSHA1": "UICubs001+Q4MsUf9zl2vcMzWQQ=",
"path": "github.com/hashicorp/hil/ast", "path": "github.com/hashicorp/hil/ast",
"revision": "7130f7330953adacbfb4ca0ad4b14b806bce3762", "revision": "1e86c6b523c55d1fa6c6e930ce80b548664c95c2",
"revisionTime": "2016-06-12T11:49:46Z" "revisionTime": "2016-07-11T23:18:37Z"
}, },
{ {
"path": "github.com/hashicorp/logutils", "path": "github.com/hashicorp/logutils",