Update dependencies and Rust Docker image

Cargo.toml

@@ -1,4 +1,5 @@
 [workspace]
+resolver = "2"
 members = [
     "auth-service",
     "planets-service",

auth-service/Cargo.toml

@@ -6,23 +6,23 @@ edition = "2021"
 
 [dependencies]
 common-utils = { path = "../common-utils" }
-async-graphql = "6.0.7"
-async-graphql-actix-web = "6.0.7"
-actix-web = "4.4.0"
+async-graphql = "7.0.5"
+async-graphql-actix-web = "7.0.5"
+actix-web = "4.5.1"
 actix-rt = "2.9.0"
-serde = { version = "1.0.188", features = ["derive"] }
-diesel = { version = "2.1.1", features = ["postgres", "r2d2"] }
+serde = { version = "1.0.202", features = ["derive"] }
+diesel = { version = "2.1.6", features = ["postgres", "r2d2"] }
 diesel_migrations = "2.1.0"
 dotenv = "0.15.0"
-jsonwebtoken = "8.3.0"
-argon2 = "0.5.2"
-chrono = "0.4.31"
+jsonwebtoken = "9.3.0"
+argon2 = "0.5.3"
+chrono = "0.4.38"
 lazy_static = "1.4.0"
-strum = "0.25.0"
-strum_macros = "0.25.2"
+strum = "0.26.2"
+strum_macros = "0.26.2"
 
 [dev-dependencies]
-serde_json = "1.0.107"
+serde_json = "1.0.117"
 jsonpath_lib = "0.3.0"
-base64 = "0.21.4"
-testcontainers = "0.14.0"
+base64 = "0.22.1"
+testcontainers = "0.16.7"

auth-service/Dockerfile

@@ -1,4 +1,4 @@
-FROM rust:1.72.1 as builder
+FROM rust:1.78.0 as builder
 
 ENV CARGO_TERM_COLOR always
 RUN apt-get update && apt-get install -y libpq-dev

auth-service/src/graphql.rs

@@ -105,7 +105,6 @@ impl RoleGuard {
     }
 }
 
