Skip to content

Commit

Permalink
Try to preserve linebreaks in mvnOutput by casting to a string
Browse files Browse the repository at this point in the history
Signed-off-by: Juan Manuel Leflet Estrada <[email protected]>
  • Loading branch information
jmle committed Oct 25, 2024
1 parent cee50a0 commit ddc1c9f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@ func (p *javaServiceClient) getDependenciesForMaven(_ context.Context) (map[uri.
cmd.Dir = moddir
mvnOutput, err := cmd.CombinedOutput()
if err != nil {
return nil, fmt.Errorf("maven dependency:tree command failed with error %w, maven output: %s", err, mvnOutput)
return nil, fmt.Errorf("maven dependency:tree command failed with error %w, maven output: %s", err, string(mvnOutput))
}

lines := strings.Split(string(mvnOutput), "\n")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ func (p *javaProvider) Init(ctx context.Context, log logr.Logger, config provide
mvnOutput, err := cmd.CombinedOutput()
if err != nil {
cancelFunc()
return nil, additionalBuiltinConfig, fmt.Errorf("error downloading java artifact %s - maven output: %s - with error %w", mvnUri, mvnOutput, err)
return nil, additionalBuiltinConfig, fmt.Errorf("error downloading java artifact %s - maven output: %s - with error %w", mvnUri, string(mvnOutput), err)
}
downloadedPath := filepath.Join(outputDir,
fmt.Sprintf("%s.jar", strings.Join(mvnCoordinatesParts[1:3], "-")))
Expand Down Expand Up @@ -694,7 +694,7 @@ func resolveSourcesJarsForMaven(ctx context.Context, log logr.Logger, location,
cmd.Dir = location
mvnOutput, err := cmd.CombinedOutput()
if err != nil {
return fmt.Errorf("maven downloadSources command failed with error %w, maven output: %s", err, mvnOutput)
return fmt.Errorf("maven downloadSources command failed with error %w, maven output: %s", err, string(mvnOutput))
}

reader := bytes.NewReader(mvnOutput)
Expand Down

0 comments on commit ddc1c9f

Please sign in to comment.