Skip to content

Commit b0ec608

Browse files
i4kii4ki
authored
chore: adjust fork. (#1)
2 parents 2442aca + d60ff2f commit b0ec608

File tree

141 files changed

+212
-211
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

141 files changed

+212
-211
lines changed

‎.github/dependabot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ updates:
88
- dependencies
99
- automated
1010
reviewers:
11-
- hashicorp/terraform-core
11+
- terramate-io/cli-tooling
1212
# only update HashiCorp actions, external actions managed by TSCCR
1313
allow:
1414
- dependency-name: hashicorp/*

‎.github/workflows/checks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
go-version-file: go.mod
3838
- name: Go test
3939
run: |
40-
go test ./... -race
40+
go test -race ./...
4141
4242
copyright:
4343
name: "copyright headers"

‎cmd/hcldec/diags_json.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"encoding/json"
88
"io"
99

10-
"github.com/hashicorp/hcl/v2"
10+
"github.com/terramate-io/hcl/v2"
1111
)
1212

1313
type jsonDiagWriter struct {

‎cmd/hcldec/main.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ import (
1111
"os"
1212
"strings"
1313

14-
"github.com/hashicorp/hcl/v2"
15-
"github.com/hashicorp/hcl/v2/hcldec"
16-
"github.com/hashicorp/hcl/v2/hclparse"
1714
flag "github.com/spf13/pflag"
15+
"github.com/terramate-io/hcl/v2"
16+
"github.com/terramate-io/hcl/v2/hcldec"
17+
"github.com/terramate-io/hcl/v2/hclparse"
1818
"github.com/zclconf/go-cty/cty"
1919
"github.com/zclconf/go-cty/cty/function"
2020
ctyjson "github.com/zclconf/go-cty/cty/json"

‎cmd/hcldec/spec.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ package main
66
import (
77
"fmt"
88

9-
"github.com/hashicorp/hcl/v2"
10-
"github.com/hashicorp/hcl/v2/ext/userfunc"
11-
"github.com/hashicorp/hcl/v2/gohcl"
12-
"github.com/hashicorp/hcl/v2/hcldec"
9+
"github.com/terramate-io/hcl/v2"
10+
"github.com/terramate-io/hcl/v2/ext/userfunc"
11+
"github.com/terramate-io/hcl/v2/gohcl"
12+
"github.com/terramate-io/hcl/v2/hcldec"
1313
"github.com/zclconf/go-cty/cty"
1414
"github.com/zclconf/go-cty/cty/function"
1515
)

‎cmd/hcldec/type_expr.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"fmt"
88
"reflect"
99

10-
"github.com/hashicorp/hcl/v2"
10+
"github.com/terramate-io/hcl/v2"
1111
"github.com/zclconf/go-cty/cty"
1212
"github.com/zclconf/go-cty/cty/function"
1313
)

‎cmd/hcldec/vars.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"fmt"
88
"strings"
99

10-
"github.com/hashicorp/hcl/v2"
10+
"github.com/terramate-io/hcl/v2"
1111
"github.com/zclconf/go-cty/cty"
1212
)
1313

‎cmd/hclfmt/main.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ import (
1212
"os"
1313
"strings"
1414

15-
"github.com/hashicorp/hcl/v2"
16-
"github.com/hashicorp/hcl/v2/hclparse"
17-
"github.com/hashicorp/hcl/v2/hclwrite"
15+
"github.com/terramate-io/hcl/v2"
16+
"github.com/terramate-io/hcl/v2/hclparse"
17+
"github.com/terramate-io/hcl/v2/hclwrite"
1818
"golang.org/x/crypto/ssh/terminal"
1919
)
2020

‎cmd/hclspecsuite/diagnostics.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"encoding/json"
88
"fmt"
99

10-
"github.com/hashicorp/hcl/v2"
10+
"github.com/terramate-io/hcl/v2"
1111
)
1212

1313
func decodeJSONDiagnostics(src []byte) hcl.Diagnostics {

‎cmd/hclspecsuite/log.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
package main
55

66
import (
7-
"github.com/hashicorp/hcl/v2"
7+
"github.com/terramate-io/hcl/v2"
88
)
99

1010
type LogBeginCallback func(testName string, testFile *TestFile)

‎cmd/hclspecsuite/main.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010

1111
"golang.org/x/crypto/ssh/terminal"
1212

13-
"github.com/hashicorp/hcl/v2"
14-
"github.com/hashicorp/hcl/v2/hclparse"
13+
"github.com/terramate-io/hcl/v2"
14+
"github.com/terramate-io/hcl/v2/hclparse"
1515
)
1616

1717
func main() {

‎cmd/hclspecsuite/runner.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ import (
1919
"github.com/zclconf/go-cty/cty/convert"
2020
ctyjson "github.com/zclconf/go-cty/cty/json"
2121

22-
"github.com/hashicorp/hcl/v2"
23-
"github.com/hashicorp/hcl/v2/ext/typeexpr"
24-
"github.com/hashicorp/hcl/v2/hclparse"
22+
"github.com/terramate-io/hcl/v2"
23+
"github.com/terramate-io/hcl/v2/ext/typeexpr"
24+
"github.com/terramate-io/hcl/v2/hclparse"
2525
)
2626

2727
type Runner struct {

‎cmd/hclspecsuite/test_file.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import (
99
"github.com/zclconf/go-cty/cty"
1010
"github.com/zclconf/go-cty/cty/convert"
1111

12-
"github.com/hashicorp/hcl/v2"
13-
"github.com/hashicorp/hcl/v2/ext/typeexpr"
14-
"github.com/hashicorp/hcl/v2/gohcl"
12+
"github.com/terramate-io/hcl/v2"
13+
"github.com/terramate-io/hcl/v2/ext/typeexpr"
14+
"github.com/terramate-io/hcl/v2/gohcl"
1515
)
1616

1717
type TestFile struct {

‎cmd/hclspecsuite/traversals.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"fmt"
88
"reflect"
99

10-
"github.com/hashicorp/hcl/v2"
10+
"github.com/terramate-io/hcl/v2"
1111
)
1212

1313
func findTraversalSpec(got hcl.Traversal, candidates []*TestFileExpectTraversal) *TestFileExpectTraversal {

‎ext/customdecode/customdecode.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
package customdecode
1111

1212
import (
13-
"github.com/hashicorp/hcl/v2"
13+
"github.com/terramate-io/hcl/v2"
1414
"github.com/zclconf/go-cty/cty"
1515
)
1616

‎ext/customdecode/expression_type.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"fmt"
88
"reflect"
99

10-
"github.com/hashicorp/hcl/v2"
10+
"github.com/terramate-io/hcl/v2"
1111
"github.com/zclconf/go-cty/cty"
1212
)
1313

‎ext/dynblock/expand_body.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ package dynblock
66
import (
77
"fmt"
88

9-
"github.com/hashicorp/hcl/v2"
9+
"github.com/terramate-io/hcl/v2"
1010
"github.com/zclconf/go-cty/cty"
1111
)
1212

‎ext/dynblock/expand_body_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import (
99

1010
"github.com/davecgh/go-spew/spew"
1111
"github.com/google/go-cmp/cmp"
12-
"github.com/hashicorp/hcl/v2"
13-
"github.com/hashicorp/hcl/v2/hcldec"
14-
"github.com/hashicorp/hcl/v2/hcltest"
12+
"github.com/terramate-io/hcl/v2"
13+
"github.com/terramate-io/hcl/v2/hcldec"
14+
"github.com/terramate-io/hcl/v2/hcltest"
1515
"github.com/zclconf/go-cty-debug/ctydebug"
1616
"github.com/zclconf/go-cty/cty"
1717
)

‎ext/dynblock/expand_spec.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ package dynblock
66
import (
77
"fmt"
88

9-
"github.com/hashicorp/hcl/v2"
9+
"github.com/terramate-io/hcl/v2"
1010
"github.com/zclconf/go-cty/cty"
1111
"github.com/zclconf/go-cty/cty/convert"
1212
)

‎ext/dynblock/expr_wrap.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
package dynblock
55

66
import (
7-
"github.com/hashicorp/hcl/v2"
7+
"github.com/terramate-io/hcl/v2"
88
"github.com/zclconf/go-cty/cty"
99
)
1010

‎ext/dynblock/iteration.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
package dynblock
55

66
import (
7-
"github.com/hashicorp/hcl/v2"
7+
"github.com/terramate-io/hcl/v2"
88
"github.com/zclconf/go-cty/cty"
99
)
1010

‎ext/dynblock/options.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
package dynblock
55

66
import (
7-
"github.com/hashicorp/hcl/v2"
7+
"github.com/terramate-io/hcl/v2"
88
"github.com/zclconf/go-cty/cty"
99
)
1010

‎ext/dynblock/public.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
package dynblock
88

99
import (
10-
"github.com/hashicorp/hcl/v2"
10+
"github.com/terramate-io/hcl/v2"
1111
)
1212

1313
// Expand "dynamic" blocks in the given body, returning a new body that

‎ext/dynblock/schema.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
package dynblock
55

6-
import "github.com/hashicorp/hcl/v2"
6+
import "github.com/terramate-io/hcl/v2"
77

88
var dynamicBlockHeaderSchema = hcl.BlockHeaderSchema{
99
Type: "dynamic",

‎ext/dynblock/unknown_body.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
package dynblock
55

66
import (
7-
"github.com/hashicorp/hcl/v2"
8-
"github.com/hashicorp/hcl/v2/hcldec"
7+
"github.com/terramate-io/hcl/v2"
8+
"github.com/terramate-io/hcl/v2/hcldec"
99
"github.com/zclconf/go-cty/cty"
1010
)
1111

‎ext/dynblock/variables.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
package dynblock
55

66
import (
7-
"github.com/hashicorp/hcl/v2"
7+
"github.com/terramate-io/hcl/v2"
88
"github.com/zclconf/go-cty/cty"
99
)
1010

‎ext/dynblock/variables_hcldec.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
package dynblock
55

66
import (
7-
"github.com/hashicorp/hcl/v2"
8-
"github.com/hashicorp/hcl/v2/hcldec"
7+
"github.com/terramate-io/hcl/v2"
8+
"github.com/terramate-io/hcl/v2/hcldec"
99
)
1010

1111
// VariablesHCLDec is a wrapper around WalkVariables that uses the given hcldec

‎ext/dynblock/variables_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ import (
77
"reflect"
88
"testing"
99

10-
"github.com/hashicorp/hcl/v2/hcldec"
10+
"github.com/terramate-io/hcl/v2/hcldec"
1111
"github.com/zclconf/go-cty/cty"
1212

1313
"github.com/davecgh/go-spew/spew"
1414

15-
"github.com/hashicorp/hcl/v2"
16-
"github.com/hashicorp/hcl/v2/hclsyntax"
15+
"github.com/terramate-io/hcl/v2"
16+
"github.com/terramate-io/hcl/v2/hclsyntax"
1717
)
1818

1919
func TestVariables(t *testing.T) {

‎ext/transform/error.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
package transform
55

66
import (
7-
"github.com/hashicorp/hcl/v2"
7+
"github.com/terramate-io/hcl/v2"
88
)
99

1010
// NewErrorBody returns a hcl.Body that returns the given diagnostics whenever

‎ext/transform/transform.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
package transform
55

66
import (
7-
"github.com/hashicorp/hcl/v2"
7+
"github.com/terramate-io/hcl/v2"
88
)
99

1010
// Shallow is equivalent to calling transformer.TransformBody(body), and

‎ext/transform/transform_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88

99
"reflect"
1010

11-
"github.com/hashicorp/hcl/v2"
12-
"github.com/hashicorp/hcl/v2/hcltest"
11+
"github.com/terramate-io/hcl/v2"
12+
"github.com/terramate-io/hcl/v2/hcltest"
1313
"github.com/zclconf/go-cty/cty"
1414
)
1515

‎ext/transform/transformer.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
package transform
55

66
import (
7-
"github.com/hashicorp/hcl/v2"
7+
"github.com/terramate-io/hcl/v2"
88
)
99

1010
// A Transformer takes a given body, applies some (possibly no-op)

‎ext/tryfunc/tryfunc.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ import (
1616
"fmt"
1717
"strings"
1818

19-
"github.com/hashicorp/hcl/v2"
20-
"github.com/hashicorp/hcl/v2/ext/customdecode"
19+
"github.com/terramate-io/hcl/v2"
20+
"github.com/terramate-io/hcl/v2/ext/customdecode"
2121
"github.com/zclconf/go-cty/cty"
2222
"github.com/zclconf/go-cty/cty/function"
2323
)

‎ext/tryfunc/tryfunc_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ package tryfunc
66
import (
77
"testing"
88

9-
"github.com/hashicorp/hcl/v2"
10-
"github.com/hashicorp/hcl/v2/hclsyntax"
9+
"github.com/terramate-io/hcl/v2"
10+
"github.com/terramate-io/hcl/v2/hclsyntax"
1111
"github.com/zclconf/go-cty/cty"
1212
"github.com/zclconf/go-cty/cty/function"
1313
)

‎ext/typeexpr/get_type.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"github.com/zclconf/go-cty/cty"
1010
"github.com/zclconf/go-cty/cty/convert"
1111

12-
"github.com/hashicorp/hcl/v2"
12+
"github.com/terramate-io/hcl/v2"
1313
)
1414

1515
const invalidTypeSummary = "Invalid type specification"

‎ext/typeexpr/get_type_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ import (
77
"fmt"
88
"testing"
99

10-
"github.com/hashicorp/hcl/v2/gohcl"
10+
"github.com/terramate-io/hcl/v2/gohcl"
1111

1212
"github.com/google/go-cmp/cmp"
1313
"github.com/zclconf/go-cty/cty"
1414

15-
"github.com/hashicorp/hcl/v2"
16-
"github.com/hashicorp/hcl/v2/hclsyntax"
17-
"github.com/hashicorp/hcl/v2/json"
15+
"github.com/terramate-io/hcl/v2"
16+
"github.com/terramate-io/hcl/v2/hclsyntax"
17+
"github.com/terramate-io/hcl/v2/json"
1818
)
1919

2020
var (

‎ext/typeexpr/public.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import (
88
"fmt"
99
"sort"
1010

11-
"github.com/hashicorp/hcl/v2/hclsyntax"
11+
"github.com/terramate-io/hcl/v2/hclsyntax"
1212

13-
"github.com/hashicorp/hcl/v2"
13+
"github.com/terramate-io/hcl/v2"
1414
"github.com/zclconf/go-cty/cty"
1515
)
1616

0 commit comments

Comments
 (0)