revert changing ResourcePaths:Config()

Author: plusplusjiajia

src/iceberg/catalog/rest/resource_paths.cc

@@ -38,8 +38,8 @@ Result<std::unique_ptr<ResourcePaths>> ResourcePaths::Make(std::string base_uri,
 ResourcePaths::ResourcePaths(std::string base_uri, const std::string& prefix)
     : base_uri_(std::move(base_uri)), prefix_(prefix.empty() ? "" : (prefix + "/")) {}
 
-Result<std::string> ResourcePaths::Config(const std::string& base_uri) {
-  return std::format("{}/v1/config", base_uri);
+Result<std::string> ResourcePaths::Config() const {
+  return std::format("{}/v1/config", base_uri_);
 }
 
 Result<std::string> ResourcePaths::OAuth2Tokens() const {

src/iceberg/catalog/rest/resource_paths.h

@@ -44,7 +44,7 @@ class ICEBERG_REST_EXPORT ResourcePaths {
                                                      const std::string& prefix);
 
   /// \brief Get the /v1/config endpoint path.
-  static Result<std::string> Config(const std::string& base_uri);
+  Result<std::string> Config() const;
 
   /// \brief Get the /v1/{prefix}/oauth/tokens endpoint path.
   Result<std::string> OAuth2Tokens() const;

src/iceberg/catalog/rest/rest_catalog.cc

@@ -63,8 +63,9 @@ std::unordered_set<Endpoint> GetDefaultEndpoints() {
 }
 
 /// \brief Fetch server config and merge it with client config
-Result<CatalogConfig> FetchServerConfig(const std::string& config_path,
+Result<CatalogConfig> FetchServerConfig(const ResourcePaths& paths,
                                         const RestCatalogProperties& current_config) {
+  ICEBERG_ASSIGN_OR_RAISE(auto config_path, paths.Config());
   HttpClient client(current_config.ExtractHeaders());
   ICEBERG_ASSIGN_OR_RAISE(const auto response,
                           client.Get(config_path, /*params=*/{}, /*headers=*/{},
@@ -110,9 +111,10 @@ Result<std::shared_ptr<RestCatalog>> RestCatalog::Make(
   if (!file_io) {
     return InvalidArgument("FileIO is required to create RestCatalog");
   }
-  ICEBERG_ASSIGN_OR_RAISE(auto config_uri,
-                          ResourcePaths::Config(std::string(TrimTrailingSlash(uri))));
-  ICEBERG_ASSIGN_OR_RAISE(auto server_config, FetchServerConfig(config_uri, config));
+  ICEBERG_ASSIGN_OR_RAISE(
+      auto paths, ResourcePaths::Make(std::string(TrimTrailingSlash(uri)),
+                                      config.Get(RestCatalogProperties::kPrefix)));
+  ICEBERG_ASSIGN_OR_RAISE(auto server_config, FetchServerConfig(*paths, config));
 
   std::unique_ptr<RestCatalogProperties> final_config = RestCatalogProperties::FromMap(
       MergeConfigs(server_config.defaults, config.configs(), server_config.overrides));
@@ -131,7 +133,7 @@ Result<std::shared_ptr<RestCatalog>> RestCatalog::Make(
   // Update resource paths based on the final config
   ICEBERG_ASSIGN_OR_RAISE(auto final_uri, final_config->Uri());
   ICEBERG_ASSIGN_OR_RAISE(
-      auto paths, ResourcePaths::Make(std::string(TrimTrailingSlash(final_uri)),
+      paths, ResourcePaths::Make(std::string(TrimTrailingSlash(final_uri)),
                                       final_config->Get(RestCatalogProperties::kPrefix)));
 
   return std::shared_ptr<RestCatalog>(