core: A "go fmt" catchup

Since we started using experimental Go Modules our editor tooling hasn't
been fully functional, apparently including format-on-save support. This
is a catchup to get everything back straight again.

terraform/context_apply_test.go

@@ -16,8 +16,8 @@ import (
 	"time"
 
 	"github.com/davecgh/go-spew/spew"
-	"github.com/google/go-cmp/cmp"
 	"github.com/go-test/deep"
+	"github.com/google/go-cmp/cmp"
 	"github.com/zclconf/go-cty/cty"
 
 	"github.com/hashicorp/terraform/addrs"
@@ -2727,7 +2727,7 @@ func TestContext2Apply_orphanResource(t *testing.T) {
 
 	// At this point both resources should be recorded in the state, along
 	// with the single instance associated with test_thing.one.
-	want := states.BuildState(func (s *states.SyncState) {
+	want := states.BuildState(func(s *states.SyncState) {
 		providerAddr := addrs.ProviderConfig{
 			Type: "test",
 		}.Absolute(addrs.RootModuleInstance)

terraform/context_plan_test.go

@@ -10,19 +10,16 @@ import (
 	"sync"
 	"testing"
 
-	"github.com/hashicorp/terraform/config/hcl2shim"
-
-	"github.com/hashicorp/terraform/plans"
-
-	"github.com/hashicorp/terraform/states"
-
 	"github.com/davecgh/go-spew/spew"
 	"github.com/google/go-cmp/cmp"
 	"github.com/zclconf/go-cty/cty"
 
 	"github.com/hashicorp/terraform/addrs"
+	"github.com/hashicorp/terraform/config/hcl2shim"
 	"github.com/hashicorp/terraform/configs/configschema"
+	"github.com/hashicorp/terraform/plans"
 	"github.com/hashicorp/terraform/providers"
+	"github.com/hashicorp/terraform/states"
 	"github.com/hashicorp/terraform/tfdiags"
 )
 

terraform/eval_diff_test.go

@@ -3,9 +3,9 @@ package terraform
 import (
 	"testing"
 
-	"github.com/zclconf/go-cty/cty"
 	"github.com/hashicorp/hcl2/hcl"
 	"github.com/hashicorp/hcl2/hcl/hclsyntax"
+	"github.com/zclconf/go-cty/cty"
 )
 
 func TestProcessIgnoreChangesIndividual(t *testing.T) {

terraform/node_provider_abstract.go

@@ -2,8 +2,8 @@ package terraform
 
 import (
 	"github.com/hashicorp/terraform/addrs"
-	"github.com/hashicorp/terraform/configs/configschema"
 	"github.com/hashicorp/terraform/configs"
+	"github.com/hashicorp/terraform/configs/configschema"
 
 	"github.com/hashicorp/terraform/dag"
 )