Merge pull request #981 from ncdc/goimports-local

Make goimports consistent by pinning version and using -local flag

hack/build-image/Dockerfile

@@ -19,4 +19,8 @@ RUN apk add --update --no-cache git bash && \
     cd /go/src/k8s.io && \
     git clone -b kubernetes-1.11.0 https://github.com/kubernetes/code-generator && \
     git clone -b kubernetes-1.11.0 https://github.com/kubernetes/apimachinery && \
+    go get golang.org/x/tools/cmd/goimports && \
+    cd /go/src/golang.org/x/tools && \
+    git checkout 40a48ad93fbe707101afb2099b738471f70594ec && \
+    go install ./cmd/goimports && \
     echo chmod -R a+w /go

hack/update-fmt.sh

@@ -1,4 +1,4 @@
-#!/bin/bash -e
+#!/bin/bash
 #
 # Copyright 2017 the Heptio Ark contributors.
 #
@@ -14,13 +14,54 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-HACK_DIR=$(dirname "${BASH_SOURCE}")
+set -o errexit
+set -o nounset
+set -o pipefail
 
-echo "Updating formatting"
+if [[ ${1:-} == '--verify' ]]; then
+  # List file diffs that need formatting updates
+  MODE='-d'
+  ACTION='Verifying'
+else
+  # Write formatting updates to files
+  MODE='-w'
+  ACTION='Updating'
+fi
 
-gofmt -w -s $(find . -type f -name "*.go" -not -path "./vendor/*" -not -path "./pkg/generated/*" -not -name "zz_generated*")
+if ! command -v goimports > /dev/null; then
+  echo 'goimports is missing - please run "go get golang.org/x/tools/cmd/goimports"'
+  exit 1
+fi
 
-command -v goimports > /dev/null || go get golang.org/x/tools/cmd/goimports
-goimports -w -d $(find . -type f -name "*.go" -not -path "./vendor/*" -not -path "./pkg/generated/*" -not -name "zz_generated*")
+files="$(find . -type f -name '*.go' -not -path './vendor/*' -not -path './pkg/generated/*' -not -name 'zz_generated*')"
+echo "${ACTION} gofmt"
+for file in ${files}; do
+  output=$(gofmt "${MODE}" -s "${file}")
+  if [[ -n "${output}" ]]; then
+    VERIFY_FMT_FAILED=1
+    echo "${output}"
+  fi
+done
+if [[ -n "${VERIFY_FMT_FAILED:-}" ]]; then
+  echo "${ACTION} gofmt - failed! Please run 'make update'."
+else
+  echo "${ACTION} gofmt - done!"
+fi
 
-echo "Success!"
+echo "${ACTION} goimports"
+for file in ${files}; do
+  output=$(goimports "${MODE}" -local github.com/heptio/ark "${file}")
+  if [[ -n "${output}" ]]; then
+    VERIFY_IMPORTS_FAILED=1
+    echo "${output}"
+  fi
+done
+if [[ -n "${VERIFY_IMPORTS_FAILED:-}" ]]; then
+  echo "${ACTION} goimports - failed! Please run 'make update'."
+else
+  echo "${ACTION} goimports - done!"
+fi
+
+if [[ -n "${VERIFY_FMT_FAILED:-}" || -n "${VERIFY_IMPORTS_FAILED:-}" ]]; then
+  exit 1
+fi

hack/verify-fmt.sh

@@ -1,4 +1,4 @@
-#!/bin/bash -e
+#!/bin/bash
 #
 # Copyright 2017 the Heptio Ark contributors.
 #
@@ -14,19 +14,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-HACK_DIR=$(dirname "${BASH_SOURCE}")
-
-echo "Verifying gofmt"
-files=$(gofmt -l -s $(find . -type f -name "*.go" -not -path "./vendor/*" -not -path "./pkg/generated/*" -not -name "zz_generated*"))
-if [[ -n "${files}" ]]; then
-  echo "The following files need gofmt updating - please run 'make update'"
-  echo "${files}"
-  exit 1
-fi
-echo "Success!"
-
-echo "Verifying goimports"
-command -v goimports > /dev/null || go get golang.org/x/tools/cmd/goimports
-goimports -l $(find . -type f -name "*.go" -not -path "./vendor/*" -not -path "./pkg/generated/*" -not -name "zz_generated*")
-echo "Success!"
-
+HACK_DIR=$(dirname "${BASH_SOURCE[0]}")
+"${HACK_DIR}"/update-fmt.sh --verify

pkg/backup/backup.go

@@ -26,7 +26,6 @@ import (
 
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
-
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/runtime/schema"

pkg/backup/backup_pv_action.go

@@ -19,7 +19,6 @@ package backup
 import (
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
-
 	corev1api "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 

pkg/backup/backup_pv_action_test.go

@@ -19,13 +19,14 @@ package backup
 import (
 	"testing"
 
-	"github.com/heptio/ark/pkg/apis/ark/v1"
-	"github.com/heptio/ark/pkg/kuberesource"
-	arktest "github.com/heptio/ark/pkg/util/test"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	corev1api "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+
+	"github.com/heptio/ark/pkg/apis/ark/v1"
+	"github.com/heptio/ark/pkg/kuberesource"
+	arktest "github.com/heptio/ark/pkg/util/test"
 )
 
 func TestBackupPVAction(t *testing.T) {

pkg/backup/backup_test.go

@@ -28,7 +28,6 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
-
 	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"

pkg/backup/delete_helpers.go

@@ -19,8 +19,9 @@ package backup
 import (
 	"fmt"
 
-	"github.com/heptio/ark/pkg/apis/ark/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	"github.com/heptio/ark/pkg/apis/ark/v1"
 )
 
 // NewDeleteBackupRequest creates a DeleteBackupRequest for the backup identified by name and uid.

pkg/backup/group_backupper.go

@@ -22,7 +22,6 @@ import (
 
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
-
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	kuberrs "k8s.io/apimachinery/pkg/util/errors"

pkg/backup/group_backupper_test.go

@@ -19,16 +19,17 @@ package backup
 import (
 	"testing"
 
-	"github.com/heptio/ark/pkg/client"
-	"github.com/heptio/ark/pkg/discovery"
-	"github.com/heptio/ark/pkg/podexec"
-	"github.com/heptio/ark/pkg/restic"
-	arktest "github.com/heptio/ark/pkg/util/test"
 	"github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	"github.com/heptio/ark/pkg/client"
+	"github.com/heptio/ark/pkg/discovery"
+	"github.com/heptio/ark/pkg/podexec"
+	"github.com/heptio/ark/pkg/restic"
+	arktest "github.com/heptio/ark/pkg/util/test"
 )
 
 func TestBackupGroupBacksUpCorrectResourcesInCorrectOrder(t *testing.T) {

pkg/backup/item_backupper.go

@@ -24,7 +24,6 @@ import (
 
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
-
 	corev1api "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

pkg/backup/item_backupper_test.go

@@ -24,12 +24,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/heptio/ark/pkg/apis/ark/v1"
-	api "github.com/heptio/ark/pkg/apis/ark/v1"
-	"github.com/heptio/ark/pkg/cloudprovider"
-	resticmocks "github.com/heptio/ark/pkg/restic/mocks"
-	"github.com/heptio/ark/pkg/util/collections"
-	arktest "github.com/heptio/ark/pkg/util/test"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/assert"
@@ -43,6 +37,13 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/util/sets"
+
+	"github.com/heptio/ark/pkg/apis/ark/v1"
+	api "github.com/heptio/ark/pkg/apis/ark/v1"
+	"github.com/heptio/ark/pkg/cloudprovider"
+	resticmocks "github.com/heptio/ark/pkg/restic/mocks"
+	"github.com/heptio/ark/pkg/util/collections"
+	arktest "github.com/heptio/ark/pkg/util/test"
 )
 
 func TestBackupItemSkips(t *testing.T) {

pkg/backup/item_hook_handler.go

@@ -23,7 +23,6 @@ import (
 
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
-
 	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"

pkg/backup/item_hook_handler_test.go

@@ -21,9 +21,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/heptio/ark/pkg/apis/ark/v1"
-	"github.com/heptio/ark/pkg/util/collections"
-	arktest "github.com/heptio/ark/pkg/util/test"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/assert"
@@ -33,6 +30,10 @@ import (
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
+
+	"github.com/heptio/ark/pkg/apis/ark/v1"
+	"github.com/heptio/ark/pkg/util/collections"
+	arktest "github.com/heptio/ark/pkg/util/test"
 )
 
 type mockItemHookHandler struct {

pkg/backup/pod_action.go

@@ -19,7 +19,6 @@ package backup
 import (
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
-
 	"k8s.io/apimachinery/pkg/api/meta"
 	"k8s.io/apimachinery/pkg/runtime"
 

pkg/backup/pod_action_test.go

@@ -19,11 +19,12 @@ package backup
 import (
 	"testing"
 
-	"github.com/heptio/ark/pkg/kuberesource"
-	arktest "github.com/heptio/ark/pkg/util/test"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"k8s.io/apimachinery/pkg/runtime"
+
+	"github.com/heptio/ark/pkg/kuberesource"
+	arktest "github.com/heptio/ark/pkg/util/test"
 )
 
 func TestPodActionAppliesTo(t *testing.T) {

pkg/backup/resource_backupper.go

@@ -19,7 +19,6 @@ package backup
 import (
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
-
 	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"

pkg/backup/resource_backupper_test.go

@@ -19,6 +19,13 @@ package backup
 import (
 	"testing"
 
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/mock"
+	"github.com/stretchr/testify/require"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+
 	"github.com/heptio/ark/pkg/apis/ark/v1"
 	"github.com/heptio/ark/pkg/client"
 	"github.com/heptio/ark/pkg/discovery"
@@ -27,12 +34,6 @@ import (
 	"github.com/heptio/ark/pkg/restic"
 	"github.com/heptio/ark/pkg/util/collections"
 	arktest "github.com/heptio/ark/pkg/util/test"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/mock"
-	"github.com/stretchr/testify/require"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
-	"k8s.io/apimachinery/pkg/runtime/schema"
 )
 
 func TestBackupResource(t *testing.T) {

pkg/backup/service_account_action.go

@@ -19,7 +19,6 @@ package backup
 import (
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
-
 	rbac "k8s.io/api/rbac/v1"
 	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

pkg/backup/service_account_action_test.go

@@ -23,7 +23,6 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-
 	rbac "k8s.io/api/rbac/v1"
 	rbacbeta "k8s.io/api/rbac/v1beta1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

pkg/client/client.go

@@ -21,7 +21,6 @@ import (
 	"runtime"
 
 	"github.com/pkg/errors"
-
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
 

pkg/client/factory.go

@@ -22,7 +22,6 @@ import (
 
 	"github.com/pkg/errors"
 	"github.com/spf13/pflag"
-
 	"k8s.io/client-go/kubernetes"
 
 	"github.com/heptio/ark/pkg/apis/ark/v1"

pkg/cloudprovider/aws/block_store.go

@@ -27,7 +27,6 @@ import (
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
-
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/util/sets"
 

pkg/cloudprovider/aws/block_store_test.go

@@ -22,11 +22,11 @@ import (
 	"testing"
 
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/heptio/ark/pkg/util/collections"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+
+	"github.com/heptio/ark/pkg/util/collections"
 )
 
 func TestGetVolumeID(t *testing.T) {

pkg/cloudprovider/aws/helpers.go

@@ -20,11 +20,10 @@ import (
 	"context"
 	"net/url"
 
-	"github.com/pkg/errors"
-
 	"github.com/aws/aws-sdk-go/aws/endpoints"
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/s3/s3manager"
+	"github.com/pkg/errors"
 )
 
 // GetBucketRegion returns the AWS region that a bucket is in, or an error

pkg/cloudprovider/azure/block_store.go

@@ -31,7 +31,6 @@ import (
 	"github.com/pkg/errors"
 	"github.com/satori/uuid"
 	"github.com/sirupsen/logrus"
-
 	"k8s.io/apimachinery/pkg/runtime"
 
 	"github.com/heptio/ark/pkg/cloudprovider"

pkg/cloudprovider/azure/block_store_test.go

@@ -19,11 +19,11 @@ package azure
 import (
 	"testing"
 
-	"github.com/heptio/ark/pkg/util/collections"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+
+	"github.com/heptio/ark/pkg/util/collections"
 )
 
 func TestGetVolumeID(t *testing.T) {

pkg/cloudprovider/gcp/block_store.go

@@ -29,7 +29,6 @@ import (
 	"golang.org/x/oauth2/google"
 	"google.golang.org/api/compute/v1"
 	"google.golang.org/api/googleapi"
-
 	"k8s.io/apimachinery/pkg/runtime"
 
 	"github.com/heptio/ark/pkg/cloudprovider"

pkg/cloudprovider/gcp/block_store_test.go

@@ -20,13 +20,12 @@ import (
 	"encoding/json"
 	"testing"
 
-	"github.com/heptio/ark/pkg/util/collections"
-	arktest "github.com/heptio/ark/pkg/util/test"
-
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+
+	"github.com/heptio/ark/pkg/util/collections"
+	arktest "github.com/heptio/ark/pkg/util/test"
 )
 
 func TestGetVolumeID(t *testing.T) {

pkg/cloudprovider/gcp/object_store_test.go

@@ -21,8 +21,9 @@ import (
 	"strings"
 	"testing"
 
-	arktest "github.com/heptio/ark/pkg/util/test"
 	"github.com/stretchr/testify/assert"
+
+	arktest "github.com/heptio/ark/pkg/util/test"
 )
 
 type mockWriteCloser struct {

pkg/cmd/cli/backup/create.go

@@ -20,10 +20,8 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/heptio/ark/pkg/generated/informers/externalversions/ark/v1"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
-
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/tools/cache"
 
@@ -33,6 +31,7 @@ import (
 	"github.com/heptio/ark/pkg/cmd/util/flag"
 	"github.com/heptio/ark/pkg/cmd/util/output"
 	arkclient "github.com/heptio/ark/pkg/generated/clientset/versioned"
+	"github.com/heptio/ark/pkg/generated/informers/externalversions/ark/v1"
 )
 
 func NewCreateCommand(f client.Factory, use string) *cobra.Command {

pkg/cmd/cli/backup/delete.go

@@ -21,7 +21,6 @@ import (
 
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
-
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	kubeerrs "k8s.io/apimachinery/pkg/util/errors"

pkg/cmd/cli/backup/get.go

@@ -18,7 +18,6 @@ package backup
 
 import (
 	"github.com/spf13/cobra"
-
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	api "github.com/heptio/ark/pkg/apis/ark/v1"

pkg/cmd/cli/backuplocation/create.go

@@ -22,7 +22,6 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
-
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	api "github.com/heptio/ark/pkg/apis/ark/v1"

pkg/cmd/cli/backuplocation/get.go

@@ -18,7 +18,6 @@ package backuplocation
 
 import (
 	"github.com/spf13/cobra"
-
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	api "github.com/heptio/ark/pkg/apis/ark/v1"

pkg/cmd/cli/bug/bug.go

@@ -28,9 +28,10 @@ import (
 	"text/template"
 	"time"
 
+	"github.com/spf13/cobra"
+
 	"github.com/heptio/ark/pkg/buildinfo"
 	"github.com/heptio/ark/pkg/cmd"
-	"github.com/spf13/cobra"
 )
 
 const (

pkg/cmd/cli/client/client.go

@@ -17,8 +17,9 @@ limitations under the License.
 package client
 
 import (
-	"github.com/heptio/ark/pkg/cmd/cli/client/config"
 	"github.com/spf13/cobra"
+
+	"github.com/heptio/ark/pkg/cmd/cli/client/config"
 )
 
 func NewCommand() *cobra.Command {

pkg/cmd/cli/client/config/get.go

@@ -20,9 +20,10 @@ import (
 	"fmt"
 	"sort"
 
+	"github.com/spf13/cobra"
+
 	"github.com/heptio/ark/pkg/client"
 	"github.com/heptio/ark/pkg/cmd"
-	"github.com/spf13/cobra"
 )
 
 func NewGetCommand() *cobra.Command {

pkg/cmd/cli/client/config/set.go

@@ -21,9 +21,10 @@ import (
 	"os"
 	"strings"
 
+	"github.com/spf13/cobra"
+
 	"github.com/heptio/ark/pkg/client"
 	"github.com/heptio/ark/pkg/cmd"
-	"github.com/spf13/cobra"
 )
 
 func NewSetCommand() *cobra.Command {

pkg/cmd/cli/completion/completion.go

@@ -20,8 +20,9 @@ import (
 	"fmt"
 	"os"
 
-	kubectlcmd "github.com/heptio/ark/third_party/kubernetes/pkg/kubectl/cmd"
 	"github.com/spf13/cobra"
+
+	kubectlcmd "github.com/heptio/ark/third_party/kubernetes/pkg/kubectl/cmd"
 )
 
 func NewCommand() *cobra.Command {

pkg/cmd/cli/delete_options.go

@@ -23,12 +23,12 @@ import (
 	"os"
 	"strings"
 
+	"github.com/spf13/cobra"
+	"github.com/spf13/pflag"
+
 	"github.com/heptio/ark/pkg/client"
 	"github.com/heptio/ark/pkg/cmd/util/flag"
 	clientset "github.com/heptio/ark/pkg/generated/clientset/versioned"
-
-	"github.com/spf13/cobra"
-	"github.com/spf13/pflag"
 )
 
 // DeleteOptions contains parameters used for deleting a restore.

pkg/cmd/cli/plugin/add.go

@@ -24,7 +24,6 @@ import (
 	jsonpatch "github.com/evanphx/json-patch"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
-
 	"k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"

pkg/cmd/cli/plugin/remove.go

@@ -22,7 +22,6 @@ import (
 	jsonpatch "github.com/evanphx/json-patch"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
-
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 

pkg/cmd/cli/restic/repo/get.go

@@ -18,7 +18,6 @@ package repo
 
 import (
 	"github.com/spf13/cobra"
-
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	api "github.com/heptio/ark/pkg/apis/ark/v1"

pkg/cmd/cli/restic/server.go

@@ -25,7 +25,6 @@ import (
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
-
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	kubeinformers "k8s.io/client-go/informers"
 	corev1informers "k8s.io/client-go/informers/core/v1"

pkg/cmd/cli/restore/create.go

@@ -23,7 +23,6 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
-
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/tools/cache"
 

pkg/cmd/cli/restore/delete.go

@@ -21,7 +21,6 @@ import (
 
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
-
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	kubeerrs "k8s.io/apimachinery/pkg/util/errors"

pkg/cmd/cli/restore/get.go

@@ -17,9 +17,8 @@ limitations under the License.
 package restore
 
 import (
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-
 	"github.com/spf13/cobra"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	api "github.com/heptio/ark/pkg/apis/ark/v1"
 	"github.com/heptio/ark/pkg/client"

pkg/cmd/cli/restore/logs.go

@@ -22,7 +22,6 @@ import (
 
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
-
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	"github.com/heptio/ark/pkg/apis/ark/v1"

pkg/cmd/cli/schedule/create.go

@@ -22,7 +22,6 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
-
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	api "github.com/heptio/ark/pkg/apis/ark/v1"

pkg/cmd/cli/schedule/delete.go

@@ -21,7 +21,6 @@ import (
 
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
-
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	kubeerrs "k8s.io/apimachinery/pkg/util/errors"

pkg/cmd/cli/schedule/get.go

@@ -18,7 +18,6 @@ package schedule
 
 import (
 	"github.com/spf13/cobra"
-
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	api "github.com/heptio/ark/pkg/apis/ark/v1"

pkg/cmd/cli/snapshotlocation/create.go

@@ -22,7 +22,6 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
-
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	api "github.com/heptio/ark/pkg/apis/ark/v1"

pkg/cmd/cli/snapshotlocation/get.go

@@ -17,12 +17,13 @@ limitations under the License.
 package snapshotlocation
 
 import (
+	"github.com/spf13/cobra"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
 	api "github.com/heptio/ark/pkg/apis/ark/v1"
 	"github.com/heptio/ark/pkg/client"
 	"github.com/heptio/ark/pkg/cmd"
 	"github.com/heptio/ark/pkg/cmd/util/output"
-	"github.com/spf13/cobra"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 func NewGetCommand(f client.Factory, use string) *cobra.Command {

pkg/cmd/server/server.go

@@ -33,7 +33,6 @@ import (
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
-
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"

pkg/cmd/server/server_test.go

@@ -20,7 +20,6 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	"github.com/heptio/ark/pkg/apis/ark/v1"

pkg/cmd/util/downloadrequest/downloadrequest.go

@@ -25,7 +25,6 @@ import (
 	"time"
 
 	"github.com/pkg/errors"
-
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/watch"
 

pkg/cmd/util/downloadrequest/downloadrequest_test.go

@@ -26,14 +26,15 @@ import (
 	"testing"
 	"time"
 
-	"github.com/heptio/ark/pkg/apis/ark/v1"
-	"github.com/heptio/ark/pkg/generated/clientset/versioned/fake"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/watch"
 	core "k8s.io/client-go/testing"
+
+	"github.com/heptio/ark/pkg/apis/ark/v1"
+	"github.com/heptio/ark/pkg/generated/clientset/versioned/fake"
 )
 
 func TestStream(t *testing.T) {

pkg/cmd/util/output/backup_describer.go

@@ -23,11 +23,12 @@ import (
 	"sort"
 	"strings"
 
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
 	arkv1api "github.com/heptio/ark/pkg/apis/ark/v1"
 	"github.com/heptio/ark/pkg/cmd/util/downloadrequest"
 	clientset "github.com/heptio/ark/pkg/generated/clientset/versioned"
 	"github.com/heptio/ark/pkg/volume"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 // DescribeBackup describes a backup in human-readable format.

pkg/cmd/util/output/backup_printer_test.go

@@ -20,7 +20,6 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	"github.com/heptio/ark/pkg/apis/ark/v1"

pkg/cmd/util/output/output.go

@@ -24,7 +24,6 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
-
 	"k8s.io/apimachinery/pkg/api/meta"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/kubernetes/pkg/printers"

pkg/cmd/util/output/restore_describer.go

@@ -22,10 +22,11 @@ import (
 	"sort"
 	"strings"
 
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
 	"github.com/heptio/ark/pkg/apis/ark/v1"
 	"github.com/heptio/ark/pkg/cmd/util/downloadrequest"
 	clientset "github.com/heptio/ark/pkg/generated/clientset/versioned"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 func DescribeRestore(restore *v1.Restore, podVolumeRestores []v1.PodVolumeRestore, details bool, arkClient clientset.Interface) string {

pkg/controller/backup_controller.go

@@ -29,7 +29,6 @@ import (
 	jsonpatch "github.com/evanphx/json-patch"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
-
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/clock"

pkg/controller/backup_controller_test.go

@@ -30,7 +30,6 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
-
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/clock"
 

pkg/controller/backup_deletion_controller.go

@@ -22,6 +22,16 @@ import (
 	"time"
 
 	jsonpatch "github.com/evanphx/json-patch"
+	"github.com/pkg/errors"
+	"github.com/sirupsen/logrus"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/labels"
+	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/apimachinery/pkg/util/clock"
+	kubeerrs "k8s.io/apimachinery/pkg/util/errors"
+	"k8s.io/client-go/tools/cache"
+
 	"github.com/heptio/ark/pkg/apis/ark/v1"
 	pkgbackup "github.com/heptio/ark/pkg/backup"
 	"github.com/heptio/ark/pkg/cloudprovider"
@@ -32,15 +42,6 @@ import (
 	"github.com/heptio/ark/pkg/plugin"
 	"github.com/heptio/ark/pkg/restic"
 	"github.com/heptio/ark/pkg/util/kube"
-	"github.com/pkg/errors"
-	"github.com/sirupsen/logrus"
-	apierrors "k8s.io/apimachinery/pkg/api/errors"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/labels"
-	"k8s.io/apimachinery/pkg/types"
-	"k8s.io/apimachinery/pkg/util/clock"
-	kubeerrs "k8s.io/apimachinery/pkg/util/errors"
-	"k8s.io/client-go/tools/cache"
 )
 
 const resticTimeout = time.Minute

pkg/controller/backup_deletion_controller_test.go

@@ -25,7 +25,6 @@ import (
 	"github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"

pkg/controller/backup_sync_controller.go

@@ -22,7 +22,6 @@ import (
 
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
-
 	kuberrs "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"

pkg/controller/backup_sync_controller_test.go

@@ -24,7 +24,6 @@ import (
 	"github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/clock"

pkg/controller/download_request_controller.go

@@ -23,7 +23,6 @@ import (
 	jsonpatch "github.com/evanphx/json-patch"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
-
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"

pkg/controller/download_request_controller_test.go

@@ -23,7 +23,6 @@ import (
 	"github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/clock"

pkg/controller/gc_controller.go

@@ -19,16 +19,15 @@ package controller
 import (
 	"time"
 
-	pkgbackup "github.com/heptio/ark/pkg/backup"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
-
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/util/clock"
 	"k8s.io/client-go/tools/cache"
 
 	arkv1api "github.com/heptio/ark/pkg/apis/ark/v1"
+	pkgbackup "github.com/heptio/ark/pkg/backup"
 	arkv1client "github.com/heptio/ark/pkg/generated/clientset/versioned/typed/ark/v1"
 	informers "github.com/heptio/ark/pkg/generated/informers/externalversions/ark/v1"
 	listers "github.com/heptio/ark/pkg/generated/listers/ark/v1"

pkg/controller/gc_controller_test.go

@@ -26,7 +26,6 @@ import (
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/util/clock"

pkg/controller/generic_controller.go

@@ -23,7 +23,6 @@ import (
 
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
-
 	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/client-go/tools/cache"
 	"k8s.io/client-go/util/workqueue"

pkg/controller/pod_volume_backup_controller.go

@@ -26,7 +26,6 @@ import (
 	jsonpatch "github.com/evanphx/json-patch"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
-
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/types"
 	corev1informers "k8s.io/client-go/informers/core/v1"

pkg/controller/pod_volume_backup_controller_test.go

@@ -20,10 +20,10 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 
 	arkv1api "github.com/heptio/ark/pkg/apis/ark/v1"
 	arktest "github.com/heptio/ark/pkg/util/test"
-	"github.com/stretchr/testify/require"
 )
 
 func TestPVBHandler(t *testing.T) {

pkg/controller/pod_volume_restore_controller.go

@@ -27,7 +27,6 @@ import (
 	jsonpatch "github.com/evanphx/json-patch"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
-
 	corev1api "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"

pkg/controller/pod_volume_restore_controller_test.go

@@ -22,7 +22,6 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-
 	corev1api "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"

pkg/controller/restic_repository_controller.go

@@ -23,7 +23,6 @@ import (
 	jsonpatch "github.com/evanphx/json-patch"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
-
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"

pkg/controller/restore_controller.go

@@ -26,6 +26,14 @@ import (
 	"sort"
 
 	jsonpatch "github.com/evanphx/json-patch"
+	"github.com/pkg/errors"
+	"github.com/sirupsen/logrus"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	"k8s.io/apimachinery/pkg/labels"
+	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/apimachinery/pkg/util/sets"
+	"k8s.io/client-go/tools/cache"
+
 	api "github.com/heptio/ark/pkg/apis/ark/v1"
 	arkv1client "github.com/heptio/ark/pkg/generated/clientset/versioned/typed/ark/v1"
 	informers "github.com/heptio/ark/pkg/generated/informers/externalversions/ark/v1"
@@ -37,13 +45,6 @@ import (
 	"github.com/heptio/ark/pkg/util/collections"
 	kubeutil "github.com/heptio/ark/pkg/util/kube"
 	"github.com/heptio/ark/pkg/util/logging"
-	"github.com/pkg/errors"
-	"github.com/sirupsen/logrus"
-	apierrors "k8s.io/apimachinery/pkg/api/errors"
-	"k8s.io/apimachinery/pkg/labels"
-	"k8s.io/apimachinery/pkg/types"
-	"k8s.io/apimachinery/pkg/util/sets"
-	"k8s.io/client-go/tools/cache"
 )
 
 // nonRestorableResources is a blacklist for the restoration process. Any resources

pkg/controller/restore_controller_test.go

@@ -24,6 +24,16 @@ import (
 	"testing"
 	"time"
 
+	"github.com/pkg/errors"
+	"github.com/sirupsen/logrus"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/mock"
+	"github.com/stretchr/testify/require"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	core "k8s.io/client-go/testing"
+	"k8s.io/client-go/tools/cache"
+
 	api "github.com/heptio/ark/pkg/apis/ark/v1"
 	"github.com/heptio/ark/pkg/generated/clientset/versioned/fake"
 	informers "github.com/heptio/ark/pkg/generated/informers/externalversions"
@@ -37,15 +47,6 @@ import (
 	"github.com/heptio/ark/pkg/util/collections"
 	arktest "github.com/heptio/ark/pkg/util/test"
 	"github.com/heptio/ark/pkg/volume"
-	"github.com/pkg/errors"
-	"github.com/sirupsen/logrus"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/mock"
-	"github.com/stretchr/testify/require"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/runtime"
-	core "k8s.io/client-go/testing"
-	"k8s.io/client-go/tools/cache"
 )
 
 func TestFetchBackupInfo(t *testing.T) {

pkg/controller/schedule_controller.go

@@ -25,7 +25,6 @@ import (
 	"github.com/pkg/errors"
 	"github.com/robfig/cron"
 	"github.com/sirupsen/logrus"
-
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"

pkg/controller/schedule_controller_test.go

@@ -24,7 +24,6 @@ import (
 	"github.com/robfig/cron"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/util/clock"

pkg/discovery/helper.go

@@ -20,15 +20,15 @@ import (
 	"sort"
 	"sync"
 
-	kcmdutil "github.com/heptio/ark/third_party/kubernetes/pkg/kubectl/cmd/util"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
-
 	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/client-go/discovery"
 	"k8s.io/client-go/restmapper"
+
+	kcmdutil "github.com/heptio/ark/third_party/kubernetes/pkg/kubectl/cmd/util"
 )
 
 // Helper exposes functions for interacting with the Kubernetes discovery

pkg/discovery/helper_test.go

@@ -20,7 +20,6 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 

pkg/install/crd.go

@@ -19,10 +19,10 @@ package install
 import (
 	"fmt"
 
-	arkv1 "github.com/heptio/ark/pkg/apis/ark/v1"
-
 	apiextv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	arkv1 "github.com/heptio/ark/pkg/apis/ark/v1"
 )
 
 // CRDs returns a list of the CRD types for all of the required Ark CRDs

pkg/persistence/object_store.go

@@ -27,7 +27,6 @@ import (
 	"github.com/pkg/errors"
 	"github.com/satori/uuid"
 	"github.com/sirupsen/logrus"
-
 	kerrors "k8s.io/apimachinery/pkg/util/errors"
 
 	arkv1api "github.com/heptio/ark/pkg/apis/ark/v1"

pkg/persistence/object_store_test.go

@@ -31,7 +31,6 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
-
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 

pkg/plugin/backup_item_action.go

@@ -23,7 +23,6 @@ import (
 	"github.com/pkg/errors"
 	"golang.org/x/net/context"
 	"google.golang.org/grpc"
-
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"

pkg/plugin/backup_item_action_test.go

@@ -20,11 +20,6 @@ import (
 	"encoding/json"
 	"testing"
 
-	"github.com/heptio/ark/pkg/apis/ark/v1"
-	"github.com/heptio/ark/pkg/backup"
-	"github.com/heptio/ark/pkg/backup/mocks"
-	proto "github.com/heptio/ark/pkg/plugin/generated"
-	arktest "github.com/heptio/ark/pkg/util/test"
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -32,6 +27,12 @@ import (
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
+
+	"github.com/heptio/ark/pkg/apis/ark/v1"
+	"github.com/heptio/ark/pkg/backup"
+	"github.com/heptio/ark/pkg/backup/mocks"
+	proto "github.com/heptio/ark/pkg/plugin/generated"
+	arktest "github.com/heptio/ark/pkg/util/test"
 )
 
 func TestBackupItemActionGRPCServerExecute(t *testing.T) {

pkg/plugin/client_builder_test.go

@@ -21,9 +21,10 @@ import (
 	"testing"
 
 	hcplugin "github.com/hashicorp/go-plugin"
-	"github.com/heptio/ark/pkg/util/test"
 	"github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/assert"
+
+	"github.com/heptio/ark/pkg/util/test"
 )
 
 func TestNewClientBuilder(t *testing.T) {

pkg/plugin/client_dispenser_test.go

@@ -18,10 +18,11 @@ package plugin
 import (
 	"testing"
 
-	"github.com/heptio/ark/pkg/util/test"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"google.golang.org/grpc"
+
+	"github.com/heptio/ark/pkg/util/test"
 )
 
 type fakeClient struct {

pkg/plugin/logger_test.go

@@ -18,9 +18,10 @@ package plugin
 import (
 	"testing"
 
-	"github.com/heptio/ark/pkg/util/logging"
 	"github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/assert"
+
+	"github.com/heptio/ark/pkg/util/logging"
 )
 
 func TestNewLogger(t *testing.T) {

pkg/plugin/logrus_adapter_test.go

@@ -19,9 +19,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/stretchr/testify/assert"
-
 	"github.com/sirupsen/logrus"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestArgsToFields(t *testing.T) {

pkg/plugin/manager_test.go

@@ -20,12 +20,13 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/heptio/ark/pkg/util/test"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
+
+	"github.com/heptio/ark/pkg/util/test"
 )
 
 type mockRegistry struct {

pkg/plugin/plugin_base_test.go

@@ -18,8 +18,9 @@ package plugin
 import (
 	"testing"
 
-	"github.com/heptio/ark/pkg/util/test"
 	"github.com/stretchr/testify/assert"
+
+	"github.com/heptio/ark/pkg/util/test"
 )
 
 func TestClientLogger(t *testing.T) {

pkg/plugin/plugin_lister.go

@@ -17,10 +17,11 @@ package plugin
 
 import (
 	plugin "github.com/hashicorp/go-plugin"
-	proto "github.com/heptio/ark/pkg/plugin/generated"
 	"github.com/pkg/errors"
 	"golang.org/x/net/context"
 	"google.golang.org/grpc"
+
+	proto "github.com/heptio/ark/pkg/plugin/generated"
 )
 
 // PluginIdenitifer uniquely identifies a plugin by command, kind, and name.

pkg/plugin/registry.go

@@ -20,9 +20,10 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/heptio/ark/pkg/util/filesystem"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
+
+	"github.com/heptio/ark/pkg/util/filesystem"
 )
 
 // Registry manages information about available plugins.

pkg/plugin/registry_test.go

@@ -20,10 +20,11 @@ import (
 	"sort"
 	"testing"
 
-	"github.com/heptio/ark/pkg/util/test"
 	"github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+
+	"github.com/heptio/ark/pkg/util/test"
 )
 
 func TestNewRegistry(t *testing.T) {

pkg/plugin/restartable_backup_item_action.go

@@ -16,10 +16,11 @@ limitations under the License.
 package plugin
 
 import (
-	api "github.com/heptio/ark/pkg/apis/ark/v1"
-	"github.com/heptio/ark/pkg/backup"
 	"github.com/pkg/errors"
 	"k8s.io/apimachinery/pkg/runtime"
+
+	api "github.com/heptio/ark/pkg/apis/ark/v1"
+	"github.com/heptio/ark/pkg/backup"
 )
 
 // restartableBackupItemAction is a backup item action for a given implementation (such as "pod"). It is associated with

pkg/plugin/restartable_backup_item_action_test.go

@@ -19,14 +19,15 @@ package plugin
 import (
 	"testing"
 
-	"github.com/heptio/ark/pkg/apis/ark/v1"
-	"github.com/heptio/ark/pkg/backup"
-	"github.com/heptio/ark/pkg/backup/mocks"
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime/schema"
+
+	"github.com/heptio/ark/pkg/apis/ark/v1"
+	"github.com/heptio/ark/pkg/backup"
+	"github.com/heptio/ark/pkg/backup/mocks"
 )
 
 func TestRestartableGetBackupItemAction(t *testing.T) {