From b3a5c153d51a54bced68ec41a682ef74b9d9a61d Mon Sep 17 00:00:00 2001
From: Tibor Vass <tibor@docker.com>
Date: Wed, 13 Jun 2018 22:35:15 +0000
Subject: [PATCH] build: address some review nits

Signed-off-by: Tibor Vass <tibor@docker.com>
---
 cli/command/formatter/disk_usage.go |  2 +-
 cli/command/image/build/context.go  |  1 +
 cli/command/image/build_buildkit.go | 22 +++++-----------------
 3 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/cli/command/formatter/disk_usage.go b/cli/command/formatter/disk_usage.go
index 3b221a8bce..d6389a14df 100644
--- a/cli/command/formatter/disk_usage.go
+++ b/cli/command/formatter/disk_usage.go
@@ -414,7 +414,7 @@ func (c *diskUsageBuilderContext) Size() string {
 }
 
 func (c *diskUsageBuilderContext) Reclaimable() string {
-	inUseBytes := int64(0)
+	var inUseBytes int64
 	for _, bc := range c.buildCache {
 		if bc.InUse {
 			inUseBytes += bc.Size
diff --git a/cli/command/image/build/context.go b/cli/command/image/build/context.go
index 3e8076ee81..b7170df88e 100644
--- a/cli/command/image/build/context.go
+++ b/cli/command/image/build/context.go
@@ -101,6 +101,7 @@ func DetectArchiveReader(input io.ReadCloser) (rc io.ReadCloser, isArchive bool,
 // name specified by DefaultDockerfileName and returns the path to the
 // temporary directory containing the Dockerfile.
 func WriteTempDockerfile(rc io.ReadCloser) (dockerfileDir string, err error) {
+	// err is a named return value, due to the defer call below.
 	dockerfileDir, err = ioutil.TempDir("", "docker-build-tempdockerfile-")
 	if err != nil {
 		return "", errors.Errorf("unable to create temporary context directory: %v", err)
diff --git a/cli/command/image/build_buildkit.go b/cli/command/image/build_buildkit.go
index fb91971fef..7c6dd8664d 100644
--- a/cli/command/image/build_buildkit.go
+++ b/cli/command/image/build_buildkit.go
@@ -43,8 +43,6 @@ func runBuildBuildKit(dockerCli command.Cli, options buildOptions) error {
 		return errors.Errorf("buildkit not supported by daemon")
 	}
 
-	buildID := stringid.GenerateRandomID()
-
 	var (
 		remote           string
 		body             io.Reader
@@ -118,13 +116,6 @@ func runBuildBuildKit(dockerCli command.Cli, options buildOptions) error {
 		}))
 	}
 
-	// statusContext, cancelStatus := context.WithCancel(ctx)
-	// defer cancelStatus()
-
-	// if span := opentracing.SpanFromContext(ctx); span != nil {
-	// 	statusContext = opentracing.ContextWithSpan(statusContext, span)
-	// }
-
 	s.Allow(authprovider.NewDockerAuthProvider())
 
 	eg, ctx := errgroup.WithContext(ctx)
@@ -133,6 +124,7 @@ func runBuildBuildKit(dockerCli command.Cli, options buildOptions) error {
 		return s.Run(context.TODO(), dockerCli.Client().DialSession)
 	})
 
+	buildID := stringid.GenerateRandomID()
 	if body != nil {
 		eg.Go(func() error {
 			buildOptions := types.ImageBuildOptions{
@@ -233,20 +225,15 @@ func doBuild(ctx context.Context, eg *errgroup.Group, dockerCli command.Cli, opt
 			if jerr.Code == 0 {
 				jerr.Code = 1
 			}
-			// if options.quiet {
-			// 	fmt.Fprintf(dockerCli.Err(), "%s%s", progBuff, buildBuff)
-			// }
 			return cli.StatusError{Status: jerr.Message, StatusCode: jerr.Code}
 		}
-		return err
 	}
-
-	return nil
+	return err
 }
 
 func resetUIDAndGID(s *fsutil.Stat) bool {
-	s.Uid = uint32(0)
-	s.Gid = uint32(0)
+	s.Uid = 0
+	s.Gid = 0
 	return true
 }
 
@@ -268,6 +255,7 @@ func (t *tracer) write(msg jsonmessage.JSONMessage) {
 	}
 
 	var dt []byte
+	// ignoring all messages that are not understood
 	if err := json.Unmarshal(*msg.Aux, &dt); err != nil {
 		return
 	}