docker/buildx
1
0
Fork 0
mirror of https://gitea.com/Lydanne/buildx.git synced 2025-05-18 00:47:48 +08:00
Code Issues Packages Projects Releases 1 Wiki Activity

lint: nilness fixes

Browse Source 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
This commit is contained in:
Tonis Tiigi 2024-04-24 17:19:32 -07:00
parent a727de7d5f
commit 6112c41637
No known key found for this signature in database
GPG Key ID: AFA9DE5F8AB7AF39
5 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
controller/remote/client.go
View File

@ -210,7 +210,7 @@ func (c *Client) build(ctx context.Context, ref string, options pb.BuildOptions,
} }
return err return err
} else if n > 0 { } else if n > 0 {
if stream.Send(&pb.InputMessage{ if err := stream.Send(&pb.InputMessage{
Input: &pb.InputMessage_Data{ Input: &pb.InputMessage_Data{
Data: &pb.DataMessage{ Data: &pb.DataMessage{
Data: buf[:n], Data: buf[:n],

2
controller/remote/io.go
View File

@ -358,7 +358,7 @@ func copyToStream(fd uint32, snd msgStream, r io.Reader) error {
} }
return err return err
} else if n > 0 { } else if n > 0 {
if snd.Send(&pb.Message{ if err := snd.Send(&pb.Message{
Input: &pb.Message_File{ Input: &pb.Message_File{
File: &pb.FdMessage{ File: &pb.FdMessage{
Fd: fd, Fd: fd,

14
driver/docker-container/driver.go
View File

@ -203,14 +203,12 @@ func (d *Driver) wait(ctx context.Context, l progress.SubLogger) error {
bufStderr := &bytes.Buffer{} bufStderr := &bytes.Buffer{}
if err := d.run(ctx, []string{"buildctl", "debug", "workers"}, bufStdout, bufStderr); err != nil { if err := d.run(ctx, []string{"buildctl", "debug", "workers"}, bufStdout, bufStderr); err != nil {
if try > 15 { if try > 15 {
if err != nil { d.copyLogs(context.TODO(), l)
d.copyLogs(context.TODO(), l) if bufStdout.Len() != 0 {
if bufStdout.Len() != 0 { l.Log(1, bufStdout.Bytes())
l.Log(1, bufStdout.Bytes()) }
} if bufStderr.Len() != 0 {
if bufStderr.Len() != 0 { l.Log(2, bufStderr.Bytes())
l.Log(2, bufStderr.Bytes())
}
} }
return err return err
} }

7
tests/workers/docker.go
View File

@ -60,12 +60,9 @@ func (c dockerWorker) New(ctx context.Context, cfg *integration.BackendConfig) (
} }
cl = func() error { cl = func() error {
var err error err := bkclose()
if err1 := bkclose(); err == nil {
err = err1
}
cmd := exec.Command("docker", "context", "rm", "-f", name) 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) err = errors.Wrapf(err1, "failed to remove buildx instance %s", name)
} }
return err return err

5
tests/workers/remote.go
View File

@ -54,10 +54,7 @@ func (w remoteWorker) New(ctx context.Context, cfg *integration.BackendConfig) (
} }
cl = func() error { cl = func() error {
var err error err := bkclose()
if err1 := bkclose(); err == nil {
err = err1
}
cmd := exec.Command("buildx", "rm", "-f", name) cmd := exec.Command("buildx", "rm", "-f", name)
if err1 := cmd.Run(); err == nil { if err1 := cmd.Run(); err == nil {
err = err1 err = err1