fix: prevent git progress writer race reading stageNumber (#309)

(cherry picked from commit 7c486bb)

Author: mafredri

envbuilder.go

@@ -116,7 +116,8 @@ func Run(ctx context.Context, opts options.Options) error {
 			newColor(color.FgCyan).Sprintf(cloneOpts.Path),
 		)
 
-		w := git.ProgressWriter(func(line string) { opts.Logger(log.LevelInfo, "#%d: %s", stageNumber, line) })
+		stageNum := stageNumber
+		w := git.ProgressWriter(func(line string) { opts.Logger(log.LevelInfo, "#%d: %s", stageNum, line) })
 		defer w.Close()
 		cloneOpts.Progress = w
 
@@ -132,6 +133,8 @@ func Run(ctx context.Context, opts options.Options) error {
 			opts.Logger(log.LevelError, "Falling back to the default image...")
 		}
 
+		_ = w.Close()
+
 		// Always clone the repo in remote repo build mode into a location that
 		// we control that isn't affected by the users changes.
 		if opts.RemoteRepoBuildMode {
@@ -146,7 +149,8 @@ func Run(ctx context.Context, opts options.Options) error {
 				newColor(color.FgCyan).Sprintf(cloneOpts.Path),
 			)
 
-			w := git.ProgressWriter(func(line string) { opts.Logger(log.LevelInfo, "#%d: %s", stageNumber, line) })
+			stageNum := stageNumber
+			w := git.ProgressWriter(func(line string) { opts.Logger(log.LevelInfo, "#%d: %s", stageNum, line) })
 			defer w.Close()
 			cloneOpts.Progress = w
 
@@ -158,6 +162,8 @@ func Run(ctx context.Context, opts options.Options) error {
 				opts.Logger(log.LevelError, "Failed to clone repository for remote repo mode: %s", fallbackErr.Error())
 				opts.Logger(log.LevelError, "Falling back to the default image...")
 			}
+
+			_ = w.Close()
 		}
 	}
 
@@ -893,7 +899,8 @@ func RunCacheProbe(ctx context.Context, opts options.Options) (v1.Image, error)
 				newColor(color.FgCyan).Sprintf(cloneOpts.Path),
 			)
 
-			w := git.ProgressWriter(func(line string) { opts.Logger(log.LevelInfo, "#%d: %s", stageNumber, line) })
+			stageNum := stageNumber
+			w := git.ProgressWriter(func(line string) { opts.Logger(log.LevelInfo, "#%d: %s", stageNum, line) })
 			defer w.Close()
 			cloneOpts.Progress = w
 
@@ -908,6 +915,8 @@ func RunCacheProbe(ctx context.Context, opts options.Options) (v1.Image, error)
 				opts.Logger(log.LevelError, "Failed to clone repository: %s", fallbackErr.Error())
 				opts.Logger(log.LevelError, "Falling back to the default image...")
 			}
+
+			_ = w.Close()
 		} else {
 			cloneOpts, err := git.CloneOptionsFromOptions(opts)
 			if err != nil {
@@ -920,7 +929,8 @@ func RunCacheProbe(ctx context.Context, opts options.Options) (v1.Image, error)
 				newColor(color.FgCyan).Sprintf(cloneOpts.Path),
 			)
 
-			w := git.ProgressWriter(func(line string) { opts.Logger(log.LevelInfo, "#%d: %s", stageNumber, line) })
+			stageNum := stageNumber
+			w := git.ProgressWriter(func(line string) { opts.Logger(log.LevelInfo, "#%d: %s", stageNum, line) })
 			defer w.Close()
 			cloneOpts.Progress = w
 
@@ -932,6 +942,8 @@ func RunCacheProbe(ctx context.Context, opts options.Options) (v1.Image, error)
 				opts.Logger(log.LevelError, "Failed to clone repository for remote repo mode: %s", fallbackErr.Error())
 				opts.Logger(log.LevelError, "Falling back to the default image...")
 			}
+
+			_ = w.Close()
 		}
 	}
 

git/git.go

@@ -317,12 +317,14 @@ func CloneOptionsFromOptions(options options.Options) (CloneRepoOptions, error)
 
 type progressWriter struct {
 	io.WriteCloser
-	r io.ReadCloser
+	r    io.ReadCloser
+	done chan struct{}
 }
 
 func (w *progressWriter) Close() error {
-	err := w.r.Close()
-	err2 := w.WriteCloser.Close()
+	err := w.WriteCloser.Close()
+	<-w.done
+	err2 := w.r.Close()
 	if err != nil {
 		return err
 	}
@@ -331,7 +333,9 @@ func (w *progressWriter) Close() error {
 
 func ProgressWriter(write func(line string)) io.WriteCloser {
 	reader, writer := io.Pipe()
+	done := make(chan struct{})
 	go func() {
+		defer close(done)
 		data := make([]byte, 4096)
 		for {
 			read, err := reader.Read(data)
@@ -351,5 +355,6 @@ func ProgressWriter(write func(line string)) io.WriteCloser {
 	return &progressWriter{
 		WriteCloser: writer,
 		r:           reader,
+		done:        done,
 	}
 }