[FAB-9879] Refactor CouchDB runner

This refactors the couchDB runner so that we can add
more runners using some of the same attributes.

Change-Id: I33d61bd7178f9d03ee23b87a88d16852756e9718
Signed-off-by: Latitia M Haskins <latitia.haskins@gmail.com>

Author: lhaskins

Gopkg.lock

@@ -29,7 +29,7 @@ ignored = [
 
 [[constraint]]
   name = "github.com/fsouza/go-dockerclient"
-  version = "1.0.0"
+  version = "1.2.0"
 
 [[constraint]]
   branch = "master"

Gopkg.toml

@@ -8,41 +8,21 @@ package runner
 
 import (
 	"context"
-	"encoding/base32"
 	"fmt"
 	"io"
 	"net"
 	"net/http"
 	"os"
 	"strconv"
-	"strings"
 	"sync"
 	"time"
 
 	docker "github.com/fsouza/go-dockerclient"
-	"github.com/hyperledger/fabric/common/util"
 	"github.com/pkg/errors"
 	"github.com/tedsuo/ifrit"
 )
 
-const (
-	DefaultImage        = "hyperledger/fabric-couchdb:latest"
-	DefaultStartTimeout = 30 * time.Second
-)
-
-// A NameFunc is used to generate container names.
-type NameFunc func() string
-
-// DefaultNamer is the default naming function.
-var DefaultNamer NameFunc = UniqueName
-
-// UniqueName is a NamerFunc that generates base-32 enocded UUIDs for container
-// names.
-func UniqueName() string {
-	uuid := util.GenerateBytesUUID()
-	encoded := base32.StdEncoding.WithPadding(base32.NoPadding).EncodeToString(uuid)
-	return strings.ToLower(encoded)
-}
+const DefaultCouchDBImage = "hyperledger/fabric-couchdb:latest"
 
 // CouchDB manages the execution of an instance of a dockerized CounchDB
 // for tests.
@@ -70,7 +50,7 @@ type CouchDB struct {
 // Run runs a CouchDB container. It implements the ifrit.Runner interface
 func (c *CouchDB) Run(sigCh <-chan os.Signal, ready chan<- struct{}) error {
 	if c.Image == "" {
-		c.Image = DefaultImage
+		c.Image = DefaultCouchDBImage
 	}
 
 	if c.Name == "" {

integration/runner/couchdb.go

@@ -0,0 +1,27 @@
+/*
+Copyright IBM Corp. All Rights Reserved.
+
+SPDX-License-Identifier: Apache-2.0
+*/
+
+package runner
+
+import (
+	"encoding/base32"
+	"time"
+
+	"github.com/hyperledger/fabric/common/util"
+)
+
+const DefaultStartTimeout = 30 * time.Second
+
+// DefaultNamer is the default naming function.
+var DefaultNamer NameFunc = UniqueName
+
+// A NameFunc is used to generate container names.
+type NameFunc func() string
+
+// UniqueName is a NamerFunc that generates base-32 enocded UUIDs for container names.
+func UniqueName() string {
+	return base32.StdEncoding.WithPadding(base32.NoPadding).EncodeToString(util.GenerateBytesUUID())
+}