WIP: Upgrade bazel version

Author: janwinkler1

.bazelversion

@@ -1 +1 @@
-7.6.1
+8.2.1

MODULE.bazel

@@ -1,9 +1,10 @@
 module(name = "bazel_watcher")
 
-bazel_dep(name = "bazel_skylib", version = "1.6.1")
-bazel_dep(name = "rules_proto", version = "5.3.0-21.7")
-bazel_dep(name = "rules_go", version = "0.53.0", repo_name = "io_bazel_rules_go")
-bazel_dep(name = "gazelle", version = "0.34.0", repo_name = "bazel_gazelle")
+bazel_dep(name = "bazel_skylib", version = "1.7.1")
+bazel_dep(name = "rules_proto", version = "7.0.2")
+bazel_dep(name = "rules_go", version = "0.55.1", repo_name = "io_bazel_rules_go")
+bazel_dep(name = "gazelle", version = "0.36.0", repo_name = "bazel_gazelle")
+bazel_dep(name = "bazel_features", version = "1.21.0")
 
 # Configure Go SDK
 go_sdk = use_extension("@io_bazel_rules_go//go:extensions.bzl", "go_sdk")

MODULE.bazel.lock

@@ -29,12 +29,15 @@ var Version = "Development"
 
 var overrideableStartupFlags []string = []string{
 	"--bazelrc",
+	"--bazelrc=",
+	"--nobazelrc", 
 	"--home_rc",
 	"--nohome_rc",
 	"--output_base",
 }
 
 var overrideableBazelFlags []string = []string{
+	"--announce_rc",
 	"--action_env",
 	"--announce_rc",
 	"--aspects",
@@ -53,6 +56,9 @@ var overrideableBazelFlags []string = []string{
 	"--define=",
 	"--dynamic_mode=",
 	"--enable_bzlmod=",
+	"--enable_bzlmod",
+	"--enable_workspace",
+	"--enable_workspace=",
 	"--features=",
 	"--flaky_test_attempts=",
 	"--host_jvmopt",
@@ -62,6 +68,7 @@ var overrideableBazelFlags []string = []string{
 	"-k",
 	"--nocache_test_results",
 	"--noenable_bzlmod",
+	"--noenable_workspace",
 	"--nostamp",
 	"--output_groups=",
 	"--override_repository=",
@@ -157,6 +164,7 @@ func parseArgs(in []string) (targets, startupArgs, bazelArgs, args []string) {
 			if isOverrideableStartupFlag(arg) {
 				startupArgs = append(startupArgs, arg)
 			} else if isOverrideableBazelFlag(arg) {
+				println("overriding bazel flag: %s", arg)
 				bazelArgs = append(bazelArgs, arg)
 			} else {
 				// If none of those things then it's probably a target.
@@ -213,7 +221,7 @@ func applyDefaultBazelArgs(bazelArgs []string) []string {
 			return bazelArgs
 		}
 	}
-	if (isTerminal()) {
+	if isTerminal() {
 		return append(bazelArgs, "--isatty=1")
 	} else {
 		return append(bazelArgs, "--isatty=0")

cmd/ibazel/main.go

@@ -1,7 +1,6 @@
 module github.com/bazelbuild/bazel-watcher
 
 require (
-	github.com/bazelbuild/rules_go v0.55.1
 	github.com/fsnotify/fsevents v0.1.1
 	github.com/fsnotify/fsnotify v1.9.0
 	github.com/golang/protobuf v1.5.4
@@ -14,8 +13,9 @@ require (
 )
 
 require (
-	golang.org/x/sys v0.28.0
-	golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d
+	github.com/bazelbuild/rules_go v0.55.1
+	golang.org/x/sys v0.30.0
+	golang.org/x/tools v0.30.0
 )
 
 require google.golang.org/protobuf v1.36.3 // indirect

go.mod

@@ -1,5 +1,3 @@
-github.com/bazelbuild/rules_go v0.53.0 h1:u160DT+RRb+Xb2aSO4piN8xhs4aZvWz2UDXCq48F4ao=
-github.com/bazelbuild/rules_go v0.53.0/go.mod h1:xB1jfsYHWlnZyPPxzlOSst4q2ZAwS251Mp9Iw6TPuBc=
 github.com/bazelbuild/rules_go v0.55.1 h1:cQYGcunY8myOB+0Ym6PGQRhc/milkRcNv0my3XgxaDU=
 github.com/bazelbuild/rules_go v0.55.1/go.mod h1:T90Gpyq4HDFlsrvtQa2CBdHNJ2P4rAu/uUTmQbanzf0=
 github.com/fsnotify/fsevents v0.1.1 h1:/125uxJvvoSDDBPen6yUZbil8J9ydKZnnl3TWWmvnkw=
@@ -27,12 +25,12 @@ github.com/smartystreets/goconvey v1.7.2/go.mod h1:Vw0tHAZW6lzCRk3xgdin6fKYcG+G3
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
-golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
+golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg=
-golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
+golang.org/x/tools v0.30.0 h1:BgcpHewrV5AUp2G9MebG4XPFI1E2W41zU1SaqVA9vJY=
+golang.org/x/tools v0.30.0/go.mod h1:c347cR/OJfw5TI+GfX7RUPNMdDRRbjvYTS0jPyvsVtY=
 google.golang.org/protobuf v1.36.3 h1:82DV7MYdb8anAVi3qge1wSnMDrnKK7ebr+I0hHRN1BU=
 google.golang.org/protobuf v1.36.3/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
 gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=

go.sum

@@ -383,10 +383,14 @@ func (b *bazel) Test(args ...string) (*bytes.Buffer, error) {
 func (b *bazel) Run(args ...string) (*exec.Cmd, *bytes.Buffer, error) {
 	b.WriteToStderr(true)
 	b.WriteToStdout(true)
-	stdoutBuffer, stderrBuffer := b.newCommand("run", append(b.args, args...)...)
+	runArgs := append(b.args, args...)
+	stdoutBuffer, stderrBuffer := b.newCommand("run",runArgs...)
 	b.cmd.Stdin = os.Stdin
 
-	_, _ = stdoutBuffer.Write(stderrBuffer.Bytes())
+	if _, err:=
+	stdoutBuffer.Write(stderrBuffer.Bytes()); err != nil {
+		return nil, nil, fmt.Errorf("sdout.write(): %w", err)
+	}
 
 	err := b.cmd.Run()
 	if err != nil {

internal/bazel/bazel.go

@@ -22,6 +22,16 @@ const (
 	defaultDelay = 50 * time.Second
 )
 
+var defaultFlags = []string{
+	"--graceful_termination_wait_duration=1s",
+}
+
+var defaultStartupFlags = []string{
+	"--enable_workspace",
+	"--bazelrc=/dev/null",
+}
+
+
 type IBazelTester struct {
 	t             *testing.T
 	ibazelLogFile string
@@ -35,7 +45,7 @@ type IBazelTester struct {
 }
 
 func NewIBazelTester(t *testing.T) *IBazelTester {
-	f, err := ioutil.TempFile("", "ibazel_output.*.log")
+	f, err := os.CreateTemp("", "ibazel_output.*.log")
 	if err != nil {
 		panic(fmt.Sprintf("Error ioutil.Tempfile: %v", err))
 	}
@@ -66,13 +76,14 @@ func (i *IBazelTester) Test(bazelArgs []string, targets ...string) {
 	args := []string{"--bazel_path=" + i.bazelPath()}
 	args = append(args,
 		"--log_to_file="+i.ibazelLogFile,
-		"--graceful_termination_wait_duration=1s")
+		)
 	args = append(args, "test")
-	args = append(args, "--bazelrc=/dev/null")
+	args = append(args, defaultStartupFlags...)
 	args = append(args, targets...)
 	args = append(args, bazelArgs...)
 	i.cmd = exec.Command(ibazelPath, args...)
-	i.t.Logf("ibazel invoked as: %s", strings.Join(i.cmd.Args, " "))
+	i.t.Logf("ibazel invoked in %s as: %s", i.cmd.Dir,
+		strings.Join(i.cmd.Args, " "))
 
 	i.stdoutBuffer = &Buffer{}
 	i.cmd.Stdout = i.stdoutBuffer
@@ -89,15 +100,17 @@ func (i *IBazelTester) Coverage(bazelArgs []string, targets ...string) {
 	i.t.Helper()
 
 	args := []string{"--bazel_path=" + i.bazelPath()}
+	args = append(args, defaultFlags...)
 	args = append(args,
 		"--log_to_file="+i.ibazelLogFile,
-		"--graceful_termination_wait_duration=1s")
+		)
 	args = append(args, "coverage")
-	args = append(args, "--bazelrc=/dev/null")
+	args = append(args, defaultStartupFlags...)
 	args = append(args, targets...)
 	args = append(args, bazelArgs...)
 	i.cmd = exec.Command(ibazelPath, args...)
-	i.t.Logf("ibazel invoked as: %s", strings.Join(i.cmd.Args, " "))
+	i.t.Logf("ibazel invoked in %s as: %s", i.cmd.Dir,
+		strings.Join(i.cmd.Args, " "))
 
 	i.stdoutBuffer = &Buffer{}
 	i.cmd.Stdout = i.stdoutBuffer
@@ -112,19 +125,17 @@ func (i *IBazelTester) Coverage(bazelArgs []string, targets ...string) {
 
 func (i *IBazelTester) Run(bazelArgs []string, target string) {
 	i.t.Helper()
-	i.run(target, bazelArgs, []string{
-		"--log_to_file=" + i.ibazelLogFile,
-		"--graceful_termination_wait_duration=1s",
-	})
+	i.run(target, bazelArgs, append(defaultFlags,
+		"--log_to_file="+i.ibazelLogFile,
+		))
 }
 
 func (i *IBazelTester) RunWithProfiler(target string, profiler string) {
 	i.t.Helper()
-	i.run(target, []string{}, []string{
-		"--log_to_file=" + i.ibazelLogFile,
-		"--graceful_termination_wait_duration=1s",
-		"--profile_dev=" + profiler,
-	})
+	i.run(target, []string{}, append(defaultFlags,
+		"--log_to_file="+i.ibazelLogFile,
+		"--profile_dev="+profiler,
+		))
 }
 
 func (i *IBazelTester) RunWithBazelFixCommands(target string) {
@@ -415,11 +426,13 @@ func (i *IBazelTester) runUnverified(target string, bazelArgs []string, addition
 	args := []string{"--bazel_path=" + i.bazelPath()}
 	args = append(args, additionalArgs...)
 	args = append(args, "run")
-	args = append(args, "--bazelrc=/dev/null")
+
 	args = append(args, target)
 	args = append(args, bazelArgs...)
 	i.cmd = exec.Command(ibazelPath, args...)
-	i.t.Logf("ibazel invoked as: %s", strings.Join(i.cmd.Args, " "))
+	i.t.Logf("ibazel invoked in %s as: %s in: %s",
+		i.cmd.Dir, strings.Join(i.cmd.Args, " "),
+		os.Getenv("TEST_TMPDIR"))
 
 	checkArgs := []string{"build"}
 	checkArgs = append(checkArgs, target)
@@ -436,6 +449,8 @@ func (i *IBazelTester) runUnverified(target string, bazelArgs []string, addition
 			if exitErr, ok := err.(*exec.ExitError); ok {
 				status := exitErr.Sys().(syscall.WaitStatus)
 				i.t.Fatalf("Unable to build target. Error code: %d\nStdout:\n%s\nStderr:\n%s", status.ExitStatus(), buildStdout.String(), buildStderr.String())
+			} else {
+				i.t.Fatalf("Unable to build target. %v", err)
 			}
 		}
 	}

internal/e2e/ibazel.go

@@ -1,6 +1,6 @@
-load("@rules_proto//proto:defs.bzl", "proto_library")
 load("@io_bazel_rules_go//go:def.bzl", "go_library")
 load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library")
+load("@rules_proto//proto:defs.bzl", "proto_library")
 
 proto_library(
     name = "analysis_proto",

third_party/bazel/master/src/main/protobuf/analysis/BUILD.bazel

@@ -1,6 +1,6 @@
-load("@rules_proto//proto:defs.bzl", "proto_library")
 load("@io_bazel_rules_go//go:def.bzl", "go_library")
 load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library")
+load("@rules_proto//proto:defs.bzl", "proto_library")
 
 proto_library(
     name = "blaze_query_proto",