Change module path to github.com/hashicorp/hcl/v2

This is in preparation for the first v2 release from the main HCL
repository.

cmd/hcldec/README.md

@@ -22,7 +22,7 @@ If you have a working Go development environment, you can install this tool
 with `go get` in the usual way:
 
 ```
-$ go get -u github.com/hashicorp/hcl2/cmd/hcldec
+$ go get -u github.com/hashicorp/hcl/v2/cmd/hcldec
 ```
 
 This will install `hcldec` in `$GOPATH/bin`, which usually places it into

cmd/hcldec/diags_json.go

@@ -4,7 +4,7 @@ import (
  "encoding/json"
  "io"
 
- "github.com/hashicorp/hcl2/hcl"
+ "github.com/hashicorp/hcl/v2/hcl"
 )
 
 type jsonDiagWriter struct {

cmd/hcldec/main.go

@@ -7,9 +7,9 @@ import (
  "os"
  "strings"
 
- "github.com/hashicorp/hcl2/hcl"
- "github.com/hashicorp/hcl2/hcldec"
- "github.com/hashicorp/hcl2/hclparse"
+ "github.com/hashicorp/hcl/v2/hcl"
+ "github.com/hashicorp/hcl/v2/hcldec"
+ "github.com/hashicorp/hcl/v2/hclparse"
  flag "github.com/spf13/pflag"
  "github.com/zclconf/go-cty/cty"
  "github.com/zclconf/go-cty/cty/function"

cmd/hcldec/spec.go

@@ -3,10 +3,10 @@ package main
 import (
  "fmt"
 
- "github.com/hashicorp/hcl2/ext/userfunc"
- "github.com/hashicorp/hcl2/gohcl"
- "github.com/hashicorp/hcl2/hcl"
- "github.com/hashicorp/hcl2/hcldec"
+ "github.com/hashicorp/hcl/v2/ext/userfunc"
+ "github.com/hashicorp/hcl/v2/gohcl"
+ "github.com/hashicorp/hcl/v2/hcl"
+ "github.com/hashicorp/hcl/v2/hcldec"
  "github.com/zclconf/go-cty/cty"
  "github.com/zclconf/go-cty/cty/function"
 )

cmd/hcldec/type_expr.go

@@ -4,7 +4,7 @@ import (
  "fmt"
  "reflect"
 
- "github.com/hashicorp/hcl2/hcl"
+ "github.com/hashicorp/hcl/v2/hcl"
  "github.com/zclconf/go-cty/cty"
  "github.com/zclconf/go-cty/cty/function"
 )

cmd/hcldec/vars.go

@@ -4,7 +4,7 @@ import (
  "fmt"
  "strings"
 
- "github.com/hashicorp/hcl2/hcl"
+ "github.com/hashicorp/hcl/v2/hcl"
  "github.com/zclconf/go-cty/cty"
 )
 

cmd/hclfmt/main.go

@@ -9,9 +9,9 @@ import (
  "os"
  "strings"
 
- "github.com/hashicorp/hcl2/hcl"
- "github.com/hashicorp/hcl2/hclparse"
- "github.com/hashicorp/hcl2/hclwrite"
+ "github.com/hashicorp/hcl/v2/hcl"
+ "github.com/hashicorp/hcl/v2/hclparse"
+ "github.com/hashicorp/hcl/v2/hclwrite"
  "golang.org/x/crypto/ssh/terminal"
 )
 

cmd/hclspecsuite/diagnostics.go

@@ -4,7 +4,7 @@ import (
  "encoding/json"
  "fmt"
 
- "github.com/hashicorp/hcl2/hcl"
+ "github.com/hashicorp/hcl/v2/hcl"
 )
 
 func decodeJSONDiagnostics(src []byte) hcl.Diagnostics {

cmd/hclspecsuite/log.go

@@ -1,7 +1,7 @@
 package main
 
 import (
- "github.com/hashicorp/hcl2/hcl"
+ "github.com/hashicorp/hcl/v2/hcl"
 )
 
 type LogBeginCallback func(testName string, testFile *TestFile)

cmd/hclspecsuite/main.go

@@ -7,8 +7,8 @@ import (
 
  "golang.org/x/crypto/ssh/terminal"
 
- "github.com/hashicorp/hcl2/hcl"
- "github.com/hashicorp/hcl2/hclparse"
+ "github.com/hashicorp/hcl/v2/hcl"
+ "github.com/hashicorp/hcl/v2/hclparse"
 )
 
 func main() {

cmd/hclspecsuite/runner.go

@@ -15,9 +15,9 @@ import (
  "github.com/zclconf/go-cty/cty/convert"
  ctyjson "github.com/zclconf/go-cty/cty/json"
 
- "github.com/hashicorp/hcl2/ext/typeexpr"
- "github.com/hashicorp/hcl2/hcl"
- "github.com/hashicorp/hcl2/hclparse"
+ "github.com/hashicorp/hcl/v2/ext/typeexpr"
+ "github.com/hashicorp/hcl/v2/hcl"
+ "github.com/hashicorp/hcl/v2/hclparse"
 )
 
 type Runner struct {

cmd/hclspecsuite/test_file.go

@@ -6,9 +6,9 @@ import (
  "github.com/zclconf/go-cty/cty"
  "github.com/zclconf/go-cty/cty/convert"
 
- "github.com/hashicorp/hcl2/ext/typeexpr"
- "github.com/hashicorp/hcl2/gohcl"
- "github.com/hashicorp/hcl2/hcl"
+ "github.com/hashicorp/hcl/v2/ext/typeexpr"
+ "github.com/hashicorp/hcl/v2/gohcl"
+ "github.com/hashicorp/hcl/v2/hcl"
 )
 
 type TestFile struct {

cmd/hclspecsuite/traversals.go

@@ -4,7 +4,7 @@ import (
  "fmt"
  "reflect"
 
- "github.com/hashicorp/hcl2/hcl"
+ "github.com/hashicorp/hcl/v2/hcl"
 )
 
 func findTraversalSpec(got hcl.Traversal, candidates []*TestFileExpectTraversal) *TestFileExpectTraversal {

ext/dynblock/expand_body.go

@@ -3,7 +3,7 @@ package dynblock
 import (
  "fmt"
 
- "github.com/hashicorp/hcl2/hcl"
+ "github.com/hashicorp/hcl/v2/hcl"
  "github.com/zclconf/go-cty/cty"
 )
 

ext/dynblock/expand_body_test.go

@@ -3,9 +3,9 @@ package dynblock
 import (
  "testing"
 
- "github.com/hashicorp/hcl2/hcl"
- "github.com/hashicorp/hcl2/hcldec"
- "github.com/hashicorp/hcl2/hcltest"
+ "github.com/hashicorp/hcl/v2/hcl"
+ "github.com/hashicorp/hcl/v2/hcldec"
+ "github.com/hashicorp/hcl/v2/hcltest"
  "github.com/zclconf/go-cty/cty"
 )
 

ext/dynblock/expand_spec.go

@@ -3,7 +3,7 @@ package dynblock
 import (
  "fmt"
 
- "github.com/hashicorp/hcl2/hcl"
+ "github.com/hashicorp/hcl/v2/hcl"
  "github.com/zclconf/go-cty/cty"
  "github.com/zclconf/go-cty/cty/convert"
 )

ext/dynblock/expr_wrap.go

@@ -1,7 +1,7 @@
 package dynblock
 
 import (
- "github.com/hashicorp/hcl2/hcl"
+ "github.com/hashicorp/hcl/v2/hcl"
  "github.com/zclconf/go-cty/cty"
 )
 

ext/dynblock/iteration.go

@@ -1,7 +1,7 @@
 package dynblock
 
 import (
- "github.com/hashicorp/hcl2/hcl"
+ "github.com/hashicorp/hcl/v2/hcl"
  "github.com/zclconf/go-cty/cty"
 )
 

ext/dynblock/public.go

@@ -1,7 +1,7 @@
 package dynblock
 
 import (
- "github.com/hashicorp/hcl2/hcl"
+ "github.com/hashicorp/hcl/v2/hcl"
 )
 
 // Expand "dynamic" blocks in the given body, returning a new body that

ext/dynblock/schema.go

@@ -1,6 +1,6 @@
 package dynblock
 
-import "github.com/hashicorp/hcl2/hcl"
+import "github.com/hashicorp/hcl/v2/hcl"
 
 var dynamicBlockHeaderSchema = hcl.BlockHeaderSchema{
  Type: "dynamic",

ext/dynblock/unknown_body.go

@@ -1,7 +1,7 @@
 package dynblock
 
 import (
- "github.com/hashicorp/hcl2/hcl"
+ "github.com/hashicorp/hcl/v2/hcl"
  "github.com/zclconf/go-cty/cty"
 )
 

ext/dynblock/variables.go

@@ -1,7 +1,7 @@
 package dynblock
 
 import (
- "github.com/hashicorp/hcl2/hcl"
+ "github.com/hashicorp/hcl/v2/hcl"
  "github.com/zclconf/go-cty/cty"
 )
 

ext/dynblock/variables_hcldec.go

@@ -1,8 +1,8 @@
 package dynblock
 
 import (
- "github.com/hashicorp/hcl2/hcl"
- "github.com/hashicorp/hcl2/hcldec"
+ "github.com/hashicorp/hcl/v2/hcl"
+ "github.com/hashicorp/hcl/v2/hcldec"
 )
 
 // VariablesHCLDec is a wrapper around WalkVariables that uses the given hcldec

ext/dynblock/variables_test.go

@@ -4,13 +4,13 @@ import (
  "reflect"
  "testing"
 
- "github.com/hashicorp/hcl2/hcldec"
+ "github.com/hashicorp/hcl/v2/hcldec"
  "github.com/zclconf/go-cty/cty"
 
  "github.com/davecgh/go-spew/spew"
 
- "github.com/hashicorp/hcl2/hcl"
- "github.com/hashicorp/hcl2/hcl/hclsyntax"
+ "github.com/hashicorp/hcl/v2/hcl"
+ "github.com/hashicorp/hcl/v2/hcl/hclsyntax"
 )
 
 func TestVariables(t *testing.T) {

ext/include/file_resolver.go

@@ -4,8 +4,8 @@ import (
  "path/filepath"
  "strings"
 
- "github.com/hashicorp/hcl2/hcl"
- "github.com/hashicorp/hcl2/hclparse"
+ "github.com/hashicorp/hcl/v2/hcl"
+ "github.com/hashicorp/hcl/v2/hclparse"
 )
 
 // FileResolver creates and returns a Resolver that interprets include paths

ext/include/map_resolver.go

@@ -3,7 +3,7 @@ package include
 import (
  "fmt"
 
- "github.com/hashicorp/hcl2/hcl"
+ "github.com/hashicorp/hcl/v2/hcl"
 )
 
 // MapResolver returns a Resolver that consults the given map for preloaded

ext/include/resolver.go

@@ -1,7 +1,7 @@
 package include
 
 import (
- "github.com/hashicorp/hcl2/hcl"
+ "github.com/hashicorp/hcl/v2/hcl"
 )
 
 // A Resolver maps an include path (an arbitrary string, but usually something

ext/include/transformer.go

@@ -1,9 +1,9 @@
 package include
 
 import (
- "github.com/hashicorp/hcl2/ext/transform"
- "github.com/hashicorp/hcl2/gohcl"
- "github.com/hashicorp/hcl2/hcl"
+ "github.com/hashicorp/hcl/v2/ext/transform"
+ "github.com/hashicorp/hcl/v2/gohcl"
+ "github.com/hashicorp/hcl/v2/hcl"
 )
 
 // Transformer builds a transformer that finds any "include" blocks in a body

ext/include/transformer_test.go

@@ -5,9 +5,9 @@ import (
  "testing"
 
  "github.com/davecgh/go-spew/spew"
- "github.com/hashicorp/hcl2/gohcl"
- "github.com/hashicorp/hcl2/hcl"
- "github.com/hashicorp/hcl2/hcltest"
+ "github.com/hashicorp/hcl/v2/gohcl"
+ "github.com/hashicorp/hcl/v2/hcl"
+ "github.com/hashicorp/hcl/v2/hcltest"
  "github.com/zclconf/go-cty/cty"
 )
 

ext/transform/error.go

@@ -1,7 +1,7 @@
 package transform
 
 import (
- "github.com/hashicorp/hcl2/hcl"
+ "github.com/hashicorp/hcl/v2/hcl"
 )
 
 // NewErrorBody returns a hcl.Body that returns the given diagnostics whenever

ext/transform/transform.go

@@ -1,7 +1,7 @@
 package transform
 
 import (
- "github.com/hashicorp/hcl2/hcl"
+ "github.com/hashicorp/hcl/v2/hcl"
 )
 
 // Shallow is equivalent to calling transformer.TransformBody(body), and

ext/transform/transform_test.go

@@ -5,8 +5,8 @@ import (
 
  "reflect"
 
- "github.com/hashicorp/hcl2/hcl"
- "github.com/hashicorp/hcl2/hcltest"
+ "github.com/hashicorp/hcl/v2/hcl"
+ "github.com/hashicorp/hcl/v2/hcltest"
  "github.com/zclconf/go-cty/cty"
 )
 

ext/transform/transformer.go

@@ -1,7 +1,7 @@
 package transform
 
 import (
- "github.com/hashicorp/hcl2/hcl"
+ "github.com/hashicorp/hcl/v2/hcl"
 )
 
 // A Transformer takes a given body, applies some (possibly no-op)

ext/typeexpr/README.md

@@ -35,7 +35,7 @@ to allow only calls and keywords the JSON syntax is able to parse the given
 string directly as an expression, rather than as a template as would be
 the case for normal expression evaluation.
 
-For more information, see [the godoc reference](http:https://godoc.org/github.com/hashicorp/hcl2/ext/typeexpr).
+For more information, see [the godoc reference](http:https://godoc.org/github.com/hashicorp/hcl/v2/ext/typeexpr).
 
 ## Type Expression Syntax
 

ext/typeexpr/get_type.go

@@ -3,7 +3,7 @@ package typeexpr
 import (
  "fmt"
 
- "github.com/hashicorp/hcl2/hcl"
+ "github.com/hashicorp/hcl/v2/hcl"
  "github.com/zclconf/go-cty/cty"
 )
 

ext/typeexpr/get_type_test.go

@@ -3,11 +3,11 @@ package typeexpr
 import (
  "testing"
 
- "github.com/hashicorp/hcl2/gohcl"
+ "github.com/hashicorp/hcl/v2/gohcl"
 
- "github.com/hashicorp/hcl2/hcl"
- "github.com/hashicorp/hcl2/hcl/hclsyntax"
- "github.com/hashicorp/hcl2/hcl/json"
+ "github.com/hashicorp/hcl/v2/hcl"
+ "github.com/hashicorp/hcl/v2/hcl/hclsyntax"
+ "github.com/hashicorp/hcl/v2/hcl/json"
  "github.com/zclconf/go-cty/cty"
 )
 

ext/typeexpr/public.go

@@ -5,9 +5,9 @@ import (
  "fmt"
  "sort"
 
- "github.com/hashicorp/hcl2/hcl/hclsyntax"
+ "github.com/hashicorp/hcl/v2/hcl/hclsyntax"
 
- "github.com/hashicorp/hcl2/hcl"
+ "github.com/hashicorp/hcl/v2/hcl"
  "github.com/zclconf/go-cty/cty"
 )
 

ext/userfunc/README.md

@@ -25,4 +25,4 @@ inclusion in a `hcl.EvalContext`. It also returns a new `cty.Body` that
 contains the remainder of the content from the given body, allowing for
 further processing of remaining content.
 
-For more information, see [the godoc reference](http:https://godoc.org/github.com/hashicorp/hcl2/ext/userfunc).
+For more information, see [the godoc reference](http:https://godoc.org/github.com/hashicorp/hcl/v2/ext/userfunc).