[Playground] Fix graph.dot search path (apache#26951)

Fix search path for the graph.dot file which contains the graph of the pipeline execution. The feature got broken after PR apache#26842.
cushon · May 24, 2024 · ebac08b · ebac08b
1 parent 20323a4
commit ebac08b
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/playground/backend/internal/fs_tool/fs.go b/playground/backend/internal/fs_tool/fs.go
@@ -43,7 +43,7 @@ type LifeCyclePaths struct {
 	AbsoluteExecutableFilePath       string // /path/to/workingDir/pipelinesFolder/{pipelineId}/bin/{pipelineId}.{executableFileExtension}
 	AbsoluteBaseFolderPath           string // /path/to/workingDir/pipelinesFolder/{pipelineId}
 	AbsoluteLogFilePath              string // /path/to/workingDir/pipelinesFolder/{pipelineId}/logs.log
-	AbsoluteGraphFilePath            string // /path/to/workingDir/pipelinesFolder/{pipelineId}/graph.dot
+	AbsoluteGraphFilePath            string // /path/to/workingDir/pipelinesFolder/{pipelineId}/src/graph.dot
 	ProjectDir                       string // /path/to/workingDir/
 	FindExecutableName               func(context.Context, string) (string, error)
 	FindTestExecutableName           func(context.Context, string) (string, error)

diff --git a/playground/backend/internal/fs_tool/fs_test.go b/playground/backend/internal/fs_tool/fs_test.go
@@ -313,7 +313,7 @@ func TestNewLifeCycle(t *testing.T) {
 					AbsoluteExecutableFilePath:       filepath.Join(execFileFolder, fmt.Sprintf("%s%s", pipelineId.String(), javaCompiledFileExtension)),
 					AbsoluteBaseFolderPath:           baseFileFolder,
 					AbsoluteLogFilePath:              filepath.Join(baseFileFolder, logFileName),
-					AbsoluteGraphFilePath:            filepath.Join(baseFileFolder, utils.GraphFileName),
+					AbsoluteGraphFilePath:            filepath.Join(srcFileFolder, utils.GraphFileName),
 				},
 			},
 		},
@@ -335,7 +335,7 @@ func TestNewLifeCycle(t *testing.T) {
 					AbsoluteExecutableFilePath:       filepath.Join(execFileFolder, fmt.Sprintf("%s%s", pipelineId.String(), goExecutableFileExtension)),
 					AbsoluteBaseFolderPath:           baseFileFolder,
 					AbsoluteLogFilePath:              filepath.Join(baseFileFolder, logFileName),
-					AbsoluteGraphFilePath:            filepath.Join(baseFileFolder, utils.GraphFileName),
+					AbsoluteGraphFilePath:            filepath.Join(srcFileFolder, utils.GraphFileName),
 				},
 			},
 		},

diff --git a/playground/backend/internal/fs_tool/go_fs_test.go b/playground/backend/internal/fs_tool/go_fs_test.go
@@ -58,7 +58,7 @@ func Test_newGoLifeCycle(t *testing.T) {
 					AbsoluteExecutableFilePath:       filepath.Join(binFileFolder, pipelineId.String()+goExecutableFileExtension),
 					AbsoluteBaseFolderPath:           baseFileFolder,
 					AbsoluteLogFilePath:              filepath.Join(baseFileFolder, logFileName),
-					AbsoluteGraphFilePath:            filepath.Join(baseFileFolder, utils.GraphFileName),
+					AbsoluteGraphFilePath:            filepath.Join(srcFileFolder, utils.GraphFileName),
 				},
 			},
 		},

diff --git a/playground/backend/internal/fs_tool/lc_constructor.go b/playground/backend/internal/fs_tool/lc_constructor.go
@@ -40,7 +40,7 @@ func newCompilingLifeCycle(pipelineId uuid.UUID, pipelinesFolder, sourceFileExte
 	absExecFilePath, _ := filepath.Abs(filepath.Join(absExecFileFolderPath, execFileName))
 	absBaseFolderPath, _ := filepath.Abs(baseFileFolder)
 	absLogFilePath, _ := filepath.Abs(filepath.Join(absBaseFolderPath, logFileName))
-	absGraphFilePath, _ := filepath.Abs(filepath.Join(absBaseFolderPath, utils.GraphFileName))
+	absGraphFilePath, _ := filepath.Abs(filepath.Join(absSrcFileFolderPath, utils.GraphFileName))
 
 	return &LifeCycle{
 		folderGlobs: []string{baseFileFolder, srcFileFolder, binFileFolder},