Upgrade testcontainers to 0.16 (#3063)

Cargo.toml

@@ -98,7 +98,7 @@ signal-hook-tokio = "0.3.1"
 sqlx = "0.7.4"
 stopper = "0.2.7"
 tempfile = "3.10.1"
-testcontainers = "0.15.0"
+testcontainers = "0.16.5"
 thiserror = "1.0"
 tracing = "0.1.40"
 tracing-chrome = "0.7.2"

aggregator/src/binary_utils.rs

@@ -556,16 +556,16 @@ mod tests {
     use crate::{
         aggregator::http_handlers::test_util::take_response_body,
         binary_utils::{
-            database_pool, register_database_pool_status_metrics, zpages_handler,
-            CommonBinaryOptions,
+            database_pool, initialize_rustls, register_database_pool_status_metrics,
+            zpages_handler, CommonBinaryOptions,
         },
         config::DbConfig,
     };
     use clap::CommandFactory;
     use janus_aggregator_core::datastore::test_util::ephemeral_datastore;
     use janus_core::test_util::{
         install_test_trace_subscriber,
-        testcontainers::{container_client, Postgres, Volume},
+        testcontainers::{Postgres, Volume},
     };
     use opentelemetry::metrics::MeterProvider as _;
     use opentelemetry_sdk::{
@@ -574,7 +574,7 @@ mod tests {
         testing::metrics::InMemoryMetricsExporter,
     };
     use std::{collections::HashMap, fs};
-    use testcontainers::RunnableImage;
+    use testcontainers::{core::Mount, runners::AsyncRunner, RunnableImage};
     use tokio::task::spawn_blocking;
     use tracing_subscriber::{reload, EnvFilter};
     use trillium::Status;
@@ -654,8 +654,8 @@ mod tests {
     #[tokio::test]
     async fn postgres_tls_connection() {
         install_test_trace_subscriber();
+        initialize_rustls();
 
-        let client = container_client();
         // We need to be careful about providing the certificate and private key to the Postgres
         // container. The key must have '-rw-------' permissions, and both must be readable by the
         // postgres user, which has UID 70 inside the container at time of writing. Merely mounting
@@ -680,16 +680,16 @@ mod tests {
                 .to_string(),
             ]),
         ))
-        .with_volume((
+        .with_mount(Mount::bind_mount(
             fs::canonicalize("tests/tls_files")
                 .unwrap()
                 .into_os_string()
                 .into_string()
                 .unwrap(),
             "/etc/ssl/postgresql_host",
         ))
-        .with_volume((volume.name(), "/etc/ssl/postgresql"));
-        let setup_container = client.run(setup_image);
+        .with_mount(Mount::volume_mount(volume.name(), "/etc/ssl/postgresql"));
+        let setup_container = setup_image.start().await;
         drop(setup_container);
 
         let image = RunnableImage::from((
@@ -703,10 +703,10 @@ mod tests {
                 "ssl_key_file=/etc/ssl/postgresql/127.0.0.1-key.pem".to_string(),
             ]),
         ))
-        .with_volume((volume.name(), "/etc/ssl/postgresql"));
-        let db_container = client.run(image);
+        .with_mount(Mount::volume_mount(volume.name(), "/etc/ssl/postgresql"));
+        let db_container = image.start().await;
         const POSTGRES_DEFAULT_PORT: u16 = 5432;
-        let port = db_container.get_host_port_ipv4(POSTGRES_DEFAULT_PORT);
+        let port = db_container.get_host_port_ipv4(POSTGRES_DEFAULT_PORT).await;
 
         let db_config = DbConfig {
             url: format!("postgres://postgres@127.0.0.1:{port}/postgres?sslmode=require")

aggregator_core/src/datastore/test_util.rs

@@ -19,21 +19,19 @@ use sqlx::{
 use std::{
     path::PathBuf,
     str::FromStr,
-    sync::{Arc, Barrier, Weak},
-    thread::{self, JoinHandle},
+    sync::{Arc, Weak},
     time::Duration,
 };
-use testcontainers::RunnableImage;
-use tokio::sync::{oneshot, Mutex};
+use testcontainers::{runners::AsyncRunner, ContainerAsync, RunnableImage};
+use tokio::sync::Mutex;
 use tokio_postgres::{connect, Config, NoTls};
 use tracing::trace;
 
 use super::SUPPORTED_SCHEMA_VERSIONS;
 
 struct EphemeralDatabase {
+    _db_container: ContainerAsync<Postgres>,
     port_number: u16,
-    shutdown_barrier: Arc<Barrier>,
-    join_handle: Option<JoinHandle<()>>,
 }
 
 impl EphemeralDatabase {
@@ -51,30 +49,15 @@ impl EphemeralDatabase {
     }
 
     async fn start() -> Self {
-        let (port_tx, port_rx) = oneshot::channel();
-        let shutdown_barrier = Arc::new(Barrier::new(2));
-        let join_handle = thread::spawn({
-            let shutdown_barrier = Arc::clone(&shutdown_barrier);
-            move || {
-                // Start an instance of Postgres running in a container.
-                let container_client = testcontainers::clients::Cli::default();
-                let db_container = container_client.run(RunnableImage::from(Postgres::default()));
-                const POSTGRES_DEFAULT_PORT: u16 = 5432;
-                let port_number = db_container.get_host_port_ipv4(POSTGRES_DEFAULT_PORT);
-                trace!("Postgres container is up with port {port_number}");
-                port_tx.send(port_number).unwrap();
-
-                // Wait for the barrier as a shutdown signal.
-                shutdown_barrier.wait();
-                trace!("Shutting down Postgres container with port {port_number}");
-            }
-        });
-        let port_number = port_rx.await.unwrap();
+        // Start an instance of Postgres running in a container.
+        let db_container = RunnableImage::from(Postgres::default()).start().await;
+        const POSTGRES_DEFAULT_PORT: u16 = 5432;
+        let port_number = db_container.get_host_port_ipv4(POSTGRES_DEFAULT_PORT).await;
+        trace!("Postgres container is up with port {port_number}");
 
         Self {
+            _db_container: db_container,
             port_number,
-            shutdown_barrier,
-            join_handle: Some(join_handle),
         }
     }
 
@@ -86,17 +69,6 @@ impl EphemeralDatabase {
     }
 }
 
-impl Drop for EphemeralDatabase {
-    fn drop(&mut self) {
-        // Wait on the shutdown barrier, which will cause the container-management thread to
-        // begin shutdown. Then wait for the container-management thread itself to terminate.
-        // This guarantees container shutdown finishes before dropping the EphemeralDatabase
-        // completes.
-        self.shutdown_barrier.wait();
-        self.join_handle.take().unwrap().join().unwrap();
-    }
-}
-
 /// EphemeralDatastore represents an ephemeral datastore instance. It has methods allowing
 /// creation of Datastores, as well as the ability to retrieve the underlying connection pool.
 ///

core/src/test_util/testcontainers.rs

@@ -1,23 +1,7 @@
 //! Testing functionality that interacts with the testcontainers library.
 
-use std::{
-    collections::HashMap,
-    process::Command,
-    sync::{Arc, Mutex, Weak},
-};
-use testcontainers::{clients::Cli, core::WaitFor, Image};
-
-/// Returns a container client, possibly shared with other callers to this function.
-pub fn container_client() -> Arc<Cli> {
-    static CONTAINER_CLIENT_MU: Mutex<Weak<Cli>> = Mutex::new(Weak::new());
-
-    let mut container_client = CONTAINER_CLIENT_MU.lock().unwrap();
-    container_client.upgrade().unwrap_or_else(|| {
-        let client = Arc::new(Cli::default());
-        *container_client = Arc::downgrade(&client);
-        client
-    })
-}
+use std::{collections::HashMap, process::Command};
+use testcontainers::{core::WaitFor, Image};
 
 /// A [`testcontainers::Image`] that provides a Postgres server.
 #[derive(Debug)]

deny.toml

@@ -34,6 +34,7 @@ allow = [
     "Unicode-DFS-2016",
     "OpenSSL",
     "Unlicense",
+    "CC0-1.0",
 ]
 
 [[licenses.clarify]]

integration_tests/src/client.rs

@@ -17,7 +17,7 @@ use prio::{
 use rand::random;
 use serde_json::{json, Value};
 use std::env;
-use testcontainers::{clients::Cli, core::WaitFor, Image, RunnableImage};
+use testcontainers::{core::WaitFor, runners::AsyncRunner, Image, RunnableImage};
 use url::Url;
 
 /// Extension trait to encode measurements for VDAFs as JSON objects, according to
@@ -182,7 +182,6 @@ pub enum ClientBackend<'a> {
     /// Uploads reports by starting a containerized client implementation, and sending it requests
     /// using draft-dcook-ppm-dap-interop-test-design.
     Container {
-        container_client: &'a Cli,
         container_image: InteropClient,
         network: &'a str,
     },
@@ -195,7 +194,7 @@ impl<'a> ClientBackend<'a> {
         task_parameters: &TaskParameters,
         (leader_port, helper_port): (u16, u16),
         vdaf: V,
-    ) -> anyhow::Result<ClientImplementation<'a, V>>
+    ) -> anyhow::Result<ClientImplementation<V>>
     where
         V: vdaf::Client<16> + InteropClientEncoding,
     {
@@ -208,26 +207,25 @@ impl<'a> ClientBackend<'a> {
             .await
             .map_err(Into::into),
             ClientBackend::Container {
-                container_client,
                 container_image,
                 network,
             } => Ok(ClientImplementation::new_container(
                 test_name,
-                container_client,
                 container_image.clone(),
                 network,
                 task_parameters,
                 vdaf,
-            )),
+            )
+            .await),
         }
     }
 }
 
-pub struct ContainerClientImplementation<'d, V>
+pub struct ContainerClientImplementation<V>
 where
     V: vdaf::Client<16>,
 {
-    _container: ContainerLogsDropGuard<'d, InteropClient>,
+    _container: ContainerLogsDropGuard<InteropClient>,
     leader: Url,
     helper: Url,
     task_id: TaskId,
@@ -240,23 +238,23 @@ where
 
 /// A DAP client implementation, specialized to work with a particular VDAF. See also
 /// [`ClientBackend`].
-pub enum ClientImplementation<'d, V>
+pub enum ClientImplementation<V>
 where
     V: vdaf::Client<16>,
 {
     InProcess { client: Client<V> },
-    Container(Box<ContainerClientImplementation<'d, V>>),
+    Container(Box<ContainerClientImplementation<V>>),
 }
 
-impl<'d, V> ClientImplementation<'d, V>
+impl<V> ClientImplementation<V>
 where
     V: vdaf::Client<16> + InteropClientEncoding,
 {
     pub async fn new_in_process(
         task_parameters: &TaskParameters,
         (leader_port, helper_port): (u16, u16),
         vdaf: V,
-    ) -> Result<ClientImplementation<'static, V>, janus_client::Error> {
+    ) -> Result<ClientImplementation<V>, janus_client::Error> {
         let (leader_aggregator_endpoint, helper_aggregator_endpoint) = task_parameters
             .endpoint_fragments
             .endpoints_for_host_client(leader_port, helper_port);
@@ -271,9 +269,8 @@ where
         Ok(ClientImplementation::InProcess { client })
     }
 
-    pub fn new_container(
+    pub async fn new_container(
         test_name: &str,
-        container_client: &'d Cli,
         container_image: InteropClient,
         network: &str,
         task_parameters: &TaskParameters,
@@ -283,14 +280,14 @@ where
         let client_container_name = format!("client-{random_part}");
         let container = ContainerLogsDropGuard::new_janus(
             test_name,
-            container_client.run(
-                RunnableImage::from(container_image)
-                    .with_network(network)
-                    .with_env_var(get_rust_log_level())
-                    .with_container_name(client_container_name),
-            ),
+            RunnableImage::from(container_image)
+                .with_network(network)
+                .with_env_var(get_rust_log_level())
+                .with_container_name(client_container_name)
+                .start()
+                .await,
         );
-        let host_port = container.get_host_port_ipv4(8080);
+        let host_port = container.get_host_port_ipv4(8080).await;
         let http_client = reqwest::Client::new();
         let (leader_aggregator_endpoint, helper_aggregator_endpoint) = task_parameters
             .endpoint_fragments

integration_tests/src/daphne.rs

@@ -7,29 +7,29 @@ use janus_interop_binaries::{
 };
 use janus_messages::{Role, Time};
 use serde_json::json;
-use testcontainers::{clients::Cli, GenericImage, RunnableImage};
+use testcontainers::{runners::AsyncRunner, GenericImage, RunnableImage};
 use url::Url;
 
 const DAPHNE_HELPER_IMAGE_NAME_AND_TAG: &str = "cloudflare/daphne-worker-helper:sha-f6b3ef1";
 
 /// Represents a running Daphne test instance.
-pub struct Daphne<'a> {
-    daphne_container: Option<ContainerLogsDropGuard<'a, GenericImage>>,
+pub struct Daphne {
+    _daphne_container: Option<ContainerLogsDropGuard<GenericImage>>,
+    port: u16,
 }
 
-impl<'a> Daphne<'a> {
+impl Daphne {
     const INTERNAL_SERVING_PORT: u16 = 8788;
 
     /// Create and start a new hermetic Daphne test instance in the given Docker network, configured
     /// to service the given task. The aggregator port is also exposed to the host.
     pub async fn new(
         test_name: &str,
-        container_client: &'a Cli,
         network: &str,
         task: &Task,
         role: Role,
         start_container: bool,
-    ) -> Daphne<'a> {
+    ) -> Daphne {
         let (endpoint, image_name_and_tag) = match role {
             Role::Leader => panic!("A leader container image for Daphne is not yet available"),
             Role::Helper => (
@@ -51,10 +51,12 @@ impl<'a> Daphne<'a> {
                 .with_container_name(endpoint.host_str().unwrap());
             let daphne_container = ContainerLogsDropGuard::new(
                 test_name,
-                container_client.run(runnable_image),
+                runnable_image.start().await,
                 ContainerLogsSource::Path("/logs".into()),
             );
-            let port = daphne_container.get_host_port_ipv4(Self::INTERNAL_SERVING_PORT);
+            let port = daphne_container
+                .get_host_port_ipv4(Self::INTERNAL_SERVING_PORT)
+                .await;
             (port, Some(daphne_container))
         } else {
             (Self::INTERNAL_SERVING_PORT, None)
@@ -123,15 +125,14 @@ impl<'a> Daphne<'a> {
         // Write the given task to the Daphne instance we started.
         interop_api::aggregator_add_task(port, task, role).await;
 
-        Self { daphne_container }
+        Self {
+            _daphne_container: daphne_container,
+            port,
+        }
     }
 
     /// Returns the port of the aggregator on the host.
     pub fn port(&self) -> u16 {
-        self.daphne_container
-            .as_ref()
-            .map_or(Self::INTERNAL_SERVING_PORT, |container| {
-                container.get_host_port_ipv4(Self::INTERNAL_SERVING_PORT)
-            })
+        self.port
     }
 }