Fix gofmt errors

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>

cmd/kpod/common.go

@@ -9,9 +9,9 @@ import (
 	is "github.com/containers/image/storage"
 	"github.com/containers/storage"
 	"github.com/fatih/camelcase"
+	"github.com/pkg/errors"
 	"github.com/projectatomic/libpod/libkpod"
 	"github.com/projectatomic/libpod/libpod"
-	"github.com/pkg/errors"
 	"github.com/urfave/cli"
 )
 

cmd/kpod/create.go

@@ -5,8 +5,8 @@ import (
 	"strconv"
 
 	"github.com/docker/go-units"
-	"github.com/projectatomic/libpod/libpod"
 	"github.com/pkg/errors"
+	"github.com/projectatomic/libpod/libpod"
 	"github.com/urfave/cli"
 	pb "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
 )

cmd/kpod/diff.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 
 	"github.com/containers/storage/pkg/archive"
-	"github.com/projectatomic/libpod/cmd/kpod/formats"
 	"github.com/pkg/errors"
+	"github.com/projectatomic/libpod/cmd/kpod/formats"
 	"github.com/urfave/cli"
 )
 

cmd/kpod/history.go

@@ -8,9 +8,9 @@ import (
 
 	"github.com/containers/image/types"
 	units "github.com/docker/go-units"
-	"github.com/projectatomic/libpod/cmd/kpod/formats"
 	"github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/pkg/errors"
+	"github.com/projectatomic/libpod/cmd/kpod/formats"
 	"github.com/urfave/cli"
 )
 

cmd/kpod/images.go

@@ -9,11 +9,11 @@ import (
 	"github.com/containers/image/types"
 	"github.com/containers/storage"
 	"github.com/docker/go-units"
+	digest "github.com/opencontainers/go-digest"
+	"github.com/pkg/errors"
 	"github.com/projectatomic/libpod/cmd/kpod/formats"
 	"github.com/projectatomic/libpod/libpod"
 	"github.com/projectatomic/libpod/libpod/common"
-	digest "github.com/opencontainers/go-digest"
-	"github.com/pkg/errors"
 	"github.com/urfave/cli"
 )
 

cmd/kpod/info.go

@@ -8,8 +8,8 @@ import (
 	"runtime"
 
 	"github.com/docker/docker/pkg/system"
-	"github.com/projectatomic/libpod/cmd/kpod/formats"
 	"github.com/pkg/errors"
+	"github.com/projectatomic/libpod/cmd/kpod/formats"
 	"github.com/urfave/cli"
 )
 

cmd/kpod/inspect.go

@@ -1,10 +1,10 @@
 package main
 
 import (
+	"github.com/pkg/errors"
 	"github.com/projectatomic/libpod/cmd/kpod/formats"
 	"github.com/projectatomic/libpod/libkpod"
 	"github.com/projectatomic/libpod/libpod/images"
-	"github.com/pkg/errors"
 	"github.com/urfave/cli"
 )
 

cmd/kpod/kill.go

@@ -5,8 +5,8 @@ import (
 	"os"
 
 	"github.com/docker/docker/pkg/signal"
-	"github.com/projectatomic/libpod/libkpod"
 	"github.com/pkg/errors"
+	"github.com/projectatomic/libpod/libkpod"
 	"github.com/urfave/cli"
 )
 

cmd/kpod/load.go

@@ -5,8 +5,8 @@ import (
 	"io/ioutil"
 	"os"
 
-	"github.com/projectatomic/libpod/libpod"
 	"github.com/pkg/errors"
+	"github.com/projectatomic/libpod/libpod"
 	"github.com/urfave/cli"
 )
 

cmd/kpod/login.go

@@ -9,8 +9,8 @@ import (
 
 	"github.com/containers/image/docker"
 	"github.com/containers/image/pkg/docker/config"
-	"github.com/projectatomic/libpod/libpod/common"
 	"github.com/pkg/errors"
+	"github.com/projectatomic/libpod/libpod/common"
 	"github.com/urfave/cli"
 	"golang.org/x/crypto/ssh/terminal"
 )

cmd/kpod/logout.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 
 	"github.com/containers/image/pkg/docker/config"
-	"github.com/projectatomic/libpod/libpod/common"
 	"github.com/pkg/errors"
+	"github.com/projectatomic/libpod/libpod/common"
 	"github.com/urfave/cli"
 )
 

cmd/kpod/logs.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/projectatomic/libpod/libkpod"
 	"github.com/pkg/errors"
