From 4f3cc7e31444d5c0fad1a9c88a1577c1201e80f1 Mon Sep 17 00:00:00 2001 From: James Nugent Date: Mon, 11 Jul 2016 17:24:27 -0600 Subject: [PATCH 1/2] deps: Update github.com/hashicorp/hcl --- .../hashicorp/hcl/hcl/scanner/scanner.go | 2 +- .../hashicorp/hcl/hcl/strconv/quote.go | 3 -- vendor/vendor.json | 48 +++++++++---------- 3 files changed, 25 insertions(+), 28 deletions(-) diff --git a/vendor/github.com/hashicorp/hcl/hcl/scanner/scanner.go b/vendor/github.com/hashicorp/hcl/hcl/scanner/scanner.go index 174119a8da..b20416539e 100644 --- a/vendor/github.com/hashicorp/hcl/hcl/scanner/scanner.go +++ b/vendor/github.com/hashicorp/hcl/hcl/scanner/scanner.go @@ -469,7 +469,7 @@ func (s *Scanner) scanString() { // read character after quote ch := s.next() - if ch == '\n' || ch < 0 || ch == eof { + if ch < 0 || ch == eof { s.err("literal not terminated") return } diff --git a/vendor/github.com/hashicorp/hcl/hcl/strconv/quote.go b/vendor/github.com/hashicorp/hcl/hcl/strconv/quote.go index 74e232e156..956c8991c3 100644 --- a/vendor/github.com/hashicorp/hcl/hcl/strconv/quote.go +++ b/vendor/github.com/hashicorp/hcl/hcl/strconv/quote.go @@ -27,9 +27,6 @@ func Unquote(s string) (t string, err error) { if quote != '"' { return "", ErrSyntax } - if contains(s, '\n') { - return "", ErrSyntax - } // Is it trivial? Avoid allocation. if !contains(s, '\\') && !contains(s, quote) && !contains(s, '$') { diff --git a/vendor/vendor.json b/vendor/vendor.json index 023364c2c6..0c0f019e61 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -828,68 +828,68 @@ { "checksumSHA1": "ydHBPi04mEh+Tir+2JkpSIMckcw=", "path": "github.com/hashicorp/hcl", - "revision": "364df430845abef160a0bfb3a59979f746bf4956", - "revisionTime": "2016-07-08T14:13:38Z" + "revision": "d8c773c4cba11b11539e3d45f93daeaa5dcf1fa1", + "revisionTime": "2016-07-11T23:17:52Z" }, { "checksumSHA1": "IxyvRpCFeoJBGl2obLKJV7RCGjg=", "path": "github.com/hashicorp/hcl/hcl/ast", - "revision": "364df430845abef160a0bfb3a59979f746bf4956", - "revisionTime": "2016-07-08T14:13:38Z" + "revision": "d8c773c4cba11b11539e3d45f93daeaa5dcf1fa1", + "revisionTime": "2016-07-11T23:17:52Z" }, { "checksumSHA1": "5HVecyfmcTm6OTffEi6LGayQf5M=", "path": "github.com/hashicorp/hcl/hcl/fmtcmd", - "revision": "364df430845abef160a0bfb3a59979f746bf4956", - "revisionTime": "2016-07-08T14:13:38Z" + "revision": "d8c773c4cba11b11539e3d45f93daeaa5dcf1fa1", + "revisionTime": "2016-07-11T23:17:52Z" }, { "checksumSHA1": "l2oQxBsZRwn6eZjf+whXr8c9+8c=", "path": "github.com/hashicorp/hcl/hcl/parser", - "revision": "364df430845abef160a0bfb3a59979f746bf4956", - "revisionTime": "2016-07-08T14:13:38Z" + "revision": "d8c773c4cba11b11539e3d45f93daeaa5dcf1fa1", + "revisionTime": "2016-07-11T23:17:52Z" }, { "checksumSHA1": "CSmwxPOTz7GSpnWPF9aGkbVeR64=", "path": "github.com/hashicorp/hcl/hcl/printer", - "revision": "364df430845abef160a0bfb3a59979f746bf4956", - "revisionTime": "2016-07-08T14:13:38Z" + "revision": "d8c773c4cba11b11539e3d45f93daeaa5dcf1fa1", + "revisionTime": "2016-07-11T23:17:52Z" }, { - "checksumSHA1": "FHZ1IXjWHUyuMjy/wQChE4pSoPg=", + "checksumSHA1": "vjhDQVlgHhdxml1V8/cj0vOe+j8=", "path": "github.com/hashicorp/hcl/hcl/scanner", - "revision": "364df430845abef160a0bfb3a59979f746bf4956", - "revisionTime": "2016-07-08T14:13:38Z" + "revision": "d8c773c4cba11b11539e3d45f93daeaa5dcf1fa1", + "revisionTime": "2016-07-11T23:17:52Z" }, { - "checksumSHA1": "riN5acfVDm4j6LhWXauqiWH5n84=", + "checksumSHA1": "JlZmnzqdmFFyb1+2afLyR3BOE/8=", "path": "github.com/hashicorp/hcl/hcl/strconv", - "revision": "364df430845abef160a0bfb3a59979f746bf4956", - "revisionTime": "2016-07-08T14:13:38Z" + "revision": "d8c773c4cba11b11539e3d45f93daeaa5dcf1fa1", + "revisionTime": "2016-07-11T23:17:52Z" }, { "checksumSHA1": "c6yprzj06ASwCo18TtbbNNBHljA=", "path": "github.com/hashicorp/hcl/hcl/token", - "revision": "364df430845abef160a0bfb3a59979f746bf4956", - "revisionTime": "2016-07-08T14:13:38Z" + "revision": "d8c773c4cba11b11539e3d45f93daeaa5dcf1fa1", + "revisionTime": "2016-07-11T23:17:52Z" }, { "checksumSHA1": "jQ45CCc1ed/nlV7bbSnx6z72q1M=", "path": "github.com/hashicorp/hcl/json/parser", - "revision": "364df430845abef160a0bfb3a59979f746bf4956", - "revisionTime": "2016-07-08T14:13:38Z" + "revision": "d8c773c4cba11b11539e3d45f93daeaa5dcf1fa1", + "revisionTime": "2016-07-11T23:17:52Z" }, { "checksumSHA1": "S1e0F9ZKSnqgOLfjDTYazRL28tA=", "path": "github.com/hashicorp/hcl/json/scanner", - "revision": "364df430845abef160a0bfb3a59979f746bf4956", - "revisionTime": "2016-07-08T14:13:38Z" + "revision": "d8c773c4cba11b11539e3d45f93daeaa5dcf1fa1", + "revisionTime": "2016-07-11T23:17:52Z" }, { "checksumSHA1": "fNlXQCQEnb+B3k5UDL/r15xtSJY=", "path": "github.com/hashicorp/hcl/json/token", - "revision": "364df430845abef160a0bfb3a59979f746bf4956", - "revisionTime": "2016-07-08T14:13:38Z" + "revision": "d8c773c4cba11b11539e3d45f93daeaa5dcf1fa1", + "revisionTime": "2016-07-11T23:17:52Z" }, { "checksumSHA1": "o5JhQCQpoSRFcMwD8LxqP8iJ04o=", From 1a999926fef5a502d9d8c43dcc42fa8d91526a25 Mon Sep 17 00:00:00 2001 From: James Nugent Date: Mon, 11 Jul 2016 17:28:11 -0600 Subject: [PATCH 2/2] deps: Update github.com/hashicorp/hil --- vendor/github.com/hashicorp/hil/convert.go | 2 +- vendor/vendor.json | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/vendor/github.com/hashicorp/hil/convert.go b/vendor/github.com/hashicorp/hil/convert.go index b7bff7544b..3841d1fb35 100644 --- a/vendor/github.com/hashicorp/hil/convert.go +++ b/vendor/github.com/hashicorp/hil/convert.go @@ -144,5 +144,5 @@ func VariableToInterface(input ast.Variable) (interface{}, error) { return result, nil } - return nil, fmt.Errorf("Find") + return nil, fmt.Errorf("unknown input type: %s", input.Type) } diff --git a/vendor/vendor.json b/vendor/vendor.json index 0c0f019e61..a4347ea1b8 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -892,16 +892,16 @@ "revisionTime": "2016-07-11T23:17:52Z" }, { - "checksumSHA1": "o5JhQCQpoSRFcMwD8LxqP8iJ04o=", + "checksumSHA1": "kqCMCHy2b+RBMKC+ER+OPqp8C3E=", "path": "github.com/hashicorp/hil", - "revision": "79fc9230647576201673b35c724c58ec034bd21d", - "revisionTime": "2016-07-11T16:29:56Z" + "revision": "1e86c6b523c55d1fa6c6e930ce80b548664c95c2", + "revisionTime": "2016-07-11T23:18:37Z" }, { "checksumSHA1": "UICubs001+Q4MsUf9zl2vcMzWQQ=", "path": "github.com/hashicorp/hil/ast", - "revision": "7130f7330953adacbfb4ca0ad4b14b806bce3762", - "revisionTime": "2016-06-12T11:49:46Z" + "revision": "1e86c6b523c55d1fa6c6e930ce80b548664c95c2", + "revisionTime": "2016-07-11T23:18:37Z" }, { "path": "github.com/hashicorp/logutils",