cli · andyfeller · Aug 22, 2024 · Aug 18, 2024 · andyfeller · Aug 21, 2024
@@ -546,6 +546,7 @@ func logFilenameRegexp(job shared.Job, step shared.Step) *regexp.Regexp {
 	// * Truncate long job names
 	//
 	sanitizedJobName := strings.ReplaceAll(job.Name, "/", "")
+	sanitizedJobName = strings.ReplaceAll(sanitizedJobName, ":", "")
 	sanitizedJobName = truncateAsUTF16(sanitizedJobName, JOB_NAME_MAX_LENGTH)
 	re := fmt.Sprintf(`^%s\/%d_.*\.txt`, regexp.QuoteMeta(sanitizedJobName), step.Number)
 	return regexp.MustCompile(re)

@@ -1522,6 +1522,18 @@ func Test_attachRunLog(t *testing.T) {
 			// not the double space in the dir name, as the slash has been removed
 			wantFilename: "cool job  with slash/1_fob the barz.txt",
 		},
+		{
+			name: "job name with colon matches dir with colon removed",
+			job: shared.Job{
+				Name: "cool job : with colon",
+				Steps: []shared.Step{{
+					Name:   "fob the barz",
+					Number: 1,
+				}},
+			},
+			wantMatch:    true,
+			wantFilename: "cool job  with colon/1_fob the barz.txt",
+		},
 		{
 			name: "Job name with really long name (over the ZIP limit)",
 			job: shared.Job{
-Original file line number
+Diff line change
@@ -546,6 +546,7 @@ func logFilenameRegexp(job shared.Job, step shared.Step) *regexp.Regexp {
     	// * Truncate long job names
     	//
     	sanitizedJobName := strings.ReplaceAll(job.Name, "/", "")
+    	sanitizedJobName = strings.ReplaceAll(sanitizedJobName, ":", "")
             Copy link

  
      
    
  

  
      

  
  Member


      

  

  
    
      

      
            andyfeller
  

      

      

      


        Aug 21, 2024


      
    

  


        
      
  
  
  
    

    There was a problem hiding this comment.


  

 
  
    

    Choose a reason for hiding this comment

    
      The reason will be displayed to describe this comment to others. Learn more.
    

    
      
      


  


  
    
      Just because the run_log.zip is a binary, here are all the changes being made:
$ diff -r ~/Downloads/run_log ~/Downloads/run_log\ \(1\) 
Only in /Users/andyfeller/Downloads/run_log: .DS_Store
Only in /Users/andyfeller/Downloads/run_log: cool job  with colon

$ cat ~/Downloads/run_log/cool\ job\ \ with\ colon/1_fob\ the\ barz.txt 
log line 1
log line 2
log line 3
    
  
  


    

        
      
  
  
    
  
  
  
    
    Sorry, something went wrong.
  

  
    
  
    
      

              Uh oh!

              
There was an error while loading. Please reload this page.


  
  


          
      
  
    
    
      
        
            
    All reactions
     	sanitizedJobName = truncateAsUTF16(sanitizedJobName, JOB_NAME_MAX_LENGTH)
     	re := fmt.Sprintf(`^%s\/%d_.*\.txt`, regexp.QuoteMeta(sanitizedJobName), step.Number)
     	return regexp.MustCompile(re)
-          Expand Down