From c3ca111fff25b8babf9eaff4d1b348be3767e926 Mon Sep 17 00:00:00 2001 From: Martin Atkins Date: Mon, 11 Sep 2017 15:38:42 -0700 Subject: Adjust import paths for hashicorp/hcl2 repo This begins 'the great fork' of zcl to HCL. --- ext/include/file_resolver.go | 4 ++-- ext/include/map_resolver.go | 2 +- ext/include/resolver.go | 2 +- ext/include/transformer.go | 6 +++--- ext/include/transformer_test.go | 6 +++--- ext/transform/error.go | 2 +- ext/transform/transform.go | 2 +- ext/transform/transform_test.go | 4 ++-- ext/transform/transformer.go | 2 +- ext/userfunc/decode.go | 4 ++-- ext/userfunc/decode_test.go | 4 ++-- ext/userfunc/public.go | 2 +- 12 files changed, 20 insertions(+), 20 deletions(-) (limited to 'ext') diff --git a/ext/include/file_resolver.go b/ext/include/file_resolver.go index 5e5578b..d1d73e5 100644 --- a/ext/include/file_resolver.go +++ b/ext/include/file_resolver.go @@ -4,8 +4,8 @@ import ( "path/filepath" "strings" - "github.com/zclconf/go-zcl/zcl" - "github.com/zclconf/go-zcl/zclparse" + "github.com/hashicorp/hcl2/zcl" + "github.com/hashicorp/hcl2/zclparse" ) // FileResolver creates and returns a Resolver that interprets include paths diff --git a/ext/include/map_resolver.go b/ext/include/map_resolver.go index 0711067..091a3db 100644 --- a/ext/include/map_resolver.go +++ b/ext/include/map_resolver.go @@ -3,7 +3,7 @@ package include import ( "fmt" - "github.com/zclconf/go-zcl/zcl" + "github.com/hashicorp/hcl2/zcl" ) // MapResolver returns a Resolver that consults the given map for preloaded diff --git a/ext/include/resolver.go b/ext/include/resolver.go index 824407d..13b0d9f 100644 --- a/ext/include/resolver.go +++ b/ext/include/resolver.go @@ -1,7 +1,7 @@ package include import ( - "github.com/zclconf/go-zcl/zcl" + "github.com/hashicorp/hcl2/zcl" ) // 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 a7447f0..43d7b50 100644 --- a/ext/include/transformer.go +++ b/ext/include/transformer.go @@ -1,9 +1,9 @@ package include import ( - "github.com/zclconf/go-zcl/ext/transform" - "github.com/zclconf/go-zcl/gozcl" - "github.com/zclconf/go-zcl/zcl" + "github.com/hashicorp/hcl2/ext/transform" + "github.com/hashicorp/hcl2/gozcl" + "github.com/hashicorp/hcl2/zcl" ) // 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 4babbc8..9fddb6b 100644 --- a/ext/include/transformer_test.go +++ b/ext/include/transformer_test.go @@ -5,10 +5,10 @@ import ( "testing" "github.com/davecgh/go-spew/spew" + "github.com/hashicorp/hcl2/gozcl" + "github.com/hashicorp/hcl2/zcl" + "github.com/hashicorp/hcl2/zcltest" "github.com/zclconf/go-cty/cty" - "github.com/zclconf/go-zcl/gozcl" - "github.com/zclconf/go-zcl/zcl" - "github.com/zclconf/go-zcl/zcltest" ) func TestTransformer(t *testing.T) { diff --git a/ext/transform/error.go b/ext/transform/error.go index 40b1015..e21024c 100644 --- a/ext/transform/error.go +++ b/ext/transform/error.go @@ -1,7 +1,7 @@ package transform import ( - "github.com/zclconf/go-zcl/zcl" + "github.com/hashicorp/hcl2/zcl" ) // NewErrorBody returns a zcl.Body that returns the given diagnostics whenever diff --git a/ext/transform/transform.go b/ext/transform/transform.go index fe35bbd..0c683ba 100644 --- a/ext/transform/transform.go +++ b/ext/transform/transform.go @@ -1,7 +1,7 @@ package transform import ( - "github.com/zclconf/go-zcl/zcl" + "github.com/hashicorp/hcl2/zcl" ) // Shallow is equivalent to calling transformer.TransformBody(body), and diff --git a/ext/transform/transform_test.go b/ext/transform/transform_test.go index 7e3c264..a75dc0e 100644 --- a/ext/transform/transform_test.go +++ b/ext/transform/transform_test.go @@ -5,9 +5,9 @@ import ( "reflect" + "github.com/hashicorp/hcl2/zcl" + "github.com/hashicorp/hcl2/zcltest" "github.com/zclconf/go-cty/cty" - "github.com/zclconf/go-zcl/zcl" - "github.com/zclconf/go-zcl/zcltest" ) // Assert that deepWrapper implements Body diff --git a/ext/transform/transformer.go b/ext/transform/transformer.go index 1fcb5ea..d88c128 100644 --- a/ext/transform/transformer.go +++ b/ext/transform/transformer.go @@ -1,7 +1,7 @@ package transform import ( - "github.com/zclconf/go-zcl/zcl" + "github.com/hashicorp/hcl2/zcl" ) // A Transformer takes a given body, applies some (possibly no-op) diff --git a/ext/userfunc/decode.go b/ext/userfunc/decode.go index d1e4ffe..15b9e53 100644 --- a/ext/userfunc/decode.go +++ b/ext/userfunc/decode.go @@ -1,10 +1,10 @@ package userfunc import ( + "github.com/hashicorp/hcl2/gozcl" + "github.com/hashicorp/hcl2/zcl" "github.com/zclconf/go-cty/cty" "github.com/zclconf/go-cty/cty/function" - "github.com/zclconf/go-zcl/gozcl" - "github.com/zclconf/go-zcl/zcl" ) var funcBodySchema = &zcl.BodySchema{ diff --git a/ext/userfunc/decode_test.go b/ext/userfunc/decode_test.go index 2533979..00be2b1 100644 --- a/ext/userfunc/decode_test.go +++ b/ext/userfunc/decode_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" + "github.com/hashicorp/hcl2/zcl" + "github.com/hashicorp/hcl2/zcl/zclsyntax" "github.com/zclconf/go-cty/cty" - "github.com/zclconf/go-zcl/zcl" - "github.com/zclconf/go-zcl/zcl/zclsyntax" ) func TestDecodeUserFunctions(t *testing.T) { diff --git a/ext/userfunc/public.go b/ext/userfunc/public.go index 169278b..413e9cc 100644 --- a/ext/userfunc/public.go +++ b/ext/userfunc/public.go @@ -1,8 +1,8 @@ package userfunc import ( + "github.com/hashicorp/hcl2/zcl" "github.com/zclconf/go-cty/cty/function" - "github.com/zclconf/go-zcl/zcl" ) // A ContextFunc is a callback used to produce the base EvalContext for -- cgit v1.2.3