(beam) branch master updated: Fix nil pointer access in logRuntimeDependencies (#29804)

[jrmccluskey]

This is an automated email from the ASF dual-hosted git repository.

jrmccluskey pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git


The following commit(s) were added to refs/heads/master by this push:
     new 4cfe5498850 Fix nil pointer access in logRuntimeDependencies (#29804)
4cfe5498850 is described below

commit 4cfe5498850487b2ffa1874425549a6145ac9b3f
Author: Jack McCluskey <34928439+jrmcclus...@users.noreply.github.com>
AuthorDate: Mon Dec 18 16:44:03 2023 -0500

    Fix nil pointer access in logRuntimeDependencies (#29804)
---
 sdks/python/container/boot.go | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/sdks/python/container/boot.go b/sdks/python/container/boot.go
index cbf05bbd04a..c59807c72a9 100644
--- a/sdks/python/container/boot.go
+++ b/sdks/python/container/boot.go
@@ -409,7 +409,7 @@ func installSetupPackages(ctx context.Context, logger 
*tools.Logger, files []str
        if err := pipInstallPackage(ctx, logger, files, workDir, workflowFile, 
false, true, nil); err != nil {
                return fmt.Errorf("failed to install workflow: %v", err)
        }
-       if err := logRuntimeDependencies(ctx, logger); err != nil {
+       if err := logRuntimeDependencies(ctx, bufLogger); err != nil {
                logger.Warnf(ctx, "couldn't fetch the runtime python 
dependencies: %v", err)
        }
 
@@ -459,15 +459,14 @@ func processArtifactsInSetupOnlyMode() {
 
 // logRuntimeDependencies logs the python dependencies
 // installed in the runtime environment.
-func logRuntimeDependencies(ctx context.Context, logger *tools.Logger) error {
-       logger.Printf(ctx, "Logging runtime dependencies:")
+func logRuntimeDependencies(ctx context.Context, bufLogger 
*tools.BufferedLogger) error {
+       bufLogger.Printf(ctx, "Logging runtime dependencies:")
        pythonVersion, err := expansionx.GetPythonVersion()
        if err != nil {
                return err
        }
-       logger.Printf(ctx, "Using Python version:")
+       bufLogger.Printf(ctx, "Using Python version:")
        args := []string{"--version"}
-       bufLogger := tools.NewBufferedLogger(logger)
        if err := execx.ExecuteEnvWithIO(nil, os.Stdin, bufLogger, bufLogger, 
pythonVersion, args...); err != nil {
                bufLogger.FlushAtError(ctx)
        } else {