feat: add operations endpoint to get topics

Signed-off-by: kjuulh <contact@kjuulh.io>
This commit is contained in:
Kasper Juul Hermansen 2024-08-12 00:26:17 +02:00
parent 5cf8956cad
commit 8c1f7f829d
Signed by: kjuulh
GPG Key ID: D85D7535F18F35FA
6 changed files with 264 additions and 10 deletions

View File

@ -2,19 +2,42 @@
#[allow(clippy::derive_partial_eq_without_eq)] #[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Message)] #[derive(Clone, PartialEq, ::prost::Message)]
pub struct PublishEventRequest { pub struct PublishEventRequest {
#[prost(string, tag = "1")] #[prost(string, tag="1")]
pub topic: ::prost::alloc::string::String, pub topic: ::prost::alloc::string::String,
#[prost(message, optional, tag = "2")] #[prost(message, optional, tag="2")]
pub published: ::core::option::Option<::prost_types::Timestamp>, pub published: ::core::option::Option<::prost_types::Timestamp>,
#[prost(string, tag = "3")] #[prost(string, tag="3")]
pub key: ::prost::alloc::string::String, pub key: ::prost::alloc::string::String,
#[prost(bytes = "vec", tag = "4")] #[prost(bytes="vec", tag="4")]
pub value: ::prost::alloc::vec::Vec<u8>, pub value: ::prost::alloc::vec::Vec<u8>,
#[prost(string, optional, tag = "5")] #[prost(string, optional, tag="5")]
pub id: ::core::option::Option<::prost::alloc::string::String>, pub id: ::core::option::Option<::prost::alloc::string::String>,
} }
#[allow(clippy::derive_partial_eq_without_eq)] #[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Message)] #[derive(Clone, PartialEq, ::prost::Message)]
pub struct PublishEventResponse {} pub struct PublishEventResponse {
}
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct GetTopicsRequest {
}
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct GetTopicsResponse {
#[prost(string, repeated, tag="1")]
pub topics: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
}
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct GetKeysRequest {
#[prost(string, tag="1")]
pub topic: ::prost::alloc::string::String,
}
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct GetKeysResponse {
#[prost(string, repeated, tag="1")]
pub keys: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
}
include!("nodata.tonic.rs"); include!("nodata.tonic.rs");
// @@protoc_insertion_point(module) // @@protoc_insertion_point(module)

View File

