From 154d9d8da573576d2119c9cba1e2831af905d71d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 27 May 2024 14:00:27 +0000
Subject: [PATCH 1/2] build(deps): Bump testcontainers from 0.16.7 to 0.17.0

Bumps [testcontainers](https://github.com/testcontainers/testcontainers-rs) from 0.16.7 to 0.17.0.
- [Release notes](https://github.com/testcontainers/testcontainers-rs/releases)
- [Changelog](https://github.com/testcontainers/testcontainers-rs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/testcontainers/testcontainers-rs/compare/0.16.7...0.17.0)

---
updated-dependencies:
- dependency-name: testcontainers
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Cargo.lock | 20 +++++++++++++++++---
 Cargo.toml |  2 +-
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 06261868..b6455414 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4805,23 +4805,26 @@ checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76"
 
 [[package]]
 name = "testcontainers"
-version = "0.16.7"
+version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69d47265a44d1035a322691cf0a6cc227d79b62ef86ffb0dbc204b394fee3d07"
+checksum = "025e0ac563d543e0354d984540e749859a83dbe5c0afb8d458dc48d91cef2d6a"
 dependencies = [
  "async-trait",
  "bollard",
  "bollard-stubs",
+ "bytes",
  "dirs 5.0.1",
- "dns-lookup",
  "docker_credential",
  "futures",
  "log",
+ "memchr",
  "parse-display",
  "serde",
  "serde_json",
  "serde_with",
+ "thiserror",
  "tokio",
+ "tokio-stream",
  "tokio-util",
  "url",
 ]
@@ -4991,6 +4994,17 @@ dependencies = [
  "tokio",
 ]
 
+[[package]]
+name = "tokio-stream"
+version = "0.1.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af"
+dependencies = [
+ "futures-core",
+ "pin-project-lite",
+ "tokio",
+]
+
 [[package]]
 name = "tokio-util"
 version = "0.7.11"
diff --git a/Cargo.toml b/Cargo.toml
index ff387e8f..49c6d8c4 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -59,4 +59,4 @@ rstest = "0.19.0"
 tempfile = "3.10.1"
 assert_cmd = "2.0.14"
 predicates = "3.1.0"
-testcontainers = { version = "0.16", features = ["blocking"] }
+testcontainers = { version = "0.17", features = ["blocking"] }

From a6d4fd3d67093f5134faea30e653ac96fd79fb7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Guilherme=20Vanz?= <jguilhermevanz@suse.com>
Date: Mon, 27 May 2024 17:10:49 -0300
Subject: [PATCH 2/2] fix(test): fix testcontainers methods calls.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The testcontainers v0.17.0 changed the functions to return a Result
object. Therefore, this commit updates the test code to call expect
function to extract the value or fail the test.

Signed-off-by: José Guilherme Vanz <jguilhermevanz@suse.com>
---
 tests/airgap.rs | 8 ++++++--
 tests/e2e.rs    | 8 ++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/tests/airgap.rs b/tests/airgap.rs
index 31352aa5..094b361f 100644
--- a/tests/airgap.rs
+++ b/tests/airgap.rs
@@ -13,8 +13,12 @@ fn test_airgap() {
     // Run registry
     let registry_image = testcontainers::GenericImage::new("docker.io/library/registry", "2")
         .with_wait_for(WaitFor::message_on_stderr("listening on "));
-    let testcontainer = registry_image.start();
-    let port = testcontainer.get_host_port_ipv4(5000);
+    let testcontainer = registry_image
+        .start()
+        .expect("Failed to start registry container");
+    let port = testcontainer
+        .get_host_port_ipv4(5000)
+        .expect("Failed to get host port");
 
     // Save policies
     let mut save_policies_script = setup_airgap_script_command(
diff --git a/tests/e2e.rs b/tests/e2e.rs
index f0b9bdc8..6346fa1f 100644
--- a/tests/e2e.rs
+++ b/tests/e2e.rs
@@ -330,8 +330,12 @@ fn test_save_and_load() {
 fn test_push() {
     let registry_image = testcontainers::GenericImage::new("docker.io/library/registry", "2")
         .with_wait_for(WaitFor::message_on_stderr("listening on "));
-    let testcontainer = registry_image.start();
-    let port = testcontainer.get_host_port_ipv4(5000);
+    let testcontainer = registry_image
+        .start()
+        .expect("Failed to start registry container");
+    let port = testcontainer
+        .get_host_port_ipv4(5000)
+        .expect("Failed to get port");
 
     let tempdir = tempdir().unwrap();
     pull_policies(tempdir.path(), POLICIES);