Include com_google_protobuf_javalite to MODULE.bazel to fix bzlmod querying graph in end-user repo (#11147)

firov · web-flow · commit f995c121e902 · 2024-05-15T17:21:23.000+05:30
* Fix 3d party dependency use_repo

* remove protobuf as it is already added as module dep

* fix

* fix

* fix

* return com_google_protobuf_javalite archive and use it in MODULE.bazel
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -60,6 +60,7 @@ use_repo(
     non_module_deps,
     "com_github_cncf_xds",
     "envoy_api",
+    "com_google_protobuf_javalite",
     "io_grpc_grpc_proto",
 )
 
diff --git a/repositories.bzl b/repositories.bzl
@@ -117,7 +117,7 @@ def grpc_java_repositories(bzlmod = False):
         )
     if not bzlmod and not native.existing_rule("com_google_protobuf"):
         com_google_protobuf()
-    if not bzlmod and not native.existing_rule("com_google_protobuf_javalite"):
+    if not native.existing_rule("com_google_protobuf_javalite"):
         com_google_protobuf_javalite()
     if not bzlmod and not native.existing_rule("com_google_googleapis"):
         http_archive(

Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,7 @@ use_repo(`
`60`	`60`	`non_module_deps,`
`61`	`61`	`"com_github_cncf_xds",`
`62`	`62`	`"envoy_api",`
	`63`	`+ "com_google_protobuf_javalite",`
`63`	`64`	`"io_grpc_grpc_proto",`
`64`	`65`	`)`
`65`	`66`
Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ def grpc_java_repositories(bzlmod = False):`
`117`	`117`	`)`
`118`	`118`	`if not bzlmod and not native.existing_rule("com_google_protobuf"):`
`119`	`119`	`com_google_protobuf()`
`120`		`- if not bzlmod and not native.existing_rule("com_google_protobuf_javalite"):`
	`120`	`+ if not native.existing_rule("com_google_protobuf_javalite"):`
`121`	`121`	`com_google_protobuf_javalite()`
`122`	`122`	`if not bzlmod and not native.existing_rule("com_google_googleapis"):`
`123`	`123`	`http_archive(`