@ -109,6 +109,50 @@ pub mod no_data_client {
.insert(GrpcMethod::new("nodata.NoData", "PublishEvent")); .insert(GrpcMethod::new("nodata.NoData", "PublishEvent"));
self.inner.unary(req, path, codec).await self.inner.unary(req, path, codec).await
} }
pub async fn get_topics(
&mut self,
request: impl tonic::IntoRequest<super::GetTopicsRequest>,
) -> std::result::Result<
tonic::Response<super::GetTopicsResponse>,
tonic::Status,
> {
self.inner
.ready()
.await
.map_err(|e| {
tonic::Status::new(
tonic::Code::Unknown,
format!("Service was not ready: {}", e.into()),
)
})?;
let codec = tonic::codec::ProstCodec::default();
let path = http::uri::PathAndQuery::from_static("/nodata.NoData/GetTopics");
let mut req = request.into_request();
req.extensions_mut().insert(GrpcMethod::new("nodata.NoData", "GetTopics"));
self.inner.unary(req, path, codec).await
}
pub async fn get_keys(
&mut self,
request: impl tonic::IntoRequest<super::GetKeysRequest>,
) -> std::result::Result<
tonic::Response<super::GetKeysResponse>,
tonic::Status,
> {
self.inner
.ready()
.await
.map_err(|e| {
tonic::Status::new(
tonic::Code::Unknown,
format!("Service was not ready: {}", e.into()),
)
})?;
let codec = tonic::codec::ProstCodec::default();
let path = http::uri::PathAndQuery::from_static("/nodata.NoData/GetKeys");
let mut req = request.into_request();
req.extensions_mut().insert(GrpcMethod::new("nodata.NoData", "GetKeys"));
self.inner.unary(req, path, codec).await
}
} }
} }
/// Generated server implementations. /// Generated server implementations.
@ -125,6 +169,17 @@ pub mod no_data_server {
tonic::Response<super::PublishEventResponse>, tonic::Response<super::PublishEventResponse>,
tonic::Status, tonic::Status,
>; >;
async fn get_topics(
&self,
request: tonic::Request<super::GetTopicsRequest>,
) -> std::result::Result<
tonic::Response<super::GetTopicsResponse>,
tonic::Status,
>;
async fn get_keys(
&self,
request: tonic::Request<super::GetKeysRequest>,
) -> std::result::Result<tonic::Response<super::GetKeysResponse>, tonic::Status>;
} }
#[derive(Debug)] #[derive(Debug)]
pub struct NoDataServer<T: NoData> { pub struct NoDataServer<T: NoData> {
@ -251,6 +306,94 @@ pub mod no_data_server {
}; };
Box::pin(fut) Box::pin(fut)
} }
"/nodata.NoData/GetTopics" => {
#[allow(non_camel_case_types)]
struct GetTopicsSvc<T: NoData>(pub Arc<T>);
impl<T: NoData> tonic::server::UnaryService<super::GetTopicsRequest>
for GetTopicsSvc<T> {
type Response = super::GetTopicsResponse;
type Future = BoxFuture<
tonic::Response<Self::Response>,
tonic::Status,
>;
fn call(
&mut self,
request: tonic::Request<super::GetTopicsRequest>,
) -> Self::Future {
let inner = Arc::clone(&self.0);
let fut = async move {
<T as NoData>::get_topics(&inner, request).await
};
Box::pin(fut)
}
}
let accept_compression_encodings = self.accept_compression_encodings;
let send_compression_encodings = self.send_compression_encodings;
let max_decoding_message_size = self.max_decoding_message_size;
let max_encoding_message_size = self.max_encoding_message_size;
let inner = self.inner.clone();
let fut = async move {
let inner = inner.0;
let method = GetTopicsSvc(inner);
let codec = tonic::codec::ProstCodec::default();
let mut grpc = tonic::server::Grpc::new(codec)
.apply_compression_config(
accept_compression_encodings,
send_compression_encodings,
)
.apply_max_message_size_config(
max_decoding_message_size,
max_encoding_message_size,
);
let res = grpc.unary(method, req).await;
Ok(res)
};
Box::pin(fut)
}
"/nodata.NoData/GetKeys" => {
#[allow(non_camel_case_types)]
struct GetKeysSvc<T: NoData>(pub Arc<T>);
impl<T: NoData> tonic::server::UnaryService<super::GetKeysRequest>
for GetKeysSvc<T> {
type Response = super::GetKeysResponse;
type Future = BoxFuture<
tonic::Response<Self::Response>,
tonic::Status,
>;
fn call(
&mut self,
request: tonic::Request<super::GetKeysRequest>,
) -> Self::Future {
let inner = Arc::clone(&self.0);
let fut = async move {
<T as NoData>::get_keys(&inner, request).await
};
Box::pin(fut)
}
}
let accept_compression_encodings = self.accept_compression_encodings;
let send_compression_encodings = self.send_compression_encodings;
let max_decoding_message_size = self.max_decoding_message_size;
let max_encoding_message_size = self.max_encoding_message_size;
let inner = self.inner.clone();
let fut = async move {
let inner = inner.0;
let method = GetKeysSvc(inner);
let codec = tonic::codec::ProstCodec::default();
let mut grpc = tonic::server::Grpc::new(codec)
.apply_compression_config(
accept_compression_encodings,
send_compression_encodings,
)
.apply_max_message_size_config(
max_decoding_message_size,
max_encoding_message_size,
);
let res = grpc.unary(method, req).await;
Ok(res)
};
Box::pin(fut)
}
_ => { _ => {
Box::pin(async move { Box::pin(async move {
Ok( Ok(

View File

@ -48,6 +48,32 @@ impl no_data_server::NoData for GrpcServer {
Ok(tonic::Response::new(PublishEventResponse {})) Ok(tonic::Response::new(PublishEventResponse {}))
} }
async fn get_topics(
&self,
_request: tonic::Request<GetTopicsRequest>,
) -> std::result::Result<tonic::Response<GetTopicsResponse>, tonic::Status> {
let topics = self.state.staging.get_topics().await.map_err(|e| {
tracing::warn!(error = e.to_string(), "failed to get topics");
tonic::Status::internal(e.to_string())
})?;
Ok(tonic::Response::new(GetTopicsResponse { topics }))
}
async fn get_keys(
&self,
request: tonic::Request<GetKeysRequest>,
) -> std::result::Result<tonic::Response<GetKeysResponse>, tonic::Status> {
let req = request.into_inner();
let keys = self.state.staging.get_keys(&req.topic).await.map_err(|e| {
tracing::warn!(error = e.to_string(), "failed to get keys");
tonic::Status::internal(e.to_string())
})?;
Ok(tonic::Response::new(GetKeysResponse { keys }))
}
} }
impl From<PublishEventRequest> for StagingEvent { impl From<PublishEventRequest> for StagingEvent {

View File

@ -8,7 +8,7 @@ use std::net::SocketAddr;
use chrono::{Datelike, Timelike}; use chrono::{Datelike, Timelike};
use clap::{Parser, Subcommand, ValueEnum}; use clap::{Parser, Subcommand, ValueEnum};
use grpc::{GrpcServer, PublishEventRequest}; use grpc::{GetKeysRequest, GetTopicsRequest, GrpcServer, PublishEventRequest};
use http::HttpServer; use http::HttpServer;
use mad::Mad; use mad::Mad;
use state::SharedState; use state::SharedState;
@ -59,6 +59,11 @@ enum ClientCommands {
#[arg(long = "generate-id")] #[arg(long = "generate-id")]
generate_id: bool, generate_id: bool,
}, },
GetTopics {},
GetKeys {
#[arg(long)]
topic: String,
},
} }
#[tokio::main] #[tokio::main]
@ -89,8 +94,7 @@ async fn main() -> anyhow::Result<()> {
id, id,
generate_id, generate_id,
} => { } => {
let mut client = let mut client = create_client(grpc_host).await?;
crate::grpc::no_data_client::NoDataClient::connect(grpc_host).await?;
let timestamp = chrono::Utc::now(); let timestamp = chrono::Utc::now();
@ -122,8 +126,36 @@ async fn main() -> anyhow::Result<()> {
}) })
.await?; .await?;
} }
ClientCommands::GetTopics {} => {
let mut client = create_client(grpc_host).await?;
println!("Listing topics");
let topics = client.get_topics(GetTopicsRequest {}).await?;
for topic in topics.into_inner().topics {
println!("{topic}");
}
}
ClientCommands::GetKeys { topic } => {
let mut client = create_client(grpc_host).await?;
println!("Listing keys for topic: {}", topic);
let keys = client.get_keys(GetKeysRequest { topic }).await?;
for key in keys.into_inner().keys {
println!("{key}");
}
}
}, },
} }
Ok(()) Ok(())
} }
async fn create_client(
grpc_host: String,
) -> anyhow::Result<crate::grpc::no_data_client::NoDataClient<tonic::transport::Channel>> {
let client = crate::grpc::no_data_client::NoDataClient::connect(grpc_host).await?;
Ok(client)
}

