From e97299c5e7b97304aa5141f4b02a6f8f2a322486 Mon Sep 17 00:00:00 2001 From: Siegfried Weber Date: Wed, 16 Jun 2021 16:58:42 +0200 Subject: [PATCH 1/2] Test cases for jobs created --- Cargo.lock | 50 +++++++++--------- Cargo.toml | 2 +- tests/job.rs | 130 +++++++++++++++++++++++++++++++++++++++++++++++ tests/service.rs | 2 +- 4 files changed, 157 insertions(+), 27 deletions(-) create mode 100644 tests/job.rs diff --git a/Cargo.lock b/Cargo.lock index 5ac5a7e..c9a8fae 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -508,7 +508,7 @@ dependencies = [ [[package]] name = "integration-test-commons" version = "0.1.0" -source = "git+https://github.com/stackabletech/integration-test-commons.git?tag=0.1.0#45b52b1a69af2d770357d0a32bcb19c9c0cd92a9" +source = "git+https://github.com/stackabletech/integration-test-commons.git?branch=verify_status#99fe0aee35b5f132890a49637384e15c4333486c" dependencies = [ "anyhow", "futures", @@ -634,9 +634,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.96" +version = "0.2.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5600b4e6efc5421841a2138a6b082e07fe12f9aaa12783d50e5d13325b26b4fc" +checksum = "12b8adadd720df158f4d70dfe7ccc6adb0472d7c55ca83445f6a5ab3e36f8fb6" [[package]] name = "linked-hash-map" @@ -667,9 +667,9 @@ checksum = "b16bd47d9e329435e309c58469fe0791c2d0d1ba96ec0954152a5ae2b04387dc" [[package]] name = "mio" -version = "0.7.11" +version = "0.7.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf80d3e903b34e0bd7282b218398aec54e082c840d9baf8339e0080a0c542956" +checksum = "8c2bdb6314ec10835cd3293dd268473a835c02b7b352e788be788b3c6ca6bb16" dependencies = [ "libc", "log", @@ -804,15 +804,15 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.7.2" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af8b08b04175473088b46763e51ee54da5f9a164bc162f615b91bc179dbf15a3" +checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56" [[package]] name = "openssl" -version = "0.10.34" +version = "0.10.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d7830286ad6a3973c0f1d9b73738f69c76b739301d0229c4b96501695cbe4c8" +checksum = "549430950c79ae24e6d02e0b7404534ecf311d94cc9f861e9e4020187d13d885" dependencies = [ "bitflags", "cfg-if", @@ -830,9 +830,9 @@ checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a" [[package]] name = "openssl-sys" -version = "0.9.63" +version = "0.9.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6b0d6fb7d80f877617dfcb014e605e2b5ab2fb0afdf27935219bb6bd984cb98" +checksum = "209efc2fe0e980c8849efacdb567f975a1c80245c4f6980d6f012733bfa851af" dependencies = [ "autocfg", "cc", @@ -982,13 +982,13 @@ dependencies = [ [[package]] name = "rand" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ef9e7e66b4468674bfcb0c81af8b7fa0bb154fa9f28eb840da5c447baeb8d7e" +checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8" dependencies = [ "libc", "rand_chacha", - "rand_core 0.6.2", + "rand_core 0.6.3", "rand_hc", ] @@ -999,7 +999,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core 0.6.2", + "rand_core 0.6.3", ] [[package]] @@ -1019,20 +1019,20 @@ checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" [[package]] name = "rand_core" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34cf66eb183df1c5876e2dcf6b13d57340741e8dc255b48e40a26de954d06ae7" +checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" dependencies = [ "getrandom", ] [[package]] name = "rand_hc" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3190ef7066a446f2e7f42e239d161e905420ccab01eb967c9eb27d21b2322a73" +checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7" dependencies = [ - "rand_core 0.6.2", + "rand_core 0.6.3", ] [[package]] @@ -1046,9 +1046,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "742739e41cd49414de871ea5e549afb7e2a3ac77b589bcbebe8c82fab37147fc" +checksum = "5ab49abadf3f9e1c4bc499e8845e152ad87d2ad2d30371841171169e9d75feee" dependencies = [ "bitflags", ] @@ -1317,7 +1317,7 @@ checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22" dependencies = [ "cfg-if", "libc", - "rand 0.8.3", + "rand 0.8.4", "redox_syscall", "remove_dir_all", "winapi", @@ -1561,9 +1561,9 @@ dependencies = [ [[package]] name = "vcpkg" -version = "0.2.13" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "025ce40a007e1907e58d5bc1a594def78e5573bb0b1160bc389634e8f12e4faa" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] name = "want" diff --git a/Cargo.toml b/Cargo.toml index 799b51d..ea478db 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,6 +7,6 @@ name = "agent-integration-tests" version = "0.1.0" [dependencies] -integration-test-commons = { git = "https://github.com/stackabletech/integration-test-commons.git", tag = "0.1.0" } +integration-test-commons = { git = "https://github.com/stackabletech/integration-test-commons.git", branch = "verify_status" } futures = "0.3" tokio = { version = "1.7", features = ["macros", "rt-multi-thread"] } diff --git a/tests/job.rs b/tests/job.rs new file mode 100644 index 0000000..ebeb041 --- /dev/null +++ b/tests/job.rs @@ -0,0 +1,130 @@ +use integration_test_commons::test::prelude::*; + +struct ExitService<'a> { + client: &'a TestKubeClient, + pod: TemporaryResource<'a, Pod>, +} + +impl<'a> ExitService<'a> { + pub fn new(client: &'a TestKubeClient, exit_code: i32) -> Self { + setup_repository(&client); + + let pod = TemporaryResource::new( + &client, + &with_unique_name(&format!( + " + apiVersion: v1 + kind: Pod + metadata: + name: agent-service-integration-test-job + spec: + containers: + - name: exit-service + image: exit-service:1.0.0 + command: + - exit-service-1.0.0/start.sh + env: + - name: EXIT_CODE + value: {exit_code} + restartPolicy: Never + tolerations: + - key: kubernetes.io/arch + operator: Equal + value: stackable-linux + ", + exit_code = exit_code + )), + ); + + ExitService { client, pod } + } + + pub fn verify_terminated(&mut self) { + self.client.verify_status::(&self.pod, |pod| { + let phase = ExitService::phase_from(pod); + let container_terminated = ExitService::terminated_container_state_from(pod).is_some(); + (phase == "Succeeded" || phase == "Failed") && container_terminated + }); + + self.pod.update(); + } + + pub fn phase(&self) -> String { + ExitService::phase_from(&self.pod) + } + + pub fn terminated_container_state(&self) -> Option { + ExitService::terminated_container_state_from(&self.pod) + } + + fn phase_from(pod: &Pod) -> String { + pod.status + .as_ref() + .and_then(|status| status.phase.clone()) + .unwrap_or_else(|| String::from("Unknown")) + } + + fn terminated_container_state_from(pod: &Pod) -> Option { + pod.status + .as_ref() + .and_then(|status| status.container_statuses.as_ref()) + .and_then(|container_statuses| container_statuses.first().to_owned()) + .and_then(|container_status| container_status.state.as_ref()) + .and_then(|state| state.terminated.to_owned()) + } +} + +#[test] +fn successful_job_should_have_phase_succeeded_and_error_code_0() { + let client = TestKubeClient::new(); + + let exit_code = 0; + let mut exit_service = ExitService::new(&client, exit_code); + + exit_service.verify_terminated(); + + asserting("phase") + .that(&exit_service.phase()) + .is_equal_to(String::from("Succeeded")); + + let container_state = exit_service + .terminated_container_state() + .expect("Terminated container state expected"); + asserting("exit code") + .that(&container_state.exit_code) + .is_equal_to(0); + asserting("message") + .that(&container_state.message) + .is_equal_to(Some(String::from("Completed"))); + asserting("reason") + .that(&container_state.message) + .is_equal_to(Some(String::from("Completed"))); +} + +#[test] +fn failed_job_should_have_phase_failed_and_error_code_1() { + let client = TestKubeClient::new(); + + // All non-zero exit codes are mapped by the agent to 1. + let exit_code = 42; + let mut exit_service = ExitService::new(&client, exit_code); + + exit_service.verify_terminated(); + + asserting("phase") + .that(&exit_service.phase()) + .is_equal_to(String::from("Failed")); + + let container_state = exit_service + .terminated_container_state() + .expect("Terminated container state expected"); + asserting("exit code") + .that(&container_state.exit_code) + .is_equal_to(1); + asserting("message") + .that(&container_state.message) + .is_equal_to(Some(String::from("Error"))); + asserting("reason") + .that(&container_state.message) + .is_equal_to(Some(String::from("Error"))); +} diff --git a/tests/service.rs b/tests/service.rs index 28cbda0..c24a46f 100644 --- a/tests/service.rs +++ b/tests/service.rs @@ -74,7 +74,7 @@ async fn starting_and_stopping_100_pods_simultaneously_should_succeed() { .expect("Kubernetes client could not be created"); client.timeouts.create = Duration::from_secs(60); client.timeouts.delete = Duration::from_secs(60); - client.timeouts.verify_pod_condition = Duration::from_secs(60); + client.timeouts.verify_status = Duration::from_secs(60); setup_repository_async(&client) .await From b9e4b28a68c5edcde3025d5d9da1578290e29a88 Mon Sep 17 00:00:00 2001 From: Siegfried Weber Date: Tue, 22 Jun 2021 09:02:40 +0200 Subject: [PATCH 2/2] integration-test-commons set to version 0.2.0 --- Cargo.lock | 340 +++++++++++++++++++++++++++++++++-------------------- Cargo.toml | 2 +- 2 files changed, 213 insertions(+), 129 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c9a8fae..7637799 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -19,26 +19,29 @@ dependencies = [ ] [[package]] -name = "anyhow" -version = "1.0.41" +name = "ansi_term" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15af2628f6890fe2609a3b91bef4c83450512802e59489f9c1cb1fa5df064a61" +checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" +dependencies = [ + "winapi", +] [[package]] -name = "array_tool" -version = "1.0.3" +name = "anyhow" +version = "1.0.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f8cb5d814eb646a863c4f24978cff2880c4be96ad8cde2c0f0678732902e271" +checksum = "15af2628f6890fe2609a3b91bef4c83450512802e59489f9c1cb1fa5df064a61" [[package]] -name = "atty" -version = "0.2.14" +name = "async-trait" +version = "0.1.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +checksum = "0b98e84bbb4cbcdd97da190ba0c58a1bb0de2c1fdf67d159e192ed766aeca722" dependencies = [ - "hermit-abi", - "libc", - "winapi", + "proc-macro2", + "quote", + "syn", ] [[package]] @@ -91,6 +94,26 @@ dependencies = [ "winapi", ] +[[package]] +name = "const_format" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c75ea7d6aeb2ebd1ee24f7b7e1b23242ef5a56b3a693733b99bfbe5ef31d0306" +dependencies = [ + "const_format_proc_macros", +] + +[[package]] +name = "const_format_proc_macros" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29c36c619c422113552db4eb28cddba8faa757e33f758cc3415bd2885977b591" +dependencies = [ + "proc-macro2", + "quote", + "unicode-xid", +] + [[package]] name = "core-foundation" version = "0.9.1" @@ -208,19 +231,6 @@ version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" -[[package]] -name = "env_logger" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" -dependencies = [ - "atty", - "humantime", - "log", - "regex", - "termcolor", -] - [[package]] name = "fnv" version = "1.0.7" @@ -412,15 +422,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6456b8a6c8f33fee7d958fcd1b60d55b11940a79e63ae87013e6d22e26034440" -[[package]] -name = "humantime" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" -dependencies = [ - "quick-error", -] - [[package]] name = "hyper" version = "0.14.9" @@ -475,17 +476,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" -[[package]] -name = "idna" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" -dependencies = [ - "matches", - "unicode-bidi", - "unicode-normalization", -] - [[package]] name = "indexmap" version = "1.6.2" @@ -507,8 +497,8 @@ dependencies = [ [[package]] name = "integration-test-commons" -version = "0.1.0" -source = "git+https://github.com/stackabletech/integration-test-commons.git?branch=verify_status#99fe0aee35b5f132890a49637384e15c4333486c" +version = "0.2.0" +source = "git+https://github.com/stackabletech/integration-test-commons.git?tag=0.2.0#ee183a60da31df979a601f12797a092420c6276f" dependencies = [ "anyhow", "futures", @@ -522,6 +512,7 @@ dependencies = [ "serde_json", "serde_yaml", "spectral", + "stackable-operator", "tokio", "uuid", ] @@ -533,13 +524,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" [[package]] -name = "jsonpath_lib" +name = "json-patch" version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61352ec23883402b7d30b3313c16cbabefb8907361c4eb669d990cbb87ceee5a" +checksum = "f995a3c8f2bc3dd52a18a583e90f9ec109c047fa1603a853e46bcda14d2e279d" +dependencies = [ + "serde", + "serde_json", + "treediff", +] + +[[package]] +name = "jsonpath_lib" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eaa63191d68230cccb81c5aa23abd53ed64d83337cacbb25a7b8c7979523774f" dependencies = [ - "array_tool", - "env_logger", "log", "serde", "serde_json", @@ -561,9 +561,9 @@ dependencies = [ [[package]] name = "kube" -version = "0.52.0" +version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65b2fbe85ad92f8435a0f52072f55bd7f0843e082c8e461e56d1ce29440554c8" +checksum = "ab252370b019dc6e3109e76b88f898c0131e3e0834a257e90f7d406af0391c76" dependencies = [ "base64", "bytes", @@ -572,33 +572,49 @@ dependencies = [ "either", "futures", "http", + "http-body", "hyper", "hyper-timeout", "hyper-tls", "jsonpath_lib", "k8s-openapi", - "log", + "kube-core", "openssl", "pem", "pin-project 1.0.7", "serde", "serde_json", "serde_yaml", - "static_assertions", "thiserror", "tokio", "tokio-native-tls", "tokio-util", "tower", + "tower-http", "tracing", - "url", +] + +[[package]] +name = "kube-core" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e16429f67308cec5fc942ead44c144eb50dfbdcc29fa9b7fcc9e676571c530c" +dependencies = [ + "form_urlencoded", + "http", + "json-patch", + "k8s-openapi", + "once_cell", + "serde", + "serde_json", + "thiserror", ] [[package]] name = "kube-derive" -version = "0.52.0" +version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dca5161aebec14aa62448469b4c128d165e70da503d43813702a23deeff9612" +checksum = "72487bd12b59bf030421af825138ece95d8ea6e1aaeda3456197aa2dde786964" dependencies = [ "darling", "proc-macro2", @@ -609,9 +625,9 @@ dependencies = [ [[package]] name = "kube-runtime" -version = "0.52.0" +version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdbf7b51e6a4984e929dab0bd13b61592b750a3385e298aaa9100c4830205a12" +checksum = "74cc67ec0d3715fc3527c5149a17b46ddadc326c12cb605368c6b19f34a40b03" dependencies = [ "dashmap", "derivative", @@ -653,6 +669,15 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "matchers" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f099785f7595cc4b4553a174ce30dd7589ef93391ff414dbb67f62392b9e0ce1" +dependencies = [ + "regex-automata", +] + [[package]] name = "matches" version = "0.1.8" @@ -830,9 +855,9 @@ checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a" [[package]] name = "openssl-sys" -version = "0.9.64" +version = "0.9.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "209efc2fe0e980c8849efacdb567f975a1c80245c4f6980d6f012733bfa851af" +checksum = "7a7907e3bfa08bb85105209cdfcb6c63d109f8f6c1ed6ca318fff5c1853fbc1d" dependencies = [ "autocfg", "cc", @@ -952,12 +977,6 @@ dependencies = [ "unicode-xid", ] -[[package]] -name = "quick-error" -version = "1.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" - [[package]] name = "quote" version = "1.0.9" @@ -1074,6 +1093,15 @@ dependencies = [ "regex-syntax", ] +[[package]] +name = "regex-automata" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +dependencies = [ + "regex-syntax", +] + [[package]] name = "regex-syntax" version = "0.6.25" @@ -1223,6 +1251,15 @@ dependencies = [ "yaml-rust", ] +[[package]] +name = "sharded-slab" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79c719719ee05df97490f80a45acfc99e5a30ce98a1e4fb67aee422745ae14e3" +dependencies = [ + "lazy_static", +] + [[package]] name = "signal-hook-registry" version = "1.4.0" @@ -1287,10 +1324,32 @@ dependencies = [ ] [[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" +name = "stackable-operator" +version = "0.1.0-nightly" +source = "git+https://github.com/stackabletech/operator-rs.git?branch=main#918be372fc28ea6c9c6169db1d39239cd124ace2" +dependencies = [ + "async-trait", + "chrono", + "const_format", + "either", + "futures", + "json-patch", + "k8s-openapi", + "kube", + "kube-runtime", + "lazy_static", + "regex", + "schemars", + "serde", + "serde_json", + "serde_yaml", + "thiserror", + "tokio", + "tracing", + "tracing-futures", + "tracing-subscriber", + "uuid", +] [[package]] name = "strsim" @@ -1323,15 +1382,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "termcolor" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4" -dependencies = [ - "winapi-util", -] - [[package]] name = "thiserror" version = "1.0.25" @@ -1352,6 +1402,15 @@ dependencies = [ "syn", ] +[[package]] +name = "thread_local" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8018d24e04c95ac8790716a5987d0fec4f8b27249ffa0f7d33f1369bdfb88cbd" +dependencies = [ + "once_cell", +] + [[package]] name = "time" version = "0.1.44" @@ -1363,21 +1422,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "tinyvec" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b5220f05bb7de7f3f53c7c065e1199b3172696fe2db9f9c4d8ad9b4ee74c342" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" - [[package]] name = "tokio" version = "1.7.1" @@ -1457,6 +1501,23 @@ dependencies = [ "tracing", ] +[[package]] +name = "tower-http" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c58e177fa381489c0eb101ed27fb4233ba5cbe548226f439dd22853f9383bc26" +dependencies = [ + "bytes", + "futures-core", + "futures-util", + "http", + "http-body", + "pin-project 1.0.7", + "tower-layer", + "tower-service", + "tracing", +] + [[package]] name = "tower-layer" version = "0.3.1" @@ -1503,29 +1564,73 @@ dependencies = [ ] [[package]] -name = "try-lock" -version = "0.2.3" +name = "tracing-futures" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" +checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" +dependencies = [ + "pin-project 1.0.7", + "tracing", +] [[package]] -name = "unicode-bidi" -version = "0.3.5" +name = "tracing-log" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eeb8be209bb1c96b7c177c7420d26e04eccacb0eeae6b980e35fcb74678107e0" +checksum = "a6923477a48e41c1951f1999ef8bb5a3023eb723ceadafe78ffb65dc366761e3" dependencies = [ - "matches", + "lazy_static", + "log", + "tracing-core", ] [[package]] -name = "unicode-normalization" -version = "0.1.19" +name = "tracing-serde" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb65ea441fbb84f9f6748fd496cf7f63ec9af5bca94dd86456978d055e8eb28b" +dependencies = [ + "serde", + "tracing-core", +] + +[[package]] +name = "tracing-subscriber" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9" +checksum = "aa5553bf0883ba7c9cbe493b085c29926bd41b66afc31ff72cf17ff4fb60dcd5" dependencies = [ - "tinyvec", + "ansi_term", + "chrono", + "lazy_static", + "matchers", + "regex", + "serde", + "serde_json", + "sharded-slab", + "smallvec", + "thread_local", + "tracing", + "tracing-core", + "tracing-log", + "tracing-serde", ] +[[package]] +name = "treediff" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "761e8d5ad7ce14bb82b7e61ccc0ca961005a275a060b9644a2431aa11553c2ff" +dependencies = [ + "serde_json", +] + +[[package]] +name = "try-lock" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" + [[package]] name = "unicode-xid" version = "0.2.2" @@ -1538,18 +1643,6 @@ version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f14ee04d9415b52b3aeab06258a3f07093182b88ba0f9b8d203f211a7a7d41c7" -[[package]] -name = "url" -version = "2.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c" -dependencies = [ - "form_urlencoded", - "idna", - "matches", - "percent-encoding", -] - [[package]] name = "uuid" version = "0.8.2" @@ -1597,15 +1690,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" -[[package]] -name = "winapi-util" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -dependencies = [ - "winapi", -] - [[package]] name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" diff --git a/Cargo.toml b/Cargo.toml index ea478db..e5f51b2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,6 +7,6 @@ name = "agent-integration-tests" version = "0.1.0" [dependencies] -integration-test-commons = { git = "https://github.com/stackabletech/integration-test-commons.git", branch = "verify_status" } +integration-test-commons = { git = "https://github.com/stackabletech/integration-test-commons.git", tag = "0.2.0" } futures = "0.3" tokio = { version = "1.7", features = ["macros", "rt-multi-thread"] }