Use AndroidBuildUrl as a constructor parameter

Avoids passing multiple strings into `AndroidBuildApi` in favor of a
semantic object.

Also, include some dependencies used/referenced in `downloaders.cc`.

Author: cjreynol

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

@@ -72,6 +72,8 @@ cf_cc_library(
         "//cuttlefish/common/libs/utils:result",
         "//cuttlefish/host/commands/cvd/fetch:fetch_cvd_parser",
         "//cuttlefish/host/commands/cvd/utils:common",
+        "//cuttlefish/host/libs/web:android_build_api",
+        "//cuttlefish/host/libs/web:android_build_url",
         "//cuttlefish/host/libs/web:build_api",
         "//cuttlefish/host/libs/web:caching_build_api",
         "//cuttlefish/host/libs/web:credential_source",

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

@@ -22,6 +22,9 @@
 #include "cuttlefish/common/libs/utils/result.h"
 #include "cuttlefish/host/commands/cvd/fetch/fetch_cvd_parser.h"
 #include "cuttlefish/host/commands/cvd/utils/common.h"
+#include "cuttlefish/host/libs/web/android_build_api.h"
+#include "cuttlefish/host/libs/web/android_build_url.h"
+#include "cuttlefish/host/libs/web/build_api.h"
 #include "cuttlefish/host/libs/web/caching_build_api.h"
 #include "cuttlefish/host/libs/web/credential_source.h"
 #include "cuttlefish/host/libs/web/http_client/curl_http_client.h"
@@ -49,6 +52,7 @@ struct Downloaders::Impl {
   std::unique_ptr<HttpClient> curl_;
   std::unique_ptr<HttpClient> retrying_http_client_;
   std::unique_ptr<CredentialSource> android_creds_;
+  std::unique_ptr<AndroidBuildUrl> android_build_url_;
   std::unique_ptr<CasDownloader> cas_downloader_;
   std::unique_ptr<AndroidBuildApi> android_build_api_;
   std::unique_ptr<CachingBuildApi> caching_build_api_;
@@ -86,6 +90,9 @@ Result<Downloaders> Downloaders::Create(const BuildApiFlags& flags) {
           : CF_EXPECT(GetCredentialSourceFromFlags(*impl->retrying_http_client_,
                                                    flags, oauth_filepath));
 
+  impl->android_build_url_ = std::make_unique<AndroidBuildUrl>(
+      flags.api_base_url, flags.api_key, flags.project_id);
+
   Result<std::unique_ptr<CasDownloader>> cas_downloader_result =
       CasDownloader::Create(flags.cas_downloader_flags,
                             flags.credential_flags.service_account_filepath);
@@ -94,8 +101,8 @@ Result<Downloaders> Downloaders::Create(const BuildApiFlags& flags) {
   }
 
   impl->android_build_api_ = std::make_unique<AndroidBuildApi>(
-      *impl->retrying_http_client_, impl->android_creds_.get(), flags.api_key,
-      flags.wait_retry_period, flags.api_base_url, flags.project_id,
+      *impl->retrying_http_client_, impl->android_creds_.get(),
+      impl->android_build_url_.get(), flags.wait_retry_period,
       impl->cas_downloader_.get());
 
   const std::string cache_base_path = PerUserCacheDir();

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

@@ -101,15 +101,12 @@ std::ostream& operator<<(std::ostream& out, const Build& build) {
 
 AndroidBuildApi::AndroidBuildApi(HttpClient& http_client,
                                  CredentialSource* credential_source,
-                                 std::string api_key,
+                                 AndroidBuildUrl* android_build_url,
                                  const std::chrono::seconds retry_period,
-                                 std::string api_base_url,
-                                 std::string project_id,
                                  CasDownloader* cas_downloader)
     : http_client(http_client),
       credential_source(credential_source),
-      android_build_url_(std::move(api_base_url), std::move(api_key),
-                         std::move(project_id)),
+      android_build_url_(android_build_url),
       retry_period_(retry_period),
       cas_downloader_(cas_downloader) {}
 
@@ -188,7 +185,7 @@ 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);
+      android_build_url_->GetLatestBuildIdUrl(branch, target);
   auto response =
       CF_EXPECT(HttpGetToJson(http_client, url, CF_EXPECT(Headers())));
   const auto& json = response.data;
@@ -214,7 +211,7 @@ Result<std::optional<std::string>> AndroidBuildApi::LatestBuildId(
 
 Result<std::string> AndroidBuildApi::BuildStatus(const DeviceBuild& build) {
   const std::string url =
-      android_build_url_.GetBuildStatusUrl(build.id, build.target);
+      android_build_url_->GetBuildStatusUrl(build.id, build.target);
   auto response =
       CF_EXPECT(HttpGetToJson(http_client, url, CF_EXPECT(Headers())));
   const auto& json = response.data;
@@ -231,7 +228,7 @@ Result<std::string> AndroidBuildApi::BuildStatus(const DeviceBuild& build) {
 
 Result<std::string> AndroidBuildApi::ProductName(const DeviceBuild& build) {
   const std::string url =
-      android_build_url_.GetProductNameUrl(build.id, build.target);
+      android_build_url_->GetProductNameUrl(build.id, build.target);
   auto response =
       CF_EXPECT(HttpGetToJson(http_client, url, CF_EXPECT(Headers())));
   const auto& json = response.data;
@@ -252,7 +249,7 @@ Result<std::unordered_set<std::string>> AndroidBuildApi::Artifacts(
   std::string page_token = "";
   std::unordered_set<std::string> artifacts;
   do {
-    const std::string url = android_build_url_.GetArtifactUrl(
+    const std::string url = android_build_url_->GetArtifactUrl(
         build.id, build.target, artifact_filenames, page_token);
     auto response =
         CF_EXPECT(HttpGetToJson(http_client, url, CF_EXPECT(Headers())));
@@ -303,8 +300,8 @@ Result<std::unordered_set<std::string>> AndroidBuildApi::Artifacts(
 Result<std::string> AndroidBuildApi::GetArtifactDownloadUrl(
     const DeviceBuild& build, const std::string& artifact) {
   const std::string download_url_endpoint =
-      android_build_url_.GetArtifactDownloadUrl(build.id, build.target,
-                                                artifact);
+      android_build_url_->GetArtifactDownloadUrl(build.id, build.target,
+                                                 artifact);
   auto response = CF_EXPECT(
       HttpGetToJson(http_client, download_url_endpoint, CF_EXPECT(Headers())));
   const auto& json = response.data;

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

@@ -42,8 +42,8 @@ class AndroidBuildApi : public BuildApi {
   AndroidBuildApi(AndroidBuildApi&&) = delete;
   virtual ~AndroidBuildApi() = default;
   AndroidBuildApi(HttpClient& http_client, CredentialSource* credential_source,
-                  std::string api_key, std::chrono::seconds retry_period,
-                  std::string api_base_url, std::string project_id,
+                  AndroidBuildUrl* android_build_url,
+                  std::chrono::seconds retry_period,
                   CasDownloader* cas_downloader = nullptr);
 
   Result<Build> GetBuild(const BuildString& build_string) override;
@@ -103,7 +103,7 @@ class AndroidBuildApi : public BuildApi {
 
   HttpClient& http_client;
   CredentialSource* credential_source;
-  AndroidBuildUrl android_build_url_;
+  AndroidBuildUrl* android_build_url_;
   std::chrono::seconds retry_period_;
   CasDownloader* cas_downloader_;
 };