Update docker-compose-runner (#1373)

shotover · Nov 30, 2023 · 11590c4 · 11590c4
1 parent 34c4bfd
commit 11590c4
Show file tree

Hide file tree

Showing 8 changed files with 315 additions and 624 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -61,8 +61,8 @@ rand_distr = "0.4.1"
 clap = { version = "4.0.4", features = ["cargo", "derive"] }
 async-trait = "0.1.30"
 typetag = "0.2.5"
-aws-throwaway = "0.4.0"
+aws-throwaway = "0.5.0"
 tokio-bin-process = "0.4.0"
 ordered-float = { version = "4.0.0", features = ["serde"] }
 hyper = { version = "0.14.14", features = ["server"] }
-shell-quote = "0.4.0"
+shell-quote = { default-features = false, version = "0.5.0" }
diff --git a/ec2-cargo/src/main.rs b/ec2-cargo/src/main.rs
@@ -74,12 +74,6 @@ sudo /bin/docker1 "$@"
 ' | sudo dd of=/bin/docker
 sudo chmod +x /bin/docker
 
-# hack to work around docker-compose command not being present on this machine
-echo '#!/bin/bash
-docker compose "$@"
-' | sudo dd of=/bin/docker-compose
-sudo chmod +x /bin/docker-compose
-
 echo "export RUST_BACKTRACE=1" >> .profile
 echo "export CARGO_TERM_COLOR=always" >> .profile
 echo 'source "$HOME/.cargo/env"' >> .profile

diff --git a/shotover-proxy/benches/windsock/aws/mod.rs b/shotover-proxy/benches/windsock/aws/mod.rs
@@ -12,7 +12,7 @@ use std::{
     path::{Path, PathBuf},
     sync::Arc,
 };
-use test_helpers::docker_compose::get_image_waiters;
+use test_helpers::docker_compose::IMAGE_WAITERS;
 use tokio::sync::RwLock;
 use tokio_bin_process::bin_path;
 use tokio_bin_process::event::{Event, Level};
@@ -218,7 +218,7 @@ sudo docker system prune -af"#,
             .ssh()
             .shell_stdout_lines(&format!("sudo docker logs -f {container_id} 2>&1"))
             .await;
-        let image_waiter = get_image_waiters()
+        let image_waiter = IMAGE_WAITERS
             .iter()
             .find(|x| x.name == image)
             .unwrap_or_else(|| {

diff --git a/test-helpers/Cargo.toml b/test-helpers/Cargo.toml
@@ -32,5 +32,5 @@ tracing-subscriber.workspace = true
 serde_yaml.workspace = true
 anyhow.workspace = true
 rcgen.workspace = true
-docker-compose-runner = "0.2.0"
 rdkafka = { version = "0.36", features = ["cmake-build"], optional = true }
+docker-compose-runner = "0.3.0"
diff --git a/test-helpers/src/docker_compose.rs b/test-helpers/src/docker_compose.rs
@@ -1,5 +1,5 @@
 use docker_compose_runner::*;
-use std::env;
+use std::{env, time::Duration};
 use tracing_subscriber::fmt::TestWriter;
 
 pub use docker_compose_runner::DockerCompose;
@@ -14,7 +14,7 @@ fn setup_tracing_subscriber_for_test_logic() {
 
 pub fn docker_compose(file_path: &str) -> DockerCompose {
     setup_tracing_subscriber_for_test_logic();
-    DockerCompose::new(get_image_waiters(), |_| {}, file_path)
+    DockerCompose::new(&IMAGE_WAITERS, |_| {}, file_path)
 }
 
 /// Creates a new DockerCompose running an instance of moto the AWS mocking server
@@ -27,59 +27,57 @@ pub fn new_moto() -> DockerCompose {
     docker_compose("tests/transforms/docker-compose-moto.yaml")
 }
 
-pub fn get_image_waiters() -> &'static [Image] {
-    &[
-        Image {
-            name: "motoserver/moto",
-            log_regex_to_wait_for: r"Press CTRL\+C to quit",
-            timeout: 120,
-        },
-        Image {
-            name: "library/redis:5.0.9",
-            log_regex_to_wait_for: r"Ready to accept connections",
-            timeout: 120,
-        },
-        Image {
-            name: "library/redis:6.2.5",
-            log_regex_to_wait_for: r"Ready to accept connections",
-            timeout: 120,
-        },
-        Image {
-            name: "bitnami/redis:6.2.13-debian-11-r73",
-            log_regex_to_wait_for: r"Ready to accept connections",
-            timeout: 120,
-        },
-        Image {
-            name: "bitnami/redis-cluster:6.2.12-debian-11-r26",
-            //`Cluster state changed` is created by the node services
-            //`Cluster correctly created` is created by the init service
-            log_regex_to_wait_for: r"Cluster state changed|Cluster correctly created",
-            timeout: 120,
-        },
-        Image {
-            name: "bitnami/cassandra:4.0.6",
-            log_regex_to_wait_for: r"Startup complete",
-            timeout: 120,
-        },
-        Image {
-            name: "shotover/cassandra-test:4.0.6-r1",
-            log_regex_to_wait_for: r"Startup complete",
-            timeout: 120,
-        },
-        Image {
-            name: "shotover/cassandra-test:3.11.13-r1",
-            log_regex_to_wait_for: r"Startup complete",
-            timeout: 120,
-        },
-        Image {
-            name: "bitnami/kafka:3.4.0-debian-11-r22",
-            log_regex_to_wait_for: r"Kafka Server started",
-            timeout: 120,
-        },
-        Image {
-            name: "opensearchproject/opensearch:2.9.0",
-            log_regex_to_wait_for: r"Node started",
-            timeout: 120,
-        },
-    ]
-}
+pub static IMAGE_WAITERS: [Image; 10] = [
+    Image {
+        name: "motoserver/moto",
+        log_regex_to_wait_for: r"Press CTRL\+C to quit",
+        timeout: Duration::from_secs(120),
+    },
+    Image {
+        name: "library/redis:5.0.9",
+        log_regex_to_wait_for: r"Ready to accept connections",
+        timeout: Duration::from_secs(120),
+    },
+    Image {
+        name: "library/redis:6.2.5",
+        log_regex_to_wait_for: r"Ready to accept connections",
+        timeout: Duration::from_secs(120),
+    },
+    Image {
+        name: "bitnami/redis:6.2.13-debian-11-r73",
+        log_regex_to_wait_for: r"Ready to accept connections",
+        timeout: Duration::from_secs(120),
+    },
+    Image {
+        name: "bitnami/redis-cluster:6.2.12-debian-11-r26",
+        //`Cluster state changed` is created by the node services
+        //`Cluster correctly created` is created by the init service
+        log_regex_to_wait_for: r"Cluster state changed|Cluster correctly created",
+        timeout: Duration::from_secs(120),
+    },
+    Image {
+        name: "bitnami/cassandra:4.0.6",
+        log_regex_to_wait_for: r"Startup complete",
+        timeout: Duration::from_secs(120),
+    },
+    Image {
+        name: "shotover/cassandra-test:4.0.6-r1",
+        log_regex_to_wait_for: r"Startup complete",
+        timeout: Duration::from_secs(120),
+    },
+    Image {
+        name: "shotover/cassandra-test:3.11.13-r1",
+        log_regex_to_wait_for: r"Startup complete",
+        timeout: Duration::from_secs(120),
+    },
+    Image {
+        name: "bitnami/kafka:3.4.0-debian-11-r22",
+        log_regex_to_wait_for: r"Kafka Server started",
+        timeout: Duration::from_secs(120),
+    },
+    Image {
+        name: "opensearchproject/opensearch:2.9.0",
+        log_regex_to_wait_for: r"Node started",
+        timeout: Duration::from_secs(120),
+    },
+];
diff --git a/windsock/Cargo.toml b/windsock/Cargo.toml
@@ -20,4 +20,4 @@ tokio.workspace = true
 
 [dev-dependencies]
 scylla = { version = "0.10.0", features = ["ssl"] }
-docker-compose-runner = "0.2.0"
+docker-compose-runner = "0.3.0"
diff --git a/windsock/examples/cassandra.rs b/windsock/examples/cassandra.rs
@@ -138,16 +138,14 @@ impl BenchTask for BenchTaskCassandra {
 }
 
 fn docker_compose(file_path: &str) -> DockerCompose {
-    DockerCompose::new(get_image_waiters(), |_| {}, file_path)
+    DockerCompose::new(&IMAGE_WAITERS, |_| {}, file_path)
 }
 
-fn get_image_waiters() -> &'static [Image] {
-    &[Image {
-        name: "bitnami/cassandra:4.0.6",
-        log_regex_to_wait_for: r"Startup complete",
-        timeout: 120,
-    }]
-}
+static IMAGE_WAITERS: [Image; 1] = [Image {
+    name: "bitnami/cassandra:4.0.6",
+    log_regex_to_wait_for: r"Startup complete",
+    timeout: Duration::from_secs(120),
+}];
 
 fn set_working_dir() {
     // tests and benches will set the directory to the directory of the crate, we are acting as a benchmark so we do the same