From 5209f709b0f5b1b6b87e19e9f9ad791c7ce0b607 Mon Sep 17 00:00:00 2001 From: Florian Amsallem Date: Tue, 14 May 2024 10:53:12 +0200 Subject: [PATCH 1/2] ci: add clippy checks for gateway --- .github/workflows/build.yml | 7 +++++++ gateway/Dockerfile | 1 + 2 files changed, 8 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 00c92c0dcc7..cd3986f580d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -556,6 +556,13 @@ jobs: cargo fmt --check exit $(docker wait gateway-format) + - name: Clippy check + run: | + docker run --name=gateway-clippy --net=host -v $PWD/output:/output \ + ${{ fromJSON(needs.build.outputs.stable_tags).gateway-test }} \ + cargo clippy --all-features --all-targets -- -D warnings + exit $(docker wait gateway-clippy) + check_front: runs-on: ubuntu-latest needs: diff --git a/gateway/Dockerfile b/gateway/Dockerfile index 760b3610cd2..204cbd6362b 100644 --- a/gateway/Dockerfile +++ b/gateway/Dockerfile @@ -28,6 +28,7 @@ RUN cargo install --locked --path . FROM chef AS testing_env RUN rustup component add llvm-tools && \ rustup component add rustfmt && \ + rustup component add clippy && \ cargo install --locked grcov COPY --from=planner /app/recipe.json recipe.json From 3f747f31c968a64e70cccfe7f4bdc98a0881ed91 Mon Sep 17 00:00:00 2001 From: Florian Amsallem Date: Tue, 14 May 2024 20:17:10 +0200 Subject: [PATCH 2/2] gateway: fix clippy warnings --- gateway/actix_auth/src/auth_middleware.rs | 28 +++++++++++------------ 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/gateway/actix_auth/src/auth_middleware.rs b/gateway/actix_auth/src/auth_middleware.rs index c4f116fa588..ca4008ecd44 100644 --- a/gateway/actix_auth/src/auth_middleware.rs +++ b/gateway/actix_auth/src/auth_middleware.rs @@ -1,19 +1,17 @@ -use std::{ - future::{ready, Ready}, - rc::Rc, -}; +use actix_session::SessionExt; +use actix_web::dev::forward_ready; +use actix_web::dev::Service; +use actix_web::dev::ServiceRequest; +use actix_web::dev::ServiceResponse; +use actix_web::dev::Transform; +use actix_web::Error; +use actix_web::HttpMessage; +use std::future::ready; +use std::future::Ready; +use std::rc::Rc; -use actix_session::{Session, SessionExt}; -use actix_web::{ - dev::{forward_ready, Service, ServiceRequest, ServiceResponse, Transform}, - Error, HttpMessage, HttpRequest, -}; - -use crate::{AuthContext, RequestAuth}; - -pub trait AuthGate: Clone { - fn filter(&self, req: &HttpRequest, session: Option) -> Option; -} +use crate::AuthContext; +use crate::RequestAuth; /// The MandatoryIdentityMiddleware does not directly process requests. /// When actix starts, new_transform is called once per worker to create