diff --git a/terraform/context_apply_test.go b/terraform/context_apply_test.go
index 376caee663..9965897fcf 100644
--- a/terraform/context_apply_test.go
+++ b/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"
@@ -1493,7 +1493,7 @@ func TestContext2Apply_dataBasic(t *testing.T) {
 	p.DiffFn = testDiffFn
 	p.ReadDataSourceResponse = providers.ReadDataSourceResponse{
 		State: cty.ObjectVal(map[string]cty.Value{
-			"id": cty.StringVal("yo"),
+			"id":  cty.StringVal("yo"),
 			"foo": cty.NullVal(cty.String),
 		}),
 	}
@@ -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)
@@ -2744,7 +2744,7 @@ func TestContext2Apply_orphanResource(t *testing.T) {
 		s.SetResourceMeta(zeroAddr, states.EachList, providerAddr)
 		s.SetResourceMeta(oneAddr, states.EachList, providerAddr)
 		s.SetResourceInstanceCurrent(oneAddr.Instance(addrs.IntKey(0)), &states.ResourceInstanceObjectSrc{
-			Status: states.ObjectReady,
+			Status:    states.ObjectReady,
 			AttrsJSON: []byte(`{}`),
 		}, providerAddr)
 	})
diff --git a/terraform/context_fixtures_test.go b/terraform/context_fixtures_test.go
index 15eeb4ebcc..afb5bd80a0 100644
--- a/terraform/context_fixtures_test.go
+++ b/terraform/context_fixtures_test.go
@@ -38,7 +38,7 @@ func contextFixtureApplyVars(t *testing.T) *contextTestFixture {
 	c := testModule(t, "apply-vars")
 	p := mockProviderWithResourceTypeSchema("aws_instance", &configschema.Block{
 		Attributes: map[string]*configschema.Attribute{
-			"id":  {Type: cty.String, Computed: true},
+			"id":   {Type: cty.String, Computed: true},
 			"foo":  {Type: cty.String, Optional: true},
 			"bar":  {Type: cty.String, Optional: true},
 			"baz":  {Type: cty.String, Optional: true},
diff --git a/terraform/context_plan_test.go b/terraform/context_plan_test.go
index 4b2ed72f8b..4c7ab83b8a 100644
--- a/terraform/context_plan_test.go
+++ b/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"
 )
 
diff --git a/terraform/eval_diff_test.go b/terraform/eval_diff_test.go
index eaea33919f..233c2070e5 100644
--- a/terraform/eval_diff_test.go
+++ b/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) {
diff --git a/terraform/graph_builder_destroy_plan.go b/terraform/graph_builder_destroy_plan.go
index e86af161a8..a6047a9b41 100644
--- a/terraform/graph_builder_destroy_plan.go
+++ b/terraform/graph_builder_destroy_plan.go
@@ -54,7 +54,7 @@ func (b *DestroyPlanGraphBuilder) Steps() []GraphTransformer {
 	concreteResourceInstanceDeposed := func(a *NodeAbstractResourceInstance, key states.DeposedKey) dag.Vertex {
 		return &NodePlanDeposedResourceInstanceObject{
 			NodeAbstractResourceInstance: a,
-			DeposedKey: key,
+			DeposedKey:                   key,
 		}
 	}
 
diff --git a/terraform/graph_builder_plan.go b/terraform/graph_builder_plan.go
index b52a51aa3c..17adfd279e 100644
--- a/terraform/graph_builder_plan.go
+++ b/terraform/graph_builder_plan.go
@@ -72,7 +72,7 @@ func (b *PlanGraphBuilder) Steps() []GraphTransformer {
 	concreteResourceInstanceDeposed := func(a *NodeAbstractResourceInstance, key states.DeposedKey) dag.Vertex {
 		return &NodePlanDeposedResourceInstanceObject{
 			NodeAbstractResourceInstance: a,
-			DeposedKey: key,
+			DeposedKey:                   key,
 		}
 	}
 
diff --git a/terraform/graph_builder_refresh.go b/terraform/graph_builder_refresh.go
index d2459eeeb2..0342cdbe83 100644
--- a/terraform/graph_builder_refresh.go
+++ b/terraform/graph_builder_refresh.go
@@ -82,7 +82,7 @@ func (b *RefreshGraphBuilder) Steps() []GraphTransformer {
 		// The "Plan" node type also handles refreshing behavior.
 		return &NodePlanDeposedResourceInstanceObject{
 			NodeAbstractResourceInstance: a,
-			DeposedKey: key,
+			DeposedKey:                   key,
 		}
 	}
 
diff --git a/terraform/node_provider_abstract.go b/terraform/node_provider_abstract.go
index 41b24fb13a..a0cdcfe01d 100644
--- a/terraform/node_provider_abstract.go
+++ b/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"
 )
diff --git a/terraform/node_resource_apply_instance.go b/terraform/node_resource_apply_instance.go
index 857e1a80d4..cab2ad3650 100644
--- a/terraform/node_resource_apply_instance.go
+++ b/terraform/node_resource_apply_instance.go
@@ -22,7 +22,7 @@ import (
 type NodeApplyableResourceInstance struct {
 	*NodeAbstractResourceInstance
 
-	destroyNode GraphNodeDestroyerCBD
+	destroyNode      GraphNodeDestroyerCBD
 	graphNodeDeposer // implementation of GraphNodeDeposer
 }