View File

@ -61,6 +61,23 @@ impl Staging {
Ok(()) Ok(())
} }
pub async fn get_topics(&self) -> anyhow::Result<Vec<String>> {
let store = self.store.read().unwrap();
Ok(store.keys().cloned().collect::<Vec<_>>())
}
pub async fn get_keys(&self, topic: impl Into<String>) -> anyhow::Result<Vec<String>> {
let store = self.store.read().unwrap();
let items = store
.get(&topic.into())
.map(|tree| tree.keys())
.unwrap_or_default();
Ok(items.cloned().collect::<Vec<_>>())
}
} }
pub trait StagingState { pub trait StagingState {

View File

@ -6,6 +6,8 @@ package nodata;
service NoData { service NoData {
rpc PublishEvent(PublishEventRequest) returns (PublishEventResponse) {} rpc PublishEvent(PublishEventRequest) returns (PublishEventResponse) {}
rpc GetTopics(GetTopicsRequest) returns (GetTopicsResponse) {}
rpc GetKeys(GetKeysRequest) returns (GetKeysResponse) {}
} }
message PublishEventRequest { message PublishEventRequest {
@ -19,3 +21,14 @@ message PublishEventRequest {
message PublishEventResponse { message PublishEventResponse {
} }
message GetTopicsRequest {}
message GetTopicsResponse {
repeated string topics = 1;
}
message GetKeysRequest {
string topic = 1;
}
message GetKeysResponse {
repeated string keys = 1;
}