fix: template-redis-enterprise feature gate and example API updates

- Add template-redis-enterprise to feature gate cfg in src/lib.rs and src/template.rs
- Update testing_basics.rs to use current ExecCommand and LogsCommand API signatures
- Add dynamic port mapping and readiness probe for Postgres in test_fixtures.rs
- Add test_sentinel example entry to Cargo.toml

Co-authored-by: David Horner <[email protected]>

Author: joshrotenberg

Cargo.toml

@@ -110,3 +110,8 @@ required-features = ["template-redis-cluster"]
 name = "redis_enterprise_template"
 path = "examples/redis_enterprise_template.rs"
 required-features = ["template-redis-enterprise"]
+
+[[example]]
+name = "test_sentinel"
+path = "examples/test_sentinel.rs"
+required-features = ["template-redis"]

examples/test_fixtures.rs

@@ -144,29 +144,71 @@ impl PostgresFixture {
     ) -> Result<Self, Box<dyn std::error::Error>> {
         let container_name = unique_name("postgres");
 
-        RunCommand::new("postgres:15-alpine")
+        // Use dynamic host port mapping to avoid collisions on common ports (e.g., 5432)
+        let cid = RunCommand::new("postgres:15-alpine")
             .name(&container_name)
             .env("POSTGRES_DB", database)
             .env("POSTGRES_USER", username)
             .env("POSTGRES_PASSWORD", password)
-            .port(port, 5432)
+            .port_dyn(5432)
             .detach()
             .remove()
             .execute()
             .await?;
 
-        // Wait for PostgreSQL to be ready
-        wait_for_port("localhost", port, Duration::from_secs(10)).await?;
+        // Determine mapped host port so we can probe from the host
+        let mapped_ports = cid.port_mappings().await?;
+        let host_port = mapped_ports.first().map(|m| m.host_port).unwrap_or(port);
+
+        // Wait for PostgreSQL to be ready on the host-mapped port
+        wait_for_port("localhost", host_port, Duration::from_secs(10)).await?;
 
         // Additional wait for PostgreSQL initialization
         tokio::time::sleep(Duration::from_secs(2)).await;
 
+        // Probe PostgreSQL with psql until it accepts connections
+        let mut ready = false;
+        for _ in 0..30 {
+            let probe = ExecCommand::new(
+                &container_name,
+                vec![
+                    "psql".to_string(),
+                    "-U".to_string(),
+                    username.to_string(),
+                    "-d".to_string(),
+                    database.to_string(),
+                    "-c".to_string(),
+                    "SELECT 1".to_string(),
+                ],
+            )
+            .env("PGPASSWORD", password)
+            .execute()
+            .await;
+
+            if let Ok(out) = probe {
+                if out.exit_code == 0 {
+                    ready = true;
+                    break;
+                }
+            }
+
+            tokio::time::sleep(Duration::from_secs(1)).await;
+        }
+
+        if !ready {
+            return Err(format!(
+                "PostgreSQL in container {} did not become ready in time",
+                container_name
+            )
+            .into());
+        }
+
         Ok(Self {
             container_name,
             database: database.to_string(),
             username: username.to_string(),
             password: password.to_string(),
-            port,
+            port: host_port,
         })
     }
 

examples/testing_basics.rs

@@ -35,11 +35,13 @@ async fn test_with_auto_cleanup() {
     tokio::time::sleep(Duration::from_secs(1)).await;
 
     // Execute test commands
-    let result = ExecCommand::new(&container_name)
-        .cmd(vec!["redis-cli", "PING"])
-        .execute()
-        .await
-        .expect("Failed to execute command");
+    let result = ExecCommand::new(
+        &container_name,
+        vec!["redis-cli".to_string(), "PING".to_string()],
+    )
+    .execute()
+    .await
+    .expect("Failed to execute command");
 
     assert_eq!(result.stdout.trim(), "PONG");
 
@@ -112,8 +114,8 @@ async fn test_with_error_handling() {
             eprintln!("Failed to start container: {}", e);
 
             // Try to get logs for debugging
-            if let Ok(logs) = LogsCommand::new(&container_name).tail(50).execute().await {
-                eprintln!("Container logs:\n{}", logs);
+            if let Ok(logs) = LogsCommand::new(&container_name).tail("50").execute().await {
+                eprintln!("Container logs:\n{}", logs.stdout);
             }
 
             panic!("Test failed due to container startup error");
@@ -194,9 +196,9 @@ async fn test_with_log_inspection() {
     RunCommand::new("alpine")
         .name(&container_name)
         .cmd(vec![
-            "sh",
-            "-c",
-            "echo 'Starting app...'; sleep 1; echo 'App ready!'",
+            "sh".to_string(),
+            "-c".to_string(),
+            "echo 'Starting app...'; sleep 1; echo 'App ready!'".to_string(),
         ])
         .detach()
         .execute()
@@ -212,10 +214,10 @@ async fn test_with_log_inspection() {
         .await
         .expect("Failed to fetch logs");
 
-    println!("Container logs:\n{}", logs);
+    println!("Container logs:\n{}", logs.stdout);
 
-    assert!(logs.contains("Starting app..."));
-    assert!(logs.contains("App ready!"));
+    assert!(logs.stdout.contains("Starting app..."));
+    assert!(logs.stdout.contains("App ready!"));
 
     // Cleanup
     let _ = RmCommand::new(&container_name).force().execute().await;
@@ -250,7 +252,7 @@ mod tests {
         // Start a simple container
         let output = RunCommand::new("alpine")
             .name(&container_name)
-            .cmd(vec!["echo", "Hello from test!"])
+            .cmd(vec!["echo".to_string(), "Hello from test!".to_string()])
             .execute()
             .await
             .expect("Failed to run container");

src/lib.rs

@@ -406,6 +406,7 @@ pub mod stream;
     feature = "templates",
     feature = "template-redis",
     feature = "template-redis-cluster",
+    feature = "template-redis-enterprise",
     feature = "template-postgres",
     feature = "template-mysql",
     feature = "template-mongodb",
@@ -456,6 +457,7 @@ pub mod stream;
     feature = "templates",
     feature = "template-redis",
     feature = "template-redis-cluster",
+    feature = "template-redis-enterprise",
     feature = "template-postgres",
     feature = "template-mysql",
     feature = "template-mongodb",

src/template.rs

@@ -16,7 +16,11 @@ use std::collections::HashMap;
 use tracing::{debug, error, info, trace, warn};
 
 // Redis templates
-#[cfg(any(feature = "template-redis", feature = "template-redis-cluster"))]
+#[cfg(any(
+    feature = "template-redis",
+    feature = "template-redis-cluster",
+    feature = "template-redis-enterprise"
+))]
 pub mod redis;
 
 // Database templates