Remove remaining references to the cvd server

Author: jemoreira

base/cvd/cuttlefish/host/commands/cvd/BUILD.bazel

@@ -19,7 +19,6 @@ cf_cc_library(
         "//cuttlefish/host/commands/cvd/cli:nesting_commands",
         "//cuttlefish/host/commands/cvd/instances",
         "//cuttlefish/host/commands/cvd/instances/lock",
-        "//cuttlefish/host/commands/cvd/legacy:cvd_server_cc_proto",
         "//cuttlefish/host/commands/cvd/utils",
         "//libbase",
     ],
@@ -35,7 +34,6 @@ cf_cc_binary(
         "//cuttlefish/common/libs/utils:files",
         "//cuttlefish/common/libs/utils:flag_parser",
         "//cuttlefish/common/libs/utils:subprocess",
-        "//cuttlefish/host/commands/cvd/legacy",
         "//cuttlefish/host/commands/cvd/utils",
         "//cuttlefish/host/commands/cvd/version",
         "//libbase",

base/cvd/cuttlefish/host/commands/cvd/cli/BUILD.bazel

@@ -114,7 +114,6 @@ cf_cc_library(
         "//cuttlefish/host/commands/cvd/instances",
         "//cuttlefish/host/commands/cvd/instances:cvd_persistent_data",
         "//cuttlefish/host/commands/cvd/instances/lock",
-        "//cuttlefish/host/commands/cvd/legacy:cvd_server_cc_proto",
         "//cuttlefish/host/commands/cvd/utils",
         "//cuttlefish/host/libs/metrics:metrics_orchestration",
         "//libbase",

base/cvd/cuttlefish/host/commands/cvd/cli/commands/BUILD.bazel

@@ -69,7 +69,6 @@ cf_cc_library(
         "//cuttlefish/host/commands/cvd/cli:types",
         "//cuttlefish/host/commands/cvd/cli/commands:command_handler",
         "//cuttlefish/host/commands/cvd/instances",
-        "//cuttlefish/host/commands/cvd/legacy:cvd_server_cc_proto",
     ],
 )
 
@@ -435,7 +434,6 @@ cf_cc_library(
         "//cuttlefish/host/commands/cvd/cli:command_request",
         "//cuttlefish/host/commands/cvd/cli:types",
         "//cuttlefish/host/commands/cvd/cli/commands:command_handler",
-        "//cuttlefish/host/commands/cvd/legacy",
         "//cuttlefish/host/commands/cvd/utils",
         "//cuttlefish/host/commands/cvd/version",
         "@fmt",

base/cvd/cuttlefish/host/commands/cvd/cli/commands/clear.cpp

@@ -25,7 +25,6 @@
 #include "cuttlefish/host/commands/cvd/cli/commands/command_handler.h"
 #include "cuttlefish/host/commands/cvd/cli/types.h"
 #include "cuttlefish/host/commands/cvd/instances/instance_manager.h"
-#include "cuttlefish/host/commands/cvd/legacy/cvd_server.pb.h"
 
 namespace cuttlefish {
 namespace {
@@ -54,7 +53,7 @@ CvdClearCommandHandler::CvdClearCommandHandler(
 
 Result<void> CvdClearCommandHandler::Handle(const CommandRequest& request) {
   CF_EXPECT(CanHandle(request));
-  CF_EXPECT_EQ(instance_manager_.CvdClear(request).code(), cvd::Status::OK);
+  CF_EXPECT(instance_manager_.CvdClear(request));
   return {};
 }
 

base/cvd/cuttlefish/host/commands/cvd/cli/commands/reset.cpp

@@ -149,13 +149,6 @@ class CvdResetCommandHandler : public CvdCommandHandler {
       LOG(ERROR) << "Error deleting instance database file";
     }
 
-    // Any responsive cvd server process was stopped nicely when this process
-    // began, kill any unresponsive ones left.
-    auto server_kill_res = KillCvdServerProcess();
-    if (!server_kill_res.ok()) {
-      LOG(ERROR) << "Error trying to kill unresponsive cvd server: "
-                 << server_kill_res.error().Message();
-    }
     CF_EXPECT(KillAllCuttlefishInstances(
         /* clear_instance_dirs*/ options.clean_runtime_dir));
     return {};

base/cvd/cuttlefish/host/commands/cvd/instances/BUILD.bazel

@@ -140,7 +140,6 @@ cf_cc_library(
         "//cuttlefish/host/commands/cvd/instances:device_name",
         "//cuttlefish/host/commands/cvd/instances:run_cvd_proc_collector",
         "//cuttlefish/host/commands/cvd/instances/lock",
-        "//cuttlefish/host/commands/cvd/legacy:cvd_server_cc_proto",
         "//cuttlefish/host/commands/cvd/utils",
         "//cuttlefish/host/libs/command_util",
         "//cuttlefish/host/libs/config:config_constants",
@@ -167,7 +166,6 @@ cf_cc_library(
         "//cuttlefish/common/libs/utils:subprocess_managed_stdio",
         "//cuttlefish/host/commands/cvd/instances",
         "//cuttlefish/host/commands/cvd/instances:run_cvd_proc_collector",
-        "//cuttlefish/host/commands/cvd/legacy",
         "//cuttlefish/host/commands/cvd/utils",
         "//libbase",
         "@fmt",

base/cvd/cuttlefish/host/commands/cvd/instances/instance_database.cpp

@@ -40,8 +40,6 @@ namespace cuttlefish {
 
 namespace {
 
-constexpr const char kJsonGroups[] = "Groups";
-
 constexpr const unsigned UNSET_ID = 0;
 
 Result<std::string> GenUniqueGroupName(const cvd::PersistentData& data) {
@@ -269,23 +267,4 @@ Result<std::vector<LocalInstanceGroup>> InstanceDatabase::InstanceGroups()
       });
 }
 
-Result<void> InstanceDatabase::LoadFromJson(const Json::Value& db_json) {
-  std::vector<LocalInstanceGroup> new_groups;
-  CF_EXPECT(db_json.isMember(kJsonGroups));
-  const Json::Value& group_array = db_json[kJsonGroups];
-  CF_EXPECT(group_array.isArray());
-  int n_groups = group_array.size();
-  for (int i = 0; i < n_groups; i++) {
-    new_groups.push_back(
-        CF_EXPECT(LocalInstanceGroup::Deserialize(group_array[i])));
-  }
-  return viewer_.WithExclusiveLock<void>(
-      [&new_groups](cvd::PersistentData& data) -> Result<void> {
-        for (const auto& group : new_groups) {
-          *data.add_instance_groups() = group.Proto();
-        }
-        return {};
-      });
-}
-
 }  // namespace cuttlefish

base/cvd/cuttlefish/host/commands/cvd/instances/instance_database.h

@@ -22,8 +22,6 @@
 #include <utility>
 #include <vector>
 
-#include <json/json.h>
-
 #include "cuttlefish/common/libs/utils/result.h"
 #include "cuttlefish/host/commands/cvd/instances/cvd_persistent_data.pb.h"
 #include "cuttlefish/host/commands/cvd/instances/data_viewer.h"
@@ -51,8 +49,6 @@ class InstanceDatabase {
 
   Result<bool> IsEmpty() const;
 
-  Result<void> LoadFromJson(const Json::Value&);
-
   /** Adds instance group.
    *
    * A new group name will be generated one is not provided.

base/cvd/cuttlefish/host/commands/cvd/instances/instance_database_test.cpp

@@ -440,57 +440,6 @@ TEST_F(CvdInstanceDatabaseTest, AddInstancesTogether) {
   ASSERT_TRUE(result_tv.ok()) << result_tv.error().Trace();
 }
 
-TEST_F(CvdInstanceDatabaseJsonTest, DumpLoadDumpCompare) {
-  // starting set up
-  if (!SetUpOk()) {
-    GTEST_SKIP() << Error().msg;
-  }
-  /*
-   * Dumping to json, clearing up the DB, loading from the json,
-   *
-   */
-  auto serialized_db =
-      "{"
-      "  \"Groups\" : ["
-      "    {"
-      "    \"Group Name\" : \"miau\","
-      "    \"Host Tools Dir\" : \"/host/out/path\","
-      "    \"Instances\" : ["
-      "      {"
-      "        \"Instance Id\" : \"1\","
-      "        \"Parent Group\" : \"miau\","
-      "        \"Per-Instance Name\" : \"8\""
-      "      },{"
-      "        \"Instance Id\" : \"10\","
-      "        \"Parent Group\" : \"miau\","
-      "        \"Per-Instance Name\" : \"tv_instance\""
-      "      }"
-      "    ],"
-      "    \"Product Out Dir\" : \"/product/out/path\","
-      "    \"Runtime/Home Dir\" : \"/home/dir\","
-      "    \"Start Time\" : \"123456789\""
-      "    }"
-      "  ]"
-      "}";
-  auto json_parsing = ParseJson(serialized_db);
-  ASSERT_TRUE(json_parsing.ok()) << serialized_db << std::endl
-                                 << " is not a valid json.";
-  auto& db = GetDb();
-  auto load_result = db.LoadFromJson(*json_parsing);
-  ASSERT_TRUE(load_result.ok()) << load_result.error().Trace();
-  {
-    // re-look up the group and the instances
-    auto miau_group = db.FindGroup({.group_name = "miau"});
-    ASSERT_TRUE(miau_group.ok()) << miau_group.error().Trace();
-    auto result_8 = db.FindInstanceWithGroup({.instance_names = {"8"}});
-    auto result_tv =
-        db.FindInstanceWithGroup({.instance_names = {"tv_instance"}});
-
-    ASSERT_TRUE(result_8.ok()) << result_8.error().Trace();
-    ASSERT_TRUE(result_tv.ok()) << result_tv.error().Trace();
-  }
-}
-
 TEST_F(CvdInstanceDatabaseTest, UpdateInstances) {
   if (!SetUpOk()) {
     GTEST_SKIP() << Error().msg;

base/cvd/cuttlefish/host/commands/cvd/instances/instance_group_record.cpp

@@ -27,6 +27,7 @@
 #include <android-base/file.h>
 #include <android-base/parseint.h>
 #include <android-base/strings.h>
+#include <json/json.h>
 
 #include "cuttlefish/common/libs/utils/result.h"
 #include "cuttlefish/host/commands/cvd/instances/instance_database_types.h"
@@ -36,15 +37,6 @@ namespace cuttlefish {
 
 namespace {
 
-static constexpr const char kJsonGroupName[] = "Group Name";
-static constexpr const char kJsonHomeDir[] = "Runtime/Home Dir";
-static constexpr const char kJsonHostArtifactPath[] = "Host Tools Dir";
-static constexpr const char kJsonProductOutPath[] = "Product Out Dir";
-static constexpr const char kJsonStartTime[] = "Start Time";
-static constexpr const char kJsonInstances[] = "Instances";
-static constexpr const char kJsonInstanceId[] = "Instance Id";
-static constexpr const char kJsonInstanceName[] = "Per-Instance Name";
-
 std::vector<LocalInstance> Filter(
     const std::vector<LocalInstance>& instances,
     std::function<bool(const LocalInstance&)> predicate) {
@@ -192,63 +184,6 @@ std::string LocalInstanceGroup::BaseDir() const {
   return android::base::Dirname(HomeDir());
 }
 
-Result<LocalInstanceGroup> LocalInstanceGroup::Deserialize(
-    const Json::Value& group_json) {
-  CF_EXPECT(group_json.isMember(kJsonGroupName));
-  const std::string group_name = group_json[kJsonGroupName].asString();
-  CF_EXPECT(group_json.isMember(kJsonHomeDir));
-  const std::string home_dir = group_json[kJsonHomeDir].asString();
-  CF_EXPECT(group_json.isMember(kJsonHostArtifactPath));
-  const std::string host_artifacts_path =
-      group_json[kJsonHostArtifactPath].asString();
-  CF_EXPECT(group_json.isMember(kJsonProductOutPath));
-  const std::string product_out_path =
-      group_json[kJsonProductOutPath].asString();
-  TimeStamp start_time = CvdServerClock::now();
-
-  // test if the field is available as the field has been added
-  // recently as of b/315855286
-  if (group_json.isMember(kJsonStartTime)) {
-    auto restored_start_time_result =
-        DeserializeTimePoint(group_json[kJsonStartTime]);
-    if (restored_start_time_result.ok()) {
-      start_time = std::move(*restored_start_time_result);
-    } else {
-      LOG(ERROR) << "Start time restoration from json failed, so we use "
-                 << " the current system time. Reasons: "
-                 << restored_start_time_result.error().FormatForEnv();
-    }
-  }
-
-  cvd::InstanceGroup group_proto;
-  group_proto.set_name(group_name);
-  group_proto.set_home_directory(home_dir);
-  group_proto.set_host_artifacts_path(host_artifacts_path);
-  group_proto.set_product_out_path(product_out_path);
-  group_proto.set_start_time_sec(CvdServerClock::to_time_t(start_time));
-
-  CF_EXPECT(group_json.isMember(kJsonInstances));
-  const Json::Value& instances_json_array = group_json[kJsonInstances];
-  CF_EXPECT(instances_json_array.isArray());
-  for (int i = 0; i < (int)instances_json_array.size(); i++) {
-    const Json::Value& instance_json = instances_json_array[i];
-    CF_EXPECT(instance_json.isMember(kJsonInstanceName));
-    const std::string instance_name =
-        instance_json[kJsonInstanceName].asString();
-    CF_EXPECT(instance_json.isMember(kJsonInstanceId));
-    const std::string instance_id = instance_json[kJsonInstanceId].asString();
-
-    int id = -1;
-    CF_EXPECTF(android::base::ParseInt(instance_id, std::addressof(id)),
-               "Invalid instance ID in instance json: {}", instance_id);
-    auto instance = group_proto.add_instances();
-    instance->set_id(id);
-    instance->set_name(instance_name);
-  }
-
-  return Create(group_proto);
-}
-
 Result<Json::Value> LocalInstanceGroup::FetchStatus(
     std::chrono::seconds timeout) {
   Json::Value instances_json(Json::arrayValue);