Updates after running `make fmt` with Go v1.11.1

backend/local/backend_local.go

@@ -1,12 +1,11 @@
 package local
 
 import (
-	"log"
 	"context"
 	"fmt"
+	"log"
 
 	"github.com/hashicorp/errwrap"
-
 	"github.com/hashicorp/terraform/backend"
 	"github.com/hashicorp/terraform/command/clistate"
 	"github.com/hashicorp/terraform/configs/configload"

backend/remote-state/s3/backend_test.go

@@ -254,8 +254,8 @@ func TestBackendPrefixInWorkspace(t *testing.T) {
 	bucketName := fmt.Sprintf("terraform-remote-s3-test-%x", time.Now().Unix())
 
 	b := backend.TestBackendConfig(t, New(), backend.TestWrapConfig(map[string]interface{}{
-		"bucket": bucketName,
-		"key":    "test-env.tfstate",
+		"bucket":               bucketName,
+		"key":                  "test-env.tfstate",
 		"workspace_key_prefix": "env",
 	})).(*Backend)
 

command/format/object_id_test.go

@@ -8,7 +8,7 @@ import (
 )
 
 func TestObjectValueIDOrName(t *testing.T) {
-	tests := []struct{
+	tests := []struct {
 		obj    cty.Value
 		id     [2]string
 		name   [2]string
@@ -34,7 +34,7 @@ func TestObjectValueIDOrName(t *testing.T) {
 		},
 		{
 			cty.ObjectVal(map[string]cty.Value{
-				"id":   cty.StringVal("foo-123"),
+				"id": cty.StringVal("foo-123"),
 			}),
 			[...]string{"id", "foo-123"},
 			[...]string{"", ""},
@@ -95,7 +95,7 @@ func TestObjectValueIDOrName(t *testing.T) {
 		// in this formatter, this is the place to add a new test case.
 		{
 			cty.ObjectVal(map[string]cty.Value{
-				"id":   cty.True,
+				"id": cty.True,
 			}),
 			[...]string{"", ""},
 			[...]string{"", ""},
@@ -103,7 +103,7 @@ func TestObjectValueIDOrName(t *testing.T) {
 		},
 		{
 			cty.ObjectVal(map[string]cty.Value{
-				"id":   cty.NullVal(cty.String),
+				"id": cty.NullVal(cty.String),
 			}),
 			[...]string{"", ""},
 			[...]string{"", ""},
@@ -111,7 +111,7 @@ func TestObjectValueIDOrName(t *testing.T) {
 		},
 		{
 			cty.ObjectVal(map[string]cty.Value{
-				"id":   cty.UnknownVal(cty.String),
+				"id": cty.UnknownVal(cty.String),
 			}),
 			[...]string{"", ""},
 			[...]string{"", ""},
@@ -174,7 +174,7 @@ func TestObjectValueIDOrName(t *testing.T) {
 	}
 
 	for _, test := range tests {
-		t.Run(fmt.Sprintf("%#v", test.obj), func (t *testing.T) {
+		t.Run(fmt.Sprintf("%#v", test.obj), func(t *testing.T) {
 			obj := test.obj
 			gotIDKey, gotIDVal := ObjectValueID(obj)
 			gotNameKey, gotNameVal := ObjectValueName(obj)

helper/resource/grpc_test_provider.go

@@ -5,13 +5,13 @@ import (
 	"net"
 	"time"
 
-	"google.golang.org/grpc/test/bufconn"
 	"github.com/hashicorp/terraform/helper/plugin"
 	tfplugin "github.com/hashicorp/terraform/plugin"
 	"github.com/hashicorp/terraform/plugin/proto"
 	"github.com/hashicorp/terraform/providers"
 	"github.com/hashicorp/terraform/terraform"
 	"google.golang.org/grpc"
+	"google.golang.org/grpc/test/bufconn"
 )
 
 // GRPCTestProvider takes a legacy ResourceProvider, wraps it in the new GRPC

helper/resource/testing_config.go

@@ -1,9 +1,9 @@
 package resource
 
 import (
-	"errors"
 	"bufio"
 	"bytes"
+	"errors"
 	"fmt"
 	"log"
 	"sort"

tfdiags/contextual.go

@@ -297,7 +297,7 @@ func WholeContainingBody(severity Severity, summary, detail string) Diagnostic {
 
 type wholeBodyDiagnostic struct {
 	diagnosticBase
-	subject  *SourceRange // populated only after ElaborateFromConfigBody
+	subject *SourceRange // populated only after ElaborateFromConfigBody
 }
 
 func (d *wholeBodyDiagnostic) ElaborateFromConfigBody(body hcl.Body) Diagnostic {