Sigh

googleforgames · Sep 13, 2024 · 6fe4fb7 · 6fe4fb7
1 parent 349efe7
commit 6fe4fb7
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/crates/agones/src/lib.rs b/crates/agones/src/lib.rs
@@ -689,7 +689,7 @@ pub fn gameserver_address(gs: &GameServer) -> String {
 // Useful for determining why something is failing in CI without having to run a cluster.
 // Requires quilkin::test::enable_log("agones=debug"); to enable debug logging within
 // the test
-pub async fn debug_pods(client: &Client, labels: Option<String>) {
+pub async fn debug_pods(client: &Client, labels: String) {
     debug!(labels, "🪓 Debug output for Selector");
     let pods: Api<Pod> = client.namespaced_api();
     let events: Api<Event> = client.namespaced_api();
@@ -698,7 +698,7 @@ pub async fn debug_pods(client: &Client, labels: Option<String>) {
     let event_list = events.list(&params).await.unwrap();
     let pod_list = pods
         .list(&ListParams {
-            label_selector: labels,
+            label_selector: Some(labels),
             ..Default::default()
         })
         .await

diff --git a/crates/agones/src/provider.rs b/crates/agones/src/provider.rs
@@ -109,7 +109,7 @@ mod tests {
         .await
         .is_err()
         {
-            debug_pods(&client, Some(format!("role={PROXY_DEPLOYMENT}"))).await;
+            debug_pods(&client, format!("role={PROXY_DEPLOYMENT}")).await;
             panic!("Quilkin proxy deployment should be ready");
         }
 
@@ -157,8 +157,8 @@ mod tests {
             }
         }
         if !failed {
-            debug_pods(&client, Some(format!("role={PROXY_DEPLOYMENT}"))).await;
-            debug_pods(&client, Some("role=xds".into())).await;
+            debug_pods(&client, format!("role={PROXY_DEPLOYMENT}")).await;
+            debug_pods(&client, "role=xds".into()).await;
         }
         assert!(failed, "Packet should have failed");
 

diff --git a/crates/agones/src/relay.rs b/crates/agones/src/relay.rs
@@ -123,7 +123,9 @@ mod tests {
         .await
         .is_err()
         {
-            debug_pods(&client, None).await;
+            debug_pods(&client, format!("role={relay_proxy_name}")).await;
+            debug_pods(&client, "role=xds".into()).await;
+            debug_pods(&client, "role=agent".into()).await;
             panic!("Quilkin proxy deployment should be ready");
         }
 
@@ -171,7 +173,9 @@ mod tests {
             }
         }
         if !failed {
-            debug_pods(&client, None).await;
+            debug_pods(&client, format!("role={relay_proxy_name}")).await;
+            debug_pods(&client, "role=xds".into()).await;
+            debug_pods(&client, "role=agent".into()).await;
         }
         assert!(failed, "Packet should have failed");
 
@@ -392,7 +396,7 @@ mod tests {
         )
         .await;
         if result.is_err() {
-            debug_pods(client, Some("role=agent".into())).await;
+            debug_pods(client, Some("role=agent".into())(.await;
             panic!("Agent Deployment should be ready");
         }
         result.unwrap().expect("Should have an agent deployment");