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.
This commit is contained in:
Martin Atkins 2019-09-09 16:08:19 -07:00
parent 0f5ab3bd56
commit 6c4344623b
219 changed files with 166 additions and 154 deletions

View File

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

View File

@ -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"

View File

@ -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"

View File

@ -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"
)

View File

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

View File

@ -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"

View File

@ -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 {

View File

@ -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)

View File

@ -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"
)

View File

@ -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"
)

View File

@ -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 {

View File

@ -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 {

View File

View File

@ -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"
)

View File

@ -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"

View File

@ -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"
)

View File

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

View File

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

View File

@ -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

View File

@ -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",

View File

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

View File

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

View File

@ -1,7 +1,7 @@
package dynblock
import (
"github.com/hashicorp/hcl/v2/hcl"
"github.com/hashicorp/hcl/v2"
"github.com/hashicorp/hcl/v2/hcldec"
)

View File

@ -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) {

View File

@ -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"
)

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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"
)

View File

@ -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

View File

@ -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

View File

@ -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"
)

View File

@ -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)

View File

@ -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"
)

View File

@ -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"
)

View File

@ -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"
)

View File

@ -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"
)

View File

@ -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"
)

View File

@ -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"
)

6
go.mod
View File

@ -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
)

16
go.sum
View File

@ -4,17 +4,24 @@ github.com/apparentlymart/go-dump v0.0.0-20180507223929-23540a00eaa3 h1:ZSTrOEhi
github.com/apparentlymart/go-dump v0.0.0-20180507223929-23540a00eaa3/go.mod h1:oL81AME2rN47vu18xqj1S1jPIPuN7afo62yKTNn3XMM=
github.com/apparentlymart/go-textseg v1.0.0 h1:rRmlIsPEEhUTIKQb7T++Nz/A5Q6C9IuX2wFoYVvnCs0=
github.com/apparentlymart/go-textseg v1.0.0/go.mod h1:z96Txxhf3xSFMPmb5X/1W05FF/Nj9VFpLOpjS5yuumk=
github.com/bsm/go-vlq v0.0.0-20150828105119-ec6e8d4f5f4e/go.mod h1:N+BjUcTjSxc2mtRGSCPsat1kze3CUtvJN3/jTXlp29k=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
github.com/go-test/deep v1.0.3 h1:ZrJSEWsXzPOxaZnFteGEfooLba+ju3FYIbOrS+rQd68=
github.com/go-test/deep v1.0.3/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA=
github.com/golang/protobuf v1.1.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
github.com/google/go-cmp v0.2.0 h1:+dTQ8DZQJz0Mb/HjFlkptS1FeQ4cWSnN941F8aEG4SQ=
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
github.com/hashicorp/errwrap v0.0.0-20180715044906-d6c0cd880357 h1:Rem2+U35z1QtPQc6r+WolF7yXiefXqDKyk+lN2pE164=
github.com/hashicorp/errwrap v0.0.0-20180715044906-d6c0cd880357/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
github.com/hashicorp/go-multierror v0.0.0-20180717150148-3d5d8f294aa0 h1:j30noezaCfvNLcdMYSvHLv81DxYRSt1grlpseG67vhU=
github.com/hashicorp/go-multierror v0.0.0-20180717150148-3d5d8f294aa0/go.mod h1:JMRHfdO9jKNzS/+BTlxCjKNQHg/jZAft8U7LloJvN7I=
github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
github.com/hashicorp/hcl2 v0.0.0-20190909202536-66c59f909e25 h1:hP3bdZpTEdjGFXQZyeeRsYH1oJgOBGx5sMLYPqZuqOU=
github.com/hashicorp/hcl2 v0.0.0-20190909202536-66c59f909e25/go.mod h1:Cxv+IJLuBiEhQ7pBYGEuORa0nr4U994pE8mYLuFd7v0=
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
@ -25,6 +32,9 @@ github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348 h1:MtvEpTB6LX3v
github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k=
github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7 h1:DpOJ2HYzCv8LZP15IdmG+YdwD2luVPHITV96TkirNBM=
github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo=
github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ=
@ -40,8 +50,12 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk
golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734 h1:p/H982KKEjUnLJkM3tt/LemDnOc1GiZL5FCVlORJ5zo=
golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/net v0.0.0-20180811021610-c39426892332/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190502183928-7f726cade0ab/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190502175342-a43fa875dd82 h1:vsphBvatvfbhlb4PO1BYSr9dzugGxJ/SQHoNufZJq1w=
@ -55,6 +69,8 @@ google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9Ywl
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE=
gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=

View File

@ -6,7 +6,7 @@ import (
"github.com/zclconf/go-cty/cty"
"github.com/hashicorp/hcl/v2/hcl"
"github.com/hashicorp/hcl/v2"
"github.com/zclconf/go-cty/cty/convert"
"github.com/zclconf/go-cty/cty/gocty"
)

View File

@ -7,8 +7,8 @@ import (
"testing"
"github.com/davecgh/go-spew/spew"
"github.com/hashicorp/hcl/v2/hcl"
hclJSON "github.com/hashicorp/hcl/v2/hcl/json"
"github.com/hashicorp/hcl/v2"
hclJSON "github.com/hashicorp/hcl/v2/json"
"github.com/zclconf/go-cty/cty"
)

View File

