Fix formatting & tests (#2504)

Author: jakub-tldr

crates/defguard_core/tests/integration/api/api_tokens.rs

@@ -302,7 +302,7 @@ async fn dg25_3_test_token_invalidation(_: PgPoolOptions, options: PgConnectOpti
     let admin_group = admin_groups.first().unwrap();
 
     let response = client
-        .post(format!("/api/v1/group/{}", admin_group.name))
+        .post(format!("/api/v1/group/{}", admin_group.id))
         .json(&json!({"username": "hpotter"}))
         .send()
         .await;

crates/defguard_core/tests/integration/api/group.rs

@@ -32,11 +32,11 @@ async fn test_create_group(_: PgPoolOptions, options: PgConnectOptions) {
         .unwrap()
         .unwrap()
         .id;
-    let response = client.delete(&format!("/api/v1/group/{id}")).send().await;
+    let response = client.delete(format!("/api/v1/group/{id}")).send().await;
     assert_eq!(response.status(), StatusCode::OK);
 
     // Try to delete again.
-    let response = client.delete(&format!("/api/v1/group/{id}")).send().await;
+    let response = client.delete(format!("/api/v1/group/{id}")).send().await;
     assert_eq!(response.status(), StatusCode::NOT_FOUND);
 }
 
@@ -65,14 +65,14 @@ async fn test_modify_group(_: PgPoolOptions, options: PgConnectOptions) {
     // Rename group.
     let data = EditGroupInfo::new("gryffindor", Vec::new(), false);
     let response = client
-        .put(&format!("/api/v1/group/{id}"))
+        .put(format!("/api/v1/group/{id}"))
         .json(&data)
         .send()
         .await;
     assert_eq!(response.status(), StatusCode::OK);
 
     // Get group info – name should be updated.
-    let response = client.get(&format!("/api/v1/group/{id}")).send().await;
+    let response = client.get(format!("/api/v1/group/{id}")).send().await;
     assert_eq!(response.status(), StatusCode::OK);
     let group_info: GroupInfo = response.json().await;
     assert_eq!(group_info.name, "gryffindor");
@@ -101,22 +101,22 @@ async fn test_modify_group_members(_: PgPoolOptions, options: PgConnectOptions)
         .id;
 
     // Get group info.
-    let response = client.get(&format!("/api/v1/group/{id}")).send().await;
+    let response = client.get(format!("/api/v1/group/{id}")).send().await;
     assert_eq!(response.status(), StatusCode::OK);
     let group_info: GroupInfo = response.json().await;
     assert_eq!(group_info.members, vec!["hpotter".to_string()]);
 
     // Change group members.
     let data = EditGroupInfo::new("hogwards", Vec::new(), false);
     let response = client
-        .put(&format!("/api/v1/group/{id}"))
+        .put(format!("/api/v1/group/{id}"))
         .json(&data)
         .send()
         .await;
     assert_eq!(response.status(), StatusCode::OK);
 
     // Get group info.
-    let response = client.get(&format!("/api/v1/group/{id}")).send().await;
+    let response = client.get(format!("/api/v1/group/{id}")).send().await;
     assert_eq!(response.status(), StatusCode::OK);
     let group_info: GroupInfo = response.json().await;
     assert!(group_info.members.is_empty());
@@ -160,13 +160,13 @@ async fn test_modify_group_no_locations_in_request(_: PgPoolOptions, options: Pg
         "is_admin": false
     });
     let response = client
-        .put(&format!("/api/v1/group/{id}"))
+        .put(format!("/api/v1/group/{id}"))
         .json(&data)
         .send()
         .await;
     assert_eq!(response.status(), StatusCode::OK);
 
-    let response = client.get(&format!("/api/v1/group/{id}")).send().await;
+    let response = client.get(format!("/api/v1/group/{id}")).send().await;
     assert_eq!(response.status(), StatusCode::OK);
     let group_info: GroupInfo = response.json().await;
     assert_eq!(group_info.name, "gryffindor");
@@ -191,12 +191,12 @@ async fn test_remove_last_admin_group(_: PgPoolOptions, options: PgConnectOption
         .id;
 
     // Get group info.
-    let response = client.get(&format!("/api/v1/group/{id}")).send().await;
+    let response = client.get(format!("/api/v1/group/{id}")).send().await;
     assert_eq!(response.status(), StatusCode::OK);
     let group_info: GroupInfo = response.json().await;
     assert_eq!(group_info.members, vec!["admin".to_string()]);
 
-    let response = client.delete(&format!("/api/v1/group/{id}")).send().await;
+    let response = client.delete(format!("/api/v1/group/{id}")).send().await;
     assert_eq!(response.status(), StatusCode::BAD_REQUEST);
 }
 
@@ -218,7 +218,7 @@ async fn test_modify_last_admin_group(_: PgPoolOptions, options: PgConnectOption
         .id;
 
     // Get group info.
-    let response = client.get(&format!("/api/v1/group/{id}")).send().await;
+    let response = client.get(format!("/api/v1/group/{id}")).send().await;
     assert_eq!(response.status(), StatusCode::OK);
     let group_info: GroupInfo = response.json().await;
     assert_eq!(group_info.members, vec!["admin".to_string()]);
@@ -232,7 +232,7 @@ async fn test_modify_last_admin_group(_: PgPoolOptions, options: PgConnectOption
         "is_admin": false
     });
     let response = client
-        .put(&format!("/api/v1/group/{id}"))
+        .put(format!("/api/v1/group/{id}"))
         .json(&data)
         .send()
         .await;

crates/defguard_core/tests/integration/api/wireguard.rs

@@ -62,10 +62,7 @@ async fn test_network(_: PgPoolOptions, options: PgConnectOptions) {
         .unwrap()
         .unwrap()
         .id;
-    let response = client
-        .get(&format!("/api/v1/group/{admin_id}"))
-        .send()
-        .await;
+    let response = client.get(format!("/api/v1/group/{admin_id}")).send().await;
     let group_info: GroupInfo = response.json().await;
     assert_eq!(group_info.vpn_locations, vec!["network"]);
 
@@ -108,10 +105,7 @@ async fn test_network(_: PgPoolOptions, options: PgConnectOptions) {
     assert_matches!(event, GatewayEvent::NetworkModified(..));
 
     // check vpn locations for `admin` group
-    let response = client
-        .get(&format!("/api/v1/group/{admin_id}"))
-        .send()
-        .await;
+    let response = client.get(format!("/api/v1/group/{admin_id}")).send().await;
     assert_eq!(response.status(), StatusCode::OK);
     let group_info: GroupInfo = response.json().await;
     assert_eq!(group_info.vpn_locations, vec!["my network"]);

crates/defguard_core/tests/integration/api/wireguard_network_allowed_groups.rs

@@ -974,7 +974,7 @@ async fn test_delete_only_allowed_group(_: PgPoolOptions, options: PgConnectOpti
         .unwrap()
         .id;
     let response = client
-        .delete(&format!("/api/v1/group/{allowed_group_id}"))
+        .delete(format!("/api/v1/group/{allowed_group_id}"))
         .send()
         .await;
     assert_eq!(response.status(), StatusCode::OK);