From a9ab01e1a7cbf07623cd287962ab74fdfdcc9ea0 Mon Sep 17 00:00:00 2001 From: Martin Atkins Date: Wed, 2 Oct 2019 15:21:51 -0700 Subject: [PATCH] projects/projectconfigs: Use stable HCL v2.0.0 Previously we were using the experimental version from the separate hcl2 repository, but HCL is now stabilized in the main HCL repository as release v2.0.0. --- projects/projectconfigs/config.go | 6 +++--- projects/projectconfigs/context.go | 6 +++--- projects/projectconfigs/local.go | 4 ++-- projects/projectconfigs/projectconfigs_test.go | 4 ++-- projects/projectconfigs/upstream.go | 4 ++-- projects/projectconfigs/workspace.go | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/projects/projectconfigs/config.go b/projects/projectconfigs/config.go index 16e90f8eb4..665293e922 100644 --- a/projects/projectconfigs/config.go +++ b/projects/projectconfigs/config.go @@ -6,9 +6,9 @@ import ( "os" "path/filepath" - "github.com/hashicorp/hcl2/hcl" - "github.com/hashicorp/hcl2/hcl/hclsyntax" - hcljson "github.com/hashicorp/hcl2/hcl/json" + "github.com/hashicorp/hcl/v2" + "github.com/hashicorp/hcl/v2/hclsyntax" + hcljson "github.com/hashicorp/hcl/v2/json" "github.com/hashicorp/terraform/tfdiags" ) diff --git a/projects/projectconfigs/context.go b/projects/projectconfigs/context.go index 5d9d5af8af..8097072df1 100644 --- a/projects/projectconfigs/context.go +++ b/projects/projectconfigs/context.go @@ -3,9 +3,9 @@ package projectconfigs import ( "fmt" - "github.com/hashicorp/hcl2/hcl" - "github.com/hashicorp/hcl2/ext/typeexpr" - "github.com/hashicorp/hcl2/hcl/hclsyntax" + "github.com/hashicorp/hcl/v2" + "github.com/hashicorp/hcl/v2/ext/typeexpr" + "github.com/hashicorp/hcl/v2/hclsyntax" "github.com/zclconf/go-cty/cty" "github.com/hashicorp/terraform/tfdiags" diff --git a/projects/projectconfigs/local.go b/projects/projectconfigs/local.go index 68990e0940..bcd9fe4e7c 100644 --- a/projects/projectconfigs/local.go +++ b/projects/projectconfigs/local.go @@ -3,8 +3,8 @@ package projectconfigs import ( "fmt" - "github.com/hashicorp/hcl2/hcl" - "github.com/hashicorp/hcl2/hcl/hclsyntax" + "github.com/hashicorp/hcl/v2" + "github.com/hashicorp/hcl/v2/hclsyntax" "github.com/hashicorp/terraform/tfdiags" ) diff --git a/projects/projectconfigs/projectconfigs_test.go b/projects/projectconfigs/projectconfigs_test.go index 507eea6fea..56193bbd46 100644 --- a/projects/projectconfigs/projectconfigs_test.go +++ b/projects/projectconfigs/projectconfigs_test.go @@ -6,8 +6,8 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" - "github.com/hashicorp/hcl2/hcl" - "github.com/hashicorp/hcl2/hcl/hclsyntax" + "github.com/hashicorp/hcl/v2" + "github.com/hashicorp/hcl/v2/hclsyntax" "github.com/hashicorp/terraform/tfdiags" "github.com/zclconf/go-cty/cty" ) diff --git a/projects/projectconfigs/upstream.go b/projects/projectconfigs/upstream.go index f9fdea7988..546abffb9f 100644 --- a/projects/projectconfigs/upstream.go +++ b/projects/projectconfigs/upstream.go @@ -3,8 +3,8 @@ package projectconfigs import ( "fmt" - "github.com/hashicorp/hcl2/hcl" - "github.com/hashicorp/hcl2/hcl/hclsyntax" + "github.com/hashicorp/hcl/v2" + "github.com/hashicorp/hcl/v2/hclsyntax" "github.com/hashicorp/terraform/tfdiags" ) diff --git a/projects/projectconfigs/workspace.go b/projects/projectconfigs/workspace.go index b697eedece..1ef99176c4 100644 --- a/projects/projectconfigs/workspace.go +++ b/projects/projectconfigs/workspace.go @@ -3,8 +3,8 @@ package projectconfigs import ( "fmt" - "github.com/hashicorp/hcl2/hcl" - "github.com/hashicorp/hcl2/hcl/hclsyntax" + "github.com/hashicorp/hcl/v2" + "github.com/hashicorp/hcl/v2/hclsyntax" "github.com/hashicorp/terraform/tfdiags" )