From ce8ed0c6105c30656baa266c639995385aa27a0c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 30 Sep 2024 00:44:39 +0000 Subject: [PATCH 1/2] chore(deps): update rust crate testcontainers to 0.23.0 Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 1d848dd..be10228 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,7 +17,7 @@ anyhow = "1.0.86" hyper-util = { version = "0.1.7", features = ["tokio"] } prost = "0.13.1" prost-types = "0.13.1" -testcontainers = "0.22.0" +testcontainers = "0.23.0" tokio = { version = "1.39.2", features = ["full"] } tonic = { version = "0.12.1", features = ["transport", "tls", "tls-roots"]} tower = { version = "0.5.0", features = ["util"] } From 7c659e20329dc6f26d88caee2e900b7e3d016741 Mon Sep 17 00:00:00 2001 From: Charith Ellawala Date: Mon, 30 Sep 2024 07:23:59 +0100 Subject: [PATCH 2/2] Fix build script Signed-off-by: Charith Ellawala --- build.rs | 2 +- src/genpb/cerbos.svc.v1.rs | 105 ++++++++++++++++++------------------- 2 files changed, 52 insertions(+), 55 deletions(-) diff --git a/build.rs b/build.rs index ea8077c..afa0a0b 100644 --- a/build.rs +++ b/build.rs @@ -2,5 +2,5 @@ fn main() -> Result<(), std::io::Error> { tonic_build::configure() .out_dir("src/genpb") .build_server(false) - .compile(&["proto/defs/cerbos/svc/v1/svc.proto"], &["proto/defs/"]) + .compile_protos(&["proto/defs/cerbos/svc/v1/svc.proto"], &["proto/defs/"]) } diff --git a/src/genpb/cerbos.svc.v1.rs b/src/genpb/cerbos.svc.v1.rs index 97fd2af..735a6bc 100644 --- a/src/genpb/cerbos.svc.v1.rs +++ b/src/genpb/cerbos.svc.v1.rs @@ -1,7 +1,13 @@ // This file is @generated by prost-build. /// Generated client implementations. pub mod cerbos_service_client { - #![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)] + #![allow( + unused_variables, + dead_code, + missing_docs, + clippy::wildcard_imports, + clippy::let_unit_value, + )] use tonic::codegen::*; use tonic::codegen::http::Uri; #[derive(Debug, Clone)] @@ -23,8 +29,8 @@ pub mod cerbos_service_client { where T: tonic::client::GrpcService, T::Error: Into, - T::ResponseBody: Body + Send + 'static, - ::Error: Into + Send, + T::ResponseBody: Body + std::marker::Send + 'static, + ::Error: Into + std::marker::Send, { pub fn new(inner: T) -> Self { let inner = tonic::client::Grpc::new(inner); @@ -49,7 +55,7 @@ pub mod cerbos_service_client { >, , - >>::Error: Into + Send + Sync, + >>::Error: Into + std::marker::Send + std::marker::Sync, { CerbosServiceClient::new(InterceptedService::new(inner, interceptor)) } @@ -97,8 +103,7 @@ pub mod cerbos_service_client { .ready() .await .map_err(|e| { - tonic::Status::new( - tonic::Code::Unknown, + tonic::Status::unknown( format!("Service was not ready: {}", e.into()), ) })?; @@ -128,8 +133,7 @@ pub mod cerbos_service_client { .ready() .await .map_err(|e| { - tonic::Status::new( - tonic::Code::Unknown, + tonic::Status::unknown( format!("Service was not ready: {}", e.into()), ) })?; @@ -157,8 +161,7 @@ pub mod cerbos_service_client { .ready() .await .map_err(|e| { - tonic::Status::new( - tonic::Code::Unknown, + tonic::Status::unknown( format!("Service was not ready: {}", e.into()), ) })?; @@ -186,8 +189,7 @@ pub mod cerbos_service_client { .ready() .await .map_err(|e| { - tonic::Status::new( - tonic::Code::Unknown, + tonic::Status::unknown( format!("Service was not ready: {}", e.into()), ) })?; @@ -213,8 +215,7 @@ pub mod cerbos_service_client { .ready() .await .map_err(|e| { - tonic::Status::new( - tonic::Code::Unknown, + tonic::Status::unknown( format!("Service was not ready: {}", e.into()), ) })?; @@ -231,7 +232,13 @@ pub mod cerbos_service_client { } /// Generated client implementations. pub mod cerbos_admin_service_client { - #![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)] + #![allow( + unused_variables, + dead_code, + missing_docs, + clippy::wildcard_imports, + clippy::let_unit_value, + )] use tonic::codegen::*; use tonic::codegen::http::Uri; #[derive(Debug, Clone)] @@ -253,8 +260,8 @@ pub mod cerbos_admin_service_client { where T: tonic::client::GrpcService, T::Error: Into, - T::ResponseBody: Body + Send + 'static, - ::Error: Into + Send, + T::ResponseBody: Body + std::marker::Send + 'static, + ::Error: Into + std::marker::Send, { pub fn new(inner: T) -> Self { let inner = tonic::client::Grpc::new(inner); @@ -279,7 +286,7 @@ pub mod cerbos_admin_service_client { >, , - >>::Error: Into + Send + Sync, + >>::Error: Into + std::marker::Send + std::marker::Sync, { CerbosAdminServiceClient::new(InterceptedService::new(inner, interceptor)) } @@ -329,8 +336,7 @@ pub mod cerbos_admin_service_client { .ready() .await .map_err(|e| { - tonic::Status::new( - tonic::Code::Unknown, + tonic::Status::unknown( format!("Service was not ready: {}", e.into()), ) })?; @@ -361,8 +367,7 @@ pub mod cerbos_admin_service_client { .ready() .await .map_err(|e| { - tonic::Status::new( - tonic::Code::Unknown, + tonic::Status::unknown( format!("Service was not ready: {}", e.into()), ) })?; @@ -393,8 +398,7 @@ pub mod cerbos_admin_service_client { .ready() .await .map_err(|e| { - tonic::Status::new( - tonic::Code::Unknown, + tonic::Status::unknown( format!("Service was not ready: {}", e.into()), ) })?; @@ -422,8 +426,7 @@ pub mod cerbos_admin_service_client { .ready() .await .map_err(|e| { - tonic::Status::new( - tonic::Code::Unknown, + tonic::Status::unknown( format!("Service was not ready: {}", e.into()), ) })?; @@ -451,8 +454,7 @@ pub mod cerbos_admin_service_client { .ready() .await .map_err(|e| { - tonic::Status::new( - tonic::Code::Unknown, + tonic::Status::unknown( format!("Service was not ready: {}", e.into()), ) })?; @@ -480,8 +482,7 @@ pub mod cerbos_admin_service_client { .ready() .await .map_err(|e| { - tonic::Status::new( - tonic::Code::Unknown, + tonic::Status::unknown( format!("Service was not ready: {}", e.into()), ) })?; @@ -513,8 +514,7 @@ pub mod cerbos_admin_service_client { .ready() .await .map_err(|e| { - tonic::Status::new( - tonic::Code::Unknown, + tonic::Status::unknown( format!("Service was not ready: {}", e.into()), ) })?; @@ -547,8 +547,7 @@ pub mod cerbos_admin_service_client { .ready() .await .map_err(|e| { - tonic::Status::new( - tonic::Code::Unknown, + tonic::Status::unknown( format!("Service was not ready: {}", e.into()), ) })?; @@ -579,8 +578,7 @@ pub mod cerbos_admin_service_client { .ready() .await .map_err(|e| { - tonic::Status::new( - tonic::Code::Unknown, + tonic::Status::unknown( format!("Service was not ready: {}", e.into()), ) })?; @@ -608,8 +606,7 @@ pub mod cerbos_admin_service_client { .ready() .await .map_err(|e| { - tonic::Status::new( - tonic::Code::Unknown, + tonic::Status::unknown( format!("Service was not ready: {}", e.into()), ) })?; @@ -637,8 +634,7 @@ pub mod cerbos_admin_service_client { .ready() .await .map_err(|e| { - tonic::Status::new( - tonic::Code::Unknown, + tonic::Status::unknown( format!("Service was not ready: {}", e.into()), ) })?; @@ -666,8 +662,7 @@ pub mod cerbos_admin_service_client { .ready() .await .map_err(|e| { - tonic::Status::new( - tonic::Code::Unknown, + tonic::Status::unknown( format!("Service was not ready: {}", e.into()), ) })?; @@ -686,7 +681,13 @@ pub mod cerbos_admin_service_client { } /// Generated client implementations. pub mod cerbos_playground_service_client { - #![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)] + #![allow( + unused_variables, + dead_code, + missing_docs, + clippy::wildcard_imports, + clippy::let_unit_value, + )] use tonic::codegen::*; use tonic::codegen::http::Uri; #[derive(Debug, Clone)] @@ -708,8 +709,8 @@ pub mod cerbos_playground_service_client { where T: tonic::client::GrpcService, T::Error: Into, - T::ResponseBody: Body + Send + 'static, - ::Error: Into + Send, + T::ResponseBody: Body + std::marker::Send + 'static, + ::Error: Into + std::marker::Send, { pub fn new(inner: T) -> Self { let inner = tonic::client::Grpc::new(inner); @@ -734,7 +735,7 @@ pub mod cerbos_playground_service_client { >, , - >>::Error: Into + Send + Sync, + >>::Error: Into + std::marker::Send + std::marker::Sync, { CerbosPlaygroundServiceClient::new( InterceptedService::new(inner, interceptor), @@ -786,8 +787,7 @@ pub mod cerbos_playground_service_client { .ready() .await .map_err(|e| { - tonic::Status::new( - tonic::Code::Unknown, + tonic::Status::unknown( format!("Service was not ready: {}", e.into()), ) })?; @@ -818,8 +818,7 @@ pub mod cerbos_playground_service_client { .ready() .await .map_err(|e| { - tonic::Status::new( - tonic::Code::Unknown, + tonic::Status::unknown( format!("Service was not ready: {}", e.into()), ) })?; @@ -852,8 +851,7 @@ pub mod cerbos_playground_service_client { .ready() .await .map_err(|e| { - tonic::Status::new( - tonic::Code::Unknown, + tonic::Status::unknown( format!("Service was not ready: {}", e.into()), ) })?; @@ -884,8 +882,7 @@ pub mod cerbos_playground_service_client { .ready() .await .map_err(|e| { - tonic::Status::new( - tonic::Code::Unknown, + tonic::Status::unknown( format!("Service was not ready: {}", e.into()), ) })?;