Remove shotover specific logic from DockerCompose

custom-transforms-example/tests/test.rs

@@ -2,13 +2,13 @@ use redis::aio::Connection;
 use redis::Cmd;
 use std::time::Duration;
 use test_helpers::connection::redis_connection;
-use test_helpers::docker_compose::DockerCompose;
+use test_helpers::docker_compose::docker_compose;
 use test_helpers::shotover_process::{BinProcess, EventMatcher, Level};
 
 #[tokio::test(flavor = "multi_thread")]
 async fn test_custom_transform() {
  // Setup shotover and the redis server it connects to
- let _compose = DockerCompose::new("config/docker-compose.yaml");
+ let _compose = docker_compose("config/docker-compose.yaml");
  let shotover = shotover_proxy("config/topology.yaml").await;
  let mut connection = redis_connection::new_async(6379).await;
 

shotover-proxy/benches/benches/cassandra.rs

@@ -3,7 +3,8 @@ use criterion::{criterion_group, Criterion};
 use test_helpers::connection::cassandra::{
  CassandraConnection, CassandraConnectionBuilder, CassandraDriver,
 };
-use test_helpers::docker_compose::DockerCompose;
+use test_helpers::docker_compose::docker_compose;
+use test_helpers::docker_compose_runner::DockerCompose;
 use test_helpers::lazy::new_lazy_shared;
 use test_helpers::shotover_process::{BinProcess, ShotoverProcessBuilder};
 use tokio::runtime::Runtime;
@@ -231,7 +232,7 @@ impl BenchResources {
  .enable_all()
  .build()
  .unwrap();
- let compose = DockerCompose::new(compose_file);
+ let compose = docker_compose(compose_file);
  let shotover = Some(
  tokio.block_on(ShotoverProcessBuilder::new_with_topology(shotover_topology).start()),
  );
@@ -260,7 +261,7 @@ impl BenchResources {
  .enable_all()
  .build()
  .unwrap();
- let compose = DockerCompose::new(compose_file);
+ let compose = docker_compose(compose_file);
  let shotover = Some(
  tokio.block_on(ShotoverProcessBuilder::new_with_topology(shotover_topology).start()),
  );

shotover-proxy/benches/benches/redis.rs

@@ -2,7 +2,8 @@ use criterion::{criterion_group, Criterion};
 use redis::Cmd;
 use std::path::Path;
 use test_helpers::connection::redis_connection;
-use test_helpers::docker_compose::DockerCompose;
+use test_helpers::docker_compose::docker_compose;
+use test_helpers::docker_compose_runner::DockerCompose;
 use test_helpers::lazy::new_lazy_shared;
 use test_helpers::shotover_process::{BinProcess, ShotoverProcessBuilder};
 use tokio::runtime::Runtime;
@@ -168,7 +169,7 @@ impl BenchResources {
  .enable_all()
  .build()
  .unwrap();
- let compose = DockerCompose::new(compose_file);
+ let compose = docker_compose(compose_file);
  let shotover = Some(
  tokio.block_on(ShotoverProcessBuilder::new_with_topology(shotover_topology).start()),
  );

shotover-proxy/examples/cassandra_bench.rs

@@ -1,5 +1,5 @@
 use clap::Parser;
-use test_helpers::docker_compose::DockerCompose;
+use test_helpers::docker_compose::docker_compose;
 use test_helpers::latte::Latte;
 use test_helpers::shotover_process::ShotoverProcessBuilder;
 
@@ -25,7 +25,7 @@ async fn main() {
  let latte = Latte::new(args.rate, 1);
  let bench = "read";
  {
- let _compose = DockerCompose::new(&format!("{}/docker-compose.yaml", args.config_dir));
+ let _compose = docker_compose(&format!("{}/docker-compose.yaml", args.config_dir));
 
  let shotover = ShotoverProcessBuilder::new_with_topology(&format!(
  "{}/topology.yaml",

shotover-proxy/examples/cassandra_cluster_bench.rs

@@ -1,4 +1,4 @@
-use test_helpers::docker_compose::DockerCompose;
+use test_helpers::docker_compose::docker_compose;
 use test_helpers::latte::Latte;
 use test_helpers::shotover_process::ShotoverProcessBuilder;
 
@@ -10,7 +10,7 @@ async fn main() {
  let config_dir = "example-configs/cassandra-cluster-v4";
  let bench = "read";
  {
- let _compose = DockerCompose::new(&format!("{}/docker-compose.yaml", config_dir));
+ let _compose = docker_compose(&format!("{}/docker-compose.yaml", config_dir));
  let shotover =
  ShotoverProcessBuilder::new_with_topology(&format!("{}/topology.yaml", config_dir))
  .start()

shotover-proxy/examples/cassandra_cluster_flamegraph.rs

@@ -1,4 +1,4 @@
-use test_helpers::docker_compose::DockerCompose;
+use test_helpers::docker_compose::docker_compose;
 use test_helpers::flamegraph::Perf;
 use test_helpers::latte::Latte;
 use test_helpers::shotover_process::ShotoverProcessBuilder;
@@ -17,7 +17,7 @@ async fn main() {
  let config_dir = "example-configs/cassandra-cluster-v4";
  let bench = "read";
  {
- let _compose = DockerCompose::new(&format!("{}/docker-compose.yaml", config_dir));
+ let _compose = docker_compose(&format!("{}/docker-compose.yaml", config_dir));
  latte.init(bench, "172.16.1.2:9044");
 
  let shotover =

shotover-proxy/examples/cassandra_flamegraph.rs

@@ -1,4 +1,4 @@
-use test_helpers::docker_compose::DockerCompose;
+use test_helpers::docker_compose::docker_compose;
 use test_helpers::flamegraph::Perf;
 use test_helpers::latte::Latte;
 use test_helpers::shotover_process::ShotoverProcessBuilder;
@@ -17,7 +17,7 @@ async fn main() {
  let config_dir = "example-configs/cassandra-passthrough";
  let bench = "read";
  {
- let _compose = DockerCompose::new(&format!("{}/docker-compose.yaml", config_dir));
+ let _compose = docker_compose(&format!("{}/docker-compose.yaml", config_dir));
  latte.init(bench, "localhost:9043");
 
  let shotover =

shotover-proxy/examples/kafka_bench.rs

@@ -1,4 +1,4 @@
-use test_helpers::docker_compose::DockerCompose;
+use test_helpers::docker_compose::docker_compose;
 use test_helpers::kafka_producer_perf_test::run_producer_bench;
 use test_helpers::shotover_process::ShotoverProcessBuilder;
 
@@ -8,7 +8,7 @@ async fn main() {
 
  let config_dir = "tests/test-configs/kafka/passthrough";
  {
- let _compose = DockerCompose::new(&format!("{}/docker-compose.yaml", config_dir));
+ let _compose = docker_compose(&format!("{}/docker-compose.yaml", config_dir));
  let shotover =
  ShotoverProcessBuilder::new_with_topology(&format!("{}/topology.yaml", config_dir))
  .start()
@@ -21,7 +21,7 @@ async fn main() {
  }
 
  // restart the docker container to avoid running out of disk space
- let _compose = DockerCompose::new(&format!("{}/docker-compose.yaml", config_dir));
+ let _compose = docker_compose(&format!("{}/docker-compose.yaml", config_dir));
  println!("\nBenching Direct Kafka ...");
  run_producer_bench("[localhost]:9092");
 }

shotover-proxy/examples/kafka_flamegraph.rs

@@ -1,4 +1,4 @@
-use test_helpers::docker_compose::DockerCompose;
+use test_helpers::docker_compose::docker_compose;
 use test_helpers::flamegraph::Perf;
 use test_helpers::kafka_producer_perf_test::run_producer_bench;
 use test_helpers::shotover_process::ShotoverProcessBuilder;
@@ -14,7 +14,7 @@ async fn main() {
  test_helpers::bench::init();
  let config_dir = "tests/test-configs/kafka/passthrough";
  {
- let _compose = DockerCompose::new(&format!("{}/docker-compose.yaml", config_dir));
+ let _compose = docker_compose(&format!("{}/docker-compose.yaml", config_dir));
 
  let shotover =
  ShotoverProcessBuilder::new_with_topology(&format!("{}/topology.yaml", config_dir))

shotover-proxy/tests/cassandra_int_tests/cluster/single_rack_v4.rs

@@ -7,7 +7,8 @@ use test_helpers::connection::cassandra::{
  assert_query_result, run_query, CassandraConnection, CassandraConnectionBuilder,
  CassandraDriver, ResultValue,
 };
-use test_helpers::docker_compose::DockerCompose;
+
+use test_helpers::docker_compose_runner::DockerCompose;
 use tokio::sync::broadcast;
 use tokio::time::timeout;
 

shotover-proxy/tests/cassandra_int_tests/mod.rs

@@ -14,7 +14,7 @@ use test_helpers::connection::cassandra::{
 };
 use test_helpers::connection::cassandra::{Compression, ProtocolVersion};
 use test_helpers::connection::redis_connection;
-use test_helpers::docker_compose::DockerCompose;
+use test_helpers::docker_compose::{docker_compose, new_moto};
 use test_helpers::shotover_process::{Count, EventMatcher, Level, ShotoverProcessBuilder};
 use tokio::time::{timeout, Duration};
 
@@ -59,7 +59,7 @@ where
 #[tokio::test(flavor = "multi_thread")]
 #[serial]
 async fn passthrough_standard(#[case] driver: CassandraDriver) {
- let _compose = DockerCompose::new("example-configs/cassandra-passthrough/docker-compose.yaml");
+ let _compose = docker_compose("example-configs/cassandra-passthrough/docker-compose.yaml");
 
  let shotover = ShotoverProcessBuilder::new_with_topology(
  "example-configs/cassandra-passthrough/topology.yaml",
@@ -81,7 +81,7 @@ async fn passthrough_standard(#[case] driver: CassandraDriver) {
 #[tokio::test(flavor = "multi_thread")]
 #[serial]
 async fn passthrough_encode(#[case] driver: CassandraDriver) {
- let _compose = DockerCompose::new("example-configs/cassandra-passthrough/docker-compose.yaml");
+ let _compose = docker_compose("example-configs/cassandra-passthrough/docker-compose.yaml");
 
  let shotover = ShotoverProcessBuilder::new_with_topology(
  "example-configs/cassandra-passthrough/topology-encode.yaml",
@@ -104,7 +104,7 @@ async fn passthrough_encode(#[case] driver: CassandraDriver) {
 #[serial]
 async fn source_tls_and_single_tls(#[case] driver: CassandraDriver) {
  test_helpers::cert::generate_cassandra_test_certs();
- let _compose = DockerCompose::new("example-configs/cassandra-tls/docker-compose.yaml");
+ let _compose = docker_compose("example-configs/cassandra-tls/docker-compose.yaml");
 
  let shotover =
  ShotoverProcessBuilder::new_with_topology("example-configs/cassandra-tls/topology.yaml")
@@ -145,7 +145,7 @@ async fn source_tls_and_single_tls(#[case] driver: CassandraDriver) {
 #[tokio::test(flavor = "multi_thread")]
 #[serial]
 async fn cluster_single_rack_v3(#[case] driver: CassandraDriver) {
- let _compose = DockerCompose::new("example-configs/cassandra-cluster-v3/docker-compose.yaml");
+ let _compose = docker_compose("example-configs/cassandra-cluster-v3/docker-compose.yaml");
 
  {
  let shotover = ShotoverProcessBuilder::new_with_topology(
@@ -181,7 +181,7 @@ async fn cluster_single_rack_v3(#[case] driver: CassandraDriver) {
 #[tokio::test(flavor = "multi_thread")]
 #[serial]
 async fn cluster_single_rack_v4(#[case] driver: CassandraDriver) {
- let compose = DockerCompose::new("example-configs/cassandra-cluster-v4/docker-compose.yaml");
+ let compose = docker_compose("example-configs/cassandra-cluster-v4/docker-compose.yaml");
 
  let connection = || async {
  let mut connection = CassandraConnectionBuilder::new("127.0.0.1", 9042, driver)
@@ -245,7 +245,7 @@ async fn cluster_single_rack_v4(#[case] driver: CassandraDriver) {
 #[serial]
 async fn cluster_multi_rack(#[case] driver: CassandraDriver) {
  let _compose =
- DockerCompose::new("example-configs/cassandra-cluster-multi-rack/docker-compose.yaml");
+ docker_compose("example-configs/cassandra-cluster-multi-rack/docker-compose.yaml");
 
  {
  let shotover_rack1 = ShotoverProcessBuilder::new_with_topology(
@@ -300,7 +300,7 @@ async fn source_tls_and_cluster_tls(#[case] driver: CassandraDriver) {
  test_helpers::cert::generate_cassandra_test_certs();
  let ca_cert = "example-configs/docker-images/cassandra-tls-4.0.6/certs/localhost_CA.crt";
 
- let _compose = DockerCompose::new("example-configs/cassandra-cluster-tls/docker-compose.yaml");
+ let _compose = docker_compose("example-configs/cassandra-cluster-tls/docker-compose.yaml");
  {
  let shotover = ShotoverProcessBuilder::new_with_topology(
  "example-configs/cassandra-cluster-tls/topology.yaml",
@@ -349,7 +349,7 @@ async fn source_tls_and_cluster_tls(#[case] driver: CassandraDriver) {
 #[tokio::test(flavor = "multi_thread")]
 #[serial]
 async fn cassandra_redis_cache(#[case] driver: CassandraDriver) {
- let _compose = DockerCompose::new("example-configs/cassandra-redis-cache/docker-compose.yaml");
+ let _compose = docker_compose("example-configs/cassandra-redis-cache/docker-compose.yaml");
 
  let shotover = ShotoverProcessBuilder::new_with_topology(
  "example-configs/cassandra-redis-cache/topology.yaml",
@@ -380,8 +380,7 @@ async fn cassandra_redis_cache(#[case] driver: CassandraDriver) {
 #[tokio::test(flavor = "multi_thread")]
 #[serial]
 async fn protect_transform_local(#[case] driver: CassandraDriver) {
- let _compose =
- DockerCompose::new("example-configs/cassandra-protect-local/docker-compose.yaml");
+ let _compose = docker_compose("example-configs/cassandra-protect-local/docker-compose.yaml");
 
  let shotover = ShotoverProcessBuilder::new_with_topology(
  "example-configs/cassandra-protect-local/topology.yaml",
@@ -407,8 +406,8 @@ async fn protect_transform_local(#[case] driver: CassandraDriver) {
 #[tokio::test(flavor = "multi_thread")]
 #[serial]
 async fn protect_transform_aws(#[case] driver: CassandraDriver) {
- let _compose = DockerCompose::new("example-configs/cassandra-protect-aws/docker-compose.yaml");
- let _compose_aws = DockerCompose::new_moto();
+ let _compose = docker_compose("example-configs/cassandra-protect-aws/docker-compose.yaml");
+ let _compose_aws = new_moto();
 
  let shotover = ShotoverProcessBuilder::new_with_topology(
  "example-configs/cassandra-protect-aws/topology.yaml",
@@ -434,7 +433,7 @@ async fn protect_transform_aws(#[case] driver: CassandraDriver) {
 #[tokio::test(flavor = "multi_thread")]
 #[serial]
 async fn peers_rewrite_v4(#[case] driver: CassandraDriver) {
- let _docker_compose = DockerCompose::new(
+ let _docker_compose = docker_compose(
  "tests/test-configs/cassandra-peers-rewrite/docker-compose-4.0-cassandra.yaml",
  );
 
@@ -536,7 +535,7 @@ async fn peers_rewrite_v4(#[case] driver: CassandraDriver) {
 #[tokio::test(flavor = "multi_thread")]
 #[serial]
 async fn peers_rewrite_v3(#[case] driver: CassandraDriver) {
- let _docker_compose = DockerCompose::new(
+ let _docker_compose = docker_compose(
  "tests/test-configs/cassandra-peers-rewrite/docker-compose-3.11-cassandra.yaml",
  );
 
@@ -575,7 +574,7 @@ async fn peers_rewrite_v3(#[case] driver: CassandraDriver) {
 #[serial]
 async fn request_throttling(#[case] driver: CassandraDriver) {
  let _docker_compose =
- DockerCompose::new("example-configs/cassandra-passthrough/docker-compose.yaml");
+ docker_compose("example-configs/cassandra-passthrough/docker-compose.yaml");
 
  let shotover = ShotoverProcessBuilder::new_with_topology(
  "tests/test-configs/cassandra-request-throttling.yaml",
@@ -682,8 +681,7 @@ async fn request_throttling(#[case] driver: CassandraDriver) {
 #[serial]
 async fn compression_single(#[case] driver: CassandraDriver) {
  async fn test(driver: CassandraDriver, topology_path: &str, compression: Compression) {
- let _compose =
- DockerCompose::new("example-configs/cassandra-passthrough/docker-compose.yaml");
+ let _compose = docker_compose("example-configs/cassandra-passthrough/docker-compose.yaml");
  let shotover = ShotoverProcessBuilder::new_with_topology(topology_path)
  .start()
  .await;
@@ -715,8 +713,7 @@ async fn compression_single(#[case] driver: CassandraDriver) {
 #[serial]
 async fn compression_cluster(#[case] driver: CassandraDriver) {
  async fn test(driver: CassandraDriver, topology_path: &str, compression: Compression) {
- let _compose =
- DockerCompose::new("example-configs/cassandra-cluster-v4/docker-compose.yaml");
+ let _compose = docker_compose("example-configs/cassandra-cluster-v4/docker-compose.yaml");
  let shotover = ShotoverProcessBuilder::new_with_topology(topology_path)
  .start()
  .await;
@@ -750,7 +747,7 @@ async fn compression_cluster(#[case] driver: CassandraDriver) {
 #[serial]
 async fn events_keyspace(#[case] driver: CassandraDriver) {
  let _docker_compose =
- DockerCompose::new("example-configs/cassandra-passthrough/docker-compose.yaml");
+ docker_compose("example-configs/cassandra-passthrough/docker-compose.yaml");
 
  let shotover = ShotoverProcessBuilder::new_with_topology(
  "example-configs/cassandra-passthrough/topology.yaml",
@@ -791,7 +788,7 @@ async fn events_keyspace(#[case] driver: CassandraDriver) {
 #[serial]
 async fn test_protocol_v3(#[case] driver: CassandraDriver) {
  let _docker_compose =
- DockerCompose::new("example-configs/cassandra-passthrough/docker-compose.yaml");
+ docker_compose("example-configs/cassandra-passthrough/docker-compose.yaml");
 
  let shotover = ShotoverProcessBuilder::new_with_topology(
  "example-configs/cassandra-passthrough/topology-encode.yaml",
@@ -816,7 +813,7 @@ async fn test_protocol_v3(#[case] driver: CassandraDriver) {
 #[serial]
 async fn test_protocol_v4(#[case] driver: CassandraDriver) {
  let _docker_compose =
- DockerCompose::new("example-configs/cassandra-passthrough/docker-compose.yaml");
+ docker_compose("example-configs/cassandra-passthrough/docker-compose.yaml");
 
  let shotover = ShotoverProcessBuilder::new_with_topology(
  "example-configs/cassandra-passthrough/topology-encode.yaml",
@@ -841,7 +838,7 @@ async fn test_protocol_v4(#[case] driver: CassandraDriver) {
 #[serial]
 async fn test_protocol_v5_single(#[case] driver: CassandraDriver) {
  let _docker_compose =
- DockerCompose::new("example-configs/cassandra-passthrough/docker-compose.yaml");
+ docker_compose("example-configs/cassandra-passthrough/docker-compose.yaml");
 
  let shotover = ShotoverProcessBuilder::new_with_topology(
  "example-configs/cassandra-passthrough/topology-encode.yaml",

shotover-proxy/tests/examples/mod.rs

@@ -3,13 +3,13 @@ use serial_test::serial;
 use test_helpers::connection::cassandra::{
  assert_query_result, CassandraConnectionBuilder, CassandraDriver, ResultValue,
 };
-use test_helpers::docker_compose::DockerCompose;
+use test_helpers::docker_compose::docker_compose;
 
 #[tokio::test(flavor = "multi_thread")]
 #[serial]
 async fn test_cassandra_rewrite_peers_example() {
  let _docker_compose =
- DockerCompose::new("example-configs-docker/cassandra-peers-rewrite/docker-compose.yaml");
+ docker_compose("example-configs-docker/cassandra-peers-rewrite/docker-compose.yaml");
 
  let connection = CassandraConnectionBuilder::new("172.16.1.2", 9043, CassandraDriver::Datastax)
  .build()

shotover-proxy/tests/kafka_int_tests/mod.rs

@@ -1,13 +1,14 @@
 use serial_test::serial;
-use test_helpers::{docker_compose::DockerCompose, shotover_process::ShotoverProcessBuilder};
+use test_helpers::docker_compose::docker_compose;
+use test_helpers::shotover_process::ShotoverProcessBuilder;
 
 mod test_cases;
 
 #[tokio::test]
 #[serial]
 async fn passthrough_standard() {
  let _docker_compose =
- DockerCompose::new("tests/test-configs/kafka/passthrough/docker-compose.yaml");
+ docker_compose("tests/test-configs/kafka/passthrough/docker-compose.yaml");
  let shotover = ShotoverProcessBuilder::new_with_topology(
  "tests/test-configs/kafka/passthrough/topology.yaml",
  )
@@ -23,7 +24,7 @@ async fn passthrough_standard() {
 #[serial]
 async fn passthrough_encode() {
  let _docker_compose =
- DockerCompose::new("tests/test-configs/kafka/passthrough/docker-compose.yaml");
+ docker_compose("tests/test-configs/kafka/passthrough/docker-compose.yaml");
  let shotover = ShotoverProcessBuilder::new_with_topology(
  "tests/test-configs/kafka/passthrough/topology-encode.yaml",
  )