Consolidate Bazel modules in frontend and fix build

Databean · Databean · commit e9b449aea9da · 2026-04-22T00:14:25.000Z
Consolidate MODULE.bazel files under frontend/ to a single top-level file.
Fix build targets.

Updated e2etests to use the new paths.

Bug: b/505119120
Assisted-by: Antigravity:Gemini-Next
diff --git a/e2etests/MODULE.bazel b/e2etests/MODULE.bazel
@@ -4,7 +4,7 @@ bazel_dep(name = "rules_python", version = "1.1.0")
 bazel_dep(name = "rules_shell", version = "0.6.1")
 
 go_sdk = use_extension("@rules_go//go:extensions.bzl", "go_sdk")
-go_sdk.download(version = "1.24.0")
+go_sdk.download(version = "1.24.12")
 
 go_deps = use_extension("@gazelle//:extensions.bzl", "go_deps")
 go_deps.from_file(go_mod = "//:go.mod")
@@ -15,20 +15,8 @@ use_repo(
     "com_github_google_go_cmp",
 )
 
-bazel_dep(name = "com_github_google_android_cuttlefish_frontend_src_host_orchestrator")
+bazel_dep(name = "com_github_google_android_cuttlefish_frontend")
 local_path_override(
-    module_name = "com_github_google_android_cuttlefish_frontend_src_host_orchestrator",
-    path = "../frontend/src/host_orchestrator",
-)
-
-bazel_dep(name = "com_github_google_android_cuttlefish_frontend_src_libhoclient")
-local_path_override(
-    module_name = "com_github_google_android_cuttlefish_frontend_src_libhoclient",
-    path = "../frontend/src/libhoclient",
-)
-
-bazel_dep(name = "com_github_google_android_cuttlefish_frontend_src_liboperator")
-local_path_override(
-    module_name = "com_github_google_android_cuttlefish_frontend_src_liboperator",
-    path = "../frontend/src/liboperator",
+    module_name = "com_github_google_android_cuttlefish_frontend",
+    path = "../frontend",
 )
diff --git a/e2etests/orchestration/bugreport_test/BUILD.bazel b/e2etests/orchestration/bugreport_test/BUILD.bazel
@@ -24,6 +24,6 @@ go_test(
     flaky = True,
     deps = [
         "//orchestration/common",
-        "@com_github_google_android_cuttlefish_frontend_src_libhoclient//:libhoclient",
+        "@com_github_google_android_cuttlefish_frontend//src/libhoclient:libhoclient",
     ],
 )
diff --git a/e2etests/orchestration/common/BUILD.bazel b/e2etests/orchestration/common/BUILD.bazel
@@ -20,7 +20,7 @@ go_library(
     importpath = "github.com/google/android-cuttlefish/e2etests/orchestration/common",
     visibility = ["//visibility:public"],
     deps = [
-        "@com_github_google_android_cuttlefish_frontend_src_host_orchestrator//api/v1:api",
-        "@com_github_google_android_cuttlefish_frontend_src_libhoclient//:libhoclient",
+        "@com_github_google_android_cuttlefish_frontend//src/host_orchestrator/api/v1:api",
+        "@com_github_google_android_cuttlefish_frontend//src/libhoclient:libhoclient",
     ],
 )
diff --git a/e2etests/orchestration/create_from_images_zip_test/BUILD.bazel b/e2etests/orchestration/create_from_images_zip_test/BUILD.bazel
@@ -23,8 +23,8 @@ go_test(
     ],
     deps = [
         "//orchestration/common",
-        "@com_github_google_android_cuttlefish_frontend_src_host_orchestrator//api/v1:api",
-        "@com_github_google_android_cuttlefish_frontend_src_libhoclient//:libhoclient",
+        "@com_github_google_android_cuttlefish_frontend//src/host_orchestrator/api/v1:api",
+        "@com_github_google_android_cuttlefish_frontend//src/libhoclient:libhoclient",
         "@com_github_google_go_cmp//cmp",
     ],
 )
diff --git a/e2etests/orchestration/create_local_image_test/BUILD.bazel b/e2etests/orchestration/create_local_image_test/BUILD.bazel
@@ -23,8 +23,8 @@ go_test(
     ],
     deps = [
         "//orchestration/common",
-        "@com_github_google_android_cuttlefish_frontend_src_host_orchestrator//api/v1:api",
-        "@com_github_google_android_cuttlefish_frontend_src_libhoclient//:libhoclient",
+        "@com_github_google_android_cuttlefish_frontend//src/host_orchestrator/api/v1:api",
+        "@com_github_google_android_cuttlefish_frontend//src/libhoclient:libhoclient",
         "@com_github_google_go_cmp//cmp",
     ],
 )
