Download the signed image artifact, when the default build request is signed.

Author: Databean

base/cvd/cuttlefish/host/commands/cvd/fetch/fetch_cvd.cc

@@ -25,6 +25,7 @@
 #include <optional>
 #include <string>
 #include <utility>
+#include <variant>
 #include <vector>
 
 #include <android-base/strings.h>
@@ -57,6 +58,14 @@
 namespace cuttlefish {
 namespace {
 
+bool IsSignedBuild(const Build& build) {
+  if (!std::holds_alternative<DeviceBuild>(build)) {
+    return false;
+  }
+  const auto& device_build = std::get<DeviceBuild>(build);
+  return device_build.is_signed;
+}
+
 constexpr mode_t kRwxAllMode = S_IRWXU | S_IRWXG | S_IRWXO;
 
 struct Target {
@@ -180,6 +189,7 @@ Result<void> FetchDefaultTarget(FetchBuildContext& context,
                                 bool keep_downloaded_archives,
                                 const DownloadFlags& flags,
                                 bool has_system_build) {
+  constexpr char kSignedPrefix[] = "signed/signed-";
   // Some older builds might not have misc_info.txt, so permit errors on
   // fetching misc_info.txt
   if (!context.Artifact("misc_info.txt").Download().ok()) {
@@ -188,7 +198,13 @@ Result<void> FetchDefaultTarget(FetchBuildContext& context,
   if (flags.download_img_zip) {
     LOG(INFO) << "Downloading image zip for " << context;
     std::string img_zip_name = context.GetBuildZipName("img");
-    FetchArtifact img_zip = context.Artifact(img_zip_name);
+    std::string img_zip_artifact_name = img_zip_name;
+    if (IsSignedBuild(context.Build())) {
+      img_zip_artifact_name = kSignedPrefix + img_zip_artifact_name;
+      LOG(INFO) << "Attempting to fetch SIGNED default image zip: "
+                  << img_zip_artifact_name;
+    }
+    FetchArtifact img_zip = context.Artifact(img_zip_artifact_name);
     CF_EXPECT(img_zip.Download());
     CF_EXPECT(img_zip.ExtractAll());
     if (!keep_downloaded_archives) {

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

@@ -35,6 +35,7 @@
 #include <android-base/logging.h>
 #include <json/value.h>
 
+#include <android-base/file.h>
 #include "cuttlefish/common/libs/posix/symlink.h"
 #include "cuttlefish/common/libs/utils/contains.h"
 #include "cuttlefish/common/libs/utils/files.h"
@@ -423,6 +424,8 @@ Result<std::string> AndroidBuildApi::DownloadTargetFile(
     }
     // Fallback to download from AB.
   }
+  CF_EXPECT(EnsureDirectoryExists(
+      std::string(android::base::Dirname(target_filepath))));
   CF_EXPECT(ArtifactToFile(build, artifact_name, target_filepath),
             "Unable to download " << build << ":" << artifact_name << " to "
                                   << target_filepath);

base/cvd/cuttlefish/host/libs/web/build_zip_name.cc

@@ -18,31 +18,14 @@
 #include <string>
 #include <variant>
 
-#include "android-base/strings.h"
 #include "cuttlefish/host/libs/web/android_build.h"
 
 namespace cuttlefish {
 
 std::string GetBuildZipName(const Build& build, const std::string& name) {
   std::string product =
       std::visit([](auto&& arg) { return arg.product; }, build);
-  const auto is_signed =
-      std::visit([](auto&& arg) { return arg.is_signed; }, build);
-  const auto& target = std::visit(
-      [](const auto& arg) -> const std::string& { return arg.target; }, build);
   const auto id = std::visit([](auto&& arg) { return arg.id; }, build);
-  std::string dir_prefix;
-  if (is_signed && android::base::EndsWith(target, "-user") &&
-      !android::base::EndsWith(target, "-userdebug")) {
-    dir_prefix = "signed/";
-  }
-
-  const auto filepath =
-      std::visit([](auto&& arg) { return arg.filepath; }, build);
-  if (filepath && !filepath->empty()) {
-    return dir_prefix + *filepath;
-  }
-
   return product + "-" + name + "-" + id + ".zip";
 }