Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update tokio, uuid, and clap minimum versions #520

Merged
merged 3 commits into from
Feb 16, 2023
Merged

Update tokio, uuid, and clap minimum versions #520

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e8bb214
Cargo: Update tokio minimum version to 1.24 and reduce features
ansasaki Jan 27, 2023
0440683
Cargo: Update uuid minimum version to 1.3
ansasaki Feb 15, 2023
930e5c2
Cargo: Update clap minimum version to 3.2
ansasaki Feb 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 9 additions & 22 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions keylime-agent/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ repository = "https://github.com/keylime/rust-keylime"
actix-web = { version = "4", features = ["openssl"] }
base64 = "0.13"
cfg-if = "1"
clap = { version = "~3.1.18", features = ["derive"] }
clap = { version = "3.2", features = ["derive"] }
compress-tools = "0.12"
config = { version = "0.13", features = ["toml"] }
futures = "0.3.6"
Expand All @@ -30,10 +30,10 @@ serde_derive = "1.0.80"
serde_json = { version = "1.0", features = ["raw_value"] }
static_assertions = "1"
tempfile = "3.0.4"
tokio = {version = "1.13.1", features = ["full"]}
tokio = {version = "1.24", features = ["rt", "sync"]}
tss-esapi = {version = "7.1.0", features = ["generate-bindings"]}
thiserror = "1.0"
uuid = {version = "0.8", features = ["v4"]}
uuid = {version = "1.3", features = ["v4"]}
zmq = {version = "0.9.2", optional = true}
# wiremock was moved to be a regular dependency because optional
# dev-dependencies are not supported
Expand Down
4 changes: 2 additions & 2 deletions keylime-agent/src/payloads.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ mod tests {
(k, payload.into())
}

#[tokio::test]
#[actix_rt::test]
async fn test_run() {
let dir = tempfile::tempdir().unwrap(); //#[allow_ci]
let script_path = dir.path().join("test-script.sh");
Expand Down Expand Up @@ -453,7 +453,7 @@ echo hello > test-output
}

#[cfg(feature = "testing")]
#[tokio::test]
#[actix_rt::test]
async fn test_run_encrypted_payload() {
let test_config = KeylimeConfig::default();
let temp_workdir = tempfile::tempdir().unwrap(); //#[allow_ci]
Expand Down
10 changes: 5 additions & 5 deletions keylime-agent/src/registrar_agent.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ mod tests {
use wiremock::matchers::{any, method};
use wiremock::{Mock, MockServer, ResponseTemplate};

#[tokio::test]
#[actix_rt::test]
async fn mock_register_agent_ok() {
let response: Response<RegisterResponseResults> = Response {
code: 200.into(),
Expand Down Expand Up @@ -203,7 +203,7 @@ mod tests {
assert!(response.is_ok());
}

#[tokio::test]
#[actix_rt::test]
async fn mock_register_agent_ok_without_ekcert() {
let response: Response<RegisterResponseResults> = Response {
code: 200.into(),
Expand Down Expand Up @@ -245,7 +245,7 @@ mod tests {
assert!(response.is_ok());
}

#[tokio::test]
#[actix_rt::test]
async fn mock_register_agent_err() {
let response: Response<RegisterResponseResults> = Response {
code: 200.into(),
Expand Down Expand Up @@ -284,7 +284,7 @@ mod tests {
assert_eq!(response.err().unwrap().http_code().unwrap(), 404); //#[allow_ci]
}

#[tokio::test]
#[actix_rt::test]
async fn mock_activate_agent_ok() {
let response: Response<ActivateResponseResults> = Response {
code: 200.into(),
Expand Down Expand Up @@ -312,7 +312,7 @@ mod tests {
assert!(response.is_ok());
}

#[tokio::test]
#[actix_rt::test]
async fn mock_activate_agent_err() {
let response: Response<ActivateResponseResults> = Response {
code: 200.into(),
Expand Down
2 changes: 1 addition & 1 deletion keylime-ima-emulator/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
clap = { version = "~3.1.18", features = ["derive"] }
clap = { version = "3.2", features = ["derive"] }
hex = "0.4"
keylime = { path = "../keylime" }
log = "0.4"
Expand Down