diff --git a/e2etests/orchestration/create_single_instance_test/def.bzl b/e2etests/orchestration/create_single_instance_test/def.bzl
@@ -25,7 +25,7 @@ def create_single_instance_test(name, build_id, build_target):
         deps = [
             "//orchestration/common",
             "@com_github_google_go_cmp//cmp",
-            "@com_github_google_android_cuttlefish_frontend_src_host_orchestrator//api/v1:api",
-            "@com_github_google_android_cuttlefish_frontend_src_libhoclient//:libhoclient",
+            "@com_github_google_android_cuttlefish_frontend//src/host_orchestrator/api/v1:api",
+            "@com_github_google_android_cuttlefish_frontend//src/libhoclient:libhoclient",
         ],
     )
diff --git a/e2etests/orchestration/create_with_gce_metadata_credentials_test/BUILD.bazel b/e2etests/orchestration/create_with_gce_metadata_credentials_test/BUILD.bazel
@@ -19,7 +19,7 @@ go_test(
     srcs = ["main_test.go"],
     tags = ["host-ready-special"],
     deps = [
-        "@com_github_google_android_cuttlefish_frontend_src_host_orchestrator//api/v1:api",
-        "@com_github_google_android_cuttlefish_frontend_src_libhoclient//:libhoclient",
+        "@com_github_google_android_cuttlefish_frontend//src/host_orchestrator/api/v1:api",
+        "@com_github_google_android_cuttlefish_frontend//src/libhoclient:libhoclient",
     ],
 )
diff --git a/e2etests/orchestration/powerbtn_test/BUILD.bazel b/e2etests/orchestration/powerbtn_test/BUILD.bazel
@@ -23,6 +23,6 @@ go_test(
     ],
     deps = [
         "//orchestration/common",
-        "@com_github_google_android_cuttlefish_frontend_src_libhoclient//:libhoclient",
+        "@com_github_google_android_cuttlefish_frontend//src/libhoclient:libhoclient",
     ],
 )
diff --git a/e2etests/orchestration/powerwash_test/BUILD.bazel b/e2etests/orchestration/powerwash_test/BUILD.bazel
@@ -23,6 +23,6 @@ go_test(
     ],
     deps = [
         "//orchestration/common",
-        "@com_github_google_android_cuttlefish_frontend_src_libhoclient//:libhoclient",
+        "@com_github_google_android_cuttlefish_frontend//src/libhoclient:libhoclient",
     ],
 )
diff --git a/e2etests/orchestration/reset_test/BUILD.bazel b/e2etests/orchestration/reset_test/BUILD.bazel
@@ -23,8 +23,8 @@ go_test(
     ],
     deps = [
         "//orchestration/common",
-        "@com_github_google_android_cuttlefish_frontend_src_host_orchestrator//api/v1:api",
-        "@com_github_google_android_cuttlefish_frontend_src_libhoclient//:libhoclient",
+        "@com_github_google_android_cuttlefish_frontend//src/host_orchestrator/api/v1:api",
+        "@com_github_google_android_cuttlefish_frontend//src/libhoclient:libhoclient",
         "@com_github_google_go_cmp//cmp",
     ],
 )
diff --git a/e2etests/orchestration/restart_test/BUILD.bazel b/e2etests/orchestration/restart_test/BUILD.bazel
@@ -23,6 +23,6 @@ go_test(
     ],
     deps = [
         "//orchestration/common",
-        "@com_github_google_android_cuttlefish_frontend_src_libhoclient//:libhoclient",
+        "@com_github_google_android_cuttlefish_frontend//src/libhoclient:libhoclient",
     ],
 )
diff --git a/e2etests/orchestration/screen_recording_test/BUILD.bazel b/e2etests/orchestration/screen_recording_test/BUILD.bazel
@@ -23,6 +23,6 @@ go_test(
     ],
     deps = [
         "//orchestration/common",
-        "@com_github_google_android_cuttlefish_frontend_src_libhoclient//:libhoclient",
+        "@com_github_google_android_cuttlefish_frontend//src/libhoclient:libhoclient",
     ],
 )
