review feedback

shotover · Feb 21, 2024 · 33b49c4 · 33b49c4
1 parent 867e28d
commit 33b49c4
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 216 deletions.
diff --git a/shotover-proxy/tests/kafka_int_tests/test_cases.rs b/shotover-proxy/tests/kafka_int_tests/test_cases.rs
@@ -320,7 +320,10 @@ pub async fn basic_sasl(address: &str) {
         // internal driver debug logs are emitted to tokio tracing, assuming the appropriate filter is used by the tracing subscriber
         .set("debug", "all");
     admin(client.clone()).await;
-    produce_consume(client.clone()).await;
-    produce_consume_acks0(client.clone()).await;
+    for i in 0..2 {
+        produce_consume(client.clone(), "partitions1", i).await;
+        produce_consume(client.clone(), "partitions3", i).await;
+        produce_consume_acks0(client.clone()).await;
+    }
     admin_cleanup(client.clone()).await;
 }
diff --git a/shotover-proxy/tests/test-configs/kafka/passthrough-sasl/certs/kafka-generate-ssl.sh b/shotover-proxy/tests/test-configs/kafka/passthrough-sasl/certs/kafka-generate-ssl.sh
diff --git a/shotover-proxy/tests/test-configs/kafka/passthrough-sasl/certs/kafka.keystore.jks b/shotover-proxy/tests/test-configs/kafka/passthrough-sasl/certs/kafka.keystore.jks
diff --git a/shotover-proxy/tests/test-configs/kafka/passthrough-sasl/certs/kafka.truststore.jks b/shotover-proxy/tests/test-configs/kafka/passthrough-sasl/certs/kafka.truststore.jks
diff --git a/shotover-proxy/tests/test-configs/kafka/passthrough-sasl/docker-compose.yaml b/shotover-proxy/tests/test-configs/kafka/passthrough-sasl/docker-compose.yaml
@@ -2,7 +2,7 @@ version: '2'
 
 services:
   kafka:
-    image: 'bitnami/kafka:latest'
+    image: 'bitnami/kafka:3.6.1-debian-11-r24'
     ports:
       - '9092:9092'
       - '9093:9093'

diff --git a/test-helpers/src/docker_compose.rs b/test-helpers/src/docker_compose.rs
@@ -20,7 +20,7 @@ pub fn new_moto() -> DockerCompose {
     docker_compose("tests/transforms/docker-compose-moto.yaml")
 }
 
-pub static IMAGE_WAITERS: [Image; 12] = [
+pub static IMAGE_WAITERS: [Image; 11] = [
     Image {
         name: "motoserver/moto",
         log_regex_to_wait_for: r"Press CTRL\+C to quit",
@@ -68,11 +68,6 @@ pub static IMAGE_WAITERS: [Image; 12] = [
         log_regex_to_wait_for: r"Kafka Server started",
         timeout: Duration::from_secs(120),
     },
-    Image {
-        name: "bitnami/kafka:latest",
-        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",