Merge branch 'main' into 2592-mapper-bridge

Author: jarhodes314

.github/workflows/build-workflow.yml

@@ -176,7 +176,7 @@ jobs:
           path: tests/RobotFramework/output
 
       - name: Send report to commit
-        uses: joonvena/robotframework-reporter-action@v2.3
+        uses: joonvena/robotframework-reporter-action@v2.4
         if: always() && github.event_name == 'pull_request_target'
         with:
           gh_access_token: ${{ secrets.GITHUB_TOKEN }}
@@ -353,7 +353,7 @@ jobs:
           fetch-depth: 0
           persist-credentials: false
       - name: Release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:

ci/build_scripts/package.sh

@@ -119,7 +119,7 @@ fi
 
 if [ -z "$PACKAGE_TYPES" ]; then
     case "$TARGET" in
-        *linux*) PACKAGE_TYPES="deb,apk,rpm,tarball" ;;
+        *linux*|all) PACKAGE_TYPES="deb,apk,rpm,tarball" ;;
         *apple*) PACKAGE_TYPES="tarball" ;;
         *) PACKAGE_TYPES="tarball" ;;
     esac
@@ -194,6 +194,14 @@ build_virtual_package() {
     if [[ "$PACKAGE_TYPES" =~ apk ]]; then
         env GIT_SEMVER="${APK_VERSION:-$GIT_SEMVER}" RELEASE="r0" nfpm "${COMMON_ARGS[@]}" --packager apk
     fi
+
+    # Expect to build at least 1 virtual package to prevent silent errors
+    # when no virtual packages were created
+    VIRTUAL_PACKAGE_COUNT=$(find target/virtual-packages -type f | wc -l | xargs)
+    if [ "$VIRTUAL_PACKAGE_COUNT" -lt 1 ]; then
+        echo "Expected at least 1 virtual packages to have been created. got=$VIRTUAL_PACKAGE_COUNT" >&2
+        exit 1
+    fi
 }
 
 get_package_arch() {

crates/common/batcher/Cargo.toml

@@ -15,6 +15,7 @@ time = { workspace = true }
 tokio = { workspace = true, features = ["time"] }
 
 [dev-dependencies]
+tedge_actors = { workspace = true, features = ["test-helpers"] }
 tokio = { workspace = true, features = ["rt", "macros"] }
 
 [lints]

crates/common/batcher/src/driver.rs

@@ -178,7 +178,6 @@ mod tests {
     use std::time::Duration;
     use tedge_actors::test_helpers::ServiceProviderExt;
     use tedge_actors::Builder;
-    use tedge_actors::NoConfig;
     use tedge_actors::SimpleMessageBoxBuilder;
     use tokio::time::timeout;
 
@@ -256,7 +255,7 @@ mod tests {
             .build();
         let batcher = Batcher::new(config);
         let mut box_builder = SimpleMessageBoxBuilder::new("test", 1);
-        let test_box = box_builder.new_client_box(NoConfig);
+        let test_box = box_builder.new_client_box();
         let driver_box = box_builder.build();
 
         let driver = BatchDriver::new(batcher, driver_box);

crates/common/batcher/src/lib.rs

@@ -24,7 +24,6 @@ use tedge_actors::MessageSource;
 use tedge_actors::NoConfig;
 use tedge_actors::RuntimeRequest;
 use tedge_actors::RuntimeRequestSink;
-use tedge_actors::ServiceProvider;
 use tedge_actors::SimpleMessageBoxBuilder;
 
 pub struct BatchingActorBuilder<B: Batchable> {
@@ -68,25 +67,7 @@ impl<B: Batchable> BatchingActorBuilder<B> {
     }
 }
 
-// FIXME: This implementation highlights something new to me.
-//        For some actor it makes little sense to impl ServiceProvider,
-//        as the consumer of the outputs is likely a *different* actor as the producer of the inputs
-impl<B: Batchable> ServiceProvider<BatchDriverInput<B>, BatchDriverOutput<B>, NoConfig>
-    for BatchingActorBuilder<B>
-{
-    fn connect_consumer(
-        &mut self,
-        config: NoConfig,
-        response_sender: DynSender<BatchDriverOutput<B>>,
-    ) -> DynSender<BatchDriverInput<B>> {
-        self.message_box.connect_consumer(config, response_sender)
-    }
-}
-
-impl<B: Batchable> MessageSink<BatchDriverInput<B>, NoConfig> for BatchingActorBuilder<B> {
-    fn get_config(&self) -> NoConfig {
-        NoConfig
-    }
+impl<B: Batchable> MessageSink<BatchDriverInput<B>> for BatchingActorBuilder<B> {
     fn get_sender(&self) -> DynSender<BatchDriverInput<B>> {
         self.message_box.get_sender()
     }

crates/core/tedge_actors/src/actors.rs

@@ -77,7 +77,7 @@ pub mod tests {
     #[tokio::test]
     async fn running_an_actor_without_a_runtime() {
         let mut box_builder = SimpleMessageBoxBuilder::new("test", 16);
-        let mut client_message_box = box_builder.new_client_box(NoConfig);
+        let mut client_message_box = box_builder.new_client_box();
         let mut runtime_box = box_builder.get_signal_sender();
         let actor_message_box = box_builder.build();
         let actor = Echo {