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

Update HCL to latest, unskip fmt tests 

See https://github.com/hashicorp/hcl/pull/115
This commit is contained in:
Paul Hinze 2016-04-27 07:37:07 -05:00
parent 3fbe470a21
commit c74c5fe7f0
No known key found for this signature in database
GPG Key ID: B69DEDF2D55501C0
3 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Godeps/Godeps.json generated
View File

@ -720,47 +720,47 @@
}, },
{ {
"ImportPath": "github.com/hashicorp/hcl", "ImportPath": "github.com/hashicorp/hcl",
"Rev": "27a57f2605e04995c111273c263d51cee60d9bc4" "Rev": "9a905a34e6280ce905da1a32344b25e81011197a"
}, },
{ {
"ImportPath": "github.com/hashicorp/hcl/hcl/ast", "ImportPath": "github.com/hashicorp/hcl/hcl/ast",
"Rev": "27a57f2605e04995c111273c263d51cee60d9bc4" "Rev": "9a905a34e6280ce905da1a32344b25e81011197a"
}, },
{ {
"ImportPath": "github.com/hashicorp/hcl/hcl/fmtcmd", "ImportPath": "github.com/hashicorp/hcl/hcl/fmtcmd",
"Rev": "27a57f2605e04995c111273c263d51cee60d9bc4" "Rev": "9a905a34e6280ce905da1a32344b25e81011197a"
}, },
{ {
"ImportPath": "github.com/hashicorp/hcl/hcl/parser", "ImportPath": "github.com/hashicorp/hcl/hcl/parser",
"Rev": "27a57f2605e04995c111273c263d51cee60d9bc4" "Rev": "9a905a34e6280ce905da1a32344b25e81011197a"
}, },
{ {
"ImportPath": "github.com/hashicorp/hcl/hcl/printer", "ImportPath": "github.com/hashicorp/hcl/hcl/printer",
"Rev": "27a57f2605e04995c111273c263d51cee60d9bc4" "Rev": "9a905a34e6280ce905da1a32344b25e81011197a"
}, },
{ {
"ImportPath": "github.com/hashicorp/hcl/hcl/scanner", "ImportPath": "github.com/hashicorp/hcl/hcl/scanner",
"Rev": "27a57f2605e04995c111273c263d51cee60d9bc4" "Rev": "9a905a34e6280ce905da1a32344b25e81011197a"
}, },
{ {
"ImportPath": "github.com/hashicorp/hcl/hcl/strconv", "ImportPath": "github.com/hashicorp/hcl/hcl/strconv",
"Rev": "27a57f2605e04995c111273c263d51cee60d9bc4" "Rev": "9a905a34e6280ce905da1a32344b25e81011197a"
}, },
{ {
"ImportPath": "github.com/hashicorp/hcl/hcl/token", "ImportPath": "github.com/hashicorp/hcl/hcl/token",
"Rev": "27a57f2605e04995c111273c263d51cee60d9bc4" "Rev": "9a905a34e6280ce905da1a32344b25e81011197a"
}, },
{ {
"ImportPath": "github.com/hashicorp/hcl/json/parser", "ImportPath": "github.com/hashicorp/hcl/json/parser",
"Rev": "27a57f2605e04995c111273c263d51cee60d9bc4" "Rev": "9a905a34e6280ce905da1a32344b25e81011197a"
}, },
{ {
"ImportPath": "github.com/hashicorp/hcl/json/scanner", "ImportPath": "github.com/hashicorp/hcl/json/scanner",
"Rev": "27a57f2605e04995c111273c263d51cee60d9bc4" "Rev": "9a905a34e6280ce905da1a32344b25e81011197a"
}, },
{ {
"ImportPath": "github.com/hashicorp/hcl/json/token", "ImportPath": "github.com/hashicorp/hcl/json/token",
"Rev": "27a57f2605e04995c111273c263d51cee60d9bc4" "Rev": "9a905a34e6280ce905da1a32344b25e81011197a"
}, },
{ {
"ImportPath": "github.com/hashicorp/hil", "ImportPath": "github.com/hashicorp/hil",

2
command/fmt_test.go
View File

@ -125,7 +125,6 @@ func TestFmt_directoryArg(t *testing.T) {
} }
func TestFmt_stdinArg(t *testing.T) { func TestFmt_stdinArg(t *testing.T) {
t.Skip("phinze is working on fixing this test")
input := new(bytes.Buffer) input := new(bytes.Buffer)
input.Write(fmtFixture.input) input.Write(fmtFixture.input)
@ -150,7 +149,6 @@ func TestFmt_stdinArg(t *testing.T) {
} }
func TestFmt_nonDefaultOptions(t *testing.T) { func TestFmt_nonDefaultOptions(t *testing.T) {
t.Skip("phinze is working on fixing this test")
tempDir, err := fmtFixtureWriteDir() tempDir, err := fmtFixtureWriteDir()
if err != nil { if err != nil {
t.Fatalf("err: %s", err) t.Fatalf("err: %s", err)

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

@ -60,8 +60,6 @@ func processFile(filename string, in io.Reader, out io.Writer, stdin bool, opts
if err != nil { if err != nil {
return err return err
} }
// Files should end with newlines
res = append(res, []byte("\n")...)
if !bytes.Equal(src, res) { if !bytes.Equal(src, res) {
// formatting has changed // formatting has changed