update from code consistency checks

internal/command/command_test.go

@@ -7,7 +7,6 @@ import (
 	"encoding/base64"
 	"encoding/json"
 	"fmt"
-	"github.com/google/go-cmp/cmp"
 	"io"
 	"io/ioutil"
 	"net/http"
@@ -20,6 +19,8 @@ import (
 	"syscall"
 	"testing"
 
+	"github.com/google/go-cmp/cmp"
+
 	svchost "github.com/hashicorp/terraform-svchost"
 	"github.com/hashicorp/terraform-svchost/disco"
 	"github.com/hashicorp/terraform/internal/addrs"

internal/command/meta.go

@@ -6,8 +6,6 @@ import (
 	"errors"
 	"flag"
 	"fmt"
-	"github.com/hashicorp/terraform/internal/configs"
-	"github.com/hashicorp/terraform/internal/states"
 	"io/ioutil"
 	"log"
 	"os"
@@ -16,6 +14,9 @@ import (
 	"strings"
 	"time"
 
+	"github.com/hashicorp/terraform/internal/configs"
+	"github.com/hashicorp/terraform/internal/states"
+
 	plugin "github.com/hashicorp/go-plugin"
 	"github.com/hashicorp/terraform-svchost/disco"
 	"github.com/mitchellh/cli"

internal/command/state_mv.go

@@ -2,9 +2,10 @@ package command
 
 import (
 	"fmt"
-	"github.com/hashicorp/terraform/internal/terraform"
 	"strings"
 
+	"github.com/hashicorp/terraform/internal/terraform"
+
 	"github.com/hashicorp/terraform/internal/addrs"
 	"github.com/hashicorp/terraform/internal/backend"
 	"github.com/hashicorp/terraform/internal/command/arguments"

internal/command/state_push.go

@@ -2,12 +2,13 @@ package command
 
 import (
 	"fmt"
-	"github.com/hashicorp/terraform/internal/terraform"
-	"github.com/hashicorp/terraform/internal/tfdiags"
 	"io"
 	"os"
 	"strings"
 
+	"github.com/hashicorp/terraform/internal/terraform"
+	"github.com/hashicorp/terraform/internal/tfdiags"
+
 	"github.com/hashicorp/terraform/internal/command/arguments"
 	"github.com/hashicorp/terraform/internal/command/clistate"
 	"github.com/hashicorp/terraform/internal/command/views"

internal/command/state_replace_provider.go

@@ -2,9 +2,10 @@ package command
 
 import (
 	"fmt"
-	"github.com/hashicorp/terraform/internal/terraform"
 	"strings"
 
+	"github.com/hashicorp/terraform/internal/terraform"
+
 	"github.com/hashicorp/terraform/internal/addrs"
 	"github.com/hashicorp/terraform/internal/command/arguments"
 	"github.com/hashicorp/terraform/internal/command/clistate"

internal/command/state_rm.go

@@ -2,9 +2,10 @@ package command
 
 import (
 	"fmt"
-	"github.com/hashicorp/terraform/internal/terraform"
 	"strings"
 
+	"github.com/hashicorp/terraform/internal/terraform"
+
 	"github.com/hashicorp/terraform/internal/addrs"
 	"github.com/hashicorp/terraform/internal/command/arguments"
 	"github.com/hashicorp/terraform/internal/command/clistate"

internal/command/taint.go

@@ -2,9 +2,10 @@ package command
 
 import (
 	"fmt"
-	"github.com/hashicorp/terraform/internal/terraform"
 	"strings"
 
+	"github.com/hashicorp/terraform/internal/terraform"
+
 	"github.com/hashicorp/terraform/internal/addrs"
 	"github.com/hashicorp/terraform/internal/command/arguments"
 	"github.com/hashicorp/terraform/internal/command/clistate"

internal/command/untaint.go

@@ -2,9 +2,10 @@ package command
 
 import (
 	"fmt"
-	"github.com/hashicorp/terraform/internal/terraform"
 	"strings"
 
+	"github.com/hashicorp/terraform/internal/terraform"
+
 	"github.com/hashicorp/terraform/internal/addrs"
 	"github.com/hashicorp/terraform/internal/command/arguments"
 	"github.com/hashicorp/terraform/internal/command/clistate"