@@ -17,20 +17,13 @@ import (

 // WriteLogStream writes an encoded byte stream of log messages from the

 // messages channel, multiplexing them with a stdcopy.Writer if mux is true

-func WriteLogStream(ctx context.Context, w io.Writer, msgs <-chan *backend.LogMessage, config *types.ContainerLogsOptions, mux bool) {

+func WriteLogStream(_ context.Context, w io.Writer, msgs <-chan *backend.LogMessage, config *types.ContainerLogsOptions, mux bool) {

 	wf := ioutils.NewWriteFlusher(w)

 	defer wf.Close()

 	wf.Flush()

-	// this might seem like doing below is clear:

-	//   var outStream io.Writer = wf

-	// however, this GREATLY DISPLEASES golint, and if you do that, it will

-	// fail CI. we need outstream to be type writer because if we mux streams,

-	// we will need to reassign all of the streams to be stdwriters, which only

-	// conforms to the io.Writer interface.

-	var outStream io.Writer

-	outStream = wf

+	outStream := io.Writer(wf)

 	errStream := outStream

 	sysErrStream := errStream

 	if mux {

@@ -427,11 +427,7 @@ func (sr *swarmRouter) updateSecret(ctx context.Context, w http.ResponseWriter,

 	}

 	id := vars["id"]

-	if err := sr.backend.UpdateSecret(id, version, secret); err != nil {

-		return err

-	}

-

-	return nil

+	return sr.backend.UpdateSecret(id, version, secret)

 }

 func (sr *swarmRouter) getConfigs(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

@@ -498,9 +494,5 @@ func (sr *swarmRouter) updateConfig(ctx context.Context, w http.ResponseWriter,

 	}

 	id := vars["id"]

-	if err := sr.backend.UpdateConfig(id, version, config); err != nil {

-		return err

-	}

-

-	return nil

+	return sr.backend.UpdateConfig(id, version, config)

 }

@@ -182,7 +182,7 @@ func TestArgsMatchKVList(t *testing.T) {

 	}

 	for args, field := range matches {

-		if args.MatchKVList(field, sources) != true {

+		if !args.MatchKVList(field, sources) {

 			t.Fatalf("Expected true for %v on %v, got false", sources, args)

 		}

 	}

@@ -202,7 +202,7 @@ func TestArgsMatchKVList(t *testing.T) {

 	}

 	for args, field := range differs {

-		if args.MatchKVList(field, sources) != false {

+		if args.MatchKVList(field, sources) {

 			t.Fatalf("Expected false for %v on %v, got true", sources, args)

 		}

 	}

@@ -29,10 +29,8 @@ func GetTimestamp(value string, reference time.Time) (string, error) {

 	}

 	var format string

-	var parseInLocation bool

-

 	// if the string has a Z or a + or three dashes use parse otherwise use parseinlocation

-	parseInLocation = !(strings.ContainsAny(value, "zZ+") || strings.Count(value, "-") == 3)

+	parseInLocation := !(strings.ContainsAny(value, "zZ+") || strings.Count(value, "-") == 3)

 	if strings.Contains(value, ".") {

 		if parseInLocation {

@@ -34,10 +34,10 @@ func TestBuilderFlags(t *testing.T) {

 		t.Fatalf("Test3 of %q was supposed to work: %s", bf.Args, err)

 	}

-	if flStr1.IsUsed() == true {

+	if flStr1.IsUsed() {

 		t.Fatal("Test3 - str1 was not used!")

 	}

-	if flBool1.IsUsed() == true {

+	if flBool1.IsUsed() {

 		t.Fatal("Test3 - bool1 was not used!")

 	}

@@ -58,10 +58,10 @@ func TestBuilderFlags(t *testing.T) {

 	if flBool1.IsTrue() {

 		t.Fatal("Bool1 was supposed to default to: false")

 	}

-	if flStr1.IsUsed() == true {

+	if flStr1.IsUsed() {

 		t.Fatal("Str1 was not used!")

 	}

-	if flBool1.IsUsed() == true {

+	if flBool1.IsUsed() {

 		t.Fatal("Bool1 was not used!")

 	}

@@ -206,10 +206,7 @@ func lookupUser(userStr, filepath string) (int, error) {

 		return uid, nil

 	}

 	users, err := lcUser.ParsePasswdFileFilter(filepath, func(u lcUser.User) bool {

-		if u.Name == userStr {

-			return true

-		}

-		return false

+		return u.Name == userStr

 	})

 	if err != nil {

 		return 0, err

@@ -228,10 +225,7 @@ func lookupGroup(groupStr, filepath string) (int, error) {

 		return gid, nil

 	}

 	groups, err := lcUser.ParseGroupFileFilter(filepath, func(g lcUser.Group) bool {

-		if g.Name == groupStr {

-			return true

-		}

-		return false

+		return g.Name == groupStr

 	})

 	if err != nil {

 		return 0, err

@@ -143,7 +143,7 @@ func (d *Directive) possibleParserDirective(line string) error {

 	if len(tecMatch) != 0 {

 		for i, n := range tokenEscapeCommand.SubexpNames() {

 			if n == "escapechar" {

-				if d.escapeSeen == true {

+				if d.escapeSeen {

 					return errors.New("only one escape parser directive can be used")

 				}

 				d.escapeSeen = true

@@ -159,7 +159,7 @@ func (d *Directive) possibleParserDirective(line string) error {

 		if len(tpcMatch) != 0 {

 			for i, n := range tokenPlatformCommand.SubexpNames() {

 				if n == "platform" {

-					if d.platformSeen == true {

+					if d.platformSeen {

 						return errors.New("only one platform parser directive can be used")

 					}

 					d.platformSeen = true

@@ -21,7 +21,7 @@ const (

 const shouldStayFilename = "should_stay"

 func extractFilenames(files []os.FileInfo) []string {

-	filenames := make([]string, len(files), len(files))

+	filenames := make([]string, len(files))

 	for i, file := range files {

 		filenames[i] = file.Name()

@@ -116,7 +116,7 @@ func inspectResponse(ct string, r io.Reader, clen int64) (string, io.ReadCloser,

 		plen = maxPreambleLength

 	}

-	preamble := make([]byte, plen, plen)

+	preamble := make([]byte, plen)

 	rlen, err := r.Read(preamble)

 	if rlen == 0 {

 		return ct, ioutil.NopCloser(r), errors.New("empty response")

@@ -39,7 +39,7 @@ func (cli *Client) ContainerCommit(ctx context.Context, container string, option

 	for _, change := range options.Changes {

 		query.Add("changes", change)

 	}

-	if options.Pause != true {

+	if !options.Pause {

 		query.Set("pause", "0")

 	}

@@ -70,7 +70,7 @@ func tlsDialWithDialer(dialer *net.Dialer, network, addr string, config *tls.Con

 	timeout := dialer.Timeout

 	if !dialer.Deadline.IsZero() {

-		deadlineTimeout := dialer.Deadline.Sub(time.Now())

+		deadlineTimeout := time.Until(dialer.Deadline)

 		if timeout == 0 || deadlineTimeout < timeout {

 			timeout = deadlineTimeout

 		}

@@ -467,7 +467,7 @@ func loadDaemonCliConfig(opts *daemonOptions) (*config.Config, error) {

 		return nil, err

 	}

-	if conf.V2Only == false {

+	if !conf.V2Only {

 		logrus.Warnf(`The "disable-legacy-registry" option is deprecated and wil be removed in Docker v17.12. Interacting with legacy (v1) registries will no longer be supported in Docker v17.12"`)

 	}

@@ -203,10 +203,7 @@ func (db *memDB) ReserveName(name, containerID string) error {

 // Once released, a name can be reserved again

 func (db *memDB) ReleaseName(name string) error {

 	return db.withTxn(func(txn *memdb.Txn) error {

-		if err := txn.Delete(memdbNamesTable, nameAssociation{name: name}); err != nil {

-			return err

-		}

-		return nil

+		return txn.Delete(memdbNamesTable, nameAssociation{name: name})

 	})

 }

@@ -90,14 +90,12 @@ func main() {

 		fmt.Printf("Sector size: %d\n", status.SectorSize)

 		fmt.Printf("Data use: %d of %d (%.1f %%)\n", status.Data.Used, status.Data.Total, 100.0*float64(status.Data.Used)/float64(status.Data.Total))

 		fmt.Printf("Metadata use: %d of %d (%.1f %%)\n", status.Metadata.Used, status.Metadata.Total, 100.0*float64(status.Metadata.Used)/float64(status.Metadata.Total))

-		break

 	case "list":

 		ids := devices.List()

 		sort.Strings(ids)

 		for _, id := range ids {

 			fmt.Println(id)

 		}

-		break

 	case "device":

 		if flag.NArg() < 2 {

 			usage()

@@ -113,7 +111,6 @@ func main() {

 		fmt.Printf("Size in Sectors: %d\n", status.SizeInSectors)

 		fmt.Printf("Mapped Sectors: %d\n", status.MappedSectors)

 		fmt.Printf("Highest Mapped Sector: %d\n", status.HighestMappedSector)

-		break

 	case "resize":

 		if flag.NArg() < 2 {

 			usage()

@@ -131,7 +128,6 @@ func main() {

 			os.Exit(1)

 		}

-		break

 	case "snap":

 		if flag.NArg() < 3 {

 			usage()

@@ -142,7 +138,6 @@ func main() {

 			fmt.Println("Can't create snap device: ", err)

 			os.Exit(1)

 		}

-		break

 	case "remove":

 		if flag.NArg() < 2 {

 			usage()

@@ -153,7 +148,6 @@ func main() {

 			fmt.Println("Can't remove device: ", err)

 			os.Exit(1)

 		}

-		break

 	case "mount":

 		if flag.NArg() < 3 {

 			usage()

@@ -164,13 +158,10 @@ func main() {

 			fmt.Println("Can't mount device: ", err)

 			os.Exit(1)

 		}

-		break

 	default:

 		fmt.Printf("Unknown command %s\n", args[0])

 		usage()

 		os.Exit(1)

 	}

-

-	return

 }

@@ -40,11 +40,7 @@ func (nc *networkAttacherController) Update(ctx context.Context, t *api.Task) er

 func (nc *networkAttacherController) Prepare(ctx context.Context) error {

 	// Make sure all the networks that the task needs are created.

-	if err := nc.adapter.createNetworks(ctx); err != nil {

-		return err

-	}

-

-	return nil

+	return nc.adapter.createNetworks(ctx)

 }

 func (nc *networkAttacherController) Start(ctx context.Context) error {

@@ -69,11 +65,7 @@ func (nc *networkAttacherController) Terminate(ctx context.Context) error {

 func (nc *networkAttacherController) Remove(ctx context.Context) error {

 	// Try removing the network referenced in this task in case this

 	// task is the last one referencing it

-	if err := nc.adapter.removeNetworks(ctx); err != nil {

-		return err

-	}

-

-	return nil

+	return nc.adapter.removeNetworks(ctx)

 }

 func (nc *networkAttacherController) Close() error {

@@ -6,7 +6,7 @@ import (

 	"testing"

 	"github.com/docker/docker/opts"

-	"github.com/docker/go-units"

+	units "github.com/docker/go-units"

 	"github.com/gotestyourself/gotestyourself/fs"

 	"github.com/spf13/pflag"

 	"github.com/stretchr/testify/assert"

@@ -14,7 +14,7 @@ import (

 )

 func TestGetConflictFreeConfiguration(t *testing.T) {

-	configFileData := string([]byte(`

+	configFileData := `

 		{

 			"debug": true,

 			"default-ulimits": {

@@ -27,7 +27,7 @@ func TestGetConflictFreeConfiguration(t *testing.T) {

 			"log-opts": {

 				"tag": "test_tag"

 			}

-		}`))

+		}`

 	file := fs.NewFile(t, "docker-config", fs.WithContent(configFileData))

 	defer file.Remove()

@@ -55,7 +55,7 @@ func TestGetConflictFreeConfiguration(t *testing.T) {

 }

 func TestDaemonConfigurationMerge(t *testing.T) {

-	configFileData := string([]byte(`

+	configFileData := `

 		{

 			"debug": true,

 			"default-ulimits": {

@@ -68,7 +68,7 @@ func TestDaemonConfigurationMerge(t *testing.T) {

 			"log-opts": {

 				"tag": "test_tag"

 			}

-		}`))

+		}`

 	file := fs.NewFile(t, "docker-config", fs.WithContent(configFileData))

 	defer file.Remove()

@@ -115,10 +115,7 @@ func TestDaemonConfigurationMerge(t *testing.T) {

 }

 func TestDaemonConfigurationMergeShmSize(t *testing.T) {

-	data := string([]byte(`

-		{

-			"default-shm-size": "1g"

-		}`))

+	data := `{"default-shm-size": "1g"}`

 	file := fs.NewFile(t, "docker-config", fs.WithContent(data))

 	defer file.Remove()

@@ -133,7 +130,5 @@ func TestDaemonConfigurationMergeShmSize(t *testing.T) {

 	require.NoError(t, err)

 	expectedValue := 1 * 1024 * 1024 * 1024

-	if cc.ShmSize.Value() != int64(expectedValue) {

-		t.Fatalf("expected default shm size %d, got %d", expectedValue, cc.ShmSize.Value())

-	}

+	assert.Equal(t, int64(expectedValue), cc.ShmSize.Value())

 }

@@ -75,7 +75,7 @@ type Store struct {

 // NewStore initializes a new exec store.

 func NewStore() *Store {

-	return &Store{commands: make(map[string]*Config, 0)}

+	return &Store{commands: make(map[string]*Config)}

 }

 // Commands returns the exec configurations in the store.

@@ -18,6 +18,8 @@ import (

 	"github.com/docker/docker/pkg/archive"

 	"github.com/docker/docker/pkg/reexec"

 	"github.com/docker/docker/pkg/stringid"

+	"github.com/stretchr/testify/assert"

+	"github.com/stretchr/testify/require"

 )

 var (

@@ -179,9 +181,8 @@ func TestCleanupWithNoDirs(t *testing.T) {

 	d := newDriver(t)

 	defer os.RemoveAll(tmp)

-	if err := d.Cleanup(); err != nil {

-		t.Fatal(err)

-	}

+	err := d.Cleanup()

+	assert.NoError(t, err)

 }

 func TestCleanupWithDir(t *testing.T) {

@@ -201,18 +202,12 @@ func TestMountedFalseResponse(t *testing.T) {

 	d := newDriver(t)

 	defer os.RemoveAll(tmp)

-	if err := d.Create("1", "", nil); err != nil {

-		t.Fatal(err)

-	}

+	err := d.Create("1", "", nil)

+	require.NoError(t, err)

 	response, err := d.mounted(d.getDiffPath("1"))

-	if err != nil {

-		t.Fatal(err)

-	}

-

-	if response != false {

-		t.Fatal("Response if dir id 1 is mounted should be false")

-	}

+	require.NoError(t, err)

+	assert.False(t, response)

 }

 func TestMountedTrueResponse(t *testing.T) {

@@ -220,26 +215,17 @@ func TestMountedTrueResponse(t *testing.T) {

 	defer os.RemoveAll(tmp)

 	defer d.Cleanup()

-	if err := d.Create("1", "", nil); err != nil {

-		t.Fatal(err)

-	}

-	if err := d.Create("2", "1", nil); err != nil {

-		t.Fatal(err)

-	}

+	err := d.Create("1", "", nil)

+	require.NoError(t, err)

+	err = d.Create("2", "1", nil)

+	require.NoError(t, err)

-	_, err := d.Get("2", "")

-	if err != nil {

-		t.Fatal(err)

-	}

+	_, err = d.Get("2", "")

+	require.NoError(t, err)

 	response, err := d.mounted(d.pathCache["2"])

-	if err != nil {

-		t.Fatal(err)

-	}

-

-	if response != true {

-		t.Fatal("Response if dir id 2 is mounted should be true")

-	}

+	require.NoError(t, err)

+	assert.True(t, response)

 }

 func TestMountWithParent(t *testing.T) {

@@ -574,9 +560,8 @@ func TestStatus(t *testing.T) {

 	}

 	status := d.Status()

-	if status == nil || len(status) == 0 {

-		t.Fatal("Status should not be nil or empty")

-	}

+	assert.Len(t, status, 4)

+

 	rootDir := status[0]

 	dirs := status[2]

 	if rootDir[0] != "Root Dir" {

@@ -677,27 +662,19 @@ func testMountMoreThan42Layers(t *testing.T, mountPath string) {

 		}

 		current = hash(current)

-		if err := d.CreateReadWrite(current, parent, nil); err != nil {

-			t.Logf("Current layer %d", i)

-			t.Error(err)

-		}

+		err := d.CreateReadWrite(current, parent, nil)

+		require.NoError(t, err, "current layer %d", i)

+

 		point, err := d.Get(current, "")

-		if err != nil {

-			t.Logf("Current layer %d", i)

-			t.Error(err)

-		}

+		require.NoError(t, err, "current layer %d", i)

+

 		f, err := os.Create(path.Join(point, current))

-		if err != nil {

-			t.Logf("Current layer %d", i)

-			t.Error(err)

-		}

+		require.NoError(t, err, "current layer %d", i)

 		f.Close()

 		if i%10 == 0 {

-			if err := os.Remove(path.Join(point, parent)); err != nil {

-				t.Logf("Current layer %d", i)

-				t.Error(err)

-			}

+			err := os.Remove(path.Join(point, parent))

+			require.NoError(t, err, "current layer %d", i)

 			expected--

 		}

 		last = current

@@ -705,20 +682,14 @@ func testMountMoreThan42Layers(t *testing.T, mountPath string) {

 	// Perform the actual mount for the top most image

 	point, err := d.Get(last, "")

-	if err != nil {

-		t.Error(err)

-	}

+	require.NoError(t, err)

 	files, err := ioutil.ReadDir(point)

-	if err != nil {

-		t.Error(err)

-	}

-	if len(files) != expected {

-		t.Errorf("Expected %d got %d", expected, len(files))

-	}

+	require.NoError(t, err)

+	assert.Len(t, files, expected)

 }

 func TestMountMoreThan42Layers(t *testing.T) {

-	os.RemoveAll(tmpOuter)

+	defer os.RemoveAll(tmpOuter)

 	testMountMoreThan42Layers(t, tmp)

 }

@@ -1254,14 +1254,13 @@ func (devices *DeviceSet) setupBaseImage() error {

 }

 func setCloseOnExec(name string) {

-	if fileInfos, _ := ioutil.ReadDir("/proc/self/fd"); fileInfos != nil {

-		for _, i := range fileInfos {

-			link, _ := os.Readlink(filepath.Join("/proc/self/fd", i.Name()))

-			if link == name {

-				fd, err := strconv.Atoi(i.Name())

-				if err == nil {

-					unix.CloseOnExec(fd)

-				}

+	fileInfos, _ := ioutil.ReadDir("/proc/self/fd")

+	for _, i := range fileInfos {

+		link, _ := os.Readlink(filepath.Join("/proc/self/fd", i.Name()))

+		if link == name {

+			fd, err := strconv.Atoi(i.Name())

+			if err == nil {

+				unix.CloseOnExec(fd)

 			}

 		}

 	}

@@ -69,18 +69,18 @@ func (d *Driver) Status() [][2]string {

 	status := [][2]string{

 		{"Pool Name", s.PoolName},

-		{"Pool Blocksize", fmt.Sprintf("%s", units.HumanSize(float64(s.SectorSize)))},

-		{"Base Device Size", fmt.Sprintf("%s", units.HumanSize(float64(s.BaseDeviceSize)))},

+		{"Pool Blocksize", units.HumanSize(float64(s.SectorSize))},

+		{"Base Device Size", units.HumanSize(float64(s.BaseDeviceSize))},

 		{"Backing Filesystem", s.BaseDeviceFS},

 		{"Data file", s.DataFile},

 		{"Metadata file", s.MetadataFile},

-		{"Data Space Used", fmt.Sprintf("%s", units.HumanSize(float64(s.Data.Used)))},

-		{"Data Space Total", fmt.Sprintf("%s", units.HumanSize(float64(s.Data.Total)))},

-		{"Data Space Available", fmt.Sprintf("%s", units.HumanSize(float64(s.Data.Available)))},

-		{"Metadata Space Used", fmt.Sprintf("%s", units.HumanSize(float64(s.Metadata.Used)))},

-		{"Metadata Space Total", fmt.Sprintf("%s", units.HumanSize(float64(s.Metadata.Total)))},

-		{"Metadata Space Available", fmt.Sprintf("%s", units.HumanSize(float64(s.Metadata.Available)))},

-		{"Thin Pool Minimum Free Space", fmt.Sprintf("%s", units.HumanSize(float64(s.MinFreeSpace)))},

+		{"Data Space Used", units.HumanSize(float64(s.Data.Used))},

+		{"Data Space Total", units.HumanSize(float64(s.Data.Total))},

+		{"Data Space Available", units.HumanSize(float64(s.Data.Available))},

+		{"Metadata Space Used", units.HumanSize(float64(s.Metadata.Used))},

+		{"Metadata Space Total", units.HumanSize(float64(s.Metadata.Total))},

+		{"Metadata Space Available", units.HumanSize(float64(s.Metadata.Available))},

+		{"Thin Pool Minimum Free Space", units.HumanSize(float64(s.MinFreeSpace))},

 		{"Udev Sync Supported", fmt.Sprintf("%v", s.UdevSyncSupported)},

 		{"Deferred Removal Enabled", fmt.Sprintf("%v", s.DeferredRemoveEnabled)},

 		{"Deferred Deletion Enabled", fmt.Sprintf("%v", s.DeferredDeleteEnabled)},

@@ -159,13 +159,7 @@ func (d *Driver) Remove(id string) error {

 	if err := d.DeviceSet.DeleteDevice(id, false); err != nil {

 		return fmt.Errorf("failed to remove device %s: %v", id, err)

 	}

-

-	mp := path.Join(d.home, "mnt", id)

-	if err := system.EnsureRemoveAll(mp); err != nil {

-		return err

-	}

-

-	return nil

+	return system.EnsureRemoveAll(path.Join(d.home, "mnt", id))

 }

 // Get mounts a device with given id into the root filesystem

@@ -94,7 +94,7 @@ func (gdw *NaiveDiffDriver) Diff(id, parent string) (arch io.ReadCloser, err err

 		// are extracted from tar's with full second precision on modified time.

 		// We need this hack here to make sure calls within same second receive

 		// correct result.

-		time.Sleep(startTime.Truncate(time.Second).Add(time.Second).Sub(time.Now()))

+		time.Sleep(time.Until(startTime.Truncate(time.Second).Add(time.Second)))

 		return err

 	}), nil

 }

@@ -3,13 +3,13 @@

 package graphtest

 import (

-	"bytes"

 	"io"

 	"io/ioutil"

 	"path/filepath"

 	"testing"

 	"github.com/docker/docker/pkg/stringid"

+	"github.com/stretchr/testify/require"

 )

 // DriverBenchExists benchmarks calls to exist

@@ -251,9 +251,7 @@ func DriverBenchDeepLayerRead(b *testing.B, layerCount int, drivername string, d

 		}

 		b.StopTimer()

-		if bytes.Compare(c, content) != 0 {

-			b.Fatalf("Wrong content in file %v, expected %v", c, content)

-		}

+		require.Equal(b, content, c)

 		b.StartTimer()

 	}

 }

@@ -269,10 +269,7 @@ func (d *Driver) Create(id, parent string, opts *graphdriver.CreateOpts) (retErr

 	// Toplevel images are just a "root" dir

 	if parent == "" {

-		if err := idtools.MkdirAs(path.Join(dir, "root"), 0755, rootUID, rootGID); err != nil {

-			return err

-		}

-		return nil

+		return idtools.MkdirAndChown(path.Join(dir, "root"), 0755, idtools.IDPair{rootUID, rootGID})

 	}

 	parentDir := d.dir(parent)

@@ -103,10 +103,7 @@ func (d *Driver) dir(id string) string {

 // Remove deletes the content from the directory for a given id.

 func (d *Driver) Remove(id string) error {

-	if err := system.EnsureRemoveAll(d.dir(id)); err != nil {

-		return err

-	}

-	return nil

+	return system.EnsureRemoveAll(d.dir(id))

 }

 // Get returns the directory for the given id.

@@ -416,5 +416,5 @@ func (d *Driver) Put(id string) error {

 func (d *Driver) Exists(id string) bool {

 	d.Lock()

 	defer d.Unlock()

-	return d.filesystemsCache[d.zfsPath(id)] == true

+	return d.filesystemsCache[d.zfsPath(id)]

 }

@@ -301,12 +301,10 @@ func (daemon *Daemon) SquashImage(id, parent string) (string, error) {

 	}

 	defer daemon.stores[img.Platform()].layerStore.Release(newL)

-	var newImage image.Image

-	newImage = *img

+	newImage := *img

 	newImage.RootFS = nil

-	var rootFS image.RootFS

-	rootFS = *parentImg.RootFS

+	rootFS := *parentImg.RootFS

 	rootFS.DiffIDs = append(rootFS.DiffIDs, newL.DiffID())

 	newImage.RootFS = &rootFS

@@ -93,7 +93,7 @@ func (lf *logdriverFactory) getLogOptValidator(name string) LogOptValidator {

 	lf.m.Lock()

 	defer lf.m.Unlock()

-	c, _ := lf.optValidator[name]

+	c := lf.optValidator[name]

 	return c

 }

@@ -137,8 +137,7 @@ func newSectionReader(f *os.File) (*io.SectionReader, error) {

 }

 func tailFile(f io.ReadSeeker, logWatcher *logger.LogWatcher, tail int, since time.Time) {

-	var rdr io.Reader

-	rdr = f

+	rdr := io.Reader(f)

 	if tail > 0 {

 		ls, err := tailfile.TailFile(f, tail)

 		if err != nil {

@@ -202,7 +202,6 @@ func (r *messageRing) Close() {

 	r.closed = true

 	r.wait.Broadcast()

 	r.mu.Unlock()

-	return

 }

 // Drain drains all messages from the queue.

@@ -8,6 +8,7 @@ import (

 	"time"

 	"github.com/docker/docker/daemon/logger"

+	"github.com/stretchr/testify/require"

 )

 // Validate options

@@ -125,7 +126,7 @@ func TestDefault(t *testing.T) {

 		splunkLoggerDriver.nullMessage.Source != "" ||

 		splunkLoggerDriver.nullMessage.SourceType != "" ||

 		splunkLoggerDriver.nullMessage.Index != "" ||

-		splunkLoggerDriver.gzipCompression != false ||

+		splunkLoggerDriver.gzipCompression ||

 		splunkLoggerDriver.postMessagesFrequency != defaultPostMessagesFrequency ||

 		splunkLoggerDriver.postMessagesBatchSize != defaultPostMessagesBatchSize ||

 		splunkLoggerDriver.bufferMaximum != defaultBufferMaximum ||

@@ -255,7 +256,7 @@ func TestInlineFormatWithNonDefaultOptions(t *testing.T) {

 		splunkLoggerDriver.nullMessage.Source != "mysource" ||

 		splunkLoggerDriver.nullMessage.SourceType != "mysourcetype" ||

 		splunkLoggerDriver.nullMessage.Index != "myindex" ||

-		splunkLoggerDriver.gzipCompression != true ||

+		!splunkLoggerDriver.gzipCompression ||

 		splunkLoggerDriver.gzipCompressionLevel != gzip.DefaultCompression ||

 		splunkLoggerDriver.postMessagesFrequency != defaultPostMessagesFrequency ||

 		splunkLoggerDriver.postMessagesBatchSize != defaultPostMessagesBatchSize ||

@@ -355,7 +356,7 @@ func TestJsonFormat(t *testing.T) {

 		splunkLoggerDriver.nullMessage.Source != "" ||

 		splunkLoggerDriver.nullMessage.SourceType != "" ||

 		splunkLoggerDriver.nullMessage.Index != "" ||

-		splunkLoggerDriver.gzipCompression != true ||

+		!splunkLoggerDriver.gzipCompression ||

 		splunkLoggerDriver.gzipCompressionLevel != gzip.BestSpeed ||

 		splunkLoggerDriver.postMessagesFrequency != defaultPostMessagesFrequency ||

 		splunkLoggerDriver.postMessagesBatchSize != defaultPostMessagesBatchSize ||

@@ -448,14 +449,10 @@ func TestRawFormat(t *testing.T) {

 	}

 	hostname, err := info.Hostname()

-	if err != nil {

-		t.Fatal(err)

-	}

+	require.NoError(t, err)

 	loggerDriver, err := New(info)

-	if err != nil {

-		t.Fatal(err)

-	}

+	require.NoError(t, err)

 	if !hec.connectionVerified {

 		t.Fatal("By default connection should be verified")

@@ -472,7 +469,7 @@ func TestRawFormat(t *testing.T) {

 		splunkLoggerDriver.nullMessage.Source != "" ||

 		splunkLoggerDriver.nullMessage.SourceType != "" ||

 		splunkLoggerDriver.nullMessage.Index != "" ||

-		splunkLoggerDriver.gzipCompression != false ||

+		splunkLoggerDriver.gzipCompression ||

 		splunkLoggerDriver.postMessagesFrequency != defaultPostMessagesFrequency ||

 		splunkLoggerDriver.postMessagesBatchSize != defaultPostMessagesBatchSize ||

 		splunkLoggerDriver.bufferMaximum != defaultBufferMaximum ||

@@ -586,7 +583,7 @@ func TestRawFormatWithLabels(t *testing.T) {

 		splunkLoggerDriver.nullMessage.Source != "" ||

 		splunkLoggerDriver.nullMessage.SourceType != "" ||

 		splunkLoggerDriver.nullMessage.Index != "" ||

-		splunkLoggerDriver.gzipCompression != false ||

+		splunkLoggerDriver.gzipCompression ||

 		splunkLoggerDriver.postMessagesFrequency != defaultPostMessagesFrequency ||

 		splunkLoggerDriver.postMessagesBatchSize != defaultPostMessagesBatchSize ||

 		splunkLoggerDriver.bufferMaximum != defaultBufferMaximum ||

@@ -698,7 +695,7 @@ func TestRawFormatWithoutTag(t *testing.T) {

 		splunkLoggerDriver.nullMessage.Source != "" ||

 		splunkLoggerDriver.nullMessage.SourceType != "" ||

 		splunkLoggerDriver.nullMessage.Index != "" ||

-		splunkLoggerDriver.gzipCompression != false ||

+		splunkLoggerDriver.gzipCompression ||

 		splunkLoggerDriver.postMessagesFrequency != defaultPostMessagesFrequency ||

 		splunkLoggerDriver.postMessagesBatchSize != defaultPostMessagesBatchSize ||

 		splunkLoggerDriver.bufferMaximum != defaultBufferMaximum ||

@@ -169,5 +169,4 @@ func pluginStopMetricsCollection(p plugingetter.CompatPlugin) {

 			logrus.WithError(err).WithField("name", p.Name()).WithField("socket", sockPath).Error("error unmounting metrics socket for plugin")

 		}

 	}

-	return

 }

@@ -115,6 +115,7 @@ var (

 func (daemon *Daemon) startIngressWorker() {

 	ingressJobsChannel = make(chan *ingressJob, 100)

 	go func() {

+		// nolint: gosimple

 		for {

 			select {

 			case r := <-ingressJobsChannel:

@@ -232,7 +233,6 @@ func (daemon *Daemon) releaseIngress(id string) {

 		logrus.Errorf("Failed to delete ingress network %s: %v", n.ID(), err)

 		return

 	}

-	return

 }

 // SetNetworkBootstrapKeys sets the bootstrap keys.

@@ -29,6 +29,7 @@ import (

 	"github.com/sirupsen/logrus"

 )

+// nolint: gosimple

 var (

 	deviceCgroupRuleRegex = regexp.MustCompile("^([acb]) ([0-9]+|\\*):([0-9]+|\\*) ([rwm]{1,3})$")

 )

@@ -12,6 +12,7 @@ import (

 	"github.com/docker/docker/pkg/discovery"

 	_ "github.com/docker/docker/pkg/discovery/memory"

 	"github.com/docker/docker/registry"

+	"github.com/stretchr/testify/assert"

 )

 func TestDaemonReloadLabels(t *testing.T) {

@@ -85,15 +86,11 @@ func TestDaemonReloadAllowNondistributableArtifacts(t *testing.T) {

 	for _, value := range serviceConfig.AllowNondistributableArtifactsCIDRs {

 		actual = append(actual, value.String())

 	}

-	for _, value := range serviceConfig.AllowNondistributableArtifactsHostnames {

-		actual = append(actual, value)

-	}

+	actual = append(actual, serviceConfig.AllowNondistributableArtifactsHostnames...)

 	sort.Strings(registries)

 	sort.Strings(actual)

-	if !reflect.DeepEqual(registries, actual) {

-		t.Fatalf("expected %v, got %v\n", registries, actual)

-	}

+	assert.Equal(t, registries, actual)

 }

 func TestDaemonReloadMirrors(t *testing.T) {

@@ -16,6 +16,7 @@ func validatePSArgs(psArgs string) error {

 	// NOTE: \\s does not detect unicode whitespaces.

 	// So we use fieldsASCII instead of strings.Fields in parsePSOutput.

 	// See https://github.com/docker/docker/pull/24358

+	// nolint: gosimple

 	re := regexp.MustCompile("\\s+([^\\s]*)=\\s*(PID[^\\s]*)")

 	for _, group := range re.FindAllStringSubmatch(psArgs, -1) {

 		if len(group) >= 3 {

@@ -395,12 +395,7 @@ func (pd *v2PushDescriptor) Upload(ctx context.Context, progressOutput progress.

 	defer layerUpload.Close()

 	// upload the blob

-	desc, err := pd.uploadUsingSession(ctx, progressOutput, diffID, layerUpload)