Skip to content
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

Jump to bottom

feat: allow envs and workspace root into bazelisk #220

Merged
merged 2 commits into from
Jul 13, 2022
Merged

feat: allow envs and workspace root into bazelisk #220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
70cc3e5
feat: allow envs and workspace root into bazelisk
f0rmiga Jul 11, 2022
f9f7400
fix: run gazelle
f0rmiga Jul 12, 2022
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
2 changes: 1 addition & 1 deletion pkg/aspect/aquery/aquery.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,5 +68,5 @@ func (q *AQuery) Run(cmd *cobra.Command, args []string) error {
}
}

return shared.RunQuery(q.Bzl, presetVerb, query)
return shared.RunQuery(q.Bzl, presetVerb, query, q.Streams)
}
10 changes: 5 additions & 5 deletions pkg/aspect/aquery/aquery_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@ func TestQuery(t *testing.T) {
ctrl := gomock.NewController(t)
defer ctrl.Finish()

var stdout strings.Builder
streams := ioutils.Streams{Stdout: &stdout}
spawner := bazel_mock.NewMockBazel(ctrl)
spawner.
EXPECT().
Spawn([]string{"aquery", "somepath(//cmd/aspect/query:query, @com_github_bazelbuild_bazelisk//core:go_default_library)"}).
Spawn([]string{"aquery", "somepath(//cmd/aspect/query:query, @com_github_bazelbuild_bazelisk//core:go_default_library)"}, streams).
Return(0, nil)

var stdout strings.Builder
streams := ioutils.Streams{Stdout: &stdout}
q := aquery.New(streams, spawner, true)
q.Presets = []*shared.PresetQuery{
{
Expand All @@ -63,7 +63,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)"}).
Spawn([]string{"aquery", "somepath(//cmd/aspect/query:query, @com_github_bazelbuild_bazelisk//core:go_default_library)"}, streams).
Return(0, nil)

promptRunner := query_mock.NewMockPromptRunner(ctrl)
Expand Down Expand Up @@ -159,7 +159,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)"}).
Spawn([]string{"aquery", "somepath(//cmd/aspect/query:query, @com_github_bazelbuild_bazelisk//core:go_default_library)"}, streams).
Return(0, nil)

promptRunner := query_mock.NewMockPromptRunner(ctrl)
Expand Down
2 changes: 1 addition & 1 deletion pkg/aspect/build/build.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,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...))
exitCode, bazelErr := b.bzl.Spawn(append([]string{"build", besBackendFlag}, args...), b.Streams)

