Skip to content

Commit 942c196

Browse files
authored
✨ Print gradle output on error (#898)
Add Gradle output to errors to aid in debugging Signed-off-by: Juan Manuel Leflet Estrada <[email protected]>
1 parent bb3c887 commit 942c196

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed

external-providers/java-external-provider/pkg/java_external_provider/dependency.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,7 @@ func (p *javaServiceClient) getDependenciesForGradle(ctx context.Context) (map[u
482482
cmd.Env = append(cmd.Env, fmt.Sprintf("JAVA_HOME=%s", javaHome))
483483
output, err := cmd.CombinedOutput()
484484
if err != nil {
485-
return nil, err
485+
return nil, fmt.Errorf("error trying to get Gradle dependencies: %w - Gradle output: %s", err, string(output))
486486
}
487487

488488
lines := strings.Split(string(output), "\n")
@@ -503,6 +503,9 @@ func (c *javaServiceClient) getGradleSubprojects(ctx context.Context) ([]string,
503503
}
504504

505505
javaHome, err := c.GetJavaHomeForGradle(ctx)
506+
if err != nil {
507+
return nil, err
508+
}
506509

507510
exe, err := filepath.Abs(filepath.Join(c.config.Location, "gradlew"))
508511
if err != nil {
@@ -516,7 +519,7 @@ func (c *javaServiceClient) getGradleSubprojects(ctx context.Context) ([]string,
516519
cmd.Env = append(cmd.Env, fmt.Sprintf("JAVA_HOME=%s", javaHome))
517520
output, err := cmd.CombinedOutput()
518521
if err != nil {
519-
return nil, err
522+
return nil, fmt.Errorf("error getting gradle subprojects: %w - Gradle output: %s", err, string(output))
520523
}
521524

522525
beginRegex := regexp.MustCompile(`Root project`)

external-providers/java-external-provider/pkg/java_external_provider/provider.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -614,7 +614,7 @@ func (s *javaServiceClient) resolveSourcesJarsForGradle(ctx context.Context, fer
614614
// obtain Gradle version, needed for compatibility checks
615615
gradleVersion, err := s.GetGradleVersion(ctx)
616616
if err != nil {
617-
gradleVersion = version.Version{}
617+
return err
618618
}
619619

620620
// append downloader task
@@ -664,7 +664,7 @@ func (s *javaServiceClient) resolveSourcesJarsForGradle(ctx context.Context, fer
664664
cmd.Dir = s.config.Location
665665
output, err := cmd.CombinedOutput()
666666
if err != nil {
667-
return err
667+
return fmt.Errorf("error trying to get sources for Gradle: %w - Gradle output: %s", err, output)
668668
}
669669

670670
s.log.V(8).WithValues("output", output).Info("got gradle output")

external-providers/java-external-provider/pkg/java_external_provider/service_client.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -490,7 +490,7 @@ func (s *javaServiceClient) GetGradleVersion(ctx context.Context) (version.Versi
490490
cmd.Env = append(cmd.Env, fmt.Sprintf("JAVA_HOME=%s", os.Getenv("JAVA_HOME")))
491491
output, err = cmd.CombinedOutput()
492492
if err != nil {
493-
return version.Version{}, err
493+
return version.Version{}, fmt.Errorf("error trying to get Gradle version: %w - Gradle output: %s", err, string(output))
494494
}
495495
}
496496

0 commit comments

Comments
 (0)