diff --git a/cmd/hcldec/diags_json.go b/cmd/hcldec/diags_json.go index d9f2883..f0b4a40 100644 --- a/cmd/hcldec/diags_json.go +++ b/cmd/hcldec/diags_json.go @@ -4,7 +4,7 @@ import ( "encoding/json" "io" - "github.com/hashicorp/hcl/v2/hcl" + "github.com/hashicorp/hcl/v2" ) type jsonDiagWriter struct { diff --git a/cmd/hcldec/main.go b/cmd/hcldec/main.go index 42e4bab..461c8db 100644 --- a/cmd/hcldec/main.go +++ b/cmd/hcldec/main.go @@ -7,7 +7,7 @@ import ( "os" "strings" - "github.com/hashicorp/hcl/v2/hcl" + "github.com/hashicorp/hcl/v2" "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/hcl/v2/hclparse" flag "github.com/spf13/pflag" diff --git a/cmd/hcldec/spec.go b/cmd/hcldec/spec.go index 6bb5214..a496ef6 100644 --- a/cmd/hcldec/spec.go +++ b/cmd/hcldec/spec.go @@ -5,7 +5,7 @@ import ( "github.com/hashicorp/hcl/v2/ext/userfunc" "github.com/hashicorp/hcl/v2/gohcl" - "github.com/hashicorp/hcl/v2/hcl" + "github.com/hashicorp/hcl/v2" "github.com/hashicorp/hcl/v2/hcldec" "github.com/zclconf/go-cty/cty" "github.com/zclconf/go-cty/cty/function" diff --git a/cmd/hcldec/type_expr.go b/cmd/hcldec/type_expr.go index 44eed52..3e36420 100644 --- a/cmd/hcldec/type_expr.go +++ b/cmd/hcldec/type_expr.go @@ -4,7 +4,7 @@ import ( "fmt" "reflect" - "github.com/hashicorp/hcl/v2/hcl" + "github.com/hashicorp/hcl/v2" "github.com/zclconf/go-cty/cty" "github.com/zclconf/go-cty/cty/function" ) diff --git a/cmd/hcldec/vars.go b/cmd/hcldec/vars.go index 98450c8..d3971cb 100644 --- a/cmd/hcldec/vars.go +++ b/cmd/hcldec/vars.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/hashicorp/hcl/v2/hcl" + "github.com/hashicorp/hcl/v2" "github.com/zclconf/go-cty/cty" ) diff --git a/cmd/hclfmt/main.go b/cmd/hclfmt/main.go index 582f183..01a8d41 100644 --- a/cmd/hclfmt/main.go +++ b/cmd/hclfmt/main.go @@ -9,7 +9,7 @@ import ( "os" "strings" - "github.com/hashicorp/hcl/v2/hcl" + "github.com/hashicorp/hcl/v2" "github.com/hashicorp/hcl/v2/hclparse" "github.com/hashicorp/hcl/v2/hclwrite" "golang.org/x/crypto/ssh/terminal" diff --git a/cmd/hclspecsuite/diagnostics.go b/cmd/hclspecsuite/diagnostics.go index 97b953f..129fdd2 100644 --- a/cmd/hclspecsuite/diagnostics.go +++ b/cmd/hclspecsuite/diagnostics.go @@ -4,7 +4,7 @@ import ( "encoding/json" "fmt" - "github.com/hashicorp/hcl/v2/hcl" + "github.com/hashicorp/hcl/v2" ) func decodeJSONDiagnostics(src []byte) hcl.Diagnostics { diff --git a/cmd/hclspecsuite/log.go b/cmd/hclspecsuite/log.go index 30c27b9..022c7be 100644 --- a/cmd/hclspecsuite/log.go +++ b/cmd/hclspecsuite/log.go @@ -1,7 +1,7 @@ package main import ( - "github.com/hashicorp/hcl/v2/hcl" + "github.com/hashicorp/hcl/v2" ) type LogBeginCallback func(testName string, testFile *TestFile) diff --git a/cmd/hclspecsuite/main.go b/cmd/hclspecsuite/main.go index 2ba4982..384ee02 100644 --- a/cmd/hclspecsuite/main.go +++ b/cmd/hclspecsuite/main.go @@ -7,7 +7,7 @@ import ( "golang.org/x/crypto/ssh/terminal" - "github.com/hashicorp/hcl/v2/hcl" + "github.com/hashicorp/hcl/v2" "github.com/hashicorp/hcl/v2/hclparse" ) diff --git a/cmd/hclspecsuite/runner.go b/cmd/hclspecsuite/runner.go index 856827d..eeac8df 100644 --- a/cmd/hclspecsuite/runner.go +++ b/cmd/hclspecsuite/runner.go @@ -16,7 +16,7 @@ import ( ctyjson "github.com/zclconf/go-cty/cty/json" "github.com/hashicorp/hcl/v2/ext/typeexpr" - "github.com/hashicorp/hcl/v2/hcl" + "github.com/hashicorp/hcl/v2" "github.com/hashicorp/hcl/v2/hclparse" ) diff --git a/cmd/hclspecsuite/test_file.go b/cmd/hclspecsuite/test_file.go index 52175aa..0b531d6 100644 --- a/cmd/hclspecsuite/test_file.go +++ b/cmd/hclspecsuite/test_file.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/hcl/v2/ext/typeexpr" "github.com/hashicorp/hcl/v2/gohcl" - "github.com/hashicorp/hcl/v2/hcl" + "github.com/hashicorp/hcl/v2" ) type TestFile struct { diff --git a/cmd/hclspecsuite/traversals.go b/cmd/hclspecsuite/traversals.go index 98db5a6..d689390 100644 --- a/cmd/hclspecsuite/traversals.go +++ b/cmd/hclspecsuite/traversals.go @@ -4,7 +4,7 @@ import ( "fmt" "reflect" - "github.com/hashicorp/hcl/v2/hcl" + "github.com/hashicorp/hcl/v2" ) func findTraversalSpec(got hcl.Traversal, candidates []*TestFileExpectTraversal) *TestFileExpectTraversal { diff --git a/hcl/diagnostic.go b/diagnostic.go similarity index 100% rename from hcl/diagnostic.go rename to diagnostic.go diff --git a/hcl/diagnostic_text.go b/diagnostic_text.go similarity index 100% rename from hcl/diagnostic_text.go rename to diagnostic_text.go diff --git a/hcl/diagnostic_text_test.go b/diagnostic_text_test.go similarity index 100% rename from hcl/diagnostic_text_test.go rename to diagnostic_text_test.go diff --git a/hcl/didyoumean.go b/didyoumean.go similarity index 100% rename from hcl/didyoumean.go rename to didyoumean.go diff --git a/hcl/doc.go b/doc.go similarity index 100% rename from hcl/doc.go rename to doc.go diff --git a/hcl/eval_context.go b/eval_context.go similarity index 100% rename from hcl/eval_context.go rename to eval_context.go diff --git a/hcl/expr_call.go b/expr_call.go similarity index 100% rename from hcl/expr_call.go rename to expr_call.go diff --git a/hcl/expr_list.go b/expr_list.go similarity index 100% rename from hcl/expr_list.go rename to expr_list.go diff --git a/hcl/expr_map.go b/expr_map.go similarity index 100% rename from hcl/expr_map.go rename to expr_map.go diff --git a/hcl/expr_unwrap.go b/expr_unwrap.go similarity index 100% rename from hcl/expr_unwrap.go rename to expr_unwrap.go diff --git a/ext/dynblock/expand_body.go b/ext/dynblock/expand_body.go index cf83637..65a9eab 100644 --- a/ext/dynblock/expand_body.go +++ b/ext/dynblock/expand_body.go @@ -3,7 +3,7 @@ package dynblock import ( "fmt" - "github.com/hashicorp/hcl/v2/hcl" + "github.com/hashicorp/hcl/v2" "github.com/zclconf/go-cty/cty" ) diff --git a/ext/dynblock/expand_body_test.go b/ext/dynblock/expand_body_test.go index 074600b..207a2b6 100644 --- a/ext/dynblock/expand_body_test.go +++ b/ext/dynblock/expand_body_test.go @@ -3,7 +3,7 @@ package dynblock import ( "testing" - "github.com/hashicorp/hcl/v2/hcl" + "github.com/hashicorp/hcl/v2" "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/hcl/v2/hcltest" "github.com/zclconf/go-cty/cty" diff --git a/ext/dynblock/expand_spec.go b/ext/dynblock/expand_spec.go index e64a6e3..98a51ea 100644 --- a/ext/dynblock/expand_spec.go +++ b/ext/dynblock/expand_spec.go @@ -3,7 +3,7 @@ package dynblock import ( "fmt" - "github.com/hashicorp/hcl/v2/hcl" + "github.com/hashicorp/hcl/v2" "github.com/zclconf/go-cty/cty" "github.com/zclconf/go-cty/cty/convert" ) diff --git a/ext/dynblock/expr_wrap.go b/ext/dynblock/expr_wrap.go index 250fb45..460a1d2 100644 --- a/ext/dynblock/expr_wrap.go +++ b/ext/dynblock/expr_wrap.go @@ -1,7 +1,7 @@ package dynblock import ( - "github.com/hashicorp/hcl/v2/hcl" + "github.com/hashicorp/hcl/v2" "github.com/zclconf/go-cty/cty" ) diff --git a/ext/dynblock/iteration.go b/ext/dynblock/iteration.go index 0967659..c566388 100644 --- a/ext/dynblock/iteration.go +++ b/ext/dynblock/iteration.go @@ -1,7 +1,7 @@ package dynblock import ( - "github.com/hashicorp/hcl/v2/hcl" + "github.com/hashicorp/hcl/v2" "github.com/zclconf/go-cty/cty" ) diff --git a/ext/dynblock/public.go b/ext/dynblock/public.go index 7ae7085..f4c55c8 100644 --- a/ext/dynblock/public.go +++ b/ext/dynblock/public.go @@ -1,7 +1,7 @@ package dynblock import ( - "github.com/hashicorp/hcl/v2/hcl" + "github.com/hashicorp/hcl/v2" ) // Expand "dynamic" blocks in the given body, returning a new body that diff --git a/ext/dynblock/schema.go b/ext/dynblock/schema.go index 77d6044..b3907d6 100644 --- a/ext/dynblock/schema.go +++ b/ext/dynblock/schema.go @@ -1,6 +1,6 @@ package dynblock -import "github.com/hashicorp/hcl/v2/hcl" +import "github.com/hashicorp/hcl/v2" var dynamicBlockHeaderSchema = hcl.BlockHeaderSchema{ Type: "dynamic", diff --git a/ext/dynblock/unknown_body.go b/ext/dynblock/unknown_body.go index 2addbc6..ce98259 100644 --- a/ext/dynblock/unknown_body.go +++ b/ext/dynblock/unknown_body.go @@ -1,7 +1,7 @@ package dynblock import ( - "github.com/hashicorp/hcl/v2/hcl" + "github.com/hashicorp/hcl/v2" "github.com/zclconf/go-cty/cty" ) diff --git a/ext/dynblock/variables.go b/ext/dynblock/variables.go index 658c478..1923392 100644 --- a/ext/dynblock/variables.go +++ b/ext/dynblock/variables.go @@ -1,7 +1,7 @@ package dynblock import ( - "github.com/hashicorp/hcl/v2/hcl" + "github.com/hashicorp/hcl/v2" "github.com/zclconf/go-cty/cty" ) diff --git a/ext/dynblock/variables_hcldec.go b/ext/dynblock/variables_hcldec.go index ec3588f..907ef3e 100644 --- a/ext/dynblock/variables_hcldec.go +++ b/ext/dynblock/variables_hcldec.go @@ -1,7 +1,7 @@ package dynblock import ( - "github.com/hashicorp/hcl/v2/hcl" + "github.com/hashicorp/hcl/v2" "github.com/hashicorp/hcl/v2/hcldec" ) diff --git a/ext/dynblock/variables_test.go b/ext/dynblock/variables_test.go index 209737a..b3a2d72 100644 --- a/ext/dynblock/variables_test.go +++ b/ext/dynblock/variables_test.go @@ -9,8 +9,8 @@ import ( "github.com/davecgh/go-spew/spew" - "github.com/hashicorp/hcl/v2/hcl" - "github.com/hashicorp/hcl/v2/hcl/hclsyntax" + "github.com/hashicorp/hcl/v2" + "github.com/hashicorp/hcl/v2/hclsyntax" ) func TestVariables(t *testing.T) { diff --git a/ext/include/file_resolver.go b/ext/include/file_resolver.go index 382c6d4..11091b8 100644 --- a/ext/include/file_resolver.go +++ b/ext/include/file_resolver.go @@ -4,7 +4,7 @@ import ( "path/filepath" "strings" - "github.com/hashicorp/hcl/v2/hcl" + "github.com/hashicorp/hcl/v2" "github.com/hashicorp/hcl/v2/hclparse" ) diff --git a/ext/include/map_resolver.go b/ext/include/map_resolver.go index b1da3df..452a6d8 100644 --- a/ext/include/map_resolver.go +++ b/ext/include/map_resolver.go @@ -3,7 +3,7 @@ package include import ( "fmt" - "github.com/hashicorp/hcl/v2/hcl" + "github.com/hashicorp/hcl/v2" ) // MapResolver returns a Resolver that consults the given map for preloaded diff --git a/ext/include/resolver.go b/ext/include/resolver.go index b1c957a..38c8b73 100644 --- a/ext/include/resolver.go +++ b/ext/include/resolver.go @@ -1,7 +1,7 @@ package include import ( - "github.com/hashicorp/hcl/v2/hcl" + "github.com/hashicorp/hcl/v2" ) // A Resolver maps an include path (an arbitrary string, but usually something diff --git a/ext/include/transformer.go b/ext/include/transformer.go index a76e7f6..ae0a808 100644 --- a/ext/include/transformer.go +++ b/ext/include/transformer.go @@ -3,7 +3,7 @@ package include import ( "github.com/hashicorp/hcl/v2/ext/transform" "github.com/hashicorp/hcl/v2/gohcl" - "github.com/hashicorp/hcl/v2/hcl" + "github.com/hashicorp/hcl/v2" ) // Transformer builds a transformer that finds any "include" blocks in a body diff --git a/ext/include/transformer_test.go b/ext/include/transformer_test.go index 71d7a2f..e5d6c1a 100644 --- a/ext/include/transformer_test.go +++ b/ext/include/transformer_test.go @@ -6,7 +6,7 @@ import ( "github.com/davecgh/go-spew/spew" "github.com/hashicorp/hcl/v2/gohcl" - "github.com/hashicorp/hcl/v2/hcl" + "github.com/hashicorp/hcl/v2" "github.com/hashicorp/hcl/v2/hcltest" "github.com/zclconf/go-cty/cty" ) diff --git a/ext/transform/error.go b/ext/transform/error.go index f35c304..6063e2b 100644 --- a/ext/transform/error.go +++ b/ext/transform/error.go @@ -1,7 +1,7 @@ package transform import ( - "github.com/hashicorp/hcl/v2/hcl" + "github.com/hashicorp/hcl/v2" ) // NewErrorBody returns a hcl.Body that returns the given diagnostics whenever diff --git a/ext/transform/transform.go b/ext/transform/transform.go index ad99b8d..f0f5ff6 100644 --- a/ext/transform/transform.go +++ b/ext/transform/transform.go @@ -1,7 +1,7 @@ package transform import ( - "github.com/hashicorp/hcl/v2/hcl" + "github.com/hashicorp/hcl/v2" ) // Shallow is equivalent to calling transformer.TransformBody(body), and diff --git a/ext/transform/transform_test.go b/ext/transform/transform_test.go index 07a09ef..7b68aca 100644 --- a/ext/transform/transform_test.go +++ b/ext/transform/transform_test.go @@ -5,7 +5,7 @@ import ( "reflect" - "github.com/hashicorp/hcl/v2/hcl" + "github.com/hashicorp/hcl/v2" "github.com/hashicorp/hcl/v2/hcltest" "github.com/zclconf/go-cty/cty" ) diff --git a/ext/transform/transformer.go b/ext/transform/transformer.go index 2950926..2599cdd 100644 --- a/ext/transform/transformer.go +++ b/ext/transform/transformer.go @@ -1,7 +1,7 @@ package transform import ( - "github.com/hashicorp/hcl/v2/hcl" + "github.com/hashicorp/hcl/v2" ) // A Transformer takes a given body, applies some (possibly no-op) diff --git a/ext/typeexpr/get_type.go b/ext/typeexpr/get_type.go index 581288b..11b0689 100644 --- a/ext/typeexpr/get_type.go +++ b/ext/typeexpr/get_type.go @@ -3,7 +3,7 @@ package typeexpr import ( "fmt" - "github.com/hashicorp/hcl/v2/hcl" + "github.com/hashicorp/hcl/v2" "github.com/zclconf/go-cty/cty" ) diff --git a/ext/typeexpr/get_type_test.go b/ext/typeexpr/get_type_test.go index bb40c24..391bf4f 100644 --- a/ext/typeexpr/get_type_test.go +++ b/ext/typeexpr/get_type_test.go @@ -5,9 +5,9 @@ import ( "github.com/hashicorp/hcl/v2/gohcl" - "github.com/hashicorp/hcl/v2/hcl" - "github.com/hashicorp/hcl/v2/hcl/hclsyntax" - "github.com/hashicorp/hcl/v2/hcl/json" + "github.com/hashicorp/hcl/v2" + "github.com/hashicorp/hcl/v2/hclsyntax" + "github.com/hashicorp/hcl/v2/json" "github.com/zclconf/go-cty/cty" ) diff --git a/ext/typeexpr/public.go b/ext/typeexpr/public.go index 0deedcb..3b8f618 100644 --- a/ext/typeexpr/public.go +++ b/ext/typeexpr/public.go @@ -5,9 +5,9 @@ import ( "fmt" "sort" - "github.com/hashicorp/hcl/v2/hcl/hclsyntax" + "github.com/hashicorp/hcl/v2/hclsyntax" - "github.com/hashicorp/hcl/v2/hcl" + "github.com/hashicorp/hcl/v2" "github.com/zclconf/go-cty/cty" ) diff --git a/ext/userfunc/decode.go b/ext/userfunc/decode.go index 73f4336..6c1e4ca 100644 --- a/ext/userfunc/decode.go +++ b/ext/userfunc/decode.go @@ -1,7 +1,7 @@ package userfunc import ( - "github.com/hashicorp/hcl/v2/hcl" + "github.com/hashicorp/hcl/v2" "github.com/zclconf/go-cty/cty" "github.com/zclconf/go-cty/cty/function" ) diff --git a/ext/userfunc/decode_test.go b/ext/userfunc/decode_test.go index d22abb8..633c6d8 100644 --- a/ext/userfunc/decode_test.go +++ b/ext/userfunc/decode_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/hcl/v2/hcl" - "github.com/hashicorp/hcl/v2/hcl/hclsyntax" + "github.com/hashicorp/hcl/v2" + "github.com/hashicorp/hcl/v2/hclsyntax" "github.com/zclconf/go-cty/cty" ) diff --git a/ext/userfunc/public.go b/ext/userfunc/public.go index 626a18c..5415c8c 100644 --- a/ext/userfunc/public.go +++ b/ext/userfunc/public.go @@ -1,7 +1,7 @@ package userfunc import ( - "github.com/hashicorp/hcl/v2/hcl" + "github.com/hashicorp/hcl/v2" "github.com/zclconf/go-cty/cty/function" ) diff --git a/go.mod b/go.mod index fb4d220..07d557b 100644 --- a/go.mod +++ b/go.mod @@ -7,19 +7,15 @@ require ( github.com/davecgh/go-spew v1.1.1 github.com/go-test/deep v1.0.3 github.com/google/go-cmp v0.2.0 - github.com/hashicorp/errwrap v0.0.0-20180715044906-d6c0cd880357 // indirect github.com/hashicorp/go-multierror v0.0.0-20180717150148-3d5d8f294aa0 + github.com/hashicorp/hcl2 v0.0.0-20190909202536-66c59f909e25 // indirect github.com/kr/pretty v0.1.0 github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348 github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7 - github.com/pmezard/go-difflib v1.0.0 // indirect github.com/sergi/go-diff v1.0.0 github.com/spf13/pflag v1.0.2 - github.com/stretchr/testify v1.2.2 // indirect github.com/zclconf/go-cty v1.0.0 golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734 - golang.org/x/sys v0.0.0-20190502175342-a43fa875dd82 // indirect - golang.org/x/text v0.3.2 // indirect gopkg.in/yaml.v2 v2.2.2 howett.net/plist v0.0.0-20181124034731-591f970eefbb ) diff --git a/go.sum b/go.sum index f462d1e..ab6ed7d 100644 --- a/go.sum +++ b/go.sum @@ -4,17 +4,24 @@ github.com/apparentlymart/go-dump v0.0.0-20180507223929-23540a00eaa3 h1:ZSTrOEhi github.com/apparentlymart/go-dump v0.0.0-20180507223929-23540a00eaa3/go.mod h1:oL81AME2rN47vu18xqj1S1jPIPuN7afo62yKTNn3XMM= github.com/apparentlymart/go-textseg v1.0.0 h1:rRmlIsPEEhUTIKQb7T++Nz/A5Q6C9IuX2wFoYVvnCs0= github.com/apparentlymart/go-textseg v1.0.0/go.mod h1:z96Txxhf3xSFMPmb5X/1W05FF/Nj9VFpLOpjS5yuumk= +github.com/bsm/go-vlq v0.0.0-20150828105119-ec6e8d4f5f4e/go.mod h1:N+BjUcTjSxc2mtRGSCPsat1kze3CUtvJN3/jTXlp29k= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/go-test/deep v1.0.3 h1:ZrJSEWsXzPOxaZnFteGEfooLba+ju3FYIbOrS+rQd68= github.com/go-test/deep v1.0.3/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA= github.com/golang/protobuf v1.1.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/google/go-cmp v0.2.0 h1:+dTQ8DZQJz0Mb/HjFlkptS1FeQ4cWSnN941F8aEG4SQ= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/hashicorp/errwrap v0.0.0-20180715044906-d6c0cd880357 h1:Rem2+U35z1QtPQc6r+WolF7yXiefXqDKyk+lN2pE164= github.com/hashicorp/errwrap v0.0.0-20180715044906-d6c0cd880357/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/go-multierror v0.0.0-20180717150148-3d5d8f294aa0 h1:j30noezaCfvNLcdMYSvHLv81DxYRSt1grlpseG67vhU= github.com/hashicorp/go-multierror v0.0.0-20180717150148-3d5d8f294aa0/go.mod h1:JMRHfdO9jKNzS/+BTlxCjKNQHg/jZAft8U7LloJvN7I= +github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= +github.com/hashicorp/hcl2 v0.0.0-20190909202536-66c59f909e25 h1:hP3bdZpTEdjGFXQZyeeRsYH1oJgOBGx5sMLYPqZuqOU= +github.com/hashicorp/hcl2 v0.0.0-20190909202536-66c59f909e25/go.mod h1:Cxv+IJLuBiEhQ7pBYGEuORa0nr4U994pE8mYLuFd7v0= +github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= @@ -25,6 +32,9 @@ github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348 h1:MtvEpTB6LX3v github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k= github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7 h1:DpOJ2HYzCv8LZP15IdmG+YdwD2luVPHITV96TkirNBM= github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo= +github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ= @@ -40,8 +50,12 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734 h1:p/H982KKEjUnLJkM3tt/LemDnOc1GiZL5FCVlORJ5zo= golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/net v0.0.0-20180811021610-c39426892332/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190502183928-7f726cade0ab/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190502175342-a43fa875dd82 h1:vsphBvatvfbhlb4PO1BYSr9dzugGxJ/SQHoNufZJq1w= @@ -55,6 +69,8 @@ google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9Ywl gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= +gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= diff --git a/gohcl/decode.go b/gohcl/decode.go index e291e0a..7ba08ee 100644 --- a/gohcl/decode.go +++ b/gohcl/decode.go @@ -6,7 +6,7 @@ import ( "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/hcl/v2/hcl" + "github.com/hashicorp/hcl/v2" "github.com/zclconf/go-cty/cty/convert" "github.com/zclconf/go-cty/cty/gocty" ) diff --git a/gohcl/decode_test.go b/gohcl/decode_test.go index 0fc18ae..b0a9fb6 100644 --- a/gohcl/decode_test.go +++ b/gohcl/decode_test.go @@ -7,8 +7,8 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - "github.com/hashicorp/hcl/v2/hcl" - hclJSON "github.com/hashicorp/hcl/v2/hcl/json" + "github.com/hashicorp/hcl/v2" + hclJSON "github.com/hashicorp/hcl/v2/json" "github.com/zclconf/go-cty/cty" ) diff --git a/gohcl/schema.go b/gohcl/schema.go index 6e4bb75..ecf6ddb 100644 --- a/gohcl/schema.go +++ b/gohcl/schema.go @@ -6,7 +6,7 @@ import ( "sort" "strings" - "github.com/hashicorp/hcl/v2/hcl" + "github.com/hashicorp/hcl/v2" ) // ImpliedBodySchema produces a hcl.BodySchema derived from the type of the diff --git a/gohcl/schema_test.go b/gohcl/schema_test.go index ca4adef..cea77ca 100644 --- a/gohcl/schema_test.go +++ b/gohcl/schema_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - "github.com/hashicorp/hcl/v2/hcl" + "github.com/hashicorp/hcl/v2" ) func TestImpliedBodySchema(t *testing.T) { diff --git a/gohcl/types.go b/gohcl/types.go index 14d4a00..a8d00f8 100644 --- a/gohcl/types.go +++ b/gohcl/types.go @@ -3,7 +3,7 @@ package gohcl import ( "reflect" - "github.com/hashicorp/hcl/v2/hcl" + "github.com/hashicorp/hcl/v2" ) var victimExpr hcl.Expression diff --git a/hcldec/block_labels.go b/hcldec/block_labels.go index a83798e..71de451 100644 --- a/hcldec/block_labels.go +++ b/hcldec/block_labels.go @@ -1,7 +1,7 @@ package hcldec import ( - "github.com/hashicorp/hcl/v2/hcl" + "github.com/hashicorp/hcl/v2" ) type blockLabel struct { diff --git a/hcldec/decode.go b/hcldec/decode.go index 372de2d..c6e4223 100644 --- a/hcldec/decode.go +++ b/hcldec/decode.go @@ -1,7 +1,7 @@ package hcldec import ( - "github.com/hashicorp/hcl/v2/hcl" + "github.com/hashicorp/hcl/v2" "github.com/zclconf/go-cty/cty" ) diff --git a/hcldec/public.go b/hcldec/public.go index ff70e85..1fa548d 100644 --- a/hcldec/public.go +++ b/hcldec/public.go @@ -1,7 +1,7 @@ package hcldec import ( - "github.com/hashicorp/hcl/v2/hcl" + "github.com/hashicorp/hcl/v2" "github.com/zclconf/go-cty/cty" ) diff --git a/hcldec/public_test.go b/hcldec/public_test.go index 0b7638b..20521fb 100644 --- a/hcldec/public_test.go +++ b/hcldec/public_test.go @@ -5,8 +5,8 @@ import ( "reflect" "testing" - "github.com/hashicorp/hcl/v2/hcl" - "github.com/hashicorp/hcl/v2/hcl/hclsyntax" + "github.com/hashicorp/hcl/v2" + "github.com/hashicorp/hcl/v2/hclsyntax" "github.com/zclconf/go-cty/cty" ) diff --git a/hcldec/schema.go b/hcldec/schema.go index 03fb1df..ddbe7fa 100644 --- a/hcldec/schema.go +++ b/hcldec/schema.go @@ -1,7 +1,7 @@ package hcldec import ( - "github.com/hashicorp/hcl/v2/hcl" + "github.com/hashicorp/hcl/v2" ) // ImpliedSchema returns the *hcl.BodySchema implied by the given specification. diff --git a/hcldec/spec.go b/hcldec/spec.go index 8c55b4a..6f2d973 100644 --- a/hcldec/spec.go +++ b/hcldec/spec.go @@ -5,7 +5,7 @@ import ( "fmt" "sort" - "github.com/hashicorp/hcl/v2/hcl" + "github.com/hashicorp/hcl/v2" "github.com/zclconf/go-cty/cty" "github.com/zclconf/go-cty/cty/convert" "github.com/zclconf/go-cty/cty/function" diff --git a/hcldec/spec_test.go b/hcldec/spec_test.go index c51c63a..64ea771 100644 --- a/hcldec/spec_test.go +++ b/hcldec/spec_test.go @@ -7,8 +7,8 @@ import ( "github.com/apparentlymart/go-dump/dump" "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/hcl/v2/hcl" - "github.com/hashicorp/hcl/v2/hcl/hclsyntax" + "github.com/hashicorp/hcl/v2" + "github.com/hashicorp/hcl/v2/hclsyntax" ) // Verify that all of our spec types implement the necessary interfaces diff --git a/hcldec/variables.go b/hcldec/variables.go index 44e5316..f8440eb 100644 --- a/hcldec/variables.go +++ b/hcldec/variables.go @@ -1,7 +1,7 @@ package hcldec import ( - "github.com/hashicorp/hcl/v2/hcl" + "github.com/hashicorp/hcl/v2" ) // Variables processes the given body with the given spec and returns a diff --git a/hcldec/variables_test.go b/hcldec/variables_test.go index b99b648..53bb99d 100644 --- a/hcldec/variables_test.go +++ b/hcldec/variables_test.go @@ -5,8 +5,8 @@ import ( "reflect" "testing" - "github.com/hashicorp/hcl/v2/hcl" - "github.com/hashicorp/hcl/v2/hcl/hclsyntax" + "github.com/hashicorp/hcl/v2" + "github.com/hashicorp/hcl/v2/hclsyntax" "github.com/zclconf/go-cty/cty" ) diff --git a/hcled/navigation.go b/hcled/navigation.go index fd402a6..050ad75 100644 --- a/hcled/navigation.go +++ b/hcled/navigation.go @@ -1,7 +1,7 @@ package hcled import ( - "github.com/hashicorp/hcl/v2/hcl" + "github.com/hashicorp/hcl/v2" ) type contextStringer interface { diff --git a/hclparse/parser.go b/hclparse/parser.go index d1f2f4c..e69b753 100644 --- a/hclparse/parser.go +++ b/hclparse/parser.go @@ -4,9 +4,9 @@ import ( "fmt" "io/ioutil" - "github.com/hashicorp/hcl/v2/hcl" - "github.com/hashicorp/hcl/v2/hcl/hclsyntax" - "github.com/hashicorp/hcl/v2/hcl/json" + "github.com/hashicorp/hcl/v2" + "github.com/hashicorp/hcl/v2/hclsyntax" + "github.com/hashicorp/hcl/v2/json" ) // NOTE: This is the public interface for parsing. The actual parsers are diff --git a/hcl/hclsyntax/diagnostics.go b/hclsyntax/diagnostics.go similarity index 95% rename from hcl/hclsyntax/diagnostics.go rename to hclsyntax/diagnostics.go index 0303668..8c20286 100644 --- a/hcl/hclsyntax/diagnostics.go +++ b/hclsyntax/diagnostics.go @@ -1,7 +1,7 @@ package hclsyntax import ( - "github.com/hashicorp/hcl/v2/hcl" + "github.com/hashicorp/hcl/v2" ) // setDiagEvalContext is an internal helper that will impose a particular diff --git a/hcl/hclsyntax/didyoumean.go b/hclsyntax/didyoumean.go similarity index 100% rename from hcl/hclsyntax/didyoumean.go rename to hclsyntax/didyoumean.go diff --git a/hcl/hclsyntax/didyoumean_test.go b/hclsyntax/didyoumean_test.go similarity index 100% rename from hcl/hclsyntax/didyoumean_test.go rename to hclsyntax/didyoumean_test.go diff --git a/hcl/hclsyntax/doc.go b/hclsyntax/doc.go similarity index 100% rename from hcl/hclsyntax/doc.go rename to hclsyntax/doc.go diff --git a/hcl/hclsyntax/expression.go b/hclsyntax/expression.go similarity index 99% rename from hcl/hclsyntax/expression.go rename to hclsyntax/expression.go index 944f2aa..14ced03 100644 --- a/hcl/hclsyntax/expression.go +++ b/hclsyntax/expression.go @@ -4,7 +4,7 @@ import ( "fmt" "sync" - "github.com/hashicorp/hcl/v2/hcl" + "github.com/hashicorp/hcl/v2" "github.com/zclconf/go-cty/cty" "github.com/zclconf/go-cty/cty/convert" "github.com/zclconf/go-cty/cty/function" diff --git a/hcl/hclsyntax/expression_ops.go b/hclsyntax/expression_ops.go similarity index 99% rename from hcl/hclsyntax/expression_ops.go rename to hclsyntax/expression_ops.go index 9468ce5..c1db0ce 100644 --- a/hcl/hclsyntax/expression_ops.go +++ b/hclsyntax/expression_ops.go @@ -3,7 +3,7 @@ package hclsyntax import ( "fmt" - "github.com/hashicorp/hcl/v2/hcl" + "github.com/hashicorp/hcl/v2" "github.com/zclconf/go-cty/cty" "github.com/zclconf/go-cty/cty/convert" "github.com/zclconf/go-cty/cty/function" diff --git a/hcl/hclsyntax/expression_static_test.go b/hclsyntax/expression_static_test.go similarity index 98% rename from hcl/hclsyntax/expression_static_test.go rename to hclsyntax/expression_static_test.go index e9ab35e..3aeadec 100644 --- a/hcl/hclsyntax/expression_static_test.go +++ b/hclsyntax/expression_static_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/go-test/deep" - "github.com/hashicorp/hcl/v2/hcl" + "github.com/hashicorp/hcl/v2" "github.com/zclconf/go-cty/cty" ) diff --git a/hcl/hclsyntax/expression_template.go b/hclsyntax/expression_template.go similarity index 99% rename from hcl/hclsyntax/expression_template.go rename to hclsyntax/expression_template.go index 68086d3..9d42511 100644 --- a/hcl/hclsyntax/expression_template.go +++ b/hclsyntax/expression_template.go @@ -4,7 +4,7 @@ import ( "bytes" "fmt" - "github.com/hashicorp/hcl/v2/hcl" + "github.com/hashicorp/hcl/v2" "github.com/zclconf/go-cty/cty" "github.com/zclconf/go-cty/cty/convert" ) diff --git a/hcl/hclsyntax/expression_template_test.go b/hclsyntax/expression_template_test.go similarity index 99% rename from hcl/hclsyntax/expression_template_test.go rename to hclsyntax/expression_template_test.go index 2f194fe..aed9e41 100644 --- a/hcl/hclsyntax/expression_template_test.go +++ b/hclsyntax/expression_template_test.go @@ -3,7 +3,7 @@ package hclsyntax import ( "testing" - "github.com/hashicorp/hcl/v2/hcl" + "github.com/hashicorp/hcl/v2" "github.com/zclconf/go-cty/cty" ) diff --git a/hcl/hclsyntax/expression_test.go b/hclsyntax/expression_test.go similarity index 99% rename from hcl/hclsyntax/expression_test.go rename to hclsyntax/expression_test.go index 710f01f..34532a2 100644 --- a/hcl/hclsyntax/expression_test.go +++ b/hclsyntax/expression_test.go @@ -3,7 +3,7 @@ package hclsyntax import ( "testing" - "github.com/hashicorp/hcl/v2/hcl" + "github.com/hashicorp/hcl/v2" "github.com/zclconf/go-cty/cty" "github.com/zclconf/go-cty/cty/function" "github.com/zclconf/go-cty/cty/function/stdlib" diff --git a/hcl/hclsyntax/expression_vars.go b/hclsyntax/expression_vars.go similarity index 97% rename from hcl/hclsyntax/expression_vars.go rename to hclsyntax/expression_vars.go index 4d5ddba..a82bf79 100755 --- a/hcl/hclsyntax/expression_vars.go +++ b/hclsyntax/expression_vars.go @@ -4,7 +4,7 @@ package hclsyntax // Run 'go generate' on this package to update the set of functions here. import ( - "github.com/hashicorp/hcl/v2/hcl" + "github.com/hashicorp/hcl/v2" ) func (e *AnonSymbolExpr) Variables() []hcl.Traversal { diff --git a/hcl/hclsyntax/expression_vars_gen.go b/hclsyntax/expression_vars_gen.go similarity index 98% rename from hcl/hclsyntax/expression_vars_gen.go rename to hclsyntax/expression_vars_gen.go index 3279052..6793771 100644 --- a/hcl/hclsyntax/expression_vars_gen.go +++ b/hclsyntax/expression_vars_gen.go @@ -89,7 +89,7 @@ const outputPreamble = `package hclsyntax // Run 'go generate' on this package to update the set of functions here. import ( - "github.com/hashicorp/hcl/v2/hcl" + "github.com/hashicorp/hcl/v2" )` const outputMethodFmt = ` diff --git a/hcl/hclsyntax/file.go b/hclsyntax/file.go similarity index 90% rename from hcl/hclsyntax/file.go rename to hclsyntax/file.go index 5f07e76..f55e9ce 100644 --- a/hcl/hclsyntax/file.go +++ b/hclsyntax/file.go @@ -1,7 +1,7 @@ package hclsyntax import ( - "github.com/hashicorp/hcl/v2/hcl" + "github.com/hashicorp/hcl/v2" ) // File is the top-level object resulting from parsing a configuration file. diff --git a/hcl/hclsyntax/fuzz/.gitignore b/hclsyntax/fuzz/.gitignore similarity index 100% rename from hcl/hclsyntax/fuzz/.gitignore rename to hclsyntax/fuzz/.gitignore diff --git a/hcl/hclsyntax/fuzz/Makefile b/hclsyntax/fuzz/Makefile similarity index 91% rename from hcl/hclsyntax/fuzz/Makefile rename to hclsyntax/fuzz/Makefile index 3b3d560..ca44fa2 100644 --- a/hcl/hclsyntax/fuzz/Makefile +++ b/hclsyntax/fuzz/Makefile @@ -15,7 +15,7 @@ fuzz-exec-%: fuzz%-fuzz.zip go-fuzz -bin=./fuzz$*-fuzz.zip -workdir=$(FUZZ_WORK_DIR) fuzz%-fuzz.zip: %/fuzz.go - go-fuzz-build github.com/hashicorp/hcl/v2/hcl/hclsyntax/fuzz/$* + go-fuzz-build github.com/hashicorp/hcl/v2/hclsyntax/fuzz/$* tools: go get -u github.com/dvyukov/go-fuzz/go-fuzz diff --git a/hcl/hclsyntax/fuzz/README.md b/hclsyntax/fuzz/README.md similarity index 100% rename from hcl/hclsyntax/fuzz/README.md rename to hclsyntax/fuzz/README.md diff --git a/hcl/hclsyntax/fuzz/config/corpus/attr-expr.hcl b/hclsyntax/fuzz/config/corpus/attr-expr.hcl similarity index 100% rename from hcl/hclsyntax/fuzz/config/corpus/attr-expr.hcl rename to hclsyntax/fuzz/config/corpus/attr-expr.hcl diff --git a/hcl/hclsyntax/fuzz/config/corpus/attr-literal.hcl b/hclsyntax/fuzz/config/corpus/attr-literal.hcl similarity index 100% rename from hcl/hclsyntax/fuzz/config/corpus/attr-literal.hcl rename to hclsyntax/fuzz/config/corpus/attr-literal.hcl diff --git a/hcl/hclsyntax/fuzz/config/corpus/block-attrs.hcl b/hclsyntax/fuzz/config/corpus/block-attrs.hcl similarity index 100% rename from hcl/hclsyntax/fuzz/config/corpus/block-attrs.hcl rename to hclsyntax/fuzz/config/corpus/block-attrs.hcl diff --git a/hcl/hclsyntax/fuzz/config/corpus/block-empty.hcl b/hclsyntax/fuzz/config/corpus/block-empty.hcl similarity index 100% rename from hcl/hclsyntax/fuzz/config/corpus/block-empty.hcl rename to hclsyntax/fuzz/config/corpus/block-empty.hcl diff --git a/hcl/hclsyntax/fuzz/config/corpus/block-nested.hcl b/hclsyntax/fuzz/config/corpus/block-nested.hcl similarity index 100% rename from hcl/hclsyntax/fuzz/config/corpus/block-nested.hcl rename to hclsyntax/fuzz/config/corpus/block-nested.hcl diff --git a/hcl/hclsyntax/fuzz/config/corpus/empty.hcl b/hclsyntax/fuzz/config/corpus/empty.hcl similarity index 100% rename from hcl/hclsyntax/fuzz/config/corpus/empty.hcl rename to hclsyntax/fuzz/config/corpus/empty.hcl diff --git a/hcl/hclsyntax/fuzz/config/corpus/utf8.hcl b/hclsyntax/fuzz/config/corpus/utf8.hcl similarity index 100% rename from hcl/hclsyntax/fuzz/config/corpus/utf8.hcl rename to hclsyntax/fuzz/config/corpus/utf8.hcl diff --git a/hcl/hclsyntax/fuzz/config/fuzz.go b/hclsyntax/fuzz/config/fuzz.go similarity index 71% rename from hcl/hclsyntax/fuzz/config/fuzz.go rename to hclsyntax/fuzz/config/fuzz.go index f787b5a..798fa37 100644 --- a/hcl/hclsyntax/fuzz/config/fuzz.go +++ b/hclsyntax/fuzz/config/fuzz.go @@ -1,8 +1,8 @@ package fuzzconfig import ( - "github.com/hashicorp/hcl/v2/hcl" - "github.com/hashicorp/hcl/v2/hcl/hclsyntax" + "github.com/hashicorp/hcl/v2" + "github.com/hashicorp/hcl/v2/hclsyntax" ) func Fuzz(data []byte) int { diff --git a/hcl/hclsyntax/fuzz/expr/corpus/empty.hcle b/hclsyntax/fuzz/expr/corpus/empty.hcle similarity index 100% rename from hcl/hclsyntax/fuzz/expr/corpus/empty.hcle rename to hclsyntax/fuzz/expr/corpus/empty.hcle diff --git a/hcl/hclsyntax/fuzz/expr/corpus/escape-dollar.hcle b/hclsyntax/fuzz/expr/corpus/escape-dollar.hcle similarity index 100% rename from hcl/hclsyntax/fuzz/expr/corpus/escape-dollar.hcle rename to hclsyntax/fuzz/expr/corpus/escape-dollar.hcle diff --git a/hcl/hclsyntax/fuzz/expr/corpus/escape-newline.hcle b/hclsyntax/fuzz/expr/corpus/escape-newline.hcle similarity index 100% rename from hcl/hclsyntax/fuzz/expr/corpus/escape-newline.hcle rename to hclsyntax/fuzz/expr/corpus/escape-newline.hcle diff --git a/hcl/hclsyntax/fuzz/expr/corpus/function-call.hcle b/hclsyntax/fuzz/expr/corpus/function-call.hcle similarity index 100% rename from hcl/hclsyntax/fuzz/expr/corpus/function-call.hcle rename to hclsyntax/fuzz/expr/corpus/function-call.hcle diff --git a/hcl/hclsyntax/fuzz/expr/corpus/int.hcle b/hclsyntax/fuzz/expr/corpus/int.hcle similarity index 100% rename from hcl/hclsyntax/fuzz/expr/corpus/int.hcle rename to hclsyntax/fuzz/expr/corpus/int.hcle diff --git a/hcl/hclsyntax/fuzz/expr/corpus/literal.hcle b/hclsyntax/fuzz/expr/corpus/literal.hcle similarity index 100% rename from hcl/hclsyntax/fuzz/expr/corpus/literal.hcle rename to hclsyntax/fuzz/expr/corpus/literal.hcle diff --git a/hcl/hclsyntax/fuzz/expr/corpus/splat-attr.hcle b/hclsyntax/fuzz/expr/corpus/splat-attr.hcle similarity index 100% rename from hcl/hclsyntax/fuzz/expr/corpus/splat-attr.hcle rename to hclsyntax/fuzz/expr/corpus/splat-attr.hcle diff --git a/hcl/hclsyntax/fuzz/expr/corpus/splat-full.hcle b/hclsyntax/fuzz/expr/corpus/splat-full.hcle similarity index 100% rename from hcl/hclsyntax/fuzz/expr/corpus/splat-full.hcle rename to hclsyntax/fuzz/expr/corpus/splat-full.hcle diff --git a/hcl/hclsyntax/fuzz/expr/corpus/utf8.hcle b/hclsyntax/fuzz/expr/corpus/utf8.hcle similarity index 100% rename from hcl/hclsyntax/fuzz/expr/corpus/utf8.hcle rename to hclsyntax/fuzz/expr/corpus/utf8.hcle diff --git a/hcl/hclsyntax/fuzz/expr/corpus/var.hcle b/hclsyntax/fuzz/expr/corpus/var.hcle similarity index 100% rename from hcl/hclsyntax/fuzz/expr/corpus/var.hcle rename to hclsyntax/fuzz/expr/corpus/var.hcle diff --git a/hcl/hclsyntax/fuzz/expr/fuzz.go b/hclsyntax/fuzz/expr/fuzz.go similarity index 71% rename from hcl/hclsyntax/fuzz/expr/fuzz.go rename to hclsyntax/fuzz/expr/fuzz.go index 3b219f6..12708e8 100644 --- a/hcl/hclsyntax/fuzz/expr/fuzz.go +++ b/hclsyntax/fuzz/expr/fuzz.go @@ -1,8 +1,8 @@ package fuzzexpr import ( - "github.com/hashicorp/hcl/v2/hcl" - "github.com/hashicorp/hcl/v2/hcl/hclsyntax" + "github.com/hashicorp/hcl/v2" + "github.com/hashicorp/hcl/v2/hclsyntax" ) func Fuzz(data []byte) int { diff --git a/hcl/hclsyntax/fuzz/template/corpus/empty.tmpl b/hclsyntax/fuzz/template/corpus/empty.tmpl similarity index 100% rename from hcl/hclsyntax/fuzz/template/corpus/empty.tmpl rename to hclsyntax/fuzz/template/corpus/empty.tmpl diff --git a/hcl/hclsyntax/fuzz/template/corpus/escape-dollar.tmpl b/hclsyntax/fuzz/template/corpus/escape-dollar.tmpl similarity index 100% rename from hcl/hclsyntax/fuzz/template/corpus/escape-dollar.tmpl rename to hclsyntax/fuzz/template/corpus/escape-dollar.tmpl diff --git a/hcl/hclsyntax/fuzz/template/corpus/escape-newline.tmpl b/hclsyntax/fuzz/template/corpus/escape-newline.tmpl similarity index 100% rename from hcl/hclsyntax/fuzz/template/corpus/escape-newline.tmpl rename to hclsyntax/fuzz/template/corpus/escape-newline.tmpl diff --git a/hcl/hclsyntax/fuzz/template/corpus/function-call.tmpl b/hclsyntax/fuzz/template/corpus/function-call.tmpl similarity index 100% rename from hcl/hclsyntax/fuzz/template/corpus/function-call.tmpl rename to hclsyntax/fuzz/template/corpus/function-call.tmpl diff --git a/hcl/hclsyntax/fuzz/template/corpus/int.tmpl b/hclsyntax/fuzz/template/corpus/int.tmpl similarity index 100% rename from hcl/hclsyntax/fuzz/template/corpus/int.tmpl rename to hclsyntax/fuzz/template/corpus/int.tmpl diff --git a/hcl/hclsyntax/fuzz/template/corpus/just-interp.tmpl b/hclsyntax/fuzz/template/corpus/just-interp.tmpl similarity index 100% rename from hcl/hclsyntax/fuzz/template/corpus/just-interp.tmpl rename to hclsyntax/fuzz/template/corpus/just-interp.tmpl diff --git a/hcl/hclsyntax/fuzz/template/corpus/literal.tmpl b/hclsyntax/fuzz/template/corpus/literal.tmpl similarity index 100% rename from hcl/hclsyntax/fuzz/template/corpus/literal.tmpl rename to hclsyntax/fuzz/template/corpus/literal.tmpl diff --git a/hcl/hclsyntax/fuzz/template/corpus/utf8.tmpl b/hclsyntax/fuzz/template/corpus/utf8.tmpl similarity index 100% rename from hcl/hclsyntax/fuzz/template/corpus/utf8.tmpl rename to hclsyntax/fuzz/template/corpus/utf8.tmpl diff --git a/hcl/hclsyntax/fuzz/template/fuzz.go b/hclsyntax/fuzz/template/fuzz.go similarity index 71% rename from hcl/hclsyntax/fuzz/template/fuzz.go rename to hclsyntax/fuzz/template/fuzz.go index 5ae8643..d17963c 100644 --- a/hcl/hclsyntax/fuzz/template/fuzz.go +++ b/hclsyntax/fuzz/template/fuzz.go @@ -1,8 +1,8 @@ package fuzztemplate import ( - "github.com/hashicorp/hcl/v2/hcl" - "github.com/hashicorp/hcl/v2/hcl/hclsyntax" + "github.com/hashicorp/hcl/v2" + "github.com/hashicorp/hcl/v2/hclsyntax" ) func Fuzz(data []byte) int { diff --git a/hcl/hclsyntax/fuzz/traversal/corpus/attr.hclt b/hclsyntax/fuzz/traversal/corpus/attr.hclt similarity index 100% rename from hcl/hclsyntax/fuzz/traversal/corpus/attr.hclt rename to hclsyntax/fuzz/traversal/corpus/attr.hclt diff --git a/hcl/hclsyntax/fuzz/traversal/corpus/complex.hclt b/hclsyntax/fuzz/traversal/corpus/complex.hclt similarity index 100% rename from hcl/hclsyntax/fuzz/traversal/corpus/complex.hclt rename to hclsyntax/fuzz/traversal/corpus/complex.hclt diff --git a/hcl/hclsyntax/fuzz/traversal/corpus/index.hclt b/hclsyntax/fuzz/traversal/corpus/index.hclt similarity index 100% rename from hcl/hclsyntax/fuzz/traversal/corpus/index.hclt rename to hclsyntax/fuzz/traversal/corpus/index.hclt diff --git a/hcl/hclsyntax/fuzz/traversal/corpus/root.hclt b/hclsyntax/fuzz/traversal/corpus/root.hclt similarity index 100% rename from hcl/hclsyntax/fuzz/traversal/corpus/root.hclt rename to hclsyntax/fuzz/traversal/corpus/root.hclt diff --git a/hcl/hclsyntax/fuzz/traversal/fuzz.go b/hclsyntax/fuzz/traversal/fuzz.go similarity index 72% rename from hcl/hclsyntax/fuzz/traversal/fuzz.go rename to hclsyntax/fuzz/traversal/fuzz.go index d175449..856498f 100644 --- a/hcl/hclsyntax/fuzz/traversal/fuzz.go +++ b/hclsyntax/fuzz/traversal/fuzz.go @@ -1,8 +1,8 @@ package fuzztraversal import ( - "github.com/hashicorp/hcl/v2/hcl" - "github.com/hashicorp/hcl/v2/hcl/hclsyntax" + "github.com/hashicorp/hcl/v2" + "github.com/hashicorp/hcl/v2/hclsyntax" ) func Fuzz(data []byte) int { diff --git a/hcl/hclsyntax/generate.go b/hclsyntax/generate.go similarity index 100% rename from hcl/hclsyntax/generate.go rename to hclsyntax/generate.go diff --git a/hcl/hclsyntax/keywords.go b/hclsyntax/keywords.go similarity index 100% rename from hcl/hclsyntax/keywords.go rename to hclsyntax/keywords.go diff --git a/hcl/hclsyntax/navigation.go b/hclsyntax/navigation.go similarity index 96% rename from hcl/hclsyntax/navigation.go rename to hclsyntax/navigation.go index c752e94..af98ef0 100644 --- a/hcl/hclsyntax/navigation.go +++ b/hclsyntax/navigation.go @@ -4,7 +4,7 @@ import ( "bytes" "fmt" - "github.com/hashicorp/hcl/v2/hcl" + "github.com/hashicorp/hcl/v2" ) type navigation struct { diff --git a/hcl/hclsyntax/navigation_test.go b/hclsyntax/navigation_test.go similarity index 98% rename from hcl/hclsyntax/navigation_test.go rename to hclsyntax/navigation_test.go index 61a057c..f91c077 100644 --- a/hcl/hclsyntax/navigation_test.go +++ b/hclsyntax/navigation_test.go @@ -5,7 +5,7 @@ import ( "strconv" "testing" - "github.com/hashicorp/hcl/v2/hcl" + "github.com/hashicorp/hcl/v2" ) func TestNavigationContextString(t *testing.T) { diff --git a/hcl/hclsyntax/node.go b/hclsyntax/node.go similarity index 94% rename from hcl/hclsyntax/node.go rename to hclsyntax/node.go index 447f895..41b35e5 100644 --- a/hcl/hclsyntax/node.go +++ b/hclsyntax/node.go @@ -1,7 +1,7 @@ package hclsyntax import ( - "github.com/hashicorp/hcl/v2/hcl" + "github.com/hashicorp/hcl/v2" ) // Node is the abstract type that every AST node implements. diff --git a/hcl/hclsyntax/parse_traversal_test.go b/hclsyntax/parse_traversal_test.go similarity index 99% rename from hcl/hclsyntax/parse_traversal_test.go rename to hclsyntax/parse_traversal_test.go index bf074f7..329fe58 100644 --- a/hcl/hclsyntax/parse_traversal_test.go +++ b/hclsyntax/parse_traversal_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/go-test/deep" - "github.com/hashicorp/hcl/v2/hcl" + "github.com/hashicorp/hcl/v2" "github.com/zclconf/go-cty/cty" ) diff --git a/hcl/hclsyntax/parser.go b/hclsyntax/parser.go similarity index 99% rename from hcl/hclsyntax/parser.go rename to hclsyntax/parser.go index 89d1554..34c18c8 100644 --- a/hcl/hclsyntax/parser.go +++ b/hclsyntax/parser.go @@ -7,7 +7,7 @@ import ( "unicode/utf8" "github.com/apparentlymart/go-textseg/textseg" - "github.com/hashicorp/hcl/v2/hcl" + "github.com/hashicorp/hcl/v2" "github.com/zclconf/go-cty/cty" ) diff --git a/hcl/hclsyntax/parser_template.go b/hclsyntax/parser_template.go similarity index 99% rename from hcl/hclsyntax/parser_template.go rename to hclsyntax/parser_template.go index 1a05c99..95eb1a2 100644 --- a/hcl/hclsyntax/parser_template.go +++ b/hclsyntax/parser_template.go @@ -6,7 +6,7 @@ import ( "unicode" "github.com/apparentlymart/go-textseg/textseg" - "github.com/hashicorp/hcl/v2/hcl" + "github.com/hashicorp/hcl/v2" "github.com/zclconf/go-cty/cty" ) diff --git a/hcl/hclsyntax/parser_test.go b/hclsyntax/parser_test.go similarity index 99% rename from hcl/hclsyntax/parser_test.go rename to hclsyntax/parser_test.go index 3a217c2..3df29b7 100644 --- a/hcl/hclsyntax/parser_test.go +++ b/hclsyntax/parser_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/go-test/deep" - "github.com/hashicorp/hcl/v2/hcl" + "github.com/hashicorp/hcl/v2" "github.com/zclconf/go-cty/cty" ) diff --git a/hcl/hclsyntax/parser_traversal.go b/hclsyntax/parser_traversal.go similarity index 99% rename from hcl/hclsyntax/parser_traversal.go rename to hclsyntax/parser_traversal.go index 127a373..7dcb0fd 100644 --- a/hcl/hclsyntax/parser_traversal.go +++ b/hclsyntax/parser_traversal.go @@ -1,7 +1,7 @@ package hclsyntax import ( - "github.com/hashicorp/hcl/v2/hcl" + "github.com/hashicorp/hcl/v2" "github.com/zclconf/go-cty/cty" ) diff --git a/hcl/hclsyntax/peeker.go b/hclsyntax/peeker.go similarity index 99% rename from hcl/hclsyntax/peeker.go rename to hclsyntax/peeker.go index 7e1b7d5..f056f90 100644 --- a/hcl/hclsyntax/peeker.go +++ b/hclsyntax/peeker.go @@ -7,7 +7,7 @@ import ( "runtime" "strings" - "github.com/hashicorp/hcl/v2/hcl" + "github.com/hashicorp/hcl/v2" ) // This is set to true at init() time in tests, to enable more useful output diff --git a/hcl/hclsyntax/peeker_test.go b/hclsyntax/peeker_test.go similarity index 100% rename from hcl/hclsyntax/peeker_test.go rename to hclsyntax/peeker_test.go diff --git a/hcl/hclsyntax/public.go b/hclsyntax/public.go similarity index 99% rename from hcl/hclsyntax/public.go rename to hclsyntax/public.go index 4081090..0b68efd 100644 --- a/hcl/hclsyntax/public.go +++ b/hclsyntax/public.go @@ -1,7 +1,7 @@ package hclsyntax import ( - "github.com/hashicorp/hcl/v2/hcl" + "github.com/hashicorp/hcl/v2" ) // ParseConfig parses the given buffer as a whole HCL config file, returning diff --git a/hcl/hclsyntax/public_test.go b/hclsyntax/public_test.go similarity index 100% rename from hcl/hclsyntax/public_test.go rename to hclsyntax/public_test.go diff --git a/hcl/hclsyntax/scan_string_lit.go b/hclsyntax/scan_string_lit.go similarity index 100% rename from hcl/hclsyntax/scan_string_lit.go rename to hclsyntax/scan_string_lit.go diff --git a/hcl/hclsyntax/scan_string_lit.rl b/hclsyntax/scan_string_lit.rl similarity index 100% rename from hcl/hclsyntax/scan_string_lit.rl rename to hclsyntax/scan_string_lit.rl diff --git a/hcl/hclsyntax/scan_string_lit_test.go b/hclsyntax/scan_string_lit_test.go similarity index 100% rename from hcl/hclsyntax/scan_string_lit_test.go rename to hclsyntax/scan_string_lit_test.go diff --git a/hcl/hclsyntax/scan_tokens.go b/hclsyntax/scan_tokens.go similarity index 99% rename from hcl/hclsyntax/scan_tokens.go rename to hclsyntax/scan_tokens.go index 6601341..794123a 100644 --- a/hcl/hclsyntax/scan_tokens.go +++ b/hclsyntax/scan_tokens.go @@ -5,7 +5,7 @@ package hclsyntax import ( "bytes" - "github.com/hashicorp/hcl/v2/hcl" + "github.com/hashicorp/hcl/v2" ) // This file is generated from scan_tokens.rl. DO NOT EDIT. diff --git a/hcl/hclsyntax/scan_tokens.rl b/hclsyntax/scan_tokens.rl similarity index 99% rename from hcl/hclsyntax/scan_tokens.rl rename to hclsyntax/scan_tokens.rl index 05fff9d..942ad92 100644 --- a/hcl/hclsyntax/scan_tokens.rl +++ b/hclsyntax/scan_tokens.rl @@ -4,7 +4,7 @@ package hclsyntax import ( "bytes" - "github.com/hashicorp/hcl/v2/hcl" + "github.com/hashicorp/hcl/v2" ) // This file is generated from scan_tokens.rl. DO NOT EDIT. diff --git a/hcl/hclsyntax/scan_tokens_test.go b/hclsyntax/scan_tokens_test.go similarity index 99% rename from hcl/hclsyntax/scan_tokens_test.go rename to hclsyntax/scan_tokens_test.go index db5866b..720ac98 100644 --- a/hcl/hclsyntax/scan_tokens_test.go +++ b/hclsyntax/scan_tokens_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/hashicorp/hcl/v2/hcl" + "github.com/hashicorp/hcl/v2" ) func TestScanTokens_normal(t *testing.T) { diff --git a/hcl/hclsyntax/spec.md b/hclsyntax/spec.md similarity index 100% rename from hcl/hclsyntax/spec.md rename to hclsyntax/spec.md diff --git a/hcl/hclsyntax/structure.go b/hclsyntax/structure.go similarity index 99% rename from hcl/hclsyntax/structure.go rename to hclsyntax/structure.go index 4bf21e4..2f7470c 100644 --- a/hcl/hclsyntax/structure.go +++ b/hclsyntax/structure.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/hashicorp/hcl/v2/hcl" + "github.com/hashicorp/hcl/v2" ) // AsHCLBlock returns the block data expressed as a *hcl.Block. diff --git a/hcl/hclsyntax/structure_at_pos.go b/hclsyntax/structure_at_pos.go similarity index 99% rename from hcl/hclsyntax/structure_at_pos.go rename to hclsyntax/structure_at_pos.go index 77e6294..587844a 100644 --- a/hcl/hclsyntax/structure_at_pos.go +++ b/hclsyntax/structure_at_pos.go @@ -1,7 +1,7 @@ package hclsyntax import ( - "github.com/hashicorp/hcl/v2/hcl" + "github.com/hashicorp/hcl/v2" ) // ----------------------------------------------------------------------------- diff --git a/hcl/hclsyntax/structure_at_pos_test.go b/hclsyntax/structure_at_pos_test.go similarity index 99% rename from hcl/hclsyntax/structure_at_pos_test.go rename to hclsyntax/structure_at_pos_test.go index d3788ed..fb87274 100644 --- a/hcl/hclsyntax/structure_at_pos_test.go +++ b/hclsyntax/structure_at_pos_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - "github.com/hashicorp/hcl/v2/hcl" + "github.com/hashicorp/hcl/v2" ) func TestBlocksAtPos(t *testing.T) { diff --git a/hcl/hclsyntax/structure_test.go b/hclsyntax/structure_test.go similarity index 99% rename from hcl/hclsyntax/structure_test.go rename to hclsyntax/structure_test.go index 80e0de6..ec1ff6d 100644 --- a/hcl/hclsyntax/structure_test.go +++ b/hclsyntax/structure_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - "github.com/hashicorp/hcl/v2/hcl" + "github.com/hashicorp/hcl/v2" "github.com/kylelemons/godebug/pretty" "github.com/zclconf/go-cty/cty" ) diff --git a/hcl/hclsyntax/token.go b/hclsyntax/token.go similarity index 99% rename from hcl/hclsyntax/token.go rename to hclsyntax/token.go index 27901e7..c7ffe20 100644 --- a/hcl/hclsyntax/token.go +++ b/hclsyntax/token.go @@ -5,7 +5,7 @@ import ( "fmt" "github.com/apparentlymart/go-textseg/textseg" - "github.com/hashicorp/hcl/v2/hcl" + "github.com/hashicorp/hcl/v2" ) // Token represents a sequence of bytes from some HCL code that has been diff --git a/hcl/hclsyntax/token_type_string.go b/hclsyntax/token_type_string.go similarity index 100% rename from hcl/hclsyntax/token_type_string.go rename to hclsyntax/token_type_string.go diff --git a/hcl/hclsyntax/unicode2ragel.rb b/hclsyntax/unicode2ragel.rb similarity index 100% rename from hcl/hclsyntax/unicode2ragel.rb rename to hclsyntax/unicode2ragel.rb diff --git a/hcl/hclsyntax/unicode_derived.rl b/hclsyntax/unicode_derived.rl similarity index 100% rename from hcl/hclsyntax/unicode_derived.rl rename to hclsyntax/unicode_derived.rl diff --git a/hcl/hclsyntax/variables.go b/hclsyntax/variables.go similarity index 98% rename from hcl/hclsyntax/variables.go rename to hclsyntax/variables.go index 74be757..3d68c41 100644 --- a/hcl/hclsyntax/variables.go +++ b/hclsyntax/variables.go @@ -1,7 +1,7 @@ package hclsyntax import ( - "github.com/hashicorp/hcl/v2/hcl" + "github.com/hashicorp/hcl/v2" ) // Variables returns all of the variables referenced within a given experssion. diff --git a/hcl/hclsyntax/variables_test.go b/hclsyntax/variables_test.go similarity index 99% rename from hcl/hclsyntax/variables_test.go rename to hclsyntax/variables_test.go index 17e72fc..8c22ede 100644 --- a/hcl/hclsyntax/variables_test.go +++ b/hclsyntax/variables_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - "github.com/hashicorp/hcl/v2/hcl" + "github.com/hashicorp/hcl/v2" "github.com/kr/pretty" "github.com/zclconf/go-cty/cty" ) diff --git a/hcl/hclsyntax/walk.go b/hclsyntax/walk.go similarity index 97% rename from hcl/hclsyntax/walk.go rename to hclsyntax/walk.go index 494177f..89bfe67 100644 --- a/hcl/hclsyntax/walk.go +++ b/hclsyntax/walk.go @@ -1,7 +1,7 @@ package hclsyntax import ( - "github.com/hashicorp/hcl/v2/hcl" + "github.com/hashicorp/hcl/v2" ) // VisitFunc is the callback signature for VisitAll. diff --git a/hcl/hclsyntax/walk_test.go b/hclsyntax/walk_test.go similarity index 99% rename from hcl/hclsyntax/walk_test.go rename to hclsyntax/walk_test.go index ae0ff94..5a24260 100644 --- a/hcl/hclsyntax/walk_test.go +++ b/hclsyntax/walk_test.go @@ -8,7 +8,7 @@ import ( "github.com/davecgh/go-spew/spew" "github.com/go-test/deep" - "github.com/hashicorp/hcl/v2/hcl" + "github.com/hashicorp/hcl/v2" ) func TestWalk(t *testing.T) { diff --git a/hcltest/mock.go b/hcltest/mock.go index dfad5de..9e3a746 100644 --- a/hcltest/mock.go +++ b/hcltest/mock.go @@ -3,9 +3,9 @@ package hcltest import ( "fmt" - "github.com/hashicorp/hcl/v2/hcl/hclsyntax" + "github.com/hashicorp/hcl/v2/hclsyntax" - "github.com/hashicorp/hcl/v2/hcl" + "github.com/hashicorp/hcl/v2" "github.com/zclconf/go-cty/cty" ) diff --git a/hcltest/mock_test.go b/hcltest/mock_test.go index f926572..6d823f9 100644 --- a/hcltest/mock_test.go +++ b/hcltest/mock_test.go @@ -5,7 +5,7 @@ import ( "reflect" - "github.com/hashicorp/hcl/v2/hcl" + "github.com/hashicorp/hcl/v2" "github.com/zclconf/go-cty/cty" ) diff --git a/hclwrite/ast_attribute.go b/hclwrite/ast_attribute.go index 677179c..609419f 100644 --- a/hclwrite/ast_attribute.go +++ b/hclwrite/ast_attribute.go @@ -1,7 +1,7 @@ package hclwrite import ( - "github.com/hashicorp/hcl/v2/hcl/hclsyntax" + "github.com/hashicorp/hcl/v2/hclsyntax" ) type Attribute struct { diff --git a/hclwrite/ast_block.go b/hclwrite/ast_block.go index b546de2..fadb2bb 100644 --- a/hclwrite/ast_block.go +++ b/hclwrite/ast_block.go @@ -1,7 +1,7 @@ package hclwrite import ( - "github.com/hashicorp/hcl/v2/hcl/hclsyntax" + "github.com/hashicorp/hcl/v2/hclsyntax" "github.com/zclconf/go-cty/cty" ) diff --git a/hclwrite/ast_body.go b/hclwrite/ast_body.go index f421662..6808373 100644 --- a/hclwrite/ast_body.go +++ b/hclwrite/ast_body.go @@ -1,8 +1,8 @@ package hclwrite import ( - "github.com/hashicorp/hcl/v2/hcl" - "github.com/hashicorp/hcl/v2/hcl/hclsyntax" + "github.com/hashicorp/hcl/v2" + "github.com/hashicorp/hcl/v2/hclsyntax" "github.com/zclconf/go-cty/cty" ) diff --git a/hclwrite/ast_body_test.go b/hclwrite/ast_body_test.go index 3130ae5..231c5e7 100644 --- a/hclwrite/ast_body_test.go +++ b/hclwrite/ast_body_test.go @@ -7,8 +7,8 @@ import ( "github.com/davecgh/go-spew/spew" "github.com/google/go-cmp/cmp" - "github.com/hashicorp/hcl/v2/hcl" - "github.com/hashicorp/hcl/v2/hcl/hclsyntax" + "github.com/hashicorp/hcl/v2" + "github.com/hashicorp/hcl/v2/hclsyntax" "github.com/zclconf/go-cty/cty" ) diff --git a/hclwrite/ast_expression.go b/hclwrite/ast_expression.go index a1caa3a..854e716 100644 --- a/hclwrite/ast_expression.go +++ b/hclwrite/ast_expression.go @@ -3,8 +3,8 @@ package hclwrite import ( "fmt" - "github.com/hashicorp/hcl/v2/hcl" - "github.com/hashicorp/hcl/v2/hcl/hclsyntax" + "github.com/hashicorp/hcl/v2" + "github.com/hashicorp/hcl/v2/hclsyntax" "github.com/zclconf/go-cty/cty" ) diff --git a/hclwrite/examples_test.go b/hclwrite/examples_test.go index 4f00add..78882ef 100644 --- a/hclwrite/examples_test.go +++ b/hclwrite/examples_test.go @@ -3,7 +3,7 @@ package hclwrite_test import ( "fmt" - "github.com/hashicorp/hcl/v2/hcl" + "github.com/hashicorp/hcl/v2" "github.com/hashicorp/hcl/v2/hclwrite" "github.com/zclconf/go-cty/cty" ) diff --git a/hclwrite/format.go b/hclwrite/format.go index 17dbd5e..b94bee3 100644 --- a/hclwrite/format.go +++ b/hclwrite/format.go @@ -1,7 +1,7 @@ package hclwrite import ( - "github.com/hashicorp/hcl/v2/hcl/hclsyntax" + "github.com/hashicorp/hcl/v2/hclsyntax" ) var inKeyword = hclsyntax.Keyword([]byte{'i', 'n'}) diff --git a/hclwrite/format_test.go b/hclwrite/format_test.go index 948206d..241cc7a 100644 --- a/hclwrite/format_test.go +++ b/hclwrite/format_test.go @@ -7,7 +7,7 @@ import ( "reflect" "github.com/davecgh/go-spew/spew" - "github.com/hashicorp/hcl/v2/hcl/hclsyntax" + "github.com/hashicorp/hcl/v2/hclsyntax" ) func TestFormat(t *testing.T) { diff --git a/hclwrite/generate.go b/hclwrite/generate.go index 5ec1dd1..289a30d 100644 --- a/hclwrite/generate.go +++ b/hclwrite/generate.go @@ -5,8 +5,8 @@ import ( "unicode" "unicode/utf8" - "github.com/hashicorp/hcl/v2/hcl" - "github.com/hashicorp/hcl/v2/hcl/hclsyntax" + "github.com/hashicorp/hcl/v2" + "github.com/hashicorp/hcl/v2/hclsyntax" "github.com/zclconf/go-cty/cty" ) diff --git a/hclwrite/generate_test.go b/hclwrite/generate_test.go index a8c215d..7c437e2 100644 --- a/hclwrite/generate_test.go +++ b/hclwrite/generate_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/hashicorp/hcl/v2/hcl/hclsyntax" + "github.com/hashicorp/hcl/v2/hclsyntax" "github.com/zclconf/go-cty/cty" ) diff --git a/hclwrite/native_node_sorter.go b/hclwrite/native_node_sorter.go index 28e740a..cedf686 100644 --- a/hclwrite/native_node_sorter.go +++ b/hclwrite/native_node_sorter.go @@ -1,7 +1,7 @@ package hclwrite import ( - "github.com/hashicorp/hcl/v2/hcl/hclsyntax" + "github.com/hashicorp/hcl/v2/hclsyntax" ) type nativeNodeSorter struct { diff --git a/hclwrite/parser.go b/hclwrite/parser.go index a3cbe3d..d6cf532 100644 --- a/hclwrite/parser.go +++ b/hclwrite/parser.go @@ -4,8 +4,8 @@ import ( "fmt" "sort" - "github.com/hashicorp/hcl/v2/hcl" - "github.com/hashicorp/hcl/v2/hcl/hclsyntax" + "github.com/hashicorp/hcl/v2" + "github.com/hashicorp/hcl/v2/hclsyntax" "github.com/zclconf/go-cty/cty" ) diff --git a/hclwrite/parser_test.go b/hclwrite/parser_test.go index c5d5228..8ac82f5 100644 --- a/hclwrite/parser_test.go +++ b/hclwrite/parser_test.go @@ -11,8 +11,8 @@ import ( "github.com/kylelemons/godebug/pretty" - "github.com/hashicorp/hcl/v2/hcl" - "github.com/hashicorp/hcl/v2/hcl/hclsyntax" + "github.com/hashicorp/hcl/v2" + "github.com/hashicorp/hcl/v2/hclsyntax" ) func TestParse(t *testing.T) { diff --git a/hclwrite/public.go b/hclwrite/public.go index 85f89ed..678a3aa 100644 --- a/hclwrite/public.go +++ b/hclwrite/public.go @@ -3,7 +3,7 @@ package hclwrite import ( "bytes" - "github.com/hashicorp/hcl/v2/hcl" + "github.com/hashicorp/hcl/v2" ) // NewFile creates a new file object that is empty and ready to have constructs diff --git a/hclwrite/round_trip_test.go b/hclwrite/round_trip_test.go index 8536bbd..14001df 100644 --- a/hclwrite/round_trip_test.go +++ b/hclwrite/round_trip_test.go @@ -9,8 +9,8 @@ import ( "github.com/zclconf/go-cty/cty/function" "github.com/zclconf/go-cty/cty/function/stdlib" - "github.com/hashicorp/hcl/v2/hcl" - "github.com/hashicorp/hcl/v2/hcl/hclsyntax" + "github.com/hashicorp/hcl/v2" + "github.com/hashicorp/hcl/v2/hclsyntax" ) func TestRoundTripVerbatim(t *testing.T) { diff --git a/hclwrite/tokens.go b/hclwrite/tokens.go index 6707d89..3bd3e5f 100644 --- a/hclwrite/tokens.go +++ b/hclwrite/tokens.go @@ -5,8 +5,8 @@ import ( "io" "github.com/apparentlymart/go-textseg/textseg" - "github.com/hashicorp/hcl/v2/hcl" - "github.com/hashicorp/hcl/v2/hcl/hclsyntax" + "github.com/hashicorp/hcl/v2" + "github.com/hashicorp/hcl/v2/hclsyntax" ) // Token is a single sequence of bytes annotated with a type. It is similar diff --git a/hcl/integrationtest/doc.go b/integrationtest/doc.go similarity index 100% rename from hcl/integrationtest/doc.go rename to integrationtest/doc.go diff --git a/hcl/integrationtest/terraformlike_test.go b/integrationtest/terraformlike_test.go similarity index 99% rename from hcl/integrationtest/terraformlike_test.go rename to integrationtest/terraformlike_test.go index 40cce96..d397d2c 100644 --- a/hcl/integrationtest/terraformlike_test.go +++ b/integrationtest/terraformlike_test.go @@ -8,9 +8,9 @@ import ( "github.com/davecgh/go-spew/spew" "github.com/hashicorp/hcl/v2/ext/dynblock" "github.com/hashicorp/hcl/v2/gohcl" - "github.com/hashicorp/hcl/v2/hcl" - "github.com/hashicorp/hcl/v2/hcl/hclsyntax" - "github.com/hashicorp/hcl/v2/hcl/json" + "github.com/hashicorp/hcl/v2" + "github.com/hashicorp/hcl/v2/hclsyntax" + "github.com/hashicorp/hcl/v2/json" "github.com/hashicorp/hcl/v2/hcldec" "github.com/zclconf/go-cty/cty" ) diff --git a/hcl/json/ast.go b/json/ast.go similarity index 98% rename from hcl/json/ast.go rename to json/ast.go index d90c107..9c580ca 100644 --- a/hcl/json/ast.go +++ b/json/ast.go @@ -3,7 +3,7 @@ package json import ( "math/big" - "github.com/hashicorp/hcl/v2/hcl" + "github.com/hashicorp/hcl/v2" ) type node interface { diff --git a/hcl/json/didyoumean.go b/json/didyoumean.go similarity index 100% rename from hcl/json/didyoumean.go rename to json/didyoumean.go diff --git a/hcl/json/didyoumean_test.go b/json/didyoumean_test.go similarity index 100% rename from hcl/json/didyoumean_test.go rename to json/didyoumean_test.go diff --git a/hcl/json/doc.go b/json/doc.go similarity index 100% rename from hcl/json/doc.go rename to json/doc.go diff --git a/hcl/json/fuzz/.gitignore b/json/fuzz/.gitignore similarity index 100% rename from hcl/json/fuzz/.gitignore rename to json/fuzz/.gitignore diff --git a/hcl/json/fuzz/Makefile b/json/fuzz/Makefile similarity index 90% rename from hcl/json/fuzz/Makefile rename to json/fuzz/Makefile index 1874772..5897a66 100644 --- a/hcl/json/fuzz/Makefile +++ b/json/fuzz/Makefile @@ -12,7 +12,7 @@ fuzz-exec-%: fuzz%-fuzz.zip go-fuzz -bin=./fuzz$*-fuzz.zip -workdir=$(FUZZ_WORK_DIR) fuzz%-fuzz.zip: %/fuzz.go - go-fuzz-build github.com/hashicorp/hcl/v2/hcl/json/fuzz/$* + go-fuzz-build github.com/hashicorp/hcl/v2/json/fuzz/$* tools: go get -u github.com/dvyukov/go-fuzz/go-fuzz diff --git a/hcl/json/fuzz/README.md b/json/fuzz/README.md similarity index 100% rename from hcl/json/fuzz/README.md rename to json/fuzz/README.md diff --git a/hcl/json/fuzz/config/corpus/attr-expr.hcl.json b/json/fuzz/config/corpus/attr-expr.hcl.json similarity index 100% rename from hcl/json/fuzz/config/corpus/attr-expr.hcl.json rename to json/fuzz/config/corpus/attr-expr.hcl.json diff --git a/hcl/json/fuzz/config/corpus/attr-literal.hcl.json b/json/fuzz/config/corpus/attr-literal.hcl.json similarity index 100% rename from hcl/json/fuzz/config/corpus/attr-literal.hcl.json rename to json/fuzz/config/corpus/attr-literal.hcl.json diff --git a/hcl/json/fuzz/config/corpus/block-attrs.hcl.json b/json/fuzz/config/corpus/block-attrs.hcl.json similarity index 100% rename from hcl/json/fuzz/config/corpus/block-attrs.hcl.json rename to json/fuzz/config/corpus/block-attrs.hcl.json diff --git a/hcl/json/fuzz/config/corpus/block-empty.json b/json/fuzz/config/corpus/block-empty.json similarity index 100% rename from hcl/json/fuzz/config/corpus/block-empty.json rename to json/fuzz/config/corpus/block-empty.json diff --git a/hcl/json/fuzz/config/corpus/block-nested.hcl.json b/json/fuzz/config/corpus/block-nested.hcl.json similarity index 100% rename from hcl/json/fuzz/config/corpus/block-nested.hcl.json rename to json/fuzz/config/corpus/block-nested.hcl.json diff --git a/hcl/json/fuzz/config/corpus/empty.hcl.json b/json/fuzz/config/corpus/empty.hcl.json similarity index 100% rename from hcl/json/fuzz/config/corpus/empty.hcl.json rename to json/fuzz/config/corpus/empty.hcl.json diff --git a/hcl/json/fuzz/config/corpus/list-empty.json b/json/fuzz/config/corpus/list-empty.json similarity index 100% rename from hcl/json/fuzz/config/corpus/list-empty.json rename to json/fuzz/config/corpus/list-empty.json diff --git a/hcl/json/fuzz/config/corpus/list-nested.json b/json/fuzz/config/corpus/list-nested.json similarity index 100% rename from hcl/json/fuzz/config/corpus/list-nested.json rename to json/fuzz/config/corpus/list-nested.json diff --git a/hcl/json/fuzz/config/corpus/list-values.json b/json/fuzz/config/corpus/list-values.json similarity index 100% rename from hcl/json/fuzz/config/corpus/list-values.json rename to json/fuzz/config/corpus/list-values.json diff --git a/hcl/json/fuzz/config/corpus/number-big.hcl.json b/json/fuzz/config/corpus/number-big.hcl.json similarity index 100% rename from hcl/json/fuzz/config/corpus/number-big.hcl.json rename to json/fuzz/config/corpus/number-big.hcl.json diff --git a/hcl/json/fuzz/config/corpus/number-int.hcl.json b/json/fuzz/config/corpus/number-int.hcl.json similarity index 100% rename from hcl/json/fuzz/config/corpus/number-int.hcl.json rename to json/fuzz/config/corpus/number-int.hcl.json diff --git a/hcl/json/fuzz/config/corpus/utf8.hcl.json b/json/fuzz/config/corpus/utf8.hcl.json similarity index 100% rename from hcl/json/fuzz/config/corpus/utf8.hcl.json rename to json/fuzz/config/corpus/utf8.hcl.json diff --git a/hcl/json/fuzz/config/fuzz.go b/json/fuzz/config/fuzz.go similarity index 79% rename from hcl/json/fuzz/config/fuzz.go rename to json/fuzz/config/fuzz.go index 37618ff..aa6214e 100644 --- a/hcl/json/fuzz/config/fuzz.go +++ b/json/fuzz/config/fuzz.go @@ -1,7 +1,7 @@ package fuzzconfig import ( - "github.com/hashicorp/hcl/v2/hcl/json" + "github.com/hashicorp/hcl/v2/json" ) func Fuzz(data []byte) int { diff --git a/hcl/json/navigation.go b/json/navigation.go similarity index 100% rename from hcl/json/navigation.go rename to json/navigation.go diff --git a/hcl/json/navigation_test.go b/json/navigation_test.go similarity index 100% rename from hcl/json/navigation_test.go rename to json/navigation_test.go diff --git a/hcl/json/parser.go b/json/parser.go similarity index 99% rename from hcl/json/parser.go rename to json/parser.go index 6cee32a..7a54c51 100644 --- a/hcl/json/parser.go +++ b/json/parser.go @@ -4,7 +4,7 @@ import ( "encoding/json" "fmt" - "github.com/hashicorp/hcl/v2/hcl" + "github.com/hashicorp/hcl/v2" "github.com/zclconf/go-cty/cty" ) diff --git a/hcl/json/parser_test.go b/json/parser_test.go similarity index 99% rename from hcl/json/parser_test.go rename to json/parser_test.go index 7e8c058..3752a15 100644 --- a/hcl/json/parser_test.go +++ b/json/parser_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/go-test/deep" - "github.com/hashicorp/hcl/v2/hcl" + "github.com/hashicorp/hcl/v2" ) func init() { diff --git a/hcl/json/peeker.go b/json/peeker.go similarity index 100% rename from hcl/json/peeker.go rename to json/peeker.go diff --git a/hcl/json/public.go b/json/public.go similarity index 98% rename from hcl/json/public.go rename to json/public.go index 2cfaa8f..8dc4a36 100644 --- a/hcl/json/public.go +++ b/json/public.go @@ -5,7 +5,7 @@ import ( "io/ioutil" "os" - "github.com/hashicorp/hcl/v2/hcl" + "github.com/hashicorp/hcl/v2" ) // Parse attempts to parse the given buffer as JSON and, if successful, returns diff --git a/hcl/json/public_test.go b/json/public_test.go similarity index 98% rename from hcl/json/public_test.go rename to json/public_test.go index 5918075..fb4a435 100644 --- a/hcl/json/public_test.go +++ b/json/public_test.go @@ -3,7 +3,7 @@ package json import ( "testing" - "github.com/hashicorp/hcl/v2/hcl" + "github.com/hashicorp/hcl/v2" "github.com/zclconf/go-cty/cty" ) diff --git a/hcl/json/scanner.go b/json/scanner.go similarity index 99% rename from hcl/json/scanner.go rename to json/scanner.go index a960512..912eabc 100644 --- a/hcl/json/scanner.go +++ b/json/scanner.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/apparentlymart/go-textseg/textseg" - "github.com/hashicorp/hcl/v2/hcl" + "github.com/hashicorp/hcl/v2" ) //go:generate stringer -type tokenType scanner.go diff --git a/hcl/json/scanner_test.go b/json/scanner_test.go similarity index 99% rename from hcl/json/scanner_test.go rename to json/scanner_test.go index 1bff979..1914cfb 100644 --- a/hcl/json/scanner_test.go +++ b/json/scanner_test.go @@ -6,7 +6,7 @@ import ( "reflect" "testing" - "github.com/hashicorp/hcl/v2/hcl" + "github.com/hashicorp/hcl/v2" ) func TestScan(t *testing.T) { diff --git a/hcl/json/spec.md b/json/spec.md similarity index 100% rename from hcl/json/spec.md rename to json/spec.md diff --git a/hcl/json/structure.go b/json/structure.go similarity index 99% rename from hcl/json/structure.go rename to json/structure.go index db1826a..76c9d73 100644 --- a/hcl/json/structure.go +++ b/json/structure.go @@ -3,8 +3,8 @@ package json import ( "fmt" - "github.com/hashicorp/hcl/v2/hcl" - "github.com/hashicorp/hcl/v2/hcl/hclsyntax" + "github.com/hashicorp/hcl/v2" + "github.com/hashicorp/hcl/v2/hclsyntax" "github.com/zclconf/go-cty/cty" "github.com/zclconf/go-cty/cty/convert" ) diff --git a/hcl/json/structure_test.go b/json/structure_test.go similarity index 99% rename from hcl/json/structure_test.go rename to json/structure_test.go index 8a89ac1..4d53cbd 100644 --- a/hcl/json/structure_test.go +++ b/json/structure_test.go @@ -8,7 +8,7 @@ import ( "github.com/davecgh/go-spew/spew" "github.com/go-test/deep" - "github.com/hashicorp/hcl/v2/hcl" + "github.com/hashicorp/hcl/v2" "github.com/zclconf/go-cty/cty" ) diff --git a/hcl/json/tokentype_string.go b/json/tokentype_string.go similarity index 100% rename from hcl/json/tokentype_string.go rename to json/tokentype_string.go diff --git a/hcl/merged.go b/merged.go similarity index 100% rename from hcl/merged.go rename to merged.go diff --git a/hcl/merged_test.go b/merged_test.go similarity index 100% rename from hcl/merged_test.go rename to merged_test.go diff --git a/hcl/ops.go b/ops.go similarity index 100% rename from hcl/ops.go rename to ops.go diff --git a/hcl/ops_test.go b/ops_test.go similarity index 100% rename from hcl/ops_test.go rename to ops_test.go diff --git a/hcl/pos.go b/pos.go similarity index 100% rename from hcl/pos.go rename to pos.go diff --git a/hcl/pos_scanner.go b/pos_scanner.go similarity index 100% rename from hcl/pos_scanner.go rename to pos_scanner.go diff --git a/hcl/pos_scanner_test.go b/pos_scanner_test.go similarity index 100% rename from hcl/pos_scanner_test.go rename to pos_scanner_test.go diff --git a/hcl/pos_test.go b/pos_test.go similarity index 100% rename from hcl/pos_test.go rename to pos_test.go diff --git a/hcl/schema.go b/schema.go similarity index 100% rename from hcl/schema.go rename to schema.go diff --git a/hcl/spec.md b/spec.md similarity index 100% rename from hcl/spec.md rename to spec.md diff --git a/hcl/spectests/.gitignore b/spectests/.gitignore similarity index 100% rename from hcl/spectests/.gitignore rename to spectests/.gitignore diff --git a/hcl/spectests/spec_test.go b/spectests/spec_test.go similarity index 97% rename from hcl/spectests/spec_test.go rename to spectests/spec_test.go index f48fae0..6a85fd2 100644 --- a/hcl/spectests/spec_test.go +++ b/spectests/spec_test.go @@ -42,7 +42,7 @@ func build() error { } func TestSpec(t *testing.T) { - suiteDir := filepath.Clean("../../specsuite/tests") + suiteDir := filepath.Clean("../specsuite/tests") harness := "./tmp_hclspecsuite" hcldec := "./tmp_hcldec" diff --git a/hcl/static_expr.go b/static_expr.go similarity index 100% rename from hcl/static_expr.go rename to static_expr.go diff --git a/hcl/structure.go b/structure.go similarity index 100% rename from hcl/structure.go rename to structure.go diff --git a/hcl/structure_at_pos.go b/structure_at_pos.go similarity index 100% rename from hcl/structure_at_pos.go rename to structure_at_pos.go diff --git a/hcl/traversal.go b/traversal.go similarity index 100% rename from hcl/traversal.go rename to traversal.go diff --git a/hcl/traversal_for_expr.go b/traversal_for_expr.go similarity index 100% rename from hcl/traversal_for_expr.go rename to traversal_for_expr.go diff --git a/hcl/traversal_for_expr_test.go b/traversal_for_expr_test.go similarity index 100% rename from hcl/traversal_for_expr_test.go rename to traversal_for_expr_test.go