diff --git a/src/agent/Cargo.lock b/src/agent/Cargo.lock index 78f227570f..e1089995e4 100644 --- a/src/agent/Cargo.lock +++ b/src/agent/Cargo.lock @@ -626,6 +626,20 @@ dependencies = [ "cfg-if 1.0.0", ] +[[package]] +name = "crossbeam" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2801af0d36612ae591caa9568261fddce32ce6e08a7275ea334a06a4ad021a2c" +dependencies = [ + "cfg-if 1.0.0", + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-epoch", + "crossbeam-queue", + "crossbeam-utils", +] + [[package]] name = "crossbeam-channel" version = "0.5.6" @@ -661,6 +675,16 @@ dependencies = [ "scopeguard", ] +[[package]] +name = "crossbeam-queue" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cd42583b04998a5363558e5f9291ee5a5ff6b49944332103f251e7479a82aa7" +dependencies = [ + "cfg-if 1.0.0", + "crossbeam-utils", +] + [[package]] name = "crossbeam-utils" version = "0.8.11" @@ -881,6 +905,17 @@ dependencies = [ "subtle", ] +[[package]] +name = "dircpy" +version = "0.3.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73ff6269b47c0c5220a0ff5eb140424340276ec89a10e58cbd4cf366de52dfa9" +dependencies = [ + "jwalk", + "log", + "walkdir", +] + [[package]] name = "dirs-next" version = "2.0.0" @@ -1091,6 +1126,12 @@ dependencies = [ "percent-encoding 2.1.0", ] +[[package]] +name = "fs_extra" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2022715d62ab30faffd124d40b76f4134a550a87792276512b18d63272333394" + [[package]] name = "funty" version = "1.1.0" @@ -1508,10 +1549,12 @@ dependencies = [ [[package]] name = "image-rs" version = "0.1.0" -source = "git+https://github.com/confidential-containers/image-rs?rev=00cd5661d8a8c9fb11d96d3f46d3ef14009c6c5f#00cd5661d8a8c9fb11d96d3f46d3ef14009c6c5f" +source = "git+https://github.com/confidential-containers/image-rs?rev=a1d7ba31201d9d7a575d05c5fed1f2cb2142a842#a1d7ba31201d9d7a575d05c5fed1f2cb2142a842" dependencies = [ "anyhow", + "dircpy", "flate2", + "fs_extra", "futures-util", "libc", "log", @@ -1523,13 +1566,11 @@ dependencies = [ "serde", "serde_json", "sha2 0.10.5", - "shadow-rs", "signature 0.1.0", "strum", "tar", "tokio", - "tonic 0.5.2", - "tonic-build 0.5.2", + "walkdir", "zstd", ] @@ -1658,6 +1699,16 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "jwalk" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "172752e853a067cbce46427de8470ddf308af7fd8ceaf9b682ef31a5021b6bb9" +dependencies = [ + "crossbeam", + "rayon", +] + [[package]] name = "jwt" version = "0.15.0" @@ -3111,6 +3162,15 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + [[package]] name = "scan_fmt" version = "0.2.6" @@ -3367,17 +3427,24 @@ dependencies = [ [[package]] name = "signature" version = "0.1.0" -source = "git+https://github.com/confidential-containers/image-rs?rev=00cd5661d8a8c9fb11d96d3f46d3ef14009c6c5f#00cd5661d8a8c9fb11d96d3f46d3ef14009c6c5f" +source = "git+https://github.com/confidential-containers/image-rs?rev=a1d7ba31201d9d7a575d05c5fed1f2cb2142a842#a1d7ba31201d9d7a575d05c5fed1f2cb2142a842" dependencies = [ "anyhow", + "async-trait", "base64", "hex", "oci-distribution", + "prost 0.8.0", "sequoia-openpgp", "serde", "serde_json", "serde_yaml", + "shadow-rs", "strum", + "strum_macros 0.24.3", + "tokio", + "tonic 0.5.2", + "tonic-build 0.5.2", "url 2.2.2", ] @@ -3531,7 +3598,7 @@ version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cae14b91c7d11c9a851d3fbc80a963198998c2a64eec840477fa92d8ce9b70bb" dependencies = [ - "strum_macros", + "strum_macros 0.23.1", ] [[package]] @@ -3547,6 +3614,19 @@ dependencies = [ "syn", ] +[[package]] +name = "strum_macros" +version = "0.24.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" +dependencies = [ + "heck 0.4.0", + "proc-macro2", + "quote", + "rustversion", + "syn", +] + [[package]] name = "subprocess" version = "0.2.9" @@ -4308,6 +4388,17 @@ dependencies = [ "tokio-vsock", ] +[[package]] +name = "walkdir" +version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" +dependencies = [ + "same-file", + "winapi", + "winapi-util", +] + [[package]] name = "want" version = "0.3.0" diff --git a/src/agent/Cargo.toml b/src/agent/Cargo.toml index a97dd8846b..1bf91b0482 100644 --- a/src/agent/Cargo.toml +++ b/src/agent/Cargo.toml @@ -68,7 +68,7 @@ toml = "0.5.8" clap = { version = "3.0.1", features = ["derive"] } # Image pull/decrypt -image-rs = { git = "https://github.com/confidential-containers/image-rs", rev = "00cd5661d8a8c9fb11d96d3f46d3ef14009c6c5f" } +image-rs = { git = "https://github.com/confidential-containers/image-rs", rev = "a1d7ba31201d9d7a575d05c5fed1f2cb2142a842" } # "vendored" feature for openssl is required by musl build openssl = { version = "0.10.38", features = ["vendored"] }