chore: upgrade gazelle to v0.46.0-rc2 (#119)

jbedard · web-flow · commit 4a3c2d2f2d03 · 2025-10-29T15:27:23.000-07:00
### Changes are visible to end-users: no

### Test plan

- Covered by existing test cases
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -4,7 +4,7 @@ module(
 )
 
 bazel_dep(name = "rules_go", version = "0.56.1")
-bazel_dep(name = "gazelle", version = "0.45.0")
+bazel_dep(name = "gazelle", version = "0.45.0")  # must match go.mod
 
 # Go modules
 go_deps = use_extension("@gazelle//:extensions.bzl", "go_deps")
diff --git a/common/go.mod b/common/go.mod
@@ -3,7 +3,7 @@ module github.com/aspect-build/aspect-gazelle/common
 go 1.24.5
 
 require (
-	github.com/bazelbuild/bazel-gazelle v0.45.0
+	github.com/bazelbuild/bazel-gazelle v0.46.0-rc2
 	github.com/bazelbuild/buildtools v0.0.0-20250930140053-2eb4fccefb52
 	github.com/bmatcuk/doublestar/v4 v4.9.1
 	github.com/emirpasic/gods v1.18.1
diff --git a/common/go.sum b/common/go.sum
@@ -1,7 +1,7 @@
 github.com/Masterminds/semver/v3 v3.4.0 h1:Zog+i5UMtVoCU8oKka5P7i9q9HgrJeGzI9SA1Xbatp0=
 github.com/Masterminds/semver/v3 v3.4.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM=
-github.com/bazelbuild/bazel-gazelle v0.45.0 h1:ZfbDRyNppw0Sd42lXVX7ybar63MJofb58Yvl4SvbtYY=
-github.com/bazelbuild/bazel-gazelle v0.45.0/go.mod h1:XdBdWhrTc5x50CKzKXOcwrZWdLuX58IX1KcSaWPtEGo=
+github.com/bazelbuild/bazel-gazelle v0.46.0-rc2 h1:opKbd+Bj7ZKtlYJF1JqE9W4OVDvFEZogj2ncVtrLpOU=
+github.com/bazelbuild/bazel-gazelle v0.46.0-rc2/go.mod h1:8Ozf20jhv+in87nCUHdmUPPcVGTfKg/gotZ/hce3T+w=
 github.com/bazelbuild/buildtools v0.0.0-20250930140053-2eb4fccefb52 h1:njQAmjTv/YHRm/0Lfv9DXHFZ4MdT2IA/RKHTnqZkgDw=
 github.com/bazelbuild/buildtools v0.0.0-20250930140053-2eb4fccefb52/go.mod h1:PLNUetjLa77TCCziPsz0EI8a6CUxgC+1jgmWv0H25tg=
 github.com/bazelbuild/rules_go v0.56.1 h1:YOyW1J8kdvJl1AzlWrR+qikC6EPiFVbT4l1gjTBfXT0=
diff --git a/go.work.sum b/go.work.sum
@@ -253,6 +253,7 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
+go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
 go.opentelemetry.io/contrib/detectors/gcp v1.32.0/go.mod h1:TVqo0Sda4Cv8gCIixd7LuLwW4EylumVWfhjZJjDD4DU=
 go.opentelemetry.io/contrib/detectors/gcp v1.34.0/go.mod h1:cV4BMFcscUR/ckqLkbfQmF0PRsq8w/lMGzdbCSveBHo=
 go.opentelemetry.io/otel v1.32.0/go.mod h1:00DCVSB0RQcnzlwyTfqtxSm+DRr9hpYrHjNGiBHVQIg=
@@ -290,6 +291,7 @@ golang.org/x/mod v0.20.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/mod v0.23.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
 golang.org/x/mod v0.25.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=
 golang.org/x/mod v0.27.0/go.mod h1:rWI627Fq0DEoudcK+MBkNkCe0EetEaDSwJJkCcjpazc=
+golang.org/x/mod v0.28.0/go.mod h1:yfB/L0NOf/kmEbXjzCPOx1iK1fRutOydrCMsqRhEBxI=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -304,6 +306,7 @@ golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
 golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=
 golang.org/x/net v0.35.0/go.mod h1:EglIi67kWsHKlRzzVMUD93VMSWGFOMSZgxFjparz1Qk=
 golang.org/x/net v0.37.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
+golang.org/x/net v0.44.0/go.mod h1:ECOoLqd5U3Lhyeyo/QDCEVQ4sNgYsqvCZ722XogGieY=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.24.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
 golang.org/x/oauth2 v0.25.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
@@ -329,6 +332,7 @@ golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
 golang.org/x/sys v0.35.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
+golang.org/x/sys v0.36.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
 golang.org/x/telemetry v0.0.0-20250710130107-8d8967aff50b/go.mod h1:4ZwOYna0/zsOKwuR5X/m0QFOJpSZvAxFfkQT+Erd9D4=
 golang.org/x/telemetry v0.0.0-20250807160809-1a19826ec488/go.mod h1:fGb/2+tgXXjhjHsTNdVEEMZNWA0quBnfrO+AfoDSAKw=
 golang.org/x/telemetry v0.0.0-20250908211612-aef8a434d053/go.mod h1:+nZKN+XVh4LCiA9DV3ywrzN4gumyCnKjau3NGb9SGoE=
diff --git a/language/js/MODULE.bazel b/language/js/MODULE.bazel
@@ -6,7 +6,7 @@ module(
 bazel_dep(name = "aspect_rules_js", version = "2.0.0")  # TODO: dev_dependency = True
 bazel_dep(name = "aspect_gazelle", version = "0.0.0")
 bazel_dep(name = "rules_go", version = "0.56.1")
-bazel_dep(name = "gazelle", version = "0.45.0")
+bazel_dep(name = "gazelle", version = "0.45.0")  # must match go.mod
 
 # Go modules
 go_deps = use_extension("@gazelle//:extensions.bzl", "go_deps")
diff --git a/language/js/go.mod b/language/js/go.mod
@@ -6,7 +6,7 @@ replace github.com/aspect-build/aspect-gazelle/common => ../../common
 
 require (
 	github.com/Masterminds/semver/v3 v3.4.0
-	github.com/bazelbuild/bazel-gazelle v0.45.0 // NOTE: keep in sync with MODULE.bazel
+	github.com/bazelbuild/bazel-gazelle v0.46.0-rc2 // NOTE: keep in sync with MODULE.bazel
 	github.com/bazelbuild/buildtools v0.0.0-20250930140053-2eb4fccefb52
 	github.com/bmatcuk/doublestar/v4 v4.9.1
 	github.com/emirpasic/gods v1.18.1
diff --git a/language/js/go.sum b/language/js/go.sum
@@ -1,7 +1,7 @@
 github.com/Masterminds/semver/v3 v3.4.0 h1:Zog+i5UMtVoCU8oKka5P7i9q9HgrJeGzI9SA1Xbatp0=
 github.com/Masterminds/semver/v3 v3.4.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM=
-github.com/bazelbuild/bazel-gazelle v0.45.0 h1:ZfbDRyNppw0Sd42lXVX7ybar63MJofb58Yvl4SvbtYY=
-github.com/bazelbuild/bazel-gazelle v0.45.0/go.mod h1:XdBdWhrTc5x50CKzKXOcwrZWdLuX58IX1KcSaWPtEGo=
+github.com/bazelbuild/bazel-gazelle v0.46.0-rc2 h1:opKbd+Bj7ZKtlYJF1JqE9W4OVDvFEZogj2ncVtrLpOU=
+github.com/bazelbuild/bazel-gazelle v0.46.0-rc2/go.mod h1:8Ozf20jhv+in87nCUHdmUPPcVGTfKg/gotZ/hce3T+w=
 github.com/bazelbuild/buildtools v0.0.0-20250930140053-2eb4fccefb52 h1:njQAmjTv/YHRm/0Lfv9DXHFZ4MdT2IA/RKHTnqZkgDw=
 github.com/bazelbuild/buildtools v0.0.0-20250930140053-2eb4fccefb52/go.mod h1:PLNUetjLa77TCCziPsz0EI8a6CUxgC+1jgmWv0H25tg=
 github.com/bazelbuild/rules_go v0.56.1 h1:YOyW1J8kdvJl1AzlWrR+qikC6EPiFVbT4l1gjTBfXT0=
diff --git a/language/kotlin/MODULE.bazel b/language/kotlin/MODULE.bazel
@@ -5,7 +5,7 @@ module(
 
 bazel_dep(name = "aspect_gazelle", version = "0.0.0")
 bazel_dep(name = "rules_go", version = "0.56.1")
-bazel_dep(name = "gazelle", version = "0.45.0")
+bazel_dep(name = "gazelle", version = "0.45.0")  # must match go.mod
 bazel_dep(name = "contrib_rules_jvm", version = "0.30.0")
 
 # Go modules
diff --git a/language/kotlin/go.mod b/language/kotlin/go.mod
@@ -7,7 +7,7 @@ replace github.com/aspect-build/aspect-gazelle/common => ../../common
 require (
 	github.com/aspect-build/aspect-gazelle/common v0.0.0-00010101000000-000000000000
 	github.com/bazel-contrib/rules_jvm v0.30.0
-	github.com/bazelbuild/bazel-gazelle v0.45.0
+	github.com/bazelbuild/bazel-gazelle v0.46.0-rc2
 	github.com/emirpasic/gods v1.18.1
 	github.com/rs/zerolog v1.34.0
 )
diff --git a/language/kotlin/go.sum b/language/kotlin/go.sum
@@ -1,7 +1,7 @@
 github.com/bazel-contrib/rules_jvm v0.30.0 h1:GSKDLgH7hi5dpOwmdhE3SJEQzVtsv31i2IvSUWIkP5Q=
 github.com/bazel-contrib/rules_jvm v0.30.0/go.mod h1:HxRDtmRlh/ErR+2QlVwYs4BcIrB248HeheKi5uyKeN4=
-github.com/bazelbuild/bazel-gazelle v0.45.0 h1:ZfbDRyNppw0Sd42lXVX7ybar63MJofb58Yvl4SvbtYY=
-github.com/bazelbuild/bazel-gazelle v0.45.0/go.mod h1:XdBdWhrTc5x50CKzKXOcwrZWdLuX58IX1KcSaWPtEGo=
+github.com/bazelbuild/bazel-gazelle v0.46.0-rc2 h1:opKbd+Bj7ZKtlYJF1JqE9W4OVDvFEZogj2ncVtrLpOU=
+github.com/bazelbuild/bazel-gazelle v0.46.0-rc2/go.mod h1:8Ozf20jhv+in87nCUHdmUPPcVGTfKg/gotZ/hce3T+w=
 github.com/bazelbuild/buildtools v0.0.0-20250930140053-2eb4fccefb52 h1:njQAmjTv/YHRm/0Lfv9DXHFZ4MdT2IA/RKHTnqZkgDw=
 github.com/bazelbuild/buildtools v0.0.0-20250930140053-2eb4fccefb52/go.mod h1:PLNUetjLa77TCCziPsz0EI8a6CUxgC+1jgmWv0H25tg=
 github.com/bazelbuild/rules_go v0.56.1 h1:YOyW1J8kdvJl1AzlWrR+qikC6EPiFVbT4l1gjTBfXT0=
diff --git a/language/orion/MODULE.bazel b/language/orion/MODULE.bazel
@@ -5,7 +5,7 @@ module(
 
 bazel_dep(name = "aspect_gazelle", version = "0.0.0")
 bazel_dep(name = "rules_go", version = "0.56.1")
-bazel_dep(name = "gazelle", version = "0.45.0")
+bazel_dep(name = "gazelle", version = "0.45.0")  # must match go.mod
 
 # Go modules
 go_deps = use_extension("@gazelle//:extensions.bzl", "go_deps")
diff --git a/language/orion/go.mod b/language/orion/go.mod
@@ -5,7 +5,7 @@ go 1.24.5
 replace github.com/aspect-build/aspect-gazelle/common => ../../common
 
 require (
-	github.com/bazelbuild/bazel-gazelle v0.45.0 // NOTE: keep in sync with MODULE.bazel
+	github.com/bazelbuild/bazel-gazelle v0.46.0-rc2 // NOTE: keep in sync with MODULE.bazel
 	github.com/bazelbuild/buildtools v0.0.0-20250930140053-2eb4fccefb52
 	github.com/bmatcuk/doublestar/v4 v4.9.1
 	github.com/emirpasic/gods v1.18.1
diff --git a/language/orion/go.sum b/language/orion/go.sum
@@ -6,8 +6,8 @@ github.com/alecthomas/participle/v2 v2.1.4 h1:W/H79S8Sat/krZ3el6sQMvMaahJ+XcM9WS
 github.com/alecthomas/participle/v2 v2.1.4/go.mod h1:8tqVbpTX20Ru4NfYQgZf4mP18eXPTBViyMWiArNEgGI=
 github.com/alecthomas/repr v0.5.2 h1:SU73FTI9D1P5UNtvseffFSGmdNci/O6RsqzeXJtP0Qs=
 github.com/alecthomas/repr v0.5.2/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4=
-github.com/bazelbuild/bazel-gazelle v0.45.0 h1:ZfbDRyNppw0Sd42lXVX7ybar63MJofb58Yvl4SvbtYY=
-github.com/bazelbuild/bazel-gazelle v0.45.0/go.mod h1:XdBdWhrTc5x50CKzKXOcwrZWdLuX58IX1KcSaWPtEGo=
+github.com/bazelbuild/bazel-gazelle v0.46.0-rc2 h1:opKbd+Bj7ZKtlYJF1JqE9W4OVDvFEZogj2ncVtrLpOU=
+github.com/bazelbuild/bazel-gazelle v0.46.0-rc2/go.mod h1:8Ozf20jhv+in87nCUHdmUPPcVGTfKg/gotZ/hce3T+w=
 github.com/bazelbuild/buildtools v0.0.0-20250930140053-2eb4fccefb52 h1:njQAmjTv/YHRm/0Lfv9DXHFZ4MdT2IA/RKHTnqZkgDw=
 github.com/bazelbuild/buildtools v0.0.0-20250930140053-2eb4fccefb52/go.mod h1:PLNUetjLa77TCCziPsz0EI8a6CUxgC+1jgmWv0H25tg=
 github.com/bazelbuild/rules_go v0.56.1 h1:YOyW1J8kdvJl1AzlWrR+qikC6EPiFVbT4l1gjTBfXT0=
diff --git a/runner/MODULE.bazel b/runner/MODULE.bazel
@@ -38,15 +38,15 @@ bazel_dep(name = "gazelle_cc", version = "0.1.0")  # must match go.mod
 # Override the gazelle version used locally to pre-release and apply aspect patches
 archive_override(
     module_name = "gazelle",
-    integrity = "sha256-PVedDoJ8oJ5feBKNhef2Y2ziooEYcMB3FuAvNNh1qJI=",
+    integrity = "sha256-7OFD5iTGfqKOaFkiuMIwl2ph2gXVUSpaCxWHnY/lwOw=",
     patch_strip = 1,
     patches = [
         "//patches:bazelbuild_bazel-gazelle_aspect-cli.patch",
         "//patches:bazelbuild_bazel-gazelle_aspect-watchman.patch",
         "//pkg/git:gazelle-gitignore.patch",
     ],
-    strip_prefix = "bazel-gazelle-2de7b829fef136795c68d9d3b8644a379693cf55",
-    urls = ["https://github.com/bazel-contrib/bazel-gazelle/archive/2de7b829fef136795c68d9d3b8644a379693cf55.tar.gz"],
+    strip_prefix = "bazel-gazelle-47b5773efc64569526e4cafe53cf74d8993dfda9",
+    urls = ["https://github.com/bazel-contrib/bazel-gazelle/archive/47b5773efc64569526e4cafe53cf74d8993dfda9.tar.gz"],
 )
 
 # Go modules
diff --git a/runner/go.mod b/runner/go.mod
@@ -13,7 +13,7 @@ go 1.24.5
 require (
 	github.com/EngFlow/gazelle_cc v0.1.0 // NOTE: keep in sync with MODULE.bazel
 	github.com/bazel-contrib/rules_python/gazelle v0.0.0-20251012075144-43a5acf8cedf
-	github.com/bazelbuild/bazel-gazelle v0.45.0 // NOTE: keep in sync with MODULE.bazel
+	github.com/bazelbuild/bazel-gazelle v0.46.0-rc2 // NOTE: keep in sync with MODULE.bazel
 	github.com/bazelbuild/buildtools v0.0.0-20250930140053-2eb4fccefb52
 	go.opentelemetry.io/otel v1.38.0
 	go.opentelemetry.io/otel/trace v1.38.0
diff --git a/runner/go.sum b/runner/go.sum
@@ -14,8 +14,8 @@ github.com/bazel-contrib/rules_jvm v0.30.0 h1:GSKDLgH7hi5dpOwmdhE3SJEQzVtsv31i2I
 github.com/bazel-contrib/rules_jvm v0.30.0/go.mod h1:HxRDtmRlh/ErR+2QlVwYs4BcIrB248HeheKi5uyKeN4=
 github.com/bazel-contrib/rules_python/gazelle v0.0.0-20251012075144-43a5acf8cedf h1:HGT/ELJizYCYtTtyL4m9HAD0wYzuLBzDP3YYfk5N8Ow=
 github.com/bazel-contrib/rules_python/gazelle v0.0.0-20251012075144-43a5acf8cedf/go.mod h1:84dcq5fZ/hiQGnpjzH57+Xm7T6uwpPty1KPB7qzHDO0=
-github.com/bazelbuild/bazel-gazelle v0.45.0 h1:ZfbDRyNppw0Sd42lXVX7ybar63MJofb58Yvl4SvbtYY=
-github.com/bazelbuild/bazel-gazelle v0.45.0/go.mod h1:XdBdWhrTc5x50CKzKXOcwrZWdLuX58IX1KcSaWPtEGo=
+github.com/bazelbuild/bazel-gazelle v0.46.0-rc2 h1:opKbd+Bj7ZKtlYJF1JqE9W4OVDvFEZogj2ncVtrLpOU=
+github.com/bazelbuild/bazel-gazelle v0.46.0-rc2/go.mod h1:8Ozf20jhv+in87nCUHdmUPPcVGTfKg/gotZ/hce3T+w=
 github.com/bazelbuild/buildtools v0.0.0-20250930140053-2eb4fccefb52 h1:njQAmjTv/YHRm/0Lfv9DXHFZ4MdT2IA/RKHTnqZkgDw=
 github.com/bazelbuild/buildtools v0.0.0-20250930140053-2eb4fccefb52/go.mod h1:PLNUetjLa77TCCziPsz0EI8a6CUxgC+1jgmWv0H25tg=
 github.com/bazelbuild/rules_go v0.56.1 h1:YOyW1J8kdvJl1AzlWrR+qikC6EPiFVbT4l1gjTBfXT0=

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ module(`
`4`	`4`	`)`
`5`	`5`
`6`	`6`	`bazel_dep(name = "rules_go", version = "0.56.1")`
`7`		`-bazel_dep(name = "gazelle", version = "0.45.0")`
	`7`	`+bazel_dep(name = "gazelle", version = "0.45.0") # must match go.mod`
`8`	`8`
`9`	`9`	`# Go modules`
`10`	`10`	`go_deps = use_extension("@gazelle//:extensions.bzl", "go_deps")`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ replace github.com/aspect-build/aspect-gazelle/common => ../../common`
`7`	`7`	`require (`
`8`	`8`	`github.com/aspect-build/aspect-gazelle/common v0.0.0-00010101000000-000000000000`
`9`	`9`	`github.com/bazel-contrib/rules_jvm v0.30.0`
`10`		`- github.com/bazelbuild/bazel-gazelle v0.45.0`
	`10`	`+ github.com/bazelbuild/bazel-gazelle v0.46.0-rc2`
`11`	`11`	`github.com/emirpasic/gods v1.18.1`
`12`	`12`	`github.com/rs/zerolog v1.34.0`
`13`	`13`	`)`