Skip to content

Commit 39e609d

Browse files
apparentlymartapparentlymart
committed
vendor: switch to HCL 2.0 in the HCL repository
Previously we were using the experimental HCL 2 repository, but now we'll shift over to the v2 import path within the main HCL repository as part of actually releasing HCL 2.0 as stable. This is a mechanical search/replace to the new import paths. It also switches to the v2.0.0 release of HCL, which includes some new code that Terraform didn't previously have but should not change any behavior that matters for Terraform's purposes. For the moment the experimental HCL2 repository is still an indirect dependency via terraform-config-inspect, so it remains in our go.sum and vendor directories for the moment. Because terraform-config-inspect uses a much smaller subset of the HCL2 functionality, this does still manage to prune the vendor directory a little. A subsequent release of terraform-config-inspect should allow us to completely remove that old repository in a future commit.
1 parent 38b69c9 commit 39e609d

241 files changed

Lines changed: 25873 additions & 241 deletions

File tree

Some content is hidden

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

‎addrs/module_instance.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"bytes"
55
"fmt"
66

7-
"github.com/hashicorp/hcl2/hcl"
8-
"github.com/hashicorp/hcl2/hcl/hclsyntax"
7+
"github.com/hashicorp/hcl/v2"
8+
"github.com/hashicorp/hcl/v2/hclsyntax"
99
"github.com/zclconf/go-cty/cty"
1010
"github.com/zclconf/go-cty/cty/gocty"
1111

‎addrs/parse_ref.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package addrs
33
import (
44
"fmt"
55

6-
"github.com/hashicorp/hcl2/hcl"
7-
"github.com/hashicorp/hcl2/hcl/hclsyntax"
6+
"github.com/hashicorp/hcl/v2"
7+
"github.com/hashicorp/hcl/v2/hclsyntax"
88
"github.com/hashicorp/terraform/tfdiags"
99
)
1010

‎addrs/parse_ref_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"testing"
55

66
"github.com/go-test/deep"
7-
"github.com/hashicorp/hcl2/hcl"
8-
"github.com/hashicorp/hcl2/hcl/hclsyntax"
7+
"github.com/hashicorp/hcl/v2"
8+
"github.com/hashicorp/hcl/v2/hclsyntax"
99
"github.com/hashicorp/terraform/tfdiags"
1010
"github.com/zclconf/go-cty/cty"
1111
)

‎addrs/parse_target.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ package addrs
33
import (
44
"fmt"
55

6-
"github.com/hashicorp/hcl2/hcl/hclsyntax"
6+
"github.com/hashicorp/hcl/v2/hclsyntax"
77

8-
"github.com/hashicorp/hcl2/hcl"
8+
"github.com/hashicorp/hcl/v2"
99
"github.com/hashicorp/terraform/tfdiags"
1010
)
1111

‎addrs/parse_target_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"testing"
55

66
"github.com/go-test/deep"
7-
"github.com/hashicorp/hcl2/hcl"
8-
"github.com/hashicorp/hcl2/hcl/hclsyntax"
7+
"github.com/hashicorp/hcl/v2"
8+
"github.com/hashicorp/hcl/v2/hclsyntax"
99
"github.com/hashicorp/terraform/tfdiags"
1010
)
1111

‎addrs/provider_config.go‎

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

66
"github.com/hashicorp/terraform/tfdiags"
77

8-
"github.com/hashicorp/hcl2/hcl"
9-
"github.com/hashicorp/hcl2/hcl/hclsyntax"
8+
"github.com/hashicorp/hcl/v2"
9+
"github.com/hashicorp/hcl/v2/hclsyntax"
1010
)
1111

1212
// ProviderConfig is the address of a provider configuration.

‎addrs/provider_config_test.go‎

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

66
"github.com/go-test/deep"
77

8-
"github.com/hashicorp/hcl2/hcl"
9-
"github.com/hashicorp/hcl2/hcl/hclsyntax"
8+
"github.com/hashicorp/hcl/v2"
9+
"github.com/hashicorp/hcl/v2/hclsyntax"
1010
)
1111

1212
func TestParseProviderConfigCompact(t *testing.T) {

‎backend/remote-state/inmem/backend_test.go‎

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

10-
"github.com/hashicorp/hcl2/hcl"
10+
"github.com/hashicorp/hcl/v2"
1111

1212
"github.com/hashicorp/terraform/backend"
1313
"github.com/hashicorp/terraform/helper/logging"

‎backend/remote-state/inmem/client_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package inmem
33
import (
44
"testing"
55

6-
"github.com/hashicorp/hcl2/hcl"
6+
"github.com/hashicorp/hcl/v2"
77
"github.com/hashicorp/terraform/backend"
88
"github.com/hashicorp/terraform/state/remote"
99
)

‎backend/testing.go‎

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

88
uuid "github.com/hashicorp/go-uuid"
9-
"github.com/hashicorp/hcl2/hcl"
10-
"github.com/hashicorp/hcl2/hcldec"
9+
"github.com/hashicorp/hcl/v2"
10+
"github.com/hashicorp/hcl/v2/hcldec"
1111

1212
"github.com/hashicorp/terraform/addrs"
1313
"github.com/hashicorp/terraform/configs"

0 commit comments

Comments
 (0)