diff --git a/e2etests/orchestration/snapshot_test/BUILD.bazel b/e2etests/orchestration/snapshot_test/BUILD.bazel
@@ -24,8 +24,8 @@ go_test(
     flaky = True,
     deps = [
         "//orchestration/common",
-        "@com_github_google_android_cuttlefish_frontend_src_host_orchestrator//api/v1:api",
-        "@com_github_google_android_cuttlefish_frontend_src_libhoclient//:libhoclient",
+        "@com_github_google_android_cuttlefish_frontend//src/host_orchestrator/api/v1:api",
+        "@com_github_google_android_cuttlefish_frontend//src/libhoclient:libhoclient",
         "@com_github_google_go_cmp//cmp",
     ],
 )
diff --git a/e2etests/orchestration/verify_access_token_test/BUILD.bazel b/e2etests/orchestration/verify_access_token_test/BUILD.bazel
@@ -19,8 +19,8 @@ go_test(
     srcs = ["main_test.go"],
     tags = ["host-ready-special"],
     deps = [
-        "@com_github_google_android_cuttlefish_frontend_src_host_orchestrator//api/v1:api",
-        "@com_github_google_android_cuttlefish_frontend_src_libhoclient//:libhoclient",
+        "@com_github_google_android_cuttlefish_frontend//src/host_orchestrator/api/v1:api",
+        "@com_github_google_android_cuttlefish_frontend//src/libhoclient:libhoclient",
         "@com_github_google_go_cmp//cmp",
     ],
 )
diff --git a/frontend/BUILD.bazel b/frontend/BUILD.bazel
@@ -0,0 +1,4 @@
+load("@gazelle//:def.bzl", "gazelle")
+
+# gazelle:prefix github.com/google/android-cuttlefish/frontend
+gazelle(name = "gazelle")
diff --git a/frontend/MODULE.bazel b/frontend/MODULE.bazel
@@ -0,0 +1,29 @@
+module(name = "com_github_google_android_cuttlefish_frontend")
+
+bazel_dep(name = "rules_go", version = "0.60.0")
+bazel_dep(name = "gazelle", version = "0.50.0")
+
+go_deps = use_extension("@gazelle//:extensions.bzl", "go_deps")
+go_deps.from_file(go_work = "//:go.work")
+# Note: The following com_github_google_android_cuttlefish_frontend_src_* repos
+# are listed here because Gazelle's go_deps extension reports them as direct
+# dependencies based on go.mod files. However, they are NOT pulled from external
+# locations. Gazelle resolves Go imports to local targets in this workspace
+# (e.g., //src/host_orchestrator/...). They are included here to satisfy
+# 'bazel mod tidy' and avoid warnings.
+use_repo(
+    go_deps,
+    "com_github_cenkalti_backoff_v4",
+    "com_github_google_android_cuttlefish_frontend_src_host_orchestrator",
+    "com_github_google_android_cuttlefish_frontend_src_liboperator",
+    "com_github_google_btree",
+    "com_github_google_go_cmp",
+    "com_github_google_uuid",
+    "com_github_gorilla_mux",
+    "com_github_gorilla_websocket",
+    "com_github_hashicorp_go_multierror",
+    "com_github_pion_logging",
+    "com_github_pion_webrtc_v3",
+    "org_golang_google_grpc",
+    "org_golang_google_protobuf",
+)
diff --git a/frontend/go.work b/frontend/go.work
@@ -0,0 +1,8 @@
+go 1.18
+
+use (
+	./src/host_orchestrator
+	./src/libhoclient
+	./src/liboperator
+	./src/operator
+)
diff --git a/frontend/src/host_orchestrator/BUILD.bazel b/frontend/src/host_orchestrator/BUILD.bazel
@@ -1,7 +1,6 @@
 load("@gazelle//:def.bzl", "gazelle")
 load("@rules_go//go:def.bzl", "go_binary", "go_library")
 
