From 6112c416376c67ec33fc7b81406914692494f6b3 Mon Sep 17 00:00:00 2001
From: Tonis Tiigi <tonistiigi@gmail.com>
Date: Wed, 24 Apr 2024 17:19:32 -0700
Subject: [PATCH] lint: nilness fixes

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
---
 controller/remote/client.go       |  2 +-
 controller/remote/io.go           |  2 +-
 driver/docker-container/driver.go | 14 ++++++--------
 tests/workers/docker.go           |  7 ++-----
 tests/workers/remote.go           |  5 +----
 5 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/controller/remote/client.go b/controller/remote/client.go
index b3b6c12b..b60061f4 100644
--- a/controller/remote/client.go
+++ b/controller/remote/client.go
@@ -210,7 +210,7 @@ func (c *Client) build(ctx context.Context, ref string, options pb.BuildOptions,
 						}
 						return err
 					} else if n > 0 {
-						if stream.Send(&pb.InputMessage{
+						if err := stream.Send(&pb.InputMessage{
 							Input: &pb.InputMessage_Data{
 								Data: &pb.DataMessage{
 									Data: buf[:n],
diff --git a/controller/remote/io.go b/controller/remote/io.go
index 384585e6..6a8c59c3 100644
--- a/controller/remote/io.go
+++ b/controller/remote/io.go
@@ -358,7 +358,7 @@ func copyToStream(fd uint32, snd msgStream, r io.Reader) error {
 			}
 			return err
 		} else if n > 0 {
-			if snd.Send(&pb.Message{
+			if err := snd.Send(&pb.Message{
 				Input: &pb.Message_File{
 					File: &pb.FdMessage{
 						Fd:   fd,
diff --git a/driver/docker-container/driver.go b/driver/docker-container/driver.go
index 9f77dfe6..d9b29a34 100644
--- a/driver/docker-container/driver.go
+++ b/driver/docker-container/driver.go
@@ -203,14 +203,12 @@ func (d *Driver) wait(ctx context.Context, l progress.SubLogger) error {
 		bufStderr := &bytes.Buffer{}
 		if err := d.run(ctx, []string{"buildctl", "debug", "workers"}, bufStdout, bufStderr); err != nil {
 			if try > 15 {
-				if err != nil {
-					d.copyLogs(context.TODO(), l)
-					if bufStdout.Len() != 0 {
-						l.Log(1, bufStdout.Bytes())
-					}
-					if bufStderr.Len() != 0 {
-						l.Log(2, bufStderr.Bytes())
-					}
+				d.copyLogs(context.TODO(), l)
+				if bufStdout.Len() != 0 {
+					l.Log(1, bufStdout.Bytes())
+				}
+				if bufStderr.Len() != 0 {
+					l.Log(2, bufStderr.Bytes())
 				}
 				return err
 			}
diff --git a/tests/workers/docker.go b/tests/workers/docker.go
index cd6d6084..b1d711f0 100644
--- a/tests/workers/docker.go
+++ b/tests/workers/docker.go
@@ -60,12 +60,9 @@ func (c dockerWorker) New(ctx context.Context, cfg *integration.BackendConfig) (
 	}
 
 	cl = func() error {
-		var err error
-		if err1 := bkclose(); err == nil {
-			err = err1
-		}
+		err := bkclose()
 		cmd := exec.Command("docker", "context", "rm", "-f", name)
-		if err1 := cmd.Run(); err1 != nil {
+		if err1 := cmd.Run(); err == nil {
 			err = errors.Wrapf(err1, "failed to remove buildx instance %s", name)
 		}
 		return err
diff --git a/tests/workers/remote.go b/tests/workers/remote.go
index 4ded704f..1e2038b8 100644
--- a/tests/workers/remote.go
+++ b/tests/workers/remote.go
@@ -54,10 +54,7 @@ func (w remoteWorker) New(ctx context.Context, cfg *integration.BackendConfig) (
 	}
 
 	cl = func() error {
-		var err error
-		if err1 := bkclose(); err == nil {
-			err = err1
-		}
+		err := bkclose()
 		cmd := exec.Command("buildx", "rm", "-f", name)
 		if err1 := cmd.Run(); err == nil {
 			err = err1