(beam) branch transform_service_test_suite updated: update

[chamikara]

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

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


The following commit(s) were added to refs/heads/transform_service_test_suite 
by this push:
     new e865d2ee126 update
e865d2ee126 is described below

commit e865d2ee126b8ed4ac68831083f6804a5400490a
Author: Chamikara Jayalath <chamikar...@gmail.com>
AuthorDate: Sun Mar 10 10:54:54 2024 -0700

    update
---
 sdks/python/expansion-service-container/boot.go | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/sdks/python/expansion-service-container/boot.go 
b/sdks/python/expansion-service-container/boot.go
index 5d73e0a34b7..08afccefcc5 100644
--- a/sdks/python/expansion-service-container/boot.go
+++ b/sdks/python/expansion-service-container/boot.go
@@ -98,8 +98,8 @@ func installExtraPackages(requirementsFile string) error {
        return nil
 }
 
-func getUpdatedRequirementsFile(oldRequirementsFileName string, 
dependenciesDir string) (string, error) {
-       oldExtraPackages, err := getLines(filepath.Join(dependenciesDir, 
oldRequirementsFileName))
+func getUpdatedRequirementsFile(oldDependenciesRequirementsFile string, 
dependenciesDir string) (string, error) {
+       oldExtraPackages, err := getLines(oldDependenciesRequirementsFile)
        if err != nil {
                return "", err
        }
@@ -157,16 +157,22 @@ func launchExpansionServiceProcess() error {
                return fmt.Errorf("Could not execute /usr/bin/ls -al /: %s", 
err)
        }
 
-  requirement_file_exists := false
-  if _, err := os.Stat(*requirements_file); err == nil {
-    requirement_file_exists = true
+  // Requirements file with dependencies to install.
+  // Note that we have to look for the requirements file in the dependencies
+  // volume here not the requirements file at the top level. Latter provides
+  // Beam dependencies.
+       dependencies_requirements_file := filepath.Join(*dependencies_dir, 
*requirements_file)
+  dependencies_requirements_file_exists := false
+  if _, err := os.Stat(dependencies_requirements_file); err == nil {
+    dependencies_requirements_file_exists = true
   }
 
-  log.Printf("boot.go requirement_file_exists: %v", requirement_file_exists)
+  log.Printf("boot.go requirements_file: %v", )
+  log.Printf("boot.go requirement_file_exists: %v", 
dependencies_requirements_file_exists)
 
-       if requirement_file_exists {
+       if dependencies_requirements_file_exists {
                log.Printf("boot.go Received the requirements file %v", 
*requirements_file)
-               updatedRequirementsFileName, err := 
getUpdatedRequirementsFile(*requirements_file, *dependencies_dir)
+               updatedRequirementsFileName, err := 
getUpdatedRequirementsFile(dependencies_requirements_file, *dependencies_dir)
                if err != nil {
                        return err
                }
@@ -181,7 +187,7 @@ func launchExpansionServiceProcess() error {
                        return err
                }
        } else {
-         log.Printf("Requirements file %s was provided but not available.", 
*requirements_file)
+         log.Printf("Requirements file %s was provided but not available.", 
dependencies_requirements_file)
        }
 
        if err := execx.Execute(pythonVersion, args...); err != nil {