Merge pull request #103 from TeamBulbbot/workflow_problems

TeamBulbbot · Jul 1, 2024 · 648ddde · 648ddde
2 parents bb5a95c + 08d0b4c
commit 648ddde
Show file tree

Hide file tree

Showing 17 changed files with 27 additions and 38 deletions.
diff --git a/.github/workflows/gateway.yml b/.github/workflows/gateway.yml
@@ -9,7 +9,7 @@ on:
   pull_request:
     paths:
       - "bulbbot.Gateway/**"
-    types: [opened, edited, reopened]
+    types: [opened, edited, reopened, synchronize]
 
 jobs:
   test:
@@ -28,7 +28,7 @@ jobs:
   fmt:
     defaults:
       run:
-        working-directory: ./Bulbbot.Gateway
+        working-directory: ./bulbbot.Gateway
     name: Rustfmt
     runs-on: ubuntu-latest
     steps:
@@ -42,7 +42,7 @@ jobs:
   clippy:
     defaults:
       run:
-        working-directory: ./Bulbbot.Gateway
+        working-directory: ./bulbbot.Gateway
     name: Clippy
     runs-on: ubuntu-latest
     steps:

diff --git a/.github/workflows/gateway_handler.yml b/.github/workflows/gateway_handler.yml
@@ -9,7 +9,7 @@ on:
   pull_request:
     paths:
       - "bulbbot.GatewayHandler/**"
-    types: [opened, edited, reopened]
+    types: [opened, edited, reopened, synchronize]
 
 jobs:
   test:

diff --git a/.github/workflows/guild_service.yml b/.github/workflows/guild_service.yml
@@ -9,7 +9,7 @@ on:
   pull_request:
     paths:
       - "bulbbot.GuildService/**"
-    types: [opened, edited, reopened]
+    types: [opened, edited, reopened, synchronize]
 
 jobs:
   test:

diff --git a/.github/workflows/message_service.yml b/.github/workflows/message_service.yml
@@ -9,7 +9,7 @@ on:
   pull_request:
     paths:
       - "bulbbot.MessageService/**"
-    types: [opened, edited, reopened]
+    types: [opened, edited, reopened, synchronize]
 
 jobs:
   test:

