Skip to content

Commit c0e3f99

Browse files
thesayyngregmagolan
thesayyn
and
gregmagolan
committed
fix: call flags-as-proto in a tmpdir (#1167)
Co-authored-by: Greg Magolan <gmagolan@gmail.com> GitOrigin-RevId: ab916d069d5b88efdc1ac35c0c00068126ab33de
1 parent 7bef335 commit c0e3f99

File tree

32 files changed

+72
-71
lines changed

32 files changed

+72
-71
lines changed

‎cmd/aspect/help/flags_as_proto.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ func NewFlagsAsProtoCmd(streams ioutils.Streams, bzlProvider bazel.BazelProvider
3232
return err
3333
}
3434

35-
if exitCode, err := bzl.RunCommand(streams, bazelCmd...); exitCode != 0 {
35+
if exitCode, err := bzl.RunCommand(streams, nil, bazelCmd...); exitCode != 0 {
3636
err = &aspecterrors.ExitError{
3737
Err: err,
3838
ExitCode: exitCode,

‎integration_tests/aspect/flags_test.bats

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,4 +109,17 @@ EOF
109109

110110
run aspect query --aspect:unknownflag=2 --aspect:interactive=false
111111
assert_output --partial "Error: unknown flag: --aspect:unknownflag"
112-
}
112+
}
113+
114+
@test 'startup flags in .bazelrc should not permanently kill bazel server' {
115+
run aspect info
116+
refute_output --partial "WARNING: Running Bazel server needs to be killed, because the startup options are different."
117+
118+
echo "startup --noidle_server_tasks" > .bazelrc
119+
120+
run aspect info
121+
assert_output --partial "WARNING: Running Bazel server needs to be killed, because the startup options are different."
122+
123+
run aspect info
124+
refute_output --partial "WARNING: Running Bazel server needs to be killed, because the startup options are different."
125+
}

‎pkg/aspect/analyzeprofile/analyzeprofile.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ func (runner *AnalyzeProfile) Run(ctx context.Context, _ *cobra.Command, args []
4444
return err
4545
}
4646

47-
if exitCode, err := bzl.RunCommand(runner.Streams, bazelCmd...); exitCode != 0 {
47+
if exitCode, err := bzl.RunCommand(runner.Streams, nil, bazelCmd...); exitCode != 0 {
4848
err = &aspecterrors.ExitError{
4949
Err: err,
5050
ExitCode: exitCode,

‎pkg/aspect/aquery/aquery_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ func TestQuery(t *testing.T) {
4343
spawner := bazel_mock.NewMockBazel(ctrl)
4444
spawner.
4545
EXPECT().
46-
RunCommand(streams, "aquery", "somepath(//cmd/aspect/query:query, @com_github_bazelbuild_bazelisk//core:go_default_library)").
46+
RunCommand(streams, nil, "aquery", "somepath(//cmd/aspect/query:query, @com_github_bazelbuild_bazelisk//core:go_default_library)").
4747
Return(0, nil)
4848

4949
q := aquery.New(streams, spawner, true)
@@ -71,7 +71,7 @@ func TestQuery(t *testing.T) {
7171
spawner := bazel_mock.NewMockBazel(ctrl)
7272
spawner.
7373
EXPECT().
74-
RunCommand(streams, "aquery", "somepath(//cmd/aspect/query:query, @com_github_bazelbuild_bazelisk//core:go_default_library)").
74+
RunCommand(streams, nil, "aquery", "somepath(//cmd/aspect/query:query, @com_github_bazelbuild_bazelisk//core:go_default_library)").
7575
Return(0, nil)
7676

7777
promptRunner := query_mock.NewMockPromptRunner(ctrl)
@@ -167,7 +167,7 @@ func TestQuery(t *testing.T) {
167167
spawner := bazel_mock.NewMockBazel(ctrl)
168168
spawner.
169169
EXPECT().
170-
RunCommand(streams, "aquery", "somepath(//cmd/aspect/query:query, @com_github_bazelbuild_bazelisk//core:go_default_library)").
170+
RunCommand(streams, nil, "aquery", "somepath(//cmd/aspect/query:query, @com_github_bazelbuild_bazelisk//core:go_default_library)").
171171
Return(0, nil)
172172

173173
promptRunner := query_mock.NewMockPromptRunner(ctrl)

‎pkg/aspect/build/build.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ func New(
4646
// Event Protocol backend used by Aspect plugins to subscribe to build events.
4747
func (runner *Build) Run(args []string, besBackend bep.BESBackend) (exitErr error) {
4848
besBackendFlag := fmt.Sprintf("--bes_backend=%s", besBackend.Addr())
49-
exitCode, bazelErr := runner.bzl.RunCommand(runner.Streams, append([]string{"build", besBackendFlag}, args...)...)
49+
exitCode, bazelErr := runner.bzl.RunCommand(runner.Streams, nil, append([]string{"build", besBackendFlag}, args...)...)
5050

5151
// Process the subscribers errors before the Bazel one.
5252
subscriberErrors := besBackend.Errors()

‎pkg/aspect/build/build_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ func TestBuild(t *testing.T) {
4545
}
4646
bzl.
4747
EXPECT().
48-
RunCommand(streams, "build", "--bes_backend=grpc://127.0.0.1:12345", "//...").
48+
RunCommand(streams, nil, "build", "--bes_backend=grpc://127.0.0.1:12345", "//...").
4949
Return(expectErr.ExitCode, expectErr.Err)
5050
besBackend := bep_mock.NewMockBESBackend(ctrl)
5151
besBackend.
@@ -74,7 +74,7 @@ func TestBuild(t *testing.T) {
7474
bzl := bazel_mock.NewMockBazel(ctrl)
7575
bzl.
7676
EXPECT().
77-
RunCommand(streams, "build", "--bes_backend=grpc://127.0.0.1:12345", "//...").
77+
RunCommand(streams, nil, "build", "--bes_backend=grpc://127.0.0.1:12345", "//...").
7878
Return(0, nil)
7979
besBackend := bep_mock.NewMockBESBackend(ctrl)
8080
besBackend.
@@ -107,7 +107,7 @@ func TestBuild(t *testing.T) {
107107
bzl := bazel_mock.NewMockBazel(ctrl)
108108
bzl.
109109
EXPECT().
110-
RunCommand(streams, "build", "--bes_backend=grpc://127.0.0.1:12345", "//...").
110+
RunCommand(streams, nil, "build", "--bes_backend=grpc://127.0.0.1:12345", "//...").
111111
Return(0, nil)
112112
besBackend := bep_mock.NewMockBESBackend(ctrl)
113113
besBackend.

‎pkg/aspect/canonicalizeflags/canonicalizeflags.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ func (runner *CanonicalizeFlags) Run(ctx context.Context, _ *cobra.Command, args
4444
return err
4545
}
4646

47-
if exitCode, err := bzl.RunCommand(runner.Streams, bazelCmd...); exitCode != 0 {
47+
if exitCode, err := bzl.RunCommand(runner.Streams, nil, bazelCmd...); exitCode != 0 {
4848
err = &aspecterrors.ExitError{
4949
Err: err,
5050
ExitCode: exitCode,

‎pkg/aspect/clean/clean.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ func (runner *Clean) Run(cmd *cobra.Command, args []string) error {
107107

108108
bazelCmd := []string{"clean"}
109109
bazelCmd = append(bazelCmd, flags...)
110-
if exitCode, err := runner.bzl.RunCommand(runner.Streams, bazelCmd...); exitCode != 0 {
110+
if exitCode, err := runner.bzl.RunCommand(runner.Streams, nil, bazelCmd...); exitCode != 0 {
111111
err = &aspecterrors.ExitError{
112112
Err: err,
113113
ExitCode: exitCode,
@@ -261,6 +261,7 @@ func (runner *Clean) findDiskCaches(
261261
// This will ensure it returns quickly and allows us to easily access said flag.
262262
runner.bzl.RunCommand(
263263
streams,
264+
nil,
264265
"query",
265266
"//",
266267
"--build_event_json_file="+bepLocation,

‎pkg/aspect/clean/clean_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ func TestClean(t *testing.T) {
5151
bzl := mock.NewMockBazel(ctrl)
5252
bzl.
5353
EXPECT().
54-
RunCommand(streams, "clean").
54+
RunCommand(streams, nil, "clean").
5555
Return(0, nil)
5656

5757
b := clean.New(streams, bzl)

‎pkg/aspect/coverage/coverage.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ func (runner *Coverage) Run(args []string, besBackend bep.BESBackend) (exitErr e
4242
bazelCmd := []string{"coverage", besBackendFlag}
4343
bazelCmd = append(bazelCmd, args...)
4444

45-
exitCode, bazelErr := runner.bzl.RunCommand(runner.Streams, bazelCmd...)
45+
exitCode, bazelErr := runner.bzl.RunCommand(runner.Streams, nil, bazelCmd...)
4646

4747
// Process the subscribers errors before the Bazel one.
4848
subscriberErrors := besBackend.Errors()

‎pkg/aspect/cquery/cquery_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ func TestQuery(t *testing.T) {
4343
spawner := bazel_mock.NewMockBazel(ctrl)
4444
spawner.
4545
EXPECT().
46-
RunCommand(streams, "cquery", "somepath(//cmd/aspect/query:query, @com_github_bazelbuild_bazelisk//core:go_default_library)").
46+
RunCommand(streams, nil, "cquery", "somepath(//cmd/aspect/query:query, @com_github_bazelbuild_bazelisk//core:go_default_library)").
4747
Return(0, nil)
4848

4949
q := cquery.New(streams, spawner, true)
@@ -71,7 +71,7 @@ func TestQuery(t *testing.T) {
7171
spawner := bazel_mock.NewMockBazel(ctrl)
7272
spawner.
7373
EXPECT().
74-
RunCommand(streams, "cquery", "somepath(//cmd/aspect/query:query, @com_github_bazelbuild_bazelisk//core:go_default_library)").
74+
RunCommand(streams, nil, "cquery", "somepath(//cmd/aspect/query:query, @com_github_bazelbuild_bazelisk//core:go_default_library)").
7575
Return(0, nil)
7676

7777
promptRunner := query_mock.NewMockPromptRunner(ctrl)
@@ -167,7 +167,7 @@ func TestQuery(t *testing.T) {
167167
spawner := bazel_mock.NewMockBazel(ctrl)
168168
spawner.
169169
EXPECT().
170-
RunCommand(streams, "cquery", "somepath(//cmd/aspect/query:query, @com_github_bazelbuild_bazelisk//core:go_default_library)").
170+
RunCommand(streams, nil, "cquery", "somepath(//cmd/aspect/query:query, @com_github_bazelbuild_bazelisk//core:go_default_library)").
171171
Return(0, nil)
172172

173173
promptRunner := query_mock.NewMockPromptRunner(ctrl)

‎pkg/aspect/docs/docs.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ func (runner *Docs) Run(_ *cobra.Command, args []string) error {
4343
// Detect requests for docs on rules, which we host.
4444
// Also, special case `bazel-` as this is likely bazel-lib or bazel-skylib
4545
if len(args) == 1 {
46-
if strings.HasPrefix(args[0], "rules_") || strings.HasPrefix(args[0], "bazel-") {
47-
dest = fmt.Sprintf("https://docs.aspect.build/%s", args[0])
46+
if strings.HasPrefix(args[0], "contrib_") || strings.HasPrefix(args[0], "aspect_rules_") || strings.HasPrefix(args[0], "rules_") || strings.HasPrefix(args[0], "bazel-") {
47+
dest = fmt.Sprintf("https://docs.aspect.build/rules/%s", args[0])
4848
} else {
4949
dest = fmt.Sprintf("https://bazel.build/reference/%s.html", args[0])
5050
}

‎pkg/aspect/dump/dump.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ func (runner *Dump) Run(ctx context.Context, _ *cobra.Command, args []string) er
4444
return err
4545
}
4646

47-
if exitCode, err := bzl.RunCommand(runner.Streams, bazelCmd...); exitCode != 0 {
47+
if exitCode, err := bzl.RunCommand(runner.Streams, nil, bazelCmd...); exitCode != 0 {
4848
err = &aspecterrors.ExitError{
4949
Err: err,
5050
ExitCode: exitCode,

‎pkg/aspect/fetch/fetch.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ func (runner *Fetch) Run(ctx context.Context, _ *cobra.Command, args []string) e
4343
return err
4444
}
4545

46-
if exitCode, err := bzl.RunCommand(runner.Streams, bazelCmd...); exitCode != 0 {
46+
if exitCode, err := bzl.RunCommand(runner.Streams, nil, bazelCmd...); exitCode != 0 {
4747
err = &aspecterrors.ExitError{
4848
Err: err,
4949
ExitCode: exitCode,

‎pkg/aspect/info/info.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ func (runner *Info) Run(ctx context.Context, _ *cobra.Command, args []string) er
4444
return err
4545
}
4646

47-
if exitCode, err := bzl.RunCommand(runner.Streams, bazelCmd...); exitCode != 0 {
47+
if exitCode, err := bzl.RunCommand(runner.Streams, nil, bazelCmd...); exitCode != 0 {
4848
err = &aspecterrors.ExitError{
4949
Err: err,
5050
ExitCode: exitCode,

‎pkg/aspect/license/license.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ func (runner *License) Run(ctx context.Context, _ *cobra.Command, args []string)
102102
return err
103103
}
104104

105-
if exitCode, err := bzl.RunCommand(runner.Streams, bazelCmd...); exitCode != 0 {
105+
if exitCode, err := bzl.RunCommand(runner.Streams, nil, bazelCmd...); exitCode != 0 {
106106
err = &aspecterrors.ExitError{
107107
Err: err,
108108
ExitCode: exitCode,

‎pkg/aspect/mobileinstall/mobileinstall.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ func (runner *MobileInstall) Run(ctx context.Context, _ *cobra.Command, args []s
4444
return err
4545
}
4646

47-
if exitCode, err := bzl.RunCommand(runner.Streams, bazelCmd...); exitCode != 0 {
47+
if exitCode, err := bzl.RunCommand(runner.Streams, nil, bazelCmd...); exitCode != 0 {
4848
err = &aspecterrors.ExitError{
4949
Err: err,
5050
ExitCode: exitCode,

‎pkg/aspect/modquery/modquery.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ func (runner *ModQuery) Run(ctx context.Context, _ *cobra.Command, args []string
4444
return err
4545
}
4646

47-
if exitCode, err := bzl.RunCommand(runner.Streams, bazelCmd...); exitCode != 0 {
47+
if exitCode, err := bzl.RunCommand(runner.Streams, nil, bazelCmd...); exitCode != 0 {
4848
err = &aspecterrors.ExitError{
4949
Err: err,
5050
ExitCode: exitCode,

‎pkg/aspect/printaction/printaction.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ func (runner *PrintAction) Run(ctx context.Context, _ *cobra.Command, args []str
4444
return err
4545
}
4646

47-
if exitCode, err := bzl.RunCommand(runner.Streams, bazelCmd...); exitCode != 0 {
47+
if exitCode, err := bzl.RunCommand(runner.Streams, nil, bazelCmd...); exitCode != 0 {
4848
err = &aspecterrors.ExitError{
4949
Err: err,
5050
ExitCode: exitCode,

‎pkg/aspect/query/query_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ func TestQuery(t *testing.T) {
4545
spawner := bazel_mock.NewMockBazel(ctrl)
4646
spawner.
4747
EXPECT().
48-
RunCommand(streams, "query", "somepath(//cmd/aspect/query:query, @com_github_bazelbuild_bazelisk//core:go_default_library)").
48+
RunCommand(streams, nil, "query", "somepath(//cmd/aspect/query:query, @com_github_bazelbuild_bazelisk//core:go_default_library)").
4949
Return(0, nil)
5050

5151
q := query.New(streams, spawner, true)
@@ -81,7 +81,7 @@ func TestQuery(t *testing.T) {
8181
spawner := bazel_mock.NewMockBazel(ctrl)
8282
spawner.
8383
EXPECT().
84-
RunCommand(streams, "query", "somepath(//cmd/aspect/query:query, @com_github_bazelbuild_bazelisk//core:go_default_library)").
84+
RunCommand(streams, nil, "query", "somepath(//cmd/aspect/query:query, @com_github_bazelbuild_bazelisk//core:go_default_library)").
8585
Return(0, nil)
8686

8787
promptRunner := query_mock.NewMockPromptRunner(ctrl)
@@ -226,7 +226,7 @@ func TestQuery(t *testing.T) {
226226
spawner := bazel_mock.NewMockBazel(ctrl)
227227
spawner.
228228
EXPECT().
229-
RunCommand(streams, "query", "somepath(//cmd/aspect/query:query, @com_github_bazelbuild_bazelisk//core:go_default_library)").
229+
RunCommand(streams, nil, "query", "somepath(//cmd/aspect/query:query, @com_github_bazelbuild_bazelisk//core:go_default_library)").
230230
Return(0, nil)
231231

232232
promptRunner := query_mock.NewMockPromptRunner(ctrl)

‎pkg/aspect/query/shared/query.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ func RunQuery(bzl bazel.Bazel, command string, streams ioutils.Streams, args []s
168168
bazelCmd := []string{command}
169169
bazelCmd = append(bazelCmd, args...)
170170

171-
if exitCode, err := bzl.RunCommand(streams, bazelCmd...); exitCode != 0 {
171+
if exitCode, err := bzl.RunCommand(streams, nil, bazelCmd...); exitCode != 0 {
172172
err = &aspecterrors.ExitError{
173173
Err: err,
174174
ExitCode: exitCode,

‎pkg/aspect/run/run.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ func New(
4646
// Event Protocol backend used by Aspect plugins to subscribe to build events.
4747
func (runner *Run) Run(args []string, besBackend bep.BESBackend) (exitErr error) {
4848
besBackendFlag := fmt.Sprintf("--bes_backend=%s", besBackend.Addr())
49-
exitCode, bazelErr := runner.bzl.RunCommand(runner.Streams, append([]string{"run", besBackendFlag}, args...)...)
49+
exitCode, bazelErr := runner.bzl.RunCommand(runner.Streams, nil, append([]string{"run", besBackendFlag}, args...)...)
5050

5151
// Process the subscribers errors before the Bazel one.
5252
subscriberErrors := besBackend.Errors()

‎pkg/aspect/run/run_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ func TestRun(t *testing.T) {
4545
}
4646
bzl.
4747
EXPECT().
48-
RunCommand(streams, "run", "--bes_backend=grpc://127.0.0.1:12345", "//...").
48+
RunCommand(streams, nil, "run", "--bes_backend=grpc://127.0.0.1:12345", "//...").
4949
Return(expectErr.ExitCode, expectErr.Err)
5050
besBackend := bep_mock.NewMockBESBackend(ctrl)
5151
besBackend.
@@ -74,7 +74,7 @@ func TestRun(t *testing.T) {
7474
bzl := bazel_mock.NewMockBazel(ctrl)
7575
bzl.
7676
EXPECT().
77-
RunCommand(streams, "run", "--bes_backend=grpc://127.0.0.1:12345", "//...").
77+
RunCommand(streams, nil, "run", "--bes_backend=grpc://127.0.0.1:12345", "//...").
7878
Return(0, nil)
7979
besBackend := bep_mock.NewMockBESBackend(ctrl)
8080
besBackend.
@@ -107,7 +107,7 @@ func TestRun(t *testing.T) {
107107
bzl := bazel_mock.NewMockBazel(ctrl)
108108
bzl.
109109
EXPECT().
110-
RunCommand(streams, "run", "--bes_backend=grpc://127.0.0.1:12345", "//...").
110+
RunCommand(streams, nil, "run", "--bes_backend=grpc://127.0.0.1:12345", "//...").
111111
Return(0, nil)
112112
besBackend := bep_mock.NewMockBESBackend(ctrl)
113113
besBackend.

‎pkg/aspect/shutdown/shutdown.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ func (runner *Shutdown) Run(ctx context.Context, _ *cobra.Command, args []string
4444
return err
4545
}
4646

47-
if exitCode, err := bzl.RunCommand(runner.Streams, bazelCmd...); exitCode != 0 {
47+
if exitCode, err := bzl.RunCommand(runner.Streams, nil, bazelCmd...); exitCode != 0 {
4848
err = &aspecterrors.ExitError{
4949
Err: err,
5050
ExitCode: exitCode,

‎pkg/aspect/sync/sync.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ func (runner *Sync) Run(ctx context.Context, _ *cobra.Command, args []string) er
4444
return err
4545
}
4646

47-
if exitCode, err := bzl.RunCommand(runner.Streams, bazelCmd...); exitCode != 0 {
47+
if exitCode, err := bzl.RunCommand(runner.Streams, nil, bazelCmd...); exitCode != 0 {
4848
err = &aspecterrors.ExitError{
4949
Err: err,
5050
ExitCode: exitCode,

‎pkg/aspect/test/test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ func (runner *Test) Run(args []string, besBackend bep.BESBackend) (exitErr error
4242
bazelCmd := []string{"test", besBackendFlag}
4343
bazelCmd = append(bazelCmd, args...)
4444

45-
exitCode, bazelErr := runner.bzl.RunCommand(runner.Streams, bazelCmd...)
45+
exitCode, bazelErr := runner.bzl.RunCommand(runner.Streams, nil, bazelCmd...)
4646

4747
// Process the subscribers errors before the Bazel one.
4848
subscriberErrors := besBackend.Errors()

‎pkg/aspect/test/test_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ func TestTest(t *testing.T) {
3939
bzl := mock.NewMockBazel(ctrl)
4040
bzl.
4141
EXPECT().
42-
RunCommand(streams, "test", "--bes_backend=grpc://127.0.0.1:12345").
42+
RunCommand(streams, nil, "test", "--bes_backend=grpc://127.0.0.1:12345").
4343
Return(0, nil)
4444

4545
besBackend := bep_mock.NewMockBESBackend(ctrl)

‎pkg/aspect/version/version.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ func (runner *Version) Run(cmd *cobra.Command, bzl bazel.Bazel, args []string) e
6565

6666
bazelCmd := []string{"version"}
6767
bazelCmd = append(bazelCmd, args...)
68-
if exitCode, err := bzl.RunCommand(runner.Streams, bazelCmd...); exitCode != 0 {
68+
if exitCode, err := bzl.RunCommand(runner.Streams, nil, bazelCmd...); exitCode != 0 {
6969
err = &aspecterrors.ExitError{
7070
Err: err,
7171
ExitCode: exitCode,

‎pkg/aspect/version/version_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ func TestVersion(t *testing.T) {
4848
bzl := bazel_mock.NewMockBazel(ctrl)
4949
bzl.
5050
EXPECT().
51-
RunCommand(streams, "version").
51+
RunCommand(streams, nil, "version").
5252
Return(0, nil)
5353

5454
v := version.New(streams)
@@ -66,7 +66,7 @@ func TestVersion(t *testing.T) {
6666
bzl := bazel_mock.NewMockBazel(ctrl)
6767
bzl.
6868
EXPECT().
69-
RunCommand(streams, "version", "--gnu_format").
69+
RunCommand(streams, nil, "version", "--gnu_format").
7070
Return(0, nil)
7171

7272
v := version.New(streams)

0 commit comments

Comments
 (0)