Quick dependency unification

Only remaining task is to upgrade from clap 2 to 3.
Azure · Apr 15, 2022 · fb8e43d · fb8e43d
1 parent e2f22e4
commit fb8e43d
Show file tree

Hide file tree

Showing 32 changed files with 201 additions and 2,430 deletions.
diff --git a/edgelet/Cargo.lock b/edgelet/Cargo.lock
diff --git a/edgelet/docker-rs/Cargo.toml b/edgelet/docker-rs/Cargo.toml
@@ -7,14 +7,13 @@ version = "0.1.0"
 
 [dependencies]
 async-trait = "0.1"
-base64 = "0.9"
-futures = "0.1"
+base64 = "0.13"
+futures = "0.3"
 hyper = "0.14"
 serde = "1.0"
 serde_derive = "1.0"
 serde_json = "1.0"
-typed-headers = "0.1"
-url = "1.5"
+url = "2"
 
-http-common = {git = "https://github.com/Azure/iot-identity-service", branch = "main"}
+http-common = { git = "https://github.com/Azure/iot-identity-service", branch = "main" }
 
diff --git a/edgelet/docker-rs/src/apis/client.rs b/edgelet/docker-rs/src/apis/client.rs
@@ -4,7 +4,6 @@ use std::sync::Arc;
 
 use futures::{Future, Stream};
 use serde_json;
-use typed_headers::{self, mime, HeaderMapExt};
 
 use http_common::{Connector, ErrorBody, HttpRequest};
 use hyper::{Body, Client, Uri};

diff --git a/edgelet/docker-rs/src/lib.rs b/edgelet/docker-rs/src/lib.rs
@@ -12,6 +12,5 @@
 #![cfg(not(tarpaulin_include))]
 pub mod apis;
 pub mod models;
-pub mod utils;
 
 pub use apis::{DockerApi, DockerApiClient};
diff --git a/edgelet/docker-rs/src/utils.rs b/edgelet/docker-rs/src/utils.rs
diff --git a/edgelet/edgelet-docker/Cargo.toml b/edgelet/edgelet-docker/Cargo.toml
@@ -8,17 +8,17 @@ version = "0.1.0"
 [dependencies]
 anyhow = "1"
 async-trait = "0.1"
-base64 = "0.9"
+base64 = "0.13"
 bytes = "1"
 chrono = { version = "0.4", features = ["serde"] }
 futures = "0.3"
-hex="0.3"
+hex = "0.4"
 hyper = "0.14"
 log = "0.4"
 serde = "1.0"
 serde_derive = "1.0"
 serde_json = "1.0"
-sysinfo = "0.14.10"
+sysinfo = "0.23"
 thiserror = "1"
 tokio = { version = "1", features = ["macros", "process"] }
 url = { version = "2", features = ["serde"] }
@@ -32,9 +32,3 @@ edgelet-settings = { path = "../edgelet-settings", features = ["settings-docker"
 edgelet-utils = { path = "../edgelet-utils" }
 http-common = { git = "https://github.com/Azure/iot-identity-service", branch = "main" }
 libc = "0.2.66"
-
-[dev_dependencies]
-maplit = "1.0"
-tempfile = "3"
-time = "0.1"
-typed-headers = "0.1"
diff --git a/edgelet/edgelet-docker/src/runtime.rs b/edgelet/edgelet-docker/src/runtime.rs
@@ -10,7 +10,7 @@ use std::{mem, process, str};
 use anyhow::Context;
 use hyper::Uri;
 use log::{debug, error, info, warn, Level};
-use sysinfo::{DiskExt, ProcessExt, ProcessorExt, System, SystemExt};
+use sysinfo::{DiskExt, PidExt, ProcessExt, ProcessorExt, System, SystemExt};
 use tokio::sync::mpsc::UnboundedSender;
 use tokio::sync::Mutex;
 use url::Url;
@@ -666,35 +666,30 @@ impl ModuleRuntime for DockerModuleRuntime {
         let mut system_resources = self.system_resources.as_ref().lock().await;
         system_resources.refresh_all();
 
-        let start_time = process::id()
-            .try_into()
-            .map(|id| {
-                system_resources
-                    .get_process(id)
-                    .map(ProcessExt::start_time)
-                    .unwrap_or_default()
-            })
+        let start_time = system_resources
+            .process(sysinfo::Pid::from_u32(process::id()))
+            .map(ProcessExt::start_time)
             .unwrap_or_default();
 
         let current_time = SystemTime::now()
             .duration_since(UNIX_EPOCH)
             .unwrap_or_default()
             .as_secs();
 
-        let used_cpu = system_resources.get_global_processor_info().get_cpu_usage();
-        let total_memory = system_resources.get_total_memory() * 1000;
-        let used_memory = system_resources.get_used_memory() * 1000;
+        let used_cpu = system_resources.global_processor_info().cpu_usage();
+        let total_memory = system_resources.total_memory() * 1000;
+        let used_memory = system_resources.used_memory() * 1000;
 
         let disks = system_resources
-            .get_disks()
+            .disks()
             .iter()
             .map(|disk| {
                 DiskInfo::new(
-                    disk.get_name().to_string_lossy().into_owned(),
-                    disk.get_available_space(),
-                    disk.get_total_space(),
-                    String::from_utf8_lossy(disk.get_file_system()).into_owned(),
-                    format!("{:?}", disk.get_type()),
+                    disk.name().to_string_lossy().into_owned(),
+                    disk.available_space(),
+                    disk.total_space(),
+                    String::from_utf8_lossy(disk.file_system()).into_owned(),
+                    format!("{:?}", disk.type_()),
                 )
             })
             .collect();