From c6bb7f5ab15a99d13e27cffb85253a660c28298c Mon Sep 17 00:00:00 2001 From: Noor Date: Fri, 24 Jan 2025 09:09:33 +0000 Subject: [PATCH] fix new grpc modification implemented dummy grpc service --- Cargo.lock | 24 ++++++++++++------------ src/data.rs | 8 ++++---- src/grpc.rs | 44 ++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 58 insertions(+), 18 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e0cedab..dd5a038 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -316,7 +316,7 @@ dependencies = [ [[package]] name = "detee-shared" version = "0.1.0" -source = "git+ssh://git@gitea.detee.cloud/noormohammedb/detee-shared#f4e1159efc1987a1ca6e079617719527875957bf" +source = "git+ssh://git@gitea.detee.cloud/noormohammedb/detee-shared#3cb47a47e824edb4df8f2057f3d9dfa2a04f9e76" dependencies = [ "base64", "prost", @@ -523,7 +523,7 @@ dependencies = [ "futures-core", "futures-sink", "http", - "indexmap 2.7.0", + "indexmap 2.7.1", "slab", "tokio", "tokio-util", @@ -860,9 +860,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.7.0" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f" +checksum = "8c9c992b02b5b4c94ea26e32fe5bccb7aa7d9f390ab5c1221ff895bc7ea8b652" dependencies = [ "equivalent", "hashbrown 0.15.2", @@ -1063,9 +1063,9 @@ dependencies = [ [[package]] name = "openssl-probe" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" +checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e" [[package]] name = "openssl-sys" @@ -1092,7 +1092,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" dependencies = [ "fixedbitset", - "indexmap 2.7.0", + "indexmap 2.7.1", ] [[package]] @@ -1357,9 +1357,9 @@ checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustix" -version = "0.38.43" +version = "0.38.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a78891ee6bf2340288408954ac787aa063d8e8817e9f53abb37c695c6d834ef6" +checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154" dependencies = [ "bitflags", "errno", @@ -1501,7 +1501,7 @@ version = "0.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "59e2dd588bf1597a252c3b920e0143eb99b0f76e4e082f4c92ce34fbc9e71ddd" dependencies = [ - "indexmap 2.7.0", + "indexmap 2.7.1", "itoa", "libyml", "memchr", @@ -1847,9 +1847,9 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "unicode-ident" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" +checksum = "11cd88e12b17c6494200a9c1b683a04fcac9573ed74cd1b62aeb2727c5592243" [[package]] name = "untrusted" diff --git a/src/data.rs b/src/data.rs index a73e3e8..499fad1 100644 --- a/src/data.rs +++ b/src/data.rs @@ -1,7 +1,7 @@ use anyhow::Result; -use detee_shared::config::Container as ContainerConfig; -use detee_shared::config::Resource as ResourceConfig; +use detee_shared::pb_types::shared::Container as ContainerConfig; +use detee_shared::pb_types::shared::Resource as ResourceConfig; use crate::package::deploy_enclave; @@ -12,7 +12,7 @@ pub struct DaemonState { #[derive(Debug, Default)] pub struct Container { - pub id: String, + pub uuid: String, pub name: String, pub package_path: String, pub status: String, @@ -37,7 +37,7 @@ impl DaemonState { let mapped_ports = deploy_enclave(&unarchive_dir, publishing_ports).await?; let container = Container { - id: "123".to_string(), + uuid: req_data.uuid.unwrap_or_default().uuid, name: "".to_string(), package_path: unarchive_dir, status: "running".to_string(), diff --git a/src/grpc.rs b/src/grpc.rs index 31ec549..004629c 100644 --- a/src/grpc.rs +++ b/src/grpc.rs @@ -9,10 +9,12 @@ use tonic::transport::Server; use detee_shared::pb::daemon::daemon_service_server::{ DaemonService as DaemonServicePB, DaemonServiceServer as DaemonServiceServerPB, }; -use detee_shared::pb::daemon::NewContainerRes; +use detee_shared::pb::daemon::{ + ContainerFilters, ContainerInspectResp, ContainerListResp, DeleteContainerRes, NewContainerRes, +}; use detee_shared::pb::shared::Container as ContainerPB; -use detee_shared::config::Container as ContainerConfig; +use detee_shared::pb_types::shared::Container as ContainerConfig; use crate::package::handle_package; use crate::DaemonState; @@ -70,7 +72,45 @@ impl DaemonServicePB for DaemonServer { .map_err(|err| tonic::Status::internal(err.to_string()))?; return Ok(tonic::Response::new(NewContainerRes { + container_id: None, status: "success".to_string(), + ip_address: "".to_string(), + })); + } + async fn inspect_container( + &self, + req: tonic::Request, + ) -> Result, tonic::Status> { + dbg!(req); + return Ok(tonic::Response::new(ContainerInspectResp { + ..Default::default() + })); + } + + // async fn container_log( + // &self, + // req: tonic::Request, + // ) -> Result, tonic::Status> { + // todo!() + // } + + async fn list_containers( + &self, + req: tonic::Request, + ) -> Result, tonic::Status> { + dbg!(req); + return Ok(tonic::Response::new(ContainerListResp { + ..Default::default() + })); + } + + async fn delete_container( + &self, + req: tonic::Request, + ) -> Result, tonic::Status> { + dbg!(req); + return Ok(tonic::Response::new(DeleteContainerRes { + ..Default::default() })); } }