Make Info return stderr buffer

Author: avdv

internal/bazel/bazel.go

@@ -133,8 +133,8 @@ type Bazel interface {
 	SetStartupArgs([]string)
 	WriteToStderr(v bool)
 	WriteToStdout(v bool)
-	Info() (map[string]string, error)
 	Query(args ...string) (*blaze_query.QueryResult, error)
+	Info() (map[string]string, *bytes.Buffer, error)
 	CQuery(args ...string) (*analysis.CqueryResult, error)
 	Build(args ...string) (*bytes.Buffer, error)
 	Norun(args ...string) (*bytes.Buffer, error)
@@ -235,10 +235,10 @@ func (b *bazel) newCommand(command string, args ...string) (*bytes.Buffer, *byte
 // 'bazel help info-keys'.
 //
 // res, err := b.Info()
-func (b *bazel) Info() (map[string]string, error) {
+func (b *bazel) Info() (map[string]string, *bytes.Buffer, error) {
 	b.WriteToStderr(false)
 	b.WriteToStdout(false)
-	stdoutBuffer, _ := b.newCommand("info")
+	stdoutBuffer, stderrBuffer := b.newCommand("info")
 
 	// This gofunction only prints if 'bazel info' takes longer than 8 seconds
 	doneCh := make(chan struct{})
@@ -254,9 +254,10 @@ func (b *bazel) Info() (map[string]string, error) {
 
 	err := b.cmd.Run()
 	if err != nil {
-		return nil, err
+		return nil, nil, err
 	}
-	return b.processInfo(stdoutBuffer.String())
+	result, err := b.processInfo(stdoutBuffer.String())
+	return result, stderrBuffer, err
 }
 
 func (b *bazel) processInfo(info string) (map[string]string, error) {

internal/bazel/testing/mock.go

@@ -57,9 +57,9 @@ func (b *MockBazel) WriteToStderr(v bool) {
 func (b *MockBazel) WriteToStdout(v bool) {
 	b.actions = append(b.actions, []string{"WriteToStdout", fmt.Sprint(v)})
 }
-func (b *MockBazel) Info() (map[string]string, error) {
+func (b *MockBazel) Info() (map[string]string, *bytes.Buffer, error) {
 	b.actions = append(b.actions, []string{"Info"})
-	return map[string]string{}, nil
+	return map[string]string{}, nil, nil
 }
 func (b *MockBazel) AddQueryResponse(query string, res *blaze_query.QueryResult) {
 	if b.queryResponse == nil {

internal/ibazel/ibazel.go

@@ -114,7 +114,7 @@ func New(version string) (*IBazel, error) {
 		lifecycleHooks,
 	}
 
-	info, _ := i.getInfo()
+	info, stderrBuffer, _ := i.getInfo()
 	for _, l := range i.lifecycleListeners {
 		l.Initialize(&info)
 	}
@@ -468,16 +468,16 @@ func (i *IBazel) queryRule(rule string) (*blaze_query.Rule, error) {
 	return nil, errors.New("No information available")
 }
 
-func (i *IBazel) getInfo() (map[string]string, error) {
+func (i *IBazel) getInfo() (map[string]string, *bytes.Buffer, error) {
 	b := i.newBazel()
 
-	res, err := b.Info()
+	res, stderrBuffer, err := b.Info()
 	if err != nil {
 		log.Errorf("Error getting Bazel info %v", err)
-		return nil, err
+		return nil, nil, err
 	}
 
-	return res, nil
+	return res, stderrBuffer, nil
 }
 
 func (i *IBazel) queryForSourceFiles(query string) ([]string, error) {

internal/ibazel/ibazel_unix.go

@@ -28,7 +28,7 @@ import (
 )
 
 func (i *IBazel) realLocalRepositoryPaths() (map[string]string, error) {
-	info, err := i.getInfo()
+	info, _, err := i.getInfo()
 	if err != nil {
 		log.Errorf("Error finding bazel info: %v\n", err)
 		return nil, err