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.
f-workspaces2-prototype
Martin Atkins 7 years ago
parent 332fc6ef31
commit a9ab01e1a7

@ -6,9 +6,9 @@ import (
"os" "os"
"path/filepath" "path/filepath"
"github.com/hashicorp/hcl2/hcl" "github.com/hashicorp/hcl/v2"
"github.com/hashicorp/hcl2/hcl/hclsyntax" "github.com/hashicorp/hcl/v2/hclsyntax"
hcljson "github.com/hashicorp/hcl2/hcl/json" hcljson "github.com/hashicorp/hcl/v2/json"
"github.com/hashicorp/terraform/tfdiags" "github.com/hashicorp/terraform/tfdiags"
) )

@ -3,9 +3,9 @@ package projectconfigs
import ( import (
"fmt" "fmt"
"github.com/hashicorp/hcl2/hcl" "github.com/hashicorp/hcl/v2"
"github.com/hashicorp/hcl2/ext/typeexpr" "github.com/hashicorp/hcl/v2/ext/typeexpr"
"github.com/hashicorp/hcl2/hcl/hclsyntax" "github.com/hashicorp/hcl/v2/hclsyntax"
"github.com/zclconf/go-cty/cty" "github.com/zclconf/go-cty/cty"
"github.com/hashicorp/terraform/tfdiags" "github.com/hashicorp/terraform/tfdiags"

@ -3,8 +3,8 @@ package projectconfigs
import ( import (
"fmt" "fmt"
"github.com/hashicorp/hcl2/hcl" "github.com/hashicorp/hcl/v2"
"github.com/hashicorp/hcl2/hcl/hclsyntax" "github.com/hashicorp/hcl/v2/hclsyntax"
"github.com/hashicorp/terraform/tfdiags" "github.com/hashicorp/terraform/tfdiags"
) )

@ -6,8 +6,8 @@ import (
"github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp"
"github.com/google/go-cmp/cmp/cmpopts" "github.com/google/go-cmp/cmp/cmpopts"
"github.com/hashicorp/hcl2/hcl" "github.com/hashicorp/hcl/v2"
"github.com/hashicorp/hcl2/hcl/hclsyntax" "github.com/hashicorp/hcl/v2/hclsyntax"
"github.com/hashicorp/terraform/tfdiags" "github.com/hashicorp/terraform/tfdiags"
"github.com/zclconf/go-cty/cty" "github.com/zclconf/go-cty/cty"
) )

@ -3,8 +3,8 @@ package projectconfigs
import ( import (
"fmt" "fmt"
"github.com/hashicorp/hcl2/hcl" "github.com/hashicorp/hcl/v2"
"github.com/hashicorp/hcl2/hcl/hclsyntax" "github.com/hashicorp/hcl/v2/hclsyntax"
"github.com/hashicorp/terraform/tfdiags" "github.com/hashicorp/terraform/tfdiags"
) )

@ -3,8 +3,8 @@ package projectconfigs
import ( import (
"fmt" "fmt"
"github.com/hashicorp/hcl2/hcl" "github.com/hashicorp/hcl/v2"
"github.com/hashicorp/hcl2/hcl/hclsyntax" "github.com/hashicorp/hcl/v2/hclsyntax"
"github.com/hashicorp/terraform/tfdiags" "github.com/hashicorp/terraform/tfdiags"
) )

Loading…
Cancel
Save