@ -6,7 +6,7 @@ import (
"sort"
"strings"
"github.com/hashicorp/hcl/v2/hcl"
"github.com/hashicorp/hcl/v2"
)
// ImpliedBodySchema produces a hcl.BodySchema derived from the type of the

View File

@ -6,7 +6,7 @@ import (
"testing"
"github.com/davecgh/go-spew/spew"
"github.com/hashicorp/hcl/v2/hcl"
"github.com/hashicorp/hcl/v2"
)
func TestImpliedBodySchema(t *testing.T) {

View File

@ -3,7 +3,7 @@ package gohcl
import (
"reflect"
"github.com/hashicorp/hcl/v2/hcl"
"github.com/hashicorp/hcl/v2"
)
var victimExpr hcl.Expression

View File

@ -1,7 +1,7 @@
package hcldec
import (
"github.com/hashicorp/hcl/v2/hcl"
"github.com/hashicorp/hcl/v2"
)
type blockLabel struct {

View File

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

View File

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

View File

@ -5,8 +5,8 @@ import (
"reflect"
"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"
)

View File

@ -1,7 +1,7 @@
package hcldec
import (
"github.com/hashicorp/hcl/v2/hcl"
"github.com/hashicorp/hcl/v2"
)
// ImpliedSchema returns the *hcl.BodySchema implied by the given specification.

View File

@ -5,7 +5,7 @@ import (
"fmt"
"sort"
"github.com/hashicorp/hcl/v2/hcl"
"github.com/hashicorp/hcl/v2"
"github.com/zclconf/go-cty/cty"
"github.com/zclconf/go-cty/cty/convert"
"github.com/zclconf/go-cty/cty/function"

View File

@ -7,8 +7,8 @@ import (
"github.com/apparentlymart/go-dump/dump"
"github.com/zclconf/go-cty/cty"
"github.com/hashicorp/hcl/v2/hcl"
"github.com/hashicorp/hcl/v2/hcl/hclsyntax"
"github.com/hashicorp/hcl/v2"
"github.com/hashicorp/hcl/v2/hclsyntax"
)
// Verify that all of our spec types implement the necessary interfaces

View File

@ -1,7 +1,7 @@
package hcldec
import (
"github.com/hashicorp/hcl/v2/hcl"
"github.com/hashicorp/hcl/v2"
)
// Variables processes the given body with the given spec and returns a

View File

@ -5,8 +5,8 @@ import (
"reflect"
"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"
)

View File

@ -1,7 +1,7 @@
package hcled
import (
"github.com/hashicorp/hcl/v2/hcl"
"github.com/hashicorp/hcl/v2"
)
type contextStringer interface {

View File

@ -4,9 +4,9 @@ import (
"fmt"
"io/ioutil"
"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"
)
// NOTE: This is the public interface for parsing. The actual parsers are

View File

@ -1,7 +1,7 @@
package hclsyntax
import (
"github.com/hashicorp/hcl/v2/hcl"
"github.com/hashicorp/hcl/v2"
)
// setDiagEvalContext is an internal helper that will impose a particular

View File

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

View File

@ -3,7 +3,7 @@ package hclsyntax
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"
"github.com/zclconf/go-cty/cty/function"

View File

@ -4,7 +4,7 @@ import (
"testing"
"github.com/go-test/deep"
"github.com/hashicorp/hcl/v2/hcl"
"github.com/hashicorp/hcl/v2"
"github.com/zclconf/go-cty/cty"
)

View File

@ -4,7 +4,7 @@ import (
"bytes"
"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"
)

View File

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

View File

@ -3,7 +3,7 @@ package hclsyntax
import (
"testing"
"github.com/hashicorp/hcl/v2/hcl"
"github.com/hashicorp/hcl/v2"
"github.com/zclconf/go-cty/cty"
"github.com/zclconf/go-cty/cty/function"
"github.com/zclconf/go-cty/cty/function/stdlib"

View File

@ -4,7 +4,7 @@ package hclsyntax
// Run 'go generate' on this package to update the set of functions here.
import (
"github.com/hashicorp/hcl/v2/hcl"
"github.com/hashicorp/hcl/v2"
)
func (e *AnonSymbolExpr) Variables() []hcl.Traversal {

View File

@ -89,7 +89,7 @@ const outputPreamble = `package hclsyntax
// Run 'go generate' on this package to update the set of functions here.
import (
"github.com/hashicorp/hcl/v2/hcl"
"github.com/hashicorp/hcl/v2"
)`
const outputMethodFmt = `

View File

@ -1,7 +1,7 @@
package hclsyntax
import (
"github.com/hashicorp/hcl/v2/hcl"
"github.com/hashicorp/hcl/v2"
)
// File is the top-level object resulting from parsing a configuration file.

View File

@ -15,7 +15,7 @@ fuzz-exec-%: fuzz%-fuzz.zip
go-fuzz -bin=./fuzz$*-fuzz.zip -workdir=$(FUZZ_WORK_DIR)
fuzz%-fuzz.zip: %/fuzz.go
go-fuzz-build github.com/hashicorp/hcl/v2/hcl/hclsyntax/fuzz/$*
go-fuzz-build github.com/hashicorp/hcl/v2/hclsyntax/fuzz/$*
tools:
go get -u github.com/dvyukov/go-fuzz/go-fuzz

View File

@ -1,8 +1,8 @@
package fuzzconfig
import (
"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 Fuzz(data []byte) int {

Some files were not shown because too many files have changed in this diff Show More