chore: tcp listener test flakiness (#1007)

Author: gaspb

modules/meteroid/src/api_rest/server.rs

@@ -33,6 +33,30 @@ pub async fn start_rest_server(
     store: Store,
     services: Services,
     ready: std::sync::Arc<std::sync::atomic::AtomicBool>,
+) -> Result<(), Box<dyn std::error::Error>> {
+    let listener = TcpListener::bind(&config.rest_api_addr)
+        .await
+        .expect("Could not bind listener");
+    start_rest_server_with_listener(
+        config,
+        object_store,
+        stripe_adapter,
+        store,
+        services,
+        ready,
+        listener,
+    )
+    .await
+}
+
+pub async fn start_rest_server_with_listener(
+    config: Config,
+    object_store: Arc<dyn ObjectStoreService>,
+    stripe_adapter: Arc<Stripe>,
+    store: Store,
+    services: Services,
+    ready: std::sync::Arc<std::sync::atomic::AtomicBool>,
+    listener: TcpListener,
 ) -> Result<(), Box<dyn std::error::Error>> {
     let app_state = AppState {
         object_store,
@@ -101,10 +125,6 @@ pub async fn start_rest_server(
 
     tracing::info!("Starting REST API on {}", config.rest_api_addr);
 
-    let listener = TcpListener::bind(&config.rest_api_addr)
-        .await
-        .expect("Could not bind listener");
-
     axum::serve(listener, app.into_make_service()).await?;
 
     Ok(())

modules/meteroid/tests/integration/meteroid_it/container.rs

@@ -94,7 +94,10 @@ pub async fn start_meteroid_with_port(
     usage_client: Arc<dyn UsageClient>,
     mailer: Arc<dyn MailerService>,
 ) -> MeteroidSetup {
-    let rest_api_addr = helpers::network::free_local_socket().expect("Could not get webhook addr");
+    let rest_listener = tokio::net::TcpListener::bind("127.0.0.1:0")
+        .await
+        .expect("Could not bind REST listener");
+    let rest_api_addr = rest_listener.local_addr().expect("Could not get REST addr");
 
     let config = super::config::mocked_config(
         postgres_connection_string,
@@ -140,13 +143,14 @@ pub async fn start_meteroid_with_port(
     let stripe_adapter = Arc::new(Stripe { client: stripe });
 
     let ready = std::sync::Arc::new(std::sync::atomic::AtomicBool::new(true));
-    let rest_server = meteroid::api_rest::server::start_rest_server(
+    let rest_server = meteroid::api_rest::server::start_rest_server_with_listener(
         config.clone(),
         in_memory_object_store(),
         stripe_adapter,
         store.clone(),
         services.clone(),
         ready,
+        rest_listener,
     );
 
     let join_handle_meteroid = tokio::spawn(async move {