Skip to content

Commit 292606b

Browse files
authored
Fix nil pointer access in logRuntimeDependencies (#29804) (#29806)
1 parent ea477dd commit 292606b

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

sdks/python/container/boot.go

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,7 @@ func installSetupPackages(ctx context.Context, logger *tools.Logger, files []str
409409
if err := pipInstallPackage(ctx, logger, files, workDir, workflowFile, false, true, nil); err != nil {
410410
return fmt.Errorf("failed to install workflow: %v", err)
411411
}
412-
if err := logRuntimeDependencies(ctx, logger); err != nil {
412+
if err := logRuntimeDependencies(ctx, bufLogger); err != nil {
413413
logger.Warnf(ctx, "couldn't fetch the runtime python dependencies: %v", err)
414414
}
415415

@@ -459,15 +459,14 @@ func processArtifactsInSetupOnlyMode() {
459459

460460
// logRuntimeDependencies logs the python dependencies
461461
// installed in the runtime environment.
462-
func logRuntimeDependencies(ctx context.Context, logger *tools.Logger) error {
463-
logger.Printf(ctx, "Logging runtime dependencies:")
462+
func logRuntimeDependencies(ctx context.Context, bufLogger *tools.BufferedLogger) error {
463+
bufLogger.Printf(ctx, "Logging runtime dependencies:")
464464
pythonVersion, err := expansionx.GetPythonVersion()
465465
if err != nil {
466466
return err
467467
}
468-
logger.Printf(ctx, "Using Python version:")
468+
bufLogger.Printf(ctx, "Using Python version:")
469469
args := []string{"--version"}
470-
bufLogger := tools.NewBufferedLogger(logger)
471470
if err := execx.ExecuteEnvWithIO(nil, os.Stdin, bufLogger, bufLogger, pythonVersion, args...); err != nil {
472471
bufLogger.FlushAtError(ctx)
473472
} else {

0 commit comments

Comments
 (0)