refactor: bazel

cmd/aspect/aquery/aquery.go

@@ -29,10 +29,10 @@ import (
 )
 
 func NewDefaultAQueryCmd() *cobra.Command {
-	return NewAQueryCommand(ioutils.DefaultStreams, bazel.New())
+	return NewAQueryCommand(ioutils.DefaultStreams, bazel.FindFromWd)
 }
 
-func NewAQueryCommand(streams ioutils.Streams, bzl bazel.Bazel) *cobra.Command {
+func NewAQueryCommand(streams ioutils.Streams, bzlProvider bazel.BazelProvider) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "aquery",
 		Short: "Executes an aquery.",
@@ -42,6 +42,10 @@ func NewAQueryCommand(streams ioutils.Streams, bzl bazel.Bazel) *cobra.Command {
 				flags.FlagsInterceptor(streams),
 			},
 			func(ctx context.Context, cmd *cobra.Command, args []string) (exitErr error) {
+				bzl, err := bzlProvider()
+				if err != nil {
+					return err
+				}
 				q := aquery.New(streams, bzl, true)
 				return q.Run(cmd, args)
 			},

cmd/aspect/build/build.go

@@ -36,15 +36,15 @@ func NewDefaultBuildCmd(pluginSystem system.PluginSystem) *cobra.Command {
 	return NewBuildCmd(
 		ioutils.DefaultStreams,
 		pluginSystem,
-		bazel.New(),
+		bazel.FindFromWd,
 	)
 }
 
 // NewBuildCmd creates a new build cobra command.
 func NewBuildCmd(
 	streams ioutils.Streams,
 	pluginSystem system.PluginSystem,
-	bzl bazel.Bazel,
+	bzlProvider bazel.BazelProvider,
 ) *cobra.Command {
 	return &cobra.Command{
 		Use:   "build",
@@ -58,6 +58,10 @@ func NewBuildCmd(
 				pluginSystem.BuildHooksInterceptor(streams),
 			},
 			func(ctx context.Context, cmd *cobra.Command, args []string) (exitErr error) {
+				bzl, err := bzlProvider()
+				if err != nil {
+					return err
+				}
 				b := build.New(streams, bzl)
 				besBackend := bep.BESBackendFromContext(ctx)
 				return b.Run(args, besBackend)

cmd/aspect/clean/clean.go

@@ -32,11 +32,11 @@ import (
 
 // NewDefaultCleanCmd creates a new default clean cobra command.
 func NewDefaultCleanCmd() *cobra.Command {
-	return NewCleanCmd(ioutils.DefaultStreams, bazel.New())
+	return NewCleanCmd(ioutils.DefaultStreams, bazel.FindFromWd)
 }
 
 // NewCleanCmd creates a new clean cobra command.
-func NewCleanCmd(streams ioutils.Streams, bzl bazel.Bazel) *cobra.Command {
+func NewCleanCmd(streams ioutils.Streams, bzlProvider bazel.BazelProvider) *cobra.Command {
 	var expunge bool
 	var expungeAsync bool
 
@@ -79,6 +79,10 @@ Workaround inconistent state:
 			},
 			func(ctx context.Context, cmd *cobra.Command, args []string) (exitErr error) {
 				isInteractive := isatty.IsTerminal(os.Stdout.Fd()) || isatty.IsCygwinTerminal(os.Stdout.Fd())
+				bzl, err := bzlProvider()
+				if err != nil {
+					return err
+				}
 				c := clean.NewDefault(streams, bzl, isInteractive)
 				c.Expunge = expunge
 				c.ExpungeAsync = expungeAsync

cmd/aspect/cquery/cquery.go

@@ -29,10 +29,10 @@ import (
 )
 
 func NewDefaultCQueryCmd() *cobra.Command {
-	return NewCQueryCommand(ioutils.DefaultStreams, bazel.New())
+	return NewCQueryCommand(ioutils.DefaultStreams, bazel.FindFromWd)
 }
 
-func NewCQueryCommand(streams ioutils.Streams, bzl bazel.Bazel) *cobra.Command {
+func NewCQueryCommand(streams ioutils.Streams, bzlProvider bazel.BazelProvider) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "cquery",
 		Short: "Executes a cquery.",
@@ -42,6 +42,10 @@ func NewCQueryCommand(streams ioutils.Streams, bzl bazel.Bazel) *cobra.Command {
 				flags.FlagsInterceptor(streams),
 			},
 			func(ctx context.Context, cmd *cobra.Command, args []string) (exitErr error) {
+				bzl, err := bzlProvider()
+				if err != nil {
+					return err
+				}
 				q := cquery.New(streams, bzl, true)
 				return q.Run(cmd, args)
 			},

cmd/aspect/query/query.go

@@ -29,10 +29,10 @@ import (
 )
 
 func NewDefaultQueryCmd() *cobra.Command {
-	return NewQueryCommand(ioutils.DefaultStreams, bazel.New())
+	return NewQueryCommand(ioutils.DefaultStreams, bazel.FindFromWd)
 }
 
-func NewQueryCommand(streams ioutils.Streams, bzl bazel.Bazel) *cobra.Command {
+func NewQueryCommand(streams ioutils.Streams, bzlProvider bazel.BazelProvider) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "query",
 		Short: "Executes a dependency graph query.",
@@ -42,6 +42,10 @@ func NewQueryCommand(streams ioutils.Streams, bzl bazel.Bazel) *cobra.Command {
 				flags.FlagsInterceptor(streams),
 			},
 			func(ctx context.Context, cmd *cobra.Command, args []string) (exitErr error) {
+				bzl, err := bzlProvider()
+				if err != nil {
+					return err
+				}
 				q := query.New(streams, bzl, true)
 				return q.Run(cmd, args)
 			},

cmd/aspect/run/run.go

@@ -36,14 +36,14 @@ func NewDefaultRunCmd(pluginSystem system.PluginSystem) *cobra.Command {
 	return NewRunCmd(
 		ioutils.DefaultStreams,
 		pluginSystem,
-		bazel.New(),
+		bazel.FindFromWd,
 	)
 }
 
 func NewRunCmd(
 	streams ioutils.Streams,
 	pluginSystem system.PluginSystem,
-	bzl bazel.Bazel,
+	bzlProvider bazel.BazelProvider,
 ) *cobra.Command {
 	return &cobra.Command{
 		Use:   "run",
@@ -63,6 +63,10 @@ use 'bazel run --script_path' to write a script and then execute it.
 				pluginSystem.RunHooksInterceptor(streams),
 			},
 			func(ctx context.Context, cmd *cobra.Command, args []string) (exitErr error) {
+				bzl, err := bzlProvider()
+				if err != nil {
+					return err
+				}
 				r := run.New(streams, bzl)
 				besBackend := bep.BESBackendFromContext(ctx)
 				return r.Run(args, besBackend)

cmd/aspect/test/test.go

@@ -36,14 +36,14 @@ func NewDefaultTestCmd(pluginSystem system.PluginSystem) *cobra.Command {
 	return NewTestCmd(
 		ioutils.DefaultStreams,
 		pluginSystem,
-		bazel.New(),
+		bazel.FindFromWd,
 	)
 }
 
 func NewTestCmd(
 	streams ioutils.Streams,
 	pluginSystem system.PluginSystem,
-	bzl bazel.Bazel,
+	bzlProvider bazel.BazelProvider,
 ) *cobra.Command {
 	return &cobra.Command{
 		Use:   "test",
@@ -66,6 +66,10 @@ specify targets.
 				pluginSystem.TestHooksInterceptor(streams),
 			},
 			func(ctx context.Context, cmd *cobra.Command, args []string) (exitErr error) {
+				bzl, err := bzlProvider()
+				if err != nil {
+					return err
+				}
 				t := test.New(streams, bzl)
 				besBackend := bep.BESBackendFromContext(ctx)
 				return t.Run(args, besBackend)

cmd/aspect/version/BUILD.bazel

@@ -10,6 +10,7 @@ go_library(
         "//pkg/aspect/root/flags",
         "//pkg/aspect/version",
         "//pkg/bazel",
+        "//pkg/bazel/workspace",
         "//pkg/interceptors",
         "//pkg/ioutils",
         "@com_github_spf13_cobra//:cobra",

cmd/aspect/version/version.go

@@ -25,15 +25,16 @@ import (
 	"aspect.build/cli/pkg/aspect/root/flags"
 	"aspect.build/cli/pkg/aspect/version"
 	"aspect.build/cli/pkg/bazel"
+	"aspect.build/cli/pkg/bazel/workspace"
 	"aspect.build/cli/pkg/interceptors"
 	"aspect.build/cli/pkg/ioutils"
 )
 
 func NewDefaultVersionCmd() *cobra.Command {
-	return NewVersionCmd(ioutils.DefaultStreams, bazel.New())
+	return NewVersionCmd(ioutils.DefaultStreams, bazel.FindFromWd)
 }
 
-func NewVersionCmd(streams ioutils.Streams, bzl bazel.Bazel) *cobra.Command {
+func NewVersionCmd(streams ioutils.Streams, bzlProvider bazel.BazelProvider) *cobra.Command {
 	v := version.New(streams)
 	v.BuildInfo = *buildinfo.Current()
 
@@ -46,6 +47,10 @@ func NewVersionCmd(streams ioutils.Streams, bzl bazel.Bazel) *cobra.Command {
 				flags.FlagsInterceptor(streams),
 			},
 			func(ctx context.Context, cmd *cobra.Command, args []string) (exitErr error) {
+				bzl, err := bzlProvider()
+				if err != nil && !workspace.IsNotFoundError(err) {
+					return err
+				}
 				return v.Run(bzl)
 			},
 		),

pkg/aspect/analyzeprofile/analyzeprofile.go

@@ -39,9 +39,12 @@ func New(streams ioutils.Streams) *AnalyzeProfile {
 func (v *AnalyzeProfile) Run(ctx context.Context, _ *cobra.Command, args []string) error {
 	bazelCmd := []string{"analyze-profile"}
 	bazelCmd = append(bazelCmd, args...)
-	bzl := bazel.New()
+	bzl, err := bazel.FindFromWd()
+	if err != nil {
+		return err
+	}
 
-	if exitCode, err := bzl.Spawn(bazelCmd, v.Streams); exitCode != 0 {
+	if exitCode, err := bzl.RunCommand(bazelCmd, v.Streams); exitCode != 0 {
 		err = &aspecterrors.ExitError{
 			Err:      err,
 			ExitCode: exitCode,

pkg/aspect/aquery/aquery_test.go

@@ -43,7 +43,7 @@ func TestQuery(t *testing.T) {
 		spawner := bazel_mock.NewMockBazel(ctrl)
 		spawner.
 			EXPECT().
-			Spawn([]string{"aquery", "somepath(//cmd/aspect/query:query, @com_github_bazelbuild_bazelisk//core:go_default_library)"}, streams).
+			RunCommand([]string{"aquery", "somepath(//cmd/aspect/query:query, @com_github_bazelbuild_bazelisk//core:go_default_library)"}, streams).
 			Return(0, nil)
 
 		q := aquery.New(streams, spawner, true)
@@ -71,7 +71,7 @@ func TestQuery(t *testing.T) {
 		spawner := bazel_mock.NewMockBazel(ctrl)
 		spawner.
 			EXPECT().
-			Spawn([]string{"aquery", "somepath(//cmd/aspect/query:query, @com_github_bazelbuild_bazelisk//core:go_default_library)"}, streams).
+			RunCommand([]string{"aquery", "somepath(//cmd/aspect/query:query, @com_github_bazelbuild_bazelisk//core:go_default_library)"}, streams).
 			Return(0, nil)
 
 		promptRunner := query_mock.NewMockPromptRunner(ctrl)
@@ -167,7 +167,7 @@ func TestQuery(t *testing.T) {
 		spawner := bazel_mock.NewMockBazel(ctrl)
 		spawner.
 			EXPECT().
-			Spawn([]string{"aquery", "somepath(//cmd/aspect/query:query, @com_github_bazelbuild_bazelisk//core:go_default_library)"}, streams).
+			RunCommand([]string{"aquery", "somepath(//cmd/aspect/query:query, @com_github_bazelbuild_bazelisk//core:go_default_library)"}, streams).
 			Return(0, nil)
 
 		promptRunner := query_mock.NewMockPromptRunner(ctrl)

pkg/aspect/build/build.go

@@ -46,7 +46,7 @@ func New(
 // Event Protocol backend used by Aspect plugins to subscribe to build events.
 func (b *Build) Run(args []string, besBackend bep.BESBackend) (exitErr error) {
 	besBackendFlag := fmt.Sprintf("--bes_backend=%s", besBackend.Addr())
-	exitCode, bazelErr := b.bzl.Spawn(append([]string{"build", besBackendFlag}, args...), b.Streams)
+	exitCode, bazelErr := b.bzl.RunCommand(append([]string{"build", besBackendFlag}, args...), b.Streams)
 
 	// Process the subscribers errors before the Bazel one.
 	subscriberErrors := besBackend.Errors()

pkg/aspect/build/build_test.go

@@ -45,7 +45,7 @@ func TestBuild(t *testing.T) {
 		}
 		bzl.
 			EXPECT().
-			Spawn([]string{"build", "--bes_backend=grpc://127.0.0.1:12345", "//..."}, streams).
+			RunCommand([]string{"build", "--bes_backend=grpc://127.0.0.1:12345", "//..."}, streams).
 			Return(expectErr.ExitCode, expectErr.Err)
 		besBackend := bep_mock.NewMockBESBackend(ctrl)
 		besBackend.
@@ -74,7 +74,7 @@ func TestBuild(t *testing.T) {
 		bzl := bazel_mock.NewMockBazel(ctrl)
 		bzl.
 			EXPECT().
-			Spawn([]string{"build", "--bes_backend=grpc://127.0.0.1:12345", "//..."}, streams).
+			RunCommand([]string{"build", "--bes_backend=grpc://127.0.0.1:12345", "//..."}, streams).
 			Return(0, nil)
 		besBackend := bep_mock.NewMockBESBackend(ctrl)
 		besBackend.
@@ -107,7 +107,7 @@ func TestBuild(t *testing.T) {
 		bzl := bazel_mock.NewMockBazel(ctrl)
 		bzl.
 			EXPECT().
-			Spawn([]string{"build", "--bes_backend=grpc://127.0.0.1:12345", "//..."}, streams).
+			RunCommand([]string{"build", "--bes_backend=grpc://127.0.0.1:12345", "//..."}, streams).
 			Return(0, nil)
 		besBackend := bep_mock.NewMockBESBackend(ctrl)
 		besBackend.

pkg/aspect/canonicalizeflags/canonicalizeflags.go

@@ -39,9 +39,12 @@ func New(streams ioutils.Streams) *CanonicalizeFlags {
 func (v *CanonicalizeFlags) Run(ctx context.Context, _ *cobra.Command, args []string) error {
 	bazelCmd := []string{"canonicalize-flags"}
 	bazelCmd = append(bazelCmd, args...)
-	bzl := bazel.New()
+	bzl, err := bazel.FindFromWd()
+	if err != nil {
+		return err
+	}
 
-	if exitCode, err := bzl.Spawn(bazelCmd, v.Streams); exitCode != 0 {
+	if exitCode, err := bzl.RunCommand(bazelCmd, v.Streams); exitCode != 0 {
 		err = &aspecterrors.ExitError{
 			Err:      err,
 			ExitCode: exitCode,

pkg/aspect/clean/clean.go

@@ -193,7 +193,7 @@ func (c *Clean) Run(_ *cobra.Command, _ []string) error {
 	if c.ExpungeAsync {
 		cmd = append(cmd, "--expunge_async")
 	}
-	if exitCode, err := c.bzl.Spawn(cmd, c.Streams); exitCode != 0 {
+	if exitCode, err := c.bzl.RunCommand(cmd, c.Streams); exitCode != 0 {
 		err = &aspecterrors.ExitError{
 			Err:      err,
 			ExitCode: exitCode,

pkg/aspect/clean/clean_test.go

@@ -79,7 +79,7 @@ func TestClean(t *testing.T) {
 		bzl := mock.NewMockBazel(ctrl)
 		bzl.
 			EXPECT().
-			Spawn([]string{"clean"}, streams).
+			RunCommand([]string{"clean"}, streams).
 			Return(0, nil)
 
 		b := clean.New(streams, bzl, false)
@@ -95,7 +95,7 @@ func TestClean(t *testing.T) {
 		bzl := mock.NewMockBazel(ctrl)
 		bzl.
 			EXPECT().
-			Spawn([]string{"clean", "--expunge"}, streams).
+			RunCommand([]string{"clean", "--expunge"}, streams).
 			Return(0, nil)
 
 		b := clean.New(streams, bzl, false)
@@ -112,7 +112,7 @@ func TestClean(t *testing.T) {
 		bzl := mock.NewMockBazel(ctrl)
 		bzl.
 			EXPECT().
-			Spawn([]string{"clean", "--expunge_async"}, streams).
+			RunCommand([]string{"clean", "--expunge_async"}, streams).
 			Return(0, nil)
 
 		b := clean.New(streams, bzl, false)
@@ -130,7 +130,7 @@ func TestClean(t *testing.T) {
 		bzl := mock.NewMockBazel(ctrl)
 		bzl.
 			EXPECT().
-			Spawn([]string{"clean"}, streams).
+			RunCommand([]string{"clean"}, streams).
 			Return(0, nil)
 
 		b := clean.New(streams, bzl, true)
@@ -152,7 +152,7 @@ func TestClean(t *testing.T) {
 		bzl := mock.NewMockBazel(ctrl)
 		bzl.
 			EXPECT().
-			Spawn([]string{"clean"}, streams).
+			RunCommand([]string{"clean"}, streams).
 			Return(0, nil).AnyTimes()
 
 		b := clean.New(streams, bzl, true)
@@ -211,7 +211,7 @@ func TestClean(t *testing.T) {
 		bzl := mock.NewMockBazel(ctrl)
 		bzl.
 			EXPECT().
-			Spawn([]string{"clean"}, streams).
+			RunCommand([]string{"clean"}, streams).
 			Return(0, nil)
 
 		c := clean.New(streams, bzl, true)