From a21a3f19084a904c7199362986973382abc2a4da Mon Sep 17 00:00:00 2001 From: Martin Atkins Date: Wed, 11 Dec 2019 07:34:30 -0800 Subject: [PATCH] Fix import ordering from the move from hcl2 repository When we did the automatic rewriting from the hashicorp/hcl2 import paths to hashicorp/hcl/v2 import paths, our automatic rewrite script did not run "go fmt" afterwards and so left some imports misordered as a result of the slightly-differently-shaped directory structure in the new repository. --- cmd/hcldec/spec.go | 2 +- cmd/hclspecsuite/test_file.go | 2 +- integrationtest/terraformlike_test.go | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmd/hcldec/spec.go b/cmd/hcldec/spec.go index a496ef6..b592cf9 100644 --- a/cmd/hcldec/spec.go +++ b/cmd/hcldec/spec.go @@ -3,9 +3,9 @@ package main import ( "fmt" + "github.com/hashicorp/hcl/v2" "github.com/hashicorp/hcl/v2/ext/userfunc" "github.com/hashicorp/hcl/v2/gohcl" - "github.com/hashicorp/hcl/v2" "github.com/hashicorp/hcl/v2/hcldec" "github.com/zclconf/go-cty/cty" "github.com/zclconf/go-cty/cty/function" diff --git a/cmd/hclspecsuite/test_file.go b/cmd/hclspecsuite/test_file.go index 0b531d6..57ed35e 100644 --- a/cmd/hclspecsuite/test_file.go +++ b/cmd/hclspecsuite/test_file.go @@ -6,9 +6,9 @@ import ( "github.com/zclconf/go-cty/cty" "github.com/zclconf/go-cty/cty/convert" + "github.com/hashicorp/hcl/v2" "github.com/hashicorp/hcl/v2/ext/typeexpr" "github.com/hashicorp/hcl/v2/gohcl" - "github.com/hashicorp/hcl/v2" ) type TestFile struct { diff --git a/integrationtest/terraformlike_test.go b/integrationtest/terraformlike_test.go index d397d2c..b900c43 100644 --- a/integrationtest/terraformlike_test.go +++ b/integrationtest/terraformlike_test.go @@ -6,12 +6,12 @@ import ( "testing" "github.com/davecgh/go-spew/spew" + "github.com/hashicorp/hcl/v2" "github.com/hashicorp/hcl/v2/ext/dynblock" "github.com/hashicorp/hcl/v2/gohcl" - "github.com/hashicorp/hcl/v2" + "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/hcl/v2/hclsyntax" "github.com/hashicorp/hcl/v2/json" - "github.com/hashicorp/hcl/v2/hcldec" "github.com/zclconf/go-cty/cty" )