diff --git a/.github/instructions/reviewing.instructions.md b/.github/instructions/reviewing.instructions.md index df8060af3a78..46e4bb9d6af3 100644 --- a/.github/instructions/reviewing.instructions.md +++ b/.github/instructions/reviewing.instructions.md @@ -58,7 +58,7 @@ Use this to verify that the correct check macro is used and that the error path ## libcurl -CCF wraps libcurl in `src/http/curl.h`. +CCF wraps libcurl in `src/http_client/curl.h`. | Macro | Use when … | | -------------------------------------------- | ----------------------------------- | diff --git a/CMakeLists.txt b/CMakeLists.txt index dee27f1f816e..a86b7c44f6c0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1599,7 +1599,7 @@ if(BUILD_TESTS) add_test_bin( curl_test - ${CMAKE_CURRENT_SOURCE_DIR}/src/http/test/curl_test.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/http_client/test/curl_test.cpp ) target_link_libraries(curl_test PRIVATE curl uv http_parser) diff --git a/scripts/source-dependencies.json b/scripts/source-dependencies.json index 5fff4bca0582..69681a50a6b1 100644 --- a/scripts/source-dependencies.json +++ b/scripts/source-dependencies.json @@ -34,6 +34,7 @@ "tls": ["crypto", "ds"], "udp": ["ds"], "uv": [], - "http": ["ccf-api", "crypto", "ds", "uv"] + "http": ["ccf-api", "crypto", "ds"], + "http_client": ["ccf-api", "ds", "uv"] } } diff --git a/src/host/run.cpp b/src/host/run.cpp index 24a2ec7ccabb..e047925db406 100644 --- a/src/host/run.cpp +++ b/src/host/run.cpp @@ -32,7 +32,7 @@ #include "handle_ring_buffer.h" #include "host/env.h" #include "host/files_cleanup_timer.h" -#include "http/curl.h" +#include "http_client/curl.h" #include "json_schema.h" #include "lfs_file_handler.h" #include "node_connections.h" diff --git a/src/http/curl.h b/src/http_client/curl.h similarity index 100% rename from src/http/curl.h rename to src/http_client/curl.h diff --git a/src/http/test/curl_test.cpp b/src/http_client/test/curl_test.cpp similarity index 99% rename from src/http/test/curl_test.cpp rename to src/http_client/test/curl_test.cpp index f9ef7993880b..85336c0a4038 100644 --- a/src/http/test/curl_test.cpp +++ b/src/http_client/test/curl_test.cpp @@ -4,7 +4,7 @@ #include "ccf/ds/json.h" #include "curl/curl.h" #include "ds/internal_logger.h" -#include "http/curl.h" +#include "http_client/curl.h" #include #include diff --git a/src/node/jwt_key_auto_refresh.h b/src/node/jwt_key_auto_refresh.h index 87e08ce46c46..673a394ce77e 100644 --- a/src/node/jwt_key_auto_refresh.h +++ b/src/node/jwt_key_auto_refresh.h @@ -6,8 +6,8 @@ #include "ccf/ds/nonstd.h" #include "ccf/service/tables/jwt.h" #include "enclave/http_rpc_context.h" -#include "http/curl.h" #include "http/http_builder.h" +#include "http_client/curl.h" #include "node/rpc/node_frontend.h" #include "tasks/basic_task.h" #include "tasks/task_system.h" diff --git a/src/node/node_state.h b/src/node/node_state.h index ba87f3778874..e808d179be55 100644 --- a/src/node/node_state.h +++ b/src/node/node_state.h @@ -30,8 +30,8 @@ #include "enclave/rpc_sessions.h" #include "encryptor.h" #include "history.h" -#include "http/curl.h" #include "http/http_parser.h" +#include "http_client/curl.h" #include "indexing/indexer.h" #include "js/global_class_ids.h" #include "network_state.h" diff --git a/src/node/quote_endorsements_client.h b/src/node/quote_endorsements_client.h index 63ec5774b94e..34da4a065a39 100644 --- a/src/node/quote_endorsements_client.h +++ b/src/node/quote_endorsements_client.h @@ -8,7 +8,7 @@ #include "ccf/http_consts.h" #include "ccf/pal/attestation.h" #include "ccf/pal/attestation_sev_snp_endorsements.h" -#include "http/curl.h" +#include "http_client/curl.h" #include "tasks/basic_task.h" #include "tasks/task.h" #include "tasks/task_system.h" diff --git a/src/node/recovery_decision_protocol.cpp b/src/node/recovery_decision_protocol.cpp index 31a1785985bb..a5c88d58eceb 100644 --- a/src/node/recovery_decision_protocol.cpp +++ b/src/node/recovery_decision_protocol.cpp @@ -9,7 +9,7 @@ #include "ccf/service/tables/self_healing_open.h" #include "ccf/tx.h" #include "ccf/tx_id.h" -#include "http/curl.h" +#include "http_client/curl.h" #include "node_state.h" #include "tasks/basic_task.h" #include "tasks/task_system.h" diff --git a/src/snapshots/fetch.h b/src/snapshots/fetch.h index 9e109b005f58..7aad50d7398b 100644 --- a/src/snapshots/fetch.h +++ b/src/snapshots/fetch.h @@ -5,8 +5,8 @@ #include "ccf/ds/nonstd.h" #include "ccf/rest_verb.h" #include "ds/internal_logger.h" -#include "http/curl.h" #include "http/http_builder.h" +#include "http_client/curl.h" #include #include