fix: panic when image pull fails (#152)

colesnodgrass · web-flow · commit 164cad13142f · 2024-12-12T07:29:48.000-08:00
diff --git a/internal/cmd/local/k8s/load_images.go b/internal/cmd/local/k8s/load_images.go
@@ -38,9 +38,10 @@ func loadImages(ctx context.Context, dockerClient docker.Client, nodes []nodesli
 				pterm.Debug.Printfln("error pulling image %s", err)
 				// image pull errors are intentionally dropped because we're in a goroutine,
 				// and because we don't want to interrupt other image pulls.
+			} else {
+				defer r.Close()
+				io.Copy(io.Discard, r)
 			}
-			defer r.Close()
-			io.Copy(io.Discard, r)
 		}(img)
 	}
 	wg.Wait()

Original file line number	Diff line number	Diff line change
`@@ -38,9 +38,10 @@ func loadImages(ctx context.Context, dockerClient docker.Client, nodes []nodesli`
`38`	`38`	`pterm.Debug.Printfln("error pulling image %s", err)`
`39`	`39`	`// image pull errors are intentionally dropped because we're in a goroutine,`
`40`	`40`	`// and because we don't want to interrupt other image pulls.`
	`41`	`+ } else {`
	`42`	`+ defer r.Close()`
	`43`	`+ io.Copy(io.Discard, r)`
`41`	`44`	`}`
`42`		`- defer r.Close()`
`43`		`- io.Copy(io.Discard, r)`
`44`	`45`	`}(img)`
`45`	`46`	`}`
`46`	`47`	`wg.Wait()`