From 839e91756ec79425bfa945f67e64962174811e03 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Tue, 8 Nov 2016 16:07:24 -0800 Subject: [PATCH] vendor: update HCL for GH-8709 --- .../hashicorp/hcl/hcl/strconv/quote.go | 12 +---- vendor/vendor.json | 48 +++++++++---------- 2 files changed, 25 insertions(+), 35 deletions(-) diff --git a/vendor/github.com/hashicorp/hcl/hcl/strconv/quote.go b/vendor/github.com/hashicorp/hcl/hcl/strconv/quote.go index 956c8991c3..d5787693f3 100644 --- a/vendor/github.com/hashicorp/hcl/hcl/strconv/quote.go +++ b/vendor/github.com/hashicorp/hcl/hcl/strconv/quote.go @@ -46,7 +46,7 @@ func Unquote(s string) (t string, err error) { for len(s) > 0 { // If we're starting a '${}' then let it through un-unquoted. // Specifically: we don't unquote any characters within the `${}` - // section, except for escaped backslashes, which we handle specifically. + // section. if s[0] == '$' && len(s) > 1 && s[1] == '{' { buf = append(buf, '$', '{') s = s[2:] @@ -61,16 +61,6 @@ func Unquote(s string) (t string, err error) { s = s[size:] - // We special case escaped backslashes in interpolations, converting - // them to their unescaped equivalents. - if r == '\\' { - q, _ := utf8.DecodeRuneInString(s) - switch q { - case '\\': - continue - } - } - n := utf8.EncodeRune(runeTmp[:], r) buf = append(buf, runeTmp[:n]...) diff --git a/vendor/vendor.json b/vendor/vendor.json index d3be386a62..92a068e20f 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -1320,70 +1320,70 @@ "revision": "7e3c02b30806fa5779d3bdfc152ce4c6f40e7b38" }, { - "checksumSHA1": "gjNr5WSUuPicxQzLLKpv5VsjFg0=", + "checksumSHA1": "8OPDk+bKyRGJoKcS4QNw9F7dpE8=", "path": "github.com/hashicorp/hcl", - "revision": "f74cf8281543a0797d7b4ab7d88e76e7ba125308", - "revisionTime": "2016-11-04T01:42:59Z" + "revision": "973f376f0e7cf09c96e445b44712416c0cb22ec4", + "revisionTime": "2016-11-09T00:00:27Z" }, { "checksumSHA1": "XQmjDva9JCGGkIecOgwtBEMCJhU=", "path": "github.com/hashicorp/hcl/hcl/ast", - "revision": "f74cf8281543a0797d7b4ab7d88e76e7ba125308", - "revisionTime": "2016-11-04T01:42:59Z" + "revision": "973f376f0e7cf09c96e445b44712416c0cb22ec4", + "revisionTime": "2016-11-09T00:00:27Z" }, { "checksumSHA1": "5HVecyfmcTm6OTffEi6LGayQf5M=", "path": "github.com/hashicorp/hcl/hcl/fmtcmd", - "revision": "f74cf8281543a0797d7b4ab7d88e76e7ba125308", - "revisionTime": "2016-11-04T01:42:59Z" + "revision": "973f376f0e7cf09c96e445b44712416c0cb22ec4", + "revisionTime": "2016-11-09T00:00:27Z" }, { "checksumSHA1": "croNloscHsjX87X+4/cKOURf1EY=", "path": "github.com/hashicorp/hcl/hcl/parser", - "revision": "f74cf8281543a0797d7b4ab7d88e76e7ba125308", - "revisionTime": "2016-11-04T01:42:59Z" + "revision": "973f376f0e7cf09c96e445b44712416c0cb22ec4", + "revisionTime": "2016-11-09T00:00:27Z" }, { "checksumSHA1": "bUeqPVCXaK3aY54XhZ2D3FrsbWo=", "path": "github.com/hashicorp/hcl/hcl/printer", - "revision": "f74cf8281543a0797d7b4ab7d88e76e7ba125308", - "revisionTime": "2016-11-04T01:42:59Z" + "revision": "973f376f0e7cf09c96e445b44712416c0cb22ec4", + "revisionTime": "2016-11-09T00:00:27Z" }, { "checksumSHA1": "lgR7PSAZ0RtvAc9OCtCnNsF/x8g=", "path": "github.com/hashicorp/hcl/hcl/scanner", - "revision": "f74cf8281543a0797d7b4ab7d88e76e7ba125308", - "revisionTime": "2016-11-04T01:42:59Z" + "revision": "973f376f0e7cf09c96e445b44712416c0cb22ec4", + "revisionTime": "2016-11-09T00:00:27Z" }, { - "checksumSHA1": "JlZmnzqdmFFyb1+2afLyR3BOE/8=", + "checksumSHA1": "/e0ULfQnGeUKiM1+iMnQhImo62k=", "path": "github.com/hashicorp/hcl/hcl/strconv", - "revision": "f74cf8281543a0797d7b4ab7d88e76e7ba125308", - "revisionTime": "2016-11-04T01:42:59Z" + "revision": "973f376f0e7cf09c96e445b44712416c0cb22ec4", + "revisionTime": "2016-11-09T00:00:27Z" }, { "checksumSHA1": "c6yprzj06ASwCo18TtbbNNBHljA=", "path": "github.com/hashicorp/hcl/hcl/token", - "revision": "f74cf8281543a0797d7b4ab7d88e76e7ba125308", - "revisionTime": "2016-11-04T01:42:59Z" + "revision": "973f376f0e7cf09c96e445b44712416c0cb22ec4", + "revisionTime": "2016-11-09T00:00:27Z" }, { "checksumSHA1": "138aCV5n8n7tkGYMsMVQQnnLq+0=", "path": "github.com/hashicorp/hcl/json/parser", - "revision": "f74cf8281543a0797d7b4ab7d88e76e7ba125308", - "revisionTime": "2016-11-04T01:42:59Z" + "revision": "973f376f0e7cf09c96e445b44712416c0cb22ec4", + "revisionTime": "2016-11-09T00:00:27Z" }, { "checksumSHA1": "YdvFsNOMSWMLnY6fcliWQa0O5Fw=", "path": "github.com/hashicorp/hcl/json/scanner", - "revision": "f74cf8281543a0797d7b4ab7d88e76e7ba125308", - "revisionTime": "2016-11-04T01:42:59Z" + "revision": "973f376f0e7cf09c96e445b44712416c0cb22ec4", + "revisionTime": "2016-11-09T00:00:27Z" }, { "checksumSHA1": "fNlXQCQEnb+B3k5UDL/r15xtSJY=", "path": "github.com/hashicorp/hcl/json/token", - "revision": "f74cf8281543a0797d7b4ab7d88e76e7ba125308", - "revisionTime": "2016-11-04T01:42:59Z" + "revision": "973f376f0e7cf09c96e445b44712416c0cb22ec4", + "revisionTime": "2016-11-09T00:00:27Z" }, { "checksumSHA1": "RYz/9y1RMZfg+oMgEyJIWiSl1dU=",