-#[async_trait::async_trait]
 impl Guard for RoleGuard {
     async fn check(&self, ctx: &Context<'_>) -> Result<()> {
         let maybe_getting_role_result = ctx.data_opt::<Result<Option<AuthRole>, CustomError>>();

common-utils/Cargo.toml

@@ -5,7 +5,7 @@ authors = ["Roman Kudryashov <rskudryashov@gmail.com>"]
 edition = "2021"
 
 [dependencies]
-actix-web = "4.4.0"
-serde = { version = "1.0.188", features = ["derive"] }
-strum = "0.25.0"
-strum_macros = "0.25.2"
+actix-web = "4.5.1"
+serde = { version = "1.0.202", features = ["derive"] }
+strum = "0.26.2"
+strum_macros = "0.26.2"

docker-compose.yml

@@ -21,7 +21,7 @@ services:
     ports:
       - "8001:8080"
   planets-db:
-    image: postgres:15.1-alpine
+    image: postgres:16.3
     container_name: planets-db
     restart: always
     environment:
@@ -53,7 +53,7 @@ services:
     ports:
       - "8002:8080"
   satellites-db:
-    image: postgres:15.1-alpine
+    image: postgres:16.3
     container_name: satellites-db
     restart: always
     environment:
@@ -86,7 +86,7 @@ services:
     ports:
       - "8003:8080"
   users-db:
-    image: postgres:15.1-alpine
+    image: postgres:16.3
     container_name: users-db
     restart: always
     environment:

gateway/Cargo.toml

@@ -6,16 +6,16 @@ edition = "2021"
 
 [dependencies]
 common-utils = { path = "../common-utils" }
-apollo-router = "1.30.1"
-anyhow = "1.0.75"
-async-trait = "0.1.73"
-futures = "0.3.28"
-schemars = "0.8.15"
-jsonwebtoken = "8.3.0"
-serde = "1.0.188"
-serde_json = "1.0.107"
-tokio = { version = "1.32.0", features = ["full"] }
+apollo-router = "1.46.0"
+anyhow = "1.0.85"
+async-trait = "0.1.80"
+futures = "0.3.30"
+schemars = "0.8.19"
+jsonwebtoken = "9.3.0"
+serde = "1.0.202"
+serde_json = "1.0.117"
+tokio = { version = "1.37.0", features = ["full"] }
 tower = { version = "0.4.13", features = ["full"] }
-tracing = "0.1.37"
-http = "0.2.9"
+tracing = "0.1.40"
+http = "1.1.0"
 dotenv = "0.15.0"

gateway/Dockerfile

@@ -1,4 +1,4 @@
-FROM rust:1.72.1 as builder
+FROM rust:1.76.0 as builder
 
 ENV CARGO_TERM_COLOR always
 RUN apt-get update && apt-get install -y protobuf-compiler cmake

gateway/src/jwt_validation.rs

@@ -57,20 +57,24 @@ impl Plugin for JwtValidation {
                         .extension_code("AUTH_ERROR")
                         .build(),
                 )
-                .status_code(status)
+                // TODO: don't know why by the commented line doesn't compile
+                // .status_code(Some(status))
                 .context(context)
                 .build()?;
             Ok(ControlFlow::Break(response))
         }
 
         let handler = move |request: supergraph::Request| {
-            let auth_header_value_result =
-                match request.supergraph_request.headers().get(AUTHORIZATION) {
-                    Some(auth_header_value) => auth_header_value.to_str(),
-                    // in this project, I decided to allow the passage of requests without the AUTHORIZATION header. then each subgraph performs authorization based on the ROLE header
-                    // your case may be different. be careful
-                    None => return Ok(ControlFlow::Continue(request)),
-                };
+            let auth_header_value_result = match request
+                .supergraph_request
+                .headers()
+                .get(AUTHORIZATION.as_str())
+            {
+                Some(auth_header_value) => auth_header_value.to_str(),
+                // in this project, I decided to allow the passage of requests without the AUTHORIZATION header. then each subgraph performs authorization based on the ROLE header
+                // your case may be different. be careful
+                None => return Ok(ControlFlow::Continue(request)),
+            };
 
             let auth_header_value_untrimmed = match auth_header_value_result {
                 Ok(auth_header_value) => auth_header_value,

planets-service/Cargo.toml

@@ -6,25 +6,24 @@ edition = "2021"
 
 [dependencies]
 common-utils = { path = "../common-utils" }
-async-graphql = { version = "6.0.7", features = ["dataloader"] }
-async-graphql-actix-web = "6.0.7"
-actix-web = "4.4.0"
+async-graphql = { version = "7.0.5", features = ["dataloader"] }
+async-graphql-actix-web = "7.0.5"
+actix-web = "4.5.1"
 actix-rt = "2.9.0"
-actix-web-actors = "4.2.0"
-futures = "0.3.28"
-async-trait = "0.1.73"
-bigdecimal = { version = "0.4.1", features = ["serde"] }
-serde = { version = "1.0.188", features = ["derive"] }
-serde_json = "1.0.107"
-diesel = { version = "2.1.1", features = ["postgres", "r2d2", "numeric"] }
+actix-web-actors = "4.3.0"
+futures = "0.3.30"
+bigdecimal = { version = "0.4.3", features = ["serde"] }
+serde = { version = "1.0.202", features = ["derive"] }
+serde_json = "1.0.117"
+diesel = { version = "2.1.6", features = ["postgres", "r2d2", "numeric"] }
 diesel_migrations = "2.1.0"
 dotenv = "0.15.0"
-strum = "0.25.0"
-strum_macros = "0.25.2"
-rdkafka = { version = "0.34.0", features = ["cmake-build"] }
+strum = "0.26.2"
+strum_macros = "0.26.2"
+rdkafka = { version = "0.36.2", features = ["cmake-build"] }
 async-stream = "0.3.5"
 lazy_static = "1.4.0"
 
 [dev-dependencies]
 jsonpath_lib = "0.3.0"
-testcontainers = "0.14.0"
+testcontainers = "0.16.7"

planets-service/Dockerfile

@@ -1,4 +1,4 @@
-FROM rust:1.72.1 as builder
+FROM rust:1.78.0 as builder
 
 ENV CARGO_TERM_COLOR always
 RUN apt-get update && apt-get install -y libpq-dev cmake

planets-service/src/graphql.rs

@@ -303,7 +303,6 @@ pub struct DetailsLoader {
     pub pool: Arc<PgPool>,
 }
 
-#[async_trait::async_trait]
 impl Loader<i32> for DetailsLoader {
     type Value = Details;
     type Error = Error;
@@ -329,7 +328,6 @@ impl RoleGuard {
     }
 }
 
-#[async_trait::async_trait]
 impl Guard for RoleGuard {
     async fn check(&self, ctx: &Context<'_>) -> Result<()> {
         // TODO: auth disabling is needed for tests. try to reimplement when https://github.com/rust-lang/rust/issues/45599 will be resolved (using cfg(test))

satellites-service/Cargo.toml

@@ -5,19 +5,19 @@ authors = ["Roman Kudryashov <rskudryashov@gmail.com>"]
 edition = "2021"
 
 [dependencies]
-async-graphql = { version = "6.0.7", features = ["chrono"] }
-async-graphql-actix-web = "6.0.7"
-actix-web = "4.4.0"
+async-graphql = { version = "7.0.5", features = ["chrono"] }
+async-graphql-actix-web = "7.0.5"
+actix-web = "4.5.1"
 actix-rt = "2.9.0"
-serde = { version = "1.0.188", features = ["derive"] }
-diesel = { version = "2.1.1", features = ["postgres", "r2d2", "chrono"] }
+serde = { version = "1.0.202", features = ["derive"] }
+diesel = { version = "2.1.6", features = ["postgres", "r2d2", "chrono"] }
 diesel_migrations = "2.1.0"
-chrono = { version = "0.4.31", features = ["serde"] }
+chrono = { version = "0.4.38", features = ["serde"] }
 dotenv = "0.15.0"
-strum = "0.25.0"
-strum_macros = "0.25.2"
+strum = "0.26.2"
+strum_macros = "0.26.2"
 
 [dev-dependencies]
-serde_json = "1.0.107"
+serde_json = "1.0.117"
 jsonpath_lib = "0.3.0"
-testcontainers = "0.14.0"
+testcontainers = "0.16.7"

satellites-service/Dockerfile

@@ -1,4 +1,4 @@
-FROM rust:1.72.1 as builder
+FROM rust:1.78.0 as builder
 
 ENV CARGO_TERM_COLOR always
 RUN apt-get update && apt-get install -y libpq-dev