move docker client init code to utils and call from TestMain

Author: nkubala

cmd/analyze.go

@@ -62,7 +62,7 @@ func analyzeImage(imageName string, analyzerArgs []string) error {
 		return err
 	}
 
-	cli, err := NewClient()
+	cli, err := pkgutil.NewClient()
 	if err != nil {
 		return fmt.Errorf("Error getting docker client: %s", err)
 	}

cmd/diff.go

@@ -63,7 +63,7 @@ func diffImages(image1Arg, image2Arg string, diffArgs []string) error {
 		return err
 	}
 
-	cli, err := NewClient()
+	cli, err := pkgutil.NewClient()
 	if err != nil {
 		return err
 	}

cmd/root.go

@@ -17,7 +17,6 @@ limitations under the License.
 package cmd
 
 import (
-	"context"
 	"errors"
 	goflag "flag"
 	"fmt"
@@ -57,16 +56,6 @@ If no prefix is specified, the local daemon will be checked first.
 Tarballs can also be specified by simply providing the path to the .tar, .tar.gz, or .tgz file.`,
 }
 
-func NewClient() (*client.Client, error) {
-	cli, err := client.NewEnvClient()
-	if err != nil {
-		return nil, fmt.Errorf("Error getting docker client: %s", err)
-	}
-	cli.NegotiateAPIVersion(context.Background())
-
-	return cli, nil
-}
-
 func outputResults(resultMap map[string]util.Result) {
 	// Outputs diff/analysis results in alphabetical order by analyzer name
 	sortedTypes := []string{}

pkg/util/docker_utils.go

@@ -39,6 +39,16 @@ type Event struct {
 	} `json:"progressDetail"`
 }
 
+func NewClient() (*client.Client, error) {
+	cli, err := client.NewEnvClient()
+	if err != nil {
+		return nil, fmt.Errorf("Error getting docker client: %s", err)
+	}
+	cli.NegotiateAPIVersion(context.Background())
+
+	return cli, nil
+}
+
 func getLayersFromManifest(manifestPath string) ([]string, error) {
 	type Manifest struct {
 		Layers []string

tests/integration_test.go

@@ -30,7 +30,8 @@ import (
 	"testing"
 
 	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/client"
+
+	pkgutil "github.com/GoogleCloudPlatform/container-diff/pkg/util"
 )
 
 const (
@@ -205,14 +206,16 @@ func TestDiffAndAnalysis(t *testing.T) {
 func TestMain(m *testing.M) {
 	// setup
 	ctx := context.Background()
-	cli, _ := client.NewEnvClient()
+	cli, _ := pkgutil.NewClient()
 	closer, err := cli.ImagePull(ctx, multiBase, types.ImagePullOptions{})
 	if err != nil {
+		fmt.Printf("Error retrieving docker client: %s", err)
 		os.Exit(1)
 	}
 	closer.Close()
 	closer, err = cli.ImagePull(ctx, multiModified, types.ImagePullOptions{})
 	if err != nil {
+		fmt.Printf("Error retrieving docker client: %s", err)
 		os.Exit(1)
 	}
 	closer.Close()