address review comments before merge

Signed-off-by: baude <bbaude@redhat.com>

8 files changed, 12 insertions, 11 deletions

diff --git a/pkg/api/handlers/containers_top.go b/pkg/api/handlers/containers_top.go
index 03081372e..bab559da1 100644
--- a/pkg/api/handlers/containers_top.go
+++ b/pkg/api/handlers/containers_top.go
@@ -1,12 +1,12 @@
 package handlers
 
 import (
-	"github.com/containers/libpod/pkg/api/handlers/utils"
 	"net/http"
 	"strings"
 
 	"github.com/containers/libpod/libpod"
 	"github.com/containers/libpod/libpod/define"
+	"github.com/containers/libpod/pkg/api/handlers/utils"
 	"github.com/gorilla/mux"
 	"github.com/gorilla/schema"
 	"github.com/pkg/errors"
diff --git a/pkg/api/handlers/events.go b/pkg/api/handlers/events.go
index 267d552df..900efa3da 100644
--- a/pkg/api/handlers/events.go
+++ b/pkg/api/handlers/events.go
@@ -3,9 +3,9 @@ package handlers
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/containers/libpod/pkg/api/handlers/utils"
 	"net/http"
 
+	"github.com/containers/libpod/pkg/api/handlers/utils"
 	"github.com/pkg/errors"
 )
 
diff --git a/pkg/api/handlers/generic/containers_create.go b/pkg/api/handlers/generic/containers_create.go
index 056f7e95c..ef5337abd 100644
--- a/pkg/api/handlers/generic/containers_create.go
+++ b/pkg/api/handlers/generic/containers_create.go
@@ -3,7 +3,6 @@ package generic
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/containers/libpod/pkg/api/handlers/utils"
 	"net/http"
 	"strings"
 
@@ -12,6 +11,7 @@ import (
 	"github.com/containers/libpod/libpod/define"
 	image2 "github.com/containers/libpod/libpod/image"
 	"github.com/containers/libpod/pkg/api/handlers"
+	"github.com/containers/libpod/pkg/api/handlers/utils"
 	"github.com/containers/libpod/pkg/namespaces"
 	createconfig "github.com/containers/libpod/pkg/spec"
 	"github.com/containers/storage"
diff --git a/pkg/api/handlers/generic/info.go b/pkg/api/handlers/generic/info.go
index 2bef8db4f..c9e79233d 100644
--- a/pkg/api/handlers/generic/info.go
+++ b/pkg/api/handlers/generic/info.go
@@ -2,8 +2,6 @@ package generic
 
 import (
 	"fmt"
-	"github.com/containers/libpod/pkg/api/handlers"
-	"github.com/containers/libpod/pkg/api/handlers/utils"
 	"io/ioutil"
 	"net/http"
 	"os"
@@ -14,6 +12,8 @@ import (
 	"github.com/containers/libpod/libpod"
 	"github.com/containers/libpod/libpod/config"
 	"github.com/containers/libpod/libpod/define"
+	"github.com/containers/libpod/pkg/api/handlers"
+	"github.com/containers/libpod/pkg/api/handlers/utils"
 	"github.com/containers/libpod/pkg/rootless"
 	"github.com/containers/libpod/pkg/sysinfo"
 	docker "github.com/docker/docker/api/types"
diff --git a/pkg/api/handlers/generic/system.go b/pkg/api/handlers/generic/system.go
index 254990b95..edf1f8522 100644
--- a/pkg/api/handlers/generic/system.go
+++ b/pkg/api/handlers/generic/system.go
@@ -1,10 +1,10 @@
 package generic
 
 import (
-	"github.com/containers/libpod/pkg/api/handlers"
-	"github.com/containers/libpod/pkg/api/handlers/utils"
 	"net/http"
 
+	"github.com/containers/libpod/pkg/api/handlers"
+	"github.com/containers/libpod/pkg/api/handlers/utils"
 	docker "github.com/docker/docker/api/types"
 )
 
diff --git a/pkg/api/handlers/generic/version.go b/pkg/api/handlers/generic/version.go
index 2c2283d10..39423914d 100644
--- a/pkg/api/handlers/generic/version.go
+++ b/pkg/api/handlers/generic/version.go
@@ -2,14 +2,14 @@ package generic
 
 import (
 	"fmt"
-	"github.com/containers/libpod/pkg/api/handlers"
-	"github.com/containers/libpod/pkg/api/handlers/utils"
 	"net/http"
 	goRuntime "runtime"
 	"time"
 
 	"github.com/containers/libpod/libpod"
 	"github.com/containers/libpod/libpod/define"
+	"github.com/containers/libpod/pkg/api/handlers"
+	"github.com/containers/libpod/pkg/api/handlers/utils"
 	docker "github.com/docker/docker/api/types"
 	"github.com/pkg/errors"
 )
diff --git a/pkg/api/handlers/handler.go b/pkg/api/handlers/handler.go
index 1ea7dc60a..2efeb1379 100644
--- a/pkg/api/handlers/handler.go
+++ b/pkg/api/handlers/handler.go
@@ -1,11 +1,12 @@
 package handlers
 
 import (
+	"net/http"
+
 	"github.com/containers/libpod/libpod"
 	"github.com/gorilla/mux"
 	"github.com/gorilla/schema"
 	"github.com/pkg/errors"
-	"net/http"
 )
 
 // Convenience routines to reduce boiler plate in handlers
diff --git a/pkg/api/server/register_swarm.go b/pkg/api/server/register_swarm.go
index 61c0b2d83..63d8acfde 100644
--- a/pkg/api/server/register_swarm.go
+++ b/pkg/api/server/register_swarm.go
@@ -2,9 +2,9 @@ package server
 
 import (
 	"errors"
-	"github.com/containers/libpod/pkg/api/handlers/utils"
 	"net/http"
 
+	"github.com/containers/libpod/pkg/api/handlers/utils"
 	"github.com/gorilla/mux"
 	"github.com/sirupsen/logrus"
 )