+	"github.com/projectatomic/libpod/libkpod"
 	"github.com/urfave/cli"
 )
 

cmd/kpod/mount.go

@@ -4,8 +4,8 @@ import (
 	js "encoding/json"
 	"fmt"
 
-	of "github.com/projectatomic/libpod/cmd/kpod/formats"
 	"github.com/pkg/errors"
+	of "github.com/projectatomic/libpod/cmd/kpod/formats"
 	"github.com/urfave/cli"
 )
 

cmd/kpod/pause.go

@@ -2,8 +2,8 @@ package main
 
 import (
 	"fmt"
-	"github.com/projectatomic/libpod/libkpod"
 	"github.com/pkg/errors"
+	"github.com/projectatomic/libpod/libkpod"
 	"github.com/urfave/cli"
 	"os"
 )

cmd/kpod/ps.go

@@ -15,10 +15,10 @@ import (
 
 	"k8s.io/apimachinery/pkg/fields"
 
+	"github.com/pkg/errors"
 	"github.com/projectatomic/libpod/cmd/kpod/formats"
 	"github.com/projectatomic/libpod/libkpod"
 	"github.com/projectatomic/libpod/oci"
-	"github.com/pkg/errors"
 	"github.com/urfave/cli"
 )
 

cmd/kpod/pull.go

@@ -8,9 +8,9 @@ import (
 	"golang.org/x/crypto/ssh/terminal"
 
 	"github.com/containers/image/types"
+	"github.com/pkg/errors"
 	"github.com/projectatomic/libpod/libpod"
 	"github.com/projectatomic/libpod/libpod/common"
-	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )

cmd/kpod/push.go

@@ -7,9 +7,9 @@ import (
 
 	"github.com/containers/image/types"
 	"github.com/containers/storage/pkg/archive"
+	"github.com/pkg/errors"
 	"github.com/projectatomic/libpod/libpod"
 	"github.com/projectatomic/libpod/libpod/common"
-	"github.com/pkg/errors"
 	"github.com/urfave/cli"
 	"golang.org/x/crypto/ssh/terminal"
 )

cmd/kpod/rename.go

@@ -1,8 +1,8 @@
 package main
 
 import (
-	"github.com/projectatomic/libpod/libkpod"
 	"github.com/pkg/errors"
+	"github.com/projectatomic/libpod/libkpod"
 	"github.com/urfave/cli"
 )
 

cmd/kpod/rm.go

@@ -3,8 +3,8 @@ package main
 import (
 	"fmt"
 
-	"github.com/projectatomic/libpod/libkpod"
 	"github.com/pkg/errors"
+	"github.com/projectatomic/libpod/libkpod"
 	"github.com/urfave/cli"
 	"golang.org/x/net/context"
 )

cmd/kpod/run.go

@@ -3,8 +3,8 @@ package main
 import (
 	"fmt"
 
-	"github.com/projectatomic/libpod/libpod"
 	"github.com/pkg/errors"
+	"github.com/projectatomic/libpod/libpod"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )

cmd/kpod/save.go

@@ -4,8 +4,8 @@ import (
 	"io"
 	"os"
 
-	"github.com/projectatomic/libpod/libpod"
 	"github.com/pkg/errors"
+	"github.com/projectatomic/libpod/libpod"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )

cmd/kpod/spec.go

@@ -4,10 +4,10 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/projectatomic/libpod/libpod"
-	ann "github.com/projectatomic/libpod/pkg/annotations"
 	spec "github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/pkg/errors"
+	"github.com/projectatomic/libpod/libpod"
+	ann "github.com/projectatomic/libpod/pkg/annotations"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 	"golang.org/x/sys/unix"

cmd/kpod/stats.go

@@ -11,9 +11,9 @@ import (
 	"github.com/docker/go-units"
 
 	tm "github.com/buger/goterm"
+	"github.com/pkg/errors"
 	"github.com/projectatomic/libpod/libkpod"
 	"github.com/projectatomic/libpod/oci"
-	"github.com/pkg/errors"
 	"github.com/urfave/cli"
 )
 

cmd/kpod/stop.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/projectatomic/libpod/libkpod"
 	"github.com/pkg/errors"
+	"github.com/projectatomic/libpod/libkpod"
 	"github.com/urfave/cli"
 	"golang.org/x/net/context"
 )

cmd/kpod/tag.go