-# gazelle:resolve_regexp go github.com/google/android-cuttlefish/frontend/src/liboperator/operator @liboperator//operator
 gazelle(name = "gazelle")
 
 go_library(
@@ -10,8 +9,9 @@ go_library(
     importpath = "github.com/google/android-cuttlefish/frontend/src/host_orchestrator",
     visibility = ["//visibility:private"],
     deps = [
-        "//orchestrator",
-        "//orchestrator/debug",
+        "//src/host_orchestrator/orchestrator",
+        "//src/host_orchestrator/orchestrator/debug",
+        "//src/host_orchestrator/orchestrator/exec",
         "@com_github_gorilla_mux//:mux",
     ],
 )
diff --git a/frontend/src/host_orchestrator/MODULE.bazel b/frontend/src/host_orchestrator/MODULE.bazel
diff --git a/frontend/src/host_orchestrator/WORKSPACE b/frontend/src/host_orchestrator/WORKSPACE
diff --git a/frontend/src/host_orchestrator/orchestrator/BUILD.bazel b/frontend/src/host_orchestrator/orchestrator/BUILD.bazel
@@ -7,29 +7,35 @@ go_library(
         "createcvdaction.go",
         "createcvdbugreportaction.go",
         "createsnapshotaction.go",
+        "displayaddaction.go",
+        "displaylistaction.go",
+        "displayremoveaction.go",
+        "displayscreenshotaction.go",
         "execcvdcommandaction.go",
         "fetchartifactsaction.go",
         "getscreenrecordingaction.go",
+        "imagedirectories.go",
         "instancemanager.go",
         "listcvdsaction.go",
-        "operation.go",
         "listscreenrecordingsaction.go",
+        "operation.go",
+        "resetcvdaction.go",
         "startcvdaction.go",
         "userartifacts.go",
+        "validation.go",
     ],
     importpath = "github.com/google/android-cuttlefish/frontend/src/host_orchestrator/orchestrator",
     visibility = ["//visibility:public"],
     deps = [
-        "//api/v1:api",
-        "//orchestrator/artifacts",
-        "//orchestrator/cvd",
-        "//orchestrator/cvd/output",
-        "//orchestrator/debug",
-        "//orchestrator/exec",
-        "@com_github_google_android_cuttlefish_frontend_src_liboperator//operator",
+        "//src/host_orchestrator/api/v1:api",
+        "//src/host_orchestrator/orchestrator/cvd",
+        "//src/host_orchestrator/orchestrator/cvd/output",
+        "//src/host_orchestrator/orchestrator/debug",
+        "//src/host_orchestrator/orchestrator/exec",
+        "//src/liboperator/operator",
+        "@com_github_google_btree//:btree",
         "@com_github_google_uuid//:uuid",
         "@com_github_gorilla_mux//:mux",
-        "@com_github_hashicorp_go_multierror//:go-multierror",
     ],
 )
 
