Merge pull request #1043 from coreydaley/clean_up_imports

Cleaning up imports

Author: openshift-merge-robot

pkg/cmd/cli/cli.go

@@ -6,13 +6,13 @@ import (
 	"runtime"
 	"strings"
 
-	utillog "github.com/openshift/source-to-image/pkg/util/log"
 	"github.com/spf13/cobra"
 
 	"github.com/openshift/source-to-image/pkg/api"
 	"github.com/openshift/source-to-image/pkg/cmd/cli/cmd"
 	cmdutil "github.com/openshift/source-to-image/pkg/cmd/cli/util"
 	"github.com/openshift/source-to-image/pkg/docker"
+	utillog "github.com/openshift/source-to-image/pkg/util/log"
 )
 
 // log is a placeholder until the builders pass an output stream down

pkg/cmd/cli/cmd/build.go

@@ -4,8 +4,6 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/openshift/source-to-image/pkg/scm/git"
-	utillog "github.com/openshift/source-to-image/pkg/util/log"
 	"github.com/spf13/cobra"
 
 	"github.com/openshift/source-to-image/pkg/api"
@@ -18,8 +16,10 @@ import (
 	"github.com/openshift/source-to-image/pkg/docker"
 	s2ierr "github.com/openshift/source-to-image/pkg/errors"
 	"github.com/openshift/source-to-image/pkg/run"
+	"github.com/openshift/source-to-image/pkg/scm/git"
 	"github.com/openshift/source-to-image/pkg/tar"
 	"github.com/openshift/source-to-image/pkg/util"
+	utillog "github.com/openshift/source-to-image/pkg/util/log"
 	"github.com/openshift/source-to-image/pkg/version"
 )
 

pkg/cmd/cli/cmd/generate.go

@@ -2,10 +2,11 @@ package cmd
 
 import (
 	"context"
+	"strings"
+
 	"github.com/containers/image/v5/transports/alltransports"
 	"github.com/containers/image/v5/types"
 	"github.com/spf13/cobra"
-	"strings"
 
 	"github.com/openshift/source-to-image/pkg/api"
 	"github.com/openshift/source-to-image/pkg/api/constants"

pkg/cmd/cli/util/util.go

@@ -5,11 +5,12 @@ import (
 	"os"
 	"path/filepath"
 
+	"github.com/spf13/cobra"
+	"github.com/spf13/pflag"
+
 	log "k8s.io/klog"
 
 	"github.com/openshift/source-to-image/pkg/api"
-	"github.com/spf13/cobra"
-	"github.com/spf13/pflag"
 )
 
 // AddCommonFlags adds the common flags for usage, build and rebuild commands

pkg/config/config.go

@@ -7,11 +7,12 @@ import (
 	"regexp"
 	"strings"
 
+	"github.com/spf13/cobra"
+	"github.com/spf13/pflag"
+
 	"github.com/openshift/source-to-image/pkg/api"
 	"github.com/openshift/source-to-image/pkg/scm/git"
 	utillog "github.com/openshift/source-to-image/pkg/util/log"
-	"github.com/spf13/cobra"
-	"github.com/spf13/pflag"
 )
 
 var log = utillog.StderrLog

pkg/docker/docker_test.go

@@ -10,14 +10,14 @@ import (
 	"strings"
 	"testing"
 
+	dockertypes "github.com/docker/docker/api/types"
+	dockercontainer "github.com/docker/docker/api/types/container"
+	dockerstrslice "github.com/docker/docker/api/types/strslice"
+
 	"github.com/openshift/source-to-image/pkg/api/constants"
 	dockertest "github.com/openshift/source-to-image/pkg/docker/test"
 	"github.com/openshift/source-to-image/pkg/errors"
 	testfs "github.com/openshift/source-to-image/pkg/test/fs"
-
-	dockertypes "github.com/docker/docker/api/types"
-	dockercontainer "github.com/docker/docker/api/types/container"
-	dockerstrslice "github.com/docker/docker/api/types/strslice"
 )
 
 func TestContainerName(t *testing.T) {

pkg/docker/util_test.go

@@ -5,6 +5,7 @@ import (
 	"testing"
 
 	cliconfig "github.com/docker/docker/cli/config"
+
 	"github.com/openshift/source-to-image/pkg/api/constants"
 	"github.com/openshift/source-to-image/pkg/util/user"
 )

pkg/tar/tar.go

@@ -11,11 +11,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/openshift/source-to-image/pkg/util/fs"
-	utillog "github.com/openshift/source-to-image/pkg/util/log"
-
 	s2ierr "github.com/openshift/source-to-image/pkg/errors"
 	"github.com/openshift/source-to-image/pkg/util"
+	"github.com/openshift/source-to-image/pkg/util/fs"
+	utillog "github.com/openshift/source-to-image/pkg/util/log"
 )
 
 var log = utillog.StderrLog

pkg/util/fs/fs.go

@@ -12,9 +12,8 @@ import (
 	"sync"
 	"time"
 
-	utillog "github.com/openshift/source-to-image/pkg/util/log"
-
 	s2ierr "github.com/openshift/source-to-image/pkg/errors"
+	utillog "github.com/openshift/source-to-image/pkg/util/log"
 )
 
 var log = utillog.StderrLog

test/generate_test.go

@@ -1,8 +1,9 @@
 package test
 
 import (
-	"github.com/openshift/source-to-image/pkg/cmd/cli/cmd"
 	"testing"
+
+	"github.com/openshift/source-to-image/pkg/cmd/cli/cmd"
 )
 
 func TestGenerate_canonizeBuilderImageArg(t *testing.T) {

test/integration/docker/integration_test.go

@@ -16,11 +16,13 @@ import (
 	"testing"
 	"time"
 
-	"k8s.io/klog"
-
 	dockertypes "github.com/docker/docker/api/types"
 	dockercontainer "github.com/docker/docker/api/types/container"
 	dockerapi "github.com/docker/docker/client"
+	"golang.org/x/net/context"
+
+	"k8s.io/klog"
+
 	"github.com/openshift/source-to-image/pkg/api"
 	"github.com/openshift/source-to-image/pkg/build"
 	"github.com/openshift/source-to-image/pkg/build/strategies"
@@ -30,7 +32,6 @@ import (
 	"github.com/openshift/source-to-image/pkg/tar"
 	"github.com/openshift/source-to-image/pkg/util"
 	"github.com/openshift/source-to-image/pkg/util/fs"
-	"golang.org/x/net/context"
 )
 
 const (