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

update HCL vendor

This commit is contained in:
Mitchell Hashimoto 2016-09-02 09:58:05 -07:00
parent 0a2b5de67f
commit c84f699158
No known key found for this signature in database
GPG Key ID: 744E147AA52F5B0A
6 changed files with 49 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
command/flag_kv_test.go
View File

@ -134,14 +134,11 @@ func TestFlagTypedKV(t *testing.T) {
true,
},
/*
TODO: wait for HCL merge
{
"key=/path",
map[string]interface{}{"key": "/path"},
false,
},
*/
{
"key=/path",
map[string]interface{}{"key": "/path"},
false,
},
{
"key=1234.dkr.ecr.us-east-1.amazonaws.com/proj:abcdef",

10
vendor/github.com/hashicorp/hcl/README.md generated vendored
View File

@ -103,6 +103,16 @@ variable "ami" {
description = "the AMI to use"
}
```
This would be equivalent to the following json:
``` json
{
"variable": {
"ami": {
"description": "the AMI to use"
}
}
}
```
## Thanks

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

@ -214,4 +214,5 @@ func (c *CommentGroup) Pos() token.Pos {
// GoStringer
//-------------------------------------------------------------------
func (o *ObjectKey) GoString() string { return fmt.Sprintf("*%#v", *o) }
func (o *ObjectKey) GoString() string { return fmt.Sprintf("*%#v", *o) }
func (o *ObjectList) GoString() string { return fmt.Sprintf("*%#v", *o) }

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

@ -224,6 +224,11 @@ func (s *Scanner) Scan() token.Token {
func (s *Scanner) scanComment(ch rune) {
// single line comments
if ch == '#' || (ch == '/' && s.peek() != '*') {
if ch == '/' && s.peek() != '/' {
s.err("expected '/' for comment")
return
}
ch = s.next()
for ch != '\n' && ch >= 0 && ch != eof {
ch = s.next()

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

@ -296,7 +296,7 @@ func (s *Scanner) scanString() {
return
}
if ch == '"' && braces == 0 {
if ch == '"' {
break
}

53
vendor/vendor.json vendored
View File

@ -1168,70 +1168,70 @@
"revision": "7e3c02b30806fa5779d3bdfc152ce4c6f40e7b38"
},
{
"checksumSHA1": "8E3sekKdBZ38W0UFwONoZb0txbE=",
"checksumSHA1": "fa9G5tEr4oJJc3vtgn/B0NWZXfA=",
"path": "github.com/hashicorp/hcl",
"revision": "bc40da04e8303cb7406e9ed1a2b742d636c5d960",
"revisionTime": "2016-08-22T16:37:30Z"
"revision": "99df0eb941dd8ddbc83d3f3605a34f6a686ac85e",
"revisionTime": "2016-09-02T16:52:19Z"
},
{
"checksumSHA1": "IxyvRpCFeoJBGl2obLKJV7RCGjg=",
"checksumSHA1": "67DfevLBglV52Y2eAuhFc/xQni0=",
"path": "github.com/hashicorp/hcl/hcl/ast",
"revision": "d8c773c4cba11b11539e3d45f93daeaa5dcf1fa1",
"revisionTime": "2016-07-11T23:17:52Z"
"revision": "99df0eb941dd8ddbc83d3f3605a34f6a686ac85e",
"revisionTime": "2016-09-02T16:52:19Z"
},
{
"checksumSHA1": "5HVecyfmcTm6OTffEi6LGayQf5M=",
"path": "github.com/hashicorp/hcl/hcl/fmtcmd",
"revision": "d8c773c4cba11b11539e3d45f93daeaa5dcf1fa1",
"revisionTime": "2016-07-11T23:17:52Z"
"revision": "99df0eb941dd8ddbc83d3f3605a34f6a686ac85e",
"revisionTime": "2016-09-02T16:52:19Z"
},
{
"checksumSHA1": "l2oQxBsZRwn6eZjf+whXr8c9+8c=",
"path": "github.com/hashicorp/hcl/hcl/parser",
"revision": "d8c773c4cba11b11539e3d45f93daeaa5dcf1fa1",
"revisionTime": "2016-07-11T23:17:52Z"
"revision": "99df0eb941dd8ddbc83d3f3605a34f6a686ac85e",
"revisionTime": "2016-09-02T16:52:19Z"
},
{
"checksumSHA1": "CSmwxPOTz7GSpnWPF9aGkbVeR64=",
"path": "github.com/hashicorp/hcl/hcl/printer",
"revision": "d8c773c4cba11b11539e3d45f93daeaa5dcf1fa1",
"revisionTime": "2016-07-11T23:17:52Z"
"revision": "99df0eb941dd8ddbc83d3f3605a34f6a686ac85e",
"revisionTime": "2016-09-02T16:52:19Z"
},
{
"checksumSHA1": "vjhDQVlgHhdxml1V8/cj0vOe+j8=",
"checksumSHA1": "lgR7PSAZ0RtvAc9OCtCnNsF/x8g=",
"path": "github.com/hashicorp/hcl/hcl/scanner",
"revision": "d8c773c4cba11b11539e3d45f93daeaa5dcf1fa1",
"revisionTime": "2016-07-11T23:17:52Z"
"revision": "99df0eb941dd8ddbc83d3f3605a34f6a686ac85e",
"revisionTime": "2016-09-02T16:52:19Z"
},
{
"checksumSHA1": "JlZmnzqdmFFyb1+2afLyR3BOE/8=",
"path": "github.com/hashicorp/hcl/hcl/strconv",
"revision": "d8c773c4cba11b11539e3d45f93daeaa5dcf1fa1",
"revisionTime": "2016-07-11T23:17:52Z"
"revision": "99df0eb941dd8ddbc83d3f3605a34f6a686ac85e",
"revisionTime": "2016-09-02T16:52:19Z"
},
{
"checksumSHA1": "c6yprzj06ASwCo18TtbbNNBHljA=",
"path": "github.com/hashicorp/hcl/hcl/token",
"revision": "d8c773c4cba11b11539e3d45f93daeaa5dcf1fa1",
"revisionTime": "2016-07-11T23:17:52Z"
"revision": "99df0eb941dd8ddbc83d3f3605a34f6a686ac85e",
"revisionTime": "2016-09-02T16:52:19Z"
},
{
"checksumSHA1": "jQ45CCc1ed/nlV7bbSnx6z72q1M=",
"path": "github.com/hashicorp/hcl/json/parser",
"revision": "d8c773c4cba11b11539e3d45f93daeaa5dcf1fa1",
"revisionTime": "2016-07-11T23:17:52Z"
"revision": "99df0eb941dd8ddbc83d3f3605a34f6a686ac85e",
"revisionTime": "2016-09-02T16:52:19Z"
},
{
"checksumSHA1": "S1e0F9ZKSnqgOLfjDTYazRL28tA=",
"checksumSHA1": "YdvFsNOMSWMLnY6fcliWQa0O5Fw=",
"path": "github.com/hashicorp/hcl/json/scanner",
"revision": "d8c773c4cba11b11539e3d45f93daeaa5dcf1fa1",
"revisionTime": "2016-07-11T23:17:52Z"
"revision": "99df0eb941dd8ddbc83d3f3605a34f6a686ac85e",
"revisionTime": "2016-09-02T16:52:19Z"
},
{
"checksumSHA1": "fNlXQCQEnb+B3k5UDL/r15xtSJY=",
"path": "github.com/hashicorp/hcl/json/token",
"revision": "d8c773c4cba11b11539e3d45f93daeaa5dcf1fa1",
"revisionTime": "2016-07-11T23:17:52Z"
"revision": "99df0eb941dd8ddbc83d3f3605a34f6a686ac85e",
"revisionTime": "2016-09-02T16:52:19Z"
},
{
"checksumSHA1": "OrnLOmhc0FcHYs02wtbu1siIsnM=",
@ -1260,7 +1260,6 @@
},
{
"checksumSHA1": "jq2E42bB0kwKaerHXwJslUea4eM=",
"origin": "github.com/hashicorp/terraform/vendor/github.com/henrikhodne/go-librato/librato",
"path": "github.com/henrikhodne/go-librato/librato",
"revision": "6e9aa4b1a8a8b735ad14b4f1c9542ef183e82dc2",
"revisionTime": "2016-08-11T07:26:26Z"