Support failures in the GPT partition config generation

Right now the partition config generation produces references to image
files, which are assumed will exist in the future.

Reporting errors allows the partition config generation to possibly
invoke the logic that actually generates the partitions being referred
to.

Bug: b/470170417

Author: Databean

base/cvd/cuttlefish/host/commands/assemble_cvd/assemble_cvd.cc

@@ -342,10 +342,14 @@ Result<const CuttlefishConfig*> InitFilesystemAndCreateConfig(
       Result<std::optional<ChromeOsStateImage>> chrome_os_state =
           CF_EXPECT(ChromeOsStateImage::Reuse(instance));
       if (chrome_os_state.ok() && metadata.ok() && misc.ok()) {
-        DiskBuilder os_builder =
+        Result<DiskBuilder> os_builder =
             OsCompositeDiskBuilder(config, instance, *chrome_os_state,
                                    *metadata, *misc, system_image_dir);
-        creating_os_disk |= CF_EXPECT(os_builder.WillRebuildCompositeDisk());
+        if (!os_builder.ok()) {
+          creating_os_disk = true;
+        } else {
+          creating_os_disk |= CF_EXPECT(os_builder->WillRebuildCompositeDisk());
+        }
       } else {
         creating_os_disk = true;
         break;

base/cvd/cuttlefish/host/commands/assemble_cvd/create_dynamic_disk_files.cc

@@ -161,8 +161,8 @@ Result<void> CreateDynamicDiskFiles(
     MetadataImage metadata = CF_EXPECT(MetadataImage::ReuseOrCreate(instance));
     MiscImage misc = CF_EXPECT(MiscImage::ReuseOrCreate(instance));
 
-    DiskBuilder os_disk_builder = OsCompositeDiskBuilder(
-        config, instance, chrome_os_state, metadata, misc, system_image_dirs);
+    DiskBuilder os_disk_builder = CF_EXPECT(OsCompositeDiskBuilder(
+        config, instance, chrome_os_state, metadata, misc, system_image_dirs));
     const auto os_built_composite =
         CF_EXPECT(os_disk_builder.BuildCompositeDiskIfNecessary());
 

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

@@ -22,6 +22,7 @@ cf_cc_library(
     hdrs = ["android_composite_disk_config.h"],
     deps = [
         "//cuttlefish/common/libs/utils:files",
+        "//cuttlefish/common/libs/utils:result",
         "//cuttlefish/host/commands/assemble_cvd/disk:metadata_image",
         "//cuttlefish/host/commands/assemble_cvd/disk:misc_image",
         "//cuttlefish/host/commands/assemble_cvd/flags:system_image_dir",
@@ -37,6 +38,7 @@ cf_cc_library(
     hdrs = ["android_efi_loader_composite_disk.h"],
     deps = [
         "//cuttlefish/common/libs/utils:files",
+        "//cuttlefish/common/libs/utils:result",
         "//cuttlefish/host/commands/assemble_cvd/disk:android_composite_disk_config",
         "//cuttlefish/host/commands/assemble_cvd/disk:metadata_image",
         "//cuttlefish/host/commands/assemble_cvd/disk:misc_image",
@@ -263,6 +265,7 @@ cf_cc_library(
     srcs = ["os_composite_disk.cc"],
     hdrs = ["os_composite_disk.h"],
     deps = [
+        "//cuttlefish/common/libs/utils:result",
         "//cuttlefish/host/commands/assemble_cvd:assemble_cvd_flags",
         "//cuttlefish/host/commands/assemble_cvd:disk_builder",
         "//cuttlefish/host/commands/assemble_cvd/disk:android_composite_disk_config",

base/cvd/cuttlefish/host/commands/assemble_cvd/disk/android_composite_disk_config.cc

@@ -25,6 +25,7 @@
 #include <android-base/strings.h>
 
 #include "cuttlefish/common/libs/utils/files.h"
+#include "cuttlefish/common/libs/utils/result.h"
 #include "cuttlefish/host/commands/assemble_cvd/disk/metadata_image.h"
 #include "cuttlefish/host/commands/assemble_cvd/disk/misc_image.h"
 #include "cuttlefish/host/commands/assemble_cvd/flags/system_image_dir.h"
@@ -48,7 +49,7 @@ std::optional<ImagePartition> HibernationImage(
 
 }  // namespace
 
-std::vector<ImagePartition> AndroidCompositeDiskConfig(
+Result<std::vector<ImagePartition>> AndroidCompositeDiskConfig(
     const CuttlefishConfig::InstanceSpecific& instance,
     const MetadataImage& metadata_image, const MiscImage& misc_image,
     const SystemImageDirFlag& system_image_dir) {

base/cvd/cuttlefish/host/commands/assemble_cvd/disk/android_composite_disk_config.h

@@ -17,6 +17,7 @@
 
 #include <vector>
 
+#include "cuttlefish/common/libs/utils/result.h"
 #include "cuttlefish/host/commands/assemble_cvd/disk/metadata_image.h"
 #include "cuttlefish/host/commands/assemble_cvd/disk/misc_image.h"
 #include "cuttlefish/host/commands/assemble_cvd/flags/system_image_dir.h"
@@ -25,7 +26,7 @@
 
 namespace cuttlefish {
 
-std::vector<ImagePartition> AndroidCompositeDiskConfig(
+Result<std::vector<ImagePartition>> AndroidCompositeDiskConfig(
     const CuttlefishConfig::InstanceSpecific& instance, const MetadataImage&,
     const MiscImage&, const SystemImageDirFlag&);
 

base/cvd/cuttlefish/host/commands/assemble_cvd/disk/android_efi_loader_composite_disk.cc

@@ -19,6 +19,7 @@
 #include <vector>
 
 #include "cuttlefish/common/libs/utils/files.h"
+#include "cuttlefish/common/libs/utils/result.h"
 #include "cuttlefish/host/commands/assemble_cvd/disk/android_composite_disk_config.h"
 #include "cuttlefish/host/commands/assemble_cvd/disk/metadata_image.h"
 #include "cuttlefish/host/commands/assemble_cvd/disk/misc_image.h"
@@ -29,12 +30,12 @@
 
 namespace cuttlefish {
 
-std::vector<ImagePartition> AndroidEfiLoaderCompositeDiskConfig(
+Result<std::vector<ImagePartition>> AndroidEfiLoaderCompositeDiskConfig(
     const CuttlefishConfig::InstanceSpecific& instance,
     const MetadataImage& metadata, const MiscImage& misc,
     const SystemImageDirFlag& system_image_dir) {
-  std::vector<ImagePartition> partitions =
-      AndroidCompositeDiskConfig(instance, metadata, misc, system_image_dir);
+  std::vector<ImagePartition> partitions = CF_EXPECT(
+      AndroidCompositeDiskConfig(instance, metadata, misc, system_image_dir));
   // Cuttlefish uboot EFI bootflow by default looks at the first partition
   // for EFI application. Thus we put "android_esp" at the beginning.
   partitions.insert(

base/cvd/cuttlefish/host/commands/assemble_cvd/disk/android_efi_loader_composite_disk.h

@@ -18,6 +18,7 @@
 
 #include <vector>
 
+#include "cuttlefish/common/libs/utils/result.h"
 #include "cuttlefish/host/commands/assemble_cvd/disk/metadata_image.h"
 #include "cuttlefish/host/commands/assemble_cvd/disk/misc_image.h"
 #include "cuttlefish/host/commands/assemble_cvd/flags/system_image_dir.h"
@@ -26,7 +27,7 @@
 
 namespace cuttlefish {
 
-std::vector<ImagePartition> AndroidEfiLoaderCompositeDiskConfig(
+Result<std::vector<ImagePartition>> AndroidEfiLoaderCompositeDiskConfig(
     const CuttlefishConfig::InstanceSpecific& instance, const MetadataImage&,
     const MiscImage&, const SystemImageDirFlag&);
 

base/cvd/cuttlefish/host/commands/assemble_cvd/disk/os_composite_disk.cc

@@ -21,6 +21,7 @@
 
 #include <android-base/logging.h>
 
+#include "cuttlefish/common/libs/utils/result.h"
 #include "cuttlefish/host/commands/assemble_cvd/assemble_cvd_flags.h"
 #include "cuttlefish/host/commands/assemble_cvd/disk/android_composite_disk_config.h"
 #include "cuttlefish/host/commands/assemble_cvd/disk/android_efi_loader_composite_disk.h"
@@ -39,18 +40,18 @@
 namespace cuttlefish {
 namespace {
 
-std::vector<ImagePartition> GetOsCompositeDiskConfig(
+Result<std::vector<ImagePartition>> GetOsCompositeDiskConfig(
     const CuttlefishConfig::InstanceSpecific& instance,
     const std::optional<ChromeOsStateImage>& chrome_os_state,
     const MetadataImage& metadata, const MiscImage& misc,
     const SystemImageDirFlag& system_image_dir) {
   switch (instance.boot_flow()) {
     case BootFlow::Android:
-      return AndroidCompositeDiskConfig(instance, metadata, misc,
-                                        system_image_dir);
+      return CF_EXPECT(AndroidCompositeDiskConfig(instance, metadata, misc,
+                                                  system_image_dir));
     case BootFlow::AndroidEfiLoader:
-      return AndroidEfiLoaderCompositeDiskConfig(instance, metadata, misc,
-                                                 system_image_dir);
+      return CF_EXPECT(AndroidEfiLoaderCompositeDiskConfig(
+          instance, metadata, misc, system_image_dir));
     case BootFlow::ChromeOs:
       CHECK(chrome_os_state.has_value());
       return ChromeOsCompositeDiskConfig(instance, *chrome_os_state);
@@ -65,7 +66,7 @@ std::vector<ImagePartition> GetOsCompositeDiskConfig(
 
 }  // namespace
 
-DiskBuilder OsCompositeDiskBuilder(
+Result<DiskBuilder> OsCompositeDiskBuilder(
     const CuttlefishConfig& config,
     const CuttlefishConfig::InstanceSpecific& instance,
     const std::optional<ChromeOsStateImage>& chrome_os_state,
@@ -83,8 +84,8 @@ DiskBuilder OsCompositeDiskBuilder(
         .CompositeDiskPath(instance.chromeos_disk());
   }
   return builder
-      .Partitions(GetOsCompositeDiskConfig(instance, chrome_os_state, metadata,
-                                           misc, system_image_dir))
+      .Partitions(CF_EXPECT(GetOsCompositeDiskConfig(
+          instance, chrome_os_state, metadata, misc, system_image_dir)))
       .HeaderPath(instance.PerInstancePath("os_composite_gpt_header.img"))
       .FooterPath(instance.PerInstancePath("os_composite_gpt_footer.img"))
       .CompositeDiskPath(instance.os_composite_disk_path());

base/cvd/cuttlefish/host/commands/assemble_cvd/disk/os_composite_disk.h

@@ -18,6 +18,7 @@
 
 #include <optional>
 
+#include "cuttlefish/common/libs/utils/result.h"
 #include "cuttlefish/host/commands/assemble_cvd/disk/chromeos_state.h"
 #include "cuttlefish/host/commands/assemble_cvd/disk/metadata_image.h"
 #include "cuttlefish/host/commands/assemble_cvd/disk/misc_image.h"
@@ -27,7 +28,7 @@
 
 namespace cuttlefish {
 
-DiskBuilder OsCompositeDiskBuilder(
+Result<DiskBuilder> OsCompositeDiskBuilder(
     const CuttlefishConfig& config,
     const CuttlefishConfig::InstanceSpecific& instance,
     const std::optional<ChromeOsStateImage>&, const MetadataImage&,