From c3ca111fff25b8babf9eaff4d1b348be3767e926 Mon Sep 17 00:00:00 2001 From: Martin Atkins Date: Mon, 11 Sep 2017 15:38:42 -0700 Subject: [PATCH] Adjust import paths for hashicorp/hcl2 repo This begins 'the great fork' of zcl to HCL. --- cmd/zclfmt/main.go | 6 +++--- 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 +- gozcl/decode.go | 2 +- gozcl/decode_test.go | 6 +++--- gozcl/schema.go | 2 +- gozcl/schema_test.go | 2 +- gozcl/types.go | 2 +- zcl/hclhil/parser.go | 2 +- zcl/hclhil/public.go | 2 +- zcl/hclhil/shim.go | 2 +- zcl/hclhil/structure.go | 2 +- zcl/hclhil/structure_test.go | 2 +- zcl/hclhil/template.go | 6 +++--- zcl/hclhil/template_test.go | 2 +- zcl/json/ast.go | 2 +- zcl/json/parser.go | 2 +- zcl/json/parser_test.go | 2 +- zcl/json/public.go | 2 +- zcl/json/public_test.go | 2 +- zcl/json/scanner.go | 2 +- zcl/json/scanner_test.go | 2 +- zcl/json/structure.go | 6 +++--- zcl/json/structure_test.go | 2 +- zcl/zclsyntax/expression.go | 2 +- zcl/zclsyntax/expression_ops.go | 2 +- zcl/zclsyntax/expression_template.go | 2 +- zcl/zclsyntax/expression_template_test.go | 2 +- zcl/zclsyntax/expression_test.go | 2 +- zcl/zclsyntax/expression_vars.go | 2 +- zcl/zclsyntax/file.go | 2 +- zcl/zclsyntax/node.go | 2 +- zcl/zclsyntax/parse_traversal_test.go | 2 +- zcl/zclsyntax/parser.go | 2 +- zcl/zclsyntax/parser_template.go | 2 +- zcl/zclsyntax/parser_test.go | 2 +- zcl/zclsyntax/parser_traversal.go | 2 +- zcl/zclsyntax/peeker.go | 2 +- zcl/zclsyntax/public.go | 2 +- zcl/zclsyntax/scan_tokens.go | 2 +- zcl/zclsyntax/scan_tokens_test.go | 2 +- zcl/zclsyntax/structure.go | 2 +- zcl/zclsyntax/structure_test.go | 2 +- zcl/zclsyntax/token.go | 2 +- zcl/zclsyntax/variables.go | 2 +- zcl/zclsyntax/variables_test.go | 2 +- zcl/zclsyntax/walk.go | 2 +- zcldec/decode.go | 2 +- zcldec/public.go | 2 +- zcldec/public_test.go | 4 ++-- zcldec/schema.go | 2 +- zcldec/spec.go | 2 +- zcldec/variables.go | 2 +- zcldec/variables_test.go | 4 ++-- zcled/navigation.go | 2 +- zclparse/parser.go | 8 ++++---- zcltest/mock.go | 2 +- zcltest/mock_test.go | 2 +- zclwrite/ast.go | 2 +- zclwrite/ast_test.go | 4 ++-- zclwrite/format.go | 2 +- zclwrite/format_test.go | 2 +- zclwrite/native_node_sorter.go | 2 +- zclwrite/parser.go | 4 ++-- zclwrite/parser_test.go | 4 ++-- zclwrite/public.go | 2 +- zclwrite/round_trip_test.go | 4 ++-- zclwrite/tokens.go | 2 +- 78 files changed, 103 insertions(+), 103 deletions(-) diff --git a/cmd/zclfmt/main.go b/cmd/zclfmt/main.go index fdaebba..6ccff3d 100644 --- a/cmd/zclfmt/main.go +++ b/cmd/zclfmt/main.go @@ -9,9 +9,9 @@ import ( "os" "strings" - "github.com/zclconf/go-zcl/zcl" - "github.com/zclconf/go-zcl/zclparse" - "github.com/zclconf/go-zcl/zclwrite" + "github.com/hashicorp/hcl2/zcl" + "github.com/hashicorp/hcl2/zclparse" + "github.com/hashicorp/hcl2/zclwrite" "golang.org/x/crypto/ssh/terminal" ) 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 diff --git a/gozcl/decode.go b/gozcl/decode.go index 93c7557..8f54e8a 100644 --- a/gozcl/decode.go +++ b/gozcl/decode.go @@ -4,9 +4,9 @@ import ( "fmt" "reflect" + "github.com/hashicorp/hcl2/zcl" "github.com/zclconf/go-cty/cty/convert" "github.com/zclconf/go-cty/cty/gocty" - "github.com/zclconf/go-zcl/zcl" ) // DecodeBody extracts the configuration within the given body into the given diff --git a/gozcl/decode_test.go b/gozcl/decode_test.go index 71cd0ea..addb744 100644 --- a/gozcl/decode_test.go +++ b/gozcl/decode_test.go @@ -6,10 +6,10 @@ import ( "reflect" "testing" - "github.com/zclconf/go-cty/cty" - "github.com/zclconf/go-zcl/zcl" - zclJSON "github.com/zclconf/go-zcl/zcl/json" "github.com/davecgh/go-spew/spew" + "github.com/hashicorp/hcl2/zcl" + zclJSON "github.com/hashicorp/hcl2/zcl/json" + "github.com/zclconf/go-cty/cty" ) func TestDecodeBody(t *testing.T) { diff --git a/gozcl/schema.go b/gozcl/schema.go index 06c767c..85d5fee 100644 --- a/gozcl/schema.go +++ b/gozcl/schema.go @@ -6,7 +6,7 @@ import ( "sort" "strings" - "github.com/zclconf/go-zcl/zcl" + "github.com/hashicorp/hcl2/zcl" ) // ImpliedBodySchema produces a zcl.BodySchema derived from the type of the diff --git a/gozcl/schema_test.go b/gozcl/schema_test.go index bb65f5f..9d884c2 100644 --- a/gozcl/schema_test.go +++ b/gozcl/schema_test.go @@ -5,8 +5,8 @@ import ( "reflect" "testing" - "github.com/zclconf/go-zcl/zcl" "github.com/davecgh/go-spew/spew" + "github.com/hashicorp/hcl2/zcl" ) func TestImpliedBodySchema(t *testing.T) { diff --git a/gozcl/types.go b/gozcl/types.go index 7d79ffb..cfd37b2 100644 --- a/gozcl/types.go +++ b/gozcl/types.go @@ -3,7 +3,7 @@ package gozcl import ( "reflect" - "github.com/zclconf/go-zcl/zcl" + "github.com/hashicorp/hcl2/zcl" ) var victimExpr zcl.Expression diff --git a/zcl/hclhil/parser.go b/zcl/hclhil/parser.go index 51211a4..8be63e6 100644 --- a/zcl/hclhil/parser.go +++ b/zcl/hclhil/parser.go @@ -3,9 +3,9 @@ package hclhil import ( "fmt" - "github.com/zclconf/go-zcl/zcl" "github.com/hashicorp/hcl" hclast "github.com/hashicorp/hcl/hcl/ast" + "github.com/hashicorp/hcl2/zcl" ) func parse(src []byte, filename string) (*zcl.File, zcl.Diagnostics) { diff --git a/zcl/hclhil/public.go b/zcl/hclhil/public.go index 987b98e..604578a 100644 --- a/zcl/hclhil/public.go +++ b/zcl/hclhil/public.go @@ -5,7 +5,7 @@ import ( "io/ioutil" "os" - "github.com/zclconf/go-zcl/zcl" + "github.com/hashicorp/hcl2/zcl" ) // Parse attempts to parse the given buffer as HCL with HIL expressions and, diff --git a/zcl/hclhil/shim.go b/zcl/hclhil/shim.go index 64adcb8..a5cfccc 100644 --- a/zcl/hclhil/shim.go +++ b/zcl/hclhil/shim.go @@ -1,9 +1,9 @@ package hclhil import ( - "github.com/zclconf/go-zcl/zcl" hclparser "github.com/hashicorp/hcl/hcl/parser" hcltoken "github.com/hashicorp/hcl/hcl/token" + "github.com/hashicorp/hcl2/zcl" hilast "github.com/hashicorp/hil/ast" hilparser "github.com/hashicorp/hil/parser" ) diff --git a/zcl/hclhil/structure.go b/zcl/hclhil/structure.go index c685523..71f540f 100644 --- a/zcl/hclhil/structure.go +++ b/zcl/hclhil/structure.go @@ -6,8 +6,8 @@ import ( hclast "github.com/hashicorp/hcl/hcl/ast" hcltoken "github.com/hashicorp/hcl/hcl/token" + "github.com/hashicorp/hcl2/zcl" "github.com/zclconf/go-cty/cty" - "github.com/zclconf/go-zcl/zcl" ) // body is our implementation of zcl.Body in terms of an HCL ObjectList diff --git a/zcl/hclhil/structure_test.go b/zcl/hclhil/structure_test.go index 67dc151..38fe1fc 100644 --- a/zcl/hclhil/structure_test.go +++ b/zcl/hclhil/structure_test.go @@ -8,8 +8,8 @@ import ( "github.com/davecgh/go-spew/spew" hclast "github.com/hashicorp/hcl/hcl/ast" hcltoken "github.com/hashicorp/hcl/hcl/token" + "github.com/hashicorp/hcl2/zcl" "github.com/zclconf/go-cty/cty" - "github.com/zclconf/go-zcl/zcl" ) func TestBodyPartialContent(t *testing.T) { diff --git a/zcl/hclhil/template.go b/zcl/hclhil/template.go index 8e63511..db95ea8 100644 --- a/zcl/hclhil/template.go +++ b/zcl/hclhil/template.go @@ -5,11 +5,11 @@ import ( "strconv" "strings" - "github.com/zclconf/go-cty/cty" - "github.com/zclconf/go-cty/cty/function" - "github.com/zclconf/go-zcl/zcl" + "github.com/hashicorp/hcl2/zcl" "github.com/hashicorp/hil" hilast "github.com/hashicorp/hil/ast" + "github.com/zclconf/go-cty/cty" + "github.com/zclconf/go-cty/cty/function" ) func parseTemplate(src []byte, filename string, startPos zcl.Pos) (zcl.Expression, zcl.Diagnostics) { diff --git a/zcl/hclhil/template_test.go b/zcl/hclhil/template_test.go index 5faf8bf..367c3d7 100644 --- a/zcl/hclhil/template_test.go +++ b/zcl/hclhil/template_test.go @@ -3,10 +3,10 @@ package hclhil import ( "testing" + "github.com/hashicorp/hcl2/zcl" "github.com/zclconf/go-cty/cty" "github.com/zclconf/go-cty/cty/function" "github.com/zclconf/go-cty/cty/function/stdlib" - "github.com/zclconf/go-zcl/zcl" ) func TestTemplateExpression(t *testing.T) { diff --git a/zcl/json/ast.go b/zcl/json/ast.go index cda261e..93cc9c3 100644 --- a/zcl/json/ast.go +++ b/zcl/json/ast.go @@ -3,7 +3,7 @@ package json import ( "math/big" - "github.com/zclconf/go-zcl/zcl" + "github.com/hashicorp/hcl2/zcl" ) type node interface { diff --git a/zcl/json/parser.go b/zcl/json/parser.go index db5151b..e72028c 100644 --- a/zcl/json/parser.go +++ b/zcl/json/parser.go @@ -5,7 +5,7 @@ import ( "fmt" "math/big" - "github.com/zclconf/go-zcl/zcl" + "github.com/hashicorp/hcl2/zcl" ) func parseFileContent(buf []byte, filename string) (node, zcl.Diagnostics) { diff --git a/zcl/json/parser_test.go b/zcl/json/parser_test.go index 61cf6d7..b1bf95c 100644 --- a/zcl/json/parser_test.go +++ b/zcl/json/parser_test.go @@ -5,8 +5,8 @@ import ( "reflect" "testing" - "github.com/zclconf/go-zcl/zcl" "github.com/davecgh/go-spew/spew" + "github.com/hashicorp/hcl2/zcl" ) func TestParse(t *testing.T) { diff --git a/zcl/json/public.go b/zcl/json/public.go index dcdb8ec..aeb22ff 100644 --- a/zcl/json/public.go +++ b/zcl/json/public.go @@ -5,7 +5,7 @@ import ( "io/ioutil" "os" - "github.com/zclconf/go-zcl/zcl" + "github.com/hashicorp/hcl2/zcl" ) // Parse attempts to parse the given buffer as JSON and, if successful, returns diff --git a/zcl/json/public_test.go b/zcl/json/public_test.go index e226b53..ec3b488 100644 --- a/zcl/json/public_test.go +++ b/zcl/json/public_test.go @@ -3,8 +3,8 @@ package json import ( "testing" + "github.com/hashicorp/hcl2/zcl" "github.com/zclconf/go-cty/cty" - "github.com/zclconf/go-zcl/zcl" ) func TestParse_nonObject(t *testing.T) { diff --git a/zcl/json/scanner.go b/zcl/json/scanner.go index 03a99b8..f56ff5d 100644 --- a/zcl/json/scanner.go +++ b/zcl/json/scanner.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/apparentlymart/go-textseg/textseg" - "github.com/zclconf/go-zcl/zcl" + "github.com/hashicorp/hcl2/zcl" ) //go:generate stringer -type tokenType scanner.go diff --git a/zcl/json/scanner_test.go b/zcl/json/scanner_test.go index 080930e..0abf92d 100644 --- a/zcl/json/scanner_test.go +++ b/zcl/json/scanner_test.go @@ -6,7 +6,7 @@ import ( "reflect" "testing" - "github.com/zclconf/go-zcl/zcl" + "github.com/hashicorp/hcl2/zcl" ) func TestScan(t *testing.T) { diff --git a/zcl/json/structure.go b/zcl/json/structure.go index 25b3734..ebfe565 100644 --- a/zcl/json/structure.go +++ b/zcl/json/structure.go @@ -3,10 +3,10 @@ package json import ( "fmt" + "github.com/hashicorp/hcl2/zcl" + "github.com/hashicorp/hcl2/zcl/hclhil" + "github.com/hashicorp/hcl2/zcl/zclsyntax" "github.com/zclconf/go-cty/cty" - "github.com/zclconf/go-zcl/zcl" - "github.com/zclconf/go-zcl/zcl/hclhil" - "github.com/zclconf/go-zcl/zcl/zclsyntax" ) // body is the implementation of "Body" used for files processed with the JSON diff --git a/zcl/json/structure_test.go b/zcl/json/structure_test.go index 72031d2..48e9734 100644 --- a/zcl/json/structure_test.go +++ b/zcl/json/structure_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - "github.com/zclconf/go-zcl/zcl" + "github.com/hashicorp/hcl2/zcl" ) func TestBodyPartialContent(t *testing.T) { diff --git a/zcl/zclsyntax/expression.go b/zcl/zclsyntax/expression.go index 9a69956..2669ee0 100644 --- a/zcl/zclsyntax/expression.go +++ b/zcl/zclsyntax/expression.go @@ -3,10 +3,10 @@ package zclsyntax import ( "fmt" + "github.com/hashicorp/hcl2/zcl" "github.com/zclconf/go-cty/cty" "github.com/zclconf/go-cty/cty/convert" "github.com/zclconf/go-cty/cty/function" - "github.com/zclconf/go-zcl/zcl" ) // Expression is the abstract type for nodes that behave as zcl expressions. diff --git a/zcl/zclsyntax/expression_ops.go b/zcl/zclsyntax/expression_ops.go index 60c156c..a460b90 100644 --- a/zcl/zclsyntax/expression_ops.go +++ b/zcl/zclsyntax/expression_ops.go @@ -3,11 +3,11 @@ package zclsyntax import ( "fmt" + "github.com/hashicorp/hcl2/zcl" "github.com/zclconf/go-cty/cty" "github.com/zclconf/go-cty/cty/convert" "github.com/zclconf/go-cty/cty/function" "github.com/zclconf/go-cty/cty/function/stdlib" - "github.com/zclconf/go-zcl/zcl" ) type Operation struct { diff --git a/zcl/zclsyntax/expression_template.go b/zcl/zclsyntax/expression_template.go index 635db6b..ffd1397 100644 --- a/zcl/zclsyntax/expression_template.go +++ b/zcl/zclsyntax/expression_template.go @@ -4,9 +4,9 @@ import ( "bytes" "fmt" + "github.com/hashicorp/hcl2/zcl" "github.com/zclconf/go-cty/cty" "github.com/zclconf/go-cty/cty/convert" - "github.com/zclconf/go-zcl/zcl" ) type TemplateExpr struct { diff --git a/zcl/zclsyntax/expression_template_test.go b/zcl/zclsyntax/expression_template_test.go index 7d89042..bb0b7e6 100644 --- a/zcl/zclsyntax/expression_template_test.go +++ b/zcl/zclsyntax/expression_template_test.go @@ -3,8 +3,8 @@ package zclsyntax import ( "testing" + "github.com/hashicorp/hcl2/zcl" "github.com/zclconf/go-cty/cty" - "github.com/zclconf/go-zcl/zcl" ) func TestTemplateExprParseAndValue(t *testing.T) { diff --git a/zcl/zclsyntax/expression_test.go b/zcl/zclsyntax/expression_test.go index 652a7de..332bfa3 100644 --- a/zcl/zclsyntax/expression_test.go +++ b/zcl/zclsyntax/expression_test.go @@ -3,10 +3,10 @@ package zclsyntax import ( "testing" + "github.com/hashicorp/hcl2/zcl" "github.com/zclconf/go-cty/cty" "github.com/zclconf/go-cty/cty/function" "github.com/zclconf/go-cty/cty/function/stdlib" - "github.com/zclconf/go-zcl/zcl" ) func TestExpressionParseAndValue(t *testing.T) { diff --git a/zcl/zclsyntax/expression_vars.go b/zcl/zclsyntax/expression_vars.go index a0bfea5..950941e 100755 --- a/zcl/zclsyntax/expression_vars.go +++ b/zcl/zclsyntax/expression_vars.go @@ -4,7 +4,7 @@ package zclsyntax // Run 'go generate' on this package to update the set of functions here. import ( - "github.com/zclconf/go-zcl/zcl" + "github.com/hashicorp/hcl2/zcl" ) func (e *AnonSymbolExpr) Variables() []zcl.Traversal { diff --git a/zcl/zclsyntax/file.go b/zcl/zclsyntax/file.go index f7be7ad..89ce7bd 100644 --- a/zcl/zclsyntax/file.go +++ b/zcl/zclsyntax/file.go @@ -1,6 +1,6 @@ package zclsyntax -import "github.com/zclconf/go-zcl/zcl" +import "github.com/hashicorp/hcl2/zcl" // File is the top-level object resulting from parsing a configuration file. type File struct { diff --git a/zcl/zclsyntax/node.go b/zcl/zclsyntax/node.go index 8f2ff11..af2c9ad 100644 --- a/zcl/zclsyntax/node.go +++ b/zcl/zclsyntax/node.go @@ -1,7 +1,7 @@ package zclsyntax import ( - "github.com/zclconf/go-zcl/zcl" + "github.com/hashicorp/hcl2/zcl" ) // Node is the abstract type that every AST node implements. diff --git a/zcl/zclsyntax/parse_traversal_test.go b/zcl/zclsyntax/parse_traversal_test.go index 8368020..927d1f5 100644 --- a/zcl/zclsyntax/parse_traversal_test.go +++ b/zcl/zclsyntax/parse_traversal_test.go @@ -6,8 +6,8 @@ import ( "reflect" "github.com/davecgh/go-spew/spew" + "github.com/hashicorp/hcl2/zcl" "github.com/zclconf/go-cty/cty" - "github.com/zclconf/go-zcl/zcl" ) func TestParseTraversalAbs(t *testing.T) { diff --git a/zcl/zclsyntax/parser.go b/zcl/zclsyntax/parser.go index 14c88c2..e4b63d7 100644 --- a/zcl/zclsyntax/parser.go +++ b/zcl/zclsyntax/parser.go @@ -6,9 +6,9 @@ import ( "fmt" "github.com/apparentlymart/go-textseg/textseg" + "github.com/hashicorp/hcl2/zcl" "github.com/zclconf/go-cty/cty" "github.com/zclconf/go-cty/cty/convert" - "github.com/zclconf/go-zcl/zcl" ) type parser struct { diff --git a/zcl/zclsyntax/parser_template.go b/zcl/zclsyntax/parser_template.go index cc5120d..3b56192 100644 --- a/zcl/zclsyntax/parser_template.go +++ b/zcl/zclsyntax/parser_template.go @@ -5,8 +5,8 @@ import ( "strings" "unicode" + "github.com/hashicorp/hcl2/zcl" "github.com/zclconf/go-cty/cty" - "github.com/zclconf/go-zcl/zcl" ) func (p *parser) ParseTemplate() (Expression, zcl.Diagnostics) { diff --git a/zcl/zclsyntax/parser_test.go b/zcl/zclsyntax/parser_test.go index 9448bb6..761c712 100644 --- a/zcl/zclsyntax/parser_test.go +++ b/zcl/zclsyntax/parser_test.go @@ -5,9 +5,9 @@ import ( "testing" "github.com/davecgh/go-spew/spew" + "github.com/hashicorp/hcl2/zcl" "github.com/kylelemons/godebug/pretty" "github.com/zclconf/go-cty/cty" - "github.com/zclconf/go-zcl/zcl" ) func TestParseConfig(t *testing.T) { diff --git a/zcl/zclsyntax/parser_traversal.go b/zcl/zclsyntax/parser_traversal.go index 27d5702..84615df 100644 --- a/zcl/zclsyntax/parser_traversal.go +++ b/zcl/zclsyntax/parser_traversal.go @@ -1,8 +1,8 @@ package zclsyntax import ( + "github.com/hashicorp/hcl2/zcl" "github.com/zclconf/go-cty/cty" - "github.com/zclconf/go-zcl/zcl" ) // ParseTraversalAbs parses an absolute traversal that is assumed to consume diff --git a/zcl/zclsyntax/peeker.go b/zcl/zclsyntax/peeker.go index e5eb4ce..cc24556 100644 --- a/zcl/zclsyntax/peeker.go +++ b/zcl/zclsyntax/peeker.go @@ -1,7 +1,7 @@ package zclsyntax import ( - "github.com/zclconf/go-zcl/zcl" + "github.com/hashicorp/hcl2/zcl" ) type peeker struct { diff --git a/zcl/zclsyntax/public.go b/zcl/zclsyntax/public.go index c87f346..d403d14 100644 --- a/zcl/zclsyntax/public.go +++ b/zcl/zclsyntax/public.go @@ -1,7 +1,7 @@ package zclsyntax import ( - "github.com/zclconf/go-zcl/zcl" + "github.com/hashicorp/hcl2/zcl" ) // ParseConfig parses the given buffer as a whole zcl config file, returning diff --git a/zcl/zclsyntax/scan_tokens.go b/zcl/zclsyntax/scan_tokens.go index 8de7709..058ecee 100644 --- a/zcl/zclsyntax/scan_tokens.go +++ b/zcl/zclsyntax/scan_tokens.go @@ -4,7 +4,7 @@ package zclsyntax import ( "bytes" - "github.com/zclconf/go-zcl/zcl" + "github.com/hashicorp/hcl2/zcl" ) // This file is generated from scan_tokens.rl. DO NOT EDIT. diff --git a/zcl/zclsyntax/scan_tokens_test.go b/zcl/zclsyntax/scan_tokens_test.go index fc0cc4e..9e6aa91 100644 --- a/zcl/zclsyntax/scan_tokens_test.go +++ b/zcl/zclsyntax/scan_tokens_test.go @@ -4,8 +4,8 @@ import ( "reflect" "testing" + "github.com/hashicorp/hcl2/zcl" "github.com/kylelemons/godebug/pretty" - "github.com/zclconf/go-zcl/zcl" ) func TestScanTokens_normal(t *testing.T) { diff --git a/zcl/zclsyntax/structure.go b/zcl/zclsyntax/structure.go index c6c56d7..723c335 100644 --- a/zcl/zclsyntax/structure.go +++ b/zcl/zclsyntax/structure.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/zclconf/go-zcl/zcl" + "github.com/hashicorp/hcl2/zcl" ) // AsZCLBlock returns the block data expressed as a *zcl.Block. diff --git a/zcl/zclsyntax/structure_test.go b/zcl/zclsyntax/structure_test.go index 790711b..209371f 100644 --- a/zcl/zclsyntax/structure_test.go +++ b/zcl/zclsyntax/structure_test.go @@ -5,9 +5,9 @@ import ( "reflect" "testing" + "github.com/hashicorp/hcl2/zcl" "github.com/kylelemons/godebug/pretty" "github.com/zclconf/go-cty/cty" - "github.com/zclconf/go-zcl/zcl" ) func TestBodyContent(t *testing.T) { diff --git a/zcl/zclsyntax/token.go b/zcl/zclsyntax/token.go index c3e5973..4391349 100644 --- a/zcl/zclsyntax/token.go +++ b/zcl/zclsyntax/token.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/apparentlymart/go-textseg/textseg" - "github.com/zclconf/go-zcl/zcl" + "github.com/hashicorp/hcl2/zcl" ) // Token represents a sequence of bytes from some zcl code that has been diff --git a/zcl/zclsyntax/variables.go b/zcl/zclsyntax/variables.go index bea1178..7e4caac 100644 --- a/zcl/zclsyntax/variables.go +++ b/zcl/zclsyntax/variables.go @@ -1,7 +1,7 @@ package zclsyntax import ( - "github.com/zclconf/go-zcl/zcl" + "github.com/hashicorp/hcl2/zcl" ) // Variables returns all of the variables referenced within a given experssion. diff --git a/zcl/zclsyntax/variables_test.go b/zcl/zclsyntax/variables_test.go index 21733ab..31dc5c0 100644 --- a/zcl/zclsyntax/variables_test.go +++ b/zcl/zclsyntax/variables_test.go @@ -7,8 +7,8 @@ import ( "reflect" "github.com/davecgh/go-spew/spew" + "github.com/hashicorp/hcl2/zcl" "github.com/zclconf/go-cty/cty" - "github.com/zclconf/go-zcl/zcl" ) func TestVariables(t *testing.T) { diff --git a/zcl/zclsyntax/walk.go b/zcl/zclsyntax/walk.go index 8d9cc21..b6d66eb 100644 --- a/zcl/zclsyntax/walk.go +++ b/zcl/zclsyntax/walk.go @@ -1,7 +1,7 @@ package zclsyntax import ( - "github.com/zclconf/go-zcl/zcl" + "github.com/hashicorp/hcl2/zcl" ) // VisitFunc is the callback signature for VisitAll. diff --git a/zcldec/decode.go b/zcldec/decode.go index 8ad4637..e7cee7b 100644 --- a/zcldec/decode.go +++ b/zcldec/decode.go @@ -1,8 +1,8 @@ package zcldec import ( + "github.com/hashicorp/hcl2/zcl" "github.com/zclconf/go-cty/cty" - "github.com/zclconf/go-zcl/zcl" ) func decode(body zcl.Body, block *zcl.Block, ctx *zcl.EvalContext, spec Spec, partial bool) (cty.Value, zcl.Body, zcl.Diagnostics) { diff --git a/zcldec/public.go b/zcldec/public.go index a089ea7..7fc3cc1 100644 --- a/zcldec/public.go +++ b/zcldec/public.go @@ -1,8 +1,8 @@ package zcldec import ( + "github.com/hashicorp/hcl2/zcl" "github.com/zclconf/go-cty/cty" - "github.com/zclconf/go-zcl/zcl" ) // Decode interprets the given body using the given specification and returns diff --git a/zcldec/public_test.go b/zcldec/public_test.go index d20c46d..e63f2fa 100644 --- a/zcldec/public_test.go +++ b/zcldec/public_test.go @@ -5,9 +5,9 @@ import ( "reflect" "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 TestDecode(t *testing.T) { diff --git a/zcldec/schema.go b/zcldec/schema.go index 846375f..7f857f7 100644 --- a/zcldec/schema.go +++ b/zcldec/schema.go @@ -1,7 +1,7 @@ package zcldec import ( - "github.com/zclconf/go-zcl/zcl" + "github.com/hashicorp/hcl2/zcl" ) // ImpliedSchema returns the *zcl.BodySchema implied by the given specification. diff --git a/zcldec/spec.go b/zcldec/spec.go index a3593ff..1bbf553 100644 --- a/zcldec/spec.go +++ b/zcldec/spec.go @@ -3,9 +3,9 @@ package zcldec import ( "fmt" + "github.com/hashicorp/hcl2/zcl" "github.com/zclconf/go-cty/cty" "github.com/zclconf/go-cty/cty/convert" - "github.com/zclconf/go-zcl/zcl" ) // A Spec is a description of how to decode a zcl.Body to a cty.Value. diff --git a/zcldec/variables.go b/zcldec/variables.go index f5becbd..78d114a 100644 --- a/zcldec/variables.go +++ b/zcldec/variables.go @@ -1,7 +1,7 @@ package zcldec import ( - "github.com/zclconf/go-zcl/zcl" + "github.com/hashicorp/hcl2/zcl" ) // Variables processes the given body with the given spec and returns a diff --git a/zcldec/variables_test.go b/zcldec/variables_test.go index da8eaee..1f792d2 100644 --- a/zcldec/variables_test.go +++ b/zcldec/variables_test.go @@ -5,8 +5,8 @@ import ( "reflect" "testing" - "github.com/zclconf/go-zcl/zcl" - "github.com/zclconf/go-zcl/zcl/zclsyntax" + "github.com/hashicorp/hcl2/zcl" + "github.com/hashicorp/hcl2/zcl/zclsyntax" ) func TestVariables(t *testing.T) { diff --git a/zcled/navigation.go b/zcled/navigation.go index 0a193c0..6affb7d 100644 --- a/zcled/navigation.go +++ b/zcled/navigation.go @@ -1,7 +1,7 @@ package zcled import ( - "github.com/zclconf/go-zcl/zcl" + "github.com/hashicorp/hcl2/zcl" ) type contextStringer interface { diff --git a/zclparse/parser.go b/zclparse/parser.go index 855f2a7..4725d0a 100644 --- a/zclparse/parser.go +++ b/zclparse/parser.go @@ -4,10 +4,10 @@ import ( "fmt" "io/ioutil" - "github.com/zclconf/go-zcl/zcl" - "github.com/zclconf/go-zcl/zcl/hclhil" - "github.com/zclconf/go-zcl/zcl/json" - "github.com/zclconf/go-zcl/zcl/zclsyntax" + "github.com/hashicorp/hcl2/zcl" + "github.com/hashicorp/hcl2/zcl/hclhil" + "github.com/hashicorp/hcl2/zcl/json" + "github.com/hashicorp/hcl2/zcl/zclsyntax" ) // NOTE: This is the public interface for parsing. The actual parsers are diff --git a/zcltest/mock.go b/zcltest/mock.go index 1473f55..22e9d52 100644 --- a/zcltest/mock.go +++ b/zcltest/mock.go @@ -3,8 +3,8 @@ package zcltest import ( "fmt" + "github.com/hashicorp/hcl2/zcl" "github.com/zclconf/go-cty/cty" - "github.com/zclconf/go-zcl/zcl" ) // MockBody returns a zcl.Body implementation that works in terms of a diff --git a/zcltest/mock_test.go b/zcltest/mock_test.go index d6c63bc..adda967 100644 --- a/zcltest/mock_test.go +++ b/zcltest/mock_test.go @@ -5,8 +5,8 @@ import ( "reflect" + "github.com/hashicorp/hcl2/zcl" "github.com/zclconf/go-cty/cty" - "github.com/zclconf/go-zcl/zcl" ) var mockBodyIsBody zcl.Body = mockBody{} diff --git a/zclwrite/ast.go b/zclwrite/ast.go index c72bec4..54771ec 100644 --- a/zclwrite/ast.go +++ b/zclwrite/ast.go @@ -4,8 +4,8 @@ import ( "bytes" "io" + "github.com/hashicorp/hcl2/zcl" "github.com/zclconf/go-cty/cty" - "github.com/zclconf/go-zcl/zcl" ) type Node interface { diff --git a/zclwrite/ast_test.go b/zclwrite/ast_test.go index 4265088..a639b30 100644 --- a/zclwrite/ast_test.go +++ b/zclwrite/ast_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - "github.com/zclconf/go-zcl/zcl" - "github.com/zclconf/go-zcl/zcl/zclsyntax" + "github.com/hashicorp/hcl2/zcl" + "github.com/hashicorp/hcl2/zcl/zclsyntax" ) func TestBodyFindAttribute(t *testing.T) { diff --git a/zclwrite/format.go b/zclwrite/format.go index 5f72116..5264e5e 100644 --- a/zclwrite/format.go +++ b/zclwrite/format.go @@ -1,7 +1,7 @@ package zclwrite import ( - "github.com/zclconf/go-zcl/zcl/zclsyntax" + "github.com/hashicorp/hcl2/zcl/zclsyntax" ) // placeholder token used when we don't have a token but we don't want diff --git a/zclwrite/format_test.go b/zclwrite/format_test.go index d9f77cb..e9438d4 100644 --- a/zclwrite/format_test.go +++ b/zclwrite/format_test.go @@ -7,7 +7,7 @@ import ( "reflect" "github.com/davecgh/go-spew/spew" - "github.com/zclconf/go-zcl/zcl/zclsyntax" + "github.com/hashicorp/hcl2/zcl/zclsyntax" ) func TestFormat(t *testing.T) { diff --git a/zclwrite/native_node_sorter.go b/zclwrite/native_node_sorter.go index 1128040..f992a56 100644 --- a/zclwrite/native_node_sorter.go +++ b/zclwrite/native_node_sorter.go @@ -1,7 +1,7 @@ package zclwrite import ( - "github.com/zclconf/go-zcl/zcl/zclsyntax" + "github.com/hashicorp/hcl2/zcl/zclsyntax" ) type nativeNodeSorter struct { diff --git a/zclwrite/parser.go b/zclwrite/parser.go index 79a215a..6dbdb9f 100644 --- a/zclwrite/parser.go +++ b/zclwrite/parser.go @@ -3,8 +3,8 @@ package zclwrite import ( "sort" - "github.com/zclconf/go-zcl/zcl" - "github.com/zclconf/go-zcl/zcl/zclsyntax" + "github.com/hashicorp/hcl2/zcl" + "github.com/hashicorp/hcl2/zcl/zclsyntax" ) // Our "parser" here is actually not doing any parsing of its own. Instead, diff --git a/zclwrite/parser_test.go b/zclwrite/parser_test.go index 0250269..02fc749 100644 --- a/zclwrite/parser_test.go +++ b/zclwrite/parser_test.go @@ -6,9 +6,9 @@ import ( "testing" "github.com/davecgh/go-spew/spew" + "github.com/hashicorp/hcl2/zcl" + "github.com/hashicorp/hcl2/zcl/zclsyntax" "github.com/kylelemons/godebug/pretty" - "github.com/zclconf/go-zcl/zcl" - "github.com/zclconf/go-zcl/zcl/zclsyntax" ) func TestParse(t *testing.T) { diff --git a/zclwrite/public.go b/zclwrite/public.go index 62424fc..f6e6d3e 100644 --- a/zclwrite/public.go +++ b/zclwrite/public.go @@ -3,7 +3,7 @@ package zclwrite import ( "bytes" - "github.com/zclconf/go-zcl/zcl" + "github.com/hashicorp/hcl2/zcl" ) // ParseConfig interprets the given source bytes into a *zclwrite.File. The diff --git a/zclwrite/round_trip_test.go b/zclwrite/round_trip_test.go index 77e6e32..a1cc69e 100644 --- a/zclwrite/round_trip_test.go +++ b/zclwrite/round_trip_test.go @@ -4,11 +4,11 @@ import ( "bytes" "testing" + "github.com/hashicorp/hcl2/zcl" + "github.com/hashicorp/hcl2/zcl/zclsyntax" "github.com/zclconf/go-cty/cty" "github.com/zclconf/go-cty/cty/function" "github.com/zclconf/go-cty/cty/function/stdlib" - "github.com/zclconf/go-zcl/zcl" - "github.com/zclconf/go-zcl/zcl/zclsyntax" ) func TestRoundTripVerbatim(t *testing.T) { diff --git a/zclwrite/tokens.go b/zclwrite/tokens.go index 4dbe2ec..18b02f6 100644 --- a/zclwrite/tokens.go +++ b/zclwrite/tokens.go @@ -5,7 +5,7 @@ import ( "io" "github.com/apparentlymart/go-textseg/textseg" - "github.com/zclconf/go-zcl/zcl/zclsyntax" + "github.com/hashicorp/hcl2/zcl/zclsyntax" ) // TokenGen is an abstract type that can append tokens to a list. It is the