Merge pull request #680 from joshuachp/push-oollvopvqlyn

feat(fileTransfer): add a file store module to read and write files

Author: harlem88

Cargo.lock

@@ -100,7 +100,6 @@ webpki-roots = [
 vendored = ["edgehog-store/vendored"]
 # Recreates the C bindings at buildtime, requires cmake, clang, and  bindgen-cli
 bindgen = [
-  "dep:aws-lc-rs",
   "aws-lc-rs/bindgen",
   "edgehog-store?/bindgen",
 ]
@@ -110,6 +109,7 @@ cross = ["vendored", "bindgen"]
 
 [dependencies]
 astarte-device-sdk = { workspace = true, features = ["derive"] }
+aws-lc-rs.workspace = true
 bytes.workspace = true
 cfg-if.workspace = true
 clap = { workspace = true, features = ["derive", "env"] }
@@ -123,6 +123,7 @@ edgehog-tls.workspace = true
 eyre.workspace = true
 futures.workspace = true
 hex.workspace = true
+pin-project-lite.workspace = true
 rustls.workspace = true
 serde.workspace = true
 serde_json.workspace = true
@@ -133,14 +134,14 @@ tokio-stream.workspace = true
 tokio-util = { workspace = true, features = ["rt"] }
 toml.workspace = true
 tracing.workspace = true
+tracing-error.workspace = true
 tracing-subscriber = { workspace = true, features = ["env-filter"] }
 url.workspace = true
 uuid = { workspace = true, features = ["v5", "v4", "serde"] }
 wifiscanner = { workspace = true, optional = true }
 zbus = { workspace = true, optional = true, default-features = false, features = ["tokio"] }
 
 # C dependencies
-aws-lc-rs = { workspace = true, optional = true }
 rusqlite = { workspace = true, optional = true }
 
 [dependencies.reqwest]
@@ -210,13 +211,15 @@ indexmap = "2.11.4"
 insta = "1.46.3"
 itertools = "0.14.0"
 mockall = "0.14.0"
+pin-project-lite = "0.2.17"
 pretty_assertions = "1.4.1"
 procfs = "0.18.0"
 reqwest = { version = "0.13.1", default-features = false }
 rstest = "0.26.1"
 # Version required by diesel
 rusqlite = "0.36.0"
 rustc_version = "0.4.1"
+rustix = "1.1.4"
 rustls = "0.23.37"
 rustls-native-certs = "0.8.1"
 rustls-pemfile = "2.2.0"
@@ -234,6 +237,7 @@ tokio-tungstenite = "0.28.0"
 tokio-util = "0.7.16"
 toml = "1.0.2"
 tracing = "0.1.41"
+tracing-error = "0.2.1"
 tracing-subscriber = "0.3.20"
 udev = "0.9.3"
 url = "2.5.7"

Cargo.toml

@@ -1,4 +1,19 @@
-// Copyright 2023-2024 SECO Mind Srl
+// This file is part of Edgehog.
+//
+// Copyright 2023, 2024, 2026 SECO Mind Srl
+//
+// 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
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
 // SPDX-License-Identifier: Apache-2.0
 
 //! Module containing utility functions and structures to perform integration test of the library.
@@ -316,6 +331,7 @@ impl MockWebSocket {
                 .await
                 .expect("failed to accept connection");
 
+            #[expect(clippy::result_large_err)]
             tokio_tungstenite::accept_hdr_async(stream, |req: &Request, mut res: Response| {
                 if let Some(h) = req.headers().get("Sec-WebSocket-Protocol") {
                     res.headers_mut()

edgehog-device-runtime-forwarder/src/test_utils.rs

@@ -110,7 +110,8 @@ impl<C> Runtime<C> {
 
         tasks.spawn(telemetry.spawn(telemetry_rx));
 
-        let file_transfer = Self::file_transfer(tasks);
+        // TODO: Add configuration
+        let file_transfer = Self::file_transfer(tasks, opts.store_directory.join("file-store"));
 
         #[cfg(feature = "containers")]
         let containers_tx = Self::setup_containers(
@@ -153,10 +154,13 @@ impl<C> Runtime<C> {
         })
     }
 
-    fn file_transfer(tasks: &mut JoinSet<eyre::Result<()>>) -> mpsc::Sender<FileTransferEvent> {
+    fn file_transfer(
+        tasks: &mut JoinSet<eyre::Result<()>>,
+        store_dir: std::path::PathBuf,
+    ) -> mpsc::Sender<FileTransferEvent> {
         let (tx, rx) = mpsc::channel(EVENT_BUFFER);
 
-        tasks.spawn(FileTransfer::new().spawn(rx));
+        tasks.spawn(FileTransfer::new(store_dir).spawn(rx));
 
         tx
     }