summaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorMartin Atkins <mart@degeneration.co.uk>2019-09-09 15:39:31 -0700
committerMartin Atkins <mart@degeneration.co.uk>2019-09-09 15:46:40 -0700
commit3327dee5673a51b4c44c908170d0ca615d08cddb (patch)
tree08025b332e3a43b73f45410a8b10d9389e4dacf0 /cmd
parentaf14e80638a03002f9e16a3377ac1ec750a4388c (diff)
Change module path to github.com/hashicorp/hcl/v2
This is in preparation for the first v2 release from the main HCL repository.
Diffstat (limited to 'cmd')
-rw-r--r--cmd/hcldec/README.md2
-rw-r--r--cmd/hcldec/diags_json.go2
-rw-r--r--cmd/hcldec/main.go6
-rw-r--r--cmd/hcldec/spec.go8
-rw-r--r--cmd/hcldec/type_expr.go2
-rw-r--r--cmd/hcldec/vars.go2
-rw-r--r--cmd/hclfmt/main.go6
-rw-r--r--cmd/hclspecsuite/diagnostics.go2
-rw-r--r--cmd/hclspecsuite/log.go2
-rw-r--r--cmd/hclspecsuite/main.go4
-rw-r--r--cmd/hclspecsuite/runner.go6
-rw-r--r--cmd/hclspecsuite/test_file.go6
-rw-r--r--cmd/hclspecsuite/traversals.go2
13 files changed, 25 insertions, 25 deletions
diff --git a/cmd/hcldec/README.md b/cmd/hcldec/README.md
index a037a4c..963a89f 100644
--- a/cmd/hcldec/README.md
+++ b/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
diff --git a/cmd/hcldec/diags_json.go b/cmd/hcldec/diags_json.go
index e24181f..d9f2883 100644
--- a/cmd/hcldec/diags_json.go
+++ b/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 {
diff --git a/cmd/hcldec/main.go b/cmd/hcldec/main.go
index 16dbb03..42e4bab 100644
--- a/cmd/hcldec/main.go
+++ b/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"
diff --git a/cmd/hcldec/spec.go b/cmd/hcldec/spec.go
index c8b90d3..6bb5214 100644
--- a/cmd/hcldec/spec.go
+++ b/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"
)
diff --git a/cmd/hcldec/type_expr.go b/cmd/hcldec/type_expr.go
index 559277f..44eed52 100644
--- a/cmd/hcldec/type_expr.go
+++ b/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"
)
diff --git a/cmd/hcldec/vars.go b/cmd/hcldec/vars.go
index f2ec1b4..98450c8 100644
--- a/cmd/hcldec/vars.go
+++ b/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"
)
diff --git a/cmd/hclfmt/main.go b/cmd/hclfmt/main.go
index 5223897..582f183 100644
--- a/cmd/hclfmt/main.go
+++ b/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"
)
diff --git a/cmd/hclspecsuite/diagnostics.go b/cmd/hclspecsuite/diagnostics.go
index a559f1b..97b953f 100644
--- a/cmd/hclspecsuite/diagnostics.go
+++ b/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 {
diff --git a/cmd/hclspecsuite/log.go b/cmd/hclspecsuite/log.go
index d5b5ae5..30c27b9 100644
--- a/cmd/hclspecsuite/log.go
+++ b/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)
diff --git a/cmd/hclspecsuite/main.go b/cmd/hclspecsuite/main.go
index 4db5119..2ba4982 100644
--- a/cmd/hclspecsuite/main.go
+++ b/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() {
diff --git a/cmd/hclspecsuite/runner.go b/cmd/hclspecsuite/runner.go
index b5a309c..856827d 100644
--- a/cmd/hclspecsuite/runner.go
+++ b/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 {
diff --git a/cmd/hclspecsuite/test_file.go b/cmd/hclspecsuite/test_file.go
index cdb384a..52175aa 100644
--- a/cmd/hclspecsuite/test_file.go
+++ b/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 {
diff --git a/cmd/hclspecsuite/traversals.go b/cmd/hclspecsuite/traversals.go
index 160d5b7..98db5a6 100644
--- a/cmd/hclspecsuite/traversals.go
+++ b/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 {