// Process the subscribers errors before the Bazel one.
subscriberErrors := besBackend.Errors()
Expand Down
6 changes: 3 additions & 3 deletions pkg/aspect/build/build_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ func TestBuild(t *testing.T) {
}
bzl.
EXPECT().
Spawn([]string{"build", "--bes_backend=grpc://127.0.0.1:12345", "//..."}).
Spawn([]string{"build", "--bes_backend=grpc://127.0.0.1:12345", "//..."}, streams).
Return(expectErr.ExitCode, expectErr.Err)
besBackend := bep_mock.NewMockBESBackend(ctrl)
besBackend.
Expand Down Expand Up @@ -66,7 +66,7 @@ func TestBuild(t *testing.T) {
bzl := bazel_mock.NewMockBazel(ctrl)
bzl.
EXPECT().
Spawn([]string{"build", "--bes_backend=grpc://127.0.0.1:12345", "//..."}).
Spawn([]string{"build", "--bes_backend=grpc://127.0.0.1:12345", "//..."}, streams).
Return(0, nil)
besBackend := bep_mock.NewMockBESBackend(ctrl)
besBackend.
Expand Down Expand Up @@ -99,7 +99,7 @@ func TestBuild(t *testing.T) {
bzl := bazel_mock.NewMockBazel(ctrl)
bzl.
EXPECT().
Spawn([]string{"build", "--bes_backend=grpc://127.0.0.1:12345", "//..."}).
Spawn([]string{"build", "--bes_backend=grpc://127.0.0.1:12345", "//..."}, streams).
Return(0, nil)
besBackend := bep_mock.NewMockBESBackend(ctrl)
besBackend.
Expand Down
2 changes: 1 addition & 1 deletion pkg/aspect/clean/clean.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ func (c *Clean) Run(_ *cobra.Command, _ []string) error {
if c.ExpungeAsync {
cmd = append(cmd, "--expunge_async")
}
if exitCode, err := c.bzl.Spawn(cmd); exitCode != 0 {
if exitCode, err := c.bzl.Spawn(cmd, c.Streams); exitCode != 0 {
err = &aspecterrors.ExitError{
Err: err,
ExitCode: exitCode,
Expand Down
34 changes: 18 additions & 16 deletions pkg/aspect/clean/clean_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,13 +67,14 @@ func TestClean(t *testing.T) {
ctrl := gomock.NewController(t)
defer ctrl.Finish()

streams := ioutils.Streams{}
bzl := mock.NewMockBazel(ctrl)
bzl.
EXPECT().
Spawn([]string{"clean"}).
Spawn([]string{"clean"}, streams).
Return(0, nil)

b := clean.New(ioutils.Streams{}, bzl, false)
b := clean.New(streams, bzl, false)
g.Expect(b.Run(nil, []string{})).Should(Succeed())
})

Expand All @@ -82,13 +83,14 @@ func TestClean(t *testing.T) {
ctrl := gomock.NewController(t)
defer ctrl.Finish()

streams := ioutils.Streams{}
bzl := mock.NewMockBazel(ctrl)
bzl.
EXPECT().
Spawn([]string{"clean", "--expunge"}).
Spawn([]string{"clean", "--expunge"}, streams).
Return(0, nil)

b := clean.New(ioutils.Streams{}, bzl, false)
b := clean.New(streams, bzl, false)
b.Expunge = true
g.Expect(b.Run(nil, []string{})).Should(Succeed())
})
Expand All @@ -98,13 +100,14 @@ func TestClean(t *testing.T) {
ctrl := gomock.NewController(t)
defer ctrl.Finish()

streams := ioutils.Streams{}
bzl := mock.NewMockBazel(ctrl)
bzl.
EXPECT().
Spawn([]string{"clean", "--expunge_async"}).
Spawn([]string{"clean", "--expunge_async"}, streams).
Return(0, nil)

b := clean.New(ioutils.Streams{}, bzl, false)
b := clean.New(streams, bzl, false)
b.ExpungeAsync = true
g.Expect(b.Run(nil, []string{})).Should(Succeed())
})
Expand All @@ -114,14 +117,14 @@ func TestClean(t *testing.T) {
ctrl := gomock.NewController(t)
defer ctrl.Finish()

var stdout strings.Builder
streams := ioutils.Streams{Stdout: &stdout}
bzl := mock.NewMockBazel(ctrl)
bzl.
EXPECT().
Spawn([]string{"clean"}).
Spawn([]string{"clean"}, streams).
Return(0, nil)

var stdout strings.Builder
streams := ioutils.Streams{Stdout: &stdout}
b := clean.New(streams, bzl, true)

b.Behavior = chooseReclaim{}
Expand All @@ -136,14 +139,14 @@ func TestClean(t *testing.T) {
ctrl := gomock.NewController(t)
defer ctrl.Finish()

var stdout strings.Builder
streams := ioutils.Streams{Stdout: &stdout}
bzl := mock.NewMockBazel(ctrl)
bzl.
EXPECT().
Spawn([]string{"clean"}).
Spawn([]string{"clean"}, streams).
Return(0, nil).AnyTimes()

var stdout strings.Builder
streams := ioutils.Streams{Stdout: &stdout}
b := clean.New(streams, bzl, true)

viper := *viper.New()
Expand Down Expand Up @@ -195,15 +198,14 @@ func TestClean(t *testing.T) {
ctrl := gomock.NewController(t)
defer ctrl.Finish()

var stdout strings.Builder
streams := ioutils.Streams{Stdout: &stdout}
bzl := mock.NewMockBazel(ctrl)
bzl.
EXPECT().
Spawn([]string{"clean"}).
Spawn([]string{"clean"}, streams).
Return(0, nil)

var stdout strings.Builder
streams := ioutils.Streams{Stdout: &stdout}

c := clean.New(streams, bzl, true)
c.Behavior = chooseWorkaround{}
c.Workaround = confirm{}
Expand Down
2 changes: 1 addition & 1 deletion pkg/aspect/cquery/cquery.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,5 +68,5 @@ func (q *CQuery) Run(cmd *cobra.Command, args []string) error {
}
}

return shared.RunQuery(q.Bzl, presetVerb, query)
return shared.RunQuery(q.Bzl, presetVerb, query, q.Streams)
}
10 changes: 5 additions & 5 deletions pkg/aspect/cquery/cquery_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@ func TestQuery(t *testing.T) {
ctrl := gomock.NewController(t)
defer ctrl.Finish()

var stdout strings.Builder
streams := ioutils.Streams{Stdout: &stdout}
spawner := bazel_mock.NewMockBazel(ctrl)
spawner.
EXPECT().
Spawn([]string{"cquery", "somepath(//cmd/aspect/query:query, @com_github_bazelbuild_bazelisk//core:go_default_library)"}).
Spawn([]string{"cquery", "somepath(//cmd/aspect/query:query, @com_github_bazelbuild_bazelisk//core:go_default_library)"}, streams).
Return(0, nil)

var stdout strings.Builder
streams := ioutils.Streams{Stdout: &stdout}
q := cquery.New(streams, spawner, true)
q.Presets = []*shared.PresetQuery{
{
Expand All @@ -63,7 +63,7 @@ func TestQuery(t *testing.T) {
spawner := bazel_mock.NewMockBazel(ctrl)
spawner.
EXPECT().
Spawn([]string{"cquery", "somepath(//cmd/aspect/query:query, @com_github_bazelbuild_bazelisk//core:go_default_library)"}).
Spawn([]string{"cquery", "somepath(//cmd/aspect/query:query, @com_github_bazelbuild_bazelisk//core:go_default_library)"}, streams).
Return(0, nil)

promptRunner := query_mock.NewMockPromptRunner(ctrl)
Expand Down Expand Up @@ -159,7 +159,7 @@ func TestQuery(t *testing.T) {
spawner := bazel_mock.NewMockBazel(ctrl)
spawner.
EXPECT().
Spawn([]string{"cquery", "somepath(//cmd/aspect/query:query, @com_github_bazelbuild_bazelisk//core:go_default_library)"}).
Spawn([]string{"cquery", "somepath(//cmd/aspect/query:query, @com_github_bazelbuild_bazelisk//core:go_default_library)"}, streams).
Return(0, nil)

promptRunner := query_mock.NewMockPromptRunner(ctrl)
Expand Down
2 changes: 1 addition & 1 deletion pkg/aspect/info/info.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ func (v *Info) Run(ctx context.Context, _ *cobra.Command, args []string) error {
bazelCmd = append(bazelCmd, args...)
bzl := bazel.New()

if exitCode, err := bzl.Spawn(bazelCmd); exitCode != 0 {
if exitCode, err := bzl.Spawn(bazelCmd, v.Streams); exitCode != 0 {
err = &aspecterrors.ExitError{
Err: err,
ExitCode: exitCode,
Expand Down
2 changes: 1 addition & 1 deletion pkg/aspect/query/query.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ func (q *Query) Run(cmd *cobra.Command, args []string) error {
}
}

return shared.RunQuery(q.Bzl, presetVerb, query)
return shared.RunQuery(q.Bzl, presetVerb, query, q.Streams)
}

func (q *Query) checkConfig(baseUseKey string, baseInquiredKey string, question string) error {
Expand Down
10 changes: 5 additions & 5 deletions pkg/aspect/query/query_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,14 @@ func TestQuery(t *testing.T) {
ctrl := gomock.NewController(t)
defer ctrl.Finish()

var stdout strings.Builder
streams := ioutils.Streams{Stdout: &stdout}
spawner := bazel_mock.NewMockBazel(ctrl)
spawner.
EXPECT().
Spawn([]string{"query", "somepath(//cmd/aspect/query:query, @com_github_bazelbuild_bazelisk//core:go_default_library)"}).
Spawn([]string{"query", "somepath(//cmd/aspect/query:query, @com_github_bazelbuild_bazelisk//core:go_default_library)"}, streams).
Return(0, nil)

var stdout strings.Builder
streams := ioutils.Streams{Stdout: &stdout}
q := query.New(streams, spawner, true)
q.Presets = []*shared.PresetQuery{
{
Expand Down Expand Up @@ -72,7 +72,7 @@ func TestQuery(t *testing.T) {
spawner := bazel_mock.NewMockBazel(ctrl)
spawner.
EXPECT().
Spawn([]string{"query", "somepath(//cmd/aspect/query:query, @com_github_bazelbuild_bazelisk//core:go_default_library)"}).
Spawn([]string{"query", "somepath(//cmd/aspect/query:query, @com_github_bazelbuild_bazelisk//core:go_default_library)"}, streams).
Return(0, nil)

promptRunner := query_mock.NewMockPromptRunner(ctrl)
Expand Down Expand Up @@ -217,7 +217,7 @@ func TestQuery(t *testing.T) {
spawner := bazel_mock.NewMockBazel(ctrl)
spawner.
EXPECT().
Spawn([]string{"query", "somepath(//cmd/aspect/query:query, @com_github_bazelbuild_bazelisk//core:go_default_library)"}).
Spawn([]string{"query", "somepath(//cmd/aspect/query:query, @com_github_bazelbuild_bazelisk//core:go_default_library)"}, streams).
Return(0, nil)

promptRunner := query_mock.NewMockPromptRunner(ctrl)
Expand Down
4 changes: 2 additions & 2 deletions pkg/aspect/query/shared/query.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,13 +156,13 @@ func ProcessQueries(presets []*PresetQuery) (map[string]*PresetQuery, []string,
return processedPresets, presetNames, nil
}

func RunQuery(bzl bazel.Bazel, verb string, query string) error {
func RunQuery(bzl bazel.Bazel, verb string, query string, streams ioutils.Streams) error {
bazelCmd := []string{
verb,
query,
}

if exitCode, err := bzl.Spawn(bazelCmd); exitCode != 0 {
if exitCode, err := bzl.Spawn(bazelCmd, streams); exitCode != 0 {
err = &aspecterrors.ExitError{
Err: err,
ExitCode: exitCode,
Expand Down
2 changes: 1 addition & 1 deletion pkg/aspect/run/run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ func New(
// Event Protocol backend used by Aspect plugins to subscribe to build events.
func (cmd *Run) Run(args []string, besBackend bep.BESBackend) (exitErr error) {
besBackendFlag := fmt.Sprintf("--bes_backend=%s", besBackend.Addr())
exitCode, bazelErr := cmd.bzl.Spawn(append([]string{"run", besBackendFlag}, args...))
exitCode, bazelErr := cmd.bzl.Spawn(append([]string{"run", besBackendFlag}, args...), cmd.Streams)

// Process the subscribers errors before the Bazel one.
subscriberErrors := besBackend.Errors()
Expand Down
6 changes: 3 additions & 3 deletions pkg/aspect/run/run_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ func TestRun(t *testing.T) {
}
bzl.
EXPECT().
Spawn([]string{"run", "--bes_backend=grpc://127.0.0.1:12345", "//..."}).
Spawn([]string{"run", "--bes_backend=grpc://127.0.0.1:12345", "//..."}, streams).
Return(expectErr.ExitCode, expectErr.Err)
besBackend := bep_mock.NewMockBESBackend(ctrl)
besBackend.
Expand Down Expand Up @@ -66,7 +66,7 @@ func TestRun(t *testing.T) {
bzl := bazel_mock.NewMockBazel(ctrl)
bzl.
EXPECT().
Spawn([]string{"run", "--bes_backend=grpc://127.0.0.1:12345", "//..."}).
Spawn([]string{"run", "--bes_backend=grpc://127.0.0.1:12345", "//..."}, streams).
Return(0, nil)
besBackend := bep_mock.NewMockBESBackend(ctrl)
besBackend.
Expand Down Expand Up @@ -99,7 +99,7 @@ func TestRun(t *testing.T) {
bzl := bazel_mock.NewMockBazel(ctrl)
bzl.
EXPECT().
Spawn([]string{"run", "--bes_backend=grpc://127.0.0.1:12345", "//..."}).
Spawn([]string{"run", "--bes_backend=grpc://127.0.0.1:12345", "//..."}, streams).
Return(0, nil)
besBackend := bep_mock.NewMockBESBackend(ctrl)
besBackend.
Expand Down
2 changes: 1 addition & 1 deletion pkg/aspect/test/test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ func (t *Test) Run(args []string, besBackend bep.BESBackend) (exitErr error) {
bazelCmd := []string{"test", besBackendFlag}
bazelCmd = append(bazelCmd, args...)

exitCode, bazelErr := t.bzl.Spawn(bazelCmd)
exitCode, bazelErr := t.bzl.Spawn(bazelCmd, t.Streams)

// Process the subscribers errors before the Bazel one.
subscriberErrors := besBackend.Errors()
Expand Down
5 changes: 3 additions & 2 deletions pkg/aspect/test/test_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,11 @@ func TestTest(t *testing.T) {
ctrl := gomock.NewController(t)
defer ctrl.Finish()

streams := ioutils.Streams{}
bzl := mock.NewMockBazel(ctrl)
bzl.
EXPECT().
Spawn([]string{"test", "--bes_backend=grpc://127.0.0.1:12345"}).
Spawn([]string{"test", "--bes_backend=grpc://127.0.0.1:12345"}, streams).
Return(0, nil)

besBackend := bep_mock.NewMockBESBackend(ctrl)
Expand All @@ -44,7 +45,7 @@ func TestTest(t *testing.T) {
Errors().
Times(1)

b := test.New(ioutils.Streams{}, bzl)
b := test.New(streams, bzl)
g.Expect(b.Run([]string{}, besBackend)).Should(Succeed())
})
}
2 changes: 1 addition & 1 deletion pkg/aspect/version/version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ func (v *Version) Run(bzl bazel.Bazel) error {
} else {
fmt.Fprintf(v.Stdout, "Aspect version: %s\n", version)
}
bzl.Spawn(bazelCmd)
bzl.Spawn(bazelCmd, v.Streams)

return nil
}
1 change: 1 addition & 0 deletions pkg/bazel/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ go_test(
embed = [":bazel"],
deps = [
"//pkg/bazel/workspace/mock",
"//pkg/ioutils",
"@com_github_golang_mock//gomock",
"@com_github_onsi_gomega//:gomega",
],
Expand Down
Loading