add demo with cpp-httplib

Author: HeartLinked

src/iceberg/catalog/rest/rest_catalog.cc

@@ -19,17 +19,23 @@
 
 #include "iceberg/catalog/rest/rest_catalog.h"
 
+#include <utility>
+
 #include <cpr/cpr.h>
 
 namespace iceberg::catalog::rest {
 
 RestCatalog::RestCatalog(const std::string& base_url) : base_url_(std::move(base_url)) {}
 
-cpr::Response RestCatalog::testCprIntegration() {
-  // Simple GET request demo
-  cpr::Response r =
-      cpr::Get(cpr::Url{"https://httpbin.org/get"}, cpr::Parameters{{"hello", "world"}});
+cpr::Response RestCatalog::GetConfig() {
+  cpr::Url url = cpr::Url{base_url_ + "/v1/config"};
+  cpr::Response r = cpr::Get(url);
+  return r;
+}
 
+cpr::Response RestCatalog::ListNamespaces() {
+  cpr::Url url = cpr::Url{base_url_ + "/v1/namespaces"};
+  cpr::Response r = cpr::Get(url);
   return r;
 }
 

src/iceberg/catalog/rest/rest_catalog.h

@@ -19,7 +19,7 @@
 
 #include <string>
 
-#include "cpr/response.h"
+#include <cpr/cpr.h>
 
 namespace iceberg::catalog::rest {
 
@@ -28,7 +28,9 @@ class RestCatalog {
   explicit RestCatalog(const std::string& base_url);
   ~RestCatalog() = default;
 
-  cpr::Response testCprIntegration();
+  cpr::Response GetConfig();
+
+  cpr::Response ListNamespaces();
 
  private:
   std::string base_url_;

test/CMakeLists.txt

@@ -15,13 +15,23 @@
 # specific language governing permissions and limitations
 # under the License.
 
+fetchcontent_declare(cpp-httplib
+                     GIT_REPOSITORY https://github.com/yhirose/cpp-httplib.git
+                     GIT_TAG 89c932f313c6437c38f2982869beacc89c2f2246 #release-0.26.0
+)
+
 fetchcontent_declare(googletest
                      GIT_REPOSITORY https://github.com/google/googletest.git
                      GIT_TAG b514bdc898e2951020cbdca1304b75f5950d1f59 # release-1.15.2
                      FIND_PACKAGE_ARGS
                      NAMES
                      GTest)
-fetchcontent_makeavailable(googletest)
+
+if(ICEBERG_BUILD_REST_CATALOG)
+  fetchcontent_makeavailable(cpp-httplib googletest)
+else()
+  fetchcontent_makeavailable(googletest)
+endif()
 
 set(ICEBERG_TEST_RESOURCES "${CMAKE_SOURCE_DIR}/test/resources")
 
@@ -129,4 +139,12 @@ endif()
 if(ICEBERG_BUILD_REST_CATALOG)
   add_iceberg_test(rest_catalog_test SOURCES rest_catalog_test.cc)
   target_link_libraries(rest_catalog_test PRIVATE iceberg_rest_catalog_static)
+  target_include_directories(rest_catalog_test PRIVATE ${cpp-httplib_SOURCE_DIR})
+
+  if(WIN32)
+    target_link_libraries(rest_catalog_test PRIVATE ws2_32 crypt32)
+  else()
+    target_link_libraries(rest_catalog_test PRIVATE Threads::Threads)
+  endif()
+
 endif()

test/rest_catalog_test.cc

@@ -19,37 +19,93 @@
 
 #include "iceberg/catalog/rest/rest_catalog.h"
 
+#include <httplib.h>
+
+#include <memory>
+#include <thread>
+
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
-
-#include "cpr/error.h"
-#include "cpr/response.h"
+#include <nlohmann/json.hpp>
 
 namespace iceberg::catalog::rest {
 
-class RestCatalogTest : public ::testing::Test {};
+class RestCatalogIntegrationTest : public ::testing::Test {
+ protected:
+  void SetUp() override {
+    server_ = std::make_unique<httplib::Server>();
+    port_ = server_->bind_to_any_port("127.0.0.1");
 
-TEST_F(RestCatalogTest, CanCreateRestCatalog) {
-  RestCatalog catalog("http://localhost:8181");
-  SUCCEED();
-}
+    server_thread_ = std::thread([this]() { server_->listen_after_bind(); });
+  }
+
+  void TearDown() override {
+    server_->stop();
+    if (server_thread_.joinable()) {
+      server_thread_.join();
+    }
+  }
+
+  std::unique_ptr<httplib::Server> server_;
+  int port_ = -1;
+  std::thread server_thread_;
+};
+
+TEST_F(RestCatalogIntegrationTest, GetConfigSuccessfully) {
+  server_->Get("/v1/config", [](const httplib::Request&, httplib::Response& res) {
+    res.status = 200;
+    res.set_content(R"({"warehouse": "s3://test-bucket"})", "application/json");
+  });
 
-TEST_F(RestCatalogTest, MultipleCatalogInstances) {
-  RestCatalog catalog1("http://localhost:8181");
-  RestCatalog catalog2("http://localhost:8182");
-  SUCCEED();
+  std::string base_uri = "http://127.0.0.1:" + std::to_string(port_);
+  RestCatalog catalog(base_uri);
+  cpr::Response response = catalog.GetConfig();
+
+  ASSERT_EQ(response.error.code, cpr::ErrorCode::OK);
+  ASSERT_EQ(response.status_code, 200);
+
+  auto json_body = nlohmann::json::parse(response.text);
+  EXPECT_EQ(json_body["warehouse"], "s3://test-bucket");
 }
 
-TEST_F(RestCatalogTest, TestCprIntegration) {
-  RestCatalog catalog("http://localhost:8181");
+TEST_F(RestCatalogIntegrationTest, ListNamespacesReturnsMultipleResults) {
+  server_->Get("/v1/namespaces", [](const httplib::Request&, httplib::Response& res) {
+    res.status = 200;
+    res.set_content(R"({
+         "namespaces": [
+             ["accounting", "db"],
+             ["production", "db"]
+         ]
+     })",
+                    "application/json");
+  });
+
+  std::string base_uri = "http://127.0.0.1:" + std::to_string(port_);
+  RestCatalog catalog(base_uri);
+  cpr::Response response = catalog.ListNamespaces();
+
+  ASSERT_EQ(response.error.code, cpr::ErrorCode::OK);
+  ASSERT_EQ(response.status_code, 200);
+
+  auto json_body = nlohmann::json::parse(response.text);
+  ASSERT_TRUE(json_body.contains("namespaces"));
+  EXPECT_EQ(json_body["namespaces"].size(), 2);
+  EXPECT_THAT(json_body["namespaces"][0][0], "accounting");
+}
 
-  cpr::Response response = catalog.testCprIntegration();
+TEST_F(RestCatalogIntegrationTest, HandlesServerError) {
+  server_->Get("/v1/config", [](const httplib::Request&, httplib::Response& res) {
+    res.status = 500;
+    res.set_content("Internal Server Error", "text/plain");
+  });
 
-  ASSERT_EQ(response.error.code, cpr::ErrorCode::OK)
-      << "CPR transport error: " << response.error.message;
+  std::string base_uri = "http://127.0.0.1:" + std::to_string(port_);
+  RestCatalog catalog(base_uri);
+  cpr::Response response = catalog.GetConfig();
 
-  EXPECT_EQ(response.status_code, 200);
-  EXPECT_THAT(response.text, ::testing::HasSubstr("\"hello\": \"world\""));
+  ASSERT_EQ(response.error.code, cpr::ErrorCode::OK);
+  ASSERT_EQ(response.status_code, 500);
+  ASSERT_EQ(response.text, "Internal Server Error");
 }
 
 }  // namespace iceberg::catalog::rest