Skip to content

Commit 95ec7a3

Browse files
fix(rest): build resource paths from final config (#482)
1 parent 68fe381 commit 95ec7a3

File tree

3 files changed

+3
-13
lines changed

3 files changed

+3
-13
lines changed

src/iceberg/catalog/rest/resource_paths.cc

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,6 @@ Result<std::unique_ptr<ResourcePaths>> ResourcePaths::Make(std::string base_uri,
3838
ResourcePaths::ResourcePaths(std::string base_uri, const std::string& prefix)
3939
: base_uri_(std::move(base_uri)), prefix_(prefix.empty() ? "" : (prefix + "/")) {}
4040

41-
Status ResourcePaths::SetBaseUri(const std::string& base_uri) {
42-
if (base_uri.empty()) {
43-
return InvalidArgument("Base URI is empty");
44-
}
45-
base_uri_ = base_uri;
46-
return {};
47-
}
48-
4941
Result<std::string> ResourcePaths::Config() const {
5042
return std::format("{}/v1/config", base_uri_);
5143
}

src/iceberg/catalog/rest/resource_paths.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
#include <string>
2424

2525
#include "iceberg/catalog/rest/iceberg_rest_export.h"
26-
#include "iceberg/catalog/rest/type_fwd.h"
2726
#include "iceberg/result.h"
2827
#include "iceberg/type_fwd.h"
2928

@@ -44,9 +43,6 @@ class ICEBERG_REST_EXPORT ResourcePaths {
4443
static Result<std::unique_ptr<ResourcePaths>> Make(std::string base_uri,
4544
const std::string& prefix);
4645

47-
/// \brief Set the base URI of the REST catalog server.
48-
Status SetBaseUri(const std::string& base_uri);
49-
5046
/// \brief Get the /v1/config endpoint path.
5147
Result<std::string> Config() const;
5248

src/iceberg/catalog/rest/rest_catalog.cc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,9 @@ Result<std::shared_ptr<RestCatalog>> RestCatalog::Make(
132132

133133
// Update resource paths based on the final config
134134
ICEBERG_ASSIGN_OR_RAISE(auto final_uri, final_config->Uri());
135-
ICEBERG_RETURN_UNEXPECTED(paths->SetBaseUri(std::string(TrimTrailingSlash(final_uri))));
135+
ICEBERG_ASSIGN_OR_RAISE(
136+
paths, ResourcePaths::Make(std::string(TrimTrailingSlash(final_uri)),
137+
final_config->Get(RestCatalogProperties::kPrefix)));
136138

137139
return std::shared_ptr<RestCatalog>(
138140
new RestCatalog(std::move(final_config), std::move(file_io), std::move(paths),

0 commit comments

Comments
 (0)