Request higher SafeLevel builds when requesting Android build by branch

In cvd fetch, when requesting a build by branch and target, prefer
requesting higher SafeLevel builds (PLATINUM, SAFE_2, SAFE_1) when
possible before falling back to any complete successful build (SAFE_0 /
unspecified).

If users want a specific build id, that is already possible to request
through command line arguments. When a user requests a branch by name,
they probably do not care as much how recent the build is. In the case
of our presubmit, this will hopefully reduce flakes that come from the
device side.

The main failure mode here is if a build target / branch combination has
previously reported a higher safe level and no longer does, it will get
stuck on the older build from the higher safe level indefinitely.

Assisted-by: Jetski:Gemini Next
Bug: b/518049553

Author: Databean

base/cvd/cuttlefish/host/libs/web/android_build_api.cpp

@@ -275,25 +275,33 @@ Result<std::vector<std::string>> AndroidBuildApi::Headers() {
 
 Result<std::optional<std::string>> AndroidBuildApi::LatestBuildId(
     const std::string& branch, const std::string& target) {
-  const std::string url =
-      android_build_url_.GetLatestBuildIdUrl(branch, target);
-  auto response =
-      CF_EXPECT(HttpGetToJson(http_client_, url, CF_EXPECT(Headers())));
+  for (const SafeLevel safe_level : kAllSafeLevels) {
+    VLOG(0) << "Attempting to download build at safe level '" << safe_level
+            << "' for branch '" << branch << "' and target '" << target << "'";
+    const std::string url =
+        android_build_url_.GetLatestBuildIdUrl(branch, target, safe_level);
+    const std::vector<std::string> headers = CF_EXPECT(Headers());
+    const HttpResponse<Json::Value> response =
+        CF_EXPECT(HttpGetToJson(http_client_, url, headers));
+
+    Result<Json::Value> json_res = GetResponseJson(response);
+    if (!json_res.ok()) {
+      continue;
+    }
+    const Json::Value json = *json_res;
 
-  const Json::Value json = CF_EXPECTF(GetResponseJson(response),
-                                      "Error fetching last known good build "
-                                      "id for:\nbranch \"{}\", target \"{}\"",
-                                      branch, target);
-  if (!json.isMember("builds")) {
-    return std::nullopt;
-  }
+    if (!json.isMember("builds")) {
+      continue;
+    }
 
-  CF_EXPECTF(json["builds"].isArray() && json["builds"].size() == 1,
-             "Expected to find a single latest build for branch \"{}\" and "
-             "target \"{}\" in the response array, "
-             "but found {}",
-             branch, target, json["builds"].size());
-  return CF_EXPECT(GetValue<std::string>(json["builds"][0], { "buildId" }));
+    CF_EXPECTF(json["builds"].isArray() && json["builds"].size() == 1,
+               "Expected to find a single latest build for branch \"{}\" and "
+               "target \"{}\" in the response array, "
+               "but found {}",
+               branch, target, json["builds"].size());
+    return CF_EXPECT(GetValue<std::string>(json["builds"][0], {"buildId"}));
+  }
+  return std::nullopt;
 }
 
 Result<std::unordered_set<std::string>> AndroidBuildApi::Artifacts(

base/cvd/cuttlefish/host/libs/web/android_build_url.cpp

@@ -15,6 +15,7 @@
 
 #include "cuttlefish/host/libs/web/android_build_url.h"
 
+#include <ostream>
 #include <sstream>
 #include <string>
 #include <string_view>
@@ -109,19 +110,40 @@ std::string BuildNameRegexp(
 
 }  // namespace
 
+std::string_view format_as(SafeLevel level) {
+  switch (level) {
+    case SafeLevel::kPlatinum:
+      return "PLATINUM";
+    case SafeLevel::kSafe2:
+      return "SAFE_2";
+    case SafeLevel::kSafe1:
+      return "SAFE_1";
+    case SafeLevel::kSafe0:
+      return "SAFE_0";
+    case SafeLevel::kSafeLevelUnspecified:
+      return "";
+  }
+}
+
+std::ostream& operator<<(std::ostream& os, SafeLevel level) {
+  return os << format_as(level);
+}
+
 AndroidBuildUrl::AndroidBuildUrl(std::string api_base_url, std::string api_key,
                                  std::string project_id)
     : api_base_url_(std::move(api_base_url)),
       api_key_(std::move(api_key)),
       project_id_(std::move(project_id)) {}
 
 std::string AndroidBuildUrl::GetLatestBuildIdUrl(std::string_view branch,
-                                                 std::string_view target) {
+                                                 std::string_view target,
+                                                 SafeLevel safe_level) {
   UrlBuilder builder = UrlBuilder::GetLatestBuildIdBaseUrl(api_base_url_);
   builder.AddQueryParameter("buildAttemptStatus", "complete");
   builder.AddQueryParameter("buildType", "submitted");
   builder.AddQueryParameter("pageSize", "1");
   builder.AddQueryParameter("successful", "true");
+  builder.AddQueryParameter("safeLevel", format_as(safe_level));
   builder.AddQueryParameter("branches", branch);
   builder.AddQueryParameter("targets", target);
   builder.AddApiKeyAndProjectId(api_key_, project_id_);

base/cvd/cuttlefish/host/libs/web/android_build_url.h

@@ -15,12 +15,38 @@
 
 #pragma once
 
+#include <ostream>
 #include <string>
 #include <string_view>
 #include <vector>
 
 namespace cuttlefish {
 
+enum class SafeLevel {
+  kSafeLevelUnspecified = 0,
+  kSafe0,
+  kSafe1,
+  kSafe2,
+  kPlatinum,
+};
+
+std::string_view format_as(SafeLevel level);
+
+template <typename Sink>
+void AbslStringify(Sink& sink, SafeLevel level) {
+  sink.Append(format_as(level));
+}
+
+std::ostream& operator<<(std::ostream& os, SafeLevel level);
+
+inline constexpr SafeLevel kAllSafeLevels[] = {
+    SafeLevel::kPlatinum,
+    SafeLevel::kSafe2,
+    SafeLevel::kSafe1,
+    SafeLevel::kSafe0,
+    SafeLevel::kSafeLevelUnspecified,
+};
+
 inline constexpr char kAndroidBuildServiceUrl[] =
     "https://androidbuild-pa.googleapis.com/v4";
 
@@ -29,8 +55,9 @@ class AndroidBuildUrl {
   AndroidBuildUrl(std::string api_base_url, std::string api_key,
                   std::string project_id);
 
-  std::string GetLatestBuildIdUrl(std::string_view branch,
-                                  std::string_view target);
+  std::string GetLatestBuildIdUrl(
+      std::string_view branch, std::string_view target,
+      SafeLevel safe_level = SafeLevel::kSafeLevelUnspecified);
   std::string GetBuildUrl(std::string_view id, std::string_view target);
   std::string GetArtifactUrl(std::string_view id, std::string_view target,
                              const std::vector<std::string>& artifact_filenames,