diff --git a/bulbbot.Gateway/src/main.rs b/bulbbot.Gateway/src/main.rs
@@ -105,7 +105,7 @@ async fn main() {
         info!("Running http server on localhost:{}", server_port);
         HttpServer::new(|| App::new().service(hello))
             .bind(("127.0.0.1", server_port))
-            .expect("Failed to bind to localhost:8080")
+            .unwrap_or_else(|_| panic!("Failed to bind to localhost:8080"))
             .run()
             .await
             .expect("Failed to start server");

diff --git a/bulbbot.GatewayHandler/src/events/message.rs b/bulbbot.GatewayHandler/src/events/message.rs
@@ -33,7 +33,7 @@ impl Handler {
         let mut request = self.client.post(&url).json(&message).build().unwrap();
         global::get_text_map_propagator(|propagator| {
             propagator.inject_context(
-                &cx,
+                cx,
                 &mut ReqwestInjector {
                     headers: request.headers_mut(),
                 },

diff --git a/bulbbot.GatewayHandler/src/events/message_delete.rs b/bulbbot.GatewayHandler/src/events/message_delete.rs
@@ -37,7 +37,7 @@ impl Handler {
         let mut request = self.client.post(&url).json(&message).build().unwrap();
         global::get_text_map_propagator(|propagator| {
             propagator.inject_context(
-                &cx,
+                cx,
                 &mut ReqwestInjector {
                     headers: request.headers_mut(),
                 },

diff --git a/bulbbot.GuildService/src/handlers/create_guild_command.rs b/bulbbot.GuildService/src/handlers/create_guild_command.rs
@@ -66,6 +66,6 @@ pub async fn create_guild_command_handler(
 
     match response {
         Some(resp) => Ok(HttpResponse::Created().json(resp)),
-        None => Ok(HttpResponse::BadRequest().body(format!("Guild already exists"))),
+        None => Ok(HttpResponse::BadRequest().body("Guild already exists")),
     }
 }
diff --git a/bulbbot.GuildService/src/handlers/get_guild_command.rs b/bulbbot.GuildService/src/handlers/get_guild_command.rs
@@ -44,6 +44,6 @@ pub async fn get_guild_command_handler(
 
     match response {
         Some(resp) => Ok(HttpResponse::Ok().json(resp)),
-        None => Ok(HttpResponse::NotFound().body(format!("Guild does not exist"))),
+        None => Ok(HttpResponse::NotFound().body("Guild does not exist")),
     }
 }
diff --git a/bulbbot.GuildService/src/main.rs b/bulbbot.GuildService/src/main.rs
@@ -72,7 +72,7 @@ async fn main() {
             .service(health)
     })
     .bind(("127.0.0.1", server_port))
-    .expect(&format!("Failed to bind to localhost:{}", server_port))
+    .unwrap_or_else(|_| panic!("Failed to bind to localhost:{}", server_port))
     .run()
     .await
     .expect("Failed to start server");

diff --git a/bulbbot.GuildService/src/middleware/telemetry.rs b/bulbbot.GuildService/src/middleware/telemetry.rs
@@ -54,8 +54,8 @@ where
     fn call(&self, req: ServiceRequest) -> Self::Future {
         let request = req.request();
         let cx = global::get_text_map_propagator(|propagator| {
-            propagator.extract(&mut ActixWebExtractor {
-                headers: &mut request.headers(),
+            propagator.extract(&ActixWebExtractor {
+                headers: request.headers(),
             })
         });
 

diff --git a/bulbbot.GuildService/src/schema.rs b/bulbbot.GuildService/src/schema.rs
@@ -27,7 +27,4 @@ diesel::table! {
 
 diesel::joinable!(logging -> guilds (guilds_id));
 
-diesel::allow_tables_to_appear_in_same_query!(
-    guilds,
-    logging,
-);
+diesel::allow_tables_to_appear_in_same_query!(guilds, logging,);
diff --git a/bulbbot.MessageService/src/handlers/create_message.rs b/bulbbot.MessageService/src/handlers/create_message.rs
@@ -26,7 +26,7 @@ pub async fn create_message(
     content: web::Json<MessageCommand>,
 ) -> Result<HttpResponse, Error> {
     let response = http_client
-        .get_guild(content.content.guild_id.unwrap(), &request.headers())
+        .get_guild(content.content.guild_id.unwrap(), request.headers())
         .await;
 
     if response.logging.message.is_none() {

diff --git a/bulbbot.MessageService/src/handlers/delete_message.rs b/bulbbot.MessageService/src/handlers/delete_message.rs
@@ -2,11 +2,7 @@ use crate::extractor::ActixWebExtractor;
 use crate::injector::RabbitMqInjector;
 use crate::models::messages::Messages;
 use crate::schema::messages::dsl::messages;
-use crate::{
-    database::DbPool,
-    http_client::HttpClient,
-    models::{event_type::EventType, messages::NewMessage},
-};
+use crate::{database::DbPool, http_client::HttpClient, models::event_type::EventType};
 use actix_web::HttpRequest;
 use actix_web::{http::Error, web, HttpResponse};
 use diesel::{QueryDsl, RunQueryDsl};
@@ -51,7 +47,7 @@ pub async fn delete_message(
     content: web::Json<MessageDeleteCommand>,
 ) -> Result<HttpResponse, Error> {
     let response = http_client
-        .get_guild(content.content.guild_id.unwrap(), &request.headers())
+        .get_guild(content.content.guild_id.unwrap(), request.headers())
         .await;
 
     if response.logging.message.is_none() {
@@ -79,8 +75,8 @@ pub async fn delete_message(
         None => Ok(HttpResponse::NotFound().finish()),
         Some(msg) => {
             let cx = global::get_text_map_propagator(|propagator| {
-                propagator.extract(&mut ActixWebExtractor {
-                    headers: &mut request.headers(),
+                propagator.extract(&ActixWebExtractor {
+                    headers: request.headers(),
                 })
             });
 

diff --git a/bulbbot.MessageService/src/http_client.rs b/bulbbot.MessageService/src/http_client.rs
@@ -26,11 +26,9 @@ impl HttpClient {
         }
     }
 
-    fn add_telelementry(&self, mut headers: &HeaderMap, request: &mut Request) {
+    fn add_telelementry(&self, headers: &HeaderMap, request: &mut Request) {
         let cx = global::get_text_map_propagator(|propagator| {
-            propagator.extract(&mut ActixWebExtractor {
-                headers: &mut headers,
-            })
+            propagator.extract(&ActixWebExtractor { headers })
         });
 
         global::get_text_map_propagator(|propagator| {
@@ -56,7 +54,7 @@ impl HttpClient {
 
         let response = self.client.execute(request).await.expect("Invalid reponse");
 
-        let guild = match response.json::<GuildDto>().await {
+        match response.json::<GuildDto>().await {
             Ok(g) => g,
             Err(_) => {
                 let mut request = self
@@ -78,9 +76,7 @@ impl HttpClient {
 
                 response.json::<GuildDto>().await.unwrap()
             }
-        };
-
-        guild
+        }
     }
 }
 

diff --git a/bulbbot.MessageService/src/main.rs b/bulbbot.MessageService/src/main.rs
@@ -79,7 +79,7 @@ async fn main() {
             .service(health)
     })
     .bind(("127.0.0.1", server_port))
-    .expect(&format!("Failed to bind to localhost:{}", server_port))
+    .unwrap_or_else(|_| panic!("Failed to bind to localhost:{}", server_port))
     .run()
     .await
     .expect("Failed to start server");

diff --git a/bulbbot.MessageService/src/middleware/telemetry.rs b/bulbbot.MessageService/src/middleware/telemetry.rs
@@ -54,8 +54,8 @@ where
     fn call(&self, req: ServiceRequest) -> Self::Future {
         let request = req.request();
         let cx = global::get_text_map_propagator(|propagator| {
-            propagator.extract(&mut ActixWebExtractor {
-                headers: &mut request.headers(),
+            propagator.extract(&ActixWebExtractor {
+                headers: request.headers(),
             })
         });