@@ -38,18 +44,20 @@ go_test(
     srcs = [
         "controller_test.go",
         "createcvdaction_test.go",
+        "imagedirectories_test.go",
         "instancemanager_test.go",
         "listcvdsaction_test.go",
         "operation_test.go",
         "userartifacts_test.go",
+        "validation_test.go",
     ],
     embed = [":orchestrator"],
     deps = [
-        "//api/v1:api",
-        "//orchestrator/debug",
-        "//orchestrator/exec",
-        "//orchestrator/testing",
-        "@com_github_google_android_cuttlefish_frontend_src_liboperator//operator",
+        "//src/host_orchestrator/api/v1:api",
+        "//src/host_orchestrator/orchestrator/debug",
+        "//src/host_orchestrator/orchestrator/testing",
+        "//src/liboperator/operator",
+        "@com_github_google_btree//:btree",
         "@com_github_google_go_cmp//cmp",
         "@com_github_gorilla_mux//:mux",
     ],
diff --git a/frontend/src/host_orchestrator/orchestrator/cvd/BUILD.bazel b/frontend/src/host_orchestrator/orchestrator/cvd/BUILD.bazel
@@ -6,19 +6,14 @@ go_library(
     importpath = "github.com/google/android-cuttlefish/frontend/src/host_orchestrator/orchestrator/cvd",
     visibility = ["//visibility:public"],
     deps = [
-        "//orchestrator/exec",
-        "//orchestrator/cvd/output",
+        "//src/host_orchestrator/orchestrator/cvd/output",
+        "//src/host_orchestrator/orchestrator/exec",
     ],
 )
 
 go_test(
     name = "cvd_test",
-    srcs = [
-        "cvd_test.go",
-    ],
+    srcs = ["cvd_test.go"],
     embed = [":cvd"],
-    deps = [
-        "//orchestrator/exec",
-        "@com_github_google_go_cmp//cmp",
-    ],
+    deps = ["@com_github_google_go_cmp//cmp"],
 )
diff --git a/frontend/src/host_orchestrator/orchestrator/cvd/output/BUILD.bazel b/frontend/src/host_orchestrator/orchestrator/cvd/output/BUILD.bazel
@@ -1,11 +1,8 @@
-load("@rules_go//go:def.bzl", "go_library", "go_test")
+load("@rules_go//go:def.bzl", "go_library")
 
 go_library(
     name = "output",
     srcs = ["output.go"],
     importpath = "github.com/google/android-cuttlefish/frontend/src/host_orchestrator/orchestrator/cvd/output",
     visibility = ["//visibility:public"],
-    deps = [
-        "//orchestrator/exec",
-    ],
 )
diff --git a/frontend/src/libhoclient/BUILD.bazel b/frontend/src/libhoclient/BUILD.bazel
@@ -1,23 +1,22 @@
 load("@gazelle//:def.bzl", "gazelle")
 load("@rules_go//go:def.bzl", "go_library", "go_test")
 
-# gazelle:resolve_regexp go github.com/google/android-cuttlefish/frontend/src/host_orchestrator/api/v1 @host_orchestrator//api/v1:api
-# gazelle:resolve_regexp go github.com/google/android-cuttlefish/frontend/src/liboperator/api/v1 @liboperator//api/v1:api
 gazelle(name = "gazelle")
 
 go_library(
     name = "libhoclient",
     srcs = [
+        "fake_host_orchestrator_client.go",
         "host_orchestrator_client.go",
         "httputils.go",
     ],
     importpath = "github.com/google/android-cuttlefish/frontend/src/libhoclient",
     visibility = ["//visibility:public"],
     deps = [
-        "//webrtcclient",
+        "//src/host_orchestrator/api/v1:api",
+        "//src/libhoclient/webrtcclient",
+        "//src/liboperator/api/v1:api",
         "@com_github_cenkalti_backoff_v4//:backoff",
-        "@com_github_google_android_cuttlefish_frontend_src_host_orchestrator//api/v1:api",
-        "@com_github_google_android_cuttlefish_frontend_src_liboperator//api/v1:api",
         "@com_github_gorilla_websocket//:websocket",
         "@com_github_pion_webrtc_v3//:webrtc",
     ],
@@ -26,12 +25,13 @@ go_library(
 go_test(
     name = "libhoclient_test",
     srcs = [
+        "fake_host_orchestrator_client_test.go",
         "host_orchestrator_client_test.go",
         "httputils_test.go",
     ],
     embed = [":libhoclient"],
     deps = [
-        "@com_github_google_android_cuttlefish_frontend_src_host_orchestrator//api/v1:api",
+        "//src/host_orchestrator/api/v1:api",
         "@com_github_google_go_cmp//cmp",
     ],
 )
diff --git a/frontend/src/libhoclient/MODULE.bazel b/frontend/src/libhoclient/MODULE.bazel
diff --git a/frontend/src/libhoclient/WORKSPACE b/frontend/src/libhoclient/WORKSPACE
diff --git a/frontend/src/liboperator/MODULE.bazel b/frontend/src/liboperator/MODULE.bazel
diff --git a/frontend/src/liboperator/WORKSPACE b/frontend/src/liboperator/WORKSPACE
diff --git a/frontend/src/liboperator/operator/BUILD.bazel b/frontend/src/liboperator/operator/BUILD.bazel
diff --git a/frontend/src/operator/BUILD.bazel b/frontend/src/operator/BUILD.bazel

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,6 @@ go_test(`
`24`	`24`	`flaky = True,`
`25`	`25`	`deps = [`
`26`	`26`	`"//orchestration/common",`
`27`		`- "@com_github_google_android_cuttlefish_frontend_src_libhoclient//:libhoclient",`
	`27`	`+ "@com_github_google_android_cuttlefish_frontend//src/libhoclient:libhoclient",`
`28`	`28`	`],`
`29`	`29`	`)`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,6 @@ go_test(`
`23`	`23`	`],`
`24`	`24`	`deps = [`
`25`	`25`	`"//orchestration/common",`
`26`		`- "@com_github_google_android_cuttlefish_frontend_src_libhoclient//:libhoclient",`
	`26`	`+ "@com_github_google_android_cuttlefish_frontend//src/libhoclient:libhoclient",`
`27`	`27`	`],`
`28`	`28`	`)`