driver: handle nil logger for bootstrap

tonistiigi · tonistiigi · commit 035236a5ed33 · 2024-05-20T16:38:01.000-07:00
resolveNode methods can call with nil logger. Although
the results should already be cached now in resolver
this makes the protection more explicit.

Signed-off-by: Tonis Tiigi &lt;tonistiigi@gmail.com&gt;
diff --git a/driver/driver.go b/driver/driver.go
@@ -83,6 +83,11 @@ func ParseBuilderName(name string) (string, error) {
 
 func Boot(ctx, clientContext context.Context, d *DriverHandle, pw progress.Writer) (*client.Client, error) {
 	try := 0
+	logger := discardLogger
+	if pw != nil {
+		logger = pw.Write
+	}
+
 	for {
 		info, err := d.Info(ctx)
 		if err != nil {
@@ -93,7 +98,7 @@ func Boot(ctx, clientContext context.Context, d *DriverHandle, pw progress.Write
 			if try > 2 {
 				return nil, errors.Errorf("failed to bootstrap %T driver in attempts", d)
 			}
-			if err := d.Bootstrap(ctx, pw.Write); err != nil {
+			if err := d.Bootstrap(ctx, logger); err != nil {
 				return nil, err
 			}
 		}
@@ -109,6 +114,8 @@ func Boot(ctx, clientContext context.Context, d *DriverHandle, pw progress.Write
 	}
 }
 
+func discardLogger(*client.SolveStatus) {}
+
 func historyAPISupported(ctx context.Context, c *client.Client) bool {
 	cl, err := c.ControlClient().ListenBuildHistory(ctx, &controlapi.BuildHistoryRequest{
 		ActiveOnly: true,

Original file line number	Diff line number	Diff line change
`@@ -83,6 +83,11 @@ func ParseBuilderName(name string) (string, error) {`
`83`	`83`
`84`	`84`	`func Boot(ctx, clientContext context.Context, d DriverHandle, pw progress.Writer) (client.Client, error) {`
`85`	`85`	`try := 0`
	`86`	`+ logger := discardLogger`
	`87`	`+ if pw != nil {`
	`88`	`+ logger = pw.Write`
	`89`	`+ }`
	`90`	`+`
`86`	`91`	`for {`
`87`	`92`	`info, err := d.Info(ctx)`
`88`	`93`	`if err != nil {`
`@@ -93,7 +98,7 @@ func Boot(ctx, clientContext context.Context, d *DriverHandle, pw progress.Write`
`93`	`98`	`if try > 2 {`
`94`	`99`	`return nil, errors.Errorf("failed to bootstrap %T driver in attempts", d)`
`95`	`100`	`}`
`96`		`- if err := d.Bootstrap(ctx, pw.Write); err != nil {`
	`101`	`+ if err := d.Bootstrap(ctx, logger); err != nil {`
`97`	`102`	`return nil, err`
`98`	`103`	`}`
`99`	`104`	`}`
`@@ -109,6 +114,8 @@ func Boot(ctx, clientContext context.Context, d *DriverHandle, pw progress.Write`
`109`	`114`	`}`
`110`	`115`	`}`
`111`	`116`
	`117`	`+func discardLogger(*client.SolveStatus) {}`
	`118`	`+`
`112`	`119`	`func historyAPISupported(ctx context.Context, c *client.Client) bool {`
`113`	`120`	`cl, err := c.ControlClient().ListenBuildHistory(ctx, &controlapi.BuildHistoryRequest{`
`114`	`121`	`ActiveOnly: true,`