@@ -3,8 +3,8 @@ package main
 import (
 	"github.com/containers/image/docker/reference"
 	"github.com/containers/storage"
-	"github.com/projectatomic/libpod/libpod"
 	"github.com/pkg/errors"
+	"github.com/projectatomic/libpod/libpod"
 	"github.com/urfave/cli"
 )
 

cmd/kpod/unpause.go

@@ -2,8 +2,8 @@ package main
 
 import (
 	"fmt"
-	"github.com/projectatomic/libpod/libkpod"
 	"github.com/pkg/errors"
+	"github.com/projectatomic/libpod/libkpod"
 	"github.com/urfave/cli"
 	"os"
 )

cmd/kpod/wait.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/projectatomic/libpod/libkpod"
 	"github.com/pkg/errors"
+	"github.com/projectatomic/libpod/libkpod"
 	"github.com/urfave/cli"
 )
 

libkpod/config.go

@@ -5,8 +5,8 @@ import (
 	"io/ioutil"
 
 	"github.com/BurntSushi/toml"
-	"github.com/projectatomic/libpod/oci"
 	"github.com/opencontainers/selinux/go-selinux"
+	"github.com/projectatomic/libpod/oci"
 )
 
 // Default paths if none are specified

libkpod/container.go

@@ -4,10 +4,10 @@ import (
 	"fmt"
 
 	cstorage "github.com/containers/storage"
+	"github.com/pkg/errors"
 	"github.com/projectatomic/libpod/libkpod/sandbox"
 	"github.com/projectatomic/libpod/oci"
 	"github.com/projectatomic/libpod/pkg/registrar"
-	"github.com/pkg/errors"
 )
 
 // GetStorageContainer searches for a container with the given name or ID in the given store

libkpod/container_data.go

@@ -8,12 +8,12 @@ import (
 	"k8s.io/apimachinery/pkg/fields"
 	pb "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
 
-	"github.com/projectatomic/libpod/libpod/driver"
-	"github.com/projectatomic/libpod/libpod/images"
-	"github.com/projectatomic/libpod/oci"
 	"github.com/opencontainers/image-spec/specs-go/v1"
 	specs "github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/pkg/errors"
+	"github.com/projectatomic/libpod/libpod/driver"
+	"github.com/projectatomic/libpod/libpod/images"
+	"github.com/projectatomic/libpod/oci"
 )
 
 // ContainerData handles the data used when inspecting a container

libkpod/container_server.go

@@ -12,16 +12,16 @@ import (
 	cstorage "github.com/containers/storage"
 	"github.com/docker/docker/pkg/ioutils"
 	"github.com/docker/docker/pkg/truncindex"
-	"github.com/projectatomic/libpod/libkpod/sandbox"
-	"github.com/projectatomic/libpod/oci"
-	"github.com/projectatomic/libpod/pkg/annotations"
-	"github.com/projectatomic/libpod/pkg/registrar"
-	"github.com/projectatomic/libpod/pkg/storage"
 	"github.com/opencontainers/runc/libcontainer"
 	rspec "github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/opencontainers/selinux/go-selinux"
 	"github.com/opencontainers/selinux/go-selinux/label"
 	"github.com/pkg/errors"
+	"github.com/projectatomic/libpod/libkpod/sandbox"
+	"github.com/projectatomic/libpod/oci"
+	"github.com/projectatomic/libpod/pkg/annotations"
+	"github.com/projectatomic/libpod/pkg/registrar"
+	"github.com/projectatomic/libpod/pkg/storage"
 	"github.com/sirupsen/logrus"
 	pb "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
 )

libkpod/kill.go

@@ -2,9 +2,9 @@ package libkpod
 
 import (
 	"github.com/docker/docker/pkg/signal"
+	"github.com/pkg/errors"
 	"github.com/projectatomic/libpod/oci"
 	"github.com/projectatomic/libpod/utils"
-	"github.com/pkg/errors"
 	"os"
 	"syscall"
 )

libkpod/pause.go

@@ -1,8 +1,8 @@
 package libkpod
 
 import (
-	"github.com/projectatomic/libpod/oci"
 	"github.com/pkg/errors"
+	"github.com/projectatomic/libpod/oci"
 )
 
 // ContainerPause pauses a running container.

libkpod/remove.go

@@ -4,8 +4,8 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/projectatomic/libpod/oci"
 	"github.com/pkg/errors"
+	"github.com/projectatomic/libpod/oci"
 	"golang.org/x/net/context"
 )
 

libkpod/rename.go

@@ -7,9 +7,9 @@ import (
 	"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
 
 	"github.com/docker/docker/pkg/ioutils"
+	"github.com/opencontainers/runtime-tools/generate"
 	"github.com/projectatomic/libpod/oci"
 	"github.com/projectatomic/libpod/pkg/annotations"
-	"github.com/opencontainers/runtime-tools/generate"
 )
 
 const configFile = "config.json"

libkpod/stats.go

@@ -7,8 +7,8 @@ import (
 
 	"strings"
 
-	"github.com/projectatomic/libpod/oci"
 	"github.com/opencontainers/runc/libcontainer"
+	"github.com/projectatomic/libpod/oci"
 )
 
 // ContainerStats contains the statistics information for a running container

libkpod/stop.go

@@ -1,8 +1,8 @@
 package libkpod
 
 import (
-	"github.com/projectatomic/libpod/oci"
 	"github.com/pkg/errors"
+	"github.com/projectatomic/libpod/oci"
 	"golang.org/x/net/context"
 )
 

libkpod/wait.go

@@ -1,8 +1,8 @@
 package libkpod
 
 import (
-	"github.com/projectatomic/libpod/oci"
 	"github.com/pkg/errors"
+	"github.com/projectatomic/libpod/oci"
 	"k8s.io/apimachinery/pkg/util/wait"
 )
 

libpod/container.go

@@ -10,14 +10,13 @@ import (
 
 	"github.com/containers/storage"
 	"github.com/docker/docker/pkg/stringid"
-	crioAnnotations "github.com/projectatomic/libpod/pkg/annotations"
+	"github.com/docker/docker/pkg/term"
 	spec "github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/pkg/errors"
+	crioAnnotations "github.com/projectatomic/libpod/pkg/annotations"
 	"github.com/sirupsen/logrus"
 	"github.com/ulule/deepcopier"
-	"github.com/docker/docker/pkg/term"
 	"k8s.io/client-go/tools/remotecommand"
-
 )
 
 // ContainerState represents the current state of a container

libpod/container_attach.go

@@ -9,8 +9,8 @@ import (
 	"strconv"
 
 	"github.com/docker/docker/pkg/term"
-	"github.com/projectatomic/libpod/utils"
 	"github.com/pkg/errors"
+	"github.com/projectatomic/libpod/utils"
 	"github.com/sirupsen/logrus"
 	"golang.org/x/sys/unix"
 	"k8s.io/client-go/tools/remotecommand"

libpod/diff.go

@@ -2,8 +2,8 @@ package libpod
 
 import (
 	"github.com/containers/storage/pkg/archive"
-	"github.com/projectatomic/libpod/libpod/layers"
 	"github.com/pkg/errors"
+	"github.com/projectatomic/libpod/libpod/layers"
 )
 
 // GetDiff returns the differences between the two images, layers, or containers

libpod/images/image_data.go

@@ -9,10 +9,10 @@ import (
 	"github.com/containers/image/transports"
 	"github.com/containers/image/types"
 	"github.com/containers/storage"
-	"github.com/projectatomic/libpod/libpod/driver"
 	digest "github.com/opencontainers/go-digest"
 	ociv1 "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/pkg/errors"
+	"github.com/projectatomic/libpod/libpod/driver"
 )
 
 // Data handles the data used when inspecting a container

libpod/in_memory_state.go

@@ -2,8 +2,8 @@ package libpod
 
 import (
 	"github.com/docker/docker/pkg/truncindex"
-	"github.com/projectatomic/libpod/pkg/registrar"
 	"github.com/pkg/errors"
+	"github.com/projectatomic/libpod/pkg/registrar"
 )
 
 // An InMemoryState is a purely in-memory state store

libpod/runtime_img.go

@@ -23,10 +23,10 @@ import (
 	"github.com/containers/image/types"
 	"github.com/containers/storage"
 	"github.com/containers/storage/pkg/archive"
-	"github.com/projectatomic/libpod/libpod/common"
 	digest "github.com/opencontainers/go-digest"
 	ociv1 "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/pkg/errors"
+	"github.com/projectatomic/libpod/libpod/common"
 )
 
 // Runtime API

oci/oci.go

@@ -14,8 +14,8 @@ import (
 	"time"
 
 	"github.com/containerd/cgroups"
-	"github.com/projectatomic/libpod/utils"
 	rspec "github.com/opencontainers/runtime-spec/specs-go"
+	"github.com/projectatomic/libpod/utils"
 	"github.com/sirupsen/logrus"
 	"golang.org/x/net/context"
 	"golang.org/x/sys/unix"