Skip to content

Commit 5d989eb

Browse files
[bug] fix building
1 parent eb85834 commit 5d989eb

3 files changed

Lines changed: 12 additions & 9 deletions

File tree

CMakeLists.txt

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ set(RUST_TARGET_DIR "target/debug")
1717
file(GLOB_RECURSE CXXBRIDGE_HEADERS "${RUST_TARGET_DIR}/build/*lib.rs.h")
1818
file(GLOB_RECURSE CXXBRIDGE_SOURCES "${RUST_TARGET_DIR}/build/*lib.rs.cc")
1919
file(GLOB_RECURSE CXX_CORE_HEADER "${RUST_TARGET_DIR}/build/*/cxx.h")
20+
file(GLOB RUST_STATIC_LIB "${RUST_TARGET_DIR}/libfluvio*.a")
21+
list(GET RUST_STATIC_LIB 0 FLUVIO_STATIC_LIB)
2022

2123
list(GET CXXBRIDGE_HEADERS 0 CXXBRIDGE_HEADER)
2224
get_filename_component(CXXBRIDGE_HDR_DIR ${CXXBRIDGE_HEADER} DIRECTORY)
@@ -31,7 +33,7 @@ target_include_directories(test_producer PRIVATE
3133
${CXX_ROOT_DIR}
3234
)
3335
target_link_libraries(test_producer PRIVATE
34-
${CMAKE_CURRENT_SOURCE_DIR}/${RUST_TARGET_DIR}/libfluvio_client_cpp_sys.a
36+
${FLUVIO_STATIC_LIB}
3537
pthread dl m
3638
)
3739
add_test(NAME fluvio_producer_test COMMAND test_producer)
@@ -43,7 +45,7 @@ target_include_directories(test_consumer PRIVATE
4345
${CXX_ROOT_DIR}
4446
)
4547
target_link_libraries(test_consumer PRIVATE
46-
${CMAKE_CURRENT_SOURCE_DIR}/${RUST_TARGET_DIR}/libfluvio_client_cpp_sys.a
48+
${FLUVIO_STATIC_LIB}
4749
pthread dl m
4850
)
4951
add_test(NAME fluvio_consumer_test COMMAND test_consumer)
@@ -52,7 +54,7 @@ add_test(NAME fluvio_consumer_test COMMAND test_consumer)
5254
add_executable(test_admin tests/test_admin.cpp ${CXXBRIDGE_SOURCES})
5355
target_include_directories(test_admin PRIVATE ${CXXBRIDGE_HDR_DIR}/../.. ${CXX_ROOT_DIR})
5456
target_link_libraries(test_admin PRIVATE
55-
${CMAKE_CURRENT_SOURCE_DIR}/${RUST_TARGET_DIR}/libfluvio_client_cpp_sys.a
57+
${FLUVIO_STATIC_LIB}
5658
pthread dl m
5759
)
5860
add_test(NAME fluvio_admin_test COMMAND test_admin)
@@ -61,7 +63,7 @@ add_test(NAME fluvio_admin_test COMMAND test_admin)
6163
add_executable(test_config tests/test_config.cpp ${CXXBRIDGE_SOURCES})
6264
target_include_directories(test_config PRIVATE ${CXXBRIDGE_HDR_DIR}/../.. ${CXX_ROOT_DIR})
6365
target_link_libraries(test_config PRIVATE
64-
${CMAKE_CURRENT_SOURCE_DIR}/${RUST_TARGET_DIR}/libfluvio_client_cpp_sys.a
66+
${FLUVIO_STATIC_LIB}
6567
pthread dl m
6668
)
6769
add_test(NAME fluvio_config_test COMMAND test_config)
@@ -70,7 +72,7 @@ add_test(NAME fluvio_config_test COMMAND test_config)
7072
add_executable(test_c tests/test_c.c)
7173
target_include_directories(test_c PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include)
7274
target_link_libraries(test_c PRIVATE
73-
${CMAKE_CURRENT_SOURCE_DIR}/${RUST_TARGET_DIR}/libfluvio_client_cpp_sys.a
75+
${FLUVIO_STATIC_LIB}
7476
stdc++ pthread dl m
7577
)
7678
add_test(NAME fluvio_c_native_test COMMAND test_c)
@@ -79,7 +81,7 @@ add_test(NAME fluvio_c_native_test COMMAND test_c)
7981
add_executable(test_auth tests/test_auth.cpp ${CXXBRIDGE_SOURCES})
8082
target_include_directories(test_auth PRIVATE ${CXXBRIDGE_HDR_DIR}/../.. ${CXX_ROOT_DIR})
8183
target_link_libraries(test_auth PRIVATE
82-
${CMAKE_CURRENT_SOURCE_DIR}/${RUST_TARGET_DIR}/libfluvio_client_cpp_sys.a
84+
${FLUVIO_STATIC_LIB}
8385
pthread dl m
8486
)
8587
add_test(NAME fluvio_auth_test COMMAND test_auth)
@@ -88,7 +90,7 @@ add_test(NAME fluvio_auth_test COMMAND test_auth)
8890
add_executable(test_auth_c tests/test_auth_c.c)
8991
target_include_directories(test_auth_c PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include)
9092
target_link_libraries(test_auth_c PRIVATE
91-
${CMAKE_CURRENT_SOURCE_DIR}/${RUST_TARGET_DIR}/libfluvio_client_cpp_sys.a
93+
${FLUVIO_STATIC_LIB}
9294
stdc++ pthread dl m
9395
)
9496
add_test(NAME fluvio_auth_c_test COMMAND test_auth_c)

src/consumer.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
#![allow(deprecated)]
2+
13
use fluvio::{PartitionConsumer, Offset, consumer::Record as NativeRecord};
24
use fluvio_future::task::run_block_on;
35
use futures_util::stream::StreamExt;
@@ -17,7 +19,6 @@ pub fn partition_consumer(client: &FluvioClient, topic: &str, partition: u32) ->
1719
run_block_on(client.inner.partition_consumer(topic, partition)).map(|c| Box::new(FluvioConsumer { inner: c })).map_err(|e| e.to_string())
1820
}
1921

20-
#[allow(deprecated)]
2122
pub fn consumer_with_config(client: &FluvioClient, topic: &str, partition: u32, config: &ConsumerConfigWrapper) -> Result<Box<FluvioStream>, String> {
2223
let consumer = run_block_on(client.inner.partition_consumer(topic, partition)).map_err(|e| e.to_string())?;
2324
let built_config = config.inner.build().map_err(|e| e.to_string())?;

tests/test_auth.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ int main() {
1111
const char* cert = std::getenv("FLUVIO_E2E_TLS_CERT");
1212
const char* ca = std::getenv("FLUVIO_E2E_TLS_CA");
1313

14-
auto fluvioConfig = fluvio_config_new(domain ? domain : "localhost:9003");
14+
auto fluvioConfig = fluvio_config_new("localhost:9003");
1515

1616
if (domain && key && cert && ca) {
1717
std::cout << "[E2E-AUTH] Active TLS parameters detected! Configuring strict mTLS execution pipeline." << std::endl;

0 commit comments

Comments
 (0)