Use FileSource to filter searching FetcherConfig for files

This reduces the chance of false positives when searching for the
`kernel` and `initramfs.img` files. This is relevant because the
presence of the `kernel` file is used as a signal to distinguish whether
`cvd fetch` was called with the `--kernel_build` argument.

Bug: b/462235783

Author: Databean

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

@@ -154,6 +154,7 @@ cf_cc_library(
     deps = [
         "//cuttlefish/host/commands/assemble_cvd:flags_defaults",
         "//cuttlefish/host/libs/config:fetcher_config",
+        "//cuttlefish/host/libs/config:file_source",
         "//libbase",
         "@gflags",
     ],
@@ -166,6 +167,7 @@ cf_cc_library(
     deps = [
         "//cuttlefish/host/commands/assemble_cvd:flags_defaults",
         "//cuttlefish/host/libs/config:fetcher_config",
+        "//cuttlefish/host/libs/config:file_source",
         "//libbase",
         "@gflags",
     ],

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

@@ -39,9 +39,9 @@ InitramfsPathFlag InitramfsPathFlag::FromGlobalGflags(
   std::vector<std::string> initramfs_paths;
   if (flag_info.is_default) {
     for (size_t i = 0; i < fetcher_configs.Size(); ++i) {
-      initramfs_paths.emplace_back(
-          fetcher_configs.ForInstance(i).FindCvdFileWithSuffix(
-              "initramfs.img"));
+      const FetcherConfig& fetcher_config = fetcher_configs.ForInstance(i);
+      initramfs_paths.emplace_back(fetcher_config.FindCvdFileWithSuffix(
+          FileSource::KERNEL_BUILD, "initramfs.img"));
     }
   } else {
     initramfs_paths = android::base::Split(flag_info.current_value, ",");

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

@@ -25,6 +25,7 @@
 
 #include "cuttlefish/host/commands/assemble_cvd/flags_defaults.h"
 #include "cuttlefish/host/libs/config/fetcher_config.h"
+#include "cuttlefish/host/libs/config/file_source.h"
 
 DEFINE_string(kernel_path, CF_DEFAULTS_KERNEL_PATH,
               "Path to the kernel. Overrides the one from the boot image");
@@ -40,8 +41,9 @@ KernelPathFlag KernelPathFlag::FromGlobalGflags(
 
   if (flag_info.is_default) {
     for (size_t i = 0; i < fetcher_configs.Size(); ++i) {
-      kernel_paths.emplace_back(
-          fetcher_configs.ForInstance(i).FindCvdFileWithSuffix("kernel"));
+      const FetcherConfig& fetcher_config = fetcher_configs.ForInstance(i);
+      kernel_paths.emplace_back(fetcher_config.FindCvdFileWithSuffix(
+          FileSource::KERNEL_BUILD, "kernel"));
     }
   } else {
     kernel_paths = android::base::Split(flag_info.current_value, ",");

base/cvd/cuttlefish/host/libs/config/fetcher_config.cpp

@@ -212,18 +212,23 @@ std::map<std::string, CvdFile> FetcherConfig::get_cvd_files() const {
 }
 
 std::string FetcherConfig::FindCvdFileWithSuffix(
-    const std::string& suffix) const {
+    FileSource source, std::string_view suffix) const {
   std::scoped_lock lock(*mutex_);
 
   if (!dictionary_.isMember(kCvdFiles)) {
     return {};
   }
-  const auto& json_files = dictionary_[kCvdFiles];
+  const Json::Value& json_files = dictionary_[kCvdFiles];
   for (auto it = json_files.begin(); it != json_files.end(); it++) {
-    const auto& file = it.key().asString();
-    if (absl::EndsWith(file, suffix)) {
-      return file;
+    const std::string& file = it.key().asString();
+    if (!absl::EndsWith(file, suffix)) {
+      continue;
+    }
+    CvdFile parsed = JsonToCvdFile(file, *it);
+    if (parsed.source != source) {
+      continue;
     }
+    return file;
   }
   LOG(DEBUG) << "Could not find file ending in " << suffix;
   return "";

base/cvd/cuttlefish/host/libs/config/fetcher_config.h

@@ -20,6 +20,7 @@
 #include <mutex>
 #include <ostream>
 #include <string>
+#include <string_view>
 #include <vector>
 
 #include "json/value.h"
@@ -79,7 +80,8 @@ class FetcherConfig {
   bool add_cvd_file(const CvdFile& file, bool override_entry = false);
   std::map<std::string, CvdFile> get_cvd_files() const;
 
-  std::string FindCvdFileWithSuffix(const std::string& suffix) const;
+  std::string FindCvdFileWithSuffix(FileSource source,
+                                    std::string_view suffix) const;
 
   Result<void> RemoveFileFromConfig(const std::string& path);