Unfold the "hcl" directory up into the root

The main HCL package is more visible this way, and so it's easier than having to pick it out from dozens of other package directories.
FabPLX · Sep 9, 2019 · 6c43446 · 6c43446
1 parent 0f5ab3b
commit 6c43446
Show file tree

Hide file tree

Showing 219 changed files with 166 additions and 154 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 → diagnostic.go b/hcl/diagnostic.go → diagnostic.go
diff --git a/hcl/diagnostic_text.go → diagnostic_text.go b/hcl/diagnostic_text.go → diagnostic_text.go
diff --git a/hcl/diagnostic_text_test.go → diagnostic_text_test.go b/hcl/diagnostic_text_test.go → diagnostic_text_test.go
diff --git a/hcl/didyoumean.go → didyoumean.go b/hcl/didyoumean.go → didyoumean.go
diff --git a/hcl/doc.go → doc.go b/hcl/doc.go → doc.go
diff --git a/hcl/eval_context.go → eval_context.go b/hcl/eval_context.go → eval_context.go
diff --git a/hcl/expr_call.go → expr_call.go b/hcl/expr_call.go → expr_call.go
diff --git a/hcl/expr_list.go → expr_list.go b/hcl/expr_list.go → expr_list.go
diff --git a/hcl/expr_map.go → expr_map.go b/hcl/expr_map.go → expr_map.go
diff --git a/hcl/expr_unwrap.go → expr_unwrap.go b/hcl/expr_unwrap.go → expr_unwrap.go
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
 )