Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit b652861

Browse files
committed
Add $ anchor to log file regexps
Signed-off-by: Babak K. Shandiz <[email protected]> This is to make sure we do not pick up the wrong file if there is a `.txt` sequence in the middle of a job name.
1 parent 2d21b46 commit b652861

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

pkg/cmd/run/view/view.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -555,21 +555,21 @@ func getJobNameForLogFilename(name string) string {
555555
// number; e.g., "0_jobname.txt".
556556
func jobLogFilenameRegexp(job shared.Job) *regexp.Regexp {
557557
sanitizedJobName := getJobNameForLogFilename(job.Name)
558-
re := fmt.Sprintf(`^\d+_%s\.txt`, regexp.QuoteMeta(sanitizedJobName))
558+
re := fmt.Sprintf(`^\d+_%s\.txt$`, regexp.QuoteMeta(sanitizedJobName))
559559
return regexp.MustCompile(re)
560560
}
561561

562562
// A legacy job run log file is a top-level .txt file whose name starts with a
563563
// negative number which is the ID of the run; e.g., "-2147483648_jobname.txt".
564564
func legacyJobLogFilenameRegexp(job shared.Job) *regexp.Regexp {
565565
sanitizedJobName := getJobNameForLogFilename(job.Name)
566-
re := fmt.Sprintf(`^-\d+_%s\.txt`, regexp.QuoteMeta(sanitizedJobName))
566+
re := fmt.Sprintf(`^-\d+_%s\.txt$`, regexp.QuoteMeta(sanitizedJobName))
567567
return regexp.MustCompile(re)
568568
}
569569

570570
func stepLogFilenameRegexp(job shared.Job, step shared.Step) *regexp.Regexp {
571571
sanitizedJobName := getJobNameForLogFilename(job.Name)
572-
re := fmt.Sprintf(`^%s\/%d_.*\.txt`, regexp.QuoteMeta(sanitizedJobName), step.Number)
572+
re := fmt.Sprintf(`^%s\/%d_.*\.txt$`, regexp.QuoteMeta(sanitizedJobName), step.Number)
573573
return regexp.MustCompile(re)
574574
}
575575

0 commit comments

Comments
 (0)