refactor: avoid too specific logic on client level

Author: DDtKey

testcontainers/src/compose/mod.rs

@@ -12,6 +12,9 @@ mod error;
 
 pub use error::{ComposeError, Result};
 
+const COMPOSE_PROJECT_LABEL: &str = "com.docker.compose.project";
+const COMPOSE_SERVICE_LABEL: &str = "com.docker.compose.service";
+
 pub struct DockerCompose {
     project_name: String,
     client: Arc<client::ComposeClient>,
@@ -80,13 +83,17 @@ impl DockerCompose {
 
         let docker_client = Client::lazy_client().await?;
 
-        let container_ids = docker_client
-            .list_containers_by_label("com.docker.compose.project", &self.project_name)
+        let containers = docker_client
+            .list_containers_by_label(COMPOSE_PROJECT_LABEL, &self.project_name)
             .await?;
 
-        for (service_name, container_id) in container_ids {
-            let raw = RawContainer::new(container_id, docker_client.clone());
-            self.services.insert(service_name, raw);
+        for container in containers {
+            if let (Some(labels), Some(id)) = (container.labels, container.id) {
+                if let Some(service_name) = labels.get(COMPOSE_SERVICE_LABEL) {
+                    let raw = RawContainer::new(id, docker_client.clone());
+                    self.services.insert(service_name.clone(), raw);
+                }
+            }
         }
 
         self.docker_client = Some(docker_client.clone());

testcontainers/src/core/client.rs

@@ -185,14 +185,11 @@ impl Client {
             .map_err(ClientError::InspectContainer)
     }
 
-    #[cfg(feature = "docker-compose")]
     pub(crate) async fn list_containers_by_label(
         &self,
         label_key: &str,
         label_value: &str,
-    ) -> Result<HashMap<String, String>, ClientError> {
-        use bollard::models::ContainerSummary;
-
+    ) -> Result<Vec<bollard::models::ContainerSummary>, ClientError> {
         let filters = HashMap::from([(
             "label".to_string(),
             vec![format!("{}={}", label_key, label_value)],
@@ -203,25 +200,10 @@ impl Client {
             .filters(&filters)
             .build();
 
-        let containers: Vec<ContainerSummary> = self
-            .bollard
+        self.bollard
             .list_containers(Some(options))
             .await
-            .map_err(ClientError::ListContainers)?;
-
-        let mut result = HashMap::new();
-
-        for container in containers {
-            if let Some(labels) = container.labels {
-                if let Some(service_name) = labels.get("com.docker.compose.service") {
-                    if let Some(id) = container.id {
-                        result.insert(service_name.clone(), id);
-                    }
-                }
-            }
-        }
-
-        Ok(result)
+            .map_err(ClientError::ListContainers)
     }
 
     pub(crate) async fn rm(&self, id: &str) -> Result<(), ClientError> {