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.

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

chore: update dependencies #491

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
3,023 changes: 1,829 additions & 1,194 deletions Cargo.lock

Large diffs are not rendered by default.

34 changes: 17 additions & 17 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -43,33 +43,33 @@ exclude = [
resolver = "2"

[workspace.dependencies]
anyhow = "1.0.72"
chrono = { version = "0.4.26", default-features = false, features = ["clock", "std", "wasmbind"] } # default features except `oldtime`
anyhow = "1.0.79"
chrono = { version = "0.4.31", default-features = false, features = ["clock", "std", "wasmbind"] } # default features except `oldtime`
client = { path = "./client" }
clap = { version = "4.3.21", features = ["derive"] }
fancy-regex = "0.11.0"
futures-util = "0.3.28"
clap = { version = "4.4.14", features = ["derive"] }
fancy-regex = "0.13.0"
futures-util = "0.3.30"
heck = "0.4.1"
lazy_static = "1.4.0"
nix = "0.26.2"
nix = "0.27.1"
proc-macro2 = "1.0"
proto = { path = "./proto" }
protobuf = "3.2.0"
protobuf-parse = "=3.2.0" # This crate makes no promises of stabilty, so we pin to the exact version
quote = "1.0"
serial_test = "1.0.0"
serde = "1.0.183"
serde_json = "1.0.104"
syn = { version = "1.0", features = ["full"] } # used in macros, so full doesn't affect binary size
quote = "1.0.35"
serial_test = "3.0.0"
serde = "1.0.195"
serde_json = "1.0.111"
syn = { version = "1.0.109", features = ["full"] } # used in macros, so full doesn't affect binary size
test-helpers = { path = "./crates/test-helpers" }
test-helpers-macros = { path = "./crates/test-helpers-macros" }
thiserror = "1.0.44"
tokio = "1.29.1"
tonic = "0.9.2"
tonic-health = "0.9.2"
thiserror = "1.0.56"
tokio = "1.35.1"
tonic = "0.10.2"
tonic-health = "0.10.2"
tracing = "0.1"
uuid = { version = "1.2.2", features = ["v4"] }
url = "2.3.1"
uuid = { version = "1.6.1", features = ["v4"] }
url = "2.4.1"
validation = { path = "./crates/validation" }

#[patch.crates-io]
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# Distributed Systems Runtime #
# #
# ---------------------------------------------------------------------------- #
# #
# #
# Licensed under the Apache License, Version 2.0 (the "License"); #
# you may not use this file except in compliance with the License. #
# You may obtain a copy of the License at #
Expand Down
4 changes: 2 additions & 2 deletions aer/macros/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ proc-macro = true

[dependencies]
heck = { workspace = true }
itertools = "0.10.5"
itertools = "0.12.0"
proc-macro2 = { workspace = true }
protobuf = { workspace = true }
protobuf-parse = { workspace = true }
proto-reader = { path = "../../crates/proto-reader" } # using workspace isn't working
quote = { workspace = true }
syn = { workspace = true }
syn = { workspace = true }
31 changes: 14 additions & 17 deletions auraed/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -45,33 +45,29 @@ client = { workspace = true }
aurae-ebpf-shared = { path = "../ebpf-shared" }
aya = { version = ">=0.11", features = ["async_tokio"] }
backoff = { version = "0.4.0", features = ["tokio"] }
bytes = "1.2.1"
bytes = "1.5.0"
clap = { workspace = true }
chrono = { workspace = true }
clone3 = "0.2.3"
fancy-regex = { workspace = true }
futures = "0.3.28"
futures = "0.3.30"
ipnetwork = "0.20.0"
iter_tools = "0.1.4"
libc = "0.2.147" # TODO: Nix comes with libc, can we rely on that?
iter_tools = "0.4.0"
libc = "0.2.152" # TODO: Nix comes with libc, can we rely on that?
lazy_static = { workspace = true }
libcgroups = { git = "https://github.com/containers/youki", rev = "f4e7e300e6be7a4ea758a436218b9db1b39c69cd", default-features = false, features = [
"v2",
] }
libcontainer = { git = "https://github.com/containers/youki", rev = "f4e7e300e6be7a4ea758a436218b9db1b39c69cd", default-features = false, features = [
"v2",
] }
log = "0.4.17"
libcgroups = { version = "0.3.1", default-features = false, features = ["v2"] }
libcontainer = { version = "0.3.1", default-features = false, features = ["v2"] }
log = "0.4.20"
netlink-packet-route = "0.13.0" # Used for netlink_packet_route::rtnl::address::nlas definition
nix = { workspace = true, features = ["sched"] }
oci-spec = "0.6.1"
oci-spec = "0.6.4"
once_cell = "1"
procfs = "0.14.2"
procfs = "0.16.0"
proto = { workspace = true }
rtnetlink = "0.11.0"
serde_json.workspace = true
serde.workspace = true
syslog-tracing = "0.1.0"
syslog-tracing = "0.2.0"
thiserror = { workspace = true }
tokio = { workspace = true, features = [
"fs",
Expand All @@ -87,6 +83,7 @@ tokio-stream = { version = "0.1.14", features = ["net", "sync"] }
tonic = { workspace = true, features = ["tls"] }
tonic-health = { workspace = true }
tracing = { workspace = true, features = ["log"] }
tracing-log = "0.2"
tracing-subscriber = { version = "0.3", features = ["env-filter", "registry"] }
uuid = { workspace = true }
validation = { workspace = true, features = ["regex", "tonic"] }
Expand All @@ -96,9 +93,9 @@ walkdir = "2"
[dev-dependencies]
futures-util = { workspace = true }
multi_log = "0.1.2"
pretty_assertions = "1.3.0"
pretty_assertions = "1.4.0"
serial_test = { workspace = true }
simplelog = "0.12.0"
simple_test_case = "1.1.0"
simplelog = "0.12.1"
simple_test_case = "1.2.0"
test-helpers = { workspace = true }
test-helpers-macros = { workspace = true }
5 changes: 2 additions & 3 deletions auraed/src/cri/runtime_service.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ use crate::spawn_auraed_oci_to;
use chrono::Utc;
use libcontainer;
use libcontainer::container::builder::ContainerBuilder;
use libcontainer::syscall::syscall::create_syscall;
use libcontainer::syscall::syscall::SyscallType;
use nix::sys::signal::SIGKILL;
use proto::cri::{
runtime_service_server, AttachRequest, AttachResponse,
Expand Down Expand Up @@ -124,11 +124,10 @@ impl runtime_service_server::RuntimeService for RuntimeService {
// TODO We made the decision to create a "KernelSpec" *name structure that will be how we distinguish between VMs and Containers

let sandbox = {
let scoped_syscall = create_syscall();
// Initialize a new container builder with the AURAE_SELF_IDENTIFIER name as the "init" container running a recursive Auraed
let container_builder = ContainerBuilder::new(
AURAE_SELF_IDENTIFIER.to_string(),
scoped_syscall.as_ref(),
SyscallType::default()
);

let bundle_path = crate::AURAED_RUNTIME
Expand Down
4 changes: 2 additions & 2 deletions auraed/src/ebpf/perf_buffer_reader.rs
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ pub trait PerfBufferReader<T: Clone + Send + 'static> {
// Query the number of CPUs on the host
let num_cpus = nr_cpus()?;

// Query the page size on the host
let page_size = page_size()?;
// Get the page size on the host
let page_size = page_size();

// Get the size of the event payload
let event_struct_size: usize = size_of::<T>();
Expand Down
4 changes: 2 additions & 2 deletions auraed/src/observe/observe_service.rs
Original file line number Diff line number Diff line change
Expand Up @@ -216,8 +216,8 @@ impl observe_service_server::ObserveService for ObserveService {
&self,
request: Request<GetSubProcessStreamRequest>,
) -> Result<Response<Self::GetSubProcessStreamStream>, Status> {
let channel = LogChannelType::from_i32(request.get_ref().channel_type)
.ok_or(ObserveServiceError::InvalidLogChannelType {
let channel = LogChannelType::try_from(request.get_ref().channel_type)
.map_err(|_| ObserveServiceError::InvalidLogChannelType {
channel_type: request.get_ref().channel_type,
})?;
let pid: i32 = request.get_ref().process_id;
Expand Down
6 changes: 3 additions & 3 deletions auraescript/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ path = "src/bin/main.rs"
[dependencies]
anyhow = { workspace = true }
client = { workspace = true }
deno_ast = { version = "0.29.5", features = ["transpiling"] }
deno_core = "0.222.0"
deno_runtime = "0.129.0"
deno_ast = { version = "0.31.6", features = ["transpiling"] }
deno_core = "0.245.0"
deno_runtime = "0.138.0"
macros = { package = "auraescript_macros", path = "./macros" }
proto = { workspace = true }
tokio = { workspace = true, features = ["fs", "rt-multi-thread"] }
4 changes: 2 additions & 2 deletions auraescript/macros/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ proc-macro = true
[dependencies]
heck = { workspace = true }
proc-macro2 = { workspace = true }
protobuf = "3.2.0"
protobuf = { workspace = true }
protobuf-parse = { workspace = true }
proto-reader = { path = "../../crates/proto-reader" } # using workspace isn't working
quote = { workspace = true }
syn = { workspace = true }
syn = { workspace = true }
4 changes: 2 additions & 2 deletions client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ proto = { workspace = true }
serde = { workspace = true }
thiserror = { workspace = true }
tokio = { workspace = true, features = ["fs", "rt-multi-thread"] }
toml = "0.7.6"
toml = "0.8.8"
tonic = { workspace = true, features = ["tls"] }
tower = "0.4.13"
x509-certificate = "0.18.0"
x509-certificate = "0.23.1"
6 changes: 3 additions & 3 deletions crates/validation/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ url = ["dep:url"]
fancy-regex = { workspace = true, optional = true }
lazy_static = { workspace = true, optional = true }
thiserror = { workspace = true }
validator = "0.16.0"
validator = "0.16.1"
secrecy = { version = "0.8.0", optional = true }
serde = { workspace = true, optional = true }
serde_json = { workspace = true, optional = true }
tonic = { workspace = true, optional = true }
url = { workspace = true, optional = true }

[dev-dependencies]
num_enum = "0.5.7"
num_enum_derive = "0.5.7"
num_enum = "0.7.2"
num_enum_derive = "0.7.2"
5 changes: 3 additions & 2 deletions proto/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ license = "Apache-2.0"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
pbjson = "0.5.1"
prost = "0.11.2"
futures-core = "0.3.30"
pbjson = "0.6.0"
prost = "0.12.3"
serde = { workspace = true }
tonic = { workspace = true }
Loading