Skip to content

Commit a368082

Browse files
authored
fix generator tool: ExecuteGoGenerate func (#23286)
* fix generator tool * use a var store err msg
1 parent e16f3d7 commit a368082

1 file changed

Lines changed: 17 additions & 2 deletions

File tree

‎eng/tools/generator/cmd/v2/common/cmdProcessor.go‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,23 @@ func ExecuteGoGenerate(path string) error {
6060

6161
if err != nil || stderrBuffer.Len() > 0 {
6262
if stderrBuffer.Len() > 0 {
63-
fmt.Println(stderrBuffer.String())
64-
return fmt.Errorf("failed to execute `go generate`:\n%s", stderrBuffer.String())
63+
// filter go downloading log
64+
// https://github.com/golang/go/blob/1f0c044d60211e435dc58844127544dd3ecb6a41/src/cmd/go/internal/modfetch/fetch.go#L201
65+
lines := strings.Split(stderrBuffer.String(), "\n")
66+
newLines := make([]string, 0, len(lines))
67+
for _, line := range lines {
68+
if !strings.HasPrefix(strings.TrimSpace(line), "go: downloading") {
69+
newLines = append(newLines, line)
70+
}
71+
}
72+
73+
if len(newLines) > 0 {
74+
newErrMsg := strings.Join(newLines, "\n")
75+
fmt.Println(newErrMsg)
76+
return fmt.Errorf("failed to execute `go generate`:\n%s", newErrMsg)
77+
}
78+
79+
return nil
6580
}
6681

6782
return fmt.Errorf("failed to execute `go generate`:\n%+v", err)

0 commit comments

Comments
 (0)