Merge branch 'main' into 2592-mapper-bridge

Author: jarhodes314

.gitattributes

@@ -293,7 +293,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-    - uses: crate-ci/typos@v1.18.0
+    - uses: crate-ci/typos@v1.19.0
       continue-on-error: true
     - run: exit 0
 

.github/workflows/pull-request-checks.yml

@@ -171,7 +171,7 @@ url = "2.3"
 uzers = "0.11"
 walkdir = "2"
 which = "4.2"
-whoami = "1.2.1"
+whoami = "1.5.0"
 ws_stream_tungstenite = "0.11"
 x509-parser = "0.15"
 yansi = "0.5"

Cargo.lock

@@ -32,18 +32,22 @@ Args:
 
     Example ARCH (target) values:
 
-        MUSL variants
+        Linux MUSL variants
         * x86_64-unknown-linux-musl
         * aarch64-unknown-linux-musl
         * armv7-unknown-linux-musleabihf
         * arm-unknown-linux-musleabihf
 
-        GNU variants
+        Linux GNU variants
         * x86_64-unknown-linux-gnu
         * aarch64-unknown-linux-gnu
         * armv7-unknown-linux-gnueabihf
         * arm-unknown-linux-gnueabihf
 
+        Apple
+        * aarch64-apple-darwin
+        * x86_64-apple-darwin
+
 Flags:
     --help|-h   Show this help
     --skip-build    Skip building the binaries and only package them (e.g. just create the linux packages)

Cargo.toml

@@ -68,7 +68,7 @@ VERSION=
 CLEAN=1
 PACKAGES=()
 COMMAND=
-PACKAGE_TYPES="deb,apk,rpm,tarball"
+PACKAGE_TYPES=
 
 while [ $# -gt 0 ]
 do
@@ -117,6 +117,14 @@ if [ -z "$TARGET" ]; then
     TARGET=$(./ci/build_scripts/detect_target.sh)
 fi
 
+if [ -z "$PACKAGE_TYPES" ]; then
+    case "$TARGET" in
+        *linux*) PACKAGE_TYPES="deb,apk,rpm,tarball" ;;
+        *apple*) PACKAGE_TYPES="tarball" ;;
+        *) PACKAGE_TYPES="tarball" ;;
+    esac
+fi
+
 # Normalize output dir
 OUTPUT_DIR="${OUTPUT_DIR%/}"
 
@@ -204,6 +212,8 @@ get_package_arch() {
         riscv64gc-unknown-linux-*) pkg_arch=riscv64 ;;
         mips64el-unknown-linux-*abi64) pkg_arch=mips64le ;;
         mipsel-unknown-linux-*) pkg_arch=mipsle ;;
+        aarch64-apple-darwin) pkg_arch=arm64 ;;
+        x86_64-apple-darwin) pkg_arch=amd64 ;;
         *)
             echo "Unknown package architecture. value=$1"
             exit 1

ci/build_scripts/build.sh

@@ -183,6 +183,12 @@ get_user_friendly_arch() {
         *arm-unknown-linux-musleabihf*)
             easy_arch=armv6
             ;;
+        *aarch64-apple-darwin*)
+            easy_arch=macos-arm64
+            ;;
+        *x86_64-apple-darwin*)
+            easy_arch=macos-amd64
+            ;;
     esac
     echo "$easy_arch"
 }

ci/build_scripts/package.sh

@@ -18,6 +18,7 @@ use std::fs::File;
 use std::io::Seek;
 use std::io::SeekFrom;
 use std::io::Write;
+#[cfg(target_os = "linux")]
 use std::os::unix::prelude::AsRawFd;
 use std::path::Path;
 use std::path::PathBuf;
@@ -487,7 +488,6 @@ fn try_pre_allocate_space(file: &File, path: &Path, file_len: u64) -> Result<(),
 #[allow(deprecated)]
 mod tests {
     use super::*;
-    use nix::sys::statvfs;
     use std::io::Write;
     use tempfile::tempdir;
     use tempfile::NamedTempFile;
@@ -557,6 +557,7 @@ mod tests {
     #[tokio::test]
     #[ignore = "Overriding Content-Length doesn't work in mockito"]
     async fn downloader_download_with_content_length_larger_than_usable_disk_space() {
+        use nix::sys::statvfs;
         let tmpstats = statvfs::statvfs("/tmp").unwrap();
         let usable_disk_space = tmpstats.blocks_free() * tmpstats.block_size();
 

ci/build_scripts/publish_packages.sh

@@ -317,6 +317,7 @@ EOF
 
         // On expect the errors to be logged
         let log_content = String::from_utf8(std::fs::read(log_file_path)?)?;
+        #[cfg(target_os = "linux")]
         assert_eq!(
             log_content,
             r#"----- $ ls "dummy-file"
@@ -328,6 +329,20 @@ EOF
 stderr <<EOF
 ls: cannot access 'dummy-file': No such file or directory
 EOF
+"#
+        );
+        #[cfg(target_os = "macos")]
+        assert_eq!(
+            log_content,
+            r#"----- $ ls "dummy-file"
+exit status: 1
+
+stdout <<EOF
+EOF
+
+stderr <<EOF
+ls: dummy-file: No such file or directory
+EOF
 "#
         );
         Ok(())

crates/common/download/src/download.rs

@@ -7,21 +7,34 @@ pub use self::tedge_config_cli::error::*;
 pub use self::tedge_config_cli::models::*;
 pub use self::tedge_config_cli::tedge_config::*;
 pub use self::tedge_config_cli::tedge_config_location::*;
-pub use self::tedge_config_cli::tedge_config_repository::*;
 pub use camino::Utf8Path as Path;
 pub use camino::Utf8PathBuf as PathBuf;
 pub use certificate::CertificateError;
 pub use tedge_config_macros::all_or_nothing;
 pub use tedge_config_macros::OptionalConfig;
 
-/// loads the new tedge config from system default
-pub fn get_new_tedge_config() -> Result<TEdgeConfig, TEdgeConfigError> {
-    let tedge_config_location = TEdgeConfigLocation::default();
-    TEdgeConfigRepository::new(tedge_config_location).load()
-}
+impl TEdgeConfig {
+    pub fn try_new(config_location: TEdgeConfigLocation) -> Result<Self, TEdgeConfigError> {
+        config_location.load()
+    }
+
+    pub fn load(config_dir: &Path) -> Result<TEdgeConfig, TEdgeConfigError> {
+        let config_location = TEdgeConfigLocation::from_custom_root(config_dir);
+        TEdgeConfig::try_new(config_location)
+    }
 
-/// loads the tedge config from a config directory
-pub fn load_tedge_config(config_dir: &Path) -> Result<TEdgeConfig, TEdgeConfigError> {
-    let tedge_config_location = TEdgeConfigLocation::from_custom_root(config_dir);
-    TEdgeConfigRepository::new(tedge_config_location).load()
+    #[cfg(feature = "test")]
+    /// A test only method designed for injecting configuration into tests
+    ///
+    /// ```
+    /// use tedge_config::TEdgeConfig;
+    /// let config = TEdgeConfig::load_toml_str("service.ty = \"service\"");
+    ///
+    /// assert_eq!(&config.service.ty, "service");
+    /// // Defaults are preserved
+    /// assert_eq!(config.sudo.enable, true);
+    /// ```
+    pub fn load_toml_str(toml: &str) -> TEdgeConfig {
+        TEdgeConfigLocation::load_toml_str(toml)
+    }
 }