Skip to content

[golangBuild] Reset logging of utils after isMainPackage and runGolangciLint #5498

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

[golangBuild] Reset logging of utils after isMainPackage and runGolangciLint #5498

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
38fbbb3
[golangBuild] Reset logging of `utils` after `isMainPackage`
LukasHeimann Sep 30, 2025
3e469b3
Fix another occurrence
LukasHeimann Sep 30, 2025
111121d
Another occurrence
LukasHeimann Sep 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion cmd/golangBuild.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,6 +393,7 @@ func reportGolangTestCoverage(config *golangBuildOptions, utils golangBuildUtils

coverageOutput := bytes.Buffer{}
utils.Stdout(&coverageOutput)
defer utils.Stdout(log.Writer())
options := []string{}
if config.ExcludeGeneratedFromCoverage {
options = append(options, "-ignore-gen-files")
Expand All @@ -401,7 +402,6 @@ func reportGolangTestCoverage(config *golangBuildOptions, utils golangBuildUtils
log.SetErrorCategory(log.ErrorTest)
return fmt.Errorf("failed to convert coverage data to cobertura format: %w", err)
}
utils.Stdout(log.Writer())

err = utils.FileWrite("cobertura-coverage.xml", coverageOutput.Bytes(), 0o666)
if err != nil {
Expand Down Expand Up @@ -437,6 +437,7 @@ func runGolangciLint(utils golangBuildUtils, golangciLintDir string, failOnError

var outputBuffer bytes.Buffer
utils.Stdout(&outputBuffer)
defer utils.Stdout(log.Writer())
err := utils.RunExecutable(binaryPath, "run", "--out-format", lintSettings["reportStyle"])
if err != nil && utils.GetExitCode() != 1 {
return fmt.Errorf("running golangci-lint failed: %w", err)
Expand Down Expand Up @@ -568,6 +569,11 @@ func isMainPackage(utils golangBuildUtils, pkg string) (bool, error) {
outBuffer := bytes.NewBufferString("")
utils.Stdout(outBuffer)
utils.Stderr(outBuffer)
defer func() {
// Reset routing command output to logging framework
utils.Stdout(log.Writer())
utils.Stderr(log.Writer())
}()
err := utils.RunExecutable("go", "list", "-f", "{{ .Name }}", pkg)
if err != nil {
return false, fmt.Errorf("%w: %s", err, outBuffer.String